[LON-CAPA-cvs] cvs: loncom /xml style.pm

[sakharuk]

sakharuk		Mon Sep 22 09:01:57 2003 EDT

  Modified files:              
    /loncom/xml	style.pm 
  Log:
  Multiple targets in <target> tag are acceptable  now (<target name="web,edit">).
  
  
Index: loncom/xml/style.pm
diff -u loncom/xml/style.pm:1.18 loncom/xml/style.pm:1.19
--- loncom/xml/style.pm:1.18	Fri Sep 19 13:46:59 2003
+++ loncom/xml/style.pm	Mon Sep 22 09:01:57 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Style Parser Module (new version)
 #
-# $Id: style.pm,v 1.18 2003/09/19 17:46:59 sakharuk Exp $
+# $Id: style.pm,v 1.19 2003/09/22 13:01:57 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -78,14 +78,14 @@
 	    $allow=0;
 	} elsif (($target ne 'meta') && ($target ne 'tex') && ($stoken->[0] eq 'E') && ($stoken->[1] eq 'tex')) {
 	    $allow=1;
-	} elsif (($stoken->[0] eq 'S') && ($stoken->[1] eq 'target') && ($stoken->[2]->{'name'} ne $target)) {
+	} elsif (($stoken->[0] eq 'S') && ($stoken->[1] eq 'target') && (not $stoken->[2]->{'name'}=~/(^\s*$target\s*,|,\s*$target\s*,|,\s*$target\s*$|^\s*$target\s*$)/)) {
 	    $allow=0;
 	} elsif (($stoken->[0] eq 'E') && ($stoken->[1] eq 'target')) {
 	    $allow=1;
  	} elsif (($target ne 'meta') && ($stoken->[0] eq 'S') && ($stoken->[1] eq $target)) {
 	    $allow=1;
 	} elsif (($target ne 'meta') && ($stoken->[0] eq 'E') && ($stoken->[1] eq $target)) {
-	} elsif (($stoken->[0] eq 'S') && ($stoken->[1] eq 'target') && ($stoken->[2]->{'name'} eq $target)) {
+	} elsif (($stoken->[0] eq 'S') && ($stoken->[1] eq 'target') && ($stoken->[2]->{'name'}=~/(^\s*$target\s*,|,\s*$target\s*,|,\s*$target\s*$|^\s*$target\s*$)/)) {
 	    $allow=1;
 	} elsif ($allow) { 
 	    if ($stoken->[0] eq 'T') {