Index: doc/Announce2.1.0
===================================================================
diff -u -rbc72af70d3bd87c0e179e2dfa61216864befb23e -r71e18053ef7dd9a53f11d14f3a91b8a1091e90bb
--- doc/Announce2.1.0	(.../Announce2.1.0)	(revision bc72af70d3bd87c0e179e2dfa61216864befb23e)
+++ doc/Announce2.1.0	(.../Announce2.1.0)	(revision 71e18053ef7dd9a53f11d14f3a91b8a1091e90bb)
@@ -230,9 +230,19 @@
   * They are more robust: Don't quit due to inner [return] calls,
      [exit] is handled gracefully.
 
-  * Shell tests were added (shells.test).
+  * Added tests for the shells to the regression test suite
+    (shells.test).
 
+- Traits:
 
+  * The name of the namespace of traits changed from
+      nx::traits::XXX
+    to
+      nx::trait::XXX
+    in order to improve naming orthogonality with the
+    trait management package "nx::trait".
+
+
 - MongoDB interface upgrade:
 
   * Upgraded MongoDB and drivers to
Index: doc/example-scripts/tk-horse-race.html
===================================================================
diff -u -r31e9b2929718e014fbbad009eb69af6dff0c120a -r71e18053ef7dd9a53f11d14f3a91b8a1091e90bb
--- doc/example-scripts/tk-horse-race.html	(.../tk-horse-race.html)	(revision 31e9b2929718e014fbbad009eb69af6dff0c120a)
+++ doc/example-scripts/tk-horse-race.html	(.../tk-horse-race.html)	(revision 71e18053ef7dd9a53f11d14f3a91b8a1091e90bb)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.8" />
+<meta name="generator" content="AsciiDoc 8.6.9" />
 <title>Listing of doc/example-scripts/tk-horse-race.tcl</title>
 <style type="text/css">
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -94,8 +94,10 @@
   padding: 0;
   margin: 0;
 }
+pre {
+  white-space: pre-wrap;
+}
 
-
 #author {
   color: #527bbd;
   font-weight: bold;
@@ -223,7 +225,7 @@
 }
 
 div.imageblock div.content { padding-left: 0; }
-span.image img { border-style: none; }
+span.image img { border-style: none; vertical-align: text-bottom; }
 a.image:visited { color: white; }
 
 dl {
@@ -758,157 +760,157 @@
 <pre class='nx'><span class='nx-keyword'>package</span> <span class='nx-keyword'>require</span> Tk
 <span class='nx-keyword'>package</span> <span class='nx-keyword'>require</span> nx::trait
 
- <span class='nx-comment'>##############################################################################
-</span> <span class='nx-comment'># Trait ListUtils
-</span> <span class='nx-comment'>#
-</span> <span class='nx-comment'># Some list utilities, not part of a package we can require here.
-</span> <span class='nx-comment'>##############################################################################
+ <span class='nx-[namespace tail [nx::self]]'>##############################################################################
+</span> <span class='nx-[namespace tail [nx::self]]'># Trait ListUtils
+</span> <span class='nx-[namespace tail [nx::self]]'>#
+</span> <span class='nx-[namespace tail [nx::self]]'># Some list utilities, not part of a package we can require here.
+</span> <span class='nx-[namespace tail [nx::self]]'>##############################################################################
 </span>
- nx::Trait <span class='nx-keyword'>create</span> ::nx::traits::listUtils {
+ nx::Trait <span class='nx-keyword'>create</span> ::nx::trait::listUtils {
 
    <span class='nx-keyword'>:protected</span> <span class='nx-keyword'>method</span> lpick {<span class='nx-keyword'>list</span>} {
-     <span class='nx-comment'># return a random entry from a given list
-</span>     <span class='nx-keyword'>lindex</span> <span class='nx-variable'>$list</span> [<span class='nx-keyword'>expr</span> {int(rand()*[<span class='nx-keyword'>llength</span> <span class='nx-variable'>$list</span>])}]
+     <span class='nx-[namespace tail [nx::self]]'># return a random entry from a given list
+</span>     <span class='nx-keyword'>lindex</span> <span class='nx-[namespace tail [nx::self]]'>$list</span> [<span class='nx-keyword'>expr</span> {int(rand()*[<span class='nx-keyword'>llength</span> <span class='nx-[namespace tail [nx::self]]'>$list</span>])}]
    }
    <span class='nx-keyword'>:protected</span> <span class='nx-keyword'>method</span> lremove {listName what} {
-     <span class='nx-comment'># remove a list element referenced by the elements value
-</span>     <span class='nx-keyword'>:upvar</span> <span class='nx-variable'>$listName</span> <span class='nx-keyword'>list</span>
-     <span class='nx-keyword'>set</span> pos  [<span class='nx-keyword'>lsearch</span> <span class='nx-variable'>$list</span> <span class='nx-variable'>$what</span>]
-     <span class='nx-keyword'>set</span> <span class='nx-keyword'>list</span> [<span class='nx-keyword'>lreplace</span> <span class='nx-variable'>$list</span> <span class='nx-variable'>$pos</span> <span class='nx-variable'>$pos</span>]
+     <span class='nx-[namespace tail [nx::self]]'># remove a list element referenced by the elements value
+</span>     <span class='nx-keyword'>:upvar</span> <span class='nx-[namespace tail [nx::self]]'>$listName</span> <span class='nx-keyword'>list</span>
+     <span class='nx-keyword'>set</span> pos  [<span class='nx-keyword'>lsearch</span> <span class='nx-[namespace tail [nx::self]]'>$list</span> <span class='nx-[namespace tail [nx::self]]'>$what</span>]
+     <span class='nx-keyword'>set</span> <span class='nx-keyword'>list</span> [<span class='nx-keyword'>lreplace</span> <span class='nx-[namespace tail [nx::self]]'>$list</span> <span class='nx-[namespace tail [nx::self]]'>$pos</span> <span class='nx-[namespace tail [nx::self]]'>$pos</span>]
    }
  }
 
- <span class='nx-comment'>##############################################################################
-</span> <span class='nx-comment'># Class Horse
-</span> <span class='nx-comment'>#
-</span> <span class='nx-comment'># This class defines the logic, how and where a single horse and
-</span> <span class='nx-comment'># jockey are drawn. The painting of the horse happens just at startup
-</span> <span class='nx-comment'># time, later the horses are moved via their tags.
-</span> <span class='nx-comment'>##############################################################################
+ <span class='nx-[namespace tail [nx::self]]'>##############################################################################
+</span> <span class='nx-[namespace tail [nx::self]]'># Class Horse
+</span> <span class='nx-[namespace tail [nx::self]]'>#
+</span> <span class='nx-[namespace tail [nx::self]]'># This class defines the logic, how and where a single horse and
+</span> <span class='nx-[namespace tail [nx::self]]'># jockey are drawn. The painting of the horse happens just at startup
+</span> <span class='nx-[namespace tail [nx::self]]'># time, later the horses are moved via their tags.
+</span> <span class='nx-[namespace tail [nx::self]]'>##############################################################################
 </span>
  <span class='nx-keyword'>nx::Class</span> <span class='nx-keyword'>create</span> Horse {
-   <span class='nx-keyword'>:property</span> name:required      ;<span class='nx-comment'># name is the external name of the horse
-</span>   <span class='nx-keyword'>:property</span> tag:required       ;<span class='nx-comment'># tag is an internal id
-</span>   <span class='nx-keyword'>:property</span> canvas:required    ;<span class='nx-comment'># the canvas, on which the horse is drawn
-</span>   <span class='nx-keyword'>:property</span> n:integer,required ;<span class='nx-comment'># the position on the canvas
+   <span class='nx-keyword'>:property</span> name:required      ;<span class='nx-[namespace tail [nx::self]]'># name is the external name of the horse
+</span>   <span class='nx-keyword'>:property</span> tag:required       ;<span class='nx-[namespace tail [nx::self]]'># tag is an internal id
+</span>   <span class='nx-keyword'>:property</span> canvas:required    ;<span class='nx-[namespace tail [nx::self]]'># the canvas, on which the horse is drawn
+</span>   <span class='nx-keyword'>:property</span> n:integer,required ;<span class='nx-[namespace tail [nx::self]]'># the position on the canvas
 </span>
-   <span class='nx-keyword'>:require</span> trait nx::traits::callback
-   <span class='nx-keyword'>:require</span> trait nx::traits::listUtils
+   <span class='nx-keyword'>:require</span> trait nx::trait::callback
+   <span class='nx-keyword'>:require</span> trait nx::trait::listUtils
 
    <span class='nx-keyword'>:method</span> draw {x y} {
      <span class='nx-keyword'>set</span> hide [:lpick {black brown white gray brown3 brown4}]
      <span class='nx-keyword'>set</span> c1 [:lpick {red yellow blue purple pink green}]
      <span class='nx-keyword'>set</span> c2 [:lpick {red yellow blue purple pink green}]
-     <span class='nx-variable'>${</span><span class='nx-variable'>:canvas}</span> <span class='nx-keyword'>create</span> oval 0 -1 18 4 -fill <span class='nx-variable'>$hide</span> -outline <span class='nx-variable'>$hide</span> -tag <span class='nx-variable'>${</span><span class='nx-variable'>:tag}</span>
-     <span class='nx-variable'>${</span><span class='nx-variable'>:canvas}</span> <span class='nx-keyword'>create</span> line 1 12 3 0 5 12 -fill <span class='nx-variable'>$hide</span> -tag <span class='nx-variable'>${</span><span class='nx-variable'>:tag}</span> -width 2
-     <span class='nx-variable'>${</span><span class='nx-variable'>:canvas}</span> <span class='nx-keyword'>create</span> line 15 12 17 0 19 12 -fill <span class='nx-variable'>$hide</span> -tag <span class='nx-variable'>${</span><span class='nx-variable'>:tag}</span> -width 2
-     <span class='nx-variable'>${</span><span class='nx-variable'>:canvas}</span> <span class='nx-keyword'>create</span> line 16 0 20 -7 24 -5 -fill <span class='nx-variable'>$hide</span> -tag <span class='nx-variable'>${</span><span class='nx-variable'>:tag}</span> -width 3
-     <span class='nx-comment'># Jockey:
-</span>     <span class='nx-variable'>${</span><span class='nx-variable'>:canvas}</span> <span class='nx-keyword'>create</span> line 9 4 11 1 7 -1 -fill <span class='nx-variable'>$c1</span> -width 2 -tag <span class='nx-variable'>${</span><span class='nx-variable'>:tag}</span>
-     <span class='nx-variable'>${</span><span class='nx-variable'>:canvas}</span> <span class='nx-keyword'>create</span> line 7 -2 10 -6 15 -3 -fill <span class='nx-variable'>$c2</span> -width 2 -tag <span class='nx-variable'>${</span><span class='nx-variable'>:tag}</span>
-     <span class='nx-variable'>${</span><span class='nx-variable'>:canvas}</span> <span class='nx-keyword'>create</span> oval 9 -7 12 -10 -fill orange -outline orange -tag <span class='nx-variable'>${</span><span class='nx-variable'>:tag}</span>
-     <span class='nx-variable'>${</span><span class='nx-variable'>:canvas}</span> <span class='nx-keyword'>move</span> <span class='nx-variable'>${</span><span class='nx-variable'>:tag}</span> <span class='nx-variable'>$x</span> <span class='nx-variable'>$y</span>
+     <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:canvas}</span> <span class='nx-keyword'>create</span> oval 0 -1 18 4 -fill <span class='nx-[namespace tail [nx::self]]'>$hide</span> -outline <span class='nx-[namespace tail [nx::self]]'>$hide</span> -tag <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:tag}</span>
+     <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:canvas}</span> <span class='nx-keyword'>create</span> line 1 12 3 0 5 12 -fill <span class='nx-[namespace tail [nx::self]]'>$hide</span> -tag <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:tag}</span> -width 2
+     <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:canvas}</span> <span class='nx-keyword'>create</span> line 15 12 17 0 19 12 -fill <span class='nx-[namespace tail [nx::self]]'>$hide</span> -tag <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:tag}</span> -width 2
+     <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:canvas}</span> <span class='nx-keyword'>create</span> line 16 0 20 -7 24 -5 -fill <span class='nx-[namespace tail [nx::self]]'>$hide</span> -tag <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:tag}</span> -width 3
+     <span class='nx-[namespace tail [nx::self]]'># Jockey:
+</span>     <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:canvas}</span> <span class='nx-keyword'>create</span> line 9 4 11 1 7 -1 -fill <span class='nx-[namespace tail [nx::self]]'>$c1</span> -width 2 -tag <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:tag}</span>
+     <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:canvas}</span> <span class='nx-keyword'>create</span> line 7 -2 10 -6 15 -3 -fill <span class='nx-[namespace tail [nx::self]]'>$c2</span> -width 2 -tag <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:tag}</span>
+     <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:canvas}</span> <span class='nx-keyword'>create</span> oval 9 -7 12 -10 -fill orange -outline orange -tag <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:tag}</span>
+     <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:canvas}</span> <span class='nx-keyword'>move</span> <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:tag}</span> <span class='nx-[namespace tail [nx::self]]'>$x</span> <span class='nx-[namespace tail [nx::self]]'>$y</span>
    }
 
    <span class='nx-keyword'>:method</span> <span class='nx-keyword'>init</span> {} {
-     <span class='nx-keyword'>set</span> w [entry <span class='nx-variable'>${</span><span class='nx-variable'>:canvas}</span>.e<span class='nx-variable'>${</span><span class='nx-variable'>:n}</span> -textvar [:bindvar name] -width 7 -bg green3]
-     <span class='nx-variable'>${</span><span class='nx-variable'>:canvas}</span> <span class='nx-keyword'>create</span> window 5 [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:n}</span>*30+5}] -window <span class='nx-variable'>$w</span> -anchor nw
-     :draw 70 [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:n}</span>*30+14}]
+     <span class='nx-keyword'>set</span> w [entry <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:canvas}</span>.e<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:n}</span> -textvar [:bindvar name] -width 7 -bg green3]
+     <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:canvas}</span> <span class='nx-keyword'>create</span> window 5 [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:n}</span>*30+5}] -window <span class='nx-[namespace tail [nx::self]]'>$w</span> -anchor nw
+     :draw 70 [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:n}</span>*30+14}]
    }
  }
 
- <span class='nx-comment'>##############################################################################
-</span> <span class='nx-comment'># Class HorseGame
-</span> <span class='nx-comment'>#
-</span> <span class='nx-comment'># Defines the main canvas of the Game and contains the logic of
-</span> <span class='nx-comment'># starting, resetting etc.
-</span> <span class='nx-comment'>##############################################################################
+ <span class='nx-[namespace tail [nx::self]]'>##############################################################################
+</span> <span class='nx-[namespace tail [nx::self]]'># Class HorseGame
+</span> <span class='nx-[namespace tail [nx::self]]'>#
+</span> <span class='nx-[namespace tail [nx::self]]'># Defines the main canvas of the Game and contains the logic of
+</span> <span class='nx-[namespace tail [nx::self]]'># starting, resetting etc.
+</span> <span class='nx-[namespace tail [nx::self]]'>##############################################################################
 </span>
  <span class='nx-keyword'>nx::Class</span> <span class='nx-keyword'>create</span> HorseGame {
-   <span class='nx-keyword'>:property</span> {bg1 green4}   ;<span class='nx-comment'># background color of the canvas
-</span>   <span class='nx-keyword'>:property</span> {bg2 green3}   ;<span class='nx-comment'># background color of the result label
-</span>   <span class='nx-keyword'>:property</span> {width 750}    ;<span class='nx-comment'># width of the canvas
-</span>   <span class='nx-keyword'>:property</span> {height 330}   ;<span class='nx-comment'># height of the canvas
-</span>   <span class='nx-keyword'>:property</span> {horses}       ;<span class='nx-comment'># a list of horse names participating in the game
+   <span class='nx-keyword'>:property</span> {bg1 green4}   ;<span class='nx-[namespace tail [nx::self]]'># background color of the canvas
+</span>   <span class='nx-keyword'>:property</span> {bg2 green3}   ;<span class='nx-[namespace tail [nx::self]]'># background color of the result label
+</span>   <span class='nx-keyword'>:property</span> {width 750}    ;<span class='nx-[namespace tail [nx::self]]'># width of the canvas
+</span>   <span class='nx-keyword'>:property</span> {height 330}   ;<span class='nx-[namespace tail [nx::self]]'># height of the canvas
+</span>   <span class='nx-keyword'>:property</span> {horses}       ;<span class='nx-[namespace tail [nx::self]]'># a list of horse names participating in the game
 </span>
-   <span class='nx-keyword'>:require</span> trait nx::traits::callback
-   <span class='nx-keyword'>:require</span> trait nx::traits::listUtils
+   <span class='nx-keyword'>:require</span> trait nx::trait::callback
+   <span class='nx-keyword'>:require</span> trait nx::trait::listUtils
 
    <span class='nx-keyword'>:method</span> <span class='nx-keyword'>init</span> {} {
-     <span class='nx-comment'>#
-</span>     <span class='nx-comment'># create the canvas
-</span>     <span class='nx-comment'>#
-</span>     <span class='nx-keyword'>set</span> :canvas [canvas .c -bg <span class='nx-variable'>${</span><span class='nx-variable'>:bg1}</span> -width <span class='nx-variable'>${</span><span class='nx-variable'>:width}</span> -height <span class='nx-variable'>${</span><span class='nx-variable'>:height}</span>]
-     pack <span class='nx-variable'>${</span><span class='nx-variable'>:canvas}</span>
-     <span class='nx-comment'>#
-</span>     <span class='nx-comment'># create the Horses
-</span>     <span class='nx-comment'>#
+     <span class='nx-[namespace tail [nx::self]]'>#
+</span>     <span class='nx-[namespace tail [nx::self]]'># create the canvas
+</span>     <span class='nx-[namespace tail [nx::self]]'>#
+</span>     <span class='nx-keyword'>set</span> :canvas [canvas .c -bg <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:bg1}</span> -width <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:width}</span> -height <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:height}</span>]
+     pack <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:canvas}</span>
+     <span class='nx-[namespace tail [nx::self]]'>#
+</span>     <span class='nx-[namespace tail [nx::self]]'># create the Horses
+</span>     <span class='nx-[namespace tail [nx::self]]'>#
 </span>     <span class='nx-keyword'>set</span> n 0
-     <span class='nx-keyword'>foreach</span> name <span class='nx-variable'>${</span><span class='nx-variable'>:horses}</span> {
-       <span class='nx-keyword'>set</span> h [::Horse <span class='nx-keyword'>create</span> horse<span class='nx-variable'>$n</span> -name <span class='nx-variable'>$name</span> -canvas <span class='nx-variable'>${</span><span class='nx-variable'>:canvas}</span> -n <span class='nx-variable'>$n</span> -tag horse<span class='nx-variable'>$n</span>]
-       <span class='nx-keyword'>lappend</span> :tags horse<span class='nx-variable'>$n</span>
+     <span class='nx-keyword'>foreach</span> name <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:horses}</span> {
+       <span class='nx-keyword'>set</span> h [::Horse <span class='nx-keyword'>create</span> horse<span class='nx-[namespace tail [nx::self]]'>$n</span> -name <span class='nx-[namespace tail [nx::self]]'>$name</span> -canvas <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:canvas}</span> -n <span class='nx-[namespace tail [nx::self]]'>$n</span> -tag horse<span class='nx-[namespace tail [nx::self]]'>$n</span>]
+       <span class='nx-keyword'>lappend</span> :tags horse<span class='nx-[namespace tail [nx::self]]'>$n</span>
        <span class='nx-keyword'>incr</span> n
      }
 
-     <span class='nx-comment'># finish line
-</span>     <span class='nx-keyword'>set</span> w [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:width}</span> - 20}]
-     <span class='nx-variable'>${</span><span class='nx-variable'>:canvas}</span> <span class='nx-keyword'>create</span> line <span class='nx-variable'>$w</span> 0 <span class='nx-variable'>$w</span> <span class='nx-variable'>${</span><span class='nx-variable'>:height}</span> -fill white -tag finish
+     <span class='nx-[namespace tail [nx::self]]'># finish line
+</span>     <span class='nx-keyword'>set</span> w [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:width}</span> - 20}]
+     <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:canvas}</span> <span class='nx-keyword'>create</span> line <span class='nx-[namespace tail [nx::self]]'>$w</span> 0 <span class='nx-[namespace tail [nx::self]]'>$w</span> <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:height}</span> -fill white -tag finish
 
-     <span class='nx-comment'># start button
-</span>     button <span class='nx-variable'>${</span><span class='nx-variable'>:canvas}</span>.button -text Start -pady 0 -width 0 \
-         -command [:callback start <span class='nx-variable'>${</span><span class='nx-variable'>:tags}</span>]
-     <span class='nx-variable'>${</span><span class='nx-variable'>:canvas}</span> <span class='nx-keyword'>create</span> window 5 [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>$n</span>*30}] -window <span class='nx-variable'>${</span><span class='nx-variable'>:canvas}</span>.button -anchor nw
+     <span class='nx-[namespace tail [nx::self]]'># start button
+</span>     button <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:canvas}</span>.button -text Start -pady 0 -width 0 \
+         -command [:callback start <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:tags}</span>]
+     <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:canvas}</span> <span class='nx-keyword'>create</span> window 5 [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>$n</span>*30}] -window <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:canvas}</span>.button -anchor nw
 
-     <span class='nx-comment'># label for the results
-</span>     label <span class='nx-variable'>${</span><span class='nx-variable'>:canvas}</span>.winners -textvar [:bindvar winners] -bg <span class='nx-variable'>${</span><span class='nx-variable'>:bg2}</span> -width 80
-     <span class='nx-variable'>${</span><span class='nx-variable'>:canvas}</span> <span class='nx-keyword'>create</span> window 70 [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>$n</span>*30}] -window <span class='nx-variable'>${</span><span class='nx-variable'>:canvas}</span>.winners -anchor nw
+     <span class='nx-[namespace tail [nx::self]]'># label for the results
+</span>     label <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:canvas}</span>.winners -textvar [:bindvar winners] -bg <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:bg2}</span> -width 80
+     <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:canvas}</span> <span class='nx-keyword'>create</span> window 70 [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>$n</span>*30}] -window <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:canvas}</span>.winners -anchor nw
    }
 
    <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> start {running} {
-     <span class='nx-comment'>#
-</span>     <span class='nx-comment'># When the "Start" button is pressed, we turn this button into a
-</span>     <span class='nx-comment'># "Reset" button and the horse race starts. We stop, when more
-</span>     <span class='nx-comment'># than two horses pass the finish line.
-</span>     <span class='nx-comment'>#
-</span>     <span class='nx-variable'>${</span><span class='nx-variable'>:canvas}</span>.button config -text Reset -command [:callback reset]
+     <span class='nx-[namespace tail [nx::self]]'>#
+</span>     <span class='nx-[namespace tail [nx::self]]'># When the "Start" button is pressed, we turn this button into a
+</span>     <span class='nx-[namespace tail [nx::self]]'># "Reset" button and the horse race starts. We stop, when more
+</span>     <span class='nx-[namespace tail [nx::self]]'># than two horses pass the finish line.
+</span>     <span class='nx-[namespace tail [nx::self]]'>#
+</span>     <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:canvas}</span>.button config -text Reset -command [:callback reset]
      <span class='nx-keyword'>set</span> :winners {}
-     <span class='nx-keyword'>set</span> finish [<span class='nx-keyword'>expr</span> {[<span class='nx-keyword'>lindex</span> [<span class='nx-variable'>${</span><span class='nx-variable'>:canvas}</span> bbox finish] 2]+10}]
-     <span class='nx-keyword'>while</span> {[<span class='nx-keyword'>llength</span> <span class='nx-variable'>${</span><span class='nx-variable'>:winners}</span>]&lt;3} {
-       <span class='nx-keyword'>set</span> this [:lpick <span class='nx-variable'>$running</span>]
-       <span class='nx-variable'>${</span><span class='nx-variable'>:canvas}</span> <span class='nx-keyword'>move</span> <span class='nx-variable'>$this</span> [:lpick {0 1 2 3}] 0
+     <span class='nx-keyword'>set</span> finish [<span class='nx-keyword'>expr</span> {[<span class='nx-keyword'>lindex</span> [<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:canvas}</span> bbox finish] 2]+10}]
+     <span class='nx-keyword'>while</span> {[<span class='nx-keyword'>llength</span> <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:winners}</span>]&lt;3} {
+       <span class='nx-keyword'>set</span> this [:lpick <span class='nx-[namespace tail [nx::self]]'>$running</span>]
+       <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:canvas}</span> <span class='nx-keyword'>move</span> <span class='nx-[namespace tail [nx::self]]'>$this</span> [:lpick {0 1 2 3}] 0
        <span class='nx-keyword'>update</span>
-       <span class='nx-keyword'>if</span> {[<span class='nx-keyword'>lindex</span> [<span class='nx-variable'>${</span><span class='nx-variable'>:canvas}</span> bbox <span class='nx-variable'>$this</span>] 2] &gt; <span class='nx-variable'>$finish</span>} {
-         <span class='nx-keyword'>lappend</span> :winners [<span class='nx-keyword'>expr</span> {[<span class='nx-keyword'>llength</span> <span class='nx-variable'>${</span><span class='nx-variable'>:winners}</span>]+1}]:[<span class='nx-variable'>$this</span> <span class='nx-keyword'>cget</span> -name]
-         :lremove running <span class='nx-variable'>$this</span>
+       <span class='nx-keyword'>if</span> {[<span class='nx-keyword'>lindex</span> [<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:canvas}</span> bbox <span class='nx-[namespace tail [nx::self]]'>$this</span>] 2] &gt; <span class='nx-[namespace tail [nx::self]]'>$finish</span>} {
+         <span class='nx-keyword'>lappend</span> :winners [<span class='nx-keyword'>expr</span> {[<span class='nx-keyword'>llength</span> <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:winners}</span>]+1}]:[<span class='nx-[namespace tail [nx::self]]'>$this</span> <span class='nx-keyword'>cget</span> -name]
+         :lremove running <span class='nx-[namespace tail [nx::self]]'>$this</span>
        }
      }
    }
 
    <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> reset {} {
-     <span class='nx-comment'>#
-</span>     <span class='nx-comment'># When the "Reset" button is pressed, we switch back to the start
-</span>     <span class='nx-comment'># configuration, the horses come back to the start.
-</span>     <span class='nx-comment'>#
-</span>     <span class='nx-variable'>${</span><span class='nx-variable'>:canvas}</span>.button config -text Start -command [:callback start <span class='nx-variable'>${</span><span class='nx-variable'>:tags}</span>]
-     <span class='nx-keyword'>foreach</span> tag <span class='nx-variable'>${</span><span class='nx-variable'>:tags}</span> {
-       <span class='nx-keyword'>set</span> x [<span class='nx-keyword'>lindex</span> [<span class='nx-variable'>${</span><span class='nx-variable'>:canvas}</span> bbox <span class='nx-variable'>$tag</span>] 0]
-       <span class='nx-variable'>${</span><span class='nx-variable'>:canvas}</span> <span class='nx-keyword'>move</span> <span class='nx-variable'>$tag</span> [<span class='nx-keyword'>expr</span> {70-<span class='nx-variable'>$x</span>}] 0
+     <span class='nx-[namespace tail [nx::self]]'>#
+</span>     <span class='nx-[namespace tail [nx::self]]'># When the "Reset" button is pressed, we switch back to the start
+</span>     <span class='nx-[namespace tail [nx::self]]'># configuration, the horses come back to the start.
+</span>     <span class='nx-[namespace tail [nx::self]]'>#
+</span>     <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:canvas}</span>.button config -text Start -command [:callback start <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:tags}</span>]
+     <span class='nx-keyword'>foreach</span> tag <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:tags}</span> {
+       <span class='nx-keyword'>set</span> x [<span class='nx-keyword'>lindex</span> [<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:canvas}</span> bbox <span class='nx-[namespace tail [nx::self]]'>$tag</span>] 0]
+       <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:canvas}</span> <span class='nx-keyword'>move</span> <span class='nx-[namespace tail [nx::self]]'>$tag</span> [<span class='nx-keyword'>expr</span> {70-<span class='nx-[namespace tail [nx::self]]'>$x</span>}] 0
      }
    }
  }
 
- <span class='nx-comment'>#
-</span> <span class='nx-comment'># everything is defined, create the game
-</span> <span class='nx-comment'>#
-</span> bind . &lt;space&gt; {<span class='nx-keyword'>exec</span> wish <span class='nx-variable'>$argv0</span> &amp;; <span class='nx-keyword'>exit</span>}
+ <span class='nx-[namespace tail [nx::self]]'>#
+</span> <span class='nx-[namespace tail [nx::self]]'># everything is defined, create the game
+</span> <span class='nx-[namespace tail [nx::self]]'>#
+</span> bind . &lt;space&gt; {<span class='nx-keyword'>exec</span> wish <span class='nx-[namespace tail [nx::self]]'>$argv0</span> &amp;; <span class='nx-keyword'>exit</span>}
  HorseGame <span class='nx-keyword'>new</span> -horses {Blaise NX Animal Ada Alan XOTcl Grace itcl John Linus}</pre></div></div>
 </div>
 </div>
 </div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2013-06-07 14:19:11 CEST
+Last updated 2016-12-23 11:04:14 CET
 </div>
 </div>
 </body>
Index: doc/example-scripts/tk-horse-race.tcl
===================================================================
diff -u -r31e9b2929718e014fbbad009eb69af6dff0c120a -r71e18053ef7dd9a53f11d14f3a91b8a1091e90bb
--- doc/example-scripts/tk-horse-race.tcl	(.../tk-horse-race.tcl)	(revision 31e9b2929718e014fbbad009eb69af6dff0c120a)
+++ doc/example-scripts/tk-horse-race.tcl	(.../tk-horse-race.tcl)	(revision 71e18053ef7dd9a53f11d14f3a91b8a1091e90bb)
@@ -13,7 +13,7 @@
  # Some list utilities, not part of a package we can require here.
  ##############################################################################
 
- nx::Trait create ::nx::traits::listUtils {
+ nx::Trait create ::nx::trait::listUtils {
 
    :protected method lpick {list} {
      # return a random entry from a given list
@@ -41,8 +41,8 @@
    :property canvas:required    ;# the canvas, on which the horse is drawn
    :property n:integer,required ;# the position on the canvas
    
-   :require trait nx::traits::callback
-   :require trait nx::traits::listUtils
+   :require trait nx::trait::callback
+   :require trait nx::trait::listUtils
    
    :method draw {x y} {
      set hide [:lpick {black brown white gray brown3 brown4}]
@@ -80,8 +80,8 @@
    :property {height 330}   ;# height of the canvas
    :property {horses}       ;# a list of horse names participating in the game
    
-   :require trait nx::traits::callback
-   :require trait nx::traits::listUtils
+   :require trait nx::trait::callback
+   :require trait nx::trait::listUtils
    
    :method init {} {
      #
Index: doc/example-scripts/tk-locomotive.html
===================================================================
diff -u -r7c692cef773e19f9da59bef6498ba673cdff468e -r71e18053ef7dd9a53f11d14f3a91b8a1091e90bb
--- doc/example-scripts/tk-locomotive.html	(.../tk-locomotive.html)	(revision 7c692cef773e19f9da59bef6498ba673cdff468e)
+++ doc/example-scripts/tk-locomotive.html	(.../tk-locomotive.html)	(revision 71e18053ef7dd9a53f11d14f3a91b8a1091e90bb)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.8" />
+<meta name="generator" content="AsciiDoc 8.6.9" />
 <title>Listing of doc/example-scripts/tk-locomotive.tcl</title>
 <style type="text/css">
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -94,8 +94,10 @@
   padding: 0;
   margin: 0;
 }
+pre {
+  white-space: pre-wrap;
+}
 
-
 #author {
   color: #527bbd;
   font-weight: bold;
@@ -223,7 +225,7 @@
 }
 
 div.imageblock div.content { padding-left: 0; }
-span.image img { border-style: none; }
+span.image img { border-style: none; vertical-align: text-bottom; }
 a.image:visited { color: white; }
 
 dl {
@@ -782,107 +784,107 @@
 
   <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> drawSpokes {} {
     ::nx::var import [<span class='nx-keyword'>:info</span> parent] c alpha
-    <span class='nx-keyword'>set</span> delta [<span class='nx-keyword'>expr</span> {360.0 / <span class='nx-variable'>${</span><span class='nx-variable'>:spokes}</span>}]
+    <span class='nx-keyword'>set</span> delta [<span class='nx-keyword'>expr</span> {360.0 / <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:spokes}</span>}]
     <span class='nx-keyword'>set</span> deg2arc [<span class='nx-keyword'>expr</span> {atan(1.0)*8/360.}]
-    <span class='nx-keyword'>for</span> {<span class='nx-keyword'>set</span> i 0} {<span class='nx-variable'>$i</span> &lt; <span class='nx-variable'>${</span><span class='nx-variable'>:spokes}</span>} {<span class='nx-keyword'>incr</span> i} {
-      <span class='nx-keyword'>set</span> x1 [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:x}</span> + cos(<span class='nx-variable'>$deg2arc</span>*<span class='nx-variable'>$alpha</span>) * <span class='nx-variable'>${</span><span class='nx-variable'>:r}</span>}]
-      <span class='nx-keyword'>set</span> y1 [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:y}</span> + sin(<span class='nx-variable'>$deg2arc</span>*<span class='nx-variable'>$alpha</span>) * <span class='nx-variable'>${</span><span class='nx-variable'>:r}</span>}]
-      <span class='nx-variable'>$c</span> <span class='nx-keyword'>create</span> line <span class='nx-variable'>${</span><span class='nx-variable'>:x}</span> <span class='nx-variable'>${</span><span class='nx-variable'>:y}</span> <span class='nx-variable'>$x1</span> <span class='nx-variable'>$y1</span> -fill <span class='nx-variable'>${</span><span class='nx-variable'>:color}</span> -tag spoke
-      <span class='nx-keyword'>set</span> alpha [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>$alpha</span> + <span class='nx-variable'>$delta</span>}]
+    <span class='nx-keyword'>for</span> {<span class='nx-keyword'>set</span> i 0} {<span class='nx-[namespace tail [nx::self]]'>$i</span> &lt; <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:spokes}</span>} {<span class='nx-keyword'>incr</span> i} {
+      <span class='nx-keyword'>set</span> x1 [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:x}</span> + cos(<span class='nx-[namespace tail [nx::self]]'>$deg2arc</span>*<span class='nx-[namespace tail [nx::self]]'>$alpha</span>) * <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:r}</span>}]
+      <span class='nx-keyword'>set</span> y1 [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:y}</span> + sin(<span class='nx-[namespace tail [nx::self]]'>$deg2arc</span>*<span class='nx-[namespace tail [nx::self]]'>$alpha</span>) * <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:r}</span>}]
+      <span class='nx-[namespace tail [nx::self]]'>$c</span> <span class='nx-keyword'>create</span> line <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:x}</span> <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:y}</span> <span class='nx-[namespace tail [nx::self]]'>$x1</span> <span class='nx-[namespace tail [nx::self]]'>$y1</span> -fill <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:color}</span> -tag spoke
+      <span class='nx-keyword'>set</span> alpha [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>$alpha</span> + <span class='nx-[namespace tail [nx::self]]'>$delta</span>}]
     }
     <span class='nx-keyword'>if</span> {[<span class='nx-keyword'>info</span> exists :act_pivot]} {
       <span class='nx-keyword'>lassign</span> [<span class='nx-keyword'>set</span> :act_pivot] item perc
-      <span class='nx-keyword'>set</span> rp [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:r}</span> * <span class='nx-variable'>$perc</span>}]
-      <span class='nx-keyword'>set</span> xp [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:x}</span> - <span class='nx-variable'>$rp</span> * cos(<span class='nx-variable'>$deg2arc</span> * <span class='nx-variable'>$alpha</span>)}]
-      <span class='nx-keyword'>set</span> yp [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:y}</span> - <span class='nx-variable'>$rp</span> * sin(<span class='nx-variable'>$deg2arc</span> * <span class='nx-variable'>$alpha</span>)}]
-      <span class='nx-variable'>$c</span> coords <span class='nx-variable'>$item</span> <span class='nx-variable'>$xp</span> <span class='nx-variable'>$yp</span> [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>$xp</span> + 1}] [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>$yp</span> + 1}]
+      <span class='nx-keyword'>set</span> rp [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:r}</span> * <span class='nx-[namespace tail [nx::self]]'>$perc</span>}]
+      <span class='nx-keyword'>set</span> xp [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:x}</span> - <span class='nx-[namespace tail [nx::self]]'>$rp</span> * cos(<span class='nx-[namespace tail [nx::self]]'>$deg2arc</span> * <span class='nx-[namespace tail [nx::self]]'>$alpha</span>)}]
+      <span class='nx-keyword'>set</span> yp [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:y}</span> - <span class='nx-[namespace tail [nx::self]]'>$rp</span> * sin(<span class='nx-[namespace tail [nx::self]]'>$deg2arc</span> * <span class='nx-[namespace tail [nx::self]]'>$alpha</span>)}]
+      <span class='nx-[namespace tail [nx::self]]'>$c</span> coords <span class='nx-[namespace tail [nx::self]]'>$item</span> <span class='nx-[namespace tail [nx::self]]'>$xp</span> <span class='nx-[namespace tail [nx::self]]'>$yp</span> [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>$xp</span> + 1}] [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>$yp</span> + 1}]
     }
   }
 
   <span class='nx-keyword'>:method</span> <span class='nx-keyword'>init</span> {} {
     ::nx::var import [<span class='nx-keyword'>:info</span> parent] c alpha
     <span class='nx-keyword'>set</span> alpha 0.
 
-    <span class='nx-keyword'>set</span> :y [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:y}</span> - <span class='nx-variable'>${</span><span class='nx-variable'>:r}</span>}]
-    <span class='nx-variable'>$c</span> <span class='nx-keyword'>create</span> oval \
-        [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:x}</span> - <span class='nx-variable'>${</span><span class='nx-variable'>:r}</span>}] [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:y}</span> - <span class='nx-variable'>${</span><span class='nx-variable'>:r}</span>}] \
-        [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:x}</span> + <span class='nx-variable'>${</span><span class='nx-variable'>:r}</span>}] [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:y}</span> + <span class='nx-variable'>${</span><span class='nx-variable'>:r}</span>}] \
+    <span class='nx-keyword'>set</span> :y [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:y}</span> - <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:r}</span>}]
+    <span class='nx-[namespace tail [nx::self]]'>$c</span> <span class='nx-keyword'>create</span> oval \
+        [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:x}</span> - <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:r}</span>}] [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:y}</span> - <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:r}</span>}] \
+        [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:x}</span> + <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:r}</span>}] [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:y}</span> + <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:r}</span>}] \
         -outline white
-    <span class='nx-keyword'>set</span> r1 [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:r}</span>-2}]
-    <span class='nx-keyword'>set</span> W [<span class='nx-variable'>$c</span> <span class='nx-keyword'>create</span> oval \
-               [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:x}</span> - <span class='nx-variable'>$r1</span>}] [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:y}</span> - <span class='nx-variable'>$r1</span>}] \
-               [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:x}</span> + <span class='nx-variable'>$r1</span>}] [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:y}</span> + <span class='nx-variable'>$r1</span>}] \
-               -outline <span class='nx-variable'>${</span><span class='nx-variable'>:color}</span> -width 2]
+    <span class='nx-keyword'>set</span> r1 [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:r}</span>-2}]
+    <span class='nx-keyword'>set</span> W [<span class='nx-[namespace tail [nx::self]]'>$c</span> <span class='nx-keyword'>create</span> oval \
+               [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:x}</span> - <span class='nx-[namespace tail [nx::self]]'>$r1</span>}] [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:y}</span> - <span class='nx-[namespace tail [nx::self]]'>$r1</span>}] \
+               [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:x}</span> + <span class='nx-[namespace tail [nx::self]]'>$r1</span>}] [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:y}</span> + <span class='nx-[namespace tail [nx::self]]'>$r1</span>}] \
+               -outline <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:color}</span> -width 2]
     :drawSpokes
 
-    <span class='nx-keyword'>if</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:pivot}</span>} {
+    <span class='nx-keyword'>if</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:pivot}</span>} {
       <span class='nx-keyword'>set</span> deg2arc [<span class='nx-keyword'>expr</span> {atan(1.0) * 8 / 360.0}]
-      <span class='nx-keyword'>set</span> rp [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>$r1</span>*<span class='nx-variable'>${</span><span class='nx-variable'>:pivot}</span>}]
-      <span class='nx-keyword'>set</span> xp [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:x}</span> - <span class='nx-variable'>$rp</span> * cos(<span class='nx-variable'>$deg2arc</span> * <span class='nx-variable'>$alpha</span>)}]
-      <span class='nx-keyword'>set</span> yp [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:y}</span> - <span class='nx-variable'>$rp</span> * sin(<span class='nx-variable'>$deg2arc</span> * <span class='nx-variable'>$alpha</span>)}]
-      <span class='nx-keyword'>set</span> new_pivot [<span class='nx-variable'>$c</span> <span class='nx-keyword'>create</span> rect <span class='nx-variable'>$xp</span> <span class='nx-variable'>$yp</span> [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>$xp</span> + 1}] [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>$yp</span> + 1}] \
-                         -fill <span class='nx-variable'>${</span><span class='nx-variable'>:color}</span> -tag [<span class='nx-keyword'>list</span> <span class='nx-variable'>${</span><span class='nx-variable'>:tag}</span> pivot]]
-      <span class='nx-keyword'>set</span> :act_pivot [<span class='nx-keyword'>list</span> <span class='nx-variable'>$new_pivot</span> <span class='nx-variable'>${</span><span class='nx-variable'>:pivot}</span>]
+      <span class='nx-keyword'>set</span> rp [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>$r1</span>*<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:pivot}</span>}]
+      <span class='nx-keyword'>set</span> xp [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:x}</span> - <span class='nx-[namespace tail [nx::self]]'>$rp</span> * cos(<span class='nx-[namespace tail [nx::self]]'>$deg2arc</span> * <span class='nx-[namespace tail [nx::self]]'>$alpha</span>)}]
+      <span class='nx-keyword'>set</span> yp [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:y}</span> - <span class='nx-[namespace tail [nx::self]]'>$rp</span> * sin(<span class='nx-[namespace tail [nx::self]]'>$deg2arc</span> * <span class='nx-[namespace tail [nx::self]]'>$alpha</span>)}]
+      <span class='nx-keyword'>set</span> new_pivot [<span class='nx-[namespace tail [nx::self]]'>$c</span> <span class='nx-keyword'>create</span> rect <span class='nx-[namespace tail [nx::self]]'>$xp</span> <span class='nx-[namespace tail [nx::self]]'>$yp</span> [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>$xp</span> + 1}] [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>$yp</span> + 1}] \
+                         -fill <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:color}</span> -tag [<span class='nx-keyword'>list</span> <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:tag}</span> pivot]]
+      <span class='nx-keyword'>set</span> :act_pivot [<span class='nx-keyword'>list</span> <span class='nx-[namespace tail [nx::self]]'>$new_pivot</span> <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:pivot}</span>]
 
-      <span class='nx-variable'>$c</span> <span class='nx-keyword'>create</span> arc [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:x}</span> - <span class='nx-variable'>$r1</span>}] [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:y}</span> - <span class='nx-variable'>$r1</span>}]\
-          [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:x}</span> + <span class='nx-variable'>$r1</span>}] [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:y}</span> + <span class='nx-variable'>$r1</span>}] \
-          -style chord -fill <span class='nx-variable'>${</span><span class='nx-variable'>:color}</span> -start 310 \
+      <span class='nx-[namespace tail [nx::self]]'>$c</span> <span class='nx-keyword'>create</span> arc [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:x}</span> - <span class='nx-[namespace tail [nx::self]]'>$r1</span>}] [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:y}</span> - <span class='nx-[namespace tail [nx::self]]'>$r1</span>}]\
+          [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:x}</span> + <span class='nx-[namespace tail [nx::self]]'>$r1</span>}] [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:y}</span> + <span class='nx-[namespace tail [nx::self]]'>$r1</span>}] \
+          -style chord -fill <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:color}</span> -start 310 \
           -extent 80 -tag counterweight
-      <span class='nx-keyword'>set</span> :pivot <span class='nx-variable'>$new_pivot</span>
+      <span class='nx-keyword'>set</span> :pivot <span class='nx-[namespace tail [nx::self]]'>$new_pivot</span>
     }
-    <span class='nx-keyword'>set</span> rh [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:r}</span> / 12.0}]
-    <span class='nx-variable'>$c</span> <span class='nx-keyword'>create</span> oval \
-        [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:x}</span> - <span class='nx-variable'>$rh</span>}] [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:y}</span> - <span class='nx-variable'>$rh</span>}] \
-        [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:x}</span> + <span class='nx-variable'>$rh</span>}] [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:y}</span> + <span class='nx-variable'>$rh</span>}] \
+    <span class='nx-keyword'>set</span> rh [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:r}</span> / 12.0}]
+    <span class='nx-[namespace tail [nx::self]]'>$c</span> <span class='nx-keyword'>create</span> oval \
+        [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:x}</span> - <span class='nx-[namespace tail [nx::self]]'>$rh</span>}] [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:y}</span> - <span class='nx-[namespace tail [nx::self]]'>$rh</span>}] \
+        [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:x}</span> + <span class='nx-[namespace tail [nx::self]]'>$rh</span>}] [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:y}</span> + <span class='nx-[namespace tail [nx::self]]'>$rh</span>}] \
         -fill white -tag hub
-    <span class='nx-keyword'>set</span> :r <span class='nx-variable'>$r1</span>
+    <span class='nx-keyword'>set</span> :r <span class='nx-[namespace tail [nx::self]]'>$r1</span>
   }
 }
 
 
 <span class='nx-keyword'>nx::Class</span> <span class='nx-keyword'>create</span> Locomotive {
   <span class='nx-keyword'>:property</span> {speed 4}
 
-  <span class='nx-keyword'>:require</span> trait nx::traits::callback
+  <span class='nx-keyword'>:require</span> trait nx::trait::callback
 
   <span class='nx-keyword'>:method</span> turn {} {
-    <span class='nx-keyword'>set</span> :alpha [<span class='nx-keyword'>expr</span> {round(<span class='nx-variable'>${</span><span class='nx-variable'>:alpha}</span> + 360 - <span class='nx-variable'>${</span><span class='nx-variable'>:speed}</span>) % 360}]
-    <span class='nx-keyword'>foreach</span> i [<span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> find withtag counterweight] {
-      <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> itemconfig <span class='nx-variable'>$i</span> -start [<span class='nx-keyword'>expr</span> {310 - <span class='nx-variable'>${</span><span class='nx-variable'>:alpha}</span>}]
+    <span class='nx-keyword'>set</span> :alpha [<span class='nx-keyword'>expr</span> {round(<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:alpha}</span> + 360 - <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:speed}</span>) % 360}]
+    <span class='nx-keyword'>foreach</span> i [<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> find withtag counterweight] {
+      <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> itemconfig <span class='nx-[namespace tail [nx::self]]'>$i</span> -start [<span class='nx-keyword'>expr</span> {310 - <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:alpha}</span>}]
     }
-    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>delete</span> spoke
-    <span class='nx-keyword'>foreach</span> wheel [<span class='nx-keyword'>:info</span> children] { <span class='nx-variable'>$wheel</span> drawSpokes }
-    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> raise hub
-    <span class='nx-keyword'>set</span> xp0 [<span class='nx-keyword'>expr</span> {105 + 15 * sin((<span class='nx-variable'>${</span><span class='nx-variable'>:alpha}</span> - 90) * atan(1.0) * 8 / 360)}]
-    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>delete</span> piston
-    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> coords p0 <span class='nx-variable'>$xp0</span> 120 [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>$xp0</span>+2}] 122 ;<span class='nx-comment'>#CW
-</span>    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> line 90 121 <span class='nx-variable'>$xp0</span> 121 -width 2 -fill white -tag piston ;<span class='nx-comment'>#CW
+    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>delete</span> spoke
+    <span class='nx-keyword'>foreach</span> wheel [<span class='nx-keyword'>:info</span> children] { <span class='nx-[namespace tail [nx::self]]'>$wheel</span> drawSpokes }
+    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> raise hub
+    <span class='nx-keyword'>set</span> xp0 [<span class='nx-keyword'>expr</span> {105 + 15 * sin((<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:alpha}</span> - 90) * atan(1.0) * 8 / 360)}]
+    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>delete</span> piston
+    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> coords p0 <span class='nx-[namespace tail [nx::self]]'>$xp0</span> 120 [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>$xp0</span>+2}] 122 ;<span class='nx-[namespace tail [nx::self]]'>#CW
+</span>    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> line 90 121 <span class='nx-[namespace tail [nx::self]]'>$xp0</span> 121 -width 2 -fill white -tag piston ;<span class='nx-[namespace tail [nx::self]]'>#CW
 </span>    :drawRod p0 p1 p2 p3
-    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> raise p0
-    <span class='nx-keyword'>foreach</span> i [<span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> find withtag smoke] {
-      <span class='nx-keyword'>if</span> {[<span class='nx-keyword'>lindex</span> [<span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> bbox <span class='nx-variable'>$i</span>] 3]&lt;0} {
-        <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>delete</span> <span class='nx-variable'>$i</span>
+    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> raise p0
+    <span class='nx-keyword'>foreach</span> i [<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> find withtag smoke] {
+      <span class='nx-keyword'>if</span> {[<span class='nx-keyword'>lindex</span> [<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> bbox <span class='nx-[namespace tail [nx::self]]'>$i</span>] 3]&lt;0} {
+        <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>delete</span> <span class='nx-[namespace tail [nx::self]]'>$i</span>
       } <span class='nx-keyword'>else</span> {
-        <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>move</span> <span class='nx-variable'>$i</span> [<span class='nx-keyword'>expr</span> {rand() * <span class='nx-variable'>${</span><span class='nx-variable'>:speed}</span> / 3.0}] [<span class='nx-keyword'>expr</span> {rand() * 2 - 2}]
+        <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>move</span> <span class='nx-[namespace tail [nx::self]]'>$i</span> [<span class='nx-keyword'>expr</span> {rand() * <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:speed}</span> / 3.0}] [<span class='nx-keyword'>expr</span> {rand() * 2 - 2}]
       }
     }
-    <span class='nx-keyword'>set</span> t [<span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> oval [<span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> bbox chimney] -fill white -outline white -tag smoke]
-    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>move</span> <span class='nx-variable'>$t</span> 0 -10
-    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> lower smoke
+    <span class='nx-keyword'>set</span> t [<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> oval [<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> bbox chimney] -fill white -outline white -tag smoke]
+    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>move</span> <span class='nx-[namespace tail [nx::self]]'>$t</span> 0 -10
+    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> lower smoke
   }
 
   <span class='nx-keyword'>:method</span> drawRod {p0 p1 p2 p3} {
-    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>delete</span> rod
-    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect [<span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> bbox <span class='nx-variable'>$p1</span> <span class='nx-variable'>$p3</span>] -fill white -tag rod
-    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> line {*}[<span class='nx-keyword'>lrange</span> [<span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> bbox <span class='nx-variable'>$p0</span>] 0 1] \
-        {*}[<span class='nx-keyword'>lrange</span> [<span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> bbox <span class='nx-variable'>$p2</span>] 0 1] -width 3 -fill white -tag rod
-    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> raise rod
-    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> raise pivot
+    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>delete</span> rod
+    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect [<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> bbox <span class='nx-[namespace tail [nx::self]]'>$p1</span> <span class='nx-[namespace tail [nx::self]]'>$p3</span>] -fill white -tag rod
+    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> line {*}[<span class='nx-keyword'>lrange</span> [<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> bbox <span class='nx-[namespace tail [nx::self]]'>$p0</span>] 0 1] \
+        {*}[<span class='nx-keyword'>lrange</span> [<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> bbox <span class='nx-[namespace tail [nx::self]]'>$p2</span>] 0 1] -width 3 -fill white -tag rod
+    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> raise rod
+    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> raise pivot
   }
 
   <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> tick {} {
     :turn
-    <span class='nx-keyword'>foreach</span> i [<span class='nx-keyword'>after</span> <span class='nx-keyword'>info</span>] {<span class='nx-keyword'>after</span> cancel <span class='nx-variable'>$i</span>}
+    <span class='nx-keyword'>foreach</span> i [<span class='nx-keyword'>after</span> <span class='nx-keyword'>info</span>] {<span class='nx-keyword'>after</span> cancel <span class='nx-[namespace tail [nx::self]]'>$i</span>}
     <span class='nx-keyword'>after</span> 10 [<span class='nx-keyword'>self</span>] tick
   }
 
@@ -893,7 +895,7 @@
 
   <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> <span class='nx-keyword'>break</span> {} {
     <span class='nx-keyword'>incr</span> :speed -2
-    <span class='nx-keyword'>if</span> {<span class='nx-variable'>${</span><span class='nx-variable'>:speed}</span>&lt;0} {<span class='nx-keyword'>set</span> :speed 0}
+    <span class='nx-keyword'>if</span> {<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:speed}</span>&lt;0} {<span class='nx-keyword'>set</span> :speed 0}
     :tick
   }
 
@@ -904,52 +906,52 @@
 
   <span class='nx-keyword'>:method</span> <span class='nx-keyword'>init</span> {} {
     <span class='nx-keyword'>set</span> :c [canvas .c -width 600 -height 160 -background lightblue]
-    pack <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span>
+    pack <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span>
 
-    bind <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <b>&lt;1&gt;</b> [:callback throttle]
-    bind <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <b>&lt;2&gt;</b> [:callback <span class='nx-keyword'>break</span>]
-    bind <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <b>&lt;3&gt;</b> [:callback emergencyBreak]
+    bind <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <b>&lt;1&gt;</b> [:callback throttle]
+    bind <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <b>&lt;2&gt;</b> [:callback <span class='nx-keyword'>break</span>]
+    bind <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <b>&lt;3&gt;</b> [:callback emergencyBreak]
 
-    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>delete</span> all
-    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 32 115 360 125 -fill black ;<span class='nx-comment'># frame
-</span>    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 22 118 32 122 -fill grey30 ;<span class='nx-comment'># buffer
-</span>    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> line 22 115 22 125
-    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> poly 60 95 40 115 50 115 70 95 -fill black
-    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 60 45 310 95 -fill grey25 ;<span class='nx-comment'># boiler
-</span>    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> oval 55 50 65 90 -fill black ;<span class='nx-comment'># smokebox
-</span>    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 70 32 85 50 -fill black -tag chimney
-    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 40 52 90 75 -fill black ;<span class='nx-comment'># wind diverter
-</span>    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> oval 130 36 150 52 -fill black ;<span class='nx-comment'># dome
-</span>    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 195 35 215 50 -fill black ;<span class='nx-comment'># sandbox
-</span>    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> oval 260 36 280 52 -fill black ;<span class='nx-comment'># dome
-</span>    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 65 100 90 135 -fill black ;<span class='nx-comment'># cylinder
-</span>    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 90 120 92 122 -fill red -tag p0 ;<span class='nx-comment'># crossbar
-</span>    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 72 87 82 100 -fill black ;<span class='nx-comment'># steam tube
-</span>    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 310 40 370 115 -fill black ;<span class='nx-comment'># cab
-</span>    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 310 32 390 42 -fill grey30 ;<span class='nx-comment'># cab roof
-</span>    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> text 338 82 -text <span class='nx-string'>"01 234"</span> -fill gold -font {Times 7}
-    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 318 48 333 66 -fill white ;<span class='nx-comment'># cab window #1
-</span>    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 338 48 355 66 -fill white ;<span class='nx-comment'># cab window #2
+    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>delete</span> all
+    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 32 115 360 125 -fill black ;<span class='nx-[namespace tail [nx::self]]'># frame
+</span>    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 22 118 32 122 -fill grey30 ;<span class='nx-[namespace tail [nx::self]]'># buffer
+</span>    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> line 22 115 22 125
+    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> poly 60 95 40 115 50 115 70 95 -fill black
+    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 60 45 310 95 -fill grey25 ;<span class='nx-[namespace tail [nx::self]]'># boiler
+</span>    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> oval 55 50 65 90 -fill black ;<span class='nx-[namespace tail [nx::self]]'># smokebox
+</span>    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 70 32 85 50 -fill black -tag chimney
+    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 40 52 90 75 -fill black ;<span class='nx-[namespace tail [nx::self]]'># wind diverter
+</span>    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> oval 130 36 150 52 -fill black ;<span class='nx-[namespace tail [nx::self]]'># dome
+</span>    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 195 35 215 50 -fill black ;<span class='nx-[namespace tail [nx::self]]'># sandbox
+</span>    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> oval 260 36 280 52 -fill black ;<span class='nx-[namespace tail [nx::self]]'># dome
+</span>    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 65 100 90 135 -fill black ;<span class='nx-[namespace tail [nx::self]]'># cylinder
+</span>    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 90 120 92 122 -fill red -tag p0 ;<span class='nx-[namespace tail [nx::self]]'># crossbar
+</span>    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 72 87 82 100 -fill black ;<span class='nx-[namespace tail [nx::self]]'># steam tube
+</span>    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 310 40 370 115 -fill black ;<span class='nx-[namespace tail [nx::self]]'># cab
+</span>    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 310 32 390 42 -fill grey30 ;<span class='nx-[namespace tail [nx::self]]'># cab roof
+</span>    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> text 338 82 -text <span class='nx-string'>"01 234"</span> -fill gold -font {Times 7}
+    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 318 48 333 66 -fill white ;<span class='nx-[namespace tail [nx::self]]'># cab window #1
+</span>    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 338 48 355 66 -fill white ;<span class='nx-[namespace tail [nx::self]]'># cab window #2
 </span>    Wheel <span class='nx-keyword'>new</span> -childof [<span class='nx-keyword'>self</span>] -x 50 -y 150 -r 13 -spokes 12
     Wheel <span class='nx-keyword'>new</span> -childof [<span class='nx-keyword'>self</span>] -x 105 -y 150 -r 13 -spokes 12
     Wheel <span class='nx-keyword'>new</span> -childof [<span class='nx-keyword'>self</span>] -x 150 -y 150 -r 30 -pivot 0.5 -tag p1
     Wheel <span class='nx-keyword'>new</span> -childof [<span class='nx-keyword'>self</span>] -x 215 -y 150 -r 30 -pivot 0.5 -tag p2
     Wheel <span class='nx-keyword'>new</span> -childof [<span class='nx-keyword'>self</span>] -x 280 -y 150 -r 30 -pivot 0.5 -tag p3
     :drawRod p0 p1 p2 p3
     Wheel <span class='nx-keyword'>new</span> -childof [<span class='nx-keyword'>self</span>] -x 340 -y 150 -r 16 -spokes 12
-    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 360 110 380 118 -fill black
-    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 380 65 560 125 -fill black -tag tender
-    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 560 118 570 122 -fill grey30 ;<span class='nx-comment'># buffer
-</span>    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> line 571 116 571 125
-    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 390 45 525 65 -fill black -tag tender
+    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 360 110 380 118 -fill black
+    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 380 65 560 125 -fill black -tag tender
+    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 560 118 570 122 -fill grey30 ;<span class='nx-[namespace tail [nx::self]]'># buffer
+</span>    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> line 571 116 571 125
+    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 390 45 525 65 -fill black -tag tender
     Wheel <span class='nx-keyword'>new</span> -childof [<span class='nx-keyword'>self</span>] -x 395 -y 150 -r 13 -spokes 12
     Wheel <span class='nx-keyword'>new</span> -childof [<span class='nx-keyword'>self</span>] -x 440 -y 150 -r 13 -spokes 12
-    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 380 132 456 142 -fill red
+    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 380 132 456 142 -fill red
     Wheel <span class='nx-keyword'>new</span> -childof [<span class='nx-keyword'>self</span>] -x 495 -y 150 -r 13 -spokes 12
     Wheel <span class='nx-keyword'>new</span> -childof [<span class='nx-keyword'>self</span>] -x 540 -y 150 -r 13 -spokes 12
-    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 480 132 556 142 -fill red -outline red
-    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 0 150 600 160 -fill brown ;<span class='nx-comment'># earth
-</span>    <span class='nx-variable'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> line 0 150 600 150 -fill grey -width 2 ;<span class='nx-comment'># rail
+    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 480 132 556 142 -fill red -outline red
+    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> rect 0 150 600 160 -fill brown ;<span class='nx-[namespace tail [nx::self]]'># earth
+</span>    <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:c}</span> <span class='nx-keyword'>create</span> line 0 150 600 150 -fill grey -width 2 ;<span class='nx-[namespace tail [nx::self]]'># rail
 </span>    :tick
   }
 }
@@ -961,7 +963,7 @@
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2013-07-26 01:01:36 IST
+Last updated 2016-12-23 11:01:33 CET
 </div>
 </div>
 </body>
Index: doc/example-scripts/tk-locomotive.tcl
===================================================================
diff -u -r7c692cef773e19f9da59bef6498ba673cdff468e -r71e18053ef7dd9a53f11d14f3a91b8a1091e90bb
--- doc/example-scripts/tk-locomotive.tcl	(.../tk-locomotive.tcl)	(revision 7c692cef773e19f9da59bef6498ba673cdff468e)
+++ doc/example-scripts/tk-locomotive.tcl	(.../tk-locomotive.tcl)	(revision 71e18053ef7dd9a53f11d14f3a91b8a1091e90bb)
@@ -85,7 +85,7 @@
 nx::Class create Locomotive {
   :property {speed 4}
 
-  :require trait nx::traits::callback
+  :require trait nx::trait::callback
 
   :method turn {} {
     set :alpha [expr {round(${:alpha} + 360 - ${:speed}) % 360}]
Index: doc/example-scripts/tk-ludo.html
===================================================================
diff -u -rc8cc440e978deb40fd40436aa72a9d41e86532ba -r71e18053ef7dd9a53f11d14f3a91b8a1091e90bb
--- doc/example-scripts/tk-ludo.html	(.../tk-ludo.html)	(revision c8cc440e978deb40fd40436aa72a9d41e86532ba)
+++ doc/example-scripts/tk-ludo.html	(.../tk-ludo.html)	(revision 71e18053ef7dd9a53f11d14f3a91b8a1091e90bb)
@@ -871,7 +871,7 @@
     <span class='nx-keyword'>:property</span> board<span class='nx-keyword'>:object</span>,required
     <span class='nx-keyword'>:variable</span> tag <span class='nx-string'>""</span>
 
-    <span class='nx-keyword'>:require</span> trait nx::traits::callback
+    <span class='nx-keyword'>:require</span> trait nx::trait::callback
 
     <span class='nx-keyword'>:method</span> <span class='nx-keyword'>init</span> {} {
         <span class='nx-[namespace tail [nx::self]]'>#
@@ -991,7 +991,7 @@
     <span class='nx-keyword'>:property</span> {bg red}
     <span class='nx-keyword'>:property</span> {eyes 0}
 
-    <span class='nx-keyword'>:require</span> trait nx::traits::callback
+    <span class='nx-keyword'>:require</span> trait nx::trait::callback
 
     <span class='nx-keyword'>:method</span> <span class='nx-keyword'>set</span> {n} {
         <span class='nx-[namespace tail [nx::self]]'>#
@@ -1086,7 +1086,7 @@
     <span class='nx-keyword'>:property</span> {fg white}
     <span class='nx-keyword'>:property</span> {colors:1..n {red green yellow blue}}
 
-    <span class='nx-keyword'>:require</span> trait nx::traits::callback
+    <span class='nx-keyword'>:require</span> trait nx::trait::callback
 
     <span class='nx-keyword'>:method</span> <span class='nx-keyword'>lookup</span> {var idx} {
         <span class='nx-[namespace tail [nx::self]]'>#
@@ -1384,7 +1384,7 @@
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2016-10-28 22:10:15 CEST
+Last updated 2016-12-23 11:02:35 CET
 </div>
 </div>
 </body>
Index: doc/example-scripts/tk-ludo.tcl
===================================================================
diff -u -rf69105999ff5876732032cd779f3f7521ab010e5 -r71e18053ef7dd9a53f11d14f3a91b8a1091e90bb
--- doc/example-scripts/tk-ludo.tcl	(.../tk-ludo.tcl)	(revision f69105999ff5876732032cd779f3f7521ab010e5)
+++ doc/example-scripts/tk-ludo.tcl	(.../tk-ludo.tcl)	(revision 71e18053ef7dd9a53f11d14f3a91b8a1091e90bb)
@@ -65,7 +65,7 @@
     :property board:object,required
     :variable tag ""
 
-    :require trait nx::traits::callback
+    :require trait nx::trait::callback
 
     :method init {} {
 	#
@@ -170,7 +170,7 @@
     :property {bg red}
     :property {eyes 0}
 
-    :require trait nx::traits::callback
+    :require trait nx::trait::callback
 
     :method set {n} {
 	#
@@ -257,7 +257,7 @@
     :property {fg white}
     :property {colors:1..n {red green yellow blue}}
 
-    :require trait nx::traits::callback
+    :require trait nx::trait::callback
 
     :method lookup {var idx} {
 	#
Index: doc/example-scripts/tk-mini.html
===================================================================
diff -u -rd31c271afb2488abafa0642b07538a3e62106130 -r71e18053ef7dd9a53f11d14f3a91b8a1091e90bb
--- doc/example-scripts/tk-mini.html	(.../tk-mini.html)	(revision d31c271afb2488abafa0642b07538a3e62106130)
+++ doc/example-scripts/tk-mini.html	(.../tk-mini.html)	(revision 71e18053ef7dd9a53f11d14f3a91b8a1091e90bb)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.5" />
+<meta name="generator" content="AsciiDoc 8.6.9" />
 <title>Listing of doc/example-scripts/tk-mini.tcl</title>
 <style type="text/css">
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -87,10 +87,16 @@
 ul > li     { color: #aaa; }
 ul > li > * { color: black; }
 
-pre {
+.monospaced, code, pre {
+  font-family: "Courier New", Courier, monospace;
+  font-size: inherit;
+  color: navy;
   padding: 0;
   margin: 0;
 }
+pre {
+  white-space: pre-wrap;
+}
 
 #author {
   color: #527bbd;
@@ -179,7 +185,7 @@
   margin-left: 1.0em;
   margin-right: 10%;
   border-left: 5px solid #f0f0f0;
-  color: #777777;
+  color: #888;
 }
 
 div.quoteblock > div.attribution {
@@ -219,7 +225,7 @@
 }
 
 div.imageblock div.content { padding-left: 0; }
-span.image img { border-style: none; }
+span.image img { border-style: none; vertical-align: text-bottom; }
 a.image:visited { color: white; }
 
 dl {
@@ -349,7 +355,7 @@
   margin-bottom: 0.1em;
 }
 
-div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
+div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
   margin-top: 0;
   margin-bottom: 0;
 }
@@ -407,18 +413,14 @@
 span.overline { text-decoration: overline; }
 span.line-through { text-decoration: line-through; }
 
+div.unbreakable { page-break-inside: avoid; }
 
+
 /*
  * xhtml11 specific
  *
  * */
 
-tt {
-  font-family: monospace;
-  font-size: inherit;
-  color: navy;
-}
-
 div.tableblock {
   margin-top: 1.0em;
   margin-bottom: 1.5em;
@@ -452,12 +454,6 @@
  *
  * */
 
-.monospaced {
-  font-family: monospace;
-  font-size: inherit;
-  color: navy;
-}
-
 table.tableblock {
   margin-top: 1.0em;
   margin-bottom: 1.5em;
@@ -514,6 +510,31 @@
 th.tableblock.valign-bottom, td.tableblock.valign-bottom {
   vertical-align: bottom;
 }
+
+
+/*
+ * manpage specific
+ *
+ * */
+
+body.manpage h1 {
+  padding-top: 0.5em;
+  padding-bottom: 0.5em;
+  border-top: 2px solid silver;
+  border-bottom: 2px solid silver;
+}
+body.manpage h2 {
+  border-style: none;
+}
+body.manpage div.sectionbody {
+  margin-left: 3em;
+}
+
+@media print {
+  body.manpage div#toc { display: none; }
+}
+
+
 </style>
 <script type="text/javascript">
 /*<![CDATA[*/
@@ -558,7 +579,7 @@
 
   function tocEntries(el, toclevels) {
     var result = new Array;
-    var re = new RegExp('[hH]([2-'+(toclevels+1)+'])');
+    var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
     // Function that scans the DOM tree for header elements (the DOM2
     // nodeIterator API would be a better technique but not supported by all
     // browsers).
@@ -587,7 +608,7 @@
   var i;
   for (i = 0; i < toc.childNodes.length; i++) {
     var entry = toc.childNodes[i];
-    if (entry.nodeName == 'DIV'
+    if (entry.nodeName.toLowerCase() == 'div'
      && entry.getAttribute("class")
      && entry.getAttribute("class").match(/^toclevel/))
       tocEntriesToRemove.push(entry);
@@ -633,7 +654,7 @@
   var entriesToRemove = [];
   for (i = 0; i < noteholder.childNodes.length; i++) {
     var entry = noteholder.childNodes[i];
-    if (entry.nodeName == 'DIV' && entry.getAttribute("class") == "footnote")
+    if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
       entriesToRemove.push(entry);
   }
   for (i = 0; i < entriesToRemove.length; i++) {
@@ -734,27 +755,27 @@
 .nx-placeholder {color: #AF663F; font-weight: normal; font-style: italic;}
 .nx-variable    {color: #AF663F; font-weight: normal; font-style: normal;}
 </style>
-<pre class='nx'><span class='nx-keyword'>package</span> require Tk
-<span class='nx-keyword'>package</span> require nx::trait
+<pre class='nx'><span class='nx-keyword'>package</span> <span class='nx-keyword'>require</span> Tk
+<span class='nx-keyword'>package</span> <span class='nx-keyword'>require</span> nx::trait
 
 <span class='nx-keyword'>nx::Class</span> <span class='nx-keyword'>create</span> MyClass {
-  <span class='nx-comment'>#
-</span>  <span class='nx-comment'># A sample application class that creates a text entry field bound
-</span>  <span class='nx-comment'># to an instance variable. When the provided button is pressed, the
-</span>  <span class='nx-comment'># content of the variable is placed into an additional output label.
+  <span class='nx-[namespace tail [nx::self]]'>#
+</span>  <span class='nx-[namespace tail [nx::self]]'># A sample application class that creates a text entry field bound
+</span>  <span class='nx-[namespace tail [nx::self]]'># to an instance variable. When the provided button is pressed, the
+</span>  <span class='nx-[namespace tail [nx::self]]'># content of the variable is placed into an additional output label.
 </span>
-  <span class='nx-comment'>#
-</span>  <span class='nx-comment'># The callback trait imports methods "callback" and "bindvar":
-</span>  <span class='nx-comment'>#
-</span>  :require trait nx::traits::callback
+  <span class='nx-[namespace tail [nx::self]]'>#
+</span>  <span class='nx-[namespace tail [nx::self]]'># The callback trait imports methods "callback" and "bindvar":
+</span>  <span class='nx-[namespace tail [nx::self]]'>#
+</span>  <span class='nx-keyword'>:require</span> trait nx::trait::callback
 
-  :<span class='nx-keyword'>public</span> <span class='nx-keyword'>method</span> button-pressed {} {
-    <span class='nx-comment'># When this method is invoked, the content of the ".label" widget
-</span>    <span class='nx-comment'># is updated with the content of the instance variable "myvar".
-</span>    .label configure -text <span class='nx-variable'>${</span><span class='nx-variable'>:myvar}</span>
+  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> button-pressed {} {
+    <span class='nx-[namespace tail [nx::self]]'># When this method is invoked, the content of the ".label" widget
+</span>    <span class='nx-[namespace tail [nx::self]]'># is updated with the content of the instance variable "myvar".
+</span>    .label <span class='nx-keyword'>configure</span> -text <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:myvar}</span>
   }
 
-  :<span class='nx-keyword'>method</span> <span class='nx-keyword'>init</span> {} {
+  <span class='nx-keyword'>:method</span> <span class='nx-keyword'>init</span> {} {
     wm geometry . -500+500
     pack [label .title -text <span class='nx-string'>"Type something and press the start button ..."</span>]
     pack [entry .text -textvariable [:bindvar myvar]]
@@ -771,7 +792,7 @@
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2011-10-01 20:34:14 CEST
+Last updated 2016-12-23 11:00:51 CET
 </div>
 </div>
 </body>
Index: doc/example-scripts/tk-mini.tcl
===================================================================
diff -u -rd31c271afb2488abafa0642b07538a3e62106130 -r71e18053ef7dd9a53f11d14f3a91b8a1091e90bb
--- doc/example-scripts/tk-mini.tcl	(.../tk-mini.tcl)	(revision d31c271afb2488abafa0642b07538a3e62106130)
+++ doc/example-scripts/tk-mini.tcl	(.../tk-mini.tcl)	(revision 71e18053ef7dd9a53f11d14f3a91b8a1091e90bb)
@@ -16,7 +16,7 @@
   #
   # The callback trait imports methods "callback" and "bindvar":
   #
-  :require trait nx::traits::callback
+  :require trait nx::trait::callback
 
   :public method button-pressed {} {
     # When this method is invoked, the content of the ".label" widget
@@ -34,4 +34,4 @@
 }
   
 MyClass new 
-  
\ No newline at end of file
+  
Index: doc/example-scripts/tk-spread.html
===================================================================
diff -u -rc2374366bcb47c70ebd33cb16c8152eba783987f -r71e18053ef7dd9a53f11d14f3a91b8a1091e90bb
--- doc/example-scripts/tk-spread.html	(.../tk-spread.html)	(revision c2374366bcb47c70ebd33cb16c8152eba783987f)
+++ doc/example-scripts/tk-spread.html	(.../tk-spread.html)	(revision 71e18053ef7dd9a53f11d14f3a91b8a1091e90bb)
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.8" />
+<meta name="generator" content="AsciiDoc 8.6.9" />
 <title>Listing of doc/example-scripts/tk-spread.tcl</title>
 <style type="text/css">
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -94,8 +94,10 @@
   padding: 0;
   margin: 0;
 }
+pre {
+  white-space: pre-wrap;
+}
 
-
 #author {
   color: #527bbd;
   font-weight: bold;
@@ -223,7 +225,7 @@
 }
 
 div.imageblock div.content { padding-left: 0; }
-span.image img { border-style: none; }
+span.image img { border-style: none; vertical-align: text-bottom; }
 a.image:visited { color: white; }
 
 dl {
@@ -759,90 +761,90 @@
 <pre class='nx'><span class='nx-keyword'>package</span> <span class='nx-keyword'>require</span> Tk
 <span class='nx-keyword'>package</span> <span class='nx-keyword'>require</span> nx::trait
 
- <span class='nx-comment'>##############################################################################
-</span> <span class='nx-comment'># Class SpreadSheet
-</span> <span class='nx-comment'>#
-</span> <span class='nx-comment'># The SpreadSheet computes simply totals for rows and columns.
-</span> <span class='nx-comment'>##############################################################################
+ <span class='nx-[namespace tail [nx::self]]'>##############################################################################
+</span> <span class='nx-[namespace tail [nx::self]]'># Class SpreadSheet
+</span> <span class='nx-[namespace tail [nx::self]]'>#
+</span> <span class='nx-[namespace tail [nx::self]]'># The SpreadSheet computes simply totals for rows and columns.
+</span> <span class='nx-[namespace tail [nx::self]]'>##############################################################################
 </span> <span class='nx-keyword'>nx::Class</span> <span class='nx-keyword'>create</span> SpreadSheet {
-   <span class='nx-comment'>#
-</span>   <span class='nx-comment'># The following attributes can be used for configuring the
-</span>   <span class='nx-comment'># spreadsheet.
-</span>   <span class='nx-comment'>#
+   <span class='nx-[namespace tail [nx::self]]'>#
+</span>   <span class='nx-[namespace tail [nx::self]]'># The following attributes can be used for configuring the
+</span>   <span class='nx-[namespace tail [nx::self]]'># spreadsheet.
+</span>   <span class='nx-[namespace tail [nx::self]]'>#
 </span>   <span class='nx-keyword'>:property</span> {rows:integer 3}
    <span class='nx-keyword'>:property</span> {cols:integer 2}
    <span class='nx-keyword'>:property</span> {width:integer 8}
 
-   <span class='nx-comment'>#
-</span>   <span class='nx-comment'># If no widget is provided, use the name of the object as widget
-</span>   <span class='nx-comment'># name.
-</span>   <span class='nx-comment'>#
-</span>   <span class='nx-keyword'>:property</span> -accessor <span class='nx-keyword'>public</span> {widget <span class='nx-string'>".[namespace tail [self]]"</span>}
+   <span class='nx-[namespace tail [nx::self]]'>#
+</span>   <span class='nx-[namespace tail [nx::self]]'># If no widget is provided, use the name of the object as widget
+</span>   <span class='nx-[namespace tail [nx::self]]'># name.
+</span>   <span class='nx-[namespace tail [nx::self]]'>#
+</span>   <span class='nx-keyword'>:property</span> {widget <span class='nx-string'>".[namespace tail [self]]"</span>}
 
-   <span class='nx-comment'>#
-</span>   <span class='nx-comment'># Use the nx callback trait
-</span>   <span class='nx-comment'>#
-</span>   <span class='nx-keyword'>:require</span> trait nx::traits::callback
+   <span class='nx-[namespace tail [nx::self]]'>#
+</span>   <span class='nx-[namespace tail [nx::self]]'># Use the nx callback trait
+</span>   <span class='nx-[namespace tail [nx::self]]'>#
+</span>   <span class='nx-keyword'>:require</span> trait nx::trait::callback
 
-   <span class='nx-comment'>#
-</span>   <span class='nx-comment'># The method "cell" hides the internal respresentation and sets a
-</span>   <span class='nx-comment'># cell to a value.
-</span>   <span class='nx-comment'>#
+   <span class='nx-[namespace tail [nx::self]]'>#
+</span>   <span class='nx-[namespace tail [nx::self]]'># The method "cell" hides the internal respresentation and sets a
+</span>   <span class='nx-[namespace tail [nx::self]]'># cell to a value.
+</span>   <span class='nx-[namespace tail [nx::self]]'>#
 </span>   <span class='nx-keyword'>:method</span> cell {pair value} {
-     <span class='nx-keyword'>set</span> :data(<span class='nx-variable'>$pair</span>) <span class='nx-variable'>$value</span>
+     <span class='nx-keyword'>set</span> :data(<span class='nx-[namespace tail [nx::self]]'>$pair</span>) <span class='nx-[namespace tail [nx::self]]'>$value</span>
    }
 
-   <span class='nx-comment'>#
-</span>   <span class='nx-comment'># The constructor builds the SpreadSheet matrix via multiple text
-</span>   <span class='nx-comment'># entry fields.
-</span>   <span class='nx-comment'>#
+   <span class='nx-[namespace tail [nx::self]]'>#
+</span>   <span class='nx-[namespace tail [nx::self]]'># The constructor builds the SpreadSheet matrix via multiple text
+</span>   <span class='nx-[namespace tail [nx::self]]'># entry fields.
+</span>   <span class='nx-[namespace tail [nx::self]]'>#
 </span>   <span class='nx-keyword'>:method</span> <span class='nx-keyword'>init</span> {} {
-     <span class='nx-keyword'>set</span> :last <span class='nx-variable'>${</span><span class='nx-variable'>:rows}</span>,<span class='nx-variable'>${</span><span class='nx-variable'>:cols}</span>  ;<span class='nx-comment'># keep grand total field
+     <span class='nx-keyword'>set</span> :last <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:rows}</span>,<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:cols}</span>  ;<span class='nx-[namespace tail [nx::self]]'># keep grand total field
 </span>     <span class='nx-keyword'>trace</span> var [:bindvar data] w [:callback redo]
-     frame <span class='nx-variable'>${</span><span class='nx-variable'>:widget}</span>
-     <span class='nx-keyword'>for</span> {<span class='nx-keyword'>set</span> y 0} {<span class='nx-variable'>$y</span> &lt;= <span class='nx-variable'>${</span><span class='nx-variable'>:rows}</span>} {<span class='nx-keyword'>incr</span> y} {
+     frame <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:widget}</span>
+     <span class='nx-keyword'>for</span> {<span class='nx-keyword'>set</span> y 0} {<span class='nx-[namespace tail [nx::self]]'>$y</span> &lt;= <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:rows}</span>} {<span class='nx-keyword'>incr</span> y} {
        <span class='nx-keyword'>set</span> row [<span class='nx-keyword'>list</span>]
-       <span class='nx-keyword'>for</span> {<span class='nx-keyword'>set</span> x 0} {<span class='nx-variable'>$x</span> &lt;= <span class='nx-variable'>${</span><span class='nx-variable'>:cols}</span>} {<span class='nx-keyword'>incr</span> x} {
-         <span class='nx-keyword'>set</span> e [entry <span class='nx-variable'>${</span><span class='nx-variable'>:widget}</span>.<span class='nx-variable'>$y</span>,<span class='nx-variable'>$x</span> -width <span class='nx-variable'>${</span><span class='nx-variable'>:width}</span> \
-                    -textvar [:bindvar data(<span class='nx-variable'>$y</span>,<span class='nx-variable'>$x</span>)] -just right]
-         <span class='nx-keyword'>if</span> {<span class='nx-variable'>$x</span>==<span class='nx-variable'>${</span><span class='nx-variable'>:cols}</span> || <span class='nx-variable'>$y</span>==<span class='nx-variable'>${</span><span class='nx-variable'>:rows}</span>} {
-           <span class='nx-variable'>$e</span> config -state disabled -background grey -relief flat
+       <span class='nx-keyword'>for</span> {<span class='nx-keyword'>set</span> x 0} {<span class='nx-[namespace tail [nx::self]]'>$x</span> &lt;= <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:cols}</span>} {<span class='nx-keyword'>incr</span> x} {
+         <span class='nx-keyword'>set</span> e [entry <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:widget}</span>.<span class='nx-[namespace tail [nx::self]]'>$y</span>,<span class='nx-[namespace tail [nx::self]]'>$x</span> -width <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:width}</span> \
+                    -textvar [:bindvar data(<span class='nx-[namespace tail [nx::self]]'>$y</span>,<span class='nx-[namespace tail [nx::self]]'>$x</span>)] -just right]
+         <span class='nx-keyword'>if</span> {<span class='nx-[namespace tail [nx::self]]'>$x</span>==<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:cols}</span> || <span class='nx-[namespace tail [nx::self]]'>$y</span>==<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:rows}</span>} {
+           <span class='nx-[namespace tail [nx::self]]'>$e</span> config -state disabled -background grey -relief flat
          }
-         <span class='nx-keyword'>lappend</span> row <span class='nx-variable'>$e</span>
+         <span class='nx-keyword'>lappend</span> row <span class='nx-[namespace tail [nx::self]]'>$e</span>
        }
-       grid {*}<span class='nx-variable'>$row</span> -sticky news
+       grid {*}<span class='nx-[namespace tail [nx::self]]'>$row</span> -sticky news
      }
-     <span class='nx-variable'>$e</span> config -relief solid
+     <span class='nx-[namespace tail [nx::self]]'>$e</span> config -relief solid
    }
 
-   <span class='nx-comment'>#
-</span>   <span class='nx-comment'># The method "redo" is triggered via the updates in the cells
-</span>   <span class='nx-comment'>#
+   <span class='nx-[namespace tail [nx::self]]'>#
+</span>   <span class='nx-[namespace tail [nx::self]]'># The method "redo" is triggered via the updates in the cells
+</span>   <span class='nx-[namespace tail [nx::self]]'>#
 </span>   <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> redo {varname el op} {
-     <span class='nx-keyword'>if</span> {<span class='nx-variable'>$el</span> ne <span class='nx-variable'>${</span><span class='nx-variable'>:last}</span>} {
-       <span class='nx-keyword'>lassign</span> [<span class='nx-keyword'>split</span> <span class='nx-variable'>$el</span> ,] y x
-       <span class='nx-keyword'>if</span> {<span class='nx-variable'>$x</span> ne <span class='nx-string'>""</span>} {
-         :sum <span class='nx-variable'>$y</span>,* <span class='nx-variable'>$y</span>,<span class='nx-variable'>${</span><span class='nx-variable'>:cols}</span>
-         :sum *,<span class='nx-variable'>$x</span> <span class='nx-variable'>${</span><span class='nx-variable'>:rows}</span>,<span class='nx-variable'>$x</span>
-       } ;<span class='nx-comment'># otherwise 'el' was not a cell index
-</span>     }   ;<span class='nx-comment'># prevent endless recalculation of grand total
+     <span class='nx-keyword'>if</span> {<span class='nx-[namespace tail [nx::self]]'>$el</span> ne <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:last}</span>} {
+       <span class='nx-keyword'>lassign</span> [<span class='nx-keyword'>split</span> <span class='nx-[namespace tail [nx::self]]'>$el</span> ,] y x
+       <span class='nx-keyword'>if</span> {<span class='nx-[namespace tail [nx::self]]'>$x</span> ne <span class='nx-string'>""</span>} {
+         :sum <span class='nx-[namespace tail [nx::self]]'>$y</span>,* <span class='nx-[namespace tail [nx::self]]'>$y</span>,<span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:cols}</span>
+         :sum *,<span class='nx-[namespace tail [nx::self]]'>$x</span> <span class='nx-[namespace tail [nx::self]]'>${</span><span class='nx-variable'>:rows}</span>,<span class='nx-[namespace tail [nx::self]]'>$x</span>
+       } ;<span class='nx-[namespace tail [nx::self]]'># otherwise 'el' was not a cell index
+</span>     }   ;<span class='nx-[namespace tail [nx::self]]'># prevent endless recalculation of grand total
 </span>   }
 
-   <span class='nx-comment'>#
-</span>   <span class='nx-comment'># The method "sum" adds the values matched by pattern (typically a
-</span>   <span class='nx-comment'># row or column) and sets finally the target column with the total
-</span>   <span class='nx-comment'>#
+   <span class='nx-[namespace tail [nx::self]]'>#
+</span>   <span class='nx-[namespace tail [nx::self]]'># The method "sum" adds the values matched by pattern (typically a
+</span>   <span class='nx-[namespace tail [nx::self]]'># row or column) and sets finally the target column with the total
+</span>   <span class='nx-[namespace tail [nx::self]]'>#
 </span>   <span class='nx-keyword'>:method</span> sum {pat target} {
      <span class='nx-keyword'>set</span> sum 0
-     <span class='nx-keyword'>set</span> total <span class='nx-string'>""</span> ;<span class='nx-comment'># default if no addition succeeds
-</span>     <span class='nx-keyword'>foreach</span> {i value} [<span class='nx-keyword'>array</span> get :data <span class='nx-variable'>$pat</span>] {
-       <span class='nx-keyword'>if</span> {<span class='nx-variable'>$i</span> != <span class='nx-variable'>$target</span>} {
-         <span class='nx-keyword'>if</span> {[<span class='nx-keyword'>string</span> is double -strict <span class='nx-variable'>$value</span>]} {
-           <span class='nx-keyword'>set</span> total [<span class='nx-keyword'>set</span> sum [<span class='nx-keyword'>expr</span> {<span class='nx-variable'>$sum</span> + <span class='nx-variable'>$value</span>}]]
+     <span class='nx-keyword'>set</span> total <span class='nx-string'>""</span> ;<span class='nx-[namespace tail [nx::self]]'># default if no addition succeeds
+</span>     <span class='nx-keyword'>foreach</span> {i value} [<span class='nx-keyword'>array</span> get :data <span class='nx-[namespace tail [nx::self]]'>$pat</span>] {
+       <span class='nx-keyword'>if</span> {<span class='nx-[namespace tail [nx::self]]'>$i</span> != <span class='nx-[namespace tail [nx::self]]'>$target</span>} {
+         <span class='nx-keyword'>if</span> {[<span class='nx-keyword'>string</span> is double -strict <span class='nx-[namespace tail [nx::self]]'>$value</span>]} {
+           <span class='nx-keyword'>set</span> total [<span class='nx-keyword'>set</span> sum [<span class='nx-keyword'>expr</span> {<span class='nx-[namespace tail [nx::self]]'>$sum</span> + <span class='nx-[namespace tail [nx::self]]'>$value</span>}]]
          }
        }
      }
-     :cell <span class='nx-variable'>$target</span> <span class='nx-variable'>$total</span>
+     :cell <span class='nx-[namespace tail [nx::self]]'>$target</span> <span class='nx-[namespace tail [nx::self]]'>$total</span>
    }
  }</pre></div></div>
 <div class="paragraph"><p>Build spreadsheet "x"</p></div>
@@ -858,7 +860,7 @@
 .nx-variable    {color: #AF663F; font-weight: normal; font-style: normal;}
 </style>
 <pre class='nx'>SpreadSheet <span class='nx-keyword'>create</span> x {
-   <span class='nx-comment'># populate with some values
+   <span class='nx-[namespace tail [nx::self]]'># populate with some values
 </span>   :cell 0,0 Spread1
    :cell 1,0 47
    :cell 2,1 11
@@ -892,14 +894,14 @@
 .nx-placeholder {color: #AF663F; font-weight: normal; font-style: italic;}
 .nx-variable    {color: #AF663F; font-weight: normal; font-style: normal;}
 </style>
-<pre class='nx'>pack [x widget] [y widget] -fill both</pre></div></div>
+<pre class='nx'>pack [x <span class='nx-keyword'>cget</span> -widget] [y <span class='nx-keyword'>cget</span> -widget] -fill both</pre></div></div>
 </div>
 </div>
 </div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2013-06-07 09:47:51 CEST
+Last updated 2016-12-23 11:00:51 CET
 </div>
 </div>
 </body>
Index: doc/example-scripts/tk-spread.tcl
===================================================================
diff -u -r7899713fc59e73e74af1586fa84b0b690bb9b2e7 -r71e18053ef7dd9a53f11d14f3a91b8a1091e90bb
--- doc/example-scripts/tk-spread.tcl	(.../tk-spread.tcl)	(revision 7899713fc59e73e74af1586fa84b0b690bb9b2e7)
+++ doc/example-scripts/tk-spread.tcl	(.../tk-spread.tcl)	(revision 71e18053ef7dd9a53f11d14f3a91b8a1091e90bb)
@@ -31,7 +31,7 @@
    #
    # Use the nx callback trait 
    #
-   :require trait nx::traits::callback
+   :require trait nx::trait::callback
    
    #
    # The method "cell" hides the internal respresentation and sets a
