@@ -24,14 +24,22 @@
         }
       }
       Polymer('cxx-clause', {
-        // Convenience function at the clause level, which gets called from <cxx-toc>.
+        
+        // Convenience function at the clause level, which gets called 
+        // from <cxx-toc>. If the clause is explicitly numbered, then
+        // this sets the clause_num to that value. Otherwise, the clause
+        // number is set to the argument clause_num. This returns
+        // 1 + the value set.
+        //
+        // Note that this will recursively set the section numbers for
+        // this clause.
         set_clause_num: function(clause_num) {
           // If the author explicitly specified the clause number, don't
           // use a different number.
           if (this.number)
-            clause_num = this.number
+            clause_num = Number(this.number)
           this.update_sec_nums(clause_num);
-          return clause_num;
+          return clause_num + 1;
         },
 
         domReady: updateTocClauses,
 
@@ -30,7 +30,12 @@ limitations under the License.
             // Assume there aren't any elements between cxx-section levels.
             for (var child = this.firstChild; child; child = child.nextSibling) {
                 if (child instanceof CxxSectionElement) {
-                    child.update_sec_nums(this.sec_num + '.' + (child_index++));
+                    if (child.number) {
+                        child_index = Number(child.number);
+                        console.log(child.number)
+                    }
+                    child.update_sec_nums(this.sec_num + '.' + child_index);
+                    child_index++;
                 }
             }
         },
 
@@ -36,9 +36,11 @@ limitations under the License.
         },
 
         clausesChanged: function() {
-            var n = 1
-            while (n < this.clauses.length) {
-                n = this.clause[n].set_clause_num(n)
+            var clause_num = 1;
+            for (var i = 0; i < this.clauses.length; ++i) {
+                var clause = this.clauses[i];
+                clause_num = clause.set_clause_num(clause_num);
+                this.sections.push(this.collectSections(clause));
             }
 
             // this.sections = this.clauses.array().map(function(clause, index) {
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,12 @@ limitations under the License.`
`30`	`30`	`// Assume there aren't any elements between cxx-section levels.`
`31`	`31`	`for (var child = this.firstChild; child; child = child.nextSibling) {`
`32`	`32`	`if (child instanceof CxxSectionElement) {`
`33`		`- child.update_sec_nums(this.sec_num + '.' + (child_index++));`
	`33`	`+ if (child.number) {`
	`34`	`+ child_index = Number(child.number);`
	`35`	`+ console.log(child.number)`
	`36`	`+ }`
	`37`	`+ child.update_sec_nums(this.sec_num + '.' + child_index);`
	`38`	`+ child_index++;`
`34`	`39`	`}`
`35`	`40`	`}`
`36`	`41`	`},`