- Update to 1.16

  Release notes:
  https://core.tcl.tk/tcllib/doc/tcllib-1-16/support/releases/history/README-1.16.txt

9 files changed, 124 insertions, 1656 deletions

diff --git a/devel/tcllib/Makefile b/devel/tcllib/Makefile
index 26cf3ab84df4..b903841ff7d1 100644
--- a/devel/tcllib/Makefile
+++ b/devel/tcllib/Makefile
@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	tcllib
-PORTVERSION=	1.15
-PORTREVISION=	3
+PORTVERSION=	1.16
 CATEGORIES=	devel tcl
-MASTER_SITES=	SF
 
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	Collection of utility modules for Tcl
@@ -17,6 +15,12 @@ LICENSE_PERMS=	auto-accept dist-mirror dist-sell pkg-mirror pkg-sell
 
 OPTIONS_DEFINE=	DOCS MANPAGES
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	tcltk
+GH_PROJECT=	tcllib
+GH_TAGNAME=	tcllib_${PORTVERSION:S/./_/}
+GH_COMMIT=	ce4a0e4
+
 USES+=		tcl
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	ac_cv_path_tclsh="${TCLSH}"
@@ -80,6 +84,19 @@ post-patch:
 	for man in `${FIND} ${WRKSRC} -name "tcllib_*.man"`; do \
 	    ${MV} $$man `echo $$man | ${SED} -e 's|tcllib_||'`; \
 	done
+	for man in `${FIND} ${WRKSRC} -name "tcllib_*.n"`; do \
+	    ${MV} $$man `echo $$man | ${SED} -e 's|tcllib_||'`; \
+	done
+
+#
+#	add the .tcllib suffix to man pages
+#
+	for man in `${FIND} ${WRKSRC} -name "*.man"`; do \
+	    ${MV} $$man `echo $$man | ${SED} -e 's|man$$|tcllib.man|'`; \
+	done
+	for man in `${FIND} ${WRKSRC} -name "*.n"`; do \
+	    ${MV} $$man `echo $$man | ${SED} -e 's|n$$|tcllib.n|'`; \
+	done
 
 do-install:
 	cd ${WRKSRC} && ${TCLSH} ./installer.tcl ${INSTALL_ARGS}
diff --git a/devel/tcllib/distinfo b/devel/tcllib/distinfo
index f12d7050bd23..96e9eadedc1b 100644
--- a/devel/tcllib/distinfo
+++ b/devel/tcllib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tcllib-1.15.tar.gz) = 6d308980d9dace24c6252b96223c1646e83795ba03dbf996525ad27e1b56bffd
-SIZE (tcllib-1.15.tar.gz) = 6175150
+SHA256 (tcllib-1.16.tar.gz) = a188b2fd37d0a05de7fd0794bf477c5be846de444c142457ad7adc8972e7b488
+SIZE (tcllib-1.16.tar.gz) = 7698126
diff --git a/devel/tcllib/files/patch-91f14dfd0a b/devel/tcllib/files/patch-91f14dfd0a
deleted file mode 100644
index f3ace4c107d1..000000000000
--- a/devel/tcllib/files/patch-91f14dfd0a
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: modules/struct/pkgIndex.tcl
-==================================================================
---- modules/struct/pkgIndex.tcl
-+++ modules/struct/pkgIndex.tcl
-@@ -1,10 +1,10 @@
- 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.4 [list source [file join $dir queue.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::matrix    2.0.2 [list source [file join $dir matrix.tcl]]
- package ifneeded struct::pool      1.2.1 [list source [file join $dir pool.tcl]]
- package ifneeded struct::record    1.2.1 [list source [file join $dir record.tcl]]
-
diff --git a/devel/tcllib/files/patch-bug-3601370-td b/devel/tcllib/files/patch-bug-3601370-td
deleted file mode 100644
index 28219799f832..000000000000
--- a/devel/tcllib/files/patch-bug-3601370-td
+++ /dev/null
@@ -1,832 +0,0 @@
-Index: modules/doctools/ChangeLog
-==================================================================
---- modules/doctools/ChangeLog
-+++ modules/doctools/ChangeLog
-@@ -1,10 +1,18 @@
-+2013-02-25  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-+
-+	* mpformats/_nroff.tcl (nroff_postprocess): Followup fixes to
-+	* mpformats/fmt.nroff: bugs found in branch "bug-3601370-td",
-+	* pkgIndex.tcl: Missing markup of several nroff directives as
-+	* doctools.tcl: such. Version bumped to 1.4.15.
-+	* doctools.man:
-+
- 2013-02-01  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	*
- 	* Released and tagged Tcllib 1.15 ========================
--	* 
-+	*
- 
- 2013-01-29  Andreas Kupries  <andreask@activestate.com>
- 
- 	* doctools.man: Bumped version to 1.4.14 for the
- 	* doctools.tcl: last change, see below.
-@@ -26,11 +34,11 @@
- 
- 2011-12-13  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	*
- 	* Released and tagged Tcllib 1.14 ========================
--	* 
-+	*
- 
- 2011-11-07  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	* tests/nroff/04: Updated the test outputs to match the changes
- 	* tests/nroff/07: introduced by the last two commits, below.
-@@ -63,11 +71,11 @@
- 
- 2011-01-24  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	*
- 	* Released and tagged Tcllib 1.13 ========================
--	* 
-+	*
- 
- 2011-01-12  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	* doctools.test: Updated for the changes made per the entry below.
- 
-@@ -104,11 +112,11 @@
- 	* mpformats/fmt.latex:
- 	* mpformats/fmt.tmml:
- 	* mpformats/fmt.html:
- 	* mpformats/fmt.nroff:
- 	* mpformats/fmt.null:
--	* doctools.man: 
-+	* doctools.man:
- 	* pkgIndex.tcl:
- 	* doctools.tcl:
- 
- 2010-06-17  Andreas Kupries  <andreask@activestate.com>
- 
-@@ -156,12 +164,12 @@
- 	* ../../apps/dtplite:
- 
- 	* docidx.man: Added missing dt_package and restricted 'file'
- 	* docidx.tcl: support to doctool::toc and doctools::idx. Versions
- 	* doctoc.man: bumped to 1.1.3 and 1.0.4.
--	* doctoc.tcl: 
--	* pkgIndex.tcl: 
-+	* doctoc.tcl:
-+	* pkgIndex.tcl:
- 
- 	* mpformats/toc.text: Fixed command names using various textutil
- 	* mpformats/idx.text: functionality.
- 
- 2010-02-05  Andreas Kupries  <andreask@activestate.com>
-@@ -173,11 +181,11 @@
- 	* pkgIndex.tcl: 1.4.6.
- 
- 2010-02-04  Andreas Kupries  <andreask@activestate.com>
- 
- 	* doctools.tcl: Extended with new plugin API command
--	* doctools.man: [dt_mainfile], which always returns 
-+	* doctools.man: [dt_mainfile], which always returns
- 	* doctools_plugin_apiref.man: the toplevel file currently
- 	* pkgIndex.tcl: processed, in contrast to [dt_file] which
- 	  returns the currently processed file, which may be included.
- 	  Bumped version to 1.4.5.
- 
-@@ -186,11 +194,11 @@
- 	  instead of the toplevel.
- 
- 2009-12-09  Andreas Kupries  <andreask@activestate.com>
- 
- 	* doctools.tcl: Bumped version to 1.4.4.
--	* doctools.man: 
-+	* doctools.man:
- 	* pkgIndex.tcl:
- 
- 	* mpformats/fmt.html: Extended to support the engine variable
- 	* doctools.test: 'raw' (boolean flag). The default is off, causing
- 	  the engine to generate the full html, as usual. If set, the
-@@ -213,11 +221,11 @@
- 
- 2009-12-07  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	*
- 	* Released and tagged Tcllib 1.12 ========================
--	* 
-+	*
- 
- 2009-07-21  Andreas Kupries  <andreask@activestate.com>
- 
- 	* doctools.tcl: Fixed @mdgen instructions, added forgotten
- 	  ownership reference to man.macros. See ActiveState Bug 83781,
-@@ -277,11 +285,11 @@
- 	* doctools.tcl: their result instead of generating a
- 	* doctools.test: '.so man.macros' command. Stuart Cassoff
- 	* doctools_plugin_apiref.man: <stwo@users.sourceforge.net> did the
- 	* mpformats/_nroff.tcl: work and provided the patches as part of
- 	* mpformats/fmt.nroff: his effort on making a Tcllib OpenBSD port.
--	* mpformats/idx.nroff: 
-+	* mpformats/idx.nroff:
- 	* mpformats/toc.nroff:
- 
- 2009-01-28  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	* checker.tcl: Fixed bug in handling 'category' command. Bumped
-@@ -316,17 +324,17 @@
- 
- 2008-12-12  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	*
- 	* Released and tagged Tcllib 1.11.1 ========================
--	* 
-+	*
- 
- 2008-12-01  Andreas Kupries  <andreask@activestate.com>
- 
- 	* doctools.tcl: New command in doctools language is extended API.
- 	* doctools.man: Bumped minor version, to 1.4.
--	* pkgIndex.tcl: 
-+	* pkgIndex.tcl:
- 
- 2008-11-26  Andreas Kupries  <andreask@activestate.com>
- 
- 	* api.tcl: Extended doctools language with a 'category'
- 	* checker.tcl: command. This allows manpages to provide
-@@ -355,11 +363,11 @@
- 
- 2008-10-16  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	*
- 	* Released and tagged Tcllib 1.11 ========================
--	* 
-+	*
- 
- 2008-07-08  Andreas Kupries  <andreask@activestate.com>
- 
- 	* changelog.man: Bumped the packages to version 1. They have
- 	* changelog.tcl: been on 0 long enough.
-@@ -386,11 +394,11 @@
- 	* ../tie/tie.man: Fixed the sectref argument order issues.
- 
- 2008-05-15  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	* doctools.tcl: Bumped version to 1.3.4.
--	* doctools.man: 
-+	* doctools.man:
- 	* pkgIndex.tcl:
- 
- 	* checker.tcl: Reworked the (sub)section handling, enabled the
- 	* doctools_lang_cmdref.man: documentation writer to label
- 	  (sub)sections with logical names and use these in references.
-@@ -411,11 +419,11 @@
- 	* mpformats/fr.msg:
- 
- 	* mpformats/fmt.html: Updated the backends for the changes in the
- 	* mpformats/fmt.latex: frontend/backend API, and updated testsuite
- 	* mpformats/fmt.nroff: results.
--	* mpformats/fmt.text: 
-+	* mpformats/fmt.text:
- 	* mpformats/fmt.tmml:
- 	* mpformats/fmt.wiki:
- 	* mpformats/_common.tcl:
- 	* tests/latex/00:
- 	* tests/latex/01:
-@@ -521,16 +529,16 @@
- 
- 2008-04-23  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	* tests/man/02: Added see_also and keyword references to this
- 	* tests/html/02: example. Updated all changed results.
--	* tests/latex/02: 
--	* tests/list/02: 
--	* tests/nroff/02: 
--	* tests/text/02: 
--	* tests/tmml/02: 
--	* tests/wiki/02: 
-+	* tests/latex/02:
-+	* tests/list/02:
-+	* tests/nroff/02:
-+	* tests/text/02:
-+	* tests/tmml/02:
-+	* tests/wiki/02:
- 
- 2008-04-21  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	* mpformats/fmt.html: Modified to put sections and subsections
- 	* mpformats/_html.tcl: into divisions a CSS can lock onto. Changed
-@@ -711,11 +719,11 @@
- 	* doctools.man: first pass, to avoid replication. Bumped version
- 	  to 1.3.1. This fixes [SF Tcllib Bug 1800413].
- 
- 	* mpformats/fmt.nroff: Fixed argument swap in fmt_arg_def, fixing
- 	  [SF Tcllib Bug 1800420].
--	
-+
- 	* mpformats/fmt.html: Handled [SF Tcllib Bug 1800408] and [SF
- 	  Tcllib Bug 411], removing superfluous whitespace around link
- 	  text and adding more class names to semantic markup.
- 
- 2007-09-20  Andreas Kupries  <andreask@activestate.com>
-@@ -730,11 +738,11 @@
- 
- 2007-09-12  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	*
- 	* Released and tagged Tcllib 1.10 ========================
--	* 
-+	*
- 
- 2007-08-20  Andreas Kupries  <andreask@activestate.com>
- 
- 	* doctools.tcl: Bumped versions to 1.3 and 0.3 respectively to
- 	* docidx.tcl:   reflect the extended syntax and bugfixes listed
-@@ -797,11 +805,11 @@
- 	  to warnings.
- 
- 	* checker_toc.tcl: Language change (doctoc, docidx). Comments in
- 	* checker_idx.tcl: the input are now swallowed by the checker
- 	  layer and not propagated to the backend anymore.
--	
-+
- 	* checker.tcl: Language changes.
- 	  -- Comments are swallowed, backends do not see them anymore.
- 	  -- 'require'ments an now go everywhere in the header, not only
- 	  after the 'desc'riptions.
- 	  -- Warnings now have location information.
-@@ -824,11 +832,11 @@
- 	  Note that everything which was made deprecated is still accepted
- 	  as valid input, however their use does cause the generation of
- 	  warnings. This means that the language after the changes is a
- 	  proper superset of the language before it. Old documents can be
- 	  processed just fine with the new code.
--	
-+
- 	* mpformats/fmt.html: Use the new list types for translation.
- 	* mpformats/fmt.latex:
- 	* mpformats/fmt.text:
- 	* mpformats/fmt.tmml:
- 
-@@ -851,11 +859,11 @@
- 	  are now cross-referencable via 'term', allowing direct links
- 	  between documents. Comments about internals added. Documentation
- 	  updated for the new functionality, and fixed all warnings due to
- 	  use of deprecated commands and list types. Added a section on
- 	  how to give feedback.
--	
-+
- 	* cvs.man: Fixed all warnings due to use of deprecated commands
- 	* changelog.man: and list types, tweaked the titles, and added
- 	  sections about how to give feedback.
- 
- 	* docidx.man: Significant rewrites for better language, better
-@@ -903,11 +911,11 @@
- 
- 2006-10-03  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	*
- 	* Released and tagged Tcllib 1.9 ========================
--	* 
-+	*
- 
- 2006-10-02  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	* doctools.test: Made the testsuite robust against locale
- 	* doctoc.test:   settings in the environment. The tests
-@@ -914,11 +922,11 @@
- 	* docidx.test:   assume the default locale (LANG=C).
- 
- 2006-09-19  Andreas Kupries  <andreask@activestate.com>
- 
- 	* doctools.man: Bumped version to 1.2.1
--	* doctools.tcl: 
-+	* doctools.tcl:
- 	* pkgIndex.tcl:
- 
- 2006-08-10  Andreas Kupries <andreask@activestate.com>
- 
- 	* mpformats/_text.tcl: Replaced textutil with the exact packages
-@@ -955,11 +963,11 @@
- 
- 2005-10-06  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	*
- 	* Released and tagged Tcllib 1.8 ========================
--	* 
-+	*
- 
- 2005-10-03  Andreas Kupries <andreask@activestate.com>
- 
- 	* checker.tcl:      Added code checking for ambiguities in section
- 	* mpformats/c.msg:  and subsection titles. It causes warnings.
-@@ -983,12 +991,12 @@
- 	* doctools.test: Testsuite package requirements fixed to ensure
- 	* docidx.test:   use of local packages.
- 	* doctoc.test:
- 
- 	* doctools.tcl: Typo police.
--	* docidx.tcl: 
--	* doctoc.tcl: 
-+	* docidx.tcl:
-+	* doctoc.tcl:
- 
- 2005-02-18  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	* mpformats/_nroff.tcl: Fixed problem with comment
- 	  handling. Before the fix we could generate output where nroff
-@@ -1021,11 +1029,11 @@
- 
- 2004-10-05  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	*
- 	* Released and tagged Tcllib 1.7 ========================
--	* 
-+	*
- 
- 2004-09-23  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	* mpformats/_text.tcl: Fixed expr'essions without braces.
- 
-@@ -1063,17 +1071,17 @@
- 	* docidx.test:
- 
- 2004-07-24  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	* docidx_fmt.man: More overhaul.
--	* docidx_api.man: 
--	* doctoc_fmt.man: 
--	* doctoc_api.man: 
--	* doctoc.man: 
--	* doctools_fmt.man: 
--	* doctools_api.man: 
--	* doctools.man: 
-+	* docidx_api.man:
-+	* doctoc_fmt.man:
-+	* doctoc_api.man:
-+	* doctoc.man:
-+	* doctools_fmt.man:
-+	* doctools_api.man:
-+	* doctools.man:
- 	* changelog.man:
- 	* cvs.man:
- 
- 2004-07-23  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
-@@ -1082,30 +1090,30 @@
- 
- 	* ../../apps/dtplite: Revamped the whole file mapping. Actually
- 	  ripped it out. Is not needed, the formatting engine does the
- 	  necessary parts for us, if we feed it the correct -file
- 	  options. This kills the outstanding bug with xref links.
--	
-+
- 	* ../../apps/dtplite: Bugfix. Added checks to prevent duplicate
- 	  entries in the keyword index. Without these checks going through
- 	  a set of packages twice for merging will create double links for
- 	  each actual entry. Changed the representation of the index saved
- 	  between merge invokations to keep the array for the voiding of
- 	  duplicates around.
- 
- 	* docidx.man:    Overhaul of documentation.
--	* cvs.man: 
--	* changelog.man: 
-+	* cvs.man:
-+	* changelog.man:
- 
- 2004-07-22  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	* ../../apps/dtplite: Reduced error output, show only the message,
- 	  not the whole stack.
- 
- 	* doctools.tcl: Changed processing of error messages so that
- 	* doctoc.tcl:   we don't loose the location information.
--	* docidx.tcl: 
-+	* docidx.tcl:
- 
- 2004-07-22  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	* doctools_api.man:       Polished the manpages a bit,
- 	* ../../apps/dtplite.man: for better cross-referencing.
-@@ -1164,15 +1172,15 @@
- 
- 2004-05-23  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	*
- 	* Released and tagged Tcllib 1.6.1 ========================
--	* 
-+	*
- 
- 2004-05-23  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
--	* doctools.tcl: Rel. engineering. Updated version number 
-+	* doctools.tcl: Rel. engineering. Updated version number
- 	* doctools.man: of doctools to reflect its changes, to 1.0.2.
- 	* pkgIndex.tcl:
- 
- 2004-05-14  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
-@@ -1188,14 +1196,14 @@
- 	* mpformats/_nroff.tcl:  the validator subsystem, and all formatting
- 	* mpformats/_text.tcl:   engines which are coming with the package.
- 	* mpformats/fmt.html:    For HTML output subsections are added to
- 	* mpformats/fmt.latex:   the TOC (See [SF Tcllib RFE 772491] below)
- 	* mpformats/fmt.nroff:   as well.
--	* mpformats/fmt.null: 
--	* mpformats/fmt.text: 
--	* mpformats/fmt.tmml: 
--	* mpformats/fmt.wiki: 
-+	* mpformats/fmt.null:
-+	* mpformats/fmt.text:
-+	* mpformats/fmt.tmml:
-+	* mpformats/fmt.wiki:
- 
- 2004-05-14  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	* mpformats/_text.tcl (SECT): Fixed a small problem in the text
- 	  generator which was present for ages. Titles of more than one
-@@ -1230,16 +1238,16 @@
- 	                       'opt_def'.
- 
- 2004-04-22  Joe English  <jenglish@users.sourceforge.net>
- 
- 	* mpformats/fmt.xml: BUGFIX: "puts stderr" ==> "puts_stderr".
--	
-+
- 2004-02-15  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	*
- 	* Released and tagged Tcllib 1.6 ========================
--	* 
-+	*
- 
- 2004-02-09  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	* doctools.test: Fixed problems with Tcl 8.5, the tests were
- 	  dependent on the order of keys in the result of [array get].
-@@ -1269,11 +1277,11 @@
- 
- 2003-05-05  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	*
- 	* Released and tagged Tcllib 1.4 ========================
--	* 
-+	*
- 
- 2003-04-01  Andreas Kupries  <andreask@activestate.com>
- 
- 	* checker_toc.tcl: Bug fixes for handling of nested toc divisions.
- 
-@@ -1285,12 +1293,12 @@
- 	* docidx.tcl: Added the package and file ops initially created in
- 	  doctools.tcl to these packages too, so that their text engines
- 	  can use 'textutil' too.
- 
- 	* mpformats/_text.tcl:
--	* mpformats/fmt.text: 
--	* mpformats/toc.text: 
-+	* mpformats/fmt.text:
-+	* mpformats/toc.text:
- 	* mpformats/idx.text: Bug fixes.
- 
- 2003-03-31  Andreas Kupries  <andreask@activestate.com>
- 
- 	* mpformats/toc.text:
-@@ -1367,11 +1375,11 @@
- 	  cross-references causing unwanted suppression (leakage of
- 	  definitions between multiple pages).
- 
- 	* doctoc.tcl:   Bug fixes in three return statemments.
- 	* docidx.tcl:   (return -code error string, not return -code string)
--	* doctools.tcl: 
-+	* doctools.tcl:
- 
- 2003-03-11  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	* mpformats/fmt.html:  Rewrite handling of [keywords] and
- 	* mpformats/fmt.latex: [see_also] to behave like for the TMML
-@@ -1460,11 +1468,11 @@
- 	* dtocformat.man:            and a number of formatting engines
- 	* dtocengine.man:            plugging into this package to
- 	* mpformats/_toc_common.tcl: generate output in various formats.
- 	* mpformats/toc.html:        This required additional checker code
- 	* mpformats/toc.nroff:       and more messages in the message
--	* mpformats/toc.null:        catalogs. 
-+	* mpformats/toc.null:        catalogs.
- 	* mpformats/toc.tmml:
- 	* mpformats/toc.wiki:
- 	* pkgIndex.tcl:
- 	* mpformats/c.msg:
- 	* mpformats/en.msg:
-@@ -1513,15 +1521,15 @@
- 	* mpformats/fmt.nroff: now also redirects the command to 'emph'.
- 	* mpformats/fmt.wiki:  The option -visualwarn (doctools, and
- 	* mpformats/fmt.null:  mpexpand) renamed to -deprecated. Message
- 	* mpformats/fmt.list:  'visualmarkup' removed from the catalogs,
- 	* mpformats/c.msg:     and 'depr_strong' added instead.
--	* mpformats/en.msg: 
--	* mpformats/de.msg: 
--	* checker.tcl: 
--	* doctools.tcl: 
--	* mpexpand: 
-+	* mpformats/en.msg:
-+	* mpformats/de.msg:
-+	* checker.tcl:
-+	* doctools.tcl:
-+	* mpexpand:
- 
- 	* doctools.man:    Updated, converted [strong] to better
- 	* dtformat.man:    formatting commands. Ditto for all manpages
- 	* dtformatter.man: in tcllib containing 'strong'. 'strong' is now
- 	* mpexpand.man:    not present anymore.
-@@ -1534,17 +1542,17 @@
- 				 being given to the formatter.
- 
- 	* mpformats/fmt.html:  Removed the phrase 'All rights reserved'
- 	* mpformats/fmt.latex: from the code, on recommendation by
- 	* mpformats/fmt.nroff: Joe English.
--	* mpformats/fmt.wiki: 
-+	* mpformats/fmt.wiki:
- 
- 	(In the way to early morrow :)
- 	* mpformats/fmt.html:  Changed to display copyright information in
- 	* mpformats/fmt.latex: the conversion result itself and not only
- 	* mpformats/fmt.nroff: embedded in comments.
--	* mpformats/fmt.wiki: 
-+	* mpformats/fmt.wiki:
- 
- 2003-01-14  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	* doctools.tcl:          Added a new formatting command,
- 	* doctools.test:         'copyright', to declare/assign copyright
-@@ -1557,13 +1565,13 @@
- 	* mpformats/fmt.list:    precedence over information coming from the
- 	* mpformats/fmt.nroff:   processor. Updated all predefined engines
- 	* mpformats/fmt.null:    to handle the new command. TMML done only
- 	* mpformats/fmt.tmml:    partially, as I don't know where the copy-
- 	* mpformats/fmt.wiki:    right has to go.
--	* mpformats/_common.tcl: 
--	* mpformats/_html.tcl:   
--	* mpformats/_nroff.tcl:  
-+	* mpformats/_common.tcl:
-+	* mpformats/_html.tcl:
-+	* mpformats/_nroff.tcl:
- 	* mpexpand:
- 
- 2003-01-13  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	* mpexpand:      Moved format help into the package itself.
-@@ -1621,11 +1629,11 @@
- 	* mpformats/fmt.html: Changed bug #578465 which caused
- 	  mis-generation of angle-brackets and quotes.
- 
- 2002-06-06  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
--	* mpformats/fmt.html: 
-+	* mpformats/fmt.html:
- 	* mpformats/_html.tcl: Added the missing handling of " (&quot;) to
- 	  the format.
- 
- 2002-05-27  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
-@@ -1632,11 +1640,11 @@
- 	* mpformats/_xml.tcl: args -> arguments, as the argument is not
- 	  the last one. The code as is was not erroneous, but a possible
- 	  trouble spot should tcl ever be more strict with 'args'.
- 
- 2002-05-21  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
--	
-+
- 	* mpformats/fmt.nroff: Accepted patch for bug #556509, both by Joe
- 	  English <jenglish@users.sourceforge.net>.
- 
- 2002-05-09  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
-@@ -1662,18 +1670,18 @@
- 	* mpformats/fmt.null:  Added new list types for arguments, options,
- 	  commands, and Tk (widget) options.
- 
- 2002-04-24  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
--	* mpformats/fmt.html: 
-+	* mpformats/fmt.html:
- 	* mpformats/_html.tcl: Changes analogous to TMML (see below) to
- 	  differentiate internal markup and external special characters.
- 
- 2002-04-24  Joe English  <jenglish@users.sourceforge.net>
- 
- 	* mpformats/_xml.tcl
--	* mpformats/fmt.tmml: Correctly handles XML markup characters 
-+	* mpformats/fmt.tmml: Correctly handles XML markup characters
- 	  in macro arguments.  Also correctly escapes apostrophes
- 	  in attribute values (previously-unnoticed bug).
- 	* mpformats/fmt.tmml: TMML uses <url> instead of <uri>, and
- 	  does not have a <strong> element; changed output accordingly.
- 
-@@ -1691,12 +1699,12 @@
- 	  are stripped in the post processor of this format, so
- 	  unconditionally adding them does not hurt.
- 
- 2002-04-02  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
--	* mpformats/en.msg: 
--	* mpformats/c.msg: 
-+	* mpformats/en.msg:
-+	* mpformats/c.msg:
- 	* mpformats/de.msg: Added the messages required by the new code
- 	  below.
- 
- 	* mpexpand: Added code to check that plain text is not used in
- 	  places where it is not allowed.
-@@ -1716,16 +1724,16 @@
- 	  allowing for easy i18n and l10n of mpexpand. Catalogs for the
- 	  locales "c", "en", and "de" are provided.
- 
- 	* mpformats/fmt.html: Changed uri formatting to be a link.
- 
--	* mpformats/fmt.tmml: 
--	* mpformats/fmt.html: 
--	* mpformats/fmt.nroff: 
--	* mpformats/fmt.latex: 
--	* mpformats/fmt.list: 
--	* mpformats/fmt.null: 
-+	* mpformats/fmt.tmml:
-+	* mpformats/fmt.html:
-+	* mpformats/fmt.nroff:
-+	* mpformats/fmt.latex:
-+	* mpformats/fmt.list:
-+	* mpformats/fmt.null:
- 	* mpformats/_api.tcl: Added formatting commands "term" and "const"
- 	  to allow the structural markup of non-specific terminology and
- 	  of constant values.
- 
- 	* mpformats/fmt.nroff (bullet): Bulleting changed, use \(bu as
-@@ -1781,13 +1789,13 @@
- 
- 2002-02-27  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	* mpformats/fmt.null: Null format, does not produce any output.
- 
--	* mpformats/fmt.tmml: 
--	* mpformats/fmt.nroff: 
--	* mpformats/fmt.latex: 
-+	* mpformats/fmt.tmml:
-+	* mpformats/fmt.nroff:
-+	* mpformats/fmt.latex:
- 	* mpformats/fmt.html:
- 	* mpformats/fmt.list: Implementations of the new command.
- 
- 	* mpexpand: Added the commands to the processor application. Added
- 	  option "-visualwarn". When present the processor warn about
-
-Index: modules/doctools/doctools.man
-==================================================================
---- modules/doctools/doctools.man
-+++ modules/doctools/doctools.man
-@@ -1,13 +1,13 @@
- [comment {-*- tcl -*- doctools manpage}]
--[manpage_begin doctools n 1.4.14]
-+[manpage_begin doctools n 1.4.15]
- [copyright {2003-2013 Andreas Kupries <andreas_kupries@users.sourceforge.net>}]
- [moddesc   {Documentation tools}]
- [titledesc {doctools - Processing documents}]
- [category  {Documentation tools}]
- [require Tcl 8.2]
--[require doctools [opt 1.4.14]]
-+[require doctools [opt 1.4.15]]
- [description]
- 
- This package provides a class for the creation of objects able to
- process and convert text written in the [term doctools] markup
- language into any output format X for which a
-
-Index: modules/doctools/doctools.tcl
-==================================================================
---- modules/doctools/doctools.tcl
-+++ modules/doctools/doctools.tcl
-@@ -1335,6 +1335,6 @@
-     #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.4.14
-+package provide doctools 1.4.15
-
-Index: modules/doctools/mpformats/_nroff.tcl
-==================================================================
---- modules/doctools/mpformats/_nroff.tcl
-+++ modules/doctools/mpformats/_nroff.tcl
-@@ -13,11 +13,11 @@
- # 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 ".ta$text"}
-+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}
-@@ -101,16 +101,18 @@
-     # - 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 .nf .CS]	; # commands which start no-fill mode
--    set fiMode   [list .fi .CE]	; # commands which terminate 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.
-@@ -134,20 +136,21 @@
- 		# [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 or periods at the beginning of a line have to
--		# quoted to prevent misinterpretation as comments or directives.
--		# The true comments and directive are quoted with \1
--		# already and will therefore not detected by the code
--		# here.
--
-+		# Apostrophes or periods at the beginning of a line
-+		# have to be quoted to prevent misinterpretation as
-+		# comments or directives.  The true comments and
-+		# directive are quoted with \1 already and will
-+		# therefore not detected by the code here.
-+		#puts_stderr \tQUOTE
- 		set line \1\\$line
- 	    }
- 	} else {
- 	    # No-fill mode. We remove trailing whitespace, but keep
- 	    # leading whitespace and empty lines.
-@@ -164,14 +167,15 @@
-     set lines [join $lines "\n"]
- 
-     # Remove superfluous .IP commands (empty paragraph). The first
-     # identity mapping is there to avoid smashing a man macro
-     # definition.
--    set lines [string map [list \
--	       \n\1.IP\n\1..\n  \n\1.IP\n\1..\n \
--	       \n\1.IP\n\1.     \n\1.] \
--	   $lines]
-+
-+    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 map $finalMap $lines]
- }
- 
-
-Index: modules/doctools/mpformats/fmt.nroff
-==================================================================
---- modules/doctools/mpformats/fmt.nroff
-+++ modules/doctools/mpformats/fmt.nroff
-@@ -267,15 +267,15 @@
- proc fmt_image {text {label {}}} {
-     # text = symbolic name of the image.
- 
-     set img [dt_imgdata $text {pic}]
-     if {$img ne {}} {
--	return \n.PS\n$img\n.PE\n
-+	return \n\1.PS\n$img\n\1.PE\n
-     }
-     set img [dt_imgdata $text {txt}]
-     if {$img ne {}} {
--	return \n.PS\n.nf\n$img\n.fi\n.PE\n
-+	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"
-
-Index: modules/doctools/pkgIndex.tcl
-==================================================================
---- modules/doctools/pkgIndex.tcl
-+++ modules/doctools/pkgIndex.tcl
-@@ -1,6 +1,6 @@
- if {![package vsatisfies [package provide Tcl] 8.2]} {return}
--package ifneeded doctools            1.4.14 [list source [file join $dir doctools.tcl]]
-+package ifneeded doctools            1.4.15 [list source [file join $dir doctools.tcl]]
- package ifneeded doctools::toc       1.1.3  [list source [file join $dir doctoc.tcl]]
- package ifneeded doctools::idx       1.0.4  [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/devel/tcllib/files/patch-bug-3603702 b/devel/tcllib/files/patch-bug-3603702
deleted file mode 100644
index 327644a537bb..000000000000
--- a/devel/tcllib/files/patch-bug-3603702
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: modules/clock/ChangeLog
-==================================================================
---- modules/clock/ChangeLog
-+++ modules/clock/ChangeLog
-@@ -1,5 +1,9 @@
-+2013-02-08  Andreas Kupries  <andreask@activestate.com>
-+
-+	* iso8601.test: [Bug 3603702]: Fixed TZ-dependent test case.
-+
- 2013-02-01  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	*
- 	* Released and tagged Tcllib 1.15 ========================
- 	* 
-
-Index: modules/clock/iso8601.test
-==================================================================
---- modules/clock/iso8601.test
-+++ modules/clock/iso8601.test
-@@ -38,13 +38,12 @@
- test clock-iso8601-2.0 {parse_date, bad input} -body {
-     clock::iso8601 parse_date A
- } -returnCodes error -result {not an iso8601 date string}
- 
- test clock-iso8601-2.1 {parse_date} -body {
--    clock::iso8601 parse_date 1994-11-05
--    # It is unclear if this is influenced by TZ.
--} -result 784022400
-+    clock format [clock::iso8601 parse_date 1994-11-05] -format %D
-+} -result 11/05/1994
- 
- # -------------------------------------------------------------------------
- 
- test clock-iso8601-2.0.0 {parse_date, format: 19700102, reformatted with clock format -format {%D}} -body {
-     clock format [clock::iso8601 parse_date {19700102}] -format {%D}
-
diff --git a/devel/tcllib/files/patch-bug-3608240 b/devel/tcllib/files/patch-bug-3608240
deleted file mode 100644
index 12eef0090b84..000000000000
--- a/devel/tcllib/files/patch-bug-3608240
+++ /dev/null
@@ -1,168 +0,0 @@
-Index: modules/struct/ChangeLog
-==================================================================
---- modules/struct/ChangeLog
-+++ modules/struct/ChangeLog
-@@ -1,5 +1,12 @@
-+2013-03-18  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-+
-+	* queue.testsuite: [Bug 3608240]: Fixed get/peek not taking
-+	* queue_oo.tcl: the amount of already delivered elements
-+	* queue_tcl.tcl: into account. Extended testsuite. Bumped version
-+	  to 1.4.5
-+
- 2013-02-01  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	*
- 	* Released and tagged Tcllib 1.15 ========================
- 	* 
-
-Index: modules/struct/queue.man
-==================================================================
---- modules/struct/queue.man
-+++ modules/struct/queue.man
-@@ -1,12 +1,12 @@
- [comment {-*- tcl -*-}]
--[manpage_begin struct::queue n 1.4.4]
-+[manpage_begin struct::queue n 1.4.5]
- [moddesc   {Tcl Data Structures}]
- [titledesc {Create and manipulate queue objects}]
- [category  {Data structures}]
- [require Tcl 8.4]
--[require struct::queue [opt 1.4.4]]
-+[require struct::queue [opt 1.4.5]]
- [description]
- 
- The [namespace ::struct] namespace contains a commands for processing
- finite queues.
- 
-
-Index: modules/struct/queue.tcl
-==================================================================
---- modules/struct/queue.tcl
-+++ modules/struct/queue.tcl
-@@ -182,6 +182,6 @@
- namespace eval ::struct {
-     # Export the constructor command.
-     namespace export queue
- }
- 
--package provide struct::queue 1.4.4
-+package provide struct::queue 1.4.5
-
-Index: modules/struct/queue.testsuite
-==================================================================
---- modules/struct/queue.testsuite
-+++ modules/struct/queue.testsuite
-@@ -336,7 +336,37 @@
-     myqueue unget foo
-     set res [myqueue peek [myqueue size]]
-     myqueue destroy
-     set res
- } {foo d e f}
-+
-+#----------------------------------------------------------------------
-+
-+test queue-${impl}-sf-3608240-a {} {
-+    struct::queue qp
-+    qp put 1 2 3
-+    set r {}
-+    lappend r [qp peek [qp size]]
-+    lappend r [qp get]
-+    lappend r [qp peek [qp size]]
-+    qp put 4 5
-+    lappend r [qp peek [qp size]]
-+    qp destroy
-+    set r
-+} {{1 2 3} 1 {2 3} {2 3 4 5}}
-+catch { unset r }
-+
-+test queue-${impl}-sf-3608240-b {} {
-+    struct::queue qp
-+    qp put 1 2 3
-+    set r {}
-+    lappend r [qp peek [qp size]]
-+    lappend r [qp get]
-+    lappend r [qp peek [qp size]]
-+    qp put 4 5
-+    lappend r [qp get [qp size]]
-+    qp destroy
-+    set r
-+} {{1 2 3} 1 {2 3} {2 3 4 5}}
-+catch { unset r }
- 
- #----------------------------------------------------------------------
-
-Index: modules/struct/queue_oo.tcl
-==================================================================
---- modules/struct/queue_oo.tcl
-+++ modules/struct/queue_oo.tcl
-@@ -76,13 +76,13 @@
- 	}
- 
- 	# Otherwise, return a list of items
- 
- 	if {$count > ([llength $qret] - $qat)} {
--	    # Need all of qret and parts of qadd, maybe all.
-+	    # Need all of qret (from qat on) and parts of qadd, maybe all.
- 	    set max    [expr {$qat + $count - 1 - [llength $qret]}]
--	    set result [concat $qret [lrange $qadd 0 $max]]
-+	    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}]
-@@ -123,13 +123,13 @@
- 	}
- 
- 	# Otherwise, return a list of items
- 
- 	if {$count > [llength $qret] - $qat} {
--	    # Need all of qret and parts of qadd, maybe all.
-+	    # Need all of qret (from qat on) and parts of qadd, maybe all.
- 	    set over [expr {$qat + $count - 1 - [llength $qret]}]
--	    return [concat $qret [lrange $qadd 0 $over]]
-+	    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}]]
- 	}
-     }
-
-Index: modules/struct/queue_tcl.tcl
-==================================================================
---- modules/struct/queue_tcl.tcl
-+++ modules/struct/queue_tcl.tcl
-@@ -219,13 +219,13 @@
-     }
- 
-     # Otherwise, return a list of items
- 
-     if {$count > ([llength $RET] - $AT)} {
--	# Need all of RET and parts of ADD, maybe all.
-+	# Need all of RET (from AT on) and parts of ADD, maybe all.
- 	set max    [expr {$count - ([llength $RET] - $AT) - 1}]
--	set result [concat $RET [lrange $ADD 0 $max]]
-+	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}]
-@@ -271,13 +271,13 @@
-     }
- 
-     # Otherwise, return a list of items
- 
-     if {$count > [llength $RET] - $AT} {
--	# Need all of RET and parts of ADD, maybe all.
-+	# Need all of RET (from AT on) and parts of ADD, maybe all.
- 	set over [expr {$count - ([llength $RET] - $AT) - 1}]
--	return [concat $RET [lrange $ADD 0 $over]]
-+	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}]]
-     }
- }
-
diff --git a/devel/tcllib/files/patch-installer.tcl b/devel/tcllib/files/patch-installer.tcl
deleted file mode 100644
index 7824e959e470..000000000000
--- a/devel/tcllib/files/patch-installer.tcl
+++ /dev/null
@@ -1,20 +0,0 @@
---- installer.tcl.orig	2013-04-26 17:00:27.000000000 +0200
-+++ installer.tcl	2013-04-26 17:00:45.000000000 +0200
-@@ -218,7 +218,7 @@
- 
- 	if {[file exists $aexe.man]} {
- 	    if {$config(doc,nroff)} {
--		_manfile $aexe.man nroff n $config(doc,nroff,path)
-+		_manfile $aexe.man nroff tcllib.n $config(doc,nroff,path)
- 	    }
- 	    if {$config(doc,html)} {
- 		_manfile $aexe.man html html $config(doc,html,path)
-@@ -247,7 +247,7 @@
- 	xinstall   pkg $config(pkg,path)
- 	gen_main_index $config(pkg,path) $package_name $package_version
- 	if {$config(doc,nroff)} {
--	    xinstall doc nroff n    $config(doc,nroff,path)
-+	    xinstall doc nroff tcllib.n $config(doc,nroff,path)
- 	}
- 	if {$config(doc,html)}  {
- 	    xinstall doc html  html $config(doc,html,path)
diff --git a/devel/tcllib/files/patch-json-write b/devel/tcllib/files/patch-json-write
deleted file mode 100644
index c3d16b8be481..000000000000
--- a/devel/tcllib/files/patch-json-write
+++ /dev/null
@@ -1,562 +0,0 @@
-Index: modules/pt/ChangeLog
-==================================================================
---- modules/pt/ChangeLog.orig
-+++ modules/pt/ChangeLog
-@@ -1,5 +1,20 @@
-+2013-03-04  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
-+
-+	* tests/data/ok/peg_json-indalign/0_basic_arithmetic: Updated to match
-+	* tests/data/ok/peg_json-indalign/2_fun_arithmetic: json::write 1.0.2
-+	* tests/data/ok/peg_json-indalign/3_peg_itself: ("/" not quoted as "\/")
-+	* tests/data/ok/peg_json-indalign/4_choice:
-+	* tests/data/ok/peg_json-indented/0_basic_arithmetic:
-+	* tests/data/ok/peg_json-indented/2_fun_arithmetic:
-+	* tests/data/ok/peg_json-indented/3_peg_itself:
-+	* tests/data/ok/peg_json-indented/4_choice:
-+	* tests/data/ok/peg_json-ultracompact/0_basic_arithmetic:
-+	* tests/data/ok/peg_json-ultracompact/2_fun_arithmetic:
-+	* tests/data/ok/peg_json-ultracompact/3_peg_itself:
-+	* tests/data/ok/peg_json-ultracompact/4_choice:
-+
- 2013-02-01  Andreas Kupries  <andreas_kupries@users.sourceforge.net>
- 
- 	*
- 	* Released and tagged Tcllib 1.15 ========================
- 	* 
-
-Index: modules/pt/tests/data/ok/peg_json-indalign/0_basic_arithmetic
-==================================================================
---- modules/pt/tests/data/ok/peg_json-indalign/0_basic_arithmetic.orig
-+++ modules/pt/tests/data/ok/peg_json-indalign/0_basic_arithmetic
-@@ -1,34 +1,34 @@
- {
-     "pt::grammar::peg" : {
-         "rules" : {
-             "AddOp"      : {
--                "is"   : "\/ {t -} {t +}",
-+                "is"   : "/ {t -} {t +}",
-                 "mode" : "value"
-             },
-             "Digit"      : {
--                "is"   : "\/ {t 0} {t 1} {t 2} {t 3} {t 4} {t 5} {t 6} {t 7} {t 8} {t 9}",
-+                "is"   : "/ {t 0} {t 1} {t 2} {t 3} {t 4} {t 5} {t 6} {t 7} {t 8} {t 9}",
-                 "mode" : "value"
-             },
-             "Expression" : {
--                "is"   : "\/ {x {t (} {n Expression} {t )}} {x {n Factor} {* {x {n MulOp} {n Factor}}}}",
-+                "is"   : "/ {x {t (} {n Expression} {t )}} {x {n Factor} {* {x {n MulOp} {n Factor}}}}",
-                 "mode" : "value"
-             },
-             "Factor"     : {
-                 "is"   : "x {n Term} {* {x {n AddOp} {n Term}}}",
-                 "mode" : "value"
-             },
-             "MulOp"      : {
--                "is"   : "\/ {t *} {t \/}",
-+                "is"   : "/ {t *} {t /}",
-                 "mode" : "value"
-             },
-             "Number"     : {
-                 "is"   : "x {? {n Sign}} {+ {n Digit}}",
-                 "mode" : "value"
-             },
-             "Sign"       : {
--                "is"   : "\/ {t -} {t +}",
-+                "is"   : "/ {t -} {t +}",
-                 "mode" : "value"
-             },
-             "Term"       : {
-                 "is"   : "n Number",
-                 "mode" : "value"
-
-Index: modules/pt/tests/data/ok/peg_json-indalign/2_fun_arithmetic
-==================================================================
---- modules/pt/tests/data/ok/peg_json-indalign/2_fun_arithmetic.orig
-+++ modules/pt/tests/data/ok/peg_json-indalign/2_fun_arithmetic
-@@ -1,18 +1,18 @@
- {
-     "pt::grammar::peg" : {
-         "rules" : {
-             "AddOp"      : {
--                "is"   : "\/ {t -} {t +}",
-+                "is"   : "/ {t -} {t +}",
-                 "mode" : "value"
-             },
-             "Digit"      : {
--                "is"   : "\/ {t 0} {t 1} {t 2} {t 3} {t 4} {t 5} {t 6} {t 7} {t 8} {t 9}",
-+                "is"   : "/ {t 0} {t 1} {t 2} {t 3} {t 4} {t 5} {t 6} {t 7} {t 8} {t 9}",
-                 "mode" : "value"
-             },
-             "Expression" : {
--                "is"   : "\/ {n Function} {\/ {x {t (} {n Expression} {t )}} {x {n Factor} {* {x {n MulOp} {n Factor}}}}}",
-+                "is"   : "/ {n Function} {/ {x {t (} {n Expression} {t )}} {x {n Factor} {* {x {n MulOp} {n Factor}}}}}",
-                 "mode" : "value"
-             },
-             "Factor"     : {
-                 "is"   : "x {n Term} {* {x {n AddOp} {n Term}}}",
-                 "mode" : "value"
-@@ -20,19 +20,19 @@
-             "Function"   : {
-                 "is"   : "n Sinus",
-                 "mode" : "value"
-             },
-             "MulOp"      : {
--                "is"   : "\/ {t *} {t \/}",
-+                "is"   : "/ {t *} {t /}",
-                 "mode" : "value"
-             },
-             "Number"     : {
-                 "is"   : "x {? {n Sign}} {+ {n Digit}}",
-                 "mode" : "value"
-             },
-             "Sign"       : {
--                "is"   : "\/ {t -} {t +}",
-+                "is"   : "/ {t -} {t +}",
-                 "mode" : "value"
-             },
-             "Sinus"      : {
-                 "is"   : "x {t s} {t i} {t n} {t (} {n Expression} {t )}",
-                 "mode" : "value"
-
-Index: modules/pt/tests/data/ok/peg_json-indalign/3_peg_itself
-==================================================================
---- modules/pt/tests/data/ok/peg_json-indalign/3_peg_itself.orig
-+++ modules/pt/tests/data/ok/peg_json-indalign/3_peg_itself
-@@ -20,15 +20,15 @@
-             "ASCII"         : {
-                 "is"   : "x {t <} {t a} {t s} {t c} {t i} {t i} {t >} {n WHITESPACE}",
-                 "mode" : "leaf"
-             },
-             "Attribute"     : {
--                "is"   : "x {\/ {n VOID} {n LEAF}} {n COLON}",
-+                "is"   : "x {/ {n VOID} {n LEAF}} {n COLON}",
-                 "mode" : "value"
-             },
-             "Char"          : {
--                "is"   : "\/ {n CharSpecial} {n CharOctalFull} {n CharOctalPart} {n CharUnicode} {n CharUnescaped}",
-+                "is"   : "/ {n CharSpecial} {n CharOctalFull} {n CharOctalPart} {n CharUnicode} {n CharUnescaped}",
-                 "mode" : "value"
-             },
-             "CharOctalFull" : {
-                 "is"   : "x {t \\\\} {.. 0 2} {.. 0 7} {.. 0 7}",
-                 "mode" : "leaf"
-@@ -36,11 +36,11 @@
-             "CharOctalPart" : {
-                 "is"   : "x {t \\\\} {.. 0 7} {? {.. 0 7}}",
-                 "mode" : "leaf"
-             },
-             "CharSpecial"   : {
--                "is"   : "x {t \\\\} {\/ {t n} {t r} {t t} {t '} {t {\"}} {t {[}} {t \\]} {t \\\\}}",
-+                "is"   : "x {t \\\\} {/ {t n} {t r} {t t} {t '} {t {\"}} {t {[}} {t \\]} {t \\\\}}",
-                 "mode" : "leaf"
-             },
-             "CharUnescaped" : {
-                 "is"   : "x {! {t \\\\}} dot",
-                 "mode" : "leaf"
-@@ -100,11 +100,11 @@
-             "EOF"           : {
-                 "is"   : "! dot",
-                 "mode" : "void"
-             },
-             "EOL"           : {
--                "is"   : "\/ {t {\n}} {t {\r}}",
-+                "is"   : "/ {t {\n}} {t {\r}}",
-                 "mode" : "void"
-             },
-             "Expression"    : {
-                 "is"   : "x {n Sequence} {* {x {n SLASH} {n Sequence}}}",
-                 "mode" : "value"
-@@ -124,11 +124,11 @@
-             "Header"        : {
-                 "is"   : "x {n PEG} {n Identifier} {n StartExpr}",
-                 "mode" : "value"
-             },
-             "Ident"         : {
--                "is"   : "x {\/ {t _} {t :} alpha} {* {\/ {t _} {t :} alnum}}",
-+                "is"   : "x {/ {t _} {t :} alpha} {* {/ {t _} {t :} alnum}}",
-                 "mode" : "leaf"
-             },
-             "Identifier"    : {
-                 "is"   : "x {n Ident} {n WHITESPACE}",
-                 "mode" : "value"
-@@ -140,11 +140,11 @@
-             "LEAF"          : {
-                 "is"   : "x {t l} {t e} {t a} {t f} {n WHITESPACE}",
-                 "mode" : "leaf"
-             },
-             "Literal"       : {
--                "is"   : "\/ {x {n APOSTROPH} {* {x {! {n APOSTROPH}} {n Char}}} {n APOSTROPH} {n WHITESPACE}} {x {n DAPOSTROPH} {* {x {! {n DAPOSTROPH}} {n Char}}} {n DAPOSTROPH} {n WHITESPACE}}",
-+                "is"   : "/ {x {n APOSTROPH} {* {x {! {n APOSTROPH}} {n Char}}} {n APOSTROPH} {n WHITESPACE}} {x {n DAPOSTROPH} {* {x {! {n DAPOSTROPH}} {n Char}}} {n DAPOSTROPH} {n WHITESPACE}}",
-                 "mode" : "value"
-             },
-             "LOWER"         : {
-                 "is"   : "x {t <} {t l} {t o} {t w} {t e} {t r} {t >} {n WHITESPACE}",
-                 "mode" : "leaf"
-@@ -168,15 +168,15 @@
-             "PLUS"          : {
-                 "is"   : "x {t +} {n WHITESPACE}",
-                 "mode" : "leaf"
-             },
-             "Prefix"        : {
--                "is"   : "x {? {\/ {n AND} {n NOT}}} {n Suffix}",
-+                "is"   : "x {? {/ {n AND} {n NOT}}} {n Suffix}",
-                 "mode" : "value"
-             },
-             "Primary"       : {
--                "is"   : "\/ {n ALNUM} {n ALPHA} {n ASCII} {n CONTROL} {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}",
-+                "is"   : "/ {n ALNUM} {n ALPHA} {n ASCII} {n CONTROL} {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}",
-                 "mode" : "value"
-             },
-             "PRINTABLE"     : {
-                 "is"   : "x {t <} {t p} {t r} {t i} {t n} {t t} {t >} {n WHITESPACE}",
-                 "mode" : "leaf"
-@@ -188,11 +188,11 @@
-             "QUESTION"      : {
-                 "is"   : "x {t ?} {n WHITESPACE}",
-                 "mode" : "leaf"
-             },
-             "Range"         : {
--                "is"   : "\/ {x {n Char} {n TO} {n Char}} {n Char}",
-+                "is"   : "/ {x {n Char} {n TO} {n Char}} {n Char}",
-                 "mode" : "value"
-             },
-             "SEMICOLON"     : {
-                 "is"   : "x {t {;}} {n WHITESPACE}",
-                 "mode" : "void"
-@@ -200,11 +200,11 @@
-             "Sequence"      : {
-                 "is"   : "+ {n Prefix}",
-                 "mode" : "value"
-             },
-             "SLASH"         : {
--                "is"   : "x {t \/} {n WHITESPACE}",
-+                "is"   : "x {t /} {n WHITESPACE}",
-                 "mode" : "void"
-             },
-             "SPACE"         : {
-                 "is"   : "x {t <} {t s} {t p} {t a} {t c} {t e} {t >} {n WHITESPACE}",
-                 "mode" : "leaf"
-@@ -216,11 +216,11 @@
-             "StartExpr"     : {
-                 "is"   : "x {n OPEN} {n Expression} {n CLOSE}",
-                 "mode" : "value"
-             },
-             "Suffix"        : {
--                "is"   : "x {n Primary} {? {\/ {n QUESTION} {n STAR} {n PLUS}}}",
-+                "is"   : "x {n Primary} {? {/ {n QUESTION} {n STAR} {n PLUS}}}",
-                 "mode" : "value"
-             },
-             "TO"            : {
-                 "is"   : "t -",
-                 "mode" : "void"
-@@ -232,11 +232,11 @@
-             "VOID"          : {
-                 "is"   : "x {t v} {t o} {t i} {t d} {n WHITESPACE}",
-                 "mode" : "leaf"
-             },
-             "WHITESPACE"    : {
--                "is"   : "* {\/ space {n COMMENT}}",
-+                "is"   : "* {/ space {n COMMENT}}",
-                 "mode" : "void"
-             },
-             "WORDCHAR"      : {
-                 "is"   : "x {t <} {t w} {t o} {t r} {t d} {t c} {t h} {t a} {t r} {t >} {n WHITESPACE}",
-                 "mode" : "leaf"
-
-Index: modules/pt/tests/data/ok/peg_json-indalign/4_choice
-==================================================================
---- modules/pt/tests/data/ok/peg_json-indalign/4_choice.orig
-+++ modules/pt/tests/data/ok/peg_json-indalign/4_choice
-@@ -1,6 +1,6 @@
- {
-     "pt::grammar::peg" : {
-         "rules" : {},
--        "start" : "\/ {t a} {t b} {t c}"
-+        "start" : "/ {t a} {t b} {t c}"
-     }
- }
-
-Index: modules/pt/tests/data/ok/peg_json-indented/0_basic_arithmetic
-==================================================================
---- modules/pt/tests/data/ok/peg_json-indented/0_basic_arithmetic.orig
-+++ modules/pt/tests/data/ok/peg_json-indented/0_basic_arithmetic
-@@ -1,34 +1,34 @@
- {
-     "pt::grammar::peg" : {
-         "rules" : {
-             "AddOp" : {
--                "is" : "\/ {t -} {t +}",
-+                "is" : "/ {t -} {t +}",
-                 "mode" : "value"
-             },
-             "Digit" : {
--                "is" : "\/ {t 0} {t 1} {t 2} {t 3} {t 4} {t 5} {t 6} {t 7} {t 8} {t 9}",
-+                "is" : "/ {t 0} {t 1} {t 2} {t 3} {t 4} {t 5} {t 6} {t 7} {t 8} {t 9}",
-                 "mode" : "value"
-             },
-             "Expression" : {
--                "is" : "\/ {x {t (} {n Expression} {t )}} {x {n Factor} {* {x {n MulOp} {n Factor}}}}",
-+                "is" : "/ {x {t (} {n Expression} {t )}} {x {n Factor} {* {x {n MulOp} {n Factor}}}}",
-                 "mode" : "value"
-             },
-             "Factor" : {
-                 "is" : "x {n Term} {* {x {n AddOp} {n Term}}}",
-                 "mode" : "value"
-             },
-             "MulOp" : {
--                "is" : "\/ {t *} {t \/}",
-+                "is" : "/ {t *} {t /}",
-                 "mode" : "value"
-             },
-             "Number" : {
-                 "is" : "x {? {n Sign}} {+ {n Digit}}",
-                 "mode" : "value"
-             },
-             "Sign" : {
--                "is" : "\/ {t -} {t +}",
-+                "is" : "/ {t -} {t +}",
-                 "mode" : "value"
-             },
-             "Term" : {
-                 "is" : "n Number",
-                 "mode" : "value"
-
-Index: modules/pt/tests/data/ok/peg_json-indented/2_fun_arithmetic
-==================================================================
---- modules/pt/tests/data/ok/peg_json-indented/2_fun_arithmetic.orig
-+++ modules/pt/tests/data/ok/peg_json-indented/2_fun_arithmetic
-@@ -1,18 +1,18 @@
- {
-     "pt::grammar::peg" : {
-         "rules" : {
-             "AddOp" : {
--                "is" : "\/ {t -} {t +}",
-+                "is" : "/ {t -} {t +}",
-                 "mode" : "value"
-             },
-             "Digit" : {
--                "is" : "\/ {t 0} {t 1} {t 2} {t 3} {t 4} {t 5} {t 6} {t 7} {t 8} {t 9}",
-+                "is" : "/ {t 0} {t 1} {t 2} {t 3} {t 4} {t 5} {t 6} {t 7} {t 8} {t 9}",
-                 "mode" : "value"
-             },
-             "Expression" : {
--                "is" : "\/ {n Function} {\/ {x {t (} {n Expression} {t )}} {x {n Factor} {* {x {n MulOp} {n Factor}}}}}",
-+                "is" : "/ {n Function} {/ {x {t (} {n Expression} {t )}} {x {n Factor} {* {x {n MulOp} {n Factor}}}}}",
-                 "mode" : "value"
-             },
-             "Factor" : {
-                 "is" : "x {n Term} {* {x {n AddOp} {n Term}}}",
-                 "mode" : "value"
-@@ -20,19 +20,19 @@
-             "Function" : {
-                 "is" : "n Sinus",
-                 "mode" : "value"
-             },
-             "MulOp" : {
--                "is" : "\/ {t *} {t \/}",
-+                "is" : "/ {t *} {t /}",
-                 "mode" : "value"
-             },
-             "Number" : {
-                 "is" : "x {? {n Sign}} {+ {n Digit}}",
-                 "mode" : "value"
-             },
-             "Sign" : {
--                "is" : "\/ {t -} {t +}",
-+                "is" : "/ {t -} {t +}",
-                 "mode" : "value"
-             },
-             "Sinus" : {
-                 "is" : "x {t s} {t i} {t n} {t (} {n Expression} {t )}",
-                 "mode" : "value"
-
-Index: modules/pt/tests/data/ok/peg_json-indented/3_peg_itself
-==================================================================
---- modules/pt/tests/data/ok/peg_json-indented/3_peg_itself.orig
-+++ modules/pt/tests/data/ok/peg_json-indented/3_peg_itself
-@@ -20,15 +20,15 @@
-             "ASCII" : {
-                 "is" : "x {t <} {t a} {t s} {t c} {t i} {t i} {t >} {n WHITESPACE}",
-                 "mode" : "leaf"
-             },
-             "Attribute" : {
--                "is" : "x {\/ {n VOID} {n LEAF}} {n COLON}",
-+                "is" : "x {/ {n VOID} {n LEAF}} {n COLON}",
-                 "mode" : "value"
-             },
-             "Char" : {
--                "is" : "\/ {n CharSpecial} {n CharOctalFull} {n CharOctalPart} {n CharUnicode} {n CharUnescaped}",
-+                "is" : "/ {n CharSpecial} {n CharOctalFull} {n CharOctalPart} {n CharUnicode} {n CharUnescaped}",
-                 "mode" : "value"
-             },
-             "CharOctalFull" : {
-                 "is" : "x {t \\\\} {.. 0 2} {.. 0 7} {.. 0 7}",
-                 "mode" : "leaf"
-@@ -36,11 +36,11 @@
-             "CharOctalPart" : {
-                 "is" : "x {t \\\\} {.. 0 7} {? {.. 0 7}}",
-                 "mode" : "leaf"
-             },
-             "CharSpecial" : {
--                "is" : "x {t \\\\} {\/ {t n} {t r} {t t} {t '} {t {\"}} {t {[}} {t \\]} {t \\\\}}",
-+                "is" : "x {t \\\\} {/ {t n} {t r} {t t} {t '} {t {\"}} {t {[}} {t \\]} {t \\\\}}",
-                 "mode" : "leaf"
-             },
-             "CharUnescaped" : {
-                 "is" : "x {! {t \\\\}} dot",
-                 "mode" : "leaf"
-@@ -100,11 +100,11 @@
-             "EOF" : {
-                 "is" : "! dot",
-                 "mode" : "void"
-             },
-             "EOL" : {
--                "is" : "\/ {t {\n}} {t {\r}}",
-+                "is" : "/ {t {\n}} {t {\r}}",
-                 "mode" : "void"
-             },
-             "Expression" : {
-                 "is" : "x {n Sequence} {* {x {n SLASH} {n Sequence}}}",
-                 "mode" : "value"
-@@ -124,11 +124,11 @@
-             "Header" : {
-                 "is" : "x {n PEG} {n Identifier} {n StartExpr}",
-                 "mode" : "value"
-             },
-             "Ident" : {
--                "is" : "x {\/ {t _} {t :} alpha} {* {\/ {t _} {t :} alnum}}",
-+                "is" : "x {/ {t _} {t :} alpha} {* {/ {t _} {t :} alnum}}",
-                 "mode" : "leaf"
-             },
-             "Identifier" : {
-                 "is" : "x {n Ident} {n WHITESPACE}",
-                 "mode" : "value"
-@@ -140,11 +140,11 @@
-             "LEAF" : {
-                 "is" : "x {t l} {t e} {t a} {t f} {n WHITESPACE}",
-                 "mode" : "leaf"
-             },
-             "Literal" : {
--                "is" : "\/ {x {n APOSTROPH} {* {x {! {n APOSTROPH}} {n Char}}} {n APOSTROPH} {n WHITESPACE}} {x {n DAPOSTROPH} {* {x {! {n DAPOSTROPH}} {n Char}}} {n DAPOSTROPH} {n WHITESPACE}}",
-+                "is" : "/ {x {n APOSTROPH} {* {x {! {n APOSTROPH}} {n Char}}} {n APOSTROPH} {n WHITESPACE}} {x {n DAPOSTROPH} {* {x {! {n DAPOSTROPH}} {n Char}}} {n DAPOSTROPH} {n WHITESPACE}}",
-                 "mode" : "value"
-             },
-             "LOWER" : {
-                 "is" : "x {t <} {t l} {t o} {t w} {t e} {t r} {t >} {n WHITESPACE}",
-                 "mode" : "leaf"
-@@ -168,15 +168,15 @@
-             "PLUS" : {
-                 "is" : "x {t +} {n WHITESPACE}",
-                 "mode" : "leaf"
-             },
-             "Prefix" : {
--                "is" : "x {? {\/ {n AND} {n NOT}}} {n Suffix}",
-+                "is" : "x {? {/ {n AND} {n NOT}}} {n Suffix}",
-                 "mode" : "value"
-             },
-             "Primary" : {
--                "is" : "\/ {n ALNUM} {n ALPHA} {n ASCII} {n CONTROL} {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}",
-+                "is" : "/ {n ALNUM} {n ALPHA} {n ASCII} {n CONTROL} {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}",
-                 "mode" : "value"
-             },
-             "PRINTABLE" : {
-                 "is" : "x {t <} {t p} {t r} {t i} {t n} {t t} {t >} {n WHITESPACE}",
-                 "mode" : "leaf"
-@@ -188,11 +188,11 @@
-             "QUESTION" : {
-                 "is" : "x {t ?} {n WHITESPACE}",
-                 "mode" : "leaf"
-             },
-             "Range" : {
--                "is" : "\/ {x {n Char} {n TO} {n Char}} {n Char}",
-+                "is" : "/ {x {n Char} {n TO} {n Char}} {n Char}",
-                 "mode" : "value"
-             },
-             "SEMICOLON" : {
-                 "is" : "x {t {;}} {n WHITESPACE}",
-                 "mode" : "void"
-@@ -200,11 +200,11 @@
-             "Sequence" : {
-                 "is" : "+ {n Prefix}",
-                 "mode" : "value"
-             },
-             "SLASH" : {
--                "is" : "x {t \/} {n WHITESPACE}",
-+                "is" : "x {t /} {n WHITESPACE}",
-                 "mode" : "void"
-             },
-             "SPACE" : {
-                 "is" : "x {t <} {t s} {t p} {t a} {t c} {t e} {t >} {n WHITESPACE}",
-                 "mode" : "leaf"
-@@ -216,11 +216,11 @@
-             "StartExpr" : {
-                 "is" : "x {n OPEN} {n Expression} {n CLOSE}",
-                 "mode" : "value"
-             },
-             "Suffix" : {
--                "is" : "x {n Primary} {? {\/ {n QUESTION} {n STAR} {n PLUS}}}",
-+                "is" : "x {n Primary} {? {/ {n QUESTION} {n STAR} {n PLUS}}}",
-                 "mode" : "value"
-             },
-             "TO" : {
-                 "is" : "t -",
-                 "mode" : "void"
-@@ -232,11 +232,11 @@
-             "VOID" : {
-                 "is" : "x {t v} {t o} {t i} {t d} {n WHITESPACE}",
-                 "mode" : "leaf"
-             },
-             "WHITESPACE" : {
--                "is" : "* {\/ space {n COMMENT}}",
-+                "is" : "* {/ space {n COMMENT}}",
-                 "mode" : "void"
-             },
-             "WORDCHAR" : {
-                 "is" : "x {t <} {t w} {t o} {t r} {t d} {t c} {t h} {t a} {t r} {t >} {n WHITESPACE}",
-                 "mode" : "leaf"
-
-Index: modules/pt/tests/data/ok/peg_json-indented/4_choice
-==================================================================
---- modules/pt/tests/data/ok/peg_json-indented/4_choice.orig
-+++ modules/pt/tests/data/ok/peg_json-indented/4_choice
-@@ -1,6 +1,6 @@
- {
-     "pt::grammar::peg" : {
-         "rules" : {},
--        "start" : "\/ {t a} {t b} {t c}"
-+        "start" : "/ {t a} {t b} {t c}"
-     }
- }
-
-Index: modules/pt/tests/data/ok/peg_json-ultracompact/0_basic_arithmetic
-==================================================================
---- modules/pt/tests/data/ok/peg_json-ultracompact/0_basic_arithmetic.orig
-+++ modules/pt/tests/data/ok/peg_json-ultracompact/0_basic_arithmetic
-@@ -1,1 +1,1 @@
--{"pt::grammar::peg":{"rules":{"AddOp":{"is":"\/ {t -} {t +}","mode":"value"},"Digit":{"is":"\/ {t 0} {t 1} {t 2} {t 3} {t 4} {t 5} {t 6} {t 7} {t 8} {t 9}","mode":"value"},"Expression":{"is":"\/ {x {t (} {n Expression} {t )}} {x {n Factor} {* {x {n MulOp} {n Factor}}}}","mode":"value"},"Factor":{"is":"x {n Term} {* {x {n AddOp} {n Term}}}","mode":"value"},"MulOp":{"is":"\/ {t *} {t \/}","mode":"value"},"Number":{"is":"x {? {n Sign}} {+ {n Digit}}","mode":"value"},"Sign":{"is":"\/ {t -} {t +}","mode":"value"},"Term":{"is":"n Number","mode":"value"}},"start":"n Expression"}}
-+{"pt::grammar::peg":{"rules":{"AddOp":{"is":"/ {t -} {t +}","mode":"value"},"Digit":{"is":"/ {t 0} {t 1} {t 2} {t 3} {t 4} {t 5} {t 6} {t 7} {t 8} {t 9}","mode":"value"},"Expression":{"is":"/ {x {t (} {n Expression} {t )}} {x {n Factor} {* {x {n MulOp} {n Factor}}}}","mode":"value"},"Factor":{"is":"x {n Term} {* {x {n AddOp} {n Term}}}","mode":"value"},"MulOp":{"is":"/ {t *} {t /}","mode":"value"},"Number":{"is":"x {? {n Sign}} {+ {n Digit}}","mode":"value"},"Sign":{"is":"/ {t -} {t +}","mode":"value"},"Term":{"is":"n Number","mode":"value"}},"start":"n Expression"}}
-
-Index: modules/pt/tests/data/ok/peg_json-ultracompact/2_fun_arithmetic
-==================================================================
---- modules/pt/tests/data/ok/peg_json-ultracompact/2_fun_arithmetic.orig
-+++ modules/pt/tests/data/ok/peg_json-ultracompact/2_fun_arithmetic
-@@ -1,1 +1,1 @@
--{"pt::grammar::peg":{"rules":{"AddOp":{"is":"\/ {t -} {t +}","mode":"value"},"Digit":{"is":"\/ {t 0} {t 1} {t 2} {t 3} {t 4} {t 5} {t 6} {t 7} {t 8} {t 9}","mode":"value"},"Expression":{"is":"\/ {n Function} {\/ {x {t (} {n Expression} {t )}} {x {n Factor} {* {x {n MulOp} {n Factor}}}}}","mode":"value"},"Factor":{"is":"x {n Term} {* {x {n AddOp} {n Term}}}","mode":"value"},"Function":{"is":"n Sinus","mode":"value"},"MulOp":{"is":"\/ {t *} {t \/}","mode":"value"},"Number":{"is":"x {? {n Sign}} {+ {n Digit}}","mode":"value"},"Sign":{"is":"\/ {t -} {t +}","mode":"value"},"Sinus":{"is":"x {t s} {t i} {t n} {t (} {n Expression} {t )}","mode":"value"},"Term":{"is":"n Number","mode":"value"}},"start":"n Expression"}}
-+{"pt::grammar::peg":{"rules":{"AddOp":{"is":"/ {t -} {t +}","mode":"value"},"Digit":{"is":"/ {t 0} {t 1} {t 2} {t 3} {t 4} {t 5} {t 6} {t 7} {t 8} {t 9}","mode":"value"},"Expression":{"is":"/ {n Function} {/ {x {t (} {n Expression} {t )}} {x {n Factor} {* {x {n MulOp} {n Factor}}}}}","mode":"value"},"Factor":{"is":"x {n Term} {* {x {n AddOp} {n Term}}}","mode":"value"},"Function":{"is":"n Sinus","mode":"value"},"MulOp":{"is":"/ {t *} {t /}","mode":"value"},"Number":{"is":"x {? {n Sign}} {+ {n Digit}}","mode":"value"},"Sign":{"is":"/ {t -} {t +}","mode":"value"},"Sinus":{"is":"x {t s} {t i} {t n} {t (} {n Expression} {t )}","mode":"value"},"Term":{"is":"n Number","mode":"value"}},"start":"n Expression"}}
-
-Index: modules/pt/tests/data/ok/peg_json-ultracompact/3_peg_itself
-==================================================================
---- modules/pt/tests/data/ok/peg_json-ultracompact/3_peg_itself.orig
-+++ modules/pt/tests/data/ok/peg_json-ultracompact/3_peg_itself
-@@ -1,1 +1,1 @@
--{"pt::grammar::peg":{"rules":{"ALNUM":{"is":"x {t <} {t a} {t l} {t n} {t u} {t m} {t >} {n WHITESPACE}","mode":"leaf"},"ALPHA":{"is":"x {t <} {t a} {t l} {t p} {t h} {t a} {t >} {n WHITESPACE}","mode":"leaf"},"AND":{"is":"x {t &} {n WHITESPACE}","mode":"leaf"},"APOSTROPH":{"is":"t '","mode":"void"},"ASCII":{"is":"x {t <} {t a} {t s} {t c} {t i} {t i} {t >} {n WHITESPACE}","mode":"leaf"},"Attribute":{"is":"x {\/ {n VOID} {n LEAF}} {n COLON}","mode":"value"},"Char":{"is":"\/ {n CharSpecial} {n CharOctalFull} {n CharOctalPart} {n CharUnicode} {n CharUnescaped}","mode":"value"},"CharOctalFull":{"is":"x {t \\\\} {.. 0 2} {.. 0 7} {.. 0 7}","mode":"leaf"},"CharOctalPart":{"is":"x {t \\\\} {.. 0 7} {? {.. 0 7}}","mode":"leaf"},"CharSpecial":{"is":"x {t \\\\} {\/ {t n} {t r} {t t} {t '} {t {\"}} {t {[}} {t \\]} {t \\\\}}","mode":"leaf"},"CharUnescaped":{"is":"x {! {t \\\\}} dot","mode":"leaf"},"CharUnicode":{"is":"x {t \\\\} {t u} xdigit {? {x xdigit {? {x xdigit {? xdigit}}}}}","mode":"leaf"},"Class":{"is":"x {n OPENB} {* {x {! {n CLOSEB}} {n Range}}} {n CLOSEB} {n WHITESPACE}","mode":"value"},"CLOSE":{"is":"x {t )} {n WHITESPACE}","mode":"void"},"CLOSEB":{"is":"t \\]","mode":"void"},"COLON":{"is":"x {t :} {n WHITESPACE}","mode":"void"},"COMMENT":{"is":"x {t #} {* {x {! {n EOL}} dot}} {n EOL}","mode":"void"},"CONTROL":{"is":"x {t <} {t c} {t o} {t n} {t t} {t r} {t o} {t l} {t >} {n WHITESPACE}","mode":"leaf"},"DAPOSTROPH":{"is":"t {\"}","mode":"void"},"DDIGIT":{"is":"x {t <} {t d} {t d} {t i} {t g} {t i} {t t} {t >} {n WHITESPACE}","mode":"leaf"},"Definition":{"is":"x {? {n Attribute}} {n Identifier} {n IS} {n Expression} {n SEMICOLON}","mode":"value"},"DIGIT":{"is":"x {t <} {t d} {t i} {t g} {t i} {t t} {t >} {n WHITESPACE}","mode":"leaf"},"DOT":{"is":"x {t .} {n WHITESPACE}","mode":"leaf"},"END":{"is":"x {t E} {t N} {t D} {n WHITESPACE}","mode":"void"},"EOF":{"is":"! dot","mode":"void"},"EOL":{"is":"\/ {t {\n}} {t {\r}}","mode":"void"},"Expression":{"is":"x {n Sequence} {* {x {n SLASH} {n Sequence}}}","mode":"value"},"Final":{"is":"x {n END} {n SEMICOLON} {n WHITESPACE}","mode":"void"},"Grammar":{"is":"x {n WHITESPACE} {n Header} {* {n Definition}} {n Final} {n EOF}","mode":"value"},"GRAPH":{"is":"x {t <} {t g} {t r} {t a} {t p} {t h} {t >} {n WHITESPACE}","mode":"leaf"},"Header":{"is":"x {n PEG} {n Identifier} {n StartExpr}","mode":"value"},"Ident":{"is":"x {\/ {t _} {t :} alpha} {* {\/ {t _} {t :} alnum}}","mode":"leaf"},"Identifier":{"is":"x {n Ident} {n WHITESPACE}","mode":"value"},"IS":{"is":"x {t <} {t -} {n WHITESPACE}","mode":"void"},"LEAF":{"is":"x {t l} {t e} {t a} {t f} {n WHITESPACE}","mode":"leaf"},"Literal":{"is":"\/ {x {n APOSTROPH} {* {x {! {n APOSTROPH}} {n Char}}} {n APOSTROPH} {n WHITESPACE}} {x {n DAPOSTROPH} {* {x {! {n DAPOSTROPH}} {n Char}}} {n DAPOSTROPH} {n WHITESPACE}}","mode":"value"},"LOWER":{"is":"x {t <} {t l} {t o} {t w} {t e} {t r} {t >} {n WHITESPACE}","mode":"leaf"},"NOT":{"is":"x {t !} {n WHITESPACE}","mode":"leaf"},"OPEN":{"is":"x {t (} {n WHITESPACE}","mode":"void"},"OPENB":{"is":"t {[}","mode":"void"},"PEG":{"is":"x {t P} {t E} {t G} {n WHITESPACE}","mode":"void"},"PLUS":{"is":"x {t +} {n WHITESPACE}","mode":"leaf"},"Prefix":{"is":"x {? {\/ {n AND} {n NOT}}} {n Suffix}","mode":"value"},"Primary":{"is":"\/ {n ALNUM} {n ALPHA} {n ASCII} {n CONTROL} {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}","mode":"value"},"PRINTABLE":{"is":"x {t <} {t p} {t r} {t i} {t n} {t t} {t >} {n WHITESPACE}","mode":"leaf"},"PUNCT":{"is":"x {t <} {t p} {t u} {t n} {t c} {t t} {t >} {n WHITESPACE}","mode":"leaf"},"QUESTION":{"is":"x {t ?} {n WHITESPACE}","mode":"leaf"},"Range":{"is":"\/ {x {n Char} {n TO} {n Char}} {n Char}","mode":"value"},"SEMICOLON":{"is":"x {t {;}} {n WHITESPACE}","mode":"void"},"Sequence":{"is":"+ {n Prefix}","mode":"value"},"SLASH":{"is":"x {t \/} {n WHITESPACE}","mode":"void"},"SPACE":{"is":"x {t <} {t s} {t p} {t a} {t c} {t e} {t >} {n WHITESPACE}","mode":"leaf"},"STAR":{"is":"x {t *} {n WHITESPACE}","mode":"leaf"},"StartExpr":{"is":"x {n OPEN} {n Expression} {n CLOSE}","mode":"value"},"Suffix":{"is":"x {n Primary} {? {\/ {n QUESTION} {n STAR} {n PLUS}}}","mode":"value"},"TO":{"is":"t -","mode":"void"},"UPPER":{"is":"x {t <} {t u} {t p} {t p} {t e} {t r} {t >} {n WHITESPACE}","mode":"leaf"},"VOID":{"is":"x {t v} {t o} {t i} {t d} {n WHITESPACE}","mode":"leaf"},"WHITESPACE":{"is":"* {\/ space {n COMMENT}}","mode":"void"},"WORDCHAR":{"is":"x {t <} {t w} {t o} {t r} {t d} {t c} {t h} {t a} {t r} {t >} {n WHITESPACE}","mode":"leaf"},"XDIGIT":{"is":"x {t <} {t x} {t d} {t i} {t g} {t i} {t t} {t >} {n WHITESPACE}","mode":"leaf"}},"start":"n Grammar"}}
-+{"pt::grammar::peg":{"rules":{"ALNUM":{"is":"x {t <} {t a} {t l} {t n} {t u} {t m} {t >} {n WHITESPACE}","mode":"leaf"},"ALPHA":{"is":"x {t <} {t a} {t l} {t p} {t h} {t a} {t >} {n WHITESPACE}","mode":"leaf"},"AND":{"is":"x {t &} {n WHITESPACE}","mode":"leaf"},"APOSTROPH":{"is":"t '","mode":"void"},"ASCII":{"is":"x {t <} {t a} {t s} {t c} {t i} {t i} {t >} {n WHITESPACE}","mode":"leaf"},"Attribute":{"is":"x {/ {n VOID} {n LEAF}} {n COLON}","mode":"value"},"Char":{"is":"/ {n CharSpecial} {n CharOctalFull} {n CharOctalPart} {n CharUnicode} {n CharUnescaped}","mode":"value"},"CharOctalFull":{"is":"x {t \\\\} {.. 0 2} {.. 0 7} {.. 0 7}","mode":"leaf"},"CharOctalPart":{"is":"x {t \\\\} {.. 0 7} {? {.. 0 7}}","mode":"leaf"},"CharSpecial":{"is":"x {t \\\\} {/ {t n} {t r} {t t} {t '} {t {\"}} {t {[}} {t \\]} {t \\\\}}","mode":"leaf"},"CharUnescaped":{"is":"x {! {t \\\\}} dot","mode":"leaf"},"CharUnicode":{"is":"x {t \\\\} {t u} xdigit {? {x xdigit {? {x xdigit {? xdigit}}}}}","mode":"leaf"},"Class":{"is":"x {n OPENB} {* {x {! {n CLOSEB}} {n Range}}} {n CLOSEB} {n WHITESPACE}","mode":"value"},"CLOSE":{"is":"x {t )} {n WHITESPACE}","mode":"void"},"CLOSEB":{"is":"t \\]","mode":"void"},"COLON":{"is":"x {t :} {n WHITESPACE}","mode":"void"},"COMMENT":{"is":"x {t #} {* {x {! {n EOL}} dot}} {n EOL}","mode":"void"},"CONTROL":{"is":"x {t <} {t c} {t o} {t n} {t t} {t r} {t o} {t l} {t >} {n WHITESPACE}","mode":"leaf"},"DAPOSTROPH":{"is":"t {\"}","mode":"void"},"DDIGIT":{"is":"x {t <} {t d} {t d} {t i} {t g} {t i} {t t} {t >} {n WHITESPACE}","mode":"leaf"},"Definition":{"is":"x {? {n Attribute}} {n Identifier} {n IS} {n Expression} {n SEMICOLON}","mode":"value"},"DIGIT":{"is":"x {t <} {t d} {t i} {t g} {t i} {t t} {t >} {n WHITESPACE}","mode":"leaf"},"DOT":{"is":"x {t .} {n WHITESPACE}","mode":"leaf"},"END":{"is":"x {t E} {t N} {t D} {n WHITESPACE}","mode":"void"},"EOF":{"is":"! dot","mode":"void"},"EOL":{"is":"/ {t {\n}} {t {\r}}","mode":"void"},"Expression":{"is":"x {n Sequence} {* {x {n SLASH} {n Sequence}}}","mode":"value"},"Final":{"is":"x {n END} {n SEMICOLON} {n WHITESPACE}","mode":"void"},"Grammar":{"is":"x {n WHITESPACE} {n Header} {* {n Definition}} {n Final} {n EOF}","mode":"value"},"GRAPH":{"is":"x {t <} {t g} {t r} {t a} {t p} {t h} {t >} {n WHITESPACE}","mode":"leaf"},"Header":{"is":"x {n PEG} {n Identifier} {n StartExpr}","mode":"value"},"Ident":{"is":"x {/ {t _} {t :} alpha} {* {/ {t _} {t :} alnum}}","mode":"leaf"},"Identifier":{"is":"x {n Ident} {n WHITESPACE}","mode":"value"},"IS":{"is":"x {t <} {t -} {n WHITESPACE}","mode":"void"},"LEAF":{"is":"x {t l} {t e} {t a} {t f} {n WHITESPACE}","mode":"leaf"},"Literal":{"is":"/ {x {n APOSTROPH} {* {x {! {n APOSTROPH}} {n Char}}} {n APOSTROPH} {n WHITESPACE}} {x {n DAPOSTROPH} {* {x {! {n DAPOSTROPH}} {n Char}}} {n DAPOSTROPH} {n WHITESPACE}}","mode":"value"},"LOWER":{"is":"x {t <} {t l} {t o} {t w} {t e} {t r} {t >} {n WHITESPACE}","mode":"leaf"},"NOT":{"is":"x {t !} {n WHITESPACE}","mode":"leaf"},"OPEN":{"is":"x {t (} {n WHITESPACE}","mode":"void"},"OPENB":{"is":"t {[}","mode":"void"},"PEG":{"is":"x {t P} {t E} {t G} {n WHITESPACE}","mode":"void"},"PLUS":{"is":"x {t +} {n WHITESPACE}","mode":"leaf"},"Prefix":{"is":"x {? {/ {n AND} {n NOT}}} {n Suffix}","mode":"value"},"Primary":{"is":"/ {n ALNUM} {n ALPHA} {n ASCII} {n CONTROL} {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}","mode":"value"},"PRINTABLE":{"is":"x {t <} {t p} {t r} {t i} {t n} {t t} {t >} {n WHITESPACE}","mode":"leaf"},"PUNCT":{"is":"x {t <} {t p} {t u} {t n} {t c} {t t} {t >} {n WHITESPACE}","mode":"leaf"},"QUESTION":{"is":"x {t ?} {n WHITESPACE}","mode":"leaf"},"Range":{"is":"/ {x {n Char} {n TO} {n Char}} {n Char}","mode":"value"},"SEMICOLON":{"is":"x {t {;}} {n WHITESPACE}","mode":"void"},"Sequence":{"is":"+ {n Prefix}","mode":"value"},"SLASH":{"is":"x {t /} {n WHITESPACE}","mode":"void"},"SPACE":{"is":"x {t <} {t s} {t p} {t a} {t c} {t e} {t >} {n WHITESPACE}","mode":"leaf"},"STAR":{"is":"x {t *} {n WHITESPACE}","mode":"leaf"},"StartExpr":{"is":"x {n OPEN} {n Expression} {n CLOSE}","mode":"value"},"Suffix":{"is":"x {n Primary} {? {/ {n QUESTION} {n STAR} {n PLUS}}}","mode":"value"},"TO":{"is":"t -","mode":"void"},"UPPER":{"is":"x {t <} {t u} {t p} {t p} {t e} {t r} {t >} {n WHITESPACE}","mode":"leaf"},"VOID":{"is":"x {t v} {t o} {t i} {t d} {n WHITESPACE}","mode":"leaf"},"WHITESPACE":{"is":"* {/ space {n COMMENT}}","mode":"void"},"WORDCHAR":{"is":"x {t <} {t w} {t o} {t r} {t d} {t c} {t h} {t a} {t r} {t >} {n WHITESPACE}","mode":"leaf"},"XDIGIT":{"is":"x {t <} {t x} {t d} {t i} {t g} {t i} {t t} {t >} {n WHITESPACE}","mode":"leaf"}},"start":"n Grammar"}}
-
-Index: modules/pt/tests/data/ok/peg_json-ultracompact/4_choice
-==================================================================
---- modules/pt/tests/data/ok/peg_json-ultracompact/4_choice.orig
-+++ modules/pt/tests/data/ok/peg_json-ultracompact/4_choice
-@@ -1,1 +1,1 @@
--{"pt::grammar::peg":{"rules":{},"start":"\/ {t a} {t b} {t c}"}}
-+{"pt::grammar::peg":{"rules":{},"start":"/ {t a} {t b} {t c}"}}
-
diff --git a/devel/tcllib/pkg-plist b/devel/tcllib/pkg-plist
index 32da64103adb..dc560b519a11 100644
--- a/devel/tcllib/pkg-plist
+++ b/devel/tcllib/pkg-plist
@@ -3,6 +3,7 @@ bin/nns
 bin/nnsd
 bin/nnslog
 bin/page
+bin/pt
 bin/tcldocstrip
 lib/tcllib/aes/aes.tcl
 lib/tcllib/aes/pkgIndex.tcl
@@ -66,6 +67,11 @@ lib/tcllib/crc/pkgIndex.tcl
 lib/tcllib/crc/sum.tcl
 lib/tcllib/csv/csv.tcl
 lib/tcllib/csv/pkgIndex.tcl
+lib/tcllib/debug/caller.tcl
+lib/tcllib/debug/debug.tcl
+lib/tcllib/debug/heartbeat.tcl
+lib/tcllib/debug/pkgIndex.tcl
+lib/tcllib/debug/timestamp.tcl
 lib/tcllib/des/des.tcl
 lib/tcllib/des/pkgIndex.tcl
 lib/tcllib/des/tcldes.tcl
@@ -170,6 +176,8 @@ lib/tcllib/doctools2toc/msgcat_fr.tcl
 lib/tcllib/doctools2toc/parse.tcl
 lib/tcllib/doctools2toc/pkgIndex.tcl
 lib/tcllib/doctools2toc/structure.tcl
+lib/tcllib/dtplite/dtplite.tcl
+lib/tcllib/dtplite/pkgIndex.tcl
 lib/tcllib/fileutil/decode.tcl
 lib/tcllib/fileutil/fileutil.tcl
 lib/tcllib/fileutil/multi.tcl
@@ -235,8 +243,11 @@ lib/tcllib/javascript/pkgIndex.tcl
 lib/tcllib/jpeg/jpeg.tcl
 lib/tcllib/jpeg/pkgIndex.tcl
 lib/tcllib/json/json.tcl
+lib/tcllib/json/json_tcl.tcl
 lib/tcllib/json/json_write.tcl
+lib/tcllib/json/jsonc.tcl
 lib/tcllib/json/pkgIndex.tcl
+lib/tcllib/json/test_support.tcl
 lib/tcllib/lambda/lambda.tcl
 lib/tcllib/lambda/pkgIndex.tcl
 lib/tcllib/ldap/ldap.tcl
@@ -287,6 +298,7 @@ lib/tcllib/math/qcomplex.tcl
 lib/tcllib/math/rational_funcs.tcl
 lib/tcllib/math/romannumerals.tcl
 lib/tcllib/math/special.tcl
+lib/tcllib/math/stat_kernel.tcl
 lib/tcllib/math/statistics.tcl
 lib/tcllib/math/symdiff.tcl
 lib/tcllib/math/tclIndex
@@ -440,6 +452,7 @@ lib/tcllib/sasl/gtoken.tcl
 lib/tcllib/sasl/ntlm.tcl
 lib/tcllib/sasl/pkgIndex.tcl
 lib/tcllib/sasl/sasl.tcl
+lib/tcllib/sasl/scram.tcl
 lib/tcllib/sha1/pkgIndex.tcl
 lib/tcllib/sha1/sha1.tcl
 lib/tcllib/sha1/sha1c.tcl
@@ -467,6 +480,9 @@ lib/tcllib/stooop/pkgIndex.tcl
 lib/tcllib/stooop/stooop.tcl
 lib/tcllib/stooop/switched.tcl
 lib/tcllib/stooop/xifo.tcl
+lib/tcllib/string/pkgIndex.tcl
+lib/tcllib/string/token.tcl
+lib/tcllib/string/token_shell.tcl
 lib/tcllib/stringprep/pkgIndex.tcl
 lib/tcllib/stringprep/stringprep.tcl
 lib/tcllib/stringprep/stringprep_data.tcl
@@ -505,8 +521,10 @@ lib/tcllib/struct/tree_c.tcl
 lib/tcllib/struct/tree_tcl.tcl
 lib/tcllib/tar/pkgIndex.tcl
 lib/tcllib/tar/tar.tcl
+lib/tcllib/tar/test-support.tcl
 lib/tcllib/tepam/pkgIndex.tcl
 lib/tcllib/tepam/tepam.tcl
+lib/tcllib/tepam/tepam_doc_gen.tcl
 lib/tcllib/term/ansi/code.tcl
 lib/tcllib/term/ansi/code/attr.tcl
 lib/tcllib/term/ansi/code/ctrl.tcl
@@ -613,6 +631,8 @@ lib/tcllib/virtchannel_transform/pkgIndex.tcl
 lib/tcllib/virtchannel_transform/rot.tcl
 lib/tcllib/virtchannel_transform/spacer.tcl
 lib/tcllib/virtchannel_transform/zlib.tcl
+lib/tcllib/websocket/pkgIndex.tcl
+lib/tcllib/websocket/websocket.tcl
 lib/tcllib/wip/pkgIndex.tcl
 lib/tcllib/wip/wip.tcl
 lib/tcllib/wip/wip2.tcl
@@ -643,12 +663,23 @@ lib/tcllib/zip/pkgIndex.tcl
 %%MAN%%man/mann/base32hex.tcllib.n.gz
 %%MAN%%man/mann/base64.tcllib.n.gz
 %%MAN%%man/mann/bee.tcllib.n.gz
+%%MAN%%man/mann/bench.tcllib.n.gz
+%%MAN%%man/mann/bench_intro.tcllib.n.gz
+%%MAN%%man/mann/bench_lang_intro.tcllib.n.gz
+%%MAN%%man/mann/bench_lang_spec.tcllib.n.gz
+%%MAN%%man/mann/bench_read.tcllib.n.gz
+%%MAN%%man/mann/bench_wcsv.tcllib.n.gz
+%%MAN%%man/mann/bench_wtext.tcllib.n.gz
 %%MAN%%man/mann/bibtex.tcllib.n.gz
 %%MAN%%man/mann/bigfloat.tcllib.n.gz
 %%MAN%%man/mann/bignum.tcllib.n.gz
 %%MAN%%man/mann/blowfish.tcllib.n.gz
 %%MAN%%man/mann/calculus.tcllib.n.gz
 %%MAN%%man/mann/cat.tcllib.n.gz
+%%MAN%%man/mann/cc_amex.tcllib.n.gz
+%%MAN%%man/mann/cc_discover.tcllib.n.gz
+%%MAN%%man/mann/cc_mastercard.tcllib.n.gz
+%%MAN%%man/mann/cc_visa.tcllib.n.gz
 %%MAN%%man/mann/cfront.tcllib.n.gz
 %%MAN%%man/mann/cgen.tcllib.n.gz
 %%MAN%%man/mann/changelog.tcllib.n.gz
@@ -659,10 +690,11 @@ lib/tcllib/zip/pkgIndex.tcl
 %%MAN%%man/mann/comm_wire.tcllib.n.gz
 %%MAN%%man/mann/connect.tcllib.n.gz
 %%MAN%%man/mann/constants.tcllib.n.gz
-%%MAN%%man/mann/container.tcllib.n.gz
 %%MAN%%man/mann/control.tcllib.n.gz
 %%MAN%%man/mann/copyops.tcllib.n.gz
 %%MAN%%man/mann/core.tcllib.n.gz
+%%MAN%%man/mann/coro_auto.tcllib.n.gz
+%%MAN%%man/mann/coroutine.tcllib.n.gz
 %%MAN%%man/mann/counter.tcllib.n.gz
 %%MAN%%man/mann/crc16.tcllib.n.gz
 %%MAN%%man/mann/crc32.tcllib.n.gz
@@ -670,7 +702,12 @@ lib/tcllib/zip/pkgIndex.tcl
 %%MAN%%man/mann/cvs.tcllib.n.gz
 %%MAN%%man/mann/dacceptor.tcllib.n.gz
 %%MAN%%man/mann/ddest.tcllib.n.gz
+%%MAN%%man/mann/debug.tcllib.n.gz
+%%MAN%%man/mann/debug_caller.tcllib.n.gz
+%%MAN%%man/mann/debug_heartbeat.tcllib.n.gz
+%%MAN%%man/mann/debug_timestamp.tcllib.n.gz
 %%MAN%%man/mann/decimal.tcllib.n.gz
+%%MAN%%man/mann/decode.tcllib.n.gz
 %%MAN%%man/mann/deleg_method.tcllib.n.gz
 %%MAN%%man/mann/deleg_proc.tcllib.n.gz
 %%MAN%%man/mann/des.tcllib.n.gz
@@ -702,16 +739,12 @@ lib/tcllib/zip/pkgIndex.tcl
 %%MAN%%man/mann/doctools_plugin_apiref.tcllib.n.gz
 %%MAN%%man/mann/dsource.tcllib.n.gz
 %%MAN%%man/mann/dtplite.tcllib.n.gz
+%%MAN%%man/mann/ean13.tcllib.n.gz
+%%MAN%%man/mann/encode.tcllib.n.gz
 %%MAN%%man/mann/events.tcllib.n.gz
 %%MAN%%man/mann/expander.tcllib.n.gz
-%%MAN%%man/mann/export.tcllib.n.gz
 %%MAN%%man/mann/export_docidx.tcllib.n.gz
 %%MAN%%man/mann/export_doctoc.tcllib.n.gz
-%%MAN%%man/mann/export_html.tcllib.n.gz
-%%MAN%%man/mann/export_json.tcllib.n.gz
-%%MAN%%man/mann/export_nroff.tcllib.n.gz
-%%MAN%%man/mann/export_text.tcllib.n.gz
-%%MAN%%man/mann/export_wiki.tcllib.n.gz
 %%MAN%%man/mann/fa.tcllib.n.gz
 %%MAN%%man/mann/facade.tcllib.n.gz
 %%MAN%%man/mann/faop.tcllib.n.gz
@@ -726,9 +759,11 @@ lib/tcllib/zip/pkgIndex.tcl
 %%MAN%%man/mann/fuzzy.tcllib.n.gz
 %%MAN%%man/mann/gasm.tcllib.n.gz
 %%MAN%%man/mann/generator.tcllib.n.gz
+%%MAN%%man/mann/gpx.tcllib.n.gz
 %%MAN%%man/mann/graph.tcllib.n.gz
 %%MAN%%man/mann/graph1.tcllib.n.gz
 %%MAN%%man/mann/graphops.tcllib.n.gz
+%%MAN%%man/mann/gtoken.tcllib.n.gz
 %%MAN%%man/mann/halfpipe.tcllib.n.gz
 %%MAN%%man/mann/hex.tcllib.n.gz
 %%MAN%%man/mann/hook.tcllib.n.gz
@@ -736,21 +771,37 @@ lib/tcllib/zip/pkgIndex.tcl
 %%MAN%%man/mann/html_cssdefaults.tcllib.n.gz
 %%MAN%%man/mann/htmlparse.tcllib.n.gz
 %%MAN%%man/mann/huddle.tcllib.n.gz
+%%MAN%%man/mann/iban.tcllib.n.gz
 %%MAN%%man/mann/ident.tcllib.n.gz
 %%MAN%%man/mann/identity.tcllib.n.gz
+%%MAN%%man/mann/idx_container.tcllib.n.gz
+%%MAN%%man/mann/idx_export.tcllib.n.gz
+%%MAN%%man/mann/idx_export_html.tcllib.n.gz
+%%MAN%%man/mann/idx_export_json.tcllib.n.gz
+%%MAN%%man/mann/idx_export_nroff.tcllib.n.gz
+%%MAN%%man/mann/idx_export_text.tcllib.n.gz
+%%MAN%%man/mann/idx_export_wiki.tcllib.n.gz
+%%MAN%%man/mann/idx_import.tcllib.n.gz
+%%MAN%%man/mann/idx_import_json.tcllib.n.gz
+%%MAN%%man/mann/idx_introduction.tcllib.n.gz
+%%MAN%%man/mann/idx_msgcat_c.tcllib.n.gz
+%%MAN%%man/mann/idx_msgcat_de.tcllib.n.gz
+%%MAN%%man/mann/idx_msgcat_en.tcllib.n.gz
+%%MAN%%man/mann/idx_msgcat_fr.tcllib.n.gz
+%%MAN%%man/mann/idx_parse.tcllib.n.gz
+%%MAN%%man/mann/idx_structure.tcllib.n.gz
 %%MAN%%man/mann/imap4.tcllib.n.gz
+%%MAN%%man/mann/imei.tcllib.n.gz
 %%MAN%%man/mann/imenu.tcllib.n.gz
-%%MAN%%man/mann/import.tcllib.n.gz
 %%MAN%%man/mann/import_docidx.tcllib.n.gz
 %%MAN%%man/mann/import_doctoc.tcllib.n.gz
-%%MAN%%man/mann/import_json.tcllib.n.gz
 %%MAN%%man/mann/ini.tcllib.n.gz
 %%MAN%%man/mann/interp.tcllib.n.gz
 %%MAN%%man/mann/interpolate.tcllib.n.gz
-%%MAN%%man/mann/introduction.tcllib.n.gz
 %%MAN%%man/mann/ip.tcllib.n.gz
 %%MAN%%man/mann/ipager.tcllib.n.gz
 %%MAN%%man/mann/irc.tcllib.n.gz
+%%MAN%%man/mann/isbn.tcllib.n.gz
 %%MAN%%man/mann/iso8601.tcllib.n.gz
 %%MAN%%man/mann/javascript.tcllib.n.gz
 %%MAN%%man/mann/jpeg.tcllib.n.gz
@@ -765,6 +816,8 @@ lib/tcllib/zip/pkgIndex.tcl
 %%MAN%%man/mann/logger.tcllib.n.gz
 %%MAN%%man/mann/loggerAppender.tcllib.n.gz
 %%MAN%%man/mann/loggerUtils.tcllib.n.gz
+%%MAN%%man/mann/luhn.tcllib.n.gz
+%%MAN%%man/mann/luhn5.tcllib.n.gz
 %%MAN%%man/mann/machineparameters.tcllib.n.gz
 %%MAN%%man/mann/map_geocode_nominatim.tcllib.n.gz
 %%MAN%%man/mann/map_slippy.tcllib.n.gz
@@ -791,10 +844,6 @@ lib/tcllib/zip/pkgIndex.tcl
 %%MAN%%man/mann/montecarlo.tcllib.n.gz
 %%MAN%%man/mann/mpexpand.tcllib.n.gz
 %%MAN%%man/mann/msgcat.tcllib.n.gz
-%%MAN%%man/mann/msgcat_c.tcllib.n.gz
-%%MAN%%man/mann/msgcat_de.tcllib.n.gz
-%%MAN%%man/mann/msgcat_en.tcllib.n.gz
-%%MAN%%man/mann/msgcat_fr.tcllib.n.gz
 %%MAN%%man/mann/multi.tcllib.n.gz
 %%MAN%%man/mann/multiop.tcllib.n.gz
 %%MAN%%man/mann/multiplexer.tcllib.n.gz
@@ -812,6 +861,7 @@ lib/tcllib/zip/pkgIndex.tcl
 %%MAN%%man/mann/nnslog.tcllib.n.gz
 %%MAN%%man/mann/nntp.tcllib.n.gz
 %%MAN%%man/mann/nroff_manmacros.tcllib.n.gz
+%%MAN%%man/mann/ntlm.tcllib.n.gz
 %%MAN%%man/mann/ntp_time.tcllib.n.gz
 %%MAN%%man/mann/null.tcllib.n.gz
 %%MAN%%man/mann/nullzero.tcllib.n.gz
@@ -828,10 +878,10 @@ lib/tcllib/zip/pkgIndex.tcl
 %%MAN%%man/mann/page_util_norm_peg.tcllib.n.gz
 %%MAN%%man/mann/page_util_peg.tcllib.n.gz
 %%MAN%%man/mann/page_util_quote.tcllib.n.gz
-%%MAN%%man/mann/parse.tcllib.n.gz
 %%MAN%%man/mann/peg.tcllib.n.gz
 %%MAN%%man/mann/peg_interp.tcllib.n.gz
 %%MAN%%man/mann/picoirc.tcllib.n.gz
+%%MAN%%man/mann/pkg_dtplite.tcllib.n.gz
 %%MAN%%man/mann/pki.tcllib.n.gz
 %%MAN%%man/mann/pluginmgr.tcllib.n.gz
 %%MAN%%man/mann/png.tcllib.n.gz
@@ -850,6 +900,7 @@ lib/tcllib/zip/pkgIndex.tcl
 %%MAN%%man/mann/pt_introduction.tcllib.n.gz
 %%MAN%%man/mann/pt_json_language.tcllib.n.gz
 %%MAN%%man/mann/pt_param.tcllib.n.gz
+%%MAN%%man/mann/pt_parse_peg.tcllib.n.gz
 %%MAN%%man/mann/pt_parser_api.tcllib.n.gz
 %%MAN%%man/mann/pt_peg_container.tcllib.n.gz
 %%MAN%%man/mann/pt_peg_container_peg.tcllib.n.gz
@@ -867,6 +918,7 @@ lib/tcllib/zip/pkgIndex.tcl
 %%MAN%%man/mann/pt_peg_interp.tcllib.n.gz
 %%MAN%%man/mann/pt_peg_introduction.tcllib.n.gz
 %%MAN%%man/mann/pt_peg_language.tcllib.n.gz
+%%MAN%%man/mann/pt_peg_op.tcllib.n.gz
 %%MAN%%man/mann/pt_peg_to_container.tcllib.n.gz
 %%MAN%%man/mann/pt_peg_to_cparam.tcllib.n.gz
 %%MAN%%man/mann/pt_peg_to_json.tcllib.n.gz
@@ -902,6 +954,7 @@ lib/tcllib/zip/pkgIndex.tcl
 %%MAN%%man/mann/rot.tcllib.n.gz
 %%MAN%%man/mann/rtcore.tcllib.n.gz
 %%MAN%%man/mann/sasl.tcllib.n.gz
+%%MAN%%man/mann/scram.tcllib.n.gz
 %%MAN%%man/mann/sha1.tcllib.n.gz
 %%MAN%%man/mann/sha256.tcllib.n.gz
 %%MAN%%man/mann/simulation_random.tcllib.n.gz
@@ -924,14 +977,17 @@ lib/tcllib/zip/pkgIndex.tcl
 %%MAN%%man/mann/struct_set.tcllib.n.gz
 %%MAN%%man/mann/struct_tree.tcllib.n.gz
 %%MAN%%man/mann/struct_tree1.tcllib.n.gz
-%%MAN%%man/mann/structure.tcllib.n.gz
 %%MAN%%man/mann/sum.tcllib.n.gz
+%%MAN%%man/mann/switched.tcllib.n.gz
 %%MAN%%man/mann/symdiff.tcllib.n.gz
 %%MAN%%man/mann/tabify.tcllib.n.gz
 %%MAN%%man/mann/tar.tcllib.n.gz
 %%MAN%%man/mann/tcl_parse.tcllib.n.gz
+%%MAN%%man/mann/tcldes.tcllib.n.gz
+%%MAN%%man/mann/tcldesjr.tcllib.n.gz
 %%MAN%%man/mann/tcldocstrip.tcllib.n.gz
 %%MAN%%man/mann/tepam_argument_dialogbox.tcllib.n.gz
+%%MAN%%man/mann/tepam_doc_gen.tcllib.n.gz
 %%MAN%%man/mann/tepam_introduction.tcllib.n.gz
 %%MAN%%man/mann/tepam_procedure.tcllib.n.gz
 %%MAN%%man/mann/term.tcllib.n.gz
@@ -944,6 +1000,24 @@ lib/tcllib/zip/pkgIndex.tcl
 %%MAN%%man/mann/tie.tcllib.n.gz
 %%MAN%%man/mann/tie_std.tcllib.n.gz
 %%MAN%%man/mann/tiff.tcllib.n.gz
+%%MAN%%man/mann/toc_container.tcllib.n.gz
+%%MAN%%man/mann/toc_export.tcllib.n.gz
+%%MAN%%man/mann/toc_export_html.tcllib.n.gz
+%%MAN%%man/mann/toc_export_json.tcllib.n.gz
+%%MAN%%man/mann/toc_export_nroff.tcllib.n.gz
+%%MAN%%man/mann/toc_export_text.tcllib.n.gz
+%%MAN%%man/mann/toc_export_wiki.tcllib.n.gz
+%%MAN%%man/mann/toc_import.tcllib.n.gz
+%%MAN%%man/mann/toc_import_json.tcllib.n.gz
+%%MAN%%man/mann/toc_introduction.tcllib.n.gz
+%%MAN%%man/mann/toc_msgcat_c.tcllib.n.gz
+%%MAN%%man/mann/toc_msgcat_de.tcllib.n.gz
+%%MAN%%man/mann/toc_msgcat_en.tcllib.n.gz
+%%MAN%%man/mann/toc_msgcat_fr.tcllib.n.gz
+%%MAN%%man/mann/toc_parse.tcllib.n.gz
+%%MAN%%man/mann/toc_structure.tcllib.n.gz
+%%MAN%%man/mann/token.tcllib.n.gz
+%%MAN%%man/mann/token_shell.tcllib.n.gz
 %%MAN%%man/mann/tqueue.tcllib.n.gz
 %%MAN%%man/mann/transformcore.tcllib.n.gz
 %%MAN%%man/mann/transmitter.tcllib.n.gz
@@ -958,9 +1032,17 @@ lib/tcllib/zip/pkgIndex.tcl
 %%MAN%%man/mann/units.tcllib.n.gz
 %%MAN%%man/mann/uri.tcllib.n.gz
 %%MAN%%man/mann/urn-scheme.tcllib.n.gz
+%%MAN%%man/mann/usnpi.tcllib.n.gz
 %%MAN%%man/mann/uuencode.tcllib.n.gz
 %%MAN%%man/mann/uuid.tcllib.n.gz
+%%MAN%%man/mann/valtype_common.tcllib.n.gz
 %%MAN%%man/mann/variable.tcllib.n.gz
+%%MAN%%man/mann/verhoeff.tcllib.n.gz
+%%MAN%%man/mann/vt_base64.tcllib.n.gz
+%%MAN%%man/mann/vt_counter.tcllib.n.gz
+%%MAN%%man/mann/vt_crc32.tcllib.n.gz
+%%MAN%%man/mann/vt_otp.tcllib.n.gz
+%%MAN%%man/mann/websocket.tcllib.n.gz
 %%MAN%%man/mann/wip.tcllib.n.gz
 %%MAN%%man/mann/xsxp.tcllib.n.gz
 %%MAN%%man/mann/yaml.tcllib.n.gz
@@ -970,6 +1052,7 @@ lib/tcllib/zip/pkgIndex.tcl
 @dirrm lib/tcllib/zip
 @dirrm lib/tcllib/yaml
 @dirrm lib/tcllib/wip
+@dirrm lib/tcllib/websocket
 @dirrm lib/tcllib/virtchannel_transform
 @dirrm lib/tcllib/virtchannel_core
 @dirrm lib/tcllib/virtchannel_base
@@ -991,6 +1074,7 @@ lib/tcllib/zip/pkgIndex.tcl
 @dirrm lib/tcllib/tar
 @dirrm lib/tcllib/struct
 @dirrm lib/tcllib/stringprep
+@dirrm lib/tcllib/string
 @dirrm lib/tcllib/stooop
 @dirrm lib/tcllib/soundex
 @dirrm lib/tcllib/snit
@@ -1054,6 +1138,7 @@ lib/tcllib/zip/pkgIndex.tcl
 @dirrm lib/tcllib/ftpd
 @dirrm lib/tcllib/ftp
 @dirrm lib/tcllib/fileutil
+@dirrm lib/tcllib/dtplite
 @dirrm lib/tcllib/doctools2toc
 @dirrm lib/tcllib/doctools2idx
 @dirrm lib/tcllib/doctools2base
@@ -1063,6 +1148,7 @@ lib/tcllib/zip/pkgIndex.tcl
 @dirrm lib/tcllib/dns/msgs
 @dirrm lib/tcllib/dns
 @dirrm lib/tcllib/des
+@dirrm lib/tcllib/debug
 @dirrm lib/tcllib/csv
 @dirrm lib/tcllib/crc
 @dirrm lib/tcllib/counter