--- loncom/xml/style.pm	2001/01/12 01:38:02	1.8
+++ loncom/xml/style.pm	2003/06/09 21:46:11	1.17
@@ -1,6 +1,41 @@
 # The LearningOnline Network with CAPA
 # Style Parser Module (new version)
 #
+# $Id: style.pm,v 1.17 2003/06/09 21:46:11 albertel Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
+# Copyright for TtHfunc and TtMfunc by Ian Hutchinson. 
+# TtHfunc and TtMfunc (the "Code") may be compiled and linked into 
+# binary executable programs or libraries distributed by the 
+# Michigan State University (the "Licensee"), but any binaries so 
+# distributed are hereby licensed only for use in the context
+# of a program or computational system for which the Licensee is the 
+# primary author or distributor, and which performs substantial 
+# additional tasks beyond the translation of (La)TeX into HTML.
+# The C source of the Code may not be distributed by the Licensee
+# to any other parties under any circumstances.
+#
 # written 01/08/01 by Alexander Sakharuk
 #
 
@@ -42,27 +77,40 @@ sub styleparser {
 		if ($stoken->[0] eq 'T') {
 		    $current_value .= $stoken->[1];
 		} elsif ($stoken->[0] eq 'S') {
-		    my $number = &testkey($stoken->[0],$stoken->[1],@keys);
+		    my $number=-1;
+		    if ($stoken->[1] ne "$current_key") {
+			$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);
+		    my $number=-1;
+		    if (('/'.$stoken->[1]) ne "$current_key") {
+			$number = &testkey($stoken->[0],$stoken->[1],@keys);
+		    }
 		    if ($number != -1) {
 			$current_value .= &testvalue($number,$stoken->[0],$stoken->[2],@values);
 		    } else {
 			$current_value .= $stoken->[2];
-		    } 
+		    }
 	        }
-
-
-
-	    } 
+	    }
+	}
+        $current_value =~ s/\n//g;
+###########
+#	$current_value =~ s/^\s*//g;
+#	$current_value =~ s/\s*$//g;
+#	$current_value =~ s/\( (\w)/($1/g;
+###########
+	if ($current_value) {
+	    push(@values,$current_value);
+	    #&Apache::lonxml::debug("a:$current_value: $#values \n");
+	} else {
+	    pop(@keys);
 	}
-	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);
@@ -71,12 +119,11 @@ sub styleparser {
     for (my $i=0; $i<=$#keys; $i++) {
 	push @style_array,$keys[$i],$values[$i]; 
     }
-    my %style_for_target = @style_array;
-
+    my %style_for_target =  @style_array;
 # check printing
-  while (($current_key,$current_value) = each %style_for_target) {
-      &Apache::lonxml::debug("$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; 
 
@@ -109,12 +156,12 @@ 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;
-    }
+	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];
+	$current_content = $values[$number];
     }
     return $current_content;
 }