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.46 and 1.53

version 1.46, 2002/02/26 22:27:22	version 1.53, 2002/04/16 14:37:24
Line 50 use Apache::lonxml;	Line 50 use Apache::lonxml;

BEGIN {	BEGIN {

&Apache::lonxml::register('Apache::londefdef',('m','html','head','map','select','option','input','textarea','form','meta','title','body','center','b','strong','table','dt','h1','h2','h3','h4','h5','h6','cite','i','address','dd','dl','dir','ol','ul','menu','dfn','kbd','tt','code','em','q','p','br','big','small','basefont','font','s','sub','strike','sup','hr','a','li','u','output','param','applet','img','embed','tr','td','allow','frameset','pre','insert'));	&Apache::lonxml::register('Apache::londefdef',('m','html','head','map','select','option','input','textarea','form','meta','title','body','center','b','strong','dt','h1','h2','h3','h4','h5','h6','cite','i','address','dd','dl','dir','ol','ul','menu','dfn','kbd','tt','code','em','q','p','br','big','small','basefont','font','s','sub','strike','sup','hr','a','li','u','output','param','applet','img','embed','allow','frameset','pre','insert','externallink','table','tr','td'));

}	}

Line 114 sub end_m {	Line 114 sub end_m {
$currentstring = &Apache::lonxml::xmlbegin().	$currentstring = &Apache::lonxml::xmlbegin().
&Apache::lonxml::fontsettings();	&Apache::lonxml::fontsettings();
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
	@Apache::londefdef::table = ();
$currentstring .= '\documentclass[letterpaper]{article}	$currentstring .= '\documentclass[letterpaper]{article}
\setlength{\oddsidemargin}{-40pt}
\setlength{\evensidemargin}{-60pt}
\setlength{\topmargin}{200pt}
\setlength{\textwidth}{4.4in}
\setlength{\textheight}{6.8in}
\setlength{\parindent}{20pt}
\setlength{\marginparwidth}{90pt}
\setlength{\textfloatsep}{8pt plus 2.0pt minus 4.0pt}
\newcommand{\keephidden}[1]{}	\newcommand{\keephidden}[1]{}
\usepackage[dvips]{graphicx}	\usepackage[dvips]{graphicx}
\usepackage{epsfig}';	\usepackage{epsfig}';
Line 150 sub end_m {	Line 143 sub end_m {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = &Apache::lonxml::registerurl().	$currentstring = &Apache::lonxml::registerurl(undef,$target).
$token->[2];	$token->[2];
}	}
return $currentstring;	return $currentstring;
Line 332 sub end_m {	Line 325 sub end_m {
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
if (!$Apache::lonxml::registered) {	if (!$Apache::lonxml::registered) {
$currentstring.='<head>'.&Apache::lonxml::registerurl().'</head>';	$currentstring.='<head>'.
	&Apache::lonxml::registerurl(undef,$target).'</head>';
}	}
my $onLoad='';	my $onLoad='';
foreach my $key (keys(%{$token->[2]})) {	foreach my $key (keys(%{$token->[2]})) {
Line 360 sub end_m {	Line 354 sub end_m {
if ($ENV{'request.state'} ne 'published') {	if ($ENV{'request.state'} ne 'published') {
$currentstring.=(<<EDITBUTTON);	$currentstring.=(<<EDITBUTTON);
<form method="post">	<form method="post">
<input type="submit" name="showmode" value="Edit" />	<input type="submit" name="editmode" value="Edit" />
</form>	</form>
EDITBUTTON	EDITBUTTON
}	}
Line 1266 EDITBUTTON	Line 1260 EDITBUTTON
}	}
#-- <table> tag	#-- <table> tag
sub start_table {	sub start_table {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring = '';	my $aa = {};
	push @Apache::londefdef::table, $aa;
	$Apache::londefdef::table[-1]{'row_number'} = -1;
	$Apache::londefdef::table[-1]{'output'} = '\begin{tabular} ';
	my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval);
	unless (defined $border) { $border = 0; }
	if ($border) {
	$Apache::londefdef::table[-1]{'hinc'} = '\hline ';
	$Apache::londefdef::table[-1]{'vinc'} = '&';
	$Apache::londefdef::table[-1]{'vvinc'} = '\|';
	} else {
	$Apache::londefdef::table[-1]{'hinc'} = '';
	$Apache::londefdef::table[-1]{'vinc'} = '';
	$Apache::londefdef::table[-1]{'vvinc'} = '';
	}
}	}
return $currentstring;	return $currentstring;
}	}
Line 1281 EDITBUTTON	Line 1289 EDITBUTTON
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring = '';	my $inmemory = '';
}	my $output = '';
	my $header_of_table = '{'.$Apache::londefdef::table[-1]{'vvinc'};
	my $in;
	for ($in=0;$in<=$Apache::londefdef::table[-1]{'counter_columns'};$in++) {
	$header_of_table .= $Apache::londefdef::table[-1]{'columns'}[$in].$Apache::londefdef::table[-1]{'vvinc'};
	}
	$header_of_table .= '}';
	for ($in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
	$output .= $Apache::londefdef::table[-1]{'rowdata'}[$in];
	chop $output;
	$output .= ' \\\\ ';
	}
	$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}';
	if ($#Apache::londefdef::table > 0) {
	$inmemory = $Apache::londefdef::table[-1]{'output'};
	pop @Apache::londefdef::table;
	$Apache::londefdef::table[-1]{'rowdata'}[$Apache::londefdef::table[-1]{'row_number'}] .= $inmemory;
	} else {
	$currentstring = $Apache::londefdef::table[-1]{'output'};
	$currentstring =~ s/\\\\\s+\\\\/\\\\/g;
	pop @Apache::londefdef::table;
	}
	}
return $currentstring;	return $currentstring;
}	}
#-- <tr> tag	#-- <tr> tag
sub start_tr {	sub start_tr {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring = '';	$Apache::londefdef::table[-1]{'row_number'}++;
	my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1);
	if ($alignchar ne '') {
	push @ {$Apache::londefdef::table[-1]{'rows'} }, $alignchar;
	} else {
	push @ {$Apache::londefdef::table[-1]{'rows'} }, 'c';
	}
	push ( @{ $Apache::londefdef::table[-1]{'rowdata'} }, $Apache::londefdef::table[-1]{'hinc'});
	$Apache::londefdef::table[-1]{'counter_columns'} = -1;

}	}
return $currentstring;	return $currentstring;
}	}
sub end_tr {	sub end_tr {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring = '';	# $currentstring .= ' START ROW '. $Apache::londefdef::table[-1]{'rowdata'}[$Apache::londefdef::table[-1]{'row_number'}].' END ROW ';
}	}
return $currentstring;	return $currentstring;
}	}
#-- <td> tag	#-- <td> tag
sub start_td {	sub start_td {
my ($target,$token) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring = '';	my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1);
	if ($what_to_push eq '') {
	$what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);;
	}
	push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push;
	$Apache::londefdef::table[-1]{'counter_columns'}++;
	&Apache::lonxml::startredirection();
	;
}	}
return $currentstring;	return $currentstring;
}	}
sub end_td {	sub end_td {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[2];	$currentstring = $token->[2];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring = '';	my $current_row = $Apache::londefdef::table[-1]{'row_number'};
	my $data=&Apache::lonxml::endredirection();
	@{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= $data.' '.$Apache::londefdef::table[-1]{'vinc'};
}	}
return $currentstring;	return $currentstring;
}	}
Line 1357 EDITBUTTON	Line 1405 EDITBUTTON
}	}
$file=~s/(\.gif\|\.jpg)$/\.eps/;	$file=~s/(\.gif\|\.jpg)$/\.eps/;
if ($path) {	if ($path) {
$currentstring = '\graphicspath{{'.$path.'}}\fbox{\includegraphics{'.$file.'}}';	$currentstring = '\graphicspath{{'.$path.'/}}\fbox{\includegraphics{'.$file.'}}';
} else {	} else {
$currentstring = 'See the image at \tt{'.$src.'}';	$currentstring = 'See the image at \tt{'.$src.'}';
}	}
Line 1474 sub start_embed {	Line 1522 sub start_embed {
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
if (!$Apache::lonxml::registered) {	if (!$Apache::lonxml::registered) {
$currentstring.='<head>'.&Apache::lonxml::registerurl().'</head>';	$currentstring.='<head>'.
	&Apache::lonxml::registerurl(undef,$target).'</head>';
}	}
$currentstring .= $token->[4];	$currentstring .= $token->[4];
}	}
Line 1523 sub start_embed {	Line 1572 sub start_embed {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
	$currentstring .= '';
	}
	return $currentstring;
	}
	#-- <externallink>
	sub start_externallink {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
	my $currentstring = '';
	if ($target eq 'web') {
	my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval);
	$currentstring .= '<b>'.$display.'</b>';;
	}
	return $currentstring;
	}
	sub end_externallink {
	my ($target,$token) = @_;
	my $currentstring = '';
	if ($target eq 'web') {
$currentstring .= '';	$currentstring .= '';
}	}
return $currentstring;	return $currentstring;

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

Removed from v.1.46
changed lines
	Added in v.1.53