[system] / trunk / pg / macros / PGbasicmacros.pl Repository:
ViewVC logotype

Diff of /trunk/pg/macros/PGbasicmacros.pl

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 2370 Revision 2392
1465 1465
1466 my $out; 1466 my $out;
1467 if($displayMode eq "HTML_tth") { 1467 if($displayMode eq "HTML_tth") {
1468 $out = tth($in_delim); 1468 $out = tth($in_delim);
1469 ## remove leading and trailing spaces as per Davide Cervone. 1469 ## remove leading and trailing spaces as per Davide Cervone.
1470 $in =~ s/^\s+//; 1470 $out =~ s/^\s+//;
1471 $in =~ s/\s+$//; 1471 $out =~ s/\s+$//;
1472 } elsif ($displayMode eq "HTML_dpng") { 1472 } elsif ($displayMode eq "HTML_dpng") {
1473 # for jj's version of ImageGenerator 1473 # for jj's version of ImageGenerator
1474 $out = $envir->{'imagegen'}->add($in_delim); 1474 $out = $envir->{'imagegen'}->add($in_delim);
1475 # for my version of ImageGenerator 1475 # for my version of ImageGenerator
1476 #$out = $envir->{'imagegen'}->add($in, $mode); 1476 #$out = $envir->{'imagegen'}->add($in, $mode);
1589 1589
1590 $points = 'pt' if $problemValue == 1; 1590 $points = 'pt' if $problemValue == 1;
1591 ## Prepare header for the problem 1591 ## Prepare header for the problem
1592 grep($inlist{$_}++,@{ $envir->{'PRINT_FILE_NAMES_FOR'} }); 1592 grep($inlist{$_}++,@{ $envir->{'PRINT_FILE_NAMES_FOR'} });
1593 if ( defined($inlist{$envir->{studentLogin}}) and ($inlist{$envir->{studentLogin}} > 0) ) { 1593 if ( defined($inlist{$envir->{studentLogin}}) and ($inlist{$envir->{studentLogin}} > 0) ) {
1594 $out = &M3("\n\n\\medskip\\hrule\\smallskip\\par{\\bf ${probNum}.{\\footnotesize ($problemValue $points) $TeXFileName}}\\newline ", 1594 $out = &M3("{\\bf ${probNum}. {\\footnotesize ($problemValue $points) $TeXFileName}}\\newline ",
1595 " \\begin{rawhtml} ($problemValue $points) <B>$l2hFileName</B><BR>\\end{rawhtml}", 1595 " \\begin{rawhtml} ($problemValue $points) <B>$l2hFileName</B><BR>\\end{rawhtml}",
1596 "($problemValue $points) <B>$fileName</B><BR>" 1596 "($problemValue $points) <B>$fileName</B><BR>"
1597 ) if ($problemValue ne ""); 1597 ) if ($problemValue ne "");
1598 } else { 1598 } else {
1599 $out = &M3("\n\n\\smallskip\\hrule\\smallskip\\par{\\bf ${probNum}.}($problemValue $points) ", 1599 $out = &M3("{\\bf ${probNum}.} ($problemValue $points) ",
1600 "($problemValue $points) ", 1600 "($problemValue $points) ",
1601 "($problemValue $points) " 1601 "($problemValue $points) "
1602 ) if ($problemValue ne ""); 1602 ) if ($problemValue ne "");
1603 } 1603 }
1604 $out; 1604 $out;
1686 my $url = shift; 1686 my $url = shift;
1687 my $text = shift; 1687 my $text = shift;
1688 my $options = shift; 1688 my $options = shift;
1689 $options = "" unless defined($options); 1689 $options = "" unless defined($options);
1690 return "$BBOLD\[ broken link: $text \] $EBOLD" unless defined($url); 1690 return "$BBOLD\[ broken link: $text \] $EBOLD" unless defined($url);
1691 M3( "{\\bf \\underline{$text} }", 1691 M3( "{\\bf \\underline{$text}}",
1692 "\\begin{rawhtml} <A HREF=\"$url\" $options> $text </A>\\end{rawhtml}", 1692 "\\begin{rawhtml}<A HREF=\"$url\" $options>$text</A>\\end{rawhtml}",
1693 "<A HREF=\"$url\" $options> $text </A>" 1693 "<A HREF=\"$url\" $options>$text</A>"
1694 ); 1694 );
1695} 1695}
1696 1696
1697 1697
1698sub helpLink { 1698sub helpLink {

Legend:
Removed from v.2370  
changed lines
  Added in v.2392

aubreyja at gmail dot com
ViewVC Help
Powered by ViewVC 1.0.9