--- loncom/xml/lonxml.pm 2010/03/21 18:32:02 1.507 +++ loncom/xml/lonxml.pm 2010/07/26 09:58:53 1.511 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # XML Parser Module # -# $Id: lonxml.pm,v 1.507 2010/03/21 18:32:02 www Exp $ +# $Id: lonxml.pm,v 1.511 2010/07/26 09:58:53 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -476,6 +476,10 @@ sub inner_xmlparse { } if (($ENV{'QUERY_STRING'}) && ($target eq 'web')) { $finaloutput=&afterburn($finaloutput); + } + if ($target eq 'modified') { +# if modfied, handle startpart and endpart + $finaloutput=~s/\]*\>(.*)\]*\>/$1<\/part>/gs; } return $finaloutput; } @@ -638,8 +642,9 @@ sub setup_globals { sub init_safespace { my ($target,$safeeval,$safehole,$safeinit) = @_; - $safeeval->deny_only(':dangerous'); $safeeval->reval('use Math::Complex;'); + $safeeval->reval('use LaTeX::Table;'); + $safeeval->deny_only(':dangerous'); $safeeval->permit_only(":default"); $safeeval->permit("entereval"); $safeeval->permit(":base_math"); @@ -1460,7 +1465,7 @@ sub renderingoptions { &Apache::loncommon::select_form( $env{'form.languages'}, 'languages', - &Apache::lonlocal::texthash(%langchoices)). + {&Apache::lonlocal::texthash(%langchoices)}). ''; } $output .= @@ -1469,11 +1474,11 @@ sub renderingoptions { &Apache::loncommon::select_form( $env{'form.texengine'}, 'texengine', - &Apache::lonlocal::texthash + {&Apache::lonlocal::texthash ('' => '', 'tth' => 'tth (TeX to HTML)', 'jsMath' => 'jsMath', - 'mimetex' => 'mimetex (Convert to Images)')). + 'mimetex' => 'mimetex (Convert to Images)')}). ''; return $output; } @@ -2188,24 +2193,20 @@ sub get_tag { =pod -=item &print_pdf_radiobutton(fieldname, value, text) +=item &print_pdf_radiobutton(fieldname, value) -Returns a latexline to generate a PDF-Form-Radiobutton with Text. +Returns a latexline to generate a PDF-Form-Radiobutton. +Note: Radiobuttons with equal names are automaticly grouped + in a selection-group. -$fieldname: PDF internalname of the radiobutton -$value: Value of radiobutton (read when dumping the PDF data) -$text: Text on the rightside of the radiobutton +$fieldname: PDF internalname of the radiobutton(group) +$value: Value of radiobutton =cut sub print_pdf_radiobutton { - my $result = ''; - my ($fieldName, $value, $text) = @_; - $result .= '\begin{tabularx}{\textwidth}{p{0cm}X}'."\n"; - $result .= '\radioButton[\symbolchoice{circle}]{'. - $fieldName.'}{10bp}{10bp}{'.$value.'}&'.$text."\n"; - $result .= '\end{tabularx}' . "\n"; - $result .= '\hspace{2mm}' . "\n"; - return $result; + my ($fieldname, $value) = @_; + return '\radioButton[\symbolchoice{circle}]{' + .$fieldname.'}{10bp}{10bp}{'.$value.'}'; }