--- test/html-webhacc/cc.cgi	2008/02/24 02:17:51	1.37
+++ test/html-webhacc/cc.cgi	2008/03/17 13:25:19	1.42
@@ -86,6 +86,8 @@
     <dd>$char_length byte@{[$char_length == 1 ? '' : 's']}</dd>
 </dl>
 </div>
+
+<script src="../cc-script.js"></script>
 ];
 
   $input->{id_prefix} = '';
@@ -292,18 +294,14 @@
 <div id="$input->{id_prefix}parse-errors" class="section">
 <h2>Parse Errors</h2>
 
-<dl>];
+<dl id="$input->{id_prefix}parse-errors-list">];
   push @nav, ['#parse-errors' => 'Parse Error'] unless $input->{nested};
 
   my $onerror = sub {
     my (%opt) = @_;
     my ($type, $cls, $msg) = get_text ($opt{type}, $opt{level});
-    if ($opt{column} > 0) {
-      print STDOUT qq[<dt class="$cls"><a href="#$input->{id_prefix}line-$opt{line}">Line $opt{line}</a> column $opt{column}</dt>\n];
-    } else {
-      $opt{line} = $opt{line} - 1 || 1;
-      print STDOUT qq[<dt class="$cls"><a href="#$input->{id_prefix}line-$opt{line}">Line $opt{line}</a></dt>\n];
-    }
+    print STDOUT qq[<dt class="$cls">], get_error_label ($input, \%opt),
+        qq[</dt>];
     $type =~ tr/ /-/;
     $type =~ s/\|/%7C/g;
     $msg .= qq[ [<a href="../error-description#@{[htescape ($type)]}">Description</a>]];
@@ -350,7 +348,7 @@
 <div id="$input->{id_prefix}parse-errors" class="section">
 <h2>Parse Errors</h2>
 
-<dl>];
+<dl id="$input->{id_prefix}parse-errors-list">];
   push @nav, ['#parse-errors' => 'Parse Error'] unless $input->{prefix};
 
   my $onerror = sub {
@@ -561,7 +559,7 @@
 <div id="$input->{id_prefix}parse-errors" class="section">
 <h2>Parse Errors</h2>
 
-<dl>];
+<dl id="$input->{id_prefix}parse-errors-list">];
   push @nav, ['#parse-errors' => 'Parse Error'] unless $input->{nested};
 
   my $p = get_css_parser ();
@@ -627,7 +625,7 @@
 <div id="$input->{id_prefix}parse-errors" class="section">
 <h2>Parse Errors</h2>
 
-<dl>];
+<dl id="$input->{id_prefix}parse-errors-list">];
   push @nav, ['#parse-errors' => 'Parse Error'] unless $input->{nested};
 
   my $onerror = sub {
@@ -673,19 +671,22 @@
 <h2>Document Source</h2>
 <ol lang="">\n];
   if (length $$s) {
-    while ($$s =~ /\G([^\x0A]*?)\x0D?\x0A/gc) {
+    while ($$s =~ /\G([^\x0D\x0A]*?)(?>\x0D\x0A?|\x0A)/gc) {
       print STDOUT qq[<li id="$input->{id_prefix}line-$i">], htescape $1,
           "</li>\n";
       $i++;
     }
-    if ($$s =~ /\G([^\x0A]+)/gc) {
+    if ($$s =~ /\G([^\x0D\x0A]+)/gc) {
       print STDOUT qq[<li id="$input->{id_prefix}line-$i">], htescape $1,
           "</li>\n";
     }
   } else {
     print STDOUT q[<li id="$input->{id_prefix}line-1"></li>];
   }
-  print STDOUT "</ol></div>";
+  print STDOUT "</ol></div>
+<script>
+  addSourceToParseErrorList ('$input->{id_prefix}', 'parse-errors-list');
+</script>";
 } # print_input_string_section
 
 sub print_document_tree ($$) {
@@ -854,7 +855,7 @@
   print STDOUT qq[<div id="$input->{id_prefix}document-errors" class="section">
 <h2>Document Errors</h2>
 
-<dl>];
+<dl id=document-errors-list>];
   push @nav, [qq[#$input->{id_prefix}document-errors] => 'Document Error']
       unless $input->{nested};
 
@@ -882,7 +883,10 @@
   }
   $time{check} = time - $time1;
 
-  print STDOUT qq[</dl></div>];
+  print STDOUT qq[</dl>
+<script>
+  addSourceToParseErrorList ('$input->{id_prefix}', 'document-errors-list');
+</script></div>];
 
   return $elements;
 } # print_structure_error_dom_section
@@ -1122,18 +1126,43 @@
 
   my $r = '';
 
-  if (defined $err->{line}) {
-    if ($err->{column} > 0) {
-      $r = qq[<a href="#$input->{id_prefix}line-$err->{line}">Line $err->{line}</a> column $err->{column}];
+  my $line;
+  my $column;
+    
+  if (defined $err->{node}) {
+    $line = $err->{node}->get_user_data ('manakai_source_line');
+    if (defined $line) {
+      $column = $err->{node}->get_user_data ('manakai_source_column');
+    } else {
+      if ($err->{node}->node_type == $err->{node}->ATTRIBUTE_NODE) {
+        my $owner = $err->{node}->owner_element;
+        $line = $owner->get_user_data ('manakai_source_line');
+        $column = $owner->get_user_data ('manakai_source_column');
+      }
+    }
+  }
+  unless (defined $line) {
+    if (defined $err->{token} and defined $err->{token}->{line}) {
+      $line = $err->{token}->{line};
+      $column = $err->{token}->{column};
+    } elsif (defined $err->{line}) {
+      $line = $err->{line};
+      $column = $err->{column};
+    }
+  }
+ 
+  if (defined $line) {
+    if (defined $column and $column > 0) {
+      $r = qq[<a href="#$input->{id_prefix}line-$line">Line $line</a> column $column];
     } else {
-      $err->{line} = $err->{line} - 1 || 1;
-      $r = qq[<a href="#$input->{id_prefix}line-$err->{line}">Line $err->{line}</a>];
+      $line = $line - 1 || 1;
+      $r = qq[<a href="#$input->{id_prefix}line-$line">Line $line</a>];
     }
   }
 
   if (defined $err->{node}) {
     $r .= ' ' if length $r;
-    $r = get_node_link ($input, $err->{node});
+    $r .= get_node_link ($input, $err->{node});
   }
 
   if (defined $err->{index}) {
@@ -1457,4 +1486,4 @@
 
 =cut
 
-## $Date: 2008/02/24 02:17:51 $
+## $Date: 2008/03/17 13:25:19 $