ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/SCRAM/src/ActiveDoc/Switcher.pm
(Generate patch)

Comparing COMP/SCRAM/src/ActiveDoc/Switcher.pm (file contents):
Revision 1.13.2.3 by williamc, Fri Apr 7 11:14:46 2000 UTC vs.
Revision 1.13.2.5 by williamc, Fri May 12 15:00:54 2000 UTC

# Line 223 | Line 223 | sub _closetag {
223  
224           # -- Now make sure the text context is set for calling routines to
225           # -- deal with text portions outside of tags
226 <         if ( $self->{tagcontext} eq "starttag" ) {
227 <          push @{$self->{textstack}} , $self->{textcontext};
228 <          $self->{textcontext}=$self->{tagname};
226 >         if ( ($self->{tagcontext} eq "starttag") ) {
227 >           if ( $self->{tagcontainer}->definescontext($self->{tagname}) ) {
228 >              push @{$self->{textstack}} , $self->{textcontext};
229 >              $self->{textcontext}=$self->{tagname};
230 >           }
231           }
232           else {
233            if ( $#{$self->{textstack}} > -1 ) {
234 <            if ( $self->{textcontext} eq $self->{tagname} ) {  
235 <               $self->{textcontext}=pop @{$self->{textstack}};
236 <            }
234 >           if ( $self->{textcontext} eq $self->{tagname} ) {    
235 >            if ( $self->{tagcontainer}->definescontext($self->{tagname}) ) {
236 >              # -- watch out for valid tags we ignore in this parse
237 >              $self->{textcontext}=pop @{$self->{textstack}};
238 >            }
239 >           }
240              else { #The tag we are closing is not the last one so
241                     # we keep our current context.
242                 $self->_removefromstack($self->{tagname},$self->{textstack});
# Line 239 | Line 244 | sub _closetag {
244  
245            }
246            else { # more close tags than open ones
247 +            if ( $self->{tagcontainer}->definescontext($self->{tagname}) ) {
248               print "Warning : Unmatched </...> tag on line ".
249                                          $self->line()."\n";    
250 +            }
251            }
252           }
253          }
# Line 378 | Line 385 | sub _closelabel {
385  
386          # Do we have a label name?
387          if ( $self->{lastlabel} ne "" ) {
388 <         $self->{tagvar}{$self->{lastlabel}}=$self->_getstore();
388 >         (my $label=$self->{lastlabel})=~tr[A-Z][a-z];
389 >         $self->{tagvar}{$label}=$self->_getstore();
390           $self->{lastlabel}="";
391          }
392          elsif ( $self->_getstore() ne "") {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines