--- test/html-webhacc/cc.cgi	2007/06/30 08:26:08	1.5
+++ test/html-webhacc/cc.cgi	2007/07/01 06:21:46	1.7
@@ -33,6 +33,8 @@
     exit;
   }
 
+  load_text_catalog ('en'); ## TODO: conneg
+
   my @nav;
   print STDOUT qq[Content-Type: text/html; charset=utf-8
 
@@ -88,13 +90,14 @@
 
   my $onerror = sub {
     my (%opt) = @_;
+    my ($cls, $msg) = get_text ($opt{type}, $opt{level});
     if ($opt{column} > 0) {
-      print STDOUT qq[<dt><a href="#line-$opt{line}">Line $opt{line}</a> column $opt{column}</dt>\n];
+      print STDOUT qq[<dt class="$cls"><a href="#line-$opt{line}">Line $opt{line}</a> column $opt{column}</dt>\n];
     } else {
-      $opt{line}--;
-      print STDOUT qq[<dt><a href="#line-$opt{line}">Line $opt{line}</a></dt>\n];
+      $opt{line} = $opt{line} - 1 || 1;
+      print STDOUT qq[<dt class="$cls"><a href="#line-$opt{line}">Line $opt{line}</a></dt>\n];
     }
-    print STDOUT qq[<dd>@{[htescape $opt{type}]}</dd>\n];
+    print STDOUT qq[<dd class="$cls">$msg</dd>\n];
   };
 
   $doc = $dom->create_document;
@@ -133,8 +136,7 @@
 <div id="parse-errors" class="section">
 <h2>Parse Errors</h2>
 
-<dl>
-];
+<dl>];
   push @nav, ['#parse-errors' => 'Parse Error'];
 
   my $onerror = sub {
@@ -150,8 +152,7 @@
   $doc = Message::DOM::XMLParserTemp->parse_byte_stream
       ($fh => $dom, $onerror, charset => 'utf-8');
 
-    print STDOUT qq[
-</dl>
+    print STDOUT qq[</dl>
 </div>
 ];
   } else {
@@ -182,16 +183,15 @@
 <div id="document-errors" class="section">
 <h2>Document Errors</h2>
 
-<dl>
-];
+<dl>];
     push @nav, ['#document-errors' => 'Document Error'];
 
     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";
+      my ($cls, $msg) = get_text ($opt{type}, $opt{level});
+      print STDOUT qq[<dt class="$cls">] . get_node_link ($opt{node}) .
+          qq[</dt>\n<dd class="$cls">], $msg, "</dd>\n";
     };
 
     my $elements;
@@ -201,8 +201,7 @@
       $elements = Whatpm::ContentChecker->check_document ($doc, $onerror);
     }
 
-    print STDOUT qq[
-</dl>
+    print STDOUT qq[</dl>
 </div>
 ];
 
@@ -223,10 +222,8 @@
       my $i = 0;
       for my $table_el (@{$elements->{table}}) {
         $i++;
-        print STDOUT qq[<div class="section" id="table-$i"><h3>];
-        print STDOUT qq[<a href="#node-@{[refaddr $table_el]}">],
-          htescape get_node_path ($table_el);
-        print STDOUT qq[</a></h3>\n];
+        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);
         
@@ -260,6 +257,22 @@
     
       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
@@ -282,12 +295,16 @@
   my $s = $_[0];
   my $i = 1;
   print STDOUT qq[<ol lang="">\n];
-  while ($$s =~ /\G([^\x0A]*?)\x0D?\x0A/gc) {
-    print STDOUT qq[<li id="line-$i">], htescape $1, "</li>\n";
-    $i++;
-  }
-  if ($$s =~ /\G([^\x0A]+)/gc) {
-    print STDOUT qq[<li id="line-$i">], htescape $1, "</li>\n";
+  if (length $$s) {
+    while ($$s =~ /\G([^\x0A]*?)\x0D?\x0A/gc) {
+      print STDOUT qq[<li id="line-$i">], htescape $1, "</li>\n";
+      $i++;
+    }
+    if ($$s =~ /\G([^\x0A]+)/gc) {
+      print STDOUT qq[<li id="line-$i">], htescape $1, "</li>\n";
+    }
+  } else {
+    print STDOUT q[<li id="line-1"></li>];
   }
   print STDOUT "</ol>";
 } # print_input_string
@@ -321,9 +338,11 @@
         $r .= '</ul>';
       }
 
-      if ($node->has_child_nodes) {
+      if ($child->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>';
@@ -332,10 +351,14 @@
     } 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';
+      $r .= qq[<ul class="attributes">];
+      $r .= qq[<li>@{[scalar get_text ('manakaiIsHTML:'.($child->manakai_is_html?1:0))]}</li>];
+      $r .= qq[<li>@{[scalar get_text ('manakaiCompatMode:'.$child->manakai_compat_mode)]}</li>];
+      $r .= qq[</ul>];
       if ($child->has_child_nodes) {
-        $r .= '<ol>';
-        unshift @node, @{$child->child_nodes}, '</ol>';
+        $r .= '<ol class="children">';
+        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 class="attributes">';
@@ -380,6 +403,45 @@
   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
+
+{
+  my $Msg = {};
+
+sub load_text_catalog ($) {
+  my $lang = shift; # MUST be a canonical lang name
+  open my $file, '<', "cc-msg.$lang.txt" or die "$0: cc-msg.$lang.txt: $!";
+  while (<$file>) {
+    if (s/^([^;]+);([^;]*);//) {
+      my ($type, $cls, $msg) = ($1, $2, $_);
+      $msg =~ tr/\x0D\x0A//d;
+      $Msg->{$type} = [$cls, $msg];
+    }
+  }
+} # load_text_catalog
+
+sub get_text ($) {
+  my ($type, $level) = @_;
+  $type = $level . ':' . $type if defined $level;
+  my @arg;
+  {
+    if (defined $Msg->{$type}) {
+      my $msg = $Msg->{$type}->[1];
+      $msg =~ s/\$([0-9]+)/defined $arg[$1] ? htescape ($arg[$1]) : '(undef)'/ge;
+      return ($Msg->{$type}->[0], $msg);
+    } elsif ($type =~ s/:([^:]*)$//) {
+      unshift @arg, $1;
+      redo;
+    }
+  }
+  return ('', htescape ($_[0]));
+} # get_text
+
+}
+
 =head1 AUTHOR
 
 Wakaba <w@suika.fam.cx>.
@@ -393,4 +455,4 @@
 
 =cut
 
-## $Date: 2007/06/30 08:26:08 $
+## $Date: 2007/07/01 06:21:46 $