--- loncom/xml/londefdef.pm 2006/02/04 22:11:42 1.318
+++ loncom/xml/londefdef.pm 2009/10/01 15:31:24 1.411
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.318 2006/02/04 22:11:42 foxr Exp $
+# $Id: londefdef.pm,v 1.411 2009/10/01 15:31:24 bisitz Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -42,12 +42,15 @@ package Apache::londefdef;
use Apache::lonnet;
use strict;
use Apache::lonxml;
+use Apache::lontable;
use Apache::File();
use Image::Magick;
use Apache::lonmenu();
use Apache::lonmeta();
+use Apache::lonlocal;
use Apache::Constants qw(:common);
use File::Basename;
+use LONCAPA();
# use Data::Dumper;
BEGIN {
@@ -56,20 +59,7 @@ BEGIN {
}
-#
-# Dumps all elements of the table structure.
-# Need this 'cause evidently when given an array, Data::Dumper only seems
-# to dump element 0.
-#
-#sub debug_dump_table {
-# my $lastrow = $#Apache::londefdef::table;
-# &Apache::lonnet::logthis("Dumping table: Last row index: $lastrow");
-# my $row;
-# for ($row =0; $row <= $lastrow; $row++ ) {
-# my $text = Dumper($Apache::londefdef::table[$row]);
-# &Apache::lonnet::logthis("table [ $row ]".$text);
-# }
-#}
+
sub initialize_londefdef {
$Apache::londefdef::TD_redirection=0;
@Apache::londefdef::table = ();
@@ -79,6 +69,8 @@ sub initialize_londefdef {
@Apache::londefdef::DT=(0);
@Apache::londefdef::seenDT=(0);
$Apache::londefdef::list_index=0;
+ undef($Apache::londefdef::head);
+ undef($Apache::londefdef::title);
}
#======================= TAG SUBROUTINES =====================
@@ -103,13 +95,13 @@ sub start_m {
my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
if ($eval eq 'on') {
$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
- #&Apache::lonxml::debug("M is evaulated to:$inside:");
+ #&Apache::lonxml::debug("M is evaluated to:$inside:");
}
my $tex = $inside;
my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval);
$currentstring = &Apache::lontexconvert::converted(\$inside,$display);
if ($Apache::lontexconvert::errorstring) {
- my $errormsg=''.&HTML::Entities::encode($Apache::lontexconvert::errorstring,'<>&"').'
occured while attempting to convert this TeX: ';
+ my $errormsg=''.&HTML::Entities::encode($Apache::lontexconvert::errorstring,'<>&"').'
occurred while attempting to convert this TeX: ';
$tex = &HTML::Entities::encode($tex,'<>&"');
my ($linenumber) =
($Apache::lontexconvert::errorstring =~ /Line (\d+)/);
@@ -125,6 +117,7 @@ sub start_m {
#&Apache::lonxml::debug("M is ends with:$currentstring:");
$Apache::lonxml::post_evaluate=0;
} elsif ($target eq 'tex') {
+
$currentstring = $inside;
my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
if ($eval eq 'on') {
@@ -132,11 +125,13 @@ sub start_m {
}
if ($currentstring=~/^(\s*\\\\\s*)*$/) {$currentstring = ' \vskip 0 mm ';}
# detect simple math mode entry exits, and convert them
- # to use \ensuremath
- if ($currentstring=~/^\s*\$[^\$].*[^\$]\$\s*$/) {
- $currentstring=~s/^(\s*)\$/$1/;
- $currentstring=~s/\$(\s*)$/$1/;
- $currentstring='\ensuremath{'.$currentstring.'}';
+ # to use \ensuremath ... unless there's a \verb inside.
+ if (! ($currentstring=~/\\verb/)) {
+ if ($currentstring=~/^\s*\$[^\$].*\$\s*$/) {
+ $currentstring=~s/^(\s*)\$/$1/;
+ $currentstring=~s/\$(\s*)$/$1/;
+ $currentstring='\ensuremath{'.$currentstring.'}';
+ }
}
$Apache::lonxml::post_evaluate=0;
}
@@ -155,7 +150,7 @@ sub end_m {
sub start_tthoption {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
my $result;
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'webgrade') {
my $inside = &Apache::lonxml::get_all_text("/tthoption",$parser,
$style);
$inside=~s/^\s*//;
@@ -178,32 +173,11 @@ sub end_tthoption {
sub start_html {
my ($target,$token) = @_;
my $currentstring = '';
- my $options=$env{'course.'.$env{'request.course.id'}.'.tthoptions'};
- &Apache::lontexconvert::init_tth();
if ($target eq 'web' || $target eq 'edit' || $target eq 'webgrade' ) {
- $currentstring = &Apache::lonxml::xmlbegin();
+ # start_body() takes care of emitting the
} elsif ($target eq 'tex') {
- $currentstring .= '\documentclass[letterpaper,twoside]{article}';
- if (($env{'form.latex_type'}=~'batchmode') ||
- (!$env{'request.role.adv'})) {$currentstring .='\batchmode';}
- $currentstring .= '\newcommand{\keephidden}[1]{}'.
- '\renewcommand{\deg}{$^{\circ}$}'.
- '\usepackage{multirow}'.
- '\usepackage{longtable}'.
- '\usepackage{textcomp}'.
- '\usepackage{makeidx}'.
- '\usepackage[dvips]{graphicx}'.
- '\usepackage{wrapfig}'.
- '\usepackage{picins}'.
- '\usepackage{epsfig}'.
- '\usepackage{calc}'.
- '\usepackage{amsmath}'.
- '\usepackage{amssymb}'.
- '\usepackage{amsfonts}'.
- '\usepackage{amsthm}'.
- '\usepackage{amscd}'.
- '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}'.
- '\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large\textbf{Index}} \newline \setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}';
+
+ $currentstring .= &latex_header();
}
return $currentstring;
}
@@ -211,8 +185,8 @@ sub start_html {
sub end_html {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
- if ($target eq 'web') {
- $currentstring = '';
+ if ($target eq 'web' || $target eq 'webgrade') {
+ # end_body takes care of the