--- loncom/interface/lonprintout.pm 2003/08/14 13:55:19 1.214
+++ loncom/interface/lonprintout.pm 2003/08/21 15:50:35 1.222
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.214 2003/08/14 13:55:19 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.222 2003/08/21 15:50:35 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -483,7 +483,7 @@ sub get_course {
sub page_format_transformation {
my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment,$tableofcontents,$indexlist) = @_;
my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin);
- $assignment=~s/_/ /g;
+ $assignment=&Apache::lonxml::latex_special_symbols($assignment,'header');
if ($numberofcolumns != 1) {
($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin) = &page_format($papersize,$layout,$numberofcolumns,$topmargin);
} else {
@@ -591,6 +591,26 @@ sub index_table {
}
+sub IndexCreation {
+ my ($texversion,$currentURL)=@_;
+ my @key_words=split(/,/,&index_table($currentURL));
+ my $chunk='';
+ my $st=index $texversion,'\addcontentsline{toc}{subsection}{';
+ if ($st>0) {
+ for (my $i=0;$i<3;$i++) {$st=(index $texversion,'}',$st+1);}
+ $chunk=substr($texversion,0,$st+1);
+ substr($texversion,0,$st+1)=' ';
+ }
+ foreach my $key_word (@key_words) {
+ if ($key_word=~/\S+/) {
+ $texversion=~s/\b($key_word)\b/$1 \\index{$key_word} /i;
+ }
+ }
+ if ($st>0) {substr($texversion,0,1)=$chunk;}
+ return $texversion;
+}
+
+
sub output_data {
my ($r,$helper,$rparmhash) = @_;
my %parmhash = %$rparmhash;
@@ -665,14 +685,11 @@ ENDPART
$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
}
if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
-# my $key_words=&index_table($currentURL);
- my @key_words=split(/,/,&index_table($currentURL));
- foreach my $key_word (@key_words) {
- if ($key_word=~/\S+/) {
- $texversion=~s/\b($key_word)\b/$1 \\index{$1} /;
- }
- }
-# $texversion=~s/(\\end{document})/\\strut\\\\\\strut {\\large \\textbf{INDEX}}\\strut\\\\\\strut$key_words\\strut\\\\\\strut$1/;
+ $texversion=&IndexCreation($texversion,$currentURL);
+ }
+ if ($helper->{'VARS'}->{'CONSTR_RESOURSE_URL'} eq 'yes') {
+ $texversion=~s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$currentURL| \\strut\\\\\\strut /;
+
}
$result .= $texversion;
if ($currentURL=~m/\.page\s*$/) {
@@ -716,7 +733,7 @@ ENDPART
}
$form{'symb'}=$master_seq[$i];
$master_seq[$i]=~/(.*)___\d*___/;
- my $assignment=&Apache::lonnet::gettitle($1); #tittle of the assignment which contains this problem
+ my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($1),'header'); #tittle of the assignment which contains this problem
#&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]");
my $texversion=&Apache::lonnet::ssi($urlp,%form);
if ($urlp=~/\.page$/) {
@@ -737,10 +754,12 @@ ENDPART
my $answer=&Apache::lonnet::ssi($urlp,%form);
$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
}
-# $result .= $texversion;
+ if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
+ $texversion=&IndexCreation($texversion,$urlp);
+ }
if (($selectionmade == 4) and ($assignment ne $prevassignment) and ($i>=1)) {
my ($name,$courseidinfo) = &get_name;
- my $courseidinfo = &get_course();
+ $courseidinfo = &get_course();
if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
$prevassignment=$assignment;
$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$name.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}} \vskip -5 mm ';
@@ -797,13 +816,13 @@ ENDPART
}
my $courseidinfo = &get_course();
if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
-
+ my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
if ($current_output=~/\\documentclass/) {
- $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}}$courseidinfo \\hfill \\thepage \\\\ \\textit{$helper->{VARS}->{'assignment'}}}\\vskip 3 mm /;
+ $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}}$courseidinfo \\hfill \\thepage \\\\ \\textit{$currentassignment}}\\vskip 3 mm /;
} else {
my $blanspages = '';
for (my $j=0;$j<$helper->{'VARS'}->{'EMPTY_PAGES'};$j++) {$blanspages.='\clearpage\strut\clearpage';}
- $current_output = '\strut\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage '.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$helper->{VARS}->{'assignment'}.'}}} \vskip -5 mm '.$current_output;
+ $current_output = '\strut\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage '.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$currentassignment.'}}} \vskip -5 mm '.$current_output;
}
$result .= $current_output;
&Apache::lonnet::delenv('form.counter');
@@ -868,6 +887,13 @@ ENDPART
} else {
$texversion =~ s/\\end{document}//;
}
+ if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
+ $texversion=&IndexCreation($texversion,$urlp);
+ }
+ if ($helper->{'VARS'}->{'CONSTR_RESOURSE_URL'} eq 'yes') {
+ $texversion=~s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$urlp| \\strut\\\\\\strut /;
+
+ }
$result .= $texversion;
}
$flag_latex_header_remove = 'YES';
@@ -1185,7 +1211,7 @@ CHOOSE_FROM_SUBDIR
if (($ENV{'request.role.adv'} and &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) or
($helper->{VARS}->{'construction'} eq '1')) {
$paramHash = Apache::lonhelper::getParamHash();
- $paramHash->{MESSAGE_TEXT} = "
Next option is available only for advanced users: ";
+ $paramHash->{MESSAGE_TEXT} = "
Next four options are available only for advanced users: | ";
Apache::lonhelper::message->new();
$paramHash = Apache::lonhelper::getParamHash();
$paramHash->{'variable'} = 'ANSWER_TYPE';
@@ -1198,7 +1224,7 @@ CHOOSE_FROM_SUBDIR
if ($ENV{'request.role.adv'}) {
$paramHash = Apache::lonhelper::getParamHash();
- $paramHash->{MESSAGE_TEXT} = " Another option available only for advanced users: "; + $paramHash->{MESSAGE_TEXT} = " |
";
Apache::lonhelper::message->new();
$paramHash = Apache::lonhelper::getParamHash();
$paramHash->{'variable'} = 'LATEX_TYPE';
@@ -1213,30 +1239,48 @@ CHOOSE_FROM_SUBDIR
['Print in standard LaTeX mode', 'standard'] ];
}
Apache::lonhelper::dropdown->new();
- }
-
-
+
$paramHash = Apache::lonhelper::getParamHash();
- $paramHash->{MESSAGE_TEXT} = " Print with Table of Contents: "; + $paramHash->{MESSAGE_TEXT} = " | |
"; Apache::lonhelper::message->new(); $paramHash = Apache::lonhelper::getParamHash(); $paramHash->{'variable'} = 'TABLE_CONTENTS'; $helper->declareVar('TABLE_CONTENTS'); $paramHash->{CHOICES} = [ - ['No', 'no'], - ['Yes', 'yes'] ]; + ['Print without Table of Contents', 'no'], + ['Print with Table of Contents', 'yes'] ]; Apache::lonhelper::dropdown->new(); + if (not $helper->{VARS}->{'construction'}) { + $paramHash = Apache::lonhelper::getParamHash(); + $paramHash->{MESSAGE_TEXT} = " | |
"; + Apache::lonhelper::message->new(); + $paramHash = Apache::lonhelper::getParamHash(); + $paramHash->{'variable'} = 'TABLE_INDEX'; + $helper->declareVar('TABLE_INDEX'); + $paramHash->{CHOICES} = [ + ['Print without Index', 'no'], + ['Print with Index', 'yes'] ]; + Apache::lonhelper::dropdown->new(); + } + + if ($helper->{VARS}->{'construction'}) { + $paramHash = Apache::lonhelper::getParamHash(); + $paramHash->{MESSAGE_TEXT} = " | |
";
+ Apache::lonhelper::message->new();
+ $paramHash = Apache::lonhelper::getParamHash();
+ $paramHash->{'variable'} = 'CONSTR_RESOURSE_URL';
+ $helper->declareVar('CONSTR_RESOURSE_URL');
+ $paramHash->{CHOICES} = [
+ ['Print without URL', 'no'],
+ ['Print with UTL', 'yes'] ];
+ Apache::lonhelper::dropdown->new();
+ }
+
$paramHash = Apache::lonhelper::getParamHash();
- $paramHash->{MESSAGE_TEXT} = " Print with Index: "; + $paramHash->{MESSAGE_TEXT} = " |