[BACK]Return to lonxml.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/lonxml.pm between versions 1.406 and 1.409

version 1.406, 2006/04/13 19:00:40 version 1.409, 2006/04/18 20:55:26
Line 162  sub disable_LaTeX_substitutions { Line 162  sub disable_LaTeX_substitutions {
     $Apache::lonxml::substitute_LaTeX_symbols = 0;      $Apache::lonxml::substitute_LaTeX_symbols = 0;
 }  }
   
 sub xmlbegin {  
     my ($style)=@_;  
     my $output='';  
     @htmlareafields=();  
     if ($env{'browser.mathml'}) {  
  $output='<?xml version="1.0"?>'  
             #.'<?xml-stylesheet type="text/css" href="/adm/MathML/mathml.css"?>'."\n"  
 #            .'<!DOCTYPE html SYSTEM "/adm/MathML/mathml.dtd" '  
               
 #    .'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [<!ENTITY mathns "http://www.w3.org/1998/Math/MathML">] >'  
     .'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">'  
             .'<html xmlns:math="http://www.w3.org/1998/Math/MathML" '   
     .'xmlns="http://www.w3.org/1999/xhtml">';  
     } else {  
  $output='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html>';  
     }  
     if ($style eq 'encode') {  
  $output=&HTML::Entities::encode($output,'<>&"');  
     }  
     return $output;  
 }  
   
 sub xmlend {  sub xmlend {
     my ($target,$parser)=@_;      my ($target,$parser)=@_;
     my $mode='xml';      my $mode='xml';
Line 206  sub xmlend { Line 184  sub xmlend {
  return '';   return '';
     }      }
   
     return $discussion.&Apache::loncommon::end_page();      return $discussion;
 }  }
   
 sub tokeninputfield {  sub tokeninputfield {
Line 304  sub printtokenheader { Line 282  sub printtokenheader {
     }      }
 }  }
   
 sub fontsettings {  
     my $headerstring='';  
     if (($env{'browser.os'} eq 'mac') && (!$env{'browser.mathml'})) {   
  $headerstring.=  
     '<meta Content-Type="text/html; charset=x-mac-roman" />';  
     } elsif (!$env{'browser.mathml'} && $env{'browser.unicode'}) {  
  $headerstring.=  
     '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';  
     }  
     return $headerstring;  
 }  
   
 sub printalltags {  sub printalltags {
   my $temp;    my $temp;
   foreach $temp (sort keys %Apache::lonxml::alltags) {    foreach $temp (sort keys %Apache::lonxml::alltags) {
Removed from v.1.406  
changed lines
  Added in v.1.409

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