[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm lonpreferences.pm /xml lontex.pm lontexconvert.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Fri, 24 Mar 2006 18:09:27 -0000
albertel Fri Mar 24 13:09:27 2006 EDT
Modified files:
/loncom/xml lontex.pm lontexconvert.pm
/loncom/interface loncommon.pm lonpreferences.pm
Log:
- lontex -> start_page
- eliminate old lontexconvert header/footer routines
- lontex use more standarish form parms to turn things on/off
Index: loncom/xml/lontex.pm
diff -u loncom/xml/lontex.pm:1.8 loncom/xml/lontex.pm:1.9
--- loncom/xml/lontex.pm:1.8 Tue Aug 16 12:31:14 2005
+++ loncom/xml/lontex.pm Fri Mar 24 13:09:23 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# TeX Content Handler
#
-# $Id: lontex.pm,v 1.8 2005/08/16 16:31:14 albertel Exp $
+# $Id: lontex.pm,v 1.9 2006/03/24 18:09:23 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -50,8 +50,23 @@
# ================================================================ Main Handler
+sub footer {
+ my ($errorstring) = @_;
+ my $xmlstring='';
+ if ($env{'request.state'} eq 'construct') {
+ $xmlstring.='<address>'.
+ $Apache::lontexconvert::errorstring.'</address>';
+ } else {
+ &Apache::lonmsg::author_res_msg($env{'request.filename'},
+ $Apache::lonxml::errorstring);
+ }
+# -------------------------------------------------------------------- End Body
+ $xmlstring.=&Apache::lonxml::xmlend();
+ return $xmlstring;
+}
+
sub handler {
- my $r=shift;
+ my ($r)= @_;
my @texcontents;
my $texstring;
@@ -77,26 +92,26 @@
# --------------------------------------------------------------- Render Output
- &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['mode',
- 'buttons']);
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['texengine','inhibitmenu']);
- $r->print(&Apache::lontexconvert::header());
- $r->print(
- '<body bgcolor="#FFFFFF" onLoad="'.
- &Apache::lonmenu::loadevents().
- '" onUnload="'.
- &Apache::lonmenu::unloadevents().
- '">');
- if ($env{'form.buttons'} ne 'no') {
- $r->print(&Apache::lonmenu::menubuttons(undef,'web',1));
- }
- &Apache::lontexconvert::jsMath_reset();
- if ($env{'form.mode'} eq 'jsMath') {
- $r->print(&Apache::lontexconvert::jsMath_header());
- }
- $r->print(&Apache::lontexconvert::converted(\$texstring,$env{'form.mode'}));
- $r->print('</body>');
- $r->print(&Apache::lontexconvert::footer());
+
+ &Apache::lontexconvert::init_tth();
+ my $load_items =
+ 'onLoad="' .&Apache::lonmenu::loadevents(). '" '.
+ 'onUnload="'.&Apache::lonmenu::unloadevents().'" ';
+
+ $r->print(&Apache::loncommon::start_page(undef,undef,
+ {'add_entries' => $load_items,
+ 'bgcolor' => '#FFFFFF',
+ 'force_register' => 1,
+ 'only_body' =>
+ ($env{'form.inhibitmenu'}
+ eq 'yes'), }));
+
+ $r->print(&Apache::lontexconvert::converted(\$texstring,
+ $env{'form.texengine'}));
+ $r->print(&footer());
return OK;
}
Index: loncom/xml/lontexconvert.pm
diff -u loncom/xml/lontexconvert.pm:1.69 loncom/xml/lontexconvert.pm:1.70
--- loncom/xml/lontexconvert.pm:1.69 Fri Jan 27 18:55:15 2006
+++ loncom/xml/lontexconvert.pm Fri Mar 24 13:09:23 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# TeX Conversion Module
#
-# $Id: lontexconvert.pm,v 1.69 2006/01/27 23:55:15 albertel Exp $
+# $Id: lontexconvert.pm,v 1.70 2006/03/24 18:09:23 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -70,17 +70,6 @@
}
}
-sub header {
- $errorstring='';
- my $time=time;
- &init_tth();
- return &Apache::lonxml::xmlbegin().
- "\n<head>\n".
- &Apache::lonxml::fontsettings().
- &Apache::lonmenu::registerurl(undef,'tex').
- "\n</head>\n";
-}
-
# ================================================================== Conversion
$Apache::lontexconvert::messedup=0;
@@ -137,7 +126,20 @@
$errorstring) {
&Apache::lonnet::logthis("Trying to kill myself");
$Apache::lontexconvert::messedup=1;
- $Apache::lonxml::request->child_terminate();
+ if (ref($Apache::lonxml::request)) {
+ $Apache::lonxml::request->child_terminate();
+ } else {
+ my $request;
+ eval { $request=Apache->request; };
+ if (!$request) {
+ eval { $request=Apache2::RequestUtil->request; };
+ }
+ if ($request) {
+ $request->child_terminate();
+ } else {
+ &Apache::lonnet::logthis("Unable to find a request to do child_terminate on");
+ }
+ }
}
return $xmlstring;
}
@@ -217,20 +219,6 @@
return &tth_converted($string);
}
-# ====================================================================== Footer
-
-sub footer {
- my $xmlstring='';
- if ($env{'request.state'} eq 'construct') {
- $xmlstring.='<address>'.$errorstring.'</address>';
- } else {
- &Apache::lonmsg::author_res_msg($env{'request.filename'},$errorstring);
- }
-# -------------------------------------------------------------------- End Body
- $xmlstring.=&Apache::lonxml::xmlend();
- return $xmlstring;
-}
-
# ------------------------------------------------------------ Message display
sub to_convert {
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.320 loncom/interface/loncommon.pm:1.321
--- loncom/interface/loncommon.pm:1.320 Thu Mar 23 18:43:13 2006
+++ loncom/interface/loncommon.pm Fri Mar 24 13:09:27 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.320 2006/03/23 23:43:13 albertel Exp $
+# $Id: loncommon.pm,v 1.321 2006/03/24 18:09:27 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2801,7 +2801,8 @@
style="margin-top: 0px;$addstyle" $addentries>
END
&Apache::lontexconvert::jsMath_reset();
- if ($env{'environment.texengine'} eq 'jsMath') {
+ if ($env{'environment.texengine'} eq 'jsMath' ||
+ $env{'form.texengine'} eq 'jsMath' ) {
$bodytag.=&Apache::lontexconvert::jsMath_header();
}
Index: loncom/interface/lonpreferences.pm
diff -u loncom/interface/lonpreferences.pm:1.78 loncom/interface/lonpreferences.pm:1.79
--- loncom/interface/lonpreferences.pm:1.78 Tue Mar 21 16:06:35 2006
+++ loncom/interface/lonpreferences.pm Fri Mar 24 13:09:27 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Preferences
#
-# $Id: lonpreferences.pm,v 1.78 2006/03/21 21:06:35 albertel Exp $
+# $Id: lonpreferences.pm,v 1.79 2006/03/24 18:09:27 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -208,7 +208,7 @@
</form>
Examples:
<p> TeX to HTML <br />
-<iframe src="/res/adm/pages/math_example.tex?buttons=no&mode=tth" width="400" hieght="200"></iframe>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=tth" width="400" hieght="200"></iframe>
</p>
<p>jsMath <br />
$jsMath_start
@@ -228,12 +228,12 @@
+'</font></small></div></center>');
}
</script>
-<iframe src="/res/adm/pages/math_example.tex?buttons=no&mode=jsMath" width="400" hieght="200"></iframe>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=jsMath" width="400" hieght="200"></iframe>
</p>
<p> Convert to Images <br />
<br />
-<iframe src="/res/adm/pages/math_example.tex?buttons=no&mode=mimetex" width="400" hieght="200"></iframe>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=mimetex" width="400" hieght="200"></iframe>
</p>
ENDLSCREEN
if ($env{'environment.texengine'} ne 'jsMath') {