3 files changed, 128 insertions, 141 deletions

diff --git a/textproc/ruby-htree/Makefile b/textproc/ruby-htree/Makefile
index 7bf85958efaf..a8d330b548e8 100644
--- a/textproc/ruby-htree/Makefile
+++ b/textproc/ruby-htree/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	htree
-PORTVERSION=	0.1
+PORTVERSION=	0.2
 CATEGORIES=	textproc www ruby
-MASTER_SITES=	${MASTER_SITE_RUBY}
-MASTER_SITE_SUBDIR=	contrib
+MASTER_SITES=	ftp://ftp.iDaemons.org/pub/distfiles/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
@@ -24,6 +23,7 @@ LIB_FILES=	htree.rb htree
 
 RUBY_RD_FILES=	README.rd
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
 DOCS=		${RUBY_RD_FILES} \
 		${RUBY_RD_HTML_FILES} \
 		doc
diff --git a/textproc/ruby-htree/distinfo b/textproc/ruby-htree/distinfo
index 566f9042f74b..3b70f875488b 100644
--- a/textproc/ruby-htree/distinfo
+++ b/textproc/ruby-htree/distinfo
@@ -1,2 +1,2 @@
-MD5 (ruby/htree-0.1.tar.gz) = 606c639eceae068caf29db8bc34fb733
-SIZE (ruby/htree-0.1.tar.gz) = 35483
+MD5 (ruby/htree-0.2.tar.gz) = d6c3cc3dccb385d6b11fd327ad83184f
+SIZE (ruby/htree-0.2.tar.gz) = 44771
diff --git a/textproc/ruby-htree/pkg-plist b/textproc/ruby-htree/pkg-plist
index bb8f576cd4af..2de610e2b7e0 100644
--- a/textproc/ruby-htree/pkg-plist
+++ b/textproc/ruby-htree/pkg-plist
@@ -26,161 +26,135 @@
 %%RUBY_SITELIBDIR%%/htree/traverse.rb
 @dirrm %%RUBY_SITELIBDIR%%/htree
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.rd
-%%PORTDOCS%%%%RUBY_RD_HTML_FILES%%%%RUBY_MODDOCDIR%%/README.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree.src/M000003.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree.src/M000004.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree.src/M000005.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree.src/M000006.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree.src/M000007.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree.src/M000008.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree.src/M000009.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree.src/M000010.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/BogusETag.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/BogusETag.src/M000090.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/BogusETag.src/M000091.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/BogusETag.src/M000092.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/BogusETag.src/M000093.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/BogusETag.src/M000070.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/BogusETag/Loc.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/BogusETag/Trav.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Comment.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Comment.src/M000046.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Comment.src/M000047.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Comment.src/M000048.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Comment.src/M000049.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Comment.src/M000050.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Comment.src/M000051.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Comment.src/M000053.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Comment/Loc.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Comment/Trav.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Container.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Container.src/M000011.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Container.src/M000012.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Container.src/M000013.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Container.src/M000014.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/ContainerLocMixin.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Container.src/M000010.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Container/Loc.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Container/Loc.src/M000011.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Container/Loc.src/M000012.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Container/Trav.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Container/Trav.src/M000013.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Container/Trav.src/M000014.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Container/Trav.src/M000015.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Container/Trav.src/M000016.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Container/Trav.src/M000017.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Context.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Context.src/M000086.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Context.src/M000087.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Context.src/M000088.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Context.src/M000089.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Context.src/M000067.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Context.src/M000068.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Context.src/M000069.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Doc.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Doc.src/M000071.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Doc.src/M000072.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Doc.src/M000073.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Doc.src/M000074.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Doc.src/M000075.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Doc.src/M000076.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Doc.src/M000077.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Doc.src/M000078.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Doc.src/M000079.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Doc.src/M000080.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Doc.src/M000081.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Doc.src/M000082.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Doc.src/M000083.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Doc.src/M000084.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Doc.src/M000085.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Doc/LocMixin.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Doc.src/M000055.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Doc.src/M000056.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Doc/Loc.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Doc/Trav.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Doc/Trav.src/M000057.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Doc/Trav.src/M000058.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Doc/Trav.src/M000059.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/DocType.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/DocType.src/M000094.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/DocType.src/M000095.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/DocType.src/M000096.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/DocType.src/M000097.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/DocType.src/M000098.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/DocType.src/M000099.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/DocType.src/M000100.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/DocType.src/M000101.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/DocType.src/M000102.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/DocType.src/M000071.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/DocType/Loc.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/DocType/Trav.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000103.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000104.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000105.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000106.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000107.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000108.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000109.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000110.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000111.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000112.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000113.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000114.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000115.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000116.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000117.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000118.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000119.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000121.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000122.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000123.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000124.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000125.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000127.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000128.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem/LocMixin.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000072.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000073.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000074.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000075.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000076.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src/M000077.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem/Loc.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem/Loc.src/M000086.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem/Loc.src/M000087.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem/Loc.src/M000088.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem/Loc.src/M000089.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem/Trav.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem/Trav.src/M000078.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem/Trav.src/M000079.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem/Trav.src/M000080.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem/Trav.src/M000081.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem/Trav.src/M000082.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem/Trav.src/M000083.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem/Trav.src/M000084.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem/Trav.src/M000085.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Encoder.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Encoder.src/M000129.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Encoder.src/M000130.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Encoder.src/M000131.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Encoder.src/M000132.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Encoder.src/M000133.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Encoder.src/M000134.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Encoder.src/M000135.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Encoder.src/M000136.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Encoder.src/M000137.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Encoder.src/M000090.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Encoder.src/M000091.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Encoder.src/M000092.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Encoder.src/M000093.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Encoder.src/M000094.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Error.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Leaf.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Leaf.src/M000017.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Leaf.src/M000018.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Leaf.src/M000019.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Leaf.src/M000020.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Leaf.src/M000021.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Leaf.src/M000022.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Leaf.src/M000023.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Loc.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Loc.src/M000024.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Loc.src/M000025.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Loc.src/M000026.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Loc.src/M000027.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Leaf/Loc.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Leaf/Trav.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Location.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Location.src/M000060.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Location.src/M000061.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Location.src/M000062.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Location.src/M000063.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Location.src/M000064.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Location.src/M000065.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Location.src/M000066.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Name.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Name.src/M000028.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Name.src/M000029.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Name.src/M000030.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Name.src/M000031.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Name.src/M000032.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Name.src/M000033.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Name.src/M000034.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Name.src/M000035.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Name.src/M000036.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Name.src/M000037.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Name.src/M000039.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Name.src/M000040.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Name.src/M000041.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Name.src/M000042.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Name.src/M000043.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Name.src/M000044.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Name.src/M000045.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Name.src/M000046.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Node.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Node.src/M000015.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Node.src/M000016.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Node/LocMixin.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Pat.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Node.src/M000021.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Node.src/M000022.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Node.src/M000023.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Node.src/M000024.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Node.src/M000025.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Node.src/M000026.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Node.src/M000027.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Node.src/M000028.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/ProcIns.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/ProcIns.src/M000052.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/ProcIns.src/M000053.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/ProcIns.src/M000054.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/ProcIns.src/M000055.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/ProcIns.src/M000056.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/ProcIns.src/M000057.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/ProcIns.src/M000058.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/ProcIns/Loc.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/ProcIns/Trav.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Text.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Text.src/M000059.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Text.src/M000060.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Text.src/M000061.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Text.src/M000062.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Text.src/M000063.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Text.src/M000064.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Text.src/M000065.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Text.src/M000066.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Text.src/M000067.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Text.src/M000068.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Text.src/M000069.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Text.src/M000070.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Text.src/M000048.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Text.src/M000049.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Text.src/M000050.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Text.src/M000051.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Text.src/M000052.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Text/Loc.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Text/Loc.src/M000018.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Text/Loc.src/M000019.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Text/Loc.src/M000020.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Text/Trav.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Traverse.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Traverse.src/M000029.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Traverse.src/M000030.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Traverse.src/M000031.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Traverse.src/M000032.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Traverse.src/M000033.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Traverse.src/M000034.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Traverse.src/M000035.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Traverse.src/M000036.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Traverse.src/M000037.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/Traverse.src/M000038.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/XMLDecl.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/XMLDecl.src/M000038.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/XMLDecl.src/M000039.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/XMLDecl.src/M000040.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/XMLDecl.src/M000041.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/XMLDecl.src/M000042.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/XMLDecl.src/M000043.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/XMLDecl.src/M000044.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/XMLDecl.src/M000045.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/XMLDecl.src/M000047.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/XMLDecl/Loc.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/HTree/XMLDecl/Trav.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Regexp.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Regexp.src/M000002.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/created.rid
@@ -221,23 +195,36 @@
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Regexp.src
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/XMLDecl.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/XMLDecl
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/Traverse.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/Text/Loc.src
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/Text.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/Text
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/ProcIns.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/ProcIns
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/Node.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/Node
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/Name.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/Loc.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/Leaf.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/Location.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/Leaf
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/Encoder.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem/Trav.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem/Loc.src
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem.src
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/Elem
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/DocType.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/DocType
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/Doc/Trav.src
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/Doc.src
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/Doc
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/Context.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/Container/Trav.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/Container/Loc.src
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/Container.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/Container
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/Comment.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/Comment
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/BogusETag.src
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree/BogusETag
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree.src
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/HTree
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes