--- test/html-webhacc/cc.cgi	2008/03/11 14:10:11	1.38
+++ test/html-webhacc/cc.cgi	2008/03/16 11:38:47	1.41
@@ -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,7 +294,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 {
@@ -346,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 {
@@ -557,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 ();
@@ -623,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 {
@@ -669,19 +671,20 @@
 <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}'); </script>";
 } # print_input_string_section
 
 sub print_document_tree ($$) {
@@ -1118,7 +1121,14 @@
 
   my $r = '';
 
-  if (defined $err->{line}) {
+  if (defined $err->{token} and defined $err->{token}->{line}) {
+    if ($err->{token}->{column} > 0) {
+      $r = qq[<a href="#$input->{id_prefix}line-$err->{token}->{line}">Line $err->{token}->{line}</a> column $err->{token}->{column}];
+    } else {
+      $err->{token}->{line} = $err->{token}->{line} - 1 || 1;
+      $r = qq[<a href="#$input->{id_prefix}line-$err->{token}->{line}">Line $err->{token}->{line}</a>];
+    }
+  } elsif (defined $err->{line}) {
     if ($err->{column} > 0) {
       $r = qq[<a href="#$input->{id_prefix}line-$err->{line}">Line $err->{line}</a> column $err->{column}];
     } else {
@@ -1453,4 +1463,4 @@
 
 =cut
 
-## $Date: 2008/03/11 14:10:11 $
+## $Date: 2008/03/16 11:38:47 $