--- loncom/homework/radiobuttonresponse.pm 2012/01/23 12:00:13 1.153.6.4 +++ loncom/homework/radiobuttonresponse.pm 2012/01/24 12:05:12 1.153.6.5 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # mutliple choice style responses # -# $Id: radiobuttonresponse.pm,v 1.153.6.4 2012/01/23 12:00:13 foxr Exp $ +# $Id: radiobuttonresponse.pm,v 1.153.6.5 2012/01/24 12:05:12 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,6 +31,7 @@ use HTML::Entities(); use Apache::lonlocal; use Apache::lonnet; use Apache::response; +use Apache::caparesponse; my $default_bubbles_per_line = 10; my @alphabet = ( 'A' .. 'Z' ); # Foil labels. @@ -375,7 +376,7 @@ sub format_prior_answer { } ## -sub displayallfoils { +sub displayallfoils{ my ( $direction, $target ) = @_; my $result; &Apache::lonxml::debug("survey style display"); @@ -384,6 +385,31 @@ sub displayallfoils { @names = @{ $Apache::response::foilgroup{'names'} }; } + # Figure out how to bracket the list of foils for + # the TeX target: + # + + my $begin_environment; + my $end_environment; + + if ($target eq 'tex') { + + # Decide how to bracket the list of foils: + + + if ( $env{'form.pdfFormFields'} eq 'yes' + && $Apache::inputtags::status[-1] eq 'CAN_ANSWER' ) + { + $begin_environment = '\begin{itemize}'; + $end_environment = '\end{itemize}'; + } + else { + $begin_environment = '\begin{enumerate}'; + $end_environment = '\end{enumerate}'; + } + $result .= $begin_environment; + } + my $temp = 0; my $i = 0; my $id = $Apache::inputtags::response['-1']; @@ -536,6 +562,12 @@ sub displayallfoils { if ( ( $direction eq 'horizontal' ) && ( $target ne 'tex' ) ) { $result .= ''; } + + # Close tex bracketing: + + if ($target eq 'tex') { + $result .= $end_environment; + } return $result; } @@ -934,78 +966,100 @@ sub display_foils_html { ## # Display foils in exam mode for latex # -# @param $whichfoils - Reference to an array that contains the foil names to display +# @param $whichfoils - Reference to an array that contains the foil names to display # @param $bubbles_per_line - Number of bubbles on a line. +# @param $direction - Rendering direction 'horizontal' is what we're looking for. +# @param $vbegin - Start latex fragment in vertical rendering. +# @param $vend - End latex fragmentin vertical rendering. # # @return string # @return the latex rendering of the exam problem. # -# @note The direction is not honored for exams. The lines reflect the number of -# bubbles on an exam sheet. # sub display_latex_exam { - my ($whichfoils, $bubbles_per_line) = @_; + my ($whichfoils, $bubbles_per_line, $direction, $vbegin, $vend) = @_; my $result; my $numlines; my $bubble_number = 0; my $line = 0; my $i = 0; - # This section puts out the prefix that tells the user - # (if necessary) to only choose one bubble in the next n lines - # for problems with more than one line worth of bubbles in the grid sheet: - - my $numitems = scalar( @{$whichfoils} ); - $numlines = int( $numitems / $bubbles_per_line ); - if ( ( $numitems % $bubbles_per_line ) != 0 ) { - $numlines++; - } - if ( $numlines < 1 ) { - $numlines = 1; - } - if ( $numlines > 1 ) { - my $linetext; - for ( my $i = 0 ; $i < $numlines ; $i++ ) { - $linetext .= $Apache::lonxml::counter + $i . ', '; + &Apache::lonnet::logthis("LaTeX exam: $direction $vbegin $vend"); + + if ($direction eq 'horizontal') { + + # Marshall the display text for each foil and turn things over to + # Apache::response::make_horizontal_bubbles: + + my @foil_texts; + foreach my $name (@{$whichfoils}) { + push(@foil_texts, $Apache::response::foilgroup{$name . '.text'}); } - $linetext =~ s/,\s$//; - $result .= - '\item[\small {\textbf{' - . $linetext . '}}]' - . ' {\footnotesize ' - . &mt( '(Bubble once in [_1] lines)', $numlines ) - . '} \hspace*{\fill} \\\\'; - } - else { - $result .= '\item[\textbf{' . $Apache::lonxml::counter . '}.]'; - } + $result .= &Apache::caparesponse::make_horizontal_latex_bubbles( + $whichfoils, \@foil_texts, '$\bigcirc$'); - # Now output the bubbles themselves: - foreach my $name (@{$whichfoils}) { - if ( $bubble_number >= $bubbles_per_line ) { - $line++; - $i = 0; - $bubble_number = 0; + } else { + $result .= $vbegin; + + # This section puts out the prefix that tells the user + # (if necessary) to only choose one bubble in the next n lines + # for problems with more than one line worth of bubbles in the grid sheet: + + my $numitems = scalar( @{$whichfoils} ); + $numlines = int( $numitems / $bubbles_per_line ); + if ( ( $numitems % $bubbles_per_line ) != 0 ) { + $numlines++; + } + if ( $numlines < 1 ) { + $numlines = 1; } - my $identifier; if ( $numlines > 1 ) { - $identifier = $Apache::lonxml::counter + $line; + my $linetext; + for ( my $i = 0 ; $i < $numlines ; $i++ ) { + $linetext .= $Apache::lonxml::counter + $i . ', '; + } + $linetext =~ s/,\s$//; + $result .= + '\item[\small {\textbf{' + . $linetext . '}}]' + . ' {\footnotesize ' + . &mt( '(Bubble once in [_1] lines)', $numlines ) + . '} \hspace*{\fill} \\\\'; } - $result .= - '{\small \textbf{' - . $identifier - . $alphabet[$i] - . '}}$\bigcirc$' - . $Apache::response::foilgroup{ $name . '.text' } - . '\\\\'; #' stupid emacs -- it thinks it needs that apostrophe to close the quote + else { + $result .= '\item[\textbf{' . $Apache::lonxml::counter . '}.]'; + } + + # Now output the bubbles themselves: + + foreach my $name (@{$whichfoils}) { + if ( $bubble_number >= $bubbles_per_line ) { + $line++; + $i = 0; + $bubble_number = 0; + } + my $identifier; + if ( $numlines > 1 ) { + $identifier = $Apache::lonxml::counter + $line; + } + $result .= + '{\small \textbf{' + . $identifier + . $alphabet[$i] + . '}}$\bigcirc$' + . $Apache::response::foilgroup{ $name . '.text' } + . '\\\\'; #' stupid emacs -- it thinks it needs that apostrophe to close the quote + + $i++; + $bubble_number++; + } + $result .= $vend - $i++; - $bubble_number++; - } - - return $result; + } + return $result; + } ## @@ -1036,6 +1090,59 @@ sub display_latex { ## +# Render foils for a PDF form. This is a variant of tex rednering that provides +# sufficient markup that the final PDF is a form that can be filled in online, +# or offline. +# +# @param $whichfoils - References an array of foils to display in the order in which +# they should be displayed. +# @param $direction - Rendering direction. 'horiztonal' means inputs are laid out +# horizontally otherwise they are stacked vertically. +# +# @return string +# @retval String containing the rendering of the resource. +# +sub display_pdf_form { + my ($whichfoils) = @_; + my $temp = 0; + my $result; + + foreach my $name ( @{$whichfoils} ) { + + my $fieldname = + $env{'request.symb'} + . '&part_' + . $Apache::inputtags::part + . '&radiobuttonresponse' + . '&HWVAL_' + . $Apache::inputtags::response['-1']; + $result .= '\item[{' + . &Apache::lonxml::print_pdf_radiobutton( $fieldname, + $temp ) + . '}]' + . $Apache::response::foilgroup{ $name . '.text' } + . "\n"; + + $temp++; + } + + return $result; +} + + +## +# Display selected foils: This is really just a dispatchter to appropriate renderers +# +# @param $target - Target (e.g. 'tex'...). +# @param $answer - True if answers should be shown. +# @param $whichfoils - Array of foil selectors that indicate which foils shouild be +# rendered, in rendering order. +# @param $direction- Rendering direction ('horizontal' is the one we look for, +# otherwise foils are rendered one per line vertically. +# @param $bubbles_per_line - number of exam bubbles per line. +# +# @return string +# @retval The rendered problem. sub displayfoils { my ( $target, $answer, $whichfoils, $direction, $bubbles_per_line ) = @_; @@ -1092,9 +1199,10 @@ sub displayfoils { if ( ( $Apache::lonhomework::type eq 'exam' ) ) { - $result .= $begin_environment; - $result .= &display_latex_exam($whichfoils, $bubbles_per_line); - $result .= $end_environment; + $result .= &display_latex_exam( + $whichfoils, $bubbles_per_line, $direction, $begin_environment, + $end_environment); + $result .= '\vskip 0mm '; } else { @@ -1107,24 +1215,7 @@ sub displayfoils { && ($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) { $result .= $begin_environment; - foreach my $name ( @{$whichfoils} ) { - - my $fieldname = - $env{'request.symb'} - . '&part_' - . $Apache::inputtags::part - . '&radiobuttonresponse' - . '&HWVAL_' - . $Apache::inputtags::response['-1']; - $result .= '\item[{' - . &Apache::lonxml::print_pdf_radiobutton( $fieldname, - $temp ) - . '}]' - . $Apache::response::foilgroup{ $name . '.text' } - . "\n"; - - $temp++; - } + $result .= &display_pdf_form($whichfoils, $direction); $result .= $end_environment; } else { $result .= &display_latex(