Diff for /loncom/xml/style.pm between versions 1.7 and 1.13

version 1.7, 2001/01/09 14:10:14 version 1.13, 2001/11/29 19:03:58
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # Style Parser Module (new version)  # Style Parser Module (new version)
 #  #
   # $Id$
   #
   # 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  # written 01/08/01 by Alexander Sakharuk
 #  #
   
Line 31  sub styleparser { Line 66  sub styleparser {
  m/<definetag\s+name\s*=\s*\"([^\"]*)\"/;   m/<definetag\s+name\s*=\s*\"([^\"]*)\"/;
  $current_key = $1;   $current_key = $1;
  push @keys,$current_key;   push @keys,$current_key;
 # print "$current_key\n";  # &Apache::lonxml::debug("$current_key\n");
  my $b_position =  index($entry,'<'.$target.'>',0);   my $b_position =  index($entry,'<'.$target.'>',0);
  my $e_position =  index($entry,'</'.$target.'>',$b_position);   my $e_position =  index($entry,'</'.$target.'>',$b_position);
  my $target_length = length($target) + 2;   my $target_length = length($target) + 2;
Line 61  sub styleparser { Line 96  sub styleparser {
   
     }       } 
  }   }
           $current_value =~ s/\n//g;
   ###########
   # $current_value =~ s/^\s*//g;
   # $current_value =~ s/\s*$//g;
   # $current_value =~ s/\( (\w)/($1/g;
   ###########
  push @values,$current_value;   push @values,$current_value;
 # print "a:$current_value $#values \n";  # &Apache::lonxml::debug("a:$current_value $#values \n");
  $current_key = '';   $current_key = '';
  $current_value ='';   $current_value ='';
  $b_pos = index($content_style_string,'<definetag',$b_pos+1);   $b_pos = index($content_style_string,'<definetag',$b_pos+1);
Line 71  sub styleparser { Line 112  sub styleparser {
     for (my $i=0; $i<=$#keys; $i++) {      for (my $i=0; $i<=$#keys; $i++) {
  push @style_array,$keys[$i],$values[$i];    push @style_array,$keys[$i],$values[$i]; 
     }      }
     my %style_for_target = @style_array;      my %style_for_target =  @style_array;
   
 # check printing  # check printing
   while (($current_key,$current_value) = each %style_for_target) {  #    foreach $current_key (sort keys %style_for_target) {
       print "$current_key => $current_value\n";  # &Apache::lonxml::debug("$current_key => $style_for_target{$current_key}\n");
   }  #    }
 # return result  # return result
   return %style_for_target;     return %style_for_target; 
   

Removed from v.1.7  
changed lines
  Added in v.1.13


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>