version 1.516, 2010/09/29 15:53:07
|
version 1.519, 2011/05/27 19:07:25
|
Line 1437 sub verify_html {
|
Line 1437 sub verify_html {
|
my ($is_html,$is_xml); |
my ($is_html,$is_xml); |
if ($filecontents =~/(?:\<|\<\;)\?xml[^\<]*\?(?:\>|\>\;)/is) { |
if ($filecontents =~/(?:\<|\<\;)\?xml[^\<]*\?(?:\>|\>\;)/is) { |
$is_xml = 1; |
$is_xml = 1; |
} elsif ($filecontents =~/(?:\<|\<\;)html(?:\s+[^\<]+|\s*)[^\<]*(?:\>|\>\;)/is) { |
} elsif ($filecontents =~/(?:\<|\<\;)html(?:\s+[^\<]+|\s*)(?:\>|\>\;)/is) { |
$is_html = 1; |
$is_html = 1; |
} |
} |
unless ($is_xml || $is_html) { |
unless ($is_xml || $is_html) { |
Line 1721 ENDNOTFOUND
|
Line 1721 ENDNOTFOUND
|
$result = &Apache::lontexconvert::converted(\$filecontents, |
$result = &Apache::lontexconvert::converted(\$filecontents, |
$env{'form.texengine'}); |
$env{'form.texengine'}); |
if ($env{'form.return_only_error_and_warning_counts'}) { |
if ($env{'form.return_only_error_and_warning_counts'}) { |
if (&verify_html('<html><body>'.$result.'</body></html>')) { |
|
$errorcount++; |
|
} |
|
$result = "$errorcount:$warningcount"; |
$result = "$errorcount:$warningcount"; |
} |
} |
} else { |
} else { |
Line 2042 sub register_insert_xml {
|
Line 2039 sub register_insert_xml {
|
my $key; |
my $key; |
if ($token->[1] eq 'tag') { |
if ($token->[1] eq 'tag') { |
$tag = $token->[2]{'name'}; |
$tag = $token->[2]{'name'}; |
$insertlist{"$tagnum.tag"} = $tag; |
$insertlist{$tagnum.'.tag'} = $tag; |
$insertlist{"$tag.num"} = $tagnum; |
$insertlist{$tag.'.num'} = $tagnum; |
push(@alltags,$tag); |
push(@alltags,$tag); |
} elsif ($in_help && $token->[1] eq 'file') { |
} elsif ($in_help && $token->[1] eq 'file') { |
$key = $tag.'.helpfile'; |
$key = $tag.'.helpfile'; |
Line 2076 sub register_insert_xml {
|
Line 2073 sub register_insert_xml {
|
|
|
# parse the allows and ignore tags set to <show>no</show> |
# parse the allows and ignore tags set to <show>no</show> |
foreach my $tag (@alltags) { |
foreach my $tag (@alltags) { |
next if (!exists($insertlist{"$tag.allow"})); |
next if (!exists($insertlist{$tag.'.allow'})); |
my $allow = $insertlist{"$tag.allow"}; |
my $allow = $insertlist{$tag.'.allow'}; |
foreach my $element (split(',',$allow)) { |
foreach my $element (split(',',$allow)) { |
$element =~ s/(^\s*|\s*$ )//gx; |
$element =~ s/(^\s*|\s*$ )//gx; |
if (!exists($insertlist{"$element.show"}) |
if (!exists($insertlist{$element.'.show'}) |
|| $insertlist{"$element.show"} ne 'no') { |
|| $insertlist{$element.'.show'} ne 'no') { |
push(@{ $insertlist{$tag.'.which'} },$element); |
push(@{ $insertlist{$tag.'.which'} },$element); |
} |
} |
} |
} |