--- loncom/homework/outputtags.pm 2009/05/14 10:57:40 1.55
+++ loncom/homework/outputtags.pm 2017/11/12 23:11:09 1.61
@@ -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.61 2017/11/12 23:11:09 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -33,17 +33,81 @@ package Apache::outputtags;
use strict;
use Apache::lonlocal;
use Apache::lonnet;
+use LONCAPA::LWPReq;
use POSIX qw(strftime);
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 $tag> 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;
+ $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;
@@ -108,7 +172,7 @@ sub start_displayduedate {
# at the start of the line to ensure it won't overlap
# the 1 col boundary.
- $result = '\\\\ \framebox{'
+ $result = '\vspace{1.0 ex} \framebox{'
.&mt('Due').' '.$duetext.'}';
} else {
$result = &mt('Due') . ' '.$duetext;
@@ -152,6 +216,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 {
@@ -252,12 +317,12 @@ sub start_displaystudentphoto {
}
if ($target eq 'tex' && $env{'request.role'} =~ /^cc/) {
my $url=&Apache::lonnet::studentphoto($domain,$user,"eps");
- my $ua=new LWP::UserAgent;
+ my $uhome=&Apache::lonnet::homeserver($user,$domain);
my $request=new HTTP::Request('GET',$url);
- my $response=$ua->request($request);
+ my $response=&LONCAPA::LWPReq::makerequest($uhome,$request,'','','',1);
if ($response->is_success) {
my $file=$user."_".$domain."_studentphoto.eps";
- open(FILE,">".$Apache::lonnet::perlvar{'lonPrtDir'}."/$file");
+ open(FILE,">",$Apache::lonnet::perlvar{'lonPrtDir'}."/$file");
print FILE $response->content;
close(FILE);
my $width_param=&Apache::londefdef::image_size($Apache::lonnet::perlvar{'lonPrtDir'}."/$file",'0.3',$parstack,$safeeval);