/[suikacvs]/markup/html/whatpm/Whatpm/ContentChecker.pm

Diff of /markup/html/whatpm/Whatpm/ContentChecker.pm

Parent Directory | Revision Log | View Patch Patch

-revision 1.49 by wakaba,
Sat Sep 29 04:45:09 2007 UTC
+revision 1.50 by wakaba,
Sun Oct 14 09:21:46 2007 UTC
 Line 7 
 require Whatpm::URIChecker;
  ## ISSUE: How XML and XML Namespaces conformance can (or cannot)
  ## be applied to an in-memory representation (i.e. DOM)?
+ ## TODO: Conformance of an HTML document with non-html root element.
  my $HTML_NS = q<http://www.w3.org/1999/xhtml>;
  my $XML_NS = q<http://www.w3.org/XML/1998/namespace>;
  my $XMLNS_NS = q<http://www.w3.org/2000/xmlns/>;
-Line 234 
 sub check_document ($$$) {
+Line 236 
 sub check_document ($$$) {
      $ElementDefault;
    if ($docel_def->{is_root}) {
      #
+   } elsif ($docel_def->{is_xml_root}) {
+     unless ($doc->manakai_is_html) {
+       #
+     } else {
+       $onerror->(node => $docel, type => 'element not allowed:root:xml');
+     }
    } else {
      $onerror->(node => $docel, type => 'element not allowed:root');
    }
-Line 254 
 sub check_element ($$$) {
+Line 262 
 sub check_element ($$$) {
    $self->{should_level} = 's';
    $self->{good_level} = 'g';
+   $self->{pluses} = {};
    $self->{minuses} = {};
    $self->{id} = {};
    $self->{term} = {};
-Line 316 
 sub check_element ($$$) {
+Line 325 
 sub check_element ($$$) {
          $Element->{$nsuri}->{''} ||
            $ElementDefault;
        $eldef->{attrs_checker}->($self, $todo);
-     } elsif ($todo->{type} eq 'plus') {
+     } elsif ($todo->{type} eq 'plus' or $todo->{type} eq 'minus') {
        $self->_remove_minuses ($todo);
      } elsif ($todo->{type} eq 'code') {
        $todo->{code}->();
-Line 337 
 sub check_element ($$$) {
+Line 346 
 sub check_element ($$$) {
      }
    }
+   delete $self->{pluses};
    delete $self->{minuses};
    delete $self->{onerror};
    delete $self->{id};
-Line 361 
 sub _add_minuses ($@) {
+Line 371 
 sub _add_minuses ($@) {
    return {type => 'plus', list => $r};
  } # _add_minuses
+ sub _add_pluses ($@) {
+   my $self = shift;
+   my $r = {};
+   for my $list (@_) {
+     for my $ns (keys %$list) {
+       for my $ln (keys %{$list->{$ns}}) {
+         unless ($self->{pluses}->{$ns}->{$ln}) {
+           $self->{pluses}->{$ns}->{$ln} = 1;
+           $r->{$ns}->{$ln} = 1;
+         }
+       }
+     }
+   }
+   return {type => 'minus', list => $r};
+ } # _add_pluses
  sub _remove_minuses ($$) {
    my ($self, $todo) = @_;
-   for my $ns (keys %{$todo->{list}}) {
+   if ($todo->{type} eq 'minus') {
-     for my $ln (keys %{$todo->{list}->{$ns}}) {
+     for my $ns (keys %{$todo->{list}}) {
-       delete $self->{minuses}->{$ns}->{$ln} if $todo->{list}->{$ns}->{$ln};
+       for my $ln (keys %{$todo->{list}->{$ns}}) {
+         delete $self->{pluses}->{$ns}->{$ln} if $todo->{list}->{$ns}->{$ln};
+       }
      }
+   } elsif ($todo->{type} eq 'plus') {
+     for my $ns (keys %{$todo->{list}}) {
+       for my $ln (keys %{$todo->{list}->{$ns}}) {
+         delete $self->{minuses}->{$ns}->{$ln} if $todo->{list}->{$ns}->{$ln};
+       }
+     }
+   } else {
+     die "$0: Unknown +- type: $todo->{type}";
    }
 ;
  } # _remove_minuses
+ ## NOTE: Priority for "minuses" and "pluses" are currently left
+ ## undefined and implemented inconsistently; it is not a problem for
+ ## now, since no element belongs to both lists.
  sub _check_get_children ($$$) {
    my ($self, $node, $parent_todo) = @_;
    my $new_todos = [];

 Legend:



Removed from v.1.49
 


changed lines


 
Added in v.1.50
 Legend:



Removed from v.1.49
 


changed lines


 
Added in v.1.50
-Removed from v.1.49
+Added in v.1.50

admin@suikawiki.org	ViewVC Help
Powered by ViewVC 1.1.24