Index: library/lib/doc-tools.tcl
===================================================================
diff -u -rc6057c18970d5bc19fe0f1f760ef0d29898ecfdd -r96251cd0e203685f1f4cadbf88ccc3ede6146978
--- library/lib/doc-tools.tcl	(.../doc-tools.tcl)	(revision c6057c18970d5bc19fe0f1f760ef0d29898ecfdd)
+++ library/lib/doc-tools.tcl	(.../doc-tools.tcl)	(revision 96251cd0e203685f1f4cadbf88ccc3ede6146978)
@@ -604,15 +604,15 @@
       set :positional true
       set :position 1
     }
-    :attribute @see -class ::nx::doc::PartAttribute
+    :attribute -class ::nx::doc::PartAttribute @see
 
-    :attribute @deprecated:boolean -class ::nx::doc::SwitchAttribute {
+    :attribute -class ::nx::doc::SwitchAttribute @deprecated:boolean {
       set :default 0
     }
-    :attribute @stashed:boolean -class ::nx::doc::SwitchAttribute {
+    :attribute -class ::nx::doc::SwitchAttribute @stashed:boolean {
       set :default 0
     }
-    :attribute @c-implemented:boolean -class ::nx::doc::SwitchAttribute {
+    :attribute -class ::nx::doc::SwitchAttribute @c-implemented:boolean {
       set :default 0
     }
 
@@ -825,18 +825,18 @@
     # Note: The default "" corresponds to the top-level namespace "::"!
     :attribute {@namespace ""}
 
-    :attribute @class -class ::nx::doc::PartAttribute {
+    :attribute -class ::nx::doc::PartAttribute @class {
       :pretty_name "Class"
       :pretty_plural "Classes"
       set :part_class ::nx::doc::@class
     }
-    :attribute @object -class ::nx::doc::PartAttribute {
+    :attribute -class ::nx::doc::PartAttribute @object {
       :pretty_name "Object"
       :pretty_plural "Objects"
       set :part_class ::nx::doc::@object
     }
    
-    :attribute @command -class ::nx::doc::PartAttribute {
+    :attribute -class ::nx::doc::PartAttribute @command {
       :pretty_name "Command"
       :pretty_plural "Commands"
       set :part_class ::nx::doc::@command
@@ -898,7 +898,7 @@
     :attribute {is_validated 0} 
     :attribute depends:0..*,object,type=[current]
     
-    :attribute @glossary -class ::nx::doc::PartAttribute {
+    :attribute -class ::nx::doc::PartAttribute @glossary {
       set :part_class ::nx::doc::@glossary
       :public method get {domain prop} {
 	set l [next]
@@ -911,7 +911,7 @@
       }
     }
 
-    :attribute @package -class ::nx::doc::PartAttribute {
+    :attribute -class ::nx::doc::PartAttribute @package {
       :pretty_name "Package"
       :pretty_plural "Packages"
       set :part_class ::nx::doc::@package
@@ -960,15 +960,15 @@
   #
 
   Tag create @package -superclass ContainerEntity {
-    :attribute @require -class ::nx::doc::PartAttribute
-    :attribute @version -class ::nx::doc::PartAttribute
+    :attribute -class ::nx::doc::PartAttribute @require
+    :attribute -class ::nx::doc::PartAttribute @version
   }
 
   QualifierTag create @command -superclass StructuredEntity {
-    :attribute @parameter -class ::nx::doc::PartAttribute {
+    :attribute -class ::nx::doc::PartAttribute @parameter {
       set :part_class ::nx::doc::@param
     }
-    :attribute @return -class ::nx::doc::PartAttribute {
+    :attribute -class ::nx::doc::PartAttribute @return {
       :method require_part {domain prop value} {
 	set value [expr {![string match ":*" $value] ? "__out__: $value": "__out__$value"}]
 	next [list $domain $prop $value]
@@ -977,7 +977,7 @@
     }
 
     :public forward @sub-command %self @command
-    :attribute @command -class ::nx::doc::PartAttribute {
+    :attribute -class ::nx::doc::PartAttribute @command {
       :pretty_name "Subcommand"
       :pretty_plural "Subcommands"
       :public method id {domain prop value} { 
@@ -1033,10 +1033,10 @@
   QualifierTag create @object \
       -superclass StructuredEntity \
       -mixin ContainerEntity::Containable {
-	:attribute @author -class ::nx::doc::PartAttribute 
+	:attribute -class ::nx::doc::PartAttribute @author 
 
 	:public forward @object %self @child-object
-	:attribute @child-object -class ::nx::doc::PartAttribute {
+	:attribute -class ::nx::doc::PartAttribute @child-object {
 	  set :part_class ::nx::doc::@object
 	  :public method id {domain prop value} {
 #	    puts stderr "CHILD-OBJECT: [current args]"
@@ -1050,7 +1050,7 @@
 	}
 
 	:public forward @class %self @child-class
-	:attribute @child-class -class ::nx::doc::PartAttribute {
+	:attribute -class ::nx::doc::PartAttribute @child-class {
 	  set :part_class ::nx::doc::@class
 	  :public method id {domain prop value} {
 	    #puts stderr "CHILD-CLASS: [current args]"
@@ -1063,15 +1063,15 @@
 	}
 
 	:public forward @method %self @object-method
-	:attribute @object-method -class ::nx::doc::PartAttribute {
+	:attribute -class ::nx::doc::PartAttribute @object-method {
 	  :pretty_name "Object method"
 	  :pretty_plural "Object methods"
 	  set :part_class ::nx::doc::@method
 	}
 
 	:public forward @attribute %self @object-attribute
 	#:forward @param %self @object-param
-	:attribute @object-attribute -class ::nx::doc::PartAttribute {
+	:attribute -class ::nx::doc::PartAttribute @object-attribute {
 	  set :part_class ::nx::doc::@param
 	}
 
@@ -1091,10 +1091,10 @@
 
   QualifierTag create @class \
       -superclass @object {
-	:attribute @superclass -class ::nx::doc::PartAttribute
+	:attribute -class ::nx::doc::PartAttribute @superclass
 	
 	:public forward @attribute %self @class-attribute
-	:attribute @class-attribute -class ::nx::doc::PartAttribute {
+	:attribute -class ::nx::doc::PartAttribute @class-attribute {
 	  :pretty_name "Per-class attribute"
 	  :pretty_plural "Per-class attributes"
 	  set :part_class ::nx::doc::@param
@@ -1104,14 +1104,14 @@
 	:public forward @class-object-attribute %self @object-attribute
 
 	:public forward @hook %self @class-hook
-	:attribute @class-hook -class ::nx::doc::PartAttribute {
+	:attribute -class ::nx::doc::PartAttribute @class-hook {
 	  :pretty_name "Hook method"
 	  :pretty_plural "Hook methods"
 	  set :part_class ::nx::doc::@method
 	}
 
 	:public forward @method %self @class-method
-	:attribute @class-method -class ::nx::doc::PartAttribute {
+	:attribute -class ::nx::doc::PartAttribute @class-method {
 	  :pretty_name "Provided method"
 	  :pretty_plural "Provided methods"
 	  set :part_class ::nx::doc::@method
@@ -1168,13 +1168,13 @@
   #
   PartTag create @method \
       -superclass StructuredEntity {
-	:attribute @syshook:boolean -class ::nx::doc::SwitchAttribute {
+	:attribute -class ::nx::doc::SwitchAttribute @syshook:boolean {
 	  set :default 0
 	}
-	:attribute @parameter -class ::nx::doc::PartAttribute {
+	:attribute -class ::nx::doc::PartAttribute @parameter {
 	  set :part_class ::nx::doc::@param
 	}
-	:attribute @return -class ::nx::doc::PartAttribute {
+	:attribute -class ::nx::doc::PartAttribute @return {
 	  #
 	  # TODO: @return spec fragments should be nameless,
 	  # conceptually. They represent "out" parameters with each
@@ -1209,7 +1209,7 @@
 	:public forward @class-method %self @method
 	:public forward @class-object-method %self @method
 	:public forward @sub-method %self @method
-	:attribute @method -class ::nx::doc::PartAttribute {
+	:attribute -class ::nx::doc::PartAttribute @method {
 	  set :part_class ::nx::doc::@method
 	  :public method id {domain prop name} {
 	    # TODO: ${:part_class} resolves to the local slot
@@ -1335,7 +1335,7 @@
   PartTag create @param \
       -superclass PartEntity {
 	#:attribute spec
-	:attribute @spec -class ::nx::doc::PartAttribute
+	:attribute -class ::nx::doc::PartAttribute @spec
 	:attribute default
 
 	:public class method id {partof_name scope name} {
@@ -2971,6 +2971,7 @@
 	      	      ->source [file normalize [info script]] \
 	      	      ->bundle $bundle
 	      	} 
+		return $handle
 	      }
 
 	      rename ::nsf::method::setter ::nsf::_%&setter
@@ -2983,11 +2984,12 @@
 		  dict set bundle handleinfo [::nx::doc::handleinfo $handle]
 	      	  dict set bundle type [::nsf::object::dispatch ${::nx::doc::rootns}::__Tracer ::nsf::methods::object::info::method type $handle]
 		  
-	      	  ::nx::doc::__at_register_command $handle \
+		  ::nx::doc::__at_register_command $handle \
 	      	      ->cmdtype @method \
 	      	      ->source [file normalize [info script]] \
-	      	      ->bundle $bundle
-	      	} 
+		      ->bundle $bundle
+	      	}
+		return $handle
 	      }
 
 	    rename ::nsf::objectsystem::create ::nsf::_%&createobjectsystem