[LON-CAPA-cvs] cvs: loncom /homework outputtags.pm

albertel lon-capa-cvs@mail.lon-capa.org
Wed, 13 Aug 2003 18:50:43 -0000


albertel		Wed Aug 13 14:50:43 2003 EDT

  Modified files:              
    /loncom/homework	outputtags.pm 
  Log:
  - have displaytitle use get_resource_name
  - stop stupid latex escaping call latex_special_symbols
  
  
Index: loncom/homework/outputtags.pm
diff -u loncom/homework/outputtags.pm:1.30 loncom/homework/outputtags.pm:1.31
--- loncom/homework/outputtags.pm:1.30	Tue Jul  1 17:10:43 2003
+++ loncom/homework/outputtags.pm	Wed Aug 13 14:50:43 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # tags that create controlled output
 #
-# $Id: outputtags.pm,v 1.30 2003/07/01 21:10:43 albertel Exp $
+# $Id: outputtags.pm,v 1.31 2003/08/13 18:50:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -88,16 +88,16 @@
     } else {
 	$Apache::outputtags::showonce{'displayduetitle'}=1;
     }
+    my $name=&Apache::structuretags::get_resource_name();
     if ($target eq 'web') {
-	$result="<h1>$Apache::lonhomework::name</h1>";
+	$result="<h1>$name</h1>";
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::tag_start($target,$token);
 	$result.='</td></tr>';
 	$result.=&Apache::edit::end_table();
     } elsif ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
-	$Apache::lonhomework::name=~s/%/\%/g;
-	$Apache::lonhomework::name=~s/&/\&/g;
-	$result='\vskip 0 mm\noindent\textbf{'.$Apache::lonhomework::name.'}\vskip 0 mm';
+	$name=&Apache::lonxml::latex_special_symbols($name);
+	$result='\vskip 0 mm\noindent\textbf{'.$name.'}\vskip 0 mm';
     }
     return $result;
 }