loncom/xml/lonplot.pm - diff

Return to lonplot.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/lonplot.pm between versions 1.40 and 1.127

version 1.40, 2002/01/15 16:21:39	version 1.127, 2007/08/04 00:01:52
Line 25	Line 25
#	#
# http://www.lon-capa.org/	# http://www.lon-capa.org/
#	#
# 12/15/01 Matthew
# 12/17 12/18 12/19 12/20 12/21 12/27 12/28 12/30 12/31 Matthew
# 01/01/02 Matthew
# 01/02 01/03 01/04 01/07 01/08 01/09 Matthew

# Current issues
# 1. Gnuplot is unable to vary the color or linestyle of <data> plots.
# The key does not know this so it is misleading for the user.
# Multiple <function>s can be plotted with varying line styles and
# colors.
#
package Apache::lonplot;	package Apache::lonplot;

use strict;	use strict;
	use warnings FATAL=>'all';
	no warnings 'uninitialized';
use Apache::File;	use Apache::File;
use Apache::response;	use Apache::response;
use Apache::lonxml;	use Apache::lonxml;
use Apache::edit;	use Apache::edit;
	use Apache::lonnet;
	use lib '/home/httpd/lib/perl/';
	use LONCAPA;


	use vars qw/$weboutputformat $versionstring/;



BEGIN {	BEGIN {
&Apache::lonxml::register('Apache::lonplot',('plot'));	&Apache::lonxml::register('Apache::lonplot',('gnuplot'));
	#
	# Determine the version of GNUPLOT
	$weboutputformat = 'gif';
	$versionstring = `gnuplot --version 2>/dev/null`;
	if ($versionstring =~ /^gnuplot 4/) {
	$weboutputformat = 'png';
	}

}	}


##	##
## Description of data structures:	## Description of data structures:
##	##
Line 96 my %linestyles =	Line 105 my %linestyles =
yerrorbars => [3,4],	yerrorbars => [3,4],
xyerrorbars => [4,6],	xyerrorbars => [4,6],
boxes => 3,	boxes => 3,
# boxerrorbars => [3,4,5],	filledcurves => 2,
# boxxyerrorbars => [4,6,7],
# financebars => 5,
# candlesticks => 5,
vector => 4	vector => 4
);	);

my $int_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^\d+$/};	my $int_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^\d+$/};
my $real_test =	my $real_test =
sub {$_[0]=~s/\s+//g;$_[0]=~/^[+-]?\d\.?\d([eE][+-]\d+)?$/};	sub {$_[0]=~s/\s+//g;$_[0]=~/^[+-]?\d\.?\d([eE][+-]\d+)?$/};
my $color_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^x[\da-f]{6}$/};	my $pos_real_test =
	sub {$_[0]=~s/\s+//g;$_[0]=~/^[+]?\d\.?\d([eE][+-]\d+)?$/};
	my $color_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^x[\da-fA-F]{6}$/};
my $onoff_test = sub {$_[0]=~/^(on\|off)$/};	my $onoff_test = sub {$_[0]=~/^(on\|off)$/};
my $key_pos_test = sub {$_[0]=~/^(top\|bottom\|right\|left\|outside\|below\| )+$/};	my $key_pos_test = sub {$_[0]=~/^(top\|bottom\|right\|left\|outside\|below\| )+$/};
my $sml_test = sub {$_[0]=~/^(small\|medium\|large)$/};	my $sml_test = sub {$_[0]=~/^(\d+\|small\|medium\|large)$/};
my $linestyle_test = sub {exists($linestyles{$_[0]})};	my $linestyle_test = sub {exists($linestyles{$_[0]})};
my $words_test = sub {$_[0]=~s/\s+/ /g;$_[0]=~/^([\w]+ ?)+$/};	my $words_test = sub {$_[0]=~s/\s+/ /g;$_[0]=~/^([\w~!\@\#\$\%^&\*-=_\+\[\]\{\}:\;\'<>,\.\/\?\\]+ ?)+$/};

###################################################################	###################################################################
## ##	## ##
## Attribute metadata ##	## Attribute metadata ##
## ##	## ##
###################################################################	###################################################################
my @plot_edit_order =	my @gnuplot_edit_order =
qw/bgcolor fgcolor height width font transparent grid border align/;	qw/alttag bgcolor fgcolor height width texwidth fontface font texfont
my %plot_defaults =	transparent grid samples
	border align plotcolor plottype gridtype lmargin rmargin
	tmargin bmargin major_ticscale minor_ticscale boxwidth gridlayer fillstyle
	pattern solid/;

	my $margin_choices = ['default',0..20];

	my %gnuplot_defaults =
(	(
	alttag => {
	default => 'dynamically generated plot',
	test => $words_test,
	description => 'Brief description of the plot',
	edit_type => 'entry',
	size => '40'
	},
height => {	height => {
default => 200,	default => 300,
test => $int_test,	test => $int_test,
description => 'height of image (pixels)',	description => 'Height of image (pixels)',
edit_type => 'entry',	edit_type => 'entry',
size => '10'	size => '10'
},	},
width => {	width => {
default => 200,	default => 400,
test => $int_test,	test => $int_test,
description => 'width of image (pixels)',	description => 'Width of image (pixels)',
edit_type => 'entry',	edit_type => 'entry',
size => '10'	size => '10'
},	},
bgcolor => {	bgcolor => {
default => 'xffffff',	default => 'xffffff',
test => $color_test,	test => $color_test,
description => 'background color of image (xffffff)',	description => 'Background color of image (xffffff)',
edit_type => 'entry',	edit_type => 'entry',
size => '10'	size => '10'
},	},
fgcolor => {	fgcolor => {
default => 'x000000',	default => 'x000000',
test => $color_test,	test => $color_test,
description => 'foreground color of image (x000000)',	description => 'Foreground color of image (x000000)',
edit_type => 'entry',	edit_type => 'entry',
size => '10'	size => '10'
},	},
Line 154 my %plot_defaults =	Line 176 my %plot_defaults =
default => 'off',	default => 'off',
test => $onoff_test,	test => $onoff_test,
description => 'Transparent image',	description => 'Transparent image',
edit_type => 'on_off'	edit_type => 'onoff'
},	},
grid => {	grid => {
default => 'off',	default => 'on',
test => $onoff_test,	test => $onoff_test,
description => 'Display grid',	description => 'Display grid',
edit_type => 'on_off'	edit_type => 'onoff'
	},
	gridlayer => {
	default => 'off',
	test => $onoff_test,
	description => 'Display grid front layer over filled boxes or filled curves',
	edit_type => 'onoff'
	},
	box_border => {
	default => 'noborder',
	test => sub {$_[0]=~/^(noborder\|border)$/},
	description => 'Draw border for boxes',
	edit_type => 'choice',
	choices => ['border','noborder']
},	},
border => {	border => {
default => 'on',	default => 'on',
test => $onoff_test,	test => $onoff_test,
description => 'Draw border around plot',	description => 'Draw border around plot',
edit_type => 'on_off'	edit_type => 'onoff'
},	},
font => {	font => {
default => 'medium',	default => '9',
test => $sml_test,	test => $sml_test,
description => 'Size of font to use',	description => 'Font size to use in web output (pts)',
	edit_type => 'choice',
	choices => [['5','5 (small)'],'6','7','8',['9','9 (medium)'],'10',['11','11 (large)'],'12','15']
	},
	fontface => {
	default => 'sans-serif',
	test => sub {$_[0]=~/^(sans-serif\|serif\|classic)$/},
	description => 'Type of font to use',
	edit_type => 'choice',
	choices => ['sans-serif','serif', 'classic']
	},
	samples => {
	default => '100',
	test => $int_test,
	description => 'Number of samples for non-data plots',
edit_type => 'choice',	edit_type => 'choice',
choices => ['small','medium','large']	choices => ['100','200','500','1000','2000','5000']
},	},
align => {	align => {
default => 'left',	default => 'middle',
test => sub {$_[0]=~/^(left\|right\|center)$/},	test => sub {$_[0]=~/^(left\|right\|middle\|center)$/},
description => 'alignment for image in html',	description => 'Alignment for image in HTML',
edit_type => 'choice',	edit_type => 'choice',
choices => ['left','right','center']	choices => ['left','right','middle']
}	},
	texwidth => {
	default => '93',
	test => $int_test,
	description => 'Width of plot when printed (mm)',
	edit_type => 'entry',
	size => '5'
	},
	texfont => {
	default => '22',
	test => $int_test,
	description => 'Font size to use in TeX output (pts):',
	edit_type => 'choice',
	choices => [qw/8 10 12 14 16 18 20 22 24 26 28 30 32 34 36/],
	},
	plotcolor => {
	default => 'monochrome',
	test => sub {$_[0]=~/^(monochrome\|color\|colour)$/},
	description => 'Color setting for printing:',
	edit_type => 'choice',
	choices => [qw/monochrome color colour/],
	},
	pattern => {
	default => '',
	test => $int_test,
	description => 'Pattern value for boxes:',
	edit_type => 'choice',
	choices => [0,1,2,3,4,5,6]
	},
	solid => {
	default => 0,
	test => $real_test,
	description => 'The density of fill style for boxes',
	edit_type => 'entry',
	size => '5'
	},
	fillstyle => {
	default => 'empty',
	test => sub {$_[0]=~/^(empty\|solid\|pattern)$/},
	description => 'Filled style for boxes:',
	edit_type => 'choice',
	choices => ['empty','solid','pattern']
	},
	plottype => {
	default => 'Cartesian',
	test => sub {$_[0]=~/^(Polar\|Cartesian)$/},
	description => 'Plot type:',
	edit_type => 'choice',
	choices => ['Cartesian','Polar']
	},
	gridtype => {
	default => 'Cartesian',
	test => sub {$_[0]=~/^(Polar\|Cartesian\|Linear-Log\|Log-Linear\|Log-Log)$/},
	description => 'Grid type:',
	edit_type => 'choice',
	choices => ['Cartesian','Polar','Linear-Log','Log-Linear','Log-Log']
	},
	lmargin => {
	default => 'default',
	test => sub {$_[0]=~/^(default\|\d+)$/},
	description => 'Left margin width (pts):',
	edit_type => 'choice',
	choices => $margin_choices,
	},
	rmargin => {
	default => 'default',
	test => sub {$_[0]=~/^(default\|\d+)$/},
	description => 'Right margin width (pts):',
	edit_type => 'choice',
	choices => $margin_choices,
	},
	tmargin => {
	default => 'default',
	test => sub {$_[0]=~/^(default\|\d+)$/},
	description => 'Top margin width (pts):',
	edit_type => 'choice',
	choices => $margin_choices,
	},
	bmargin => {
	default => 'default',
	test => sub {$_[0]=~/^(default\|\d+)$/},
	description => 'Bottom margin width (pts):',
	edit_type => 'choice',
	choices => $margin_choices,
	},
	boxwidth => {
	default => '',
	test => $real_test,
	description => 'Width of boxes, default is auto',
	edit_type => 'entry',
	size => '5'
	},
	major_ticscale => {
	default => '1',
	test => $real_test,
	description => 'Size of major tic marks (plot coordinates)',
	edit_type => 'entry',
	size => '5'
	},
	minor_ticscale => {
	default => '0.5',
	test => $real_test,
	description => 'Size of minor tic mark (plot coordinates)',
	edit_type => 'entry',
	size => '5'
	},
);	);

my %key_defaults =	my %key_defaults =
Line 197 my %key_defaults =	Line 351 my %key_defaults =
default => 'off',	default => 'off',
test => $onoff_test,	test => $onoff_test,
description => 'Draw a box around the key?',	description => 'Draw a box around the key?',
edit_type => 'on_off'	edit_type => 'onoff'
},	},
pos => {	pos => {
default => 'top right',	default => 'top right',
test => $key_pos_test,	test => $key_pos_test,
description => 'position of the key on the plot',	description => 'Position of the key on the plot',
edit_type => 'choice',	edit_type => 'choice',
choices => ['top left','top right','bottom left','bottom right',	choices => ['top left','top right','bottom left','bottom right',
'outside','below']	'outside','below']
Line 214 my %label_defaults =	Line 368 my %label_defaults =
xpos => {	xpos => {
default => 0,	default => 0,
test => $real_test,	test => $real_test,
description => 'x position of label (graph coordinates)',	description => 'X position of label (graph coordinates)',
edit_type => 'entry',	edit_type => 'entry',
size => '10'	size => '10'
},	},
ypos => {	ypos => {
default => 0,	default => 0,
test => $real_test,	test => $real_test,
description => 'y position of label (graph coordinates)',	description => 'Y position of label (graph coordinates)',
edit_type => 'entry',	edit_type => 'entry',
size => '10'	size => '10'
},	},
Line 234 my %label_defaults =	Line 388 my %label_defaults =
}	}
);	);

	my @tic_edit_order = ('location','mirror','start','increment','end',
	'minorfreq');
	my %tic_defaults =
	(
	location => {
	default => 'border',
	test => sub {$_[0]=~/^(border\|axis)$/},
	description => 'Location of major tic marks',
	edit_type => 'choice',
	choices => ['border','axis']
	},
	mirror => {
	default => 'on',
	test => $onoff_test,
	description => 'Mirror tics on opposite axis?',
	edit_type => 'onoff'
	},
	start => {
	default => '-10.0',
	test => $real_test,
	description => 'Start major tics at',
	edit_type => 'entry',
	size => '10'
	},
	increment => {
	default => '1.0',
	test => $real_test,
	description => 'Place a major tic every',
	edit_type => 'entry',
	size => '10'
	},
	end => {
	default => ' 10.0',
	test => $real_test,
	description => 'Stop major tics at ',
	edit_type => 'entry',
	size => '10'
	},
	minorfreq => {
	default => '0',
	test => $int_test,
	description => 'Number of minor tics per major tic mark',
	edit_type => 'entry',
	size => '10'
	},
	);

	my @axis_edit_order = ('color','xmin','xmax','ymin','ymax');
my %axis_defaults =	my %axis_defaults =
(	(
color => {	color => {
default => 'x000000',	default => 'x000000',
test => $color_test,	test => $color_test,
description => 'color of axes (x000000)',	description => 'Color of grid lines (x000000)',
edit_type => 'entry',	edit_type => 'entry',
size => '10'	size => '10'
},	},
xmin => {	xmin => {
default => '-10.0',	default => '-10.0',
test => $real_test,	test => $real_test,
description => 'minimum x-value shown in plot',	description => 'Minimum x-value shown in plot',
edit_type => 'entry',	edit_type => 'entry',
size => '10'	size => '10'
},	},
xmax => {	xmax => {
default => ' 10.0',	default => ' 10.0',
test => $real_test,	test => $real_test,
description => 'maximum x-value shown in plot',	description => 'Maximum x-value shown in plot',
edit_type => 'entry',	edit_type => 'entry',
size => '10'	size => '10'
},	},
ymin => {	ymin => {
default => '-10.0',	default => '-10.0',
test => $real_test,	test => $real_test,
description => 'minimum y-value shown in plot',	description => 'Minimum y-value shown in plot',
edit_type => 'entry',	edit_type => 'entry',
size => '10'	size => '10'
},	},
ymax => {	ymax => {
default => ' 10.0',	default => ' 10.0',
test => $real_test,	test => $real_test,
description => 'maximum y-value shown in plot',	description => 'Maximum y-value shown in plot',
edit_type => 'entry',	edit_type => 'entry',
size => '10'	size => '10'
}	}
);	);

	my @curve_edit_order = ('color','name','linestyle','linewidth','pointtype','pointsize','limit');

my %curve_defaults =	my %curve_defaults =
(	(
color => {	color => {
default => 'x000000',	default => 'x000000',
test => $color_test,	test => $color_test,
description => 'color of curve (x000000)',	description => 'Color of curve (x000000)',
edit_type => 'entry',	edit_type => 'entry',
size => '10'	size => '10'
},	},
name => {	name => {
default => '',	default => '',
test => $words_test,	test => $words_test,
description => 'name of curve to appear in key',	description => 'Name of curve to appear in key',
edit_type => 'entry',	edit_type => 'entry',
size => '20'	size => '20'
},	},
Line 295 my %curve_defaults =	Line 499 my %curve_defaults =
description => 'Line style',	description => 'Line style',
edit_type => 'choice',	edit_type => 'choice',
choices => [keys(%linestyles)]	choices => [keys(%linestyles)]
}	},
	linewidth => {
	default => 2,
	test => $int_test,
	description => 'Line width (may not apply to all line styles)',
	edit_type => 'choice',
	choices => [1,2,3,4,5,6,7,8,9,10]
	},
	pointsize => {
	default => 1,
	test => $pos_real_test,
	description => 'Point size (may not apply to all line styles)',
	edit_type => 'entry',
	size => '5'
	},
	pointtype => {
	default => 1,
	test => $int_test,
	description => 'Point type (may not apply to all line styles)',
	edit_type => 'choice',
	choices => [0,1,2,3,4,5,6]
	},
	limit => {
	default => 'closed',
	test => sub {$_[0]=~/^(closed\|x1\|x2\|y1\|y2)$/},
	description => 'Point to fill -- for filledcurves',
	edit_type => 'choice',
	choices => ['closed','x1','x2','y1','y2']
	},
);	);

###################################################################	###################################################################
Line 303 my %curve_defaults =	Line 535 my %curve_defaults =
## parsing and edit rendering ##	## parsing and edit rendering ##
## ##	## ##
###################################################################	###################################################################
my (%plot,%key,%axis,$title,$xlabel,$ylabel,@labels,@curves);

sub start_plot {	undef %Apache::lonplot::plot;
%plot = (); %key = (); %axis = ();	my (%key,%axis,$title,$xlabel,$ylabel,@labels,@curves,%xtics,%ytics);
$title = undef; $xlabel = undef; $ylabel = undef;
$#labels = -1; $#curves = -1;	sub start_gnuplot {
	undef(%Apache::lonplot::plot); undef(%key); undef(%axis);
	undef($title); undef($xlabel); undef($ylabel);
	undef(@labels); undef(@curves);
	undef(%xtics); undef(%ytics);
#	#
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
&Apache::lonxml::register('Apache::lonplot',	&Apache::lonxml::register('Apache::lonplot',
('title','xlabel','ylabel','key','axis','label','curve'));	('title','xlabel','ylabel','key','axis','label','curve',
	'xtics','ytics'));
push (@Apache::lonxml::namespace,'lonplot');	push (@Apache::lonxml::namespace,'lonplot');
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
my $inside = &Apache::lonxml::get_all_text("/plot",$$parser[-1]);	&get_attributes(\%Apache::lonplot::plot,\%gnuplot_defaults,$parstack,$safeeval,
$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
&Apache::lonxml::newparser($parser,\$inside);
&get_attributes(\%plot,\%plot_defaults,$parstack,$safeeval,
$tagstack->[-1]);	$tagstack->[-1]);
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Plot');	$result .= &Apache::edit::tag_start($target,$token,'GnuPlot');
$result .= &edit_attributes($target,$token,\%plot_defaults,	$result .= &edit_attributes($target,$token,\%gnuplot_defaults,
\@plot_edit_order);	\@gnuplot_edit_order)
	.&Apache::edit::end_row()
	.&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {	} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args	my $constructtag=&Apache::edit::get_new_args
($token,$parstack,$safeeval,keys(%plot_defaults));	($token,$parstack,$safeeval,keys(%gnuplot_defaults));
if ($constructtag) {	if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);	$result = &Apache::edit::rebuild_tag($token);
}	}
Line 335 sub start_plot {	Line 570 sub start_plot {
return $result;	return $result;
}	}

sub end_plot {	sub end_gnuplot {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;

pop @Apache::lonxml::namespace;	pop @Apache::lonxml::namespace;
&Apache::lonxml::deregister('Apache::lonplot',	&Apache::lonxml::deregister('Apache::lonplot',
('title','xlabel','ylabel','key','axis','label','curve'));	('title','xlabel','ylabel','key','axis','label','curve'));
my $result = '';	my $result = '';
if ($target eq 'web') {	my $randnumber;
	# need to call rand everytime start_script would evaluate, as the
	# safe space rand number generator and the global rand generator
	# are not separate
	if ($target eq 'web' \|\| $target eq 'tex' \|\| $target eq 'grade' \|\|
	$target eq 'answer') {
	$randnumber=int(rand(1000));
	}
	if ($target eq 'web' \|\| $target eq 'tex') {
&check_inputs(); # Make sure we have all the data we need	&check_inputs(); # Make sure we have all the data we need
##	##
## Determine filename	## Determine filename
my $tmpdir = '/home/httpd/perl/tmp/';	my $tmpdir = '/home/httpd/perl/tmp/';
my $filename = $ENV{'user.name'}.'_'.$ENV{'user.domain'}.	my $filename = $env{'user.name'}.'_'.$env{'user.domain'}.
'_'.time.'_'.$$.int(rand(1000)).'_plot.data';	'_'.time.'_'.$$.$randnumber.'_plot';
## Write the plot description to the file	## Write the plot description to the file
&write_gnuplot_file($tmpdir,$filename);	&write_gnuplot_file($tmpdir,$filename,$target);
	$filename = &escape($filename);
## return image tag for the plot	## return image tag for the plot
$result .= <<"ENDIMAGE";	if ($target eq 'web') {
<img src = "/cgi-bin/plot.gif?$filename"	$result .= <<"ENDIMAGE";
width = "$plot{'width'}"	<img src = "/cgi-bin/plot.$weboutputformat?file=$filename.data"
height = "$plot{'height'}"	width = "$Apache::lonplot::plot{'width'}"
align = "$plot{'align'}"	height = "$Apache::lonplot::plot{'height'}"
alt = "/cgi-bin/plot.gif?$filename" />	align = "$Apache::lonplot::plot{'align'}"
	alt = "$Apache::lonplot::plot{'alttag'}" />
ENDIMAGE	ENDIMAGE
	} elsif ($target eq 'tex') {
	&Apache::lonxml::debug(" gnuplot wid = $Apache::lonplot::plot{'width'}");
	&Apache::lonxml::debug(" gnuplot ht = $Apache::lonplot::plot{'height'}");
	#might be inside the safe space, register the URL for later
	&Apache::lonxml::register_ssi("/cgi-bin/plot.gif?file=$filename.data&output=eps");
	$result = "%DYNAMICIMAGE:$Apache::lonplot::plot{'width'}:$Apache::lonplot::plot{'height'}:$Apache::lonplot::plot{'texwidth'}\n";
	$result .= '\graphicspath{{/home/httpd/perl/tmp/}}'."\n";
	$result .= '\includegraphics[width='.$Apache::lonplot::plot{'texwidth'}.' mm]{'.&unescape($filename).'.eps}';
	}
	} elsif ($target eq 'edit') {
	$result.=&Apache::edit::tag_end($target,$token);
	}
	return $result;
	}


	##--------------------------------------------------------------- xtics
	sub start_xtics {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
	my $result='';
	if ($target eq 'web' \|\| $target eq 'tex') {
	&get_attributes(\%xtics,\%tic_defaults,$parstack,$safeeval,
	$tagstack->[-1]);
	} elsif ($target eq 'edit') {
	$result .= &Apache::edit::tag_start($target,$token,'xtics');
	$result .= &edit_attributes($target,$token,\%tic_defaults,
	\@tic_edit_order);
	} elsif ($target eq 'modified') {
	my $constructtag=&Apache::edit::get_new_args
	($token,$parstack,$safeeval,keys(%tic_defaults));
	if ($constructtag) {
	$result = &Apache::edit::rebuild_tag($token);
	}
	}
	return $result;
	}

	sub end_xtics {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
	my $result = '';
	if ($target eq 'web' \|\| $target eq 'tex') {
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);	$result.=&Apache::edit::tag_end($target,$token);
}	}
return $result;	return $result;
}	}

	##--------------------------------------------------------------- ytics
	sub start_ytics {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
	my $result='';
	if ($target eq 'web' \|\| $target eq 'tex') {
	&get_attributes(\%ytics,\%tic_defaults,$parstack,$safeeval,
	$tagstack->[-1]);
	} elsif ($target eq 'edit') {
	$result .= &Apache::edit::tag_start($target,$token,'ytics');
	$result .= &edit_attributes($target,$token,\%tic_defaults,
	\@tic_edit_order);
	} elsif ($target eq 'modified') {
	my $constructtag=&Apache::edit::get_new_args
	($token,$parstack,$safeeval,keys(%tic_defaults));
	if ($constructtag) {
	$result = &Apache::edit::rebuild_tag($token);
	}
	}
	return $result;
	}

	sub end_ytics {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
	my $result = '';
	if ($target eq 'web' \|\| $target eq 'tex') {
	} elsif ($target eq 'edit') {
	$result.=&Apache::edit::tag_end($target,$token);
	}
	return $result;
	}

	##-----------------------------------------------------------------font
	my %font_properties =
	(
	'classic' => {
	face => 'classic',
	file => 'DejaVuSansMono-Bold',
	printname => 'Helvetica',
	tex_no_file => 1,
	},
	'sans-serif' => {
	face => 'sans-serif',
	file => 'DejaVuSans',
	printname => 'DejaVuSans',
	},
	'serif' => {
	face => 'serif',
	file => 'DejaVuSerif',
	printname => 'DejaVuSerif',
	},
	);

	sub get_font {
	my ($target) = @_;
	my ($size, $selected_font);

	if ( $Apache::lonplot::plot{'font'} =~ /^(small\|medium\|large)/) {
	$selected_font = $font_properties{'classic'};
	if ( $Apache::lonplot::plot{'font'} eq 'small') {
	$size = '5';
	} elsif ( $Apache::lonplot::plot{'font'} eq 'medium') {
	$size = '9';
	} elsif ( $Apache::lonplot::plot{'font'} eq 'large') {
	$size = '11';
	} else {
	$size = '9';
	}
	} else {
	$size = $Apache::lonplot::plot{'font'};
	$selected_font = $font_properties{$Apache::lonplot::plot{'fontface'}};
	}
	if ($target eq 'tex' && defined($Apache::lonplot::plot{'texfont'})) {
	$size = $Apache::lonplot::plot{'texfont'};
	}
	return ($size, $selected_font);
	}

##----------------------------------------------------------------- key	##----------------------------------------------------------------- key
sub start_key {	sub start_key {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
&get_attributes(\%key,\%key_defaults,$parstack,$safeeval,	&get_attributes(\%key,\%key_defaults,$parstack,$safeeval,
$tagstack->[-1]);	$tagstack->[-1]);
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
Line 380 sub start_key {	Line 742 sub start_key {
($token,$parstack,$safeeval,keys(%key_defaults));	($token,$parstack,$safeeval,keys(%key_defaults));
if ($constructtag) {	if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);	$result = &Apache::edit::rebuild_tag($token);
$result.= &Apache::edit::handle_insert();
}	}
}	}
return $result;	return $result;
Line 389 sub start_key {	Line 750 sub start_key {
sub end_key {	sub end_key {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';	my $result = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);	$result.=&Apache::edit::tag_end($target,$token);
}	}
return $result;	return $result;
}	}

	sub gnuplot_protect {
	my ($string) = @_;
	$string =~ s{([_^&~\{\}]\|\\\\)}{\\\\$1}g;
	return $string;
	}

##------------------------------------------------------------------- title	##------------------------------------------------------------------- title
sub start_title {	sub start_title {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
$title = &Apache::lonxml::get_all_text("/title",$$parser[-1]);	$title = &Apache::lonxml::get_all_text("/title",$parser,$style);
	$title=&Apache::run::evaluate($title,$safeeval,$$parstack[-1]);
	$title =~ s/\n/ /g;
if (length($title) > $max_str_len) {	if (length($title) > $max_str_len) {
$title = substr($title,0,$max_str_len);	$title = substr($title,0,$max_str_len);
}	}
	$title = &gnuplot_protect($title);
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token,'Plot Title');	$result.=&Apache::edit::tag_start($target,$token,'Plot Title');
my $text=&Apache::lonxml::get_all_text("/title",$$parser[-1]);	my $text=&Apache::lonxml::get_all_text("/title",$parser,$style);
$result.=&Apache::edit::end_row().	$result.=&Apache::edit::editline('',$text,'',60);
&Apache::edit::start_spanning_row().
&Apache::edit::editfield('',$text,'',60,1);
} elsif ($target eq 'modified') {	} elsif ($target eq 'modified') {
my $text=$$parser[-1]->get_text("/title");	$result.=&Apache::edit::rebuild_tag($token);
$result.=&Apache::edit::modifiedfield($token);	$result.=&Apache::edit::modifiedfield("/title",$parser);
}	}
return $result;	return $result;
}	}
Line 421 sub start_title {	Line 789 sub start_title {
sub end_title {	sub end_title {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';	my $result = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);	$result.=&Apache::edit::tag_end($target,$token);
}	}
Line 431 sub end_title {	Line 799 sub end_title {
sub start_xlabel {	sub start_xlabel {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
$xlabel = &Apache::lonxml::get_all_text("/xlabel",$$parser[-1]);	$xlabel = &Apache::lonxml::get_all_text("/xlabel",$parser,$style);
	$xlabel=&Apache::run::evaluate($xlabel,$safeeval,$$parstack[-1]);
	$xlabel =~ s/\n/ /g;
if (length($xlabel) > $max_str_len) {	if (length($xlabel) > $max_str_len) {
$xlabel = substr($xlabel,0,$max_str_len);	$xlabel = substr($xlabel,0,$max_str_len);
}	}
	$xlabel = &gnuplot_protect($xlabel);
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token,'Plot Xlabel');	$result.=&Apache::edit::tag_start($target,$token,'Plot Xlabel');
my $text=&Apache::lonxml::get_all_text("/xlabel",$$parser[-1]);	my $text=&Apache::lonxml::get_all_text("/xlabel",$parser,$style);
$result.=&Apache::edit::end_row().	$result.=&Apache::edit::editline('',$text,'',60);
&Apache::edit::start_spanning_row().
&Apache::edit::editfield('',$text,'',60,1);
} elsif ($target eq 'modified') {	} elsif ($target eq 'modified') {
my $text=$$parser[-1]->get_text("/xlabel");	$result.=&Apache::edit::rebuild_tag($token);
$result.=&Apache::edit::modifiedfield($token);	$result.=&Apache::edit::modifiedfield("/xlabel",$parser);
}	}
return $result;	return $result;
}	}
Line 452 sub start_xlabel {	Line 821 sub start_xlabel {
sub end_xlabel {	sub end_xlabel {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';	my $result = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);	$result.=&Apache::edit::tag_end($target,$token);
}	}
Line 463 sub end_xlabel {	Line 832 sub end_xlabel {
sub start_ylabel {	sub start_ylabel {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
$ylabel = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]);	$ylabel = &Apache::lonxml::get_all_text("/ylabel",$parser,$style);
	$ylabel = &Apache::run::evaluate($ylabel,$safeeval,$$parstack[-1]);
	$ylabel =~ s/\n/ /g;
if (length($ylabel) > $max_str_len) {	if (length($ylabel) > $max_str_len) {
$ylabel = substr($ylabel,0,$max_str_len);	$ylabel = substr($ylabel,0,$max_str_len);
}	}
	$ylabel = &gnuplot_protect($ylabel);
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Plot Ylabel');	$result .= &Apache::edit::tag_start($target,$token,'Plot Ylabel');
my $text = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]);	my $text = &Apache::lonxml::get_all_text("/ylabel",$parser,$style);
$result .= &Apache::edit::end_row().	$result .= &Apache::edit::editline('',$text,'',60);
&Apache::edit::start_spanning_row().
&Apache::edit::editfield('',$text,'',60,1);
} elsif ($target eq 'modified') {	} elsif ($target eq 'modified') {
my $text=$$parser[-1]->get_text("/ylabel");	$result.=&Apache::edit::rebuild_tag($token);
$result.=&Apache::edit::modifiedfield($token);	$result.=&Apache::edit::modifiedfield("/ylabel",$parser);
}	}
return $result;	return $result;
}	}
Line 484 sub start_ylabel {	Line 854 sub start_ylabel {
sub end_ylabel {	sub end_ylabel {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';	my $result = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);	$result.=&Apache::edit::tag_end($target,$token);
}	}
Line 495 sub end_ylabel {	Line 865 sub end_ylabel {
sub start_label {	sub start_label {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
my %label;	my %label;
&get_attributes(\%label,\%label_defaults,$parstack,$safeeval,	&get_attributes(\%label,\%label_defaults,$parstack,$safeeval,
$tagstack->[-1]);	$tagstack->[-1]);
my $text = &Apache::lonxml::get_all_text("/label",$$parser[-1]);	my $text = &Apache::lonxml::get_all_text("/label",$parser,$style);
	$text = &Apache::run::evaluate($text,$safeeval,$$parstack[-1]);
	$text =~ s/\n/ /g;
$text = substr($text,0,$max_str_len) if (length($text) > $max_str_len);	$text = substr($text,0,$max_str_len) if (length($text) > $max_str_len);
$label{'text'} = $text;	$label{'text'} = &gnuplot_protect($text);
push(@labels,\%label);	push(@labels,\%label);
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Plot Label');	$result .= &Apache::edit::tag_start($target,$token,'Plot Label');
$result .= &edit_attributes($target,$token,\%label_defaults);	$result .= &edit_attributes($target,$token,\%label_defaults);
my $text = &Apache::lonxml::get_all_text("/label",$$parser[-1]);	my $text = &Apache::lonxml::get_all_text("/label",$parser,$style);
$result .= &Apache::edit::end_row().	$result .= &Apache::edit::end_row().
&Apache::edit::start_spanning_row().	&Apache::edit::start_spanning_row().
&Apache::edit::editfield('',$text,'',60,1);	&Apache::edit::editline('',$text,'',60);
} elsif ($target eq 'modified') {	} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args	&Apache::edit::get_new_args
($token,$parstack,$safeeval,keys(%label_defaults));	($token,$parstack,$safeeval,keys(%label_defaults));
if ($constructtag) {	$result.=&Apache::edit::rebuild_tag($token);
$result = &Apache::edit::rebuild_tag($token);	$result.=&Apache::edit::modifiedfield("/label",$parser);
$result.= &Apache::edit::handle_insert();
}
my $text=$$parser[-1]->get_text("/label");
$result.=&Apache::edit::modifiedfield($token);
}	}
return $result;	return $result;
}	}
Line 526 sub start_label {	Line 894 sub start_label {
sub end_label {	sub end_label {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';	my $result = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);	$result.=&Apache::edit::tag_end($target,$token);
}	}
Line 539 sub start_curve {	Line 907 sub start_curve {
my $result='';	my $result='';
&Apache::lonxml::register('Apache::lonplot',('function','data'));	&Apache::lonxml::register('Apache::lonplot',('function','data'));
push (@Apache::lonxml::namespace,'curve');	push (@Apache::lonxml::namespace,'curve');
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
my %curve;	my %curve;
&get_attributes(\%curve,\%curve_defaults,$parstack,$safeeval,	&get_attributes(\%curve,\%curve_defaults,$parstack,$safeeval,
$tagstack->[-1]);	$tagstack->[-1]);
push (@curves,\%curve);	push (@curves,\%curve);
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Curve');	$result .= &Apache::edit::tag_start($target,$token,'Curve');
$result .= &edit_attributes($target,$token,\%curve_defaults);	$result .= &edit_attributes($target,$token,\%curve_defaults,
	\@curve_edit_order)
	.&Apache::edit::end_row()
	.&Apache::edit::start_spanning_row();

} elsif ($target eq 'modified') {	} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args	my $constructtag=&Apache::edit::get_new_args
($token,$parstack,$safeeval,keys(%curve_defaults));	($token,$parstack,$safeeval,keys(%curve_defaults));
if ($constructtag) {	if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);	$result = &Apache::edit::rebuild_tag($token);
$result.= &Apache::edit::handle_insert();
}	}
}	}
return $result;	return $result;
Line 563 sub end_curve {	Line 934 sub end_curve {
my $result = '';	my $result = '';
pop @Apache::lonxml::namespace;	pop @Apache::lonxml::namespace;
&Apache::lonxml::deregister('Apache::lonplot',('function','data'));	&Apache::lonxml::deregister('Apache::lonplot',('function','data'));
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);	$result.=&Apache::edit::tag_end($target,$token);
}	}
Line 574 sub end_curve {	Line 945 sub end_curve {
sub start_function {	sub start_function {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
if (exists($curves[-1]->{'data'})) {	if (exists($curves[-1]->{'data'})) {
&Apache::lonxml::warning('Use of <function> precludes use of <data>. The <data> will be omitted in favor of the <function> declaration.');	&Apache::lonxml::warning
	('Use of the <b>curve function</b> tag precludes use of '.
	' the <b>curve data</b> tag. '.
	'The curve data tag will be omitted in favor of the '.
	'curve function declaration.');
delete $curves[-1]->{'data'} ;	delete $curves[-1]->{'data'} ;
}	}
$curves[-1]->{'function'} =	my $function = &Apache::lonxml::get_all_text("/function",$parser,
&Apache::lonxml::get_all_text("/function",$$parser[-1]);	$style);
	$function = &Apache::run::evaluate($function,$safeeval,$$parstack[-1]);
	$curves[-1]->{'function'} = $function;
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Gnuplot compatible curve function');	$result .= &Apache::edit::tag_start($target,$token,'Gnuplot compatible curve function');
my $text = &Apache::lonxml::get_all_text("/function",$$parser[-1]);	my $text = &Apache::lonxml::get_all_text("/function",$parser,$style);
$result .= &Apache::edit::end_row().	$result .= &Apache::edit::editline('',$text,'',60);
&Apache::edit::start_spanning_row().
&Apache::edit::editfield('',$text,'',60,1);
} elsif ($target eq 'modified') {	} elsif ($target eq 'modified') {
# Why do I do this?	$result.=&Apache::edit::rebuild_tag($token);
my $text=$$parser[-1]->get_text("/function");	$result.=&Apache::edit::modifiedfield("/function",$parser);
$result.=&Apache::edit::modifiedfield($token);
}	}
return $result;	return $result;
}	}
Line 598 sub start_function {	Line 972 sub start_function {
sub end_function {	sub end_function {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';	my $result = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result .= &Apache::edit::end_table();	$result .= &Apache::edit::end_table();
}	}
Line 609 sub end_function {	Line 983 sub end_function {
sub start_data {	sub start_data {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
if (exists($curves[-1]->{'function'})) {	if (exists($curves[-1]->{'function'})) {
&Apache::lonxml::warning('Use of <data> precludes use of .'.	&Apache::lonxml::warning
'<function>. The <function> will be omitted in favor of '.	('Use of the <b>curve function</b> tag precludes use of '.
'the <data> declaration.');	' the <b>curve data</b> tag. '.
	'The curve function tag will be omitted in favor of the '.
	'curve data declaration.');
delete($curves[-1]->{'function'});	delete($curves[-1]->{'function'});
}	}
my $datatext = &Apache::lonxml::get_all_text("/data",$$parser[-1]);	my $datatext = &Apache::lonxml::get_all_text("/data",$parser,$style);
	$datatext=&Apache::run::evaluate($datatext,$safeeval,$$parstack[-1]);
# Deal with cases where we're given an array...	# Deal with cases where we're given an array...
if ($datatext =~ /^\@/) {	if ($datatext =~ /^\@/) {
$datatext = &Apache::run::run('return "'.$datatext.'"',	$datatext = &Apache::run::run('return "'.$datatext.'"',
$safeeval,1);	$safeeval,1);
}	}
$datatext =~ s/\s+/ /g;	$datatext =~ s/\s+/ /g;
# Need to do some error checking on the @data array -	# Need to do some error checking on the @data array -
# make sure it's all numbers and make sure each array	# make sure it's all numbers and make sure each array
# is of the same length.	# is of the same length.
my @data;	my @data;
if ($datatext =~ /,/) { # comma deliminated	if ($datatext =~ /,/) { # comma deliminated
@data = split /,/,$datatext;	@data = split /,/,$datatext;
} else { # Assume it's space seperated.	} else { # Assume it's space separated.
@data = split / /,$datatext;	@data = split / /,$datatext;
}	}
for (my $i=0;$i<=$#data;$i++) {	for (my $i=0;$i<=$#data;$i++) {
# Check that it's non-empty	# Check that it's non-empty
if (! defined($data[$i])) {	if (! defined($data[$i])) {
&Apache::lonxml::warning(	&Apache::lonxml::warning(
'undefined <data> value. Replacing with '.	'undefined curve data value. Replacing with '.
' pi/e = 1.15572734979092');	' pi/e = 1.15572734979092');
$data[$i] = 1.15572734979092;	$data[$i] = 1.15572734979092;
}	}
# Check that it's a number	# Check that it's a number
if (! &$real_test($data[$i]) & ! &$int_test($data[$i])) {	if (! &$real_test($data[$i]) & ! &$int_test($data[$i])) {
&Apache::lonxml::warning(	&Apache::lonxml::warning(
'Bad <data> value of '.$data[$i].' Replacing with '.	'Bad curve data value of '.$data[$i].' Replacing with '.
' pi/e = 1.15572734979092');	' pi/e = 1.15572734979092');
$data[$i] = 1.15572734979092;	$data[$i] = 1.15572734979092;
}	}
Line 658 sub start_data {	Line 1035 sub start_data {
push @{$curves[-1]->{'data'}},\@data;	push @{$curves[-1]->{'data'}},\@data;
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Comma or space deliminated curve data');	$result .= &Apache::edit::tag_start($target,$token,'Comma or space deliminated curve data');
my $text = &Apache::lonxml::get_all_text("/data",$$parser[-1]);	my $text = &Apache::lonxml::get_all_text("/data",$parser,$style);
$result .= &Apache::edit::end_row().	$result .= &Apache::edit::editline('',$text,'',60);
&Apache::edit::start_spanning_row().
&Apache::edit::editfield('',$text,'',60,1);
} elsif ($target eq 'modified') {	} elsif ($target eq 'modified') {
my $text=$$parser[-1]->get_text("/data");	$result.=&Apache::edit::rebuild_tag($token);
$result.=&Apache::edit::modifiedfield($token);	$result.=&Apache::edit::modifiedfield("/data",$parser);
}	}
return $result;	return $result;
}	}
Line 672 sub start_data {	Line 1047 sub start_data {
sub end_data {	sub end_data {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';	my $result = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result .= &Apache::edit::end_table();	$result .= &Apache::edit::end_table();
}	}
Line 683 sub end_data {	Line 1058 sub end_data {
sub start_axis {	sub start_axis {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
&get_attributes(\%axis,\%axis_defaults,$parstack,$safeeval,	&get_attributes(\%axis,\%axis_defaults,$parstack,$safeeval,
$tagstack->[-1]);	$tagstack->[-1]);
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Plot Axes');	$result .= &Apache::edit::tag_start($target,$token,'Plot Axes');
$result .= &edit_attributes($target,$token,\%axis_defaults);	$result .= &edit_attributes($target,$token,\%axis_defaults,
	\@axis_edit_order);
} elsif ($target eq 'modified') {	} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args	my $constructtag=&Apache::edit::get_new_args
($token,$parstack,$safeeval,keys(%axis_defaults));	($token,$parstack,$safeeval,keys(%axis_defaults));
if ($constructtag) {	if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);	$result = &Apache::edit::rebuild_tag($token);
$result.= &Apache::edit::handle_insert();
}	}
}	}
return $result;	return $result;
Line 703 sub start_axis {	Line 1078 sub start_axis {
sub end_axis {	sub end_axis {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';	my $result = '';
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'tex') {
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);	$result.=&Apache::edit::tag_end($target,$token);
} elsif ($target eq 'modified') {	} elsif ($target eq 'modified') {
Line 730 sub set_defaults {	Line 1105 sub set_defaults {
sub get_attributes{	sub get_attributes{
my ($values,$defaults,$parstack,$safeeval,$tag) = @_;	my ($values,$defaults,$parstack,$safeeval,$tag) = @_;
foreach my $attr (keys(%{$defaults})) {	foreach my $attr (keys(%{$defaults})) {
$values->{$attr} =	if ($attr eq 'texwidth' \|\| $attr eq 'texfont') {
&Apache::lonxml::get_param($attr,$parstack,$safeeval);	$values->{$attr} =
	&Apache::lonxml::get_param($attr,$parstack,$safeeval,undef,1);
	} else {
	$values->{$attr} =
	&Apache::lonxml::get_param($attr,$parstack,$safeeval);
	}
if ($values->{$attr} eq '' \| !defined($values->{$attr})) {	if ($values->{$attr} eq '' \| !defined($values->{$attr})) {
$values->{$attr} = $defaults->{$attr}->{'default'};	$values->{$attr} = $defaults->{$attr}->{'default'};
next;	next;
Line 749 sub get_attributes{	Line 1129 sub get_attributes{

##------------------------------------------------------- write_gnuplot_file	##------------------------------------------------------- write_gnuplot_file
sub write_gnuplot_file {	sub write_gnuplot_file {
my ($tmpdir,$filename)= @_;	my ($tmpdir,$filename,$target)= @_;
	my ($fontsize, $font_properties) = &get_font($target);
my $gnuplot_input = '';	my $gnuplot_input = '';
my $curve;	my $curve;
	#
	# Check to be sure we do not have any empty curves
	my @curvescopy;
	foreach my $curve (@curves) {
	if (exists($curve->{'function'})) {
	if ($curve->{'function'} !~ /^\s*$/) {
	push(@curvescopy,$curve);
	}
	} elsif (exists($curve->{'data'})) {
	foreach my $data (@{$curve->{'data'}}) {
	if (scalar(@$data) > 0) {
	push(@curvescopy,$curve);
	last;
	}
	}
	}
	}
	@curves = @curvescopy;
# Collect all the colors	# Collect all the colors
my @Colors;	my @Colors;
push @Colors, $plot{'bgcolor'};	push @Colors, $Apache::lonplot::plot{'bgcolor'};
push @Colors, $plot{'fgcolor'};	push @Colors, $Apache::lonplot::plot{'fgcolor'};
push @Colors, (defined($axis{'color'})?$axis{'color'}:$plot{'fgcolor'});	push @Colors, (defined($axis{'color'})?$axis{'color'}:$Apache::lonplot::plot{'fgcolor'});
foreach $curve (@curves) {	foreach $curve (@curves) {
push @Colors, ($curve->{'color'} ne '' ?	push @Colors, ($curve->{'color'} ne '' ?
$curve->{'color'} :	$curve->{'color'} :
$plot{'fgcolor'} );	$Apache::lonplot::plot{'fgcolor'} );
}	}
# set term	# set term
$gnuplot_input .= 'set term gif ';	if ($target eq 'web') {
$gnuplot_input .= 'transparent ' if ($plot{'transparent'} eq 'on');	$gnuplot_input .= 'set terminal png enhanced nocrop ';
$gnuplot_input .= $plot{'font'} . ' ';	$gnuplot_input .= 'transparent ' if ($Apache::lonplot::plot{'transparent'} eq 'on');
$gnuplot_input .= 'size '.$plot{'width'}.','.$plot{'height'}.' ';	$gnuplot_input .= 'font "'.$Apache::lonnet::perlvar{'lonFontsDir'}.
$gnuplot_input .= "@Colors\n";	'/'.$font_properties->{'file'}.'.ttf" ';
	$gnuplot_input .= $fontsize;
	$gnuplot_input .= ' size '.$Apache::lonplot::plot{'width'}.','.$Apache::lonplot::plot{'height'}.' ';
	$gnuplot_input .= "@Colors\n";
	# set output
	$gnuplot_input .= "set output\n";
	} elsif ($target eq 'tex') {
	$gnuplot_input .= "set term postscript eps enhanced $Apache::lonplot::plot{'plotcolor'} solid ";
	if (!$font_properties->{'tex_no_file'}) {
	$gnuplot_input .=
	'fontfile "'.$Apache::lonnet::perlvar{'lonFontsDir'}.
	'/'.$font_properties->{'file'}.'.pfb" ';
	}
	$gnuplot_input .= ' "'.$font_properties->{'printname'}.'" ';
	$gnuplot_input .= $fontsize;
	$gnuplot_input .= "\nset output \"/home/httpd/perl/tmp/".
	&unescape($filename).".eps\"\n";
	}
	# cartesian or polar plot?
	if (lc($Apache::lonplot::plot{'plottype'}) eq 'polar') {
	$gnuplot_input .= 'set polar'.$/;
	} else {
	# Assume Cartesian
	}
	# cartesian or polar grid?
	if (lc($Apache::lonplot::plot{'gridtype'}) eq 'polar') {
	$gnuplot_input .= 'set grid polar'.$/;
	} elsif (lc($Apache::lonplot::plot{'gridtype'}) eq 'linear-log') {
	$gnuplot_input .= 'set logscale x'.$/;
	} elsif (lc($Apache::lonplot::plot{'gridtype'}) eq 'log-linear') {
	$gnuplot_input .= 'set logscale y'.$/;
	} elsif (lc($Apache::lonplot::plot{'gridtype'}) eq 'log-log') {
	$gnuplot_input .= 'set logscale x'.$/;
	$gnuplot_input .= 'set logscale y'.$/;
	} else {
	# Assume Cartesian
	}
	# solid or pattern for boxes?
	if (lc($Apache::lonplot::plot{'fillstyle'}) eq 'solid') {
	$gnuplot_input .= 'set style fill solid '.
	$Apache::lonplot::plot{'solid'}.$Apache::lonplot::plot{'box_border'}.$/;
	} elsif (lc($Apache::lonplot::plot{'fillstyle'}) eq 'pattern') {
	$gnuplot_input .= 'set style fill pattern '.$Apache::lonplot::plot{'pattern'}.$Apache::lonplot::plot{'box_border'}.$/;
	} elsif (lc($Apache::lonplot::plot{'fillstyle'}) eq 'empty') {
	}
	# margin
	if (lc($Apache::lonplot::plot{'lmargin'}) ne 'default') {
	$gnuplot_input .= 'set lmargin '.$Apache::lonplot::plot{'lmargin'}.$/;
	}
	if (lc($Apache::lonplot::plot{'rmargin'}) ne 'default') {
	$gnuplot_input .= 'set rmargin '.$Apache::lonplot::plot{'rmargin'}.$/;
	}
	if (lc($Apache::lonplot::plot{'tmargin'}) ne 'default') {
	$gnuplot_input .= 'set tmargin '.$Apache::lonplot::plot{'tmargin'}.$/;
	}
	if (lc($Apache::lonplot::plot{'bmargin'}) ne 'default') {
	$gnuplot_input .= 'set bmargin '.$Apache::lonplot::plot{'bmargin'}.$/;
	}
	# tic scales
	$gnuplot_input .= 'set ticscale '.
	$Apache::lonplot::plot{'major_ticscale'}.' '.$Apache::lonplot::plot{'minor_ticscale'}.$/;
	#boxwidth
	if (lc($Apache::lonplot::plot{'boxwidth'}) ne '') {
	$gnuplot_input .= 'set boxwidth '.$Apache::lonplot::plot{'boxwidth'}.$/;
	}
	# gridlayer
	$gnuplot_input .= 'set grid noxtics noytics front '.$/
	if ($Apache::lonplot::plot{'gridlayer'} eq 'on');

# grid	# grid
$gnuplot_input .= 'set grid'.$/ if ($plot{'grid'} eq 'on');	$gnuplot_input .= 'set grid'.$/ if ($Apache::lonplot::plot{'grid'} eq 'on');
# border	# border
$gnuplot_input .= ($plot{'border'} eq 'on'?	$gnuplot_input .= ($Apache::lonplot::plot{'border'} eq 'on'?
'set border'.$/ :	'set border'.$/ :
'set noborder'.$/ ); # title, xlabel, ylabel	'set noborder'.$/ );
$gnuplot_input .= "set output\n";	# sampling rate for non-data curves
$gnuplot_input .= "set title \"$title\"\n" if (defined($title)) ;	$gnuplot_input .= "set samples $Apache::lonplot::plot{'samples'}\n";
$gnuplot_input .= "set xlabel \"$xlabel\"\n" if (defined($xlabel));	# title, xlabel, ylabel
$gnuplot_input .= "set ylabel \"$ylabel\"\n" if (defined($ylabel));	# titles
	my $extra_space_x = ($xtics{'location'} eq 'axis') ? ' 0, -0.5 ' : '';
	my $extra_space_y = ($ytics{'location'} eq 'axis') ? ' -0.5, 0 ' : '';

	if ($target eq 'tex') {
	$gnuplot_input .= "set title \"$title\" font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($title)) ;
	$gnuplot_input .= "set xlabel \"$xlabel\" $extra_space_x font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($xlabel));
	$gnuplot_input .= "set ylabel \"$ylabel\" $extra_space_y font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($ylabel));
	} else {
	$gnuplot_input .= "set title \"$title\" \n" if (defined($title)) ;
	$gnuplot_input .= "set xlabel \"$xlabel\" $extra_space_x \n" if (defined($xlabel));
	$gnuplot_input .= "set ylabel \"$ylabel\" $extra_space_y \n" if (defined($ylabel));
	}
	# tics
	if (%xtics) {
	$gnuplot_input .= "set xtics $xtics{'location'} ";
	$gnuplot_input .= ( $xtics{'mirror'} eq 'on'?"mirror ":"nomirror ");
	$gnuplot_input .= "$xtics{'start'}, ";
	$gnuplot_input .= "$xtics{'increment'}, ";
	$gnuplot_input .= "$xtics{'end'}\n";
	if ($xtics{'minorfreq'} != 0) {
	$gnuplot_input .= "set mxtics ".$xtics{'minorfreq'}."\n";
	}
	}
	if (%ytics) {
	$gnuplot_input .= "set ytics $ytics{'location'} ";
	$gnuplot_input .= ( $ytics{'mirror'} eq 'on'?"mirror ":"nomirror ");
	$gnuplot_input .= "$ytics{'start'}, ";
	$gnuplot_input .= "$ytics{'increment'}, ";
	$gnuplot_input .= "$ytics{'end'}\n";
	if ($ytics{'minorfreq'} != 0) {
	$gnuplot_input .= "set mytics ".$ytics{'minorfreq'}."\n";
	}
	}
	# axis
if (%axis) {	if (%axis) {
$gnuplot_input .= "set xrange \[$axis{'xmin'}:$axis{'xmax'}\]\n";	$gnuplot_input .= "set xrange \[$axis{'xmin'}:$axis{'xmax'}\]\n";
$gnuplot_input .= "set yrange \[$axis{'ymin'}:$axis{'ymax'}\]\n";	$gnuplot_input .= "set yrange \[$axis{'ymin'}:$axis{'ymax'}\]\n";
Line 796 sub write_gnuplot_file {	Line 1297 sub write_gnuplot_file {
my $label;	my $label;
foreach $label (@labels) {	foreach $label (@labels) {
$gnuplot_input .= 'set label "'.$label->{'text'}.'" at '.	$gnuplot_input .= 'set label "'.$label->{'text'}.'" at '.
$label->{'xpos'}.','.$label->{'ypos'}.' '.$label->{'justify'}.$/ ;	$label->{'xpos'}.','.$label->{'ypos'}.' '.$label->{'justify'};
	if ($target eq 'tex') {
	$gnuplot_input .=' font "'.$font_properties->{'printname'}.','.$fontsize.'pt"' ;
	}
	$gnuplot_input .= $/;
	}
	if ($target eq 'tex') {
	$gnuplot_input .="set size 1,".$Apache::lonplot::plot{'height'}/$Apache::lonplot::plot{'width'}*1.38;
	$gnuplot_input .="\n";
}	}
# curves	# curves
$gnuplot_input .= 'plot ';	$gnuplot_input .= 'plot ';
for (my $i = 0;$i<=$#curves;$i++) {	for (my $i = 0;$i<=$#curves;$i++) {
$curve = $curves[$i];	$curve = $curves[$i];
$gnuplot_input.= ', ' if ($i > 0);	$gnuplot_input.= ', ' if ($i > 0);
	if ($target eq 'tex') {
	$curve->{'linewidth'} *= 2;
	}
if (exists($curve->{'function'})) {	if (exists($curve->{'function'})) {
$gnuplot_input.=	$gnuplot_input.=
$curve->{'function'}.' title "'.	$curve->{'function'}.' title "'.
$curve->{'name'}.'" with '.	$curve->{'name'}.'" with '.
$curve->{'linestyle'};	$curve->{'linestyle'};
	$gnuplot_input.= ' linewidth '.$curve->{'linewidth'};

	if (($curve->{'linestyle'} eq 'points') \|\|
	($curve->{'linestyle'} eq 'linespoints') \|\|
	($curve->{'linestyle'} eq 'errorbars') \|\|
	($curve->{'linestyle'} eq 'xerrorbars') \|\|
	($curve->{'linestyle'} eq 'yerrorbars') \|\|
	($curve->{'linestyle'} eq 'xyerrorbars')) {
	$gnuplot_input.=' pointtype '.$curve->{'pointtype'};
	$gnuplot_input.=' pointsize '.$curve->{'pointsize'};
	} elsif ($curve->{'linestyle'} eq 'filledcurves') {
	$gnuplot_input.= ' '.$curve->{'limit'};
	}
} elsif (exists($curve->{'data'})) {	} elsif (exists($curve->{'data'})) {
# Store data values in $datatext	# Store data values in $datatext
my $datatext = '';	my $datatext = '';
# get new filename	# get new filename
my $datafilename = "$tmpdir/$filename.$i";	my $datafilename = "$tmpdir/$filename.data.$i";
my $fh=Apache::File->new(">$datafilename");	my $fh=Apache::File->new(">$datafilename");
# Compile data	# Compile data
my @Data = @{$curve->{'data'}};	my @Data = @{$curve->{'data'}};
Line 826 sub write_gnuplot_file {	Line 1351 sub write_gnuplot_file {
}	}
# write file	# write file
print $fh $datatext;	print $fh $datatext;
close ($fh);	close($fh);
# generate gnuplot text	# generate gnuplot text
$gnuplot_input.= '"'.$datafilename.'" title "'.	$gnuplot_input.= '"'.$datafilename.'" title "'.
$curve->{'name'}.'" with '.	$curve->{'name'}.'" with '.
$curve->{'linestyle'};	$curve->{'linestyle'};
	$gnuplot_input.= ' linewidth '.$curve->{'linewidth'};
	if (($curve->{'linestyle'} eq 'points') \|\|
	($curve->{'linestyle'} eq 'linespoints') \|\|
	($curve->{'linestyle'} eq 'errorbars') \|\|
	($curve->{'linestyle'} eq 'xerrorbars') \|\|
	($curve->{'linestyle'} eq 'yerrorbars') \|\|
	($curve->{'linestyle'} eq 'xyerrorbars')) {
	$gnuplot_input.=' pointtype '.$curve->{'pointtype'};
	$gnuplot_input.=' pointsize '.$curve->{'pointsize'};
	} elsif ($curve->{'linestyle'} eq 'filledcurves') {
	$gnuplot_input.= ' '.$curve->{'limit'};
	}
}	}
}	}
# Write the output to a file.	# Write the output to a file.
my $fh=Apache::File->new(">$tmpdir$filename");	my $fh=Apache::File->new(">$tmpdir$filename.data");
print $fh $gnuplot_input;	print $fh $gnuplot_input;
close($fh);	close($fh);
# That's all folks.	# That's all folks.
Line 845 sub write_gnuplot_file {	Line 1382 sub write_gnuplot_file {
sub check_inputs {	sub check_inputs {
## Note: no inputs, no outputs - this acts only on global variables.	## Note: no inputs, no outputs - this acts only on global variables.
## Make sure we have all the input we need:	## Make sure we have all the input we need:
if (! %plot) { &set_defaults(\%plot,\%plot_defaults); }	if (! %Apache::lonplot::plot) { &set_defaults(\%Apache::lonplot::plot,\%gnuplot_defaults); }
if (! %key ) {} # No key for this plot, thats okay	if (! %key ) {} # No key for this plot, thats okay
# if (! %axis) { &set_defaults(\%axis,\%axis_defaults); }	# if (! %axis) { &set_defaults(\%axis,\%axis_defaults); }
if (! defined($title )) {} # No title for this plot, thats okay	if (! defined($title )) {} # No title for this plot, thats okay
Line 859 sub check_inputs {	Line 1396 sub check_inputs {
my $curve;	my $curve;
foreach $curve (@curves) {	foreach $curve (@curves) {
if (!defined($curve->{'function'})&&!defined($curve->{'data'})){	if (!defined($curve->{'function'})&&!defined($curve->{'data'})){
&Apache::lonxml::warning("One of the curves specified did not contain any <data> or <function> declarations\n");	&Apache::lonxml::warning("One of the curves specified did not contain any curve data or curve function declarations\n");
return '';	return '';
}	}
}	}
Line 883 sub edit_attributes {	Line 1420 sub edit_attributes {
($description,$attr,$token,	($description,$attr,$token,
$defaults->{$attr}->{'size'});	$defaults->{$attr}->{'size'});
} elsif ($defaults->{$attr}->{'edit_type'} eq 'choice') {	} elsif ($defaults->{$attr}->{'edit_type'} eq 'choice') {
$result .= &Apache::edit::select_arg	$result .= &Apache::edit::select_or_text_arg
($description,$attr,$defaults->{$attr}->{'choices'},$token);	($description,$attr,$defaults->{$attr}->{'choices'},$token);
} elsif ($defaults->{$attr}->{'edit_type'} eq 'on_off') {	} elsif ($defaults->{$attr}->{'edit_type'} eq 'onoff') {
$result .= &Apache::edit::select_arg	$result .= &Apache::edit::select_or_text_arg
($description,$attr,['on','off'],$token);	($description,$attr,['on','off'],$token);
}	}
$result .= '<br />';	$result .= '<br />';
Line 901 sub edit_attributes {	Line 1438 sub edit_attributes {
## ##	## ##
###################################################################	###################################################################

#------------------------------------------------ insert_xxxxxxx	sub insert_gnuplot {
sub insert_plot {
my $result = '';	my $result = '';
# plot attributes	# plot attributes
$result .= "<plot \n";	$result .= "\n<gnuplot ";
foreach my $attr (keys(%plot_defaults)) {	foreach my $attr (keys(%gnuplot_defaults)) {
$result .= " $attr=\"$plot_defaults{$attr}->{'default'}\"\n";	$result .= "\n $attr=\"$gnuplot_defaults{$attr}->{'default'}\"";
}	}
$result .= ">\n";	$result .= ">";
# Add the components	# Add the components (most are commented out for simplicity)
$result .= &insert_key();	# $result .= &insert_key();
$result .= &insert_axis();	# $result .= &insert_axis();
$result .= &insert_title();	# $result .= &insert_title();
$result .= &insert_xlabel();	# $result .= &insert_xlabel();
$result .= &insert_ylabel();	# $result .= &insert_ylabel();
$result .= &insert_curve();	$result .= &insert_curve();
# close up the <plot>	# close up the <gnuplot>
$result .= "</plot>\n";	$result .= "\n</gnuplot>";
	return $result;
	}

	sub insert_tics {
	my $result;
	$result .= &insert_xtics() . &insert_ytics;
	return $result;
	}

	sub insert_xtics {
	my $result;
	$result .= "\n <xtics ";
	foreach my $attr (keys(%tic_defaults)) {
	$result .= "\n $attr=\"$tic_defaults{$attr}->{'default'}\" ";
	}
	$result .= "/>";
	return $result;
	}

	sub insert_ytics {
	my $result;
	$result .= "\n <ytics ";
	foreach my $attr (keys(%tic_defaults)) {
	$result .= "\n $attr=\"$tic_defaults{$attr}->{'default'}\" ";
	}
	$result .= "/>";
return $result;	return $result;
}	}

sub insert_key {	sub insert_key {
my $result;	my $result;
$result .= " <key \n";	$result .= "\n <key ";
foreach my $attr (keys(%key_defaults)) {	foreach my $attr (keys(%key_defaults)) {
$result .= " $attr=\"$key_defaults{$attr}->{'default'}\"\n";	$result .= "\n $attr=\"$key_defaults{$attr}->{'default'}\"";
}	}
$result .= " />\n";	$result .= " />";
return $result;	return $result;
}	}

sub insert_axis{	sub insert_axis{
my $result;	my $result;
$result .= ' <axis ';	$result .= "\n <axis ";
foreach my $attr (keys(%axis_defaults)) {	foreach my $attr (keys(%axis_defaults)) {
$result .= " $attr=\"$axis_defaults{$attr}->{'default'}\"\n";	$result .= "\n $attr=\"$axis_defaults{$attr}->{'default'}\"";
}	}
$result .= " />\n";	$result .= " />";
return $result;	return $result;
}	}

sub insert_title { return " <title></title>\n"; }	sub insert_title { return "\n <title></title>"; }
sub insert_xlabel { return " <xlabel></xlabel>\n"; }	sub insert_xlabel { return "\n <xlabel></xlabel>"; }
sub insert_ylabel { return " <ylabel></ylabel>\n"; }	sub insert_ylabel { return "\n <ylabel></ylabel>"; }

sub insert_label {	sub insert_label {
my $result;	my $result;
$result .= ' <label ';	$result .= "\n <label ";
foreach my $attr (keys(%label_defaults)) {	foreach my $attr (keys(%label_defaults)) {
$result .= ' '.$attr.'="'.	$result .= "\n $attr=\"".
$label_defaults{$attr}->{'default'}."\"\n";	$label_defaults{$attr}->{'default'}."\"";
}	}
$result .= " ></label>\n";	$result .= "></label>";
return $result;	return $result;
}	}

sub insert_curve {	sub insert_curve {
my $result;	my $result;
$result .= ' <curve ';	$result .= "\n <curve ";
foreach my $attr (keys(%curve_defaults)) {	foreach my $attr (keys(%curve_defaults)) {
$result .= ' '.$attr.'="'.	$result .= "\n $attr=\"".
$curve_defaults{$attr}->{'default'}."\"\n";	$curve_defaults{$attr}->{'default'}."\"";
}	}
$result .= " ></curve>\n";	$result .= " >";
	$result .= &insert_data().&insert_data()."\n </curve>";
}	}

sub insert_function {	sub insert_function {
my $result;	my $result;
$result .= "<function></function>\n";	$result .= "\n <function></function>";
return $result;	return $result;
}	}

sub insert_data {	sub insert_data {
my $result;	my $result;
$result .= " <data></data>\n";	$result .= "\n <data></data>";
return $result;	return $result;
}	}

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

Removed from v.1.40
changed lines
	Added in v.1.127