--- test/html-webhacc/WebHACC/Output.pm	2008/07/21 12:56:34	1.7
+++ test/html-webhacc/WebHACC/Output.pm	2008/09/14 03:09:23	1.24
@@ -16,8 +16,19 @@
   return $s;
 };
 
+my $htescape_value = sub ($) {
+  my $s = $_[0];
+  $s =~ s/&/&/g;
+  $s =~ s/</&lt;/g;
+  $s =~ s/>/&gt;/g;
+  $s =~ s/"/&quot;/g;
+  return $s;
+};
+
 sub new ($) {
-  return bless {nav => [], section_rank => 1}, shift;
+  require WebHACC::Input;
+  return bless {nav => [], section_rank => 1,
+                input => WebHACC::Input->new}, shift;
 } # new
 
 sub input ($;$) {
@@ -25,7 +36,7 @@
     if (defined $_[1]) {
       $_[0]->{input} = $_[1];
     } else {
-      delete $_[0]->{input};
+      $_[0]->{input} = WebHACC::Input->new;
     }
   }
   
@@ -44,6 +55,18 @@
   return $_[0]->{handle};
 } # handle
 
+sub has_error ($;$) {
+  if (@_ > 1) {
+    if (defined $_[1]) {
+      $_[0]->{has_error} = 1;
+    } else {
+      delete $_[0]->{has_error};
+    }
+  }
+  
+  return $_[0]->{has_error};
+} # has_error
+
 sub set_utf8 ($) {
   binmode shift->{handle}, ':utf8';
 } # set_utf8
@@ -73,66 +96,108 @@
 
 sub start_tag ($$%) {
   my ($self, $tag_name, %opt) = @_;
-  $self->html ('<' . $htescape->($tag_name)); # escape for safety
+  $self->html ('<' . $htescape_value->($tag_name)); # escape for safety
   if (exists $opt{id}) {
     my $id = $self->input->id_prefix . $opt{id};
-    $self->html (' id="' . $htescape->($id) . '"');
+    $self->html (' id="' . $htescape_value->($id) . '"');
     delete $opt{id};
   }
   for (keys %opt) {    # for safety
-    $self->html (' ' . $htescape->($_) . '="' . $htescape->($opt{$_}) . '"');
+    $self->html (' ' . $htescape_value->($_) . '="' .
+                 $htescape_value->($opt{$_}) . '"');
   }
   $self->html ('>');
 } # start_tag
 
 sub end_tag ($$) {
-  shift->html ('</' . $htescape->(shift) . '>');
+  shift->html ('</' . $htescape_value->(shift) . '>');
 } # end_tag
 
 sub start_section ($%) {
   my ($self, %opt) = @_;
 
+  my $class = 'section';
   if (defined $opt{role}) {
     if ($opt{role} eq 'parse-errors') {
       $opt{id} ||= 'parse-errors';
       $opt{title} ||= 'Parse Errors Section';
       $opt{short_title} ||= 'Parse Errors';
+      $class .= ' errors';
       delete $opt{role};
     } elsif ($opt{role} eq 'structure-errors') {
       $opt{id} ||= 'document-errors';
       $opt{title} ||= 'Structural Errors';
       $opt{short_title} ||= 'Struct. Errors';
+      $class .= ' errors';
+      delete $opt{role};
+    } elsif ($opt{role} eq 'transfer-errors') {
+      $opt{id} ||= 'transfer-errors';
+      $opt{title} ||= 'Transfer Errors';
+      $opt{short_title} ||= 'Trans. Errors';
+      $class .= ' errors';
       delete $opt{role};
     } elsif ($opt{role} eq 'reformatted') {
       $opt{id} ||= 'document-tree';
       $opt{title} ||= 'Reformatted Document Source';
       $opt{short_title} ||= 'Reformatted';
+      $class .= ' dump';
       delete $opt{role}
     } elsif ($opt{role} eq 'tree') {
       $opt{id} ||= 'document-tree';
       $opt{title} ||= 'Document Tree';
       $opt{short_title} ||= 'Tree';
+      $class .= ' dump';
       delete $opt{role};
     } elsif ($opt{role} eq 'structure') {
       $opt{id} ||= 'document-structure';
       $opt{title} ||= 'Document Structure';
       $opt{short_title} ||= 'Structure';
+      $class .= ' dump';
+      delete $opt{role};
+    } elsif ($opt{role} eq 'subdoc') {
+      $class .= ' subdoc';
+      delete $opt{role};
+    } elsif ($opt{role} eq 'source') {
+      $opt{id} ||= 'source-string';
+      $opt{title} ||= 'Document Source';
+      $opt{short_title} ||= 'Source';
+      $class .= ' source';
+      delete $opt{role};
+    } elsif ($opt{role} eq 'result') {
+      $opt{id} ||= 'result-summary';
+      $opt{title} ||= 'Result';
+      $class .= ' result';
       delete $opt{role};
     }
   }
 
   $self->{section_rank}++;
-  $self->html ('<div class=section');
+  $self->html (qq[<div class="$class"]);
   if (defined $opt{id}) {
-    my $id = $self->input->id_prefix . $opt{id};
-    $self->html (' id="' . $htescape->($id) . '"');
-    push @{$self->{nav}},
-        [$id => $opt{short_title} || $opt{title} => $opt{text}] 
-        if $self->{section_rank} == 2;
+    my $prefix = $self->input->id_prefix;
+    $opt{parent_id} ||= $prefix;
+    my $id = $prefix . $opt{id};
+    $self->html (' id="' . $htescape->($id) . '">');
+    if ($self->{section_rank} == 2 or length $opt{parent_id}) {
+      my $st = $opt{short_title} || $opt{title};
+      push @{$self->{nav}},
+          [$id => $st => $opt{text}] if $self->{section_rank} == 2;
+      
+      $self->start_tag ('script');
+      $self->html (qq[ addSectionLink ('$id', ']);
+      $self->nl_text ($st, text => $opt{text});
+      if (defined $opt{parent_id}) {
+        $self->html (q[', '] . $opt{parent_id});
+      }
+      $self->html (q[') ]);
+      $self->end_tag ('script');
+    }
+  } else {
+    $self->html ('>');
   }
   my $section_rank = $self->{section_rank};
   $section_rank = 6 if $section_rank > 6;
-  $self->html ('><h' . $section_rank . '>');
+  $self->html ('<h' . $section_rank . '>');
   $self->nl_text ($opt{title}, text => $opt{text});
   $self->html ('</h' . $section_rank . '>');
 } # start_section
@@ -154,40 +219,55 @@
     } elsif ($opt{role} eq 'structure-errors') {
       $opt{id} ||= 'document-errors-list';
       delete $opt{role};
+    } elsif ($opt{role} eq 'transfer-errors') {
+      $opt{id} ||= 'transfer-errors-list';
+      delete $opt{role};
     }
   }
 
   $self->start_tag ('dl', %opt);
+
+  delete $self->{has_error}; # reset
 } # start_error_list
 
 sub end_error_list ($%) {
   my ($self, %opt) = @_;
 
+  my $no_error_message = 'No error found.';
+
   if (defined $opt{role}) {
     if ($opt{role} eq 'parse-errors') {
-      delete $opt{role};
       $self->end_tag ('dl');
       ## NOTE: For parse error list, the |add_source_to_parse_error_list|
       ## method is invoked at the end of |generate_source_string_section|,
       ## since that generation method is invoked after the error list
       ## is generated.
+      $no_error_message = 'No parse error found.';
     } elsif ($opt{role} eq 'structure-errors') {
-      delete $opt{role};
       $self->end_tag ('dl');
       $self->add_source_to_parse_error_list ('document-errors-list');
+      $no_error_message = 'No structural error found.';
+    } elsif ($opt{role} eq 'transfer-errors') {
+      $self->end_tag ('dl');
+      $no_error_message = 'No transfer error found.';
     } else {
       $self->end_tag ('dl');
     }
   } else {
     $self->end_tag ('dl');
   }
+
+  unless ($self->{has_error}) {
+    $self->start_tag ('p', class => 'no-errors');
+    $self->nl_text ($no_error_message);
+  }
 } # end_error_list
 
 sub add_source_to_parse_error_list ($$) {
   my $self = shift;
 
   $self->script (q[addSourceToParseErrorList ('] . $self->input->id_prefix .
-                 q[', '] . shift . q[')]);
+                 q[', '] . shift () . q[')]);
 } # add_source_to_parse_error_list
 
 sub start_code_block ($) {
@@ -218,6 +298,35 @@
   $self->nl_text ($content, text => $opt{text});
 } # dt
 
+sub select ($$%) {
+  my ($self, $options, %opt) = @_;
+
+  my $selected = $opt{selected};
+  delete $opt{selected};
+
+  $self->start_tag ('select', %opt);
+  
+  my @options = @$options;
+  while (@options) {
+    my $opt = shift @options;
+    if ($opt->{options}) {
+      $self->html ('<optgroup label="');
+      $self->nl_text ($opt->{label});
+      $self->html ('">');
+      unshift @options, @{$opt->{options}}, {end_options => 1};
+    } elsif ($opt->{end_options}) {
+      $self->end_tag ('optgroup');
+    } else {
+      $self->start_tag ('option', value => $opt->{value},
+                        ((defined $selected and $opt->{value} eq $selected)
+                             ? (selected => '') : ()));
+      $self->nl_text (defined $opt->{label} ? $opt->{label} : $opt->{value});
+    }
+  }
+
+  $self->end_tag ('select');
+} # select
+
 sub link ($$%) {
   my ($self, $content, %opt) = @_;
   $self->start_tag ('a', %opt, href => $opt{url});
@@ -232,6 +341,13 @@
   $self->html ('</a>');
 } # xref
 
+sub xref_text ($$%) {
+  my ($self, $content, %opt) = @_;
+  $self->html ('<a href="#' . $htescape->($self->input->id_prefix . $opt{target}) . '">');
+  $self->text ($content);
+  $self->html ('</a>');
+} # xref
+
 sub link_to_webhacc ($$%) {
   my ($self, $content, %opt) = @_;
   $opt{url} = './?uri=' . $self->encode_url_component ($opt{url});
@@ -265,9 +381,31 @@
   return join '/', @r;
 }; # $get_node_path
 
+my $get_object_path = sub ($) {
+  my $node = shift;
+  my @r;
+  while (defined $node) {
+    my $ref = ref $node;
+    $ref =~ /([^:]+)$/;
+    my $rs = $1;
+    my $node_name = $node->node_name;
+    if (defined $node_name) {
+      $rs .= ' <code>' . $htescape->($node_name) . '</code>';
+    }
+    $node = undef;
+    unshift @r, $rs;
+  }
+  return join '/', @r;
+}; # $get_object_path
+
 sub node_link ($$) {
   my ($self, $node) = @_;
-  $self->xref ($get_node_path->($node), target => 'node-' . refaddr $node);
+  if ($node->isa ('Message::IF::Node')) {
+    $self->xref_text ($get_node_path->($node),
+                      target => 'node-' . refaddr $node);
+  } else {
+    $self->html ($get_object_path->($node));
+  }
 } # node_link
 
 {
@@ -295,42 +433,52 @@
   my ($self, $type, %opt) = @_;
   my $node = $opt{node};
 
-  my @arg;
-  {
-    if (defined $Msg->{$type}) {
-      my $msg = $Msg->{$type}->[1];
-      if ($msg =~ /<var>/) {
-        $msg =~ s{<var>\$([0-9]+)</var>}{
-          defined $arg[$1] ? $htescape->($arg[$1]) : '(undef)';
-        }ge;
-        $msg =~ s{<var>{\@([A-Za-z0-9:_.-]+)}</var>}{
-          UNIVERSAL::can ($node, 'get_attribute_ns')
-              ? $htescape->($node->get_attribute_ns (undef, $1)) : ''
-        }ge;
-        $msg =~ s{<var>{\@}</var>}{
-          UNIVERSAL::can ($node, 'value') ? $htescape->($node->value) : ''
-        }ge;
-        $msg =~ s{<var>{text}</var>}{
-          defined $opt{text} ? $htescape->($opt{text}) : ''
-        }ge;
-        $msg =~ s{<var>{local-name}</var>}{
-          UNIVERSAL::can ($node, 'manakai_local_name')
+  if (defined $Msg->{$type}) {
+    my $msg = $Msg->{$type}->[1];
+    if ($msg =~ /<var>/) {
+      $msg =~ s{<var>{\@([A-Za-z0-9:_.-]+)}</var>}{
+        UNIVERSAL::can ($node, 'get_attribute_ns')
+            ? $htescape->($node->get_attribute_ns (undef, $1)) : ''
+      }ge;
+      $msg =~ s{<var>{\@}</var>}{
+        UNIVERSAL::can ($node, 'value') ? $htescape->($node->value) : ''
+      }ge;
+      $msg =~ s{<var>{text}</var>}{
+        defined $opt{text} ? $htescape->($opt{text}) : ''
+      }ge;
+      $msg =~ s{<var>{value}</var>}{
+        defined $opt{value} ? $htescape->($opt{value}) : ''
+      }ge;
+      $msg =~ s{<var>{octets}</var>}{
+        if (defined $opt{octets}) {
+          join ', ', map {sprintf '0x%02X', ord $_} split //, ${$opt{octets}};
+        } else {
+          '';
+        }
+      }ge;
+      $msg =~ s{<var>{char}</var>}{
+        defined $opt{char} ? $htescape->(${$opt{char}}) : ''
+      }ge;
+      $msg =~ s{<var>{char:hexref}</var>}{
+        if (defined $opt{char}) {
+          join '', map {sprintf '&amp;#x%02X;', ord $_} split //, ${$opt{char}};
+        } else {
+          '';
+        }
+      }ge;
+      $msg =~ s{<var>{local-name}</var>}{
+        UNIVERSAL::can ($node, 'manakai_local_name')
             ? $htescape->($node->manakai_local_name) : ''
-        }ge;
-        $msg =~ s{<var>{element-local-name}</var>}{
-          (UNIVERSAL::can ($node, 'owner_element') and
-           $node->owner_element)
+      }ge;
+      $msg =~ s{<var>{element-local-name}</var>}{
+        (UNIVERSAL::can ($node, 'owner_element') and $node->owner_element)
             ? $htescape->($node->owner_element->manakai_local_name) : ''
-        }ge;
-      }
-      $self->html ($msg);
-      return;
-    } elsif ($type =~ s/:([^:]*)$//) {
-      unshift @arg, $1;
-      redo;
+      }ge;
     }
+    $self->html ($msg);
+  } else {
+    $self->text ($type);
   }
-  $self->text ($type);
 } # nl_text
 
 }
@@ -367,13 +515,232 @@
   $self->nl_text (q[WebHACC:Title]);
   $self->html (q[</title>
 <link rel="stylesheet" href="../cc-style.css" type="text/css">
+<script src="../cc-script.js"></script>
 </head>
-<body>
+<body onclick=" return onbodyclick (event) " onload=" onbodyload () ">
 <h1>]);
   $self->nl_text (q[WebHACC:Heading]);
-  $self->html ('</h1>');
+  $self->html (q[</h1><script> insertNavSections () </script>]);
 } # html_header
 
+sub generate_input_section ($$) {
+  my ($out, $cgi) = @_;
+
+  require Encode;
+  my $decode = sub ($) {
+    if (defined $_[0]) {
+      return Encode::decode ('utf-8', $_[0]);
+    } else {
+      return undef;
+    }
+  }; # $decode
+
+  my $options = sub ($) {
+    my $context = shift;
+
+    $out->html (q[<div class="details default"><p class=legend onclick="nextSibling.style.display = nextSibling.style.display == 'block' ? 'none' : 'block'; parentNode.className = nextSibling.style.display == 'none' ? 'details' : 'details open'" tabindex=0>]);
+    $out->nl_text (q[Options]);
+    $out->start_tag ('div');
+
+    if ($context eq 'url') {
+      $out->start_tag ('p');
+      $out->start_tag ('label');
+      $out->start_tag ('input', type => 'checkbox', name => 'error-page',
+                       value => 1,
+                       ($cgi->get_parameter ('error-page')
+                            ? (checked => '') : ()));
+      $out->nl_text ('Check error page');
+      $out->end_tag ('label');
+    }
+ 
+    $out->start_tag ('p');
+    $out->start_tag ('label');
+    $out->nl_text (q[Content type]);
+    $out->text (': ');
+    $out->select ([
+      {value => '', label => 'As specified'},
+      {value => 'application/atom+xml'},
+      {value => 'text/cache-manifest'},
+      {value => 'text/css'},
+      {value => 'text/x-h2h'},
+      {value => 'text/html'},
+      {value => 'text/x-webidl'},
+      {value => 'application/xhtml+xml'},
+      {value => 'application/xml'},
+      {value => 'text/xml'},
+    ], name => 'i', selected => scalar $cgi->get_parameter ('i'));
+    $out->end_tag ('label');
+
+    if ($context ne 'text') {
+      $out->start_tag ('p');
+      $out->start_tag ('label');
+      $out->nl_text (q[Charset]);
+      $out->text (q[: ]);
+      $out->select ([
+        {value => '', label => 'As specified'},
+        {label => 'Japanese charsets', options => [
+          {value => 'Windows-31J'},
+          {value => 'Shift_JIS'},
+          {value => 'x-sjis'},
+          {value => 'EUC-JP'},
+          {value => 'x-euc-jp'},
+          {value => 'ISO-2022-JP'},
+          {value => 'ISO-2022-JP-1'},
+          {value => 'ISO-2022-JP-2'},
+        ]},
+        {label => 'Latin charsets', options => [
+          {value => 'Windows-1250'},
+          {value => 'Windows-1252'},
+          {value => 'Windows-1254'},
+          {value => 'Windows-1257'},
+          {value => 'Windows-1258'},
+          {value => 'ISO-8859-1'},
+          {value => 'ISO-8859-2'},
+          {value => 'ISO-8859-3'},
+          {value => 'ISO-8859-4'},
+          {value => 'ISO-8859-9'},
+          {value => 'ISO-8859-10'},
+          {value => 'ISO-8859-13'},
+          {value => 'ISO-8859-14'},
+          {value => 'ISO-8859-15'},
+          {value => 'ISO-8859-16'},
+          {value => 'US-ASCII'},
+        ]},
+        {label => 'Greek charsets', options => [
+          {value => 'Windows-1253'},
+          {value => 'ISO-8859-7'},
+        ]},
+        {label => 'Cyrillic charsets', options => [
+          {value => 'Windows-1251'},
+          {value => 'ISO-8859-5'},
+        ]},
+        {label => 'Arabic charsets', options => [
+          {value => 'Windows-1256'},
+          {value => 'ISO-8859-6'},
+        ]},
+        {label => 'Hebrew charsets', options => [
+          {value => 'Windows-1255'},
+          {value => 'ISO-8859-8'},
+        ]},
+        {label => 'Thai charsets', options => [
+          {value => 'Windows-874'},
+          {value => 'ISO-8859-11'},
+          {value => 'TIS-620'},
+        ]},
+        {label => 'Chinese charsets', options => [
+          {value => 'Big5'},
+          {value => 'x-x-big5'},
+          {value => 'Big5-HKSCS'},
+          {value => 'GBK'},
+          {value => 'GB2312'},
+          {value => 'GB_2312-80'},
+          {value => 'ISO-2022-CN'},
+          {value => 'ISO-2022-CN-EXT'},
+        ]},
+        {label => 'Korean charsets', options => [
+          {value => 'Windows-949'},
+          {value => 'EUC-KR'},
+          {value => 'KS_C_5601-1987'},
+          {value => 'ISO-2022-KR'},
+        ]},
+        {label => 'Unicode charsets', options => [
+          {value => 'UTF-8'},
+          {value => 'UTF-8n'},
+          {value => 'UTF-16'}, 
+          {value => 'UTF-16BE'},
+          {value => 'UTF-16LE'},
+       ]},
+      ], name => 'charset',
+      selected => scalar $cgi->get_parameter ('charset'));
+      $out->end_tag ('label');
+    }
+
+    if ($context eq 'text') {
+      $out->start_tag ('p');
+      $out->start_tag ('label');
+      $out->nl_text ('Setting innerHTML');
+      $out->text (': ');
+      $out->start_tag ('input', name => 'e',
+                       value => $decode->(scalar $cgi->get_parameter ('e')));
+      $out->end_tag ('label');
+    }
+
+    $out->html (q[</div></div>]);
+  }; # $options
+
+  $out->start_section (id => 'input', title => 'Input');
+  $out->html (q[<script> insertNavSections ('input') </script>]);
+
+  $out->start_section (id => 'input-url', title => 'By URL',
+                       parent_id => 'input');
+  $out->start_tag ('form', action => './#result-summary',
+                   'accept-charset' => 'utf-8',
+                   method => 'get');
+  $out->start_tag ('input', type => 'hidden', name => '_charset_');
+
+  $out->start_tag ('p');
+  $out->start_tag ('label');
+  $out->nl_text ('URL');
+  $out->text (': ');
+  $out->start_tag ('input',
+                   name => 'uri',
+                   type => 'url',
+                   value => $decode->(scalar $cgi->get_parameter ('uri')));
+  $out->end_tag ('label');
+
+  $out->start_tag ('p');
+  $out->start_tag ('button', type => 'submit');
+  $out->nl_text ('Check');
+  $out->end_tag ('button');
+
+  $options->('url');
+
+  $out->end_tag ('form');
+  $out->end_section;
+
+  ## TODO: File upload
+
+  $out->start_section (id => 'input-text', title => 'By direct input',
+                       parent_id => 'input');
+  $out->start_tag ('form', action => './#result-summary',
+                   'accept-charset' => 'utf-8',
+                   method => 'post');
+  $out->start_tag ('input', type => 'hidden', name => '_charset_');
+
+  $out->start_tag ('p');
+  $out->start_tag ('label');
+  $out->nl_text ('Document source to check');
+  $out->text (': ');
+  $out->start_tag ('br');
+  $out->start_tag ('textarea',
+                   name => 's');
+  my $s = $decode->($cgi->get_parameter ('s'));
+  $out->html ($htescape_value->($s)) if defined $s;
+  $out->end_tag ('textarea');
+  $out->end_tag ('label');
+
+  $out->start_tag ('p');
+  $out->start_tag ('button', type => 'submit', 
+                   onclick => 'form.method = form.s.value.length > 512 ? "post" : "get"');
+  $out->nl_text ('Check');
+  $out->end_tag ('button');
+
+  $options->('text');
+
+  $out->end_tag ('form');
+  $out->end_section;
+
+  $out->script (q[
+    if (!document.webhaccNavigated &&
+        document.getElementsByTagName ('textarea')[0].value.length > 0) {
+      showTab ('input-text');
+      document.webhaccNavigated = false;
+    }
+  ]);
+
+  $out->end_section;
+} # generate_input_section
+
 sub encode_url_component ($$) {
   shift;
   require Encode;