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.260 and 1.265

version 1.260, 2003/10/29 18:30:07	version 1.265, 2003/11/11 19:32:22
Line 475 sub page_format_transformation {	Line 475 sub page_format_transformation {
my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment,$tableofcontents,$indexlist) = @_;	my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment,$tableofcontents,$indexlist) = @_;
my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin);	my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin);
$assignment=&Apache::lonxml::latex_special_symbols($assignment,'header');	$assignment=&Apache::lonxml::latex_special_symbols($assignment,'header');
if ($numberofcolumns != 1) {	($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin) = &page_format($papersize,$layout,$numberofcolumns,$topmargin);
($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin) = &page_format($papersize,$layout,$numberofcolumns,$topmargin);
} else {
($textwidth,$textheight,$oddoffset,$evenoffset) = ($ENV{'form.width'},$ENV{'form.height'},$ENV{'form.leftmargin'},$ENV{'form.leftmargin'});
}
my $name = &get_name();	my $name = &get_name();
my $courseidinfo = &get_course();	my $courseidinfo = &get_course();
if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }	if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
Line 658 sub output_data {	Line 654 sub output_data {
my $bodytag=&Apache::loncommon::bodytag('Preparing Printout');	my $bodytag=&Apache::loncommon::bodytag('Preparing Printout');
$r->print(<<ENDPART);	$r->print(<<ENDPART);
<html>	<html>
	<script type="text/javascript" language="Javascript" >
	var editbrowser;
	function openbrowser(formname,elementname,only,omit) {
	var url = '/res/?';
	if (editbrowser == null) {
	url += 'launch=1&';
	}
	url += 'catalogmode=interactive&';
	url += 'mode=parmset&';
	url += 'form=' + formname + '&';
	if (only != null) {
	url += 'only=' + only + '&';
	}
	if (omit != null) {
	url += 'omit=' + omit + '&';
	}
	url += 'element=' + elementname + '';
	var title = 'Browser';
	var options = 'scrollbars=1,resizable=1,menubar=0';
	options += ',width=700,height=600';
	editbrowser = open(url,title,options,'1');
	editbrowser.focus();
	}
	</script>
<head>	<head>
<title>LON-CAPA output for printing</title>	<title>LON-CAPA output for printing</title>
</head>	</head>
Line 705 ENDPART	Line 725 ENDPART
if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {	if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
my %moreenv;	my %moreenv;
$moreenv{'request.filename'}=$currentURL;	$moreenv{'request.filename'}=$currentURL;
	if ($helper->{'VARS'}->{'style_file'}=~/\w/) {
	$moreenv{'construct.style'}=$helper->{'VARS'}->{'style_file'};
	my $dom = $ENV{'user.domain'};
	my $user = $ENV{'user.name'};
	my $put_result = &Apache::lonnet::put('environment',{'construct.style'=>$helper->{'VARS'}->{'style_file'}},$dom,$user);
	}
my %form;	my %form;
$form{'grade_target'}='tex';	$form{'grade_target'}='tex';
$form{'textwidth'}=$LaTeXwidth;	$form{'textwidth'}=$LaTeXwidth;
Line 1078 ENDPART	Line 1104 ENDPART
$result = &latex_corrections($number_of_columns,$result);	$result = &latex_corrections($number_of_columns,$result);
#changes page's parameters for the one column output	#changes page's parameters for the one column output
if ($numberofcolumns == 1) {	if ($numberofcolumns == 1) {
$result =~ s/\\textwidth= 9cm/\\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 25\.9cm/\\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 = -0\.57in/\\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 = -0\.57in/\\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 1133 sub handler {	Line 1159 sub handler {
# foreach $key (keys %{$helper->{'VARS'}}) {	# foreach $key (keys %{$helper->{'VARS'}}) {
# $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<-<br />');	# $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<-<br />');
# }	# }
	# foreach $key (keys %ENV) {
	# $r->print(' '.$key.'->'.$ENV{$key}.'<-<br />');
	# }
# return OK;	# return OK;

my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'});	my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'});
Line 1198 sub printHelper {	Line 1227 sub printHelper {
$helper->declareVar('filename');	$helper->declareVar('filename');
$helper->declareVar('construction');	$helper->declareVar('construction');
$helper->declareVar('assignment');	$helper->declareVar('assignment');
	$helper->declareVar('style_file');

# This will persistently load in the data we want from the	# This will persistently load in the data we want from the
# very first screen.	# very first screen.
Line 1528 CHOOSE_FROM_ANY_SEQUENCE	Line 1558 CHOOSE_FROM_ANY_SEQUENCE
addMessage("</td></tr>");	addMessage("</td></tr>");
}	}

if ($helper->{VARS}->{'construction'}) {
addMessage("<tr><td align='right'>Print With URL: </td><td>");
$paramHash = Apache::lonhelper::getParamHash();
$paramHash->{'variable'} = 'CONSTR_RESOURSE_URL';
$helper->declareVar('CONSTR_RESOURSE_URL');
$paramHash->{CHOICES} = [
['No', 'no'],
['Yes', 'yes'] ];
Apache::lonhelper::dropdown->new();
addMessage("</td></tr>");
}
if ($helper->{'VARS'}->{'construction'}) {	if ($helper->{'VARS'}->{'construction'}) {
my $xmlfrag .= <<'RNDSEED';	my $stylevalue=$ENV{'construct.style'};
	my $xmlfrag .= <<"RNDSEED";
<message><tr><td align='right'>Use random seed: </td><td></message>	<message><tr><td align='right'>Use random seed: </td><td></message>
<string variable="curseed" size="15" maxlength="15">	<string variable="curseed" size="15" maxlength="15">
<defaultvalue>	<defaultvalue>
return $helper->{VARS}->{'curseed'};	return $helper->{VARS}->{'curseed'};
</defaultvalue>	</defaultvalue>
</string>	</string>
	<message></td></tr><tr><td align="right">Use style file:</td><td></message>
	<message><input type="text" size="40" name="style_file_value" value="$stylevalue" />  <a href="javascript:openbrowser('helpform','style_file','sty')">Select style file</a> </td><td></message>
<message></td></tr></message>	<message></td></tr></message>
RNDSEED	RNDSEED
&Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);	&Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
	$helper->{'VARS'}->{'style_file'}=$ENV{'form.style_file_value'};
}	}
}	}




if ($startedTable) {	if ($startedTable) {
addMessage("</table>");	addMessage("</table>");
}	}

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

Removed from v.1.260
changed lines
	Added in v.1.265