[css2] Updated according to bug fixes for html

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

Author: ianbjacobs

css2/bin/Attic/addlinks

@@ -2,7 +2,7 @@
 # Add links from instances to definitions
 #
 # Arnaud Le Hors - lehors@w3.org
-# $Id: addlinks,v 1.3 1997-08-12 20:37:23 ian Exp $
+# $Id: addlinks,v 1.4 1997-09-17 14:23:36 ian Exp $
 
 if (($_ = $ARGV[0], /^-r/) && $ARGV[0]) {
     shift;
@@ -91,7 +91,10 @@ sub readadb {
 
 
 ### main
+
 $wd = "[^ \t\n]+";		# word
+$sp = "[ \t\n]*";               # space
+$ws = "[ \t\n]+";               # word separator
 $etag="</span>";
 
 readfile($input);
@@ -100,8 +103,8 @@ while ($class = $ARGV[0]) {
     readadb($ARGV[0]);
     shift;
     # insert appropriate links
-    $stag="<span[ \t\n]*class=$class-($wd)>|<span[ \t\n]*class=\"$class-($wd)\">";
-    $buf =~ s/($stag)(.*?)($etag)/addlink($1, "$2$3", $4, $5, $class)/sgie;
+    $stag="<span(?:$ws)class=$sp$class-($wd)?>|<span(?:$ws)class=$sp\"$class-($wd)?\">";
+    $buf =~ s/($stag)$sp(.*?)$sp($etag)/addlink($1, "$2$3", $4, $5, $class)/sgie;
 }
 
 # print out result

css2/bin/addlinks

@@ -2,7 +2,7 @@
 # Add links from instances to definitions
 #
 # Arnaud Le Hors - lehors@w3.org
-# $Id: addlinks,v 1.3 1997-08-12 20:37:23 ian Exp $
+# $Id: addlinks,v 1.4 1997-09-17 14:23:36 ian Exp $
 
 if (($_ = $ARGV[0], /^-r/) && $ARGV[0]) {
     shift;
@@ -91,7 +91,10 @@ sub readadb {
 
 
 ### main
+
 $wd = "[^ \t\n]+";		# word
+$sp = "[ \t\n]*";               # space
+$ws = "[ \t\n]+";               # word separator
 $etag="</span>";
 
 readfile($input);
@@ -100,8 +103,8 @@ while ($class = $ARGV[0]) {
     readadb($ARGV[0]);
     shift;
     # insert appropriate links
-    $stag="<span[ \t\n]*class=$class-($wd)>|<span[ \t\n]*class=\"$class-($wd)\">";
-    $buf =~ s/($stag)(.*?)($etag)/addlink($1, "$2$3", $4, $5, $class)/sgie;
+    $stag="<span(?:$ws)class=$sp$class-($wd)?>|<span(?:$ws)class=$sp\"$class-($wd)?\">";
+    $buf =~ s/($stag)$sp(.*?)$sp($etag)/addlink($1, "$2$3", $4, $5, $class)/sgie;
 }
 
 # print out result