--- test/html-webhacc/WebHACC/Output.pm	2008/07/21 09:40:59	1.5
+++ test/html-webhacc/WebHACC/Output.pm	2008/08/14 09:16:52	1.13
@@ -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;
     }
   }
   
@@ -73,29 +84,32 @@
 
 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';
+      $opt{title} ||= 'Parse Errors Section';
+      $opt{short_title} ||= 'Parse Errors';
       delete $opt{role};
     } elsif ($opt{role} eq 'structure-errors') {
       $opt{id} ||= 'document-errors';
@@ -117,22 +131,41 @@
       $opt{title} ||= 'Document Structure';
       $opt{short_title} ||= 'Structure';
       delete $opt{role};
+    } elsif ($opt{role} eq 'subdoc') {
+      $class .= ' subdoc';
+      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}] 
-        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}];
+      
+      $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 . '>' .
-               $htescape->($opt{title}) .
-               '</h' . $section_rank . '>');
+  $self->html ('<h' . $section_rank . '>');
+  $self->nl_text ($opt{title}, text => $opt{text});
+  $self->html ('</h' . $section_rank . '>');
 } # start_section
 
 sub end_section ($) {
@@ -185,7 +218,7 @@
   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 ($) {
@@ -213,9 +246,38 @@
 sub dt ($$;%) {
   my ($self, $content, %opt) = @_;
   $self->start_tag ('dt', %opt);
-  $self->text ($content);
+  $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});
@@ -226,7 +288,7 @@
 sub xref ($$%) {
   my ($self, $content, %opt) = @_;
   $self->html ('<a href="#' . $htescape->($self->input->id_prefix . $opt{target}) . '">');
-  $self->text ($content);
+  $self->nl_text ($content, text => $opt{text});
   $self->html ('</a>');
 } # xref
 
@@ -236,7 +298,6 @@
   $self->link ($content, %opt);
 } # link_to_webhacc
 
-
 my $get_node_path = sub ($) {
   my $node = shift;
   my @r;
@@ -264,16 +325,104 @@
   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 ($get_node_path->($node), target => 'node-' . refaddr $node);
+  } else {
+    $self->html ($get_object_path->($node));
+  }
 } # node_link
 
+{
+  my $Msg = {};
+
+sub load_text_catalog ($$) {
+  my $self = shift;
+
+  my $lang = shift; # MUST be a canonical lang name
+  my $file_name = qq[cc-msg.$lang.txt];
+  $lang = 'en' unless -f $file_name;
+  $self->{primary_language} = $lang;
+  
+  open my $file, '<:utf8', $file_name or die "$0: $file_name: $!";
+  while (<$file>) {
+    if (s/^([^;]+);([^;]*);//) {
+      my ($type, $cls, $msg) = ($1, $2, $_);
+      $msg =~ tr/\x0D\x0A//d;
+      $Msg->{$type} = [$cls, $msg];
+    }
+  }
+} # load_text_catalog
+
+sub nl_text ($$;%) {
+  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')
+            ? $htescape->($node->manakai_local_name) : ''
+        }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;
+    }
+  }
+  $self->text ($type);
+} # nl_text
+
+}
+
 sub nav_list ($) {
   my $self = shift;
   $self->html (q[<ul class="navigation" id="nav-items">]);
   for (@{$self->{nav}}) {
-    $self->html (qq[<li><a href="#@{[$htescape->($_->[0])]}">@{[$htescape->($_->[1])]}</a>]);
+    $self->html (qq[<li><a href="#@{[$htescape->($_->[0])]}">]);
+    $self->nl_text ($_->[1], text => $_->[2]);
+    $self->html ('</a>');
   }
   $self->html ('</ul>');
 } # nav_list
@@ -293,18 +442,178 @@
 
 sub html_header ($) {
   my $self = shift;
-  $self->html (q[<!DOCTYPE html>
-<html lang="en">
-<head>
-<title>Web Document Conformance Checker (BETA)</title>
+  $self->html (q[<!DOCTYPE html>]);
+  $self->start_tag ('html', lang => $self->{primary_language});
+  $self->html (q[<head><title>]);
+  $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>
-<h1><a href="../cc-interface">Web Document Conformance Checker</a> 
-(<em>beta</em>)</h1>
-]);
+<body onclick=" return onbodyclick (event) " onload=" onbodyload () ">
+<h1>]);
+  $self->nl_text (q[WebHACC:Heading]);
+  $self->html (q[</h1><script> insertNavSections () </script>]);
 } # html_header
 
+sub generate_input_section ($$) {
+  my ($out, $cgi) = @_;
+
+  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'">]);
+    $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 => 'application/xhtml+xml'},
+      {value => 'application/xml'},
+      {value => 'text/html'},
+      {value => 'text/xml'},
+      {value => 'text/css'},
+      {value => 'text/cache-manifest'},
+      {value => 'text/x-webidl'},
+    ], 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 => 'EUC-JP'},
+          {value => 'ISO-2022-JP'},
+        ]},
+        {label => 'European charsets', options => [
+          {value => 'Windows-1252'},
+          {value => 'ISO-8859-1'},
+          {value => 'US-ASCII'},
+        ]},
+        {label => 'Asian charsets', options => [
+          {value => 'Windows-874'},
+          {value => 'ISO-8859-11'},
+          {value => 'TIS-620'},
+        ]},
+        {label => 'Unicode charsets', options => [
+          {value => 'UTF-8'},
+          {value => 'UTF-8n'},
+        ]},
+      ], 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 => 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 => $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;
+
+  $out->end_tag ('fieldset');
+
+  ## 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 = $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;