[css2] Bug fixes

--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%40521

Author: ianbjacobs

css2/bin/Attic/mksubtoc

@@ -2,7 +2,7 @@
 # sub TOC builder
 #
 # Arnaud Le Hors - lehors@w3.org
-# $Id: mksubtoc,v 1.5 1997-12-09 15:16:00 ian Exp $
+# $Id: mksubtoc,v 1.6 1997-12-11 00:13:45 ijacobs Exp $
 
 $startlvl = 0;
 $maxlvl = 0;
@@ -93,9 +93,11 @@ while (/$file;(.*?);([0-9]*);([1-9A-Z].*?);(.*?)\n/sig) {
     $anchor = $4;
     if ($h > $startlvl && ($maxlvl == 0 || $h <= $maxlvl)) {
 	ol($h);
-	# If there's an anchor, reuse it.
+	# If there's an anchor, it has a name attr (by mktoc).
+	# Reuse it (and rename name -> href everywhere)
 	if ($t =~ /<a[^>]+>/si) {
-	    $t =~ s/name=\"?.*?$anchor\"?/href=\"#$anchor\"/isg;
+	    $t =~ s/name\s*=\s*\"[^#]*?(#[^"]*?)\"/href=\"\1\"/isg;
+	    $t =~ s/name\s*=\s*[^#]*?(#[^\s>]*?)/href=\"\1\"/isg;
 	    print OUTPUT "<li>$t\n";
 	} else {
 	    if ($h > 1) {

css2/bin/Attic/mktoc

@@ -5,7 +5,7 @@
 #   1. Some header - and its related comment
 #
 # Arnaud Le Hors - lehors@w3.org
-# $Id: mktoc,v 1.13 1997-12-09 00:08:46 ijacobs Exp $
+# $Id: mktoc,v 1.14 1997-12-11 00:13:46 ijacobs Exp $
 
 if (($_ = $ARGV[0], /^-l/) && $ARGV[0]) {
     shift;
@@ -163,9 +163,11 @@ LOOP: foreach $file (@ARGV) {
 		$hasanchor = t;
 		# let's reuse it
 		$anch = $&;
-		if ($anch =~ /name=(?:\"([^\"]+)\"|([^ \n\t>]+))/sig) {
+		if ($anch =~ /name\s*=\s*(?:\"([^\"]+)\"|([^\s>]+))/sig) {
+		    #Only one of two will match.
 		    $anchor = "$1$2";
-		    $txt =~ s/name=\"?$anchor\"?/href=\"$hfil#$anchor\"/isg;
+		    $txt =~ s/name\s*=\s*\"$anchor\"/href=\"$hfil#$anchor\"/isg;
+		    $txt =~ s/name\s*=\s*$anchor\s/href=\"$hfil#$anchor\"\s/isg;
 		}
 	    } else {
 		$anchor = "h-$num";

css2/bin/mksubtoc

@@ -2,7 +2,7 @@
 # sub TOC builder
 #
 # Arnaud Le Hors - lehors@w3.org
-# $Id: mksubtoc,v 1.5 1997-12-09 15:16:00 ian Exp $
+# $Id: mksubtoc,v 1.6 1997-12-11 00:13:45 ijacobs Exp $
 
 $startlvl = 0;
 $maxlvl = 0;
@@ -93,9 +93,11 @@ while (/$file;(.*?);([0-9]*);([1-9A-Z].*?);(.*?)\n/sig) {
     $anchor = $4;
     if ($h > $startlvl && ($maxlvl == 0 || $h <= $maxlvl)) {
 	ol($h);
-	# If there's an anchor, reuse it.
+	# If there's an anchor, it has a name attr (by mktoc).
+	# Reuse it (and rename name -> href everywhere)
 	if ($t =~ /<a[^>]+>/si) {
-	    $t =~ s/name=\"?.*?$anchor\"?/href=\"#$anchor\"/isg;
+	    $t =~ s/name\s*=\s*\"[^#]*?(#[^"]*?)\"/href=\"\1\"/isg;
+	    $t =~ s/name\s*=\s*[^#]*?(#[^\s>]*?)/href=\"\1\"/isg;
 	    print OUTPUT "<li>$t\n";
 	} else {
 	    if ($h > 1) {

css2/bin/mktoc

@@ -5,7 +5,7 @@
 #   1. Some header - and its related comment
 #
 # Arnaud Le Hors - lehors@w3.org
-# $Id: mktoc,v 1.13 1997-12-09 00:08:46 ijacobs Exp $
+# $Id: mktoc,v 1.14 1997-12-11 00:13:46 ijacobs Exp $
 
 if (($_ = $ARGV[0], /^-l/) && $ARGV[0]) {
     shift;
@@ -163,9 +163,11 @@ LOOP: foreach $file (@ARGV) {
 		$hasanchor = t;
 		# let's reuse it
 		$anch = $&;
-		if ($anch =~ /name=(?:\"([^\"]+)\"|([^ \n\t>]+))/sig) {
+		if ($anch =~ /name\s*=\s*(?:\"([^\"]+)\"|([^\s>]+))/sig) {
+		    #Only one of two will match.
 		    $anchor = "$1$2";
-		    $txt =~ s/name=\"?$anchor\"?/href=\"$hfil#$anchor\"/isg;
+		    $txt =~ s/name\s*=\s*\"$anchor\"/href=\"$hfil#$anchor\"/isg;
+		    $txt =~ s/name\s*=\s*$anchor\s/href=\"$hfil#$anchor\"\s/isg;
 		}
 	    } else {
 		$anchor = "h-$num";