--- loncom/homework/outputtags.pm 2009/05/14 10:57:40 1.55 +++ loncom/homework/outputtags.pm 2009/11/01 16:10:35 1.56 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # tags that create controlled output # -# $Id: outputtags.pm,v 1.55 2009/05/14 10:57:40 foxr Exp $ +# $Id: outputtags.pm,v 1.56 2009/11/01 16:10:35 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -39,11 +39,74 @@ BEGIN { &Apache::lonxml::register('Apache::outputtags',('displayduedate','displaytitle','displayweight','displaystudentphoto')); } +################################ utilities ########################### + +# +# Does a simple substitution of a tab when the opening tag can +# be replaced by a fixed string.. and same for the closing tag. +# Parameters: +# $input - String in in which to do the substitutions. +# $tag - name of tag without the <>'s e.g. sub for +# $opening - What to replace <$tag> with +# $closing - What to replace with. +# Returns: +# Input string appropriately substituted. +# +sub substitute_tag { + my ($input, + $tag, + $opening, + $closing) = @_; + + $input =~ s/<$tag>/$opening/gi; + $input =~ s/<\/$tag>/$closing/gi; + + return $input; +} + +# +# Substitutes the simple formatting tags in a string +# Parameters: +# $string - input string. +# Returns +# Result of string after simple substitutions +# Tags we handle are: +# , +# +sub substitute_simple_tags_latex { + my ($string) = @_; + + # restore the <>'s: + + $string =~ s/\\ensuremath{<}/}/>/g; + + + # Substitute the tags: + + $string = &substitute_tag($string, "sub", '\ensuremath{_', '}'); + $string = &substitute_tag($string, 'sup', '\ensuremath{^', '}'); + $string = &substitute_tag($string, 'em', '\em{', '}'); + + + # Escape the remaining <>'s again: + + $string =~ s//\\ensuremath{>}/g; + + + + return $string; +} + +################################ The parser ########################## + sub initialize_outputtags { %Apache::outputtags::showonce=(); } + sub start_displayduedate { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; @@ -152,6 +215,7 @@ sub start_displaytitle { $result.=&Apache::edit::end_table(); } elsif ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { $name=&Apache::lonxml::latex_special_symbols($name); + $name = &substitute_simple_tags_latex($name); if (lc($style) !~ 'plain') { $result='\vskip 0 mm\noindent\textbf{'.$name.'}\vskip 0 mm'; } else {