--- loncom/xml/londefdef.pm 2007/03/09 17:10:33 1.357
+++ loncom/xml/londefdef.pm 2007/06/05 22:37:58 1.366
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.357 2007/03/09 17:10:33 foxr Exp $
+# $Id: londefdef.pm,v 1.366 2007/06/05 22:37:58 albertel Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -128,6 +128,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') {
@@ -135,11 +136,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;
}
@@ -513,6 +516,17 @@ sub end_accessrule {
return $currentstring;
}
+sub generate_css_links {
+ my $links;
+ my $css_href = &Apache::lonnet::EXT('resource.0.cssfile');
+ if ($css_href =~ /\S/) {
+ &Apache::lonxml::extlink($css_href);
+ $links .=
+ '';
+ }
+ return $links;
+}
+
#-- tag (end tag required)
sub start_body {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
@@ -527,9 +541,13 @@ sub start_body {
if (&is_inside_of($tagstack, "head")) {
&end_head(@_);
}
+
+ my $extra_head = &generate_css_links();
+
$currentstring =
&Apache::loncommon::start_page($Apache::londefdef::title,
- $Apache::londefdef::head,
+ $Apache::londefdef::head
+ .$extra_head,
{'add_entries' => $token->[2],
'no_title' => 1,
'force_register' => 1});
@@ -1458,6 +1476,27 @@ sub start_hr {
if ($target eq 'web' || $target eq 'webgrade') {
$currentstring .= $token->[4];
} elsif ($target eq 'tex') {
+
+ #
can't be inside of thank you LaTeX.
+ #
+ my $restart_sub = 0;
+ my $restart_sup = 0;
+
+ # Since and are simple tags it's ok to turn off/on
+ # using the start_ stop_ functions.. those tags only care about
+ # $target.
+
+ if (&is_inside_of($tagstack, "sub")) {
+ $restart_sub = 1;
+ $currentstring .= &end_sub($target, $token, $tagstack,
+ $parstack, $parser, $safeeval);
+ }
+ if (&is_inside_of($tagstack, "sup")) {
+ $restart_sup = 1;
+ $currentstring .= &end_sup($target, $token, $tagstack,
+ $parstack, $parser, $safeeval);
+ }
+
my $LaTeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
if (defined $LaTeXwidth) {
if ($LaTeXwidth=~/^%/) {
@@ -1478,6 +1517,16 @@ sub start_hr {
}
$currentstring .= ' \vskip 0 mm \noindent\makebox['.$LaTeXwidth.']{'.$pre.'\makebox['.
$LaTeXwidth.'][b]{\hrulefill}'.$post.'}\vskip 0 mm ';
+ # Turn stuff back on that we can't be inside of.
+
+ if ($restart_sub) {
+ $currentstring .= &start_sub($target, $token, $tagstack,
+ $parstack, $parser, $safeeval);
+ }
+ if ($restart_sup) {
+ $currentstring .= &start_sup($target, $token, $tagstack,
+ $parstack, $parser, $safeeval);
+ }
}
return $currentstring;
}
@@ -1575,7 +1624,11 @@ sub end_a {
&Apache::lonxml::get_param('name',$parstack,$safeeval,undef,1);
if ($href =~ /\S/) {
$href =~ s/([^\\])%/$1\\\%/g;
- $currentstring .= ' ({\tt URI:'.&Apache::lonxml::latex_special_symbols($href).'})';
+ # Substitute special symbols... and allow line breaks at each /
+ #
+ $href = &Apache::lonxml::latex_special_symbols($href);
+ $href =~ s/\//\/\\-/g; # Map / to /\- to allow hyphenation.
+ $currentstring .= ' ({\tt URI:'.$href.'})';
} elsif ($name =~ /\S/) {
$currentstring .= ' ({\tt Anchor:'.&Apache::lonxml::latex_special_symbols($name).'})';
} else {
@@ -1925,7 +1978,7 @@ sub start_table {
if ($#Apache::londefdef::table==0) {
$textwidth=&recalc($env{'form.textwidth'}); #result is always in mm
$textwidth=~/(\d+\.?\d*)/;
- $textwidth=0.95*$1; #accounts "internal" LaTeX space for table frame
+ $textwidth=0.85*$1; #accounts "internal" LaTeX space for table frame
} else {
if ($Apache::londefdef::table[-2]{'TeXlen'}[$Apache::londefdef::table[-2]{'row_number'}][$Apache::londefdef::table[-2]{'counter_columns'}]=~/\d/) {
#the maximum width of nested table is determined by LATeX width of parent cell
@@ -1951,11 +2004,11 @@ sub start_table {
} else {
$TeXwidth = $textwidth;
}
- } else {
- $Apache::londefdef::table[-1]{'forcedtablewidth'} = 1;
}
+ # if the width is specified as a % it is converted to an absolute width.
+ # otherwise.. just plugged right in the hash
+
if ($TeXwidth=~/%/) {
- $Apache::londefdef::table[-1]{'percent'}=1;
$TeXwidth=~/(\d+)/;
$Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100;
} else {
@@ -1966,7 +2019,6 @@ sub start_table {
if ($Apache::londefdef::table[-1]{'width'} > $textwidth) {
$Apache::londefdef::table[-1]{'width'} = $textwidth;
}
-
#table's border
my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval);
my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0);
@@ -2028,6 +2080,7 @@ sub end_table {
$available_space=$available_space-$Apache::londefdef::table[-1]{'TeXlen'}[0][$jn];
}
}
+
#boundaries for contents columns
my @min_len=();#columns can not be narrower
my @max_len=();#maximum length of column
@@ -2106,6 +2159,7 @@ sub end_table {
$space_neeeded=$space_neeeded+$max_len[$jn];
}
if ($space_neeeded<=$available_space) {
+
for (my $jn=0;$jn<=$#max_len;$jn++) {
if ($fwidth[$jn]==0) {
$fwidth[$jn]=$max_len[$jn];
@@ -2189,16 +2243,16 @@ sub end_table {
}
}
}
- #use all available width if it is defined in % or as TeXwidth
- if (($Apache::londefdef::table[-1]{'percent'}==1) || ($Apache::londefdef::table[-1]{'forcetablewidth'}==1)) {
- my $current=0;
- for (my $i=0;$i<=$#fwidth;$i++) {
- $current+=$fwidth[$i];
- }
- my $coef=$Apache::londefdef::table[-1]{'width'}/$current;
- for (my $i=0;$i<=$#fwidth;$i++) {
- $fwidth[$i]*=$coef;
- }
+ # use all available width or specified width as if not specified,
+ # the specified width gets defaulted to the available width.
+
+ my $current=0;
+ for (my $i=0;$i<=$#fwidth;$i++) {
+ $current+=$fwidth[$i];
+ }
+ my $coef=$Apache::londefdef::table[-1]{'width'}/$current;
+ for (my $i=0;$i<=$#fwidth;$i++) {
+ $fwidth[$i]*=$coef;
}
#removing of empty columns if allowed
my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0);
@@ -2219,6 +2273,8 @@ sub end_table {
$Apache::londefdef::table[-1]{'content'}=\@cleaned_table;
@fwidth=@cleaned_header;
}
+
+
#construct header of the table
my $header_of_table = '{'.$Apache::londefdef::table[-1]{'vvinc'};
for (my $in=0;$in<=$#fwidth;$in++) {
@@ -3053,6 +3109,29 @@ sub start_applet {
$currentstring='[APPLET: '.$alttag.']';
}
} elsif ($target eq 'tex') {
+ # Turn off some stuff we can't be inside thank you LaTeX
+
+
+ my $restart_sub = 0;
+ my $restart_sup = 0;
+
+ # Since and are simple tags it's ok to turn off/on
+ # using the start_ stop_ functions.. those tags only care about
+ # $target.
+
+ if (&is_inside_of($tagstack, "sub")) {
+ $restart_sub = 1;
+ $currentstring .= &end_sub($target, $token, $tagstack,
+ $parstack, $parser, $safeeval);
+ }
+ if (&is_inside_of($tagstack, "sup")) {
+ $restart_sup = 1;
+ $currentstring .= &end_sup($target, $token, $tagstack,
+ $parstack, $parser, $safeeval);
+ }
+
+ # Now process the applet; just replace it with its alt attribute.
+
my $alttag= &Apache::lonxml::get_param('alt',$parstack,
$safeeval,undef,1);
unless ($alttag) {
@@ -3063,6 +3142,17 @@ sub start_applet {
}
$currentstring.='\begin{center} \fbox{Java Applet: '.$alttag.
'.}\end{center}';
+
+ # Turn stuff back on that we can't be inside of.
+
+ if ($restart_sub) {
+ $currentstring .= &start_sub($target, $token, $tagstack,
+ $parstack, $parser, $safeeval);
+ }
+ if ($restart_sup) {
+ $currentstring .= &start_sup($target, $token, $tagstack,
+ $parstack, $parser, $safeeval);
+ }
}
return $currentstring;
}