loncom/interface/lonprintout.pm - diff

Return to lonprintout.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonprintout.pm between versions 1.497 and 1.501

version 1.497, 2007/04/17 15:45:03	version 1.501, 2007/05/02 01:33:49
Line 48 my %perm;	Line 48 my %perm;
my %parmhash;	my %parmhash;
my $resources_printed;	my $resources_printed;

	# Fetch the contents of a resource, uninterpreted.
	# This is used here to fetch a latex file to be included
	# verbatim into the printout<
	# NOTE: Ask Guy if there is a lonnet function similar to this?
	#
	# Parameters:
	# URL of the file
	#
	sub fetch_raw_resource {
	my ($url) = @_;

	my $filename = &Apache::lonnet::filelocation("", $url);
	my $contents = &Apache::lonnet::getfile($filename);

	if ($contents == -1) {
	return "File open failed for $filename"; # This will bomb the print.
	}
	return $contents;


	}

#	#
# printf_style_subst item format_string repl	# printf_style_subst item format_string repl
#	#
Line 1265 sub output_data {	Line 1287 sub output_data {
my ($r,$helper,$rparmhash) = @_;	my ($r,$helper,$rparmhash) = @_;
my %parmhash = %$rparmhash;	my %parmhash = %$rparmhash;
$resources_printed = '';	$resources_printed = '';
	my $do_postprocessing = 1;
my $js = <<ENDPART;	my $js = <<ENDPART;
<script type="text/javascript">	<script type="text/javascript">
var editbrowser;	var editbrowser;
Line 1455 ENDPART	Line 1478 ENDPART
$resources_printed .= $currentURL.':';	$resources_printed .= $currentURL.':';
my $texversion=&Apache::lonnet::ssi($currentURL,%form);	my $texversion=&Apache::lonnet::ssi($currentURL,%form);
$result .= $texversion;	$result .= $texversion;
	} elsif ($cleanURL =~/.tex$/) {
	# For this sort of print of a single LaTeX file,
	# We can just print the LaTeX file as it is uninterpreted in any way:
	#

	$result = &fetch_raw_resource($currentURL);
	$do_postprocessing = 0; # Don't massage the result.

} else {	} else {
$result.=&unsupported($currentURL,$helper->{'VARS'}->{'LATEX_TYPE'},	$result.=&unsupported($currentURL,$helper->{'VARS'}->{'LATEX_TYPE'},
$helper->{'VARS'}->{'symb'});	$helper->{'VARS'}->{'symb'});
Line 1859 ENDPART	Line 1890 ENDPART
$result .= '\end{document}';	$result .= '\end{document}';
}	}
#-------------------------------------------------------- corrections for the different page formats	#-------------------------------------------------------- corrections for the different page formats
$result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'},$helper->{'VARS'}->{'TABLE_CONTENTS'},$helper->{'VARS'}->{'TABLE_INDEX'},$selectionmade);
$result = &latex_corrections($number_of_columns,$result,$selectionmade,	# Only post process if that has not been turned off e.g. by a raw latex resource.
$helper->{'VARS'}->{'ANSWER_TYPE'});
#if ($numberofcolumns == 1) {	if ($do_postprocessing) {
	$result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'},$helper->{'VARS'}->{'TABLE_CONTENTS'},$helper->{'VARS'}->{'TABLE_INDEX'},$selectionmade);
	$result = &latex_corrections($number_of_columns,$result,$selectionmade,
	$helper->{'VARS'}->{'ANSWER_TYPE'});
	#if ($numberofcolumns == 1) {
$result =~ s/\\textwidth\s=\s-?\d\.?\d\s*(cm\|mm\|in)/\\textwidth= $helper->{'VARS'}->{'pagesize.width'} $helper->{'VARS'}->{'pagesize.widthunit'} /;	$result =~ s/\\textwidth\s=\s-?\d\.?\d\s*(cm\|mm\|in)/\\textwidth= $helper->{'VARS'}->{'pagesize.width'} $helper->{'VARS'}->{'pagesize.widthunit'} /;
$result =~ s/\\textheight\s=?\s-?\d\.?\d\s*(cm\|mm\|in)/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;	$result =~ s/\\textheight\s=?\s-?\d\.?\d\s*(cm\|mm\|in)/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;
$result =~ s/\\evensidemargin\s=\s-?\d\.?\d\s*(cm\|mm\|in)/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;	$result =~ s/\\evensidemargin\s=\s-?\d\.?\d\s*(cm\|mm\|in)/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
$result =~ s/\\oddsidemargin\s=\s-?\d\.?\d\s*(cm\|mm\|in)/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;	$result =~ s/\\oddsidemargin\s=\s-?\d\.?\d\s*(cm\|mm\|in)/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
#}	#}
	}

#-- writing .tex file in prtspool	#-- writing .tex file in prtspool
my $temp_file;	my $temp_file;
Line 2565 CHOOSE_STUDENTS	Line 2601 CHOOSE_STUDENTS
</validator>	</validator>
</string>	</string>
<message></td></tr><tr><td></message>	<message></td></tr><tr><td></message>
<message><b>Names to store the CODEs under for later:</b></message>	<message><b>Names to save the CODEs under for later:</b></message>
<message></td><td></message>	<message></td><td></message>
<string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />	<string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
<message></td></tr><tr><td></message>	<message></td></tr><tr><td></message>
Line 2676 CHOOSE_STUDENTS1	Line 2712 CHOOSE_STUDENTS1
</validator>	</validator>
</string>	</string>
<message></td></tr><tr><td></message>	<message></td></tr><tr><td></message>
<message><b>Names to store the CODEs under for later:</b></message>	<message><b>Names to save the CODEs under for later:</b></message>
<message></td><td></message>	<message></td><td></message>
<string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />	<string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
<message></td></tr><tr><td></message>	<message></td></tr><tr><td></message>

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.497
changed lines
	Added in v.1.501