--- test/html-webhacc/WebHACC/Output.pm	2008/07/20 16:53:10	1.2
+++ test/html-webhacc/WebHACC/Output.pm	2008/07/21 09:54:59	1.6
@@ -1,6 +1,8 @@
 package WebHACC::Output;
 use strict;
+
 require IO::Handle;
+use Scalar::Util qw/refaddr/;
 
 my $htescape = sub ($) {
   my $s = $_[0];
@@ -15,7 +17,7 @@
 };
 
 sub new ($) {
-  return bless {nav => []}, shift;
+  return bless {nav => [], section_rank => 1}, shift;
 } # new
 
 sub input ($;$) {
@@ -89,22 +91,103 @@
 
 sub start_section ($%) {
   my ($self, %opt) = @_;
+
+  if (defined $opt{role}) {
+    if ($opt{role} eq 'parse-errors') {
+      $opt{id} ||= 'parse-errors';
+      $opt{title} ||= 'Parse Errors';
+      delete $opt{role};
+    } elsif ($opt{role} eq 'structure-errors') {
+      $opt{id} ||= 'document-errors';
+      $opt{title} ||= 'Structural Errors';
+      $opt{short_title} ||= 'Struct. Errors';
+      delete $opt{role};
+    } elsif ($opt{role} eq 'reformatted') {
+      $opt{id} ||= 'document-tree';
+      $opt{title} ||= 'Reformatted Document Source';
+      $opt{short_title} ||= 'Reformatted';
+      delete $opt{role}
+    } elsif ($opt{role} eq 'tree') {
+      $opt{id} ||= 'document-tree';
+      $opt{title} ||= 'Document Tree';
+      $opt{short_title} ||= 'Tree';
+      delete $opt{role};
+    } elsif ($opt{role} eq 'structure') {
+      $opt{id} ||= 'document-structure';
+      $opt{title} ||= 'Document Structure';
+      $opt{short_title} ||= 'Structure';
+      delete $opt{role};
+    }
+  }
+
+  $self->{section_rank}++;
   $self->html ('<div class=section');
   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}] 
-        unless $self->input->nested;
+        if $self->{section_rank} == 2;
   }
-  $self->html ('><h2>' . $htescape->($opt{title}) . '</h2>');
+  my $section_rank = $self->{section_rank};
+  $section_rank = 6 if $section_rank > 6;
+  $self->html ('><h' . $section_rank . '>' .
+               $htescape->($opt{title}) .
+               '</h' . $section_rank . '>');
 } # start_section
 
 sub end_section ($) {
   my $self = shift;
   $self->html ('</div>');
   $self->{handle}->flush;
+  $self->{section_rank}--;
 } # end_section
 
+sub start_error_list ($%) {
+  my ($self, %opt) = @_;
+
+  if (defined $opt{role}) {
+    if ($opt{role} eq 'parse-errors') {
+      $opt{id} ||= 'parse-errors-list';
+      delete $opt{role};
+    } elsif ($opt{role} eq 'structure-errors') {
+      $opt{id} ||= 'document-errors-list';
+      delete $opt{role};
+    }
+  }
+
+  $self->start_tag ('dl', %opt);
+} # start_error_list
+
+sub end_error_list ($%) {
+  my ($self, %opt) = @_;
+
+  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.
+    } elsif ($opt{role} eq 'structure-errors') {
+      delete $opt{role};
+      $self->end_tag ('dl');
+      $self->add_source_to_parse_error_list ('document-errors-list');
+    } else {
+      $self->end_tag ('dl');
+    }
+  } else {
+    $self->end_tag ('dl');
+  }
+} # end_error_list
+
+sub add_source_to_parse_error_list ($$) {
+  my $self = shift;
+
+  $self->script (q[addSourceToParseErrorList ('] . $self->input->id_prefix .
+                 q[', '] . shift . q[')]);
+} # add_source_to_parse_error_list
+
 sub start_code_block ($) {
   shift->html ('<pre><code>');
 } # start_code_block
@@ -113,10 +196,26 @@
   shift->html ('</code></pre>');
 } # end_code_block
 
-sub code ($$) {
-  shift->html ('<code>' . $htescape->(shift) . '</code>');
+sub code ($$;%) {
+  my ($self, $content, %opt) = @_;
+  $self->start_tag ('code', %opt);
+  $self->text ($content);
+  $self->html ('</code>');
 } # code
 
+sub script ($$;%) {
+  my ($self, $content, %opt) = @_;
+  $self->start_tag ('script', %opt);
+  $self->html ($content);
+  $self->html ('</script>');
+} # script
+
+sub dt ($$;%) {
+  my ($self, $content, %opt) = @_;
+  $self->start_tag ('dt', %opt);
+  $self->text ($content);
+} # dt
+
 sub link ($$%) {
   my ($self, $content, %opt) = @_;
   $self->start_tag ('a', %opt, href => $opt{url});
@@ -137,15 +236,73 @@
   $self->link ($content, %opt);
 } # link_to_webhacc
 
+
+my $get_node_path = sub ($) {
+  my $node = shift;
+  my @r;
+  while (defined $node) {
+    my $rs;
+    if ($node->node_type == 1) {
+      $rs = $node->node_name;
+      $node = $node->parent_node;
+    } elsif ($node->node_type == 2) {
+      $rs = '@' . $node->node_name;
+      $node = $node->owner_element;
+    } elsif ($node->node_type == 3) {
+      $rs = '"' . $node->data . '"';
+      $node = $node->parent_node;
+    } elsif ($node->node_type == 9) {
+      @r = ('') unless @r;
+      $rs = '';
+      $node = $node->parent_node;
+    } else {
+      $rs = '#' . $node->node_type;
+      $node = $node->parent_node;
+    }
+    unshift @r, $rs;
+  }
+  return join '/', @r;
+}; # $get_node_path
+
+sub node_link ($$) {
+  my ($self, $node) = @_;
+  $self->xref ($get_node_path->($node), target => 'node-' . refaddr $node);
+} # node_link
+
 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])]}">@{[$htescape->($_->[1])]}</a>]);
   }
   $self->html ('</ul>');
 } # nav_list
 
+sub http_header ($) {
+  shift->html (qq[Content-Type: text/html; charset=utf-8\n\n]);
+} # http_header
+
+sub http_error ($$) {
+  my $self = shift;
+  my $code = 0+shift;
+  my $text = {
+    404 => 'Not Found',
+  }->{$code};
+  $self->html (qq[Status: $code $text\nContent-Type: text/html ; charset=us-ascii\n\n$code $text]);
+} # http_error
+
+sub html_header ($) {
+  my $self = shift;
+  $self->html (q[<!DOCTYPE html>
+<html lang="en">
+<head>
+<title>WebHACC (BETA) Result</title>
+<link rel="stylesheet" href="../cc-style.css" type="text/css">
+</head>
+<body>
+<h1><a href="../cc-interface"><abbr title="Web Hypertext Application Conformance Checker (BETA)"><img src="../icons/title" alt="WebHACC"></abbr></a></h1>
+]);
+} # html_header
 
 sub encode_url_component ($$) {
   shift;