Index: doc/example-scripts/traits-composite.html
===================================================================
diff -u -rd31c271afb2488abafa0642b07538a3e62106130 -r93bb0947d582f274afb1cdbc885909d55e100b36
--- doc/example-scripts/traits-composite.html	(.../traits-composite.html)	(revision d31c271afb2488abafa0642b07538a3e62106130)
+++ doc/example-scripts/traits-composite.html	(.../traits-composite.html)	(revision 93bb0947d582f274afb1cdbc885909d55e100b36)
@@ -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.8" />
 <title>Listing of doc/example-scripts/traits-composite.tcl</title>
 <style type="text/css">
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -87,11 +87,15 @@
 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;
 }
 
+
 #author {
   color: #527bbd;
   font-weight: bold;
@@ -179,7 +183,7 @@
   margin-left: 1.0em;
   margin-right: 10%;
   border-left: 5px solid #f0f0f0;
-  color: #777777;
+  color: #888;
 }
 
 div.quoteblock > div.attribution {
@@ -349,7 +353,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 +411,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 +452,6 @@
  *
  * */
 
-.monospaced {
-  font-family: monospace;
-  font-size: inherit;
-  color: navy;
-}
-
 table.tableblock {
   margin-top: 1.0em;
   margin-bottom: 1.5em;
@@ -514,6 +508,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 +577,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 +606,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 +652,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++) {
@@ -742,7 +761,7 @@
 .nx-variable    {color: #AF663F; font-weight: normal; font-style: normal;}
 </style>
 <pre class='nx'><span class='nx-keyword'>package</span> req nx::trait</pre></div></div>
-<div class="paragraph"><p>Create a Trait called <tt>tPositionableStream</tt></p></div>
+<div class="paragraph"><p>Create a Trait called <code>tPositionableStream</code></p></div>
 <div class="listingblock">
 <div class="content"><style type='text/css'>
 .nx             {color: #000000; font-weight: normal; font-style: normal; padding-left: 10px}
@@ -758,13 +777,13 @@
   <span class='nx-comment'>#
 </span>  <span class='nx-comment'># Define the methods provided by this trait:
 </span>  <span class='nx-comment'>#
-</span>  :<span class='nx-keyword'>public</span> <span class='nx-keyword'>method</span> atStart {} {<span class='nx-keyword'>expr</span> {[:position] == [:minPosition]}}
-  :<span class='nx-keyword'>public</span> <span class='nx-keyword'>method</span> atEnd {} {<span class='nx-keyword'>expr</span> {[:position] == [:maxPosition]}}
-  :<span class='nx-keyword'>public</span> <span class='nx-keyword'>method</span> setToStart {} {<span class='nx-keyword'>set</span> :position [:minPosition]}
-  :<span class='nx-keyword'>public</span> <span class='nx-keyword'>method</span> setToEnd {} {<span class='nx-keyword'>set</span> :position [:maxPosition]}
-  :<span class='nx-keyword'>public</span> <span class='nx-keyword'>method</span> maxPosition {} {<span class='nx-keyword'>llength</span> <span class='nx-variable'>${</span><span class='nx-variable'>:collection}</span>}
-  :<span class='nx-keyword'>public</span> <span class='nx-keyword'>method</span> minPosition {} {<span class='nx-keyword'>return</span> 0}
-  :<span class='nx-keyword'>public</span> <span class='nx-keyword'>method</span> nextPosition {} {<span class='nx-keyword'>incr</span> :position 1}
+</span>  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> atStart {} {<span class='nx-keyword'>expr</span> {[:position] == [:minPosition]}}
+  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> atEnd {} {<span class='nx-keyword'>expr</span> {[:position] == [:maxPosition]}}
+  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> setToStart {} {<span class='nx-keyword'>set</span> :position [:minPosition]}
+  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> setToEnd {} {<span class='nx-keyword'>set</span> :position [:maxPosition]}
+  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> maxPosition {} {<span class='nx-keyword'>llength</span> <span class='nx-variable'>${</span><span class='nx-variable'>:collection}</span>}
+  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> minPosition {} {<span class='nx-keyword'>return</span> 0}
+  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> nextPosition {} {<span class='nx-keyword'>incr</span> :position 1}
 
   <span class='nx-comment'># The trait requires a method "position" and a variable "collection"
 </span>  <span class='nx-comment'># from the base class or other traits. The definition is incomplete
@@ -773,8 +792,8 @@
   :requiredMethods position
   :requiredVariables collection
 }</pre></div></div>
-<div class="paragraph"><p>Create a composite trait called <tt>tReadStream</tt> based on the trait
-<tt>tPositionableStream</tt>:</p></div>
+<div class="paragraph"><p>Create a composite trait called <code>tReadStream</code> based on the trait
+<code>tPositionableStream</code>:</p></div>
 <div class="listingblock">
 <div class="content"><style type='text/css'>
 .nx             {color: #000000; font-weight: normal; font-style: normal; padding-left: 10px}
@@ -790,8 +809,8 @@
   <span class='nx-comment'>#
 </span>  <span class='nx-comment'># Methods provided by this trait:
 </span>  <span class='nx-comment'>#
-</span>  :<span class='nx-keyword'>public</span> <span class='nx-keyword'>method</span> on {collection} {<span class='nx-keyword'>set</span> :collection <span class='nx-variable'>$collection</span>; :setToStart}
-  :<span class='nx-keyword'>public</span> <span class='nx-keyword'>method</span> <span class='nx-keyword'>next</span> {} {
+</span>  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> on {collection} {<span class='nx-keyword'>set</span> :collection <span class='nx-variable'>$collection</span>; :setToStart}
+  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> <span class='nx-keyword'>next</span> {} {
     <span class='nx-keyword'>if</span> {[:atEnd]} {<span class='nx-keyword'>return</span> <span class='nx-string'>""</span>} <span class='nx-keyword'>else</span> {
       <span class='nx-keyword'>set</span> r [<span class='nx-keyword'>lindex</span> <span class='nx-variable'>${</span><span class='nx-variable'>:collection}</span> <span class='nx-variable'>${</span><span class='nx-variable'>:position}</span>]
       :nextPosition
@@ -803,10 +822,10 @@
 </span>  :requiredMethods {setToStart atEnd nextPosition}
 
   <span class='nx-comment'># Require the trait "tPositionableStream"
-</span>  :require trait tPositionableStream
+</span>  <span class='nx-keyword'>:require</span> trait tPositionableStream
 }</pre></div></div>
-<div class="paragraph"><p>Create a composite trait called <tt>tWriteStream</tt> based on the trait
-<tt>tPositionableStream</tt>:</p></div>
+<div class="paragraph"><p>Create a composite trait called <code>tWriteStream</code> based on the trait
+<code>tPositionableStream</code>:</p></div>
 <div class="listingblock">
 <div class="content"><style type='text/css'>
 .nx             {color: #000000; font-weight: normal; font-style: normal; padding-left: 10px}
@@ -822,8 +841,8 @@
   <span class='nx-comment'>#
 </span>  <span class='nx-comment'># Methods provided by this trait:
 </span>  <span class='nx-comment'>#
-</span>  :<span class='nx-keyword'>public</span> <span class='nx-keyword'>method</span> on {collection} {<span class='nx-keyword'>set</span> :collection <span class='nx-variable'>$collection</span>; :setToEnd}
-  :<span class='nx-keyword'>public</span> <span class='nx-keyword'>method</span> nextPut {element} {
+</span>  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> on {collection} {<span class='nx-keyword'>set</span> :collection <span class='nx-variable'>$collection</span>; :setToEnd}
+  <span class='nx-keyword'>:public</span> <span class='nx-keyword'>method</span> nextPut {element} {
     <span class='nx-keyword'>lappend</span> :collection <span class='nx-variable'>$element</span>
     :nextPosition
     <span class='nx-keyword'>return</span> <span class='nx-string'>""</span>
@@ -833,10 +852,10 @@
 </span>  :requiredMethods {setToEnd nextPosition}
 
   <span class='nx-comment'># Require the trait "tPositionableStream"
-</span>  :require trait tPositionableStream
+</span>  <span class='nx-keyword'>:require</span> trait tPositionableStream
 }</pre></div></div>
-<div class="paragraph"><p>Define a class <tt>ReadStream</tt> with properties <tt>position</tt> and
-<tt>collection</tt> that uses the composite trait <tt>tReadStream</tt>:</p></div>
+<div class="paragraph"><p>Define a class <code>ReadStream</code> with properties <code>position</code> and
+<code>collection</code> that uses the composite trait <code>tReadStream</code>:</p></div>
 <div class="listingblock">
 <div class="content"><style type='text/css'>
 .nx             {color: #000000; font-weight: normal; font-style: normal; padding-left: 10px}
@@ -849,11 +868,11 @@
 .nx-variable    {color: #AF663F; font-weight: normal; font-style: normal;}
 </style>
 <pre class='nx'><span class='nx-keyword'>nx::Class</span> <span class='nx-keyword'>create</span> ReadStream {
-  :<span class='nx-keyword'>property</span> {collection <span class='nx-string'>""</span>}
-  :<span class='nx-keyword'>property</span> {position 0}
-  :require trait tReadStream
+  <span class='nx-keyword'>:property</span> {collection <span class='nx-string'>""</span>}
+  <span class='nx-keyword'>:property</span> -accessor <span class='nx-keyword'>public</span> {position 0}
+  <span class='nx-keyword'>:require</span> trait tReadStream
 }</pre></div></div>
-<div class="paragraph"><p>Create an instance of <tt>ReadStream</tt>:</p></div>
+<div class="paragraph"><p>Create an instance of <code>ReadStream</code>:</p></div>
 <div class="listingblock">
 <div class="content"><style type='text/css'>
 .nx             {color: #000000; font-weight: normal; font-style: normal; padding-left: 10px}
@@ -892,7 +911,7 @@
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2011-10-01 20:34:16 CEST
+Last updated 2013-06-07 00:17:00 CEST
 </div>
 </div>
 </body>
