--- loncom/xml/lonxml.pm 2003/12/09 16:52:13 1.296 +++ loncom/xml/lonxml.pm 2004/01/30 17:27:34 1.299 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # XML Parser Module # -# $Id: lonxml.pm,v 1.296 2003/12/09 16:52:13 albertel Exp $ +# $Id: lonxml.pm,v 1.299 2004/01/30 17:27:34 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -192,7 +192,7 @@ sub xmlend { $mode='problem'; $status=$Apache::inputtags::status[-1]; } - return &Apache::lonfeedback::list_discussion().''; + return &Apache::lonfeedback::list_discussion($mode,$status).''; } sub tokeninputfield { @@ -405,7 +405,7 @@ sub latex_special_symbols { $string =~ s/_/ /g; } else { $string=~s/\\ /\\char92 /g; - $string=~s/\^/\\\^ /g; + $string=~s/\^/\\\^\\strut /g; $string=~s/\~/\\char126 /g; #fixup & if it doesn't look like # { or α @@ -1294,10 +1294,10 @@ sub display_title { } sub debug { - if ($Apache::lonxml::debug eq 1) { - $|=1; - print('DEBUG:'.&HTML::Entities::encode($_[0])."\n"); - } + if ($Apache::lonxml::debug eq "1") { + $|=1; + Apache->request->print('DEBUG:'.&HTML::Entities::encode($_[0])."\n"); + } } sub error { @@ -1345,6 +1345,9 @@ sub get_param { if ( ! $context ) { $context = -1; } my $args =''; if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; } + if ( ! $Apache::lonxml::usestyle ) { + $args=$Apache::lonxml::style_values.$args; + } if ( ! $args ) { return undef; } if ( $case_insensitive ) { if ($args =~ s/(my \$)(\Q$param\E)(=\")/$1.lc($2).$3/ei) { @@ -1368,6 +1371,9 @@ sub get_param_var { if ( ! $context ) { $context = -1; } my $args =''; if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; } + if ( ! $Apache::lonxml::usestyle ) { + $args=$Apache::lonxml::style_values.$args; + } &Apache::lonxml::debug("Args are $args param is $param"); if ($case_insensitive) { if (! ($args=~s/(my \$)(\Q$param\E)(=\")/$1.lc($2).$3/ei)) {