version 1.37, 2004/03/08 23:23:04
|
version 1.40, 2004/04/08 14:22:48
|
Line 153 sub end_itemgroup {
|
Line 153 sub end_itemgroup {
|
$table.='</table>'; |
$table.='</table>'; |
$Apache::matchresponse::itemtable{'display'}=$table; |
$Apache::matchresponse::itemtable{'display'}=$table; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $table=' \begin{description} '; |
my $table=' \begin{description}\setlength{\leftmargin}{2em}\setlength{\labelwidth}{1em}\setlength{\itemsep}{0.5pt plus1pt minus2pt}\setlength{\listparindent}{0em} '; |
my $i=0; |
my $i=0; |
foreach my $name (@names) { |
foreach my $name (@names) { |
$Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g; |
$Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g; |
Line 161 sub end_itemgroup {
|
Line 161 sub end_itemgroup {
|
$Apache::response::itemgroup{$name.'.text'}; |
$Apache::response::itemgroup{$name.'.text'}; |
$i++; |
$i++; |
} |
} |
$table.=' \end{description} \strut '; |
$table.=' \end{description} \strut '; |
|
if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';} |
$Apache::matchresponse::itemtable{'display'}=$table; |
$Apache::matchresponse::itemtable{'display'}=$table; |
} |
} |
return $result; |
return $result; |
Line 469 sub displayfoils {
|
Line 470 sub displayfoils {
|
$question.=' '.$optionlist.$text."\n"; |
$question.=' '.$optionlist.$text."\n"; |
my @emptyItems = (); |
my @emptyItems = (); |
for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';} |
for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';} |
$question.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'}\end{enumerate}} \vskip -10 mm \strut '; |
$question.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'\end{enumerate} \vskip -8 mm \strut '; |
$internal_counter++; |
$internal_counter++; |
} else { |
} else { |
$question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n"; |
$question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n"; |
Line 487 sub displayfoils {
|
Line 488 sub displayfoils {
|
$result='<table><tr><td>'.$question.'</td><td>'.$result. |
$result='<table><tr><td>'.$question.'</td><td>'.$result. |
'</td></tr></table>'; |
'</td></tr></table>'; |
} else { |
} else { |
$result='\begin{tabular}{p{\textwidth/2}p{\textwidth/2}}\begin{minipage}{\textwidth/2}'.$question.'\end{minipage}&\begin{minipage}{\textwidth/2}'.$result.'\end{minipage}\end{tabular}'; |
my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'}); |
|
$tabsize=~/(\d+\.?\d*)/; |
|
$tabsize=$1/2.1; |
|
$tabsize.=' mm '; |
|
$result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$tabsize.'}p{'.$tabsize.'}}\begin{minipage}{'.$tabsize.'}'.$question.'\end{minipage}&\begin{minipage}{'.$tabsize.'}'.$result.'\end{minipage}\end{tabular}'; |
} |
} |
} elsif ($result=&itemdisplay('left')) { |
} elsif ($result=&itemdisplay('left')) { |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
$result='<table><tr><td>'.$result.'</td><td>'.$question. |
$result='<table><tr><td>'.$result.'</td><td>'.$question. |
'</td></tr></table>'; |
'</td></tr></table>'; |
} else { |
} else { |
$result='\begin{tabular}{p{\textwidth/2}p{\textwidth/2}}\begin{minipage}{\textwidth/2}'.$result.'\end{minipage}&\begin{minipage}{\textwidth/2}'.$question.'\end{minipage}\end{tabular}'; |
my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'}); |
|
$tabsize=~/(\d+\.?\d*)/; |
|
$tabsize=$1/2.1; |
|
$tabsize.=' mm '; |
|
$result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$tabsize.'}p{'.$tabsize.'}}\begin{minipage}{'.$tabsize.'}'.$result.'\end{minipage}&\begin{minipage}{'.$tabsize.'}'.$question.'\end{minipage}\end{tabular}'; |
} |
} |
} |
} |
if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';} |
if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';} |
Line 601 sub end_foil {
|
Line 610 sub end_foil {
|
if (defined($Apache::response::foilnames{$name})) { |
if (defined($Apache::response::foilnames{$name})) { |
&Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name)); |
&Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name)); |
} |
} |
|
$Apache::response::foilnames{$name}++; |
my $location =&Apache::lonxml::get_param('location',$parstack, |
my $location =&Apache::lonxml::get_param('location',$parstack, |
$safeeval); |
$safeeval); |
if ( $Apache::matchresponse::conceptgroup |
if ( $Apache::matchresponse::conceptgroup |