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.161 and 1.167

version 1.161, 2003/08/14 14:46:06	version 1.167, 2003/08/26 15:05:43
Line 168 sub start_html {	Line 168 sub start_html {
\usepackage[dvips]{graphicx}	\usepackage[dvips]{graphicx}
\usepackage{epsfig}\usepackage{calc}	\usepackage{epsfig}\usepackage{calc}
\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}	\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}
\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large\textbf{Index}} \newline \setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}\setlength{\itemsep}{-0.1in}\setlength{\parsep}{-0.02in}\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}';	\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large\textbf{Index}} \newline \setlength{\rightmargin}{0in}\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}\setlength{\abovedisplayshortskip}{-0.04in}\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}';
}	}
return $currentstring;	return $currentstring;
}	}
Line 323 sub start_title {	Line 323 sub start_title {
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[4];	$currentstring = $token->[4];
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring .= '\keephidden{'	$currentstring .= '\keephidden{Title of the document: '
}	}
if ($target eq 'meta') {	if ($target eq 'meta') {
$currentstring='<title>';	$currentstring='<title>';
Line 398 sub start_meta {	Line 398 sub start_meta {
}	}

sub end_meta {	sub end_meta {
my ($target,$token,$tagstack,$parstack,$parser) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
my $args='';	my $args='';
Line 407 sub end_meta {	Line 407 sub end_meta {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	}
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
$currentstring=&Apache::lonxml::endredirection();	my $content=&Apache::lonxml::get_param('content',$parstack,$safeeval);
$currentstring='';	my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval);
	if ((not defined $content) && (not defined $name)) {
	&Apache::lonxml::startredirection();
	}
}	}
return $currentstring;	return $currentstring;
}	}
Line 1792 sub end_table {	Line 1795 sub end_table {
$needed=$#length_row_final-$needed+1;	$needed=$#length_row_final-$needed+1;
for (my $jn=0;$jn<=$#length_row_final;$jn++) {	for (my $jn=0;$jn<=$#length_row_final;$jn++) {
if ($length_row_final[$jn]==0) {	if ($length_row_final[$jn]==0) {
if ($length_raw_row[$jn]<$available_length/3) {	if ($length_raw_row[$jn]<$available_length) {
$length_row_final[$jn]=$length_raw_row[$jn];	$length_row_final[$jn]=$length_raw_row[$jn];
$available_length=$available_length-$length_raw_row[$jn];	$available_length=$available_length-$length_raw_row[$jn];
$needed--;	$needed--;
Line 1828 sub end_table {	Line 1831 sub end_table {
return $currentstring;	return $currentstring;
}	}

#-- <tr> tag	#-- <tr> tag (end tag optional)
sub start_tr {	sub start_tr {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
Line 1865 sub end_tr {	Line 1868 sub end_tr {
return $currentstring;	return $currentstring;
}	}

#-- <td> tag	#-- <td> tag (end tag optional)
sub start_td {	sub start_td {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
Line 1924 sub end_td_tex {	Line 1927 sub end_td_tex {
$Apache::londefdef::table[-1]{'TeXlength'} .= $1.',';	$Apache::londefdef::table[-1]{'TeXlength'} .= $1.',';
$Apache::londefdef::table[-1]{'length'} .= '0,';	$Apache::londefdef::table[-1]{'length'} .= '0,';
} else {	} else {
$data=~s/^\s+(\S.*)/$1/;	$data=~s/^\s+(\S.*)/$1/;
$data=~s/(.*\S)\s+$/$1/;	$data=~s/(.*\S)\s+$/$1/;
my $current_length=2*length($data);	$data=~s/(\s)+/$1/;
	my $current_length=0;
	if ($data=~/\\vskip/) {
	my $newdata=$data;
	$newdata=~s/\\vskip \d\.?\d\s*mm/THISISJUSTTEMPORARYSEPARATOR/g;
	my @newdata=split(/THISISJUSTTEMPORARYSEPARATOR/,$newdata);
	foreach my $elementdata (@newdata) {
	$elementdata=~s/^\s+(\S.*)/$1/;
	$elementdata=~s/(.*\S)\s+$/$1/;
	$elementdata=~s/(\s)+/$1/;
	my $lengthnewdata=1.8*length($elementdata);
	if ($lengthnewdata>$current_length) {$current_length=$lengthnewdata;}
	}
	} else {
	$current_length=1.8*length($data);
	}
$Apache::londefdef::table[-1]{'length'} .= $current_length.',';	$Apache::londefdef::table[-1]{'length'} .= $current_length.',';
$Apache::londefdef::table[-1]{'TeXlength'} .= '0,';	$Apache::londefdef::table[-1]{'TeXlength'} .= '0,';
}	}
Line 1950 sub end_td {	Line 1968 sub end_td {
return $currentstring;	return $currentstring;
}	}

#-- <th> tag	#-- <th> tag (end tag optional)
sub start_th {	sub start_th {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
my $currentstring = '';	my $currentstring = '';
Line 2295 sub end_frameset {	Line 2313 sub end_frameset {
return $currentstring;	return $currentstring;
}	}

	#-- <xmp>
	sub start_xmp {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
	my $currentstring = '';
	if ($target eq 'web') {
	$currentstring .= $token->[4];
	} elsif ($target eq 'tex') {
	$currentstring .= '\begin{verbatim}';
	}
	return $currentstring;
	}

	sub end_xmp {
	my ($target,$token) = @_;
	my $currentstring = '';
	if ($target eq 'web') {
	$currentstring .= $token->[2];
	} elsif ($target eq 'tex') {
	$currentstring .= '\end{verbatim}';
	}
	return $currentstring;
	}

#-- <pre>	#-- <pre>
sub start_pre {	sub start_pre {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
Line 3081 sub end_tbody {	Line 3122 sub end_tbody {
return $currentstring;	return $currentstring;
}	}

#-- <tfoot> tag	#-- <tfoot> tag (end tag optional)
sub start_tfoot {	sub start_tfoot {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 3100 sub end_tfoot {	Line 3141 sub end_tfoot {
return $currentstring;	return $currentstring;
}	}

#-- <thead> tag	#-- <thead> tag (end tag optional)
sub start_thead {	sub start_thead {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';
Line 3125 sub start_var {	Line 3166 sub start_var {
my $currentstring = '';	my $currentstring = '';
if ($target eq 'web') {	if ($target eq 'web') {
$currentstring = $token->[4];	$currentstring = $token->[4];
}	} elsif ($target eq 'tex') {
	$currentstring = '\textit{';
	}
return $currentstring;	return $currentstring;
}	}

Line 3133 sub end_var {	Line 3176 sub end_var {
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') {
	$currentstring = '}';
}	}
return $currentstring;	return $currentstring;
}	}

#-- <wbr> tag	#-- <wbr> tag (end tag forbidden)
sub start_wbr {	sub start_wbr {
my ($target,$token) = @_;	my ($target,$token) = @_;
my $currentstring = '';	my $currentstring = '';

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

Removed from v.1.161
changed lines
	Added in v.1.167