--- test/html-webhacc/cc.cgi	2007/06/27 14:36:45	1.4
+++ test/html-webhacc/cc.cgi	2007/06/30 14:51:10	1.6
@@ -189,21 +189,90 @@
     require Whatpm::ContentChecker;
     my $onerror = sub {
       my %opt = @_;
-      print STDOUT qq[<dt><a href="#node-@{[refaddr $opt{node}]}">],
-          htescape get_node_path ($opt{node}),
-          "</a></dt>\n<dd>", htescape $opt{type}, "</dd>\n";
+      print STDOUT qq[<dt>] . get_node_link ($opt{node}) .
+          "</dt>\n<dd>", htescape $opt{type}, "</dd>\n";
     };
 
+    my $elements;
     if ($el) {
-      Whatpm::ContentChecker->check_element ($el, $onerror);
+      $elements = Whatpm::ContentChecker->check_element ($el, $onerror);
     } else {
-      Whatpm::ContentChecker->check_document ($doc, $onerror);
+      $elements = Whatpm::ContentChecker->check_document ($doc, $onerror);
     }
 
     print STDOUT qq[
 </dl>
 </div>
 ];
+
+    if (@{$elements->{table}}) {
+      require JSON;
+
+      print STDOUT qq[
+<div id="tables" class="section">
+<h2>Tables</h2>
+
+<!--[if IE]><script type="text/javascript" src="../excanvas.js"></script><![endif]-->
+<script src="../table-script.js" type="text/javascript"></script>
+<noscript>
+<p><em>Structure of tables are visualized here if scripting is enabled.</em></p>
+</noscript>
+];
+
+      my $i = 0;
+      for my $table_el (@{$elements->{table}}) {
+        $i++;
+        print STDOUT qq[<div class="section" id="table-$i"><h3>] .
+            get_node_link ($table_el) . q[</h3>];
+        
+        my $table = Whatpm::HTMLTable->form_table ($table_el);
+        
+        for (@{$table->{column_group}}, @{$table->{column}}, $table->{caption}) {
+          next unless $_;
+          delete $_->{element};
+        }
+        
+        for (@{$table->{row_group}}) {
+          next unless $_;
+          next unless $_->{element};
+          $_->{type} = $_->{element}->manakai_local_name;
+          delete $_->{element};
+        }
+        
+        for (@{$table->{cell}}) {
+          next unless $_;
+          for (@{$_}) {
+            next unless $_;
+            for (@$_) {
+              $_->{id} = refaddr $_->{element} if defined $_->{element};
+              delete $_->{element};
+            }
+          }
+        }
+        
+        print STDOUT '</div><script type="text/javascript">tableToCanvas (';
+        print STDOUT JSON::objToJson ($table);
+        print STDOUT qq[, document.getElementById ('table-$i'));</script>];
+      }
+    
+      print STDOUT qq[</div>];
+    }
+
+    if (keys %{$elements->{term}}) {
+      print STDOUT qq[
+<div id="terms" class="section">
+<h2>Terms</h2>
+
+<dl>
+];
+      for my $term (sort {$a cmp $b} keys %{$elements->{term}}) {
+        print STDOUT qq[<dt>@{[htescape $term]}</dt>];
+        for (@{$elements->{term}->{$term}}) {
+          print STDOUT qq[<dd>].get_node_link ($_).qq[</dd>];
+        }
+      }
+      print STDOUT qq[</dl></div>];
+    }
   }
 
   ## TODO: Show result
@@ -267,7 +336,9 @@
 
       if ($node->has_child_nodes) {
         $r .= '<ol class="children">';
-        unshift @node, @{$child->child_nodes}, '</ol>';
+        unshift @node, @{$child->child_nodes}, '</ol></li>';
+      } else {
+        $r .= '</li>';
       }
     } elsif ($nt == $child->TEXT_NODE) {
       $r .= qq'<li id="$node_id" class="tree-text"><q lang="">' . htescape ($child->data) . '</q></li>';
@@ -276,16 +347,16 @@
     } elsif ($nt == $child->COMMENT_NODE) {
       $r .= qq'<li id="$node_id" class="tree-comment"><code>&lt;!--</code><q lang="">' . htescape ($child->data) . '</q><code>--&gt;</code></li>';
     } elsif ($nt == $child->DOCUMENT_NODE) {
-      $r .= qq'<li id="$node_id" class="tree-document">Document</li>';
+      $r .= qq'<li id="$node_id" class="tree-document">Document';
       if ($child->has_child_nodes) {
         $r .= '<ol>';
-        unshift @node, @{$child->child_nodes}, '</ol>';
+        unshift @node, @{$child->child_nodes}, '</ol></li>';
       }
     } elsif ($nt == $child->DOCUMENT_TYPE_NODE) {
-      $r .= qq'<li id="$node_id" class="tree-doctype"><code>&lt;!DOCTYPE&gt;</code><ul>';
-      $r .= '<li class="tree-doctype-name">Name = <q>@{[htescape ($child->name)]}</q></li>';
-      $r .= '<li class="tree-doctype-publicid">Public identifier = <q>@{[htescape ($child->public_id)]}</q></li>';
-      $r .= '<li class="tree-doctype-systemid">System identifier = <q>@{[htescape ($child->system_id)]}</q></li>';
+      $r .= qq'<li id="$node_id" class="tree-doctype"><code>&lt;!DOCTYPE&gt;</code><ul class="attributes">';
+      $r .= qq[<li class="tree-doctype-name">Name = <q>@{[htescape ($child->name)]}</q></li>];
+      $r .= qq[<li class="tree-doctype-publicid">Public identifier = <q>@{[htescape ($child->public_id)]}</q></li>];
+      $r .= qq[<li class="tree-doctype-systemid">System identifier = <q>@{[htescape ($child->system_id)]}</q></li>];
       $r .= '</ul></li>';
     } elsif ($nt == $child->PROCESSING_INSTRUCTION_NODE) {
       $r .= qq'<li id="$node_id" class="tree-id"><code>&lt;?@{[htescape ($child->target)]}</code> <q>@{[htescape ($child->data)]}</q><code>?&gt;</code></li>';
@@ -324,6 +395,11 @@
   return join '/', @r;
 } # get_node_path
 
+sub get_node_link ($) {
+  return qq[<a href="#node-@{[refaddr $_[0]]}">] .
+      htescape (get_node_path ($_[0])) . qq[</a>];
+} # get_node_link
+
 =head1 AUTHOR
 
 Wakaba <w@suika.fam.cx>.
@@ -337,4 +413,4 @@
 
 =cut
 
-## $Date: 2007/06/27 14:36:45 $
+## $Date: 2007/06/30 14:51:10 $