--- loncom/homework/hint.pm 2001/10/09 20:45:13 1.20 +++ loncom/homework/hint.pm 2002/03/06 20:39:15 1.27 @@ -1,10 +1,38 @@ +# The LearningOnline Network with CAPA +# implements the tags that control the hints +# +# $Id: hint.pm,v 1.27 2002/03/06 20:39:15 sakharuk Exp $ +# +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# + package Apache::hinttags; use strict; use Apache::lonnet; use capa; -sub BEGIN { +BEGIN { &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint')); } @@ -30,6 +58,8 @@ sub start_hintgroup { if ($skiptoend) { &Apache::lonxml::get_all_text("/hintgroup",$$parser[$#$parser]); } + } elsif ($target eq 'tex') { + $result .= '\keephidden{'; } @Apache::hint::which=(); return $result; @@ -51,6 +81,8 @@ sub end_hintgroup { } } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table(); + } elsif ($target eq 'tex') { + $result .= '}'; } @Apache::hint::which=(); return $result; @@ -67,7 +99,8 @@ sub start_numericalhint { $result.=&Apache::edit::text_arg('Answer:','answer',$token); $result.=&Apache::edit::text_arg('Unit:','unit',$token,5); $result.=&Apache::edit::text_arg('Format:','format',$token,4); - $result.=''; + $result.=&Apache::edit::end_row(); + $result.=&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { my $constructtag= &Apache::edit::get_new_args($token,$parstack,$safeeval, @@ -139,9 +172,10 @@ sub start_hintpart { } elsif ($target eq 'grade') { &Apache::lonxml::get_all_text("/hintpart",$$parser[$#$parser]); } elsif ($target eq 'edit') { - $result.= &Apache::edit::tag_start($target,$token, - &Apache::lonxml::description($token)); - $result.= &Apache::edit::text_arg('On:','on',$token).''; + $result.= &Apache::edit::tag_start($target,$token); + $result.= &Apache::edit::text_arg('On:','on',$token); + $result.= &Apache::edit::end_row(); + $result.= &Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, 'on');