loncom/xml/londefdef.pm - diff

Return to londefdef.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/londefdef.pm between versions 1.96 and 1.99

version 1.96, 2002/10/28 19:20:15	version 1.99, 2002/11/07 19:33:52
Line 1412 sub start_table {	Line 1412 sub start_table {
if ($signature) {	if ($signature) {
my $NumberEmptyLength = $how_many_columns - $filled_columns;	my $NumberEmptyLength = $how_many_columns - $filled_columns;
my $SpacePerColumn = '(\textwidth '.$available_space.')/'.$NumberEmptyLength;	my $SpacePerColumn = '(\textwidth '.$available_space.')/'.$NumberEmptyLength;
$output =~ s/\$SpacePerColumn/$SpacePerColumn - 4 mm/g;	my $shorthand = ($NumberEmptyLength+1)*4;
	$output =~ s/\$SpacePerColumn/$SpacePerColumn - $shorthand mm/g;
}	}
$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}\vskip 0 mm ';	$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}\vskip 0 mm ';
if ($#Apache::londefdef::table > 0) {	if ($#Apache::londefdef::table > 0) {
Line 1542 sub start_table {	Line 1543 sub start_table {
#-- <img> tag	#-- <img> tag
sub start_img {	sub start_img {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=	my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,
$token->[2]->{'src'};	undef,1);
	$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src;
my $currentstring = '';	my $currentstring = '';
my $width_param = '';	my $width_param = '';
my $height_param = '';	my $height_param = '';
my $scaling = .3;	my $scaling = .3;

if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);	&image_replication($src);
&image_replication($src);
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);	$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
#if original gif/jpg file exist do following:	#if original gif/jpg file exist do following:
if (-e $src) {	if (-e $src) {
Line 1714 sub start_embed {	Line 1715 sub start_embed {
return $currentstring;	return $currentstring;
}	}
#-- <allow> tag	#-- <allow> tag
sub start_allow {	sub start_allow {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=	$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
$token->[2]->{'src'};	$token->[2]->{'src'};
my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);	my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);
&image_replication($src);	&image_replication($src);
return '';	my $result;
}	if ($target eq 'edit') {
sub end_allow {	$result .=&Apache::edit::tag_start($target,$token);
return '';	$result .=&Apache::edit::text_arg('File Spec:','src',$token,70);
}	$result .=&Apache::edit::end_row();#.&Apache::edit::start_spanning_row();
	} elsif ($target eq 'modified') {
	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
	$safeeval,'src');
	if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
	}
	return $result;
	}

	sub end_allow {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
	if ( $target eq 'edit') { return (&Apache::edit::end_table()); }
	return '';
	}
#-- Frames	#-- Frames
sub start_frameset {	sub start_frameset {
my ($target,$token) = @_;	my ($target,$token) = @_;

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

Removed from v.1.96
changed lines
	Added in v.1.99