--- loncom/xml/londefdef.pm 2002/11/07 19:33:52 1.99
+++ loncom/xml/londefdef.pm 2002/11/15 15:01:16 1.101
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.99 2002/11/07 19:33:52 albertel Exp $
+# $Id: londefdef.pm,v 1.101 2002/11/15 15:01:16 sakharuk Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -109,28 +109,38 @@ sub end_m {
return $currentstring;
}
#-- tag
- sub start_html {
- my ($target,$token) = @_;
- my $currentstring = '';
- if ($ENV{'browser.mathml'}) {
- &tth::ttminit();
- } else {
- &tth::tthinit();
- }
- if ($target eq 'web') {
- $currentstring = &Apache::lonxml::xmlbegin().
- &Apache::lonxml::fontsettings();
- } elsif ($target eq 'tex') {
- @Apache::londefdef::table = ();
- $currentstring .= '\documentclass[letterpaper]{article}
+sub start_html {
+ my ($target,$token) = @_;
+ my $currentstring = '';
+ if ($ENV{'browser.mathml'}) {
+ &tth::ttminit();
+ if ($ENV{'browser.unicode'}) {
+ &tth::ttmoptions('-L -u1');
+ } else {
+ &tth::ttmoptions('-L -u0');
+ }
+ } else {
+ &tth::tthinit();
+ if ($ENV{'browser.unicode'}) {
+ &tth::tthoptions('-L -u1');
+ } else {
+ &tth::tthoptions('-L -u0');
+ }
+ }
+ if ($target eq 'web') {
+ $currentstring = &Apache::lonxml::xmlbegin().
+ &Apache::lonxml::fontsettings();
+ } elsif ($target eq 'tex') {
+ @Apache::londefdef::table = ();
+ $currentstring .= '\documentclass[letterpaper]{article}
\newcommand{\keephidden}[1]{}
\renewcommand{\deg}{$^{\circ}$}
\usepackage[dvips]{graphicx}
\usepackage{epsfig}\usepackage{calc}
\newenvironment{choicelist}{\begin{enumerate}}{\end{enumerate}}';
- }
- return $currentstring;
- }
+ }
+ return $currentstring;
+}
sub end_html {
my ($target,$token) = @_;
my $currentstring = '';
@@ -1300,7 +1310,7 @@ sub start_table {
push @Apache::londefdef::table, $aa;
$Apache::londefdef::table[-1]{'row_number'} = -1;
$Apache::londefdef::table[-1]{'output'} = ' \noindent \begin{tabular} ';
- my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval);
+ my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval,undef,1);
unless (defined $border) { $border = 0; }
if ($border) {
$Apache::londefdef::table[-1]{'hinc'} = '\hline ';
@@ -1314,7 +1324,7 @@ sub start_table {
my $width;
foreach my $key (keys(%{$token->[2]})) {
if ($key =~ /^width$/i) {
- $width = &Apache::lonxml::get_param($key,$parstack,$safeeval);
+ $width = &Apache::lonxml::get_param($key,$parstack,$safeeval,undef,1);
}
}
if (defined($width)) { $Apache::londefdef::table[-1]{'width'}=$width; }
@@ -1412,7 +1422,7 @@ sub start_table {
if ($signature) {
my $NumberEmptyLength = $how_many_columns - $filled_columns;
my $SpacePerColumn = '(\textwidth '.$available_space.')/'.$NumberEmptyLength;
- my $shorthand = ($NumberEmptyLength+1)*4;
+ my $shorthand = ($filled_columns+1)*4;
$output =~ s/\$SpacePerColumn/$SpacePerColumn - $shorthand mm/g;
}
$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}\vskip 0 mm ';
@@ -1439,7 +1449,7 @@ sub start_table {
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
$Apache::londefdef::table[-1]{'row_number'}++;
- my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1);
+ my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);
if ($alignchar ne '') {
push @ {$Apache::londefdef::table[-1]{'rows'} }, $alignchar;
} else {
@@ -1469,7 +1479,7 @@ sub start_table {
if ($target eq 'web') {
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
- my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1);
+ my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);
if ($what_to_push eq '') {
$what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);;
}
@@ -1512,7 +1522,7 @@ sub start_table {
if ($target eq 'web') {
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
- my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1);
+ my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);
if ($what_to_push eq '') {
$what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);;
}
@@ -1565,9 +1575,12 @@ sub start_table {
$height_param = $image->Get('height') * $scaling;;
undef $image;
#do we have any specified size of the picture?
- my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval);
- my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval);
- my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval);
+ my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,
+ undef,1);
+ my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval,
+ undef,1);
+ my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval,
+ undef,1);
if ($TeXwidth ne '') {
if ($TeXwidth=~/(\d+)\s*\%/) {
$width_param = $1*$ENV{'form.textwidth'}/100;
@@ -1614,7 +1627,7 @@ sub start_table {
}
} else {
#original image file doesn't exist so check the alt attribute
- my $alt = &Apache::lonxml::get_param('alt',$parstack,$safeeval);
+ my $alt = &Apache::lonxml::get_param('alt',$parstack,$safeeval,undef,1);
if ($alt) {
$currentstring .= ' '.$alt.' ';
} else {
@@ -1719,7 +1732,7 @@ sub start_allow {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
$token->[2]->{'src'};
- my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);
+ my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
&image_replication($src);
my $result;
if ($target eq 'edit') {
@@ -1786,7 +1799,7 @@ sub end_allow {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web') {
- my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval);
+ my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval,undef,1);
$currentstring .= ''.$display.'';;
}
return $currentstring;
@@ -1804,7 +1817,7 @@ sub end_allow {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'web') {
- my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval);
+ my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval,undef,1);
$currentstring .= ''.$display.'';;
}
return $currentstring;
@@ -1822,7 +1835,7 @@ sub end_allow {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';
if ($target eq 'tex') {
- my $howmuch = &Apache::lonxml::get_param('heigth',$parstack,$safeeval);
+ my $howmuch = &Apache::lonxml::get_param('heigth',$parstack,$safeeval,undef,1);
$currentstring .= '\vskip '.$howmuch.' ';
}
return $currentstring;