--- loncom/xml/style.pm	2000/10/26 14:01:40	1.6
+++ loncom/xml/style.pm	2001/03/26 17:32:30	1.10
@@ -1,171 +1,125 @@
 # The LearningOnline Network with CAPA
-# Style Parser Module 
+# Style Parser Module (new version)
+#
+# written 01/08/01 by Alexander Sakharuk
 #
-# last modified 06/29/00 by Alexander Sakharuk
 
-package Apache::style; 
+package Apache::style;
 
 use strict;
 use HTML::TokeParser;
 
 sub styleparser {
 
-  my ($target,$content_style_string) = @_;
-  my @target_list = ('target','web','tex','edit','modified','rat','answer','metadis');
-  my @value_style = ();
-  my $current_key = '';
-  my $current_value = '';
-  my $stoken;
-  my $flag;                  
-  my $iele;
-  my $flag_target;
-
-  my $pstyle = HTML::TokeParser->new(\$content_style_string);
-
-  while ($stoken = $pstyle->get_token) {
-# start for tag definition
-   if ($stoken->[0] eq 'S' and $stoken->[1] eq 'definetag') {
-# new key in hash
-     $current_key = $stoken->[2]{name};
-     $flag = 0;
-# metadata output
-     if ($target eq 'meta') {
-       while ($stoken = $pstyle->get_token and $stoken->[1] ne 'definetag') { 
-	    if ($stoken->[0] eq 'S' and $stoken->[1] eq 'meta') {
-	      while ($stoken = $pstyle->get_token and $stoken->[1] ne 'meta') {
-                   if ($stoken->[0] eq 'T') {	
-                            $current_value .= $stoken->[1];
-		   } elsif ($stoken->[0] eq 'S') {	
-                            $current_value .= $stoken->[4];
-		   } else {
-                            $current_value .= $stoken->[2];
-		   }
-	      }
-	    }
-       }
-     } else {
-# render output
-     while ($stoken = $pstyle->get_token and $stoken->[1] ne 'render') {
-	  if ($stoken->[1] eq 'definetag') {
-	    $flag = 1;
-	    last;
-	  }
-     }
-      if ($flag == 0) { 
-	while ($stoken = $pstyle->get_token and $stoken->[1] ne 'definetag'
-	       and $stoken->[1] ne 'render') {
-# if token not equal to target $flag_target=0 
-	      $flag_target = 0;
-	      for (my $i=0; $i<$#target_list; $i++) {
-		 if ($stoken->[1] eq $target_list[$i]) {
-		   $flag_target = 1;
-		 }
-	      }
-	      if ($flag_target == 0) {
-# target not found
-			  my $tempo_out =  &test($stoken->[0],$stoken->[1],$stoken->[2],$stoken->[4],@value_style);
-			  $current_value .= $tempo_out;
-	      } else {
-# target found
-		  if ($stoken->[0] eq 'S' and $stoken->[1] eq 'target') {
-# target defined via <target> tag
-		    if (defined $stoken->[2]{dest}) {
-		      if (index($stoken->[2]{dest},$target) == -1) {
-			while ($stoken = $pstyle->get_token and $stoken->[1] ne 'target') {
-			}			
-		      } elsif (index($stoken->[2]{dest},$target) != -1) {
-			  while ($stoken = $pstyle->get_token and $stoken->[1] ne 'target') {
-			    my $tempo_out =  &test($stoken->[0],$stoken->[1],$stoken->[2],$stoken->[4],@value_style);
-			    $current_value .= $tempo_out;
-			  } 
-		      }
+    my ($target,$content_style_string) = @_;
+    my $current_key = '';
+    my $current_value = '';
+    my @keys = ();
+    my @values = ();
+    my @style_array = ();
+    my $stoken;
+
+    my $b_pos;
+    my $e_pos;
+    my $entry;
+
+    $b_pos = index($content_style_string,'<definetag',0);
+    while ($b_pos != -1) {
+	$e_pos = index($content_style_string,'</definetag',$b_pos);
+	$entry = substr($content_style_string,$b_pos,$e_pos-$b_pos+12);       
+	$_ = $entry;
+	m/<definetag\s+name\s*=\s*\"([^\"]*)\"/;
+	$current_key = $1;
+	push @keys,$current_key;
+#	&Apache::lonxml::debug("$current_key\n");
+	my $b_position =  index($entry,'<'.$target.'>',0);
+	my $e_position =  index($entry,'</'.$target.'>',$b_position);
+	my $target_length = length($target) + 2;
+	if ($b_position > -1) {
+	    my $entry_target = substr($entry,$b_position+$target_length,$e_position-$b_position-$target_length);
+	    my $pstyle = HTML::TokeParser->new(\$entry_target);
+	    while ($stoken = $pstyle->get_token) {
+		if ($stoken->[0] eq 'T') {
+		    $current_value .= $stoken->[1];
+		} elsif ($stoken->[0] eq 'S') {
+		    my $number = &testkey($stoken->[0],$stoken->[1],@keys);
+		    if ($number != -1) {
+			$current_value .= &testvalue($number,$stoken->[0],$stoken->[2],@values);
+		    } else {
+			$current_value .= $stoken->[4];
+		    } 
+	        } else {
+		    my $number = &testkey($stoken->[0],$stoken->[1],@keys);
+		    if ($number != -1) {
+			$current_value .= &testvalue($number,$stoken->[0],$stoken->[2],@values);
 		    } else {
-		       if (index($stoken->[2]{excl},$target) != -1) {
-			 while ($stoken = $pstyle->get_token and $stoken->[1] ne 'target') {
-			 }			
-		       } elsif (index($stoken->[2]{excl},$target) == -1) {
-			   while ($stoken = $pstyle->get_token and $stoken->[1] ne 'target') {
-			     my $tempo_out =  &test($stoken->[0],$stoken->[1],$stoken->[2],$stoken->[4],@value_style);
-			     $current_value .= $tempo_out;
-			   } 
-		       }
-
-
-		    }
-		  } elsif ($stoken->[1] ne $target) {
-#target defined via short-form tag
-		      my $tempo_token = $stoken->[1];
-			while ($stoken = $pstyle->get_token and $stoken->[1] ne $tempo_token) {
-		      }
-		  } else {
-		      my $tempo_token = $stoken->[1];
-			while ($stoken = $pstyle->get_token and $stoken->[1] ne $tempo_token) {
-			   my $tempo_out =  &test($stoken->[0],$stoken->[1],$stoken->[2],$stoken->[4],@value_style);
-			     $current_value .= $tempo_out;                                                           
-			}           
-		  }
-	      }
+			$current_value .= $stoken->[2];
+		    } 
+	        }
+
+
+
+	    } 
 	}
+        $current_value =~ s/\n//g;
+	push @values,$current_value;
+#	&Apache::lonxml::debug("a:$current_value $#values \n");
+	$current_key = '';
+	$current_value ='';
+	$b_pos = index($content_style_string,'<definetag',$b_pos+1);
+    }
+
+    for (my $i=0; $i<=$#keys; $i++) {
+	push @style_array,lc $keys[$i],$values[$i]; 
+    }
+    my %style_for_target =  @style_array;
 
-      }
-     }    
-   }    
-   $current_value =~ s/(\s)+/$1/g;
-   if ($current_value ne '' ) {  
-       push (@value_style,lc $current_key,$current_value);
-   }
-   $current_key = '';
-   $current_value = '';         
-  }  
-  my %style_for_target = @value_style;   
 # check printing
-#  while (($current_key,$current_value) = each %style_for_target) {
-#      print "$current_key => $current_value\n";
-#  }
+    foreach $current_key (sort keys %style_for_target) {
+	&Apache::lonxml::debug("$current_key => $style_for_target{$current_key}\n");
+    }
 # return result
   return %style_for_target; 
+
 }
 
-sub test {
+sub testkey {
 
-    my ($zeroth,$first,$second,$fourth,@value_style) = @_;
-    my $current_value = '';
-    my $num;
-    my $flag;
-	
-	if ($zeroth eq 'T') {
-	    $current_value .= $first;
-	} elsif ($zeroth eq 'S') {
-	    $flag = 0;    
-	    for (my $i=$#value_style-1;$i>=0;$i=$i-2) {
-		if ($first eq $value_style[$i]) {
-		    $flag = 1;
-		    $num = $i + 1;
-		    last;
-		}
-	    }
-	    if ($flag == 0) {
-		$current_value .= $fourth; 
-	    } else {
-		$current_value .= $value_style[$num];
+    my ($zeroth,$first,@keys) = @_; 
+    my $number = -1;
+    if ($zeroth eq 'S') {
+	for (my $i=$#keys; $i>=0; $i=$i-1) {
+	    if ($first eq lc($keys[$i]))  { 
+		$number = $i;
+		last;
 	    }
-	} elsif ($zeroth eq 'E') {
-	    $flag = 0;    
-	    for (my $i=$#value_style-1;$i>=0;$i=$i-2) {
-		if ($first eq $value_style[$i]) {
-		    $flag = 1;
-		    $num = $i + 1;
-		    last;
-		}
+	}
+    } elsif ($zeroth eq 'E') {
+	for (my $i=$#keys; $i>=0; $i=$i-1) {
+	    if ('/'.$first eq lc($keys[$i]))  { 
+		$number = $i;
+	 	last;
 	    }
-	    if ($flag == 0) {
-		$current_value .= $second;
-	    } else {
-		$current_value .= $value_style[$num];
-	    }                 
-	} 
-    return $current_value;
+	}
+    }
+	return $number;
+}
+
+sub testvalue {
+
+    my ($number,$zeroth,$second,@values) = @_;   
+    my $current_content = $values[$number];
+    if ($zeroth eq 'S') {
+    my %tempo_hash = %$second;
+    while ((my $current_k,my $current_v) = each %tempo_hash) {
+        $current_content =~ s/\$$current_k/$current_v/g;
+    }
+    } elsif ($zeroth eq 'E') {
+        $current_content = $values[$number];
+    }
+    return $current_content;
 }
 
 1;
+
 __END__