loncom/xml/londefdef.pm - diff

Return to londefdef.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/londefdef.pm between versions 1.390.2.2 and 1.396

version 1.390.2.2, 2008/10/02 18:09:38	version 1.396, 2008/11/10 11:17:50
Line 107 sub start_m {	Line 107 sub start_m {
my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);	my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
if ($eval eq 'on') {	if ($eval eq 'on') {
$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);	$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 $tex = $inside;
my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval);	my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval);
Line 139 sub start_m {	Line 139 sub start_m {
# detect simple math mode entry exits, and convert them	# detect simple math mode entry exits, and convert them
# to use \ensuremath ... unless there's a \verb inside.	# to use \ensuremath ... unless there's a \verb inside.
if (! ($currentstring=~/\\verb/)) {	if (! ($currentstring=~/\\verb/)) {
if ($currentstring=~/^\s\$[^\$].[^\$]\$\s*$/) {	if ($currentstring=~/^\s\$[^\$].\$\s*$/) {
$currentstring=~s/^(\s*)\$/$1/;	$currentstring=~s/^(\s*)\$/$1/;
$currentstring=~s/\$(\s*)$/$1/;	$currentstring=~s/\$(\s*)$/$1/;
$currentstring='\ensuremath{'.$currentstring.'}';	$currentstring='\ensuremath{'.$currentstring.'}';
Line 213 sub start_html {	Line 213 sub start_html {
'\usepackage{amssymb}'.	'\usepackage{amssymb}'.
'\usepackage{amsfonts}'.	'\usepackage{amsfonts}'.
'\usepackage{amsthm}'.	'\usepackage{amsthm}'.
'\usepackage{amscd}'.	'\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}}'.
	if($env{'form.pdfFormFields'} eq 'yes') {
	$currentstring .= '\usepackage{hyperref}'.
	'\usepackage{eforms}'.
	'\usepackage{tabularx}';
	}

	$currentstring .= '\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}}';	'\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}}';
}	}
return $currentstring;	return $currentstring;
Line 603 sub edit_controls {	Line 610 sub edit_controls {
&Apache::lonxml::renderingoptions().'	&Apache::lonxml::renderingoptions().'
<input type="submit" name="changeproblemmode" value="'.&mt('Change View').'" />	<input type="submit" name="changeproblemmode" value="'.&mt('Change View').'" />
</div>	</div>
<div class="LC_edit_problem_header_edit_row"><input type="submit" name="editmode" accesskey="e" value="Edit" /></div></div>	<div class="LC_edit_problem_header_edit_row"><input type="submit" name="editmode" accesskey="e" value="'.&mt('Edit').'" /></div></div>
</form>	</form>
<br />';	<br />';
return $result;	return $result;
Line 2019 sub start_table {	Line 2026 sub start_table {
if ($target eq 'web' \|\| $target eq 'webgrade') {	if ($target eq 'web' \|\| $target eq 'webgrade') {
$currentstring .= $token->[4];	$currentstring .= $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
	&disable_para(); # Can't have paras in a table.
push(@Apache::londefdef::table, {});	push(@Apache::londefdef::table, {});
$Apache::londefdef::table[-1]{'row_number'} = -1;	$Apache::londefdef::table[-1]{'row_number'} = -1;
#maximum table's width (default coincides with text line length)	#maximum table's width (default coincides with text line length)
Line 2517 sub end_table {	Line 2525 sub end_table {
pop @Apache::londefdef::table;	pop @Apache::londefdef::table;
undef @Apache::londefdef::table;	undef @Apache::londefdef::table;
}	}
}	}
	&enable_para();
}	}
return $currentstring;	return $currentstring;
}	}

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

Removed from v.1.390.2.2
changed lines
	Added in v.1.396