2003-09-05 12:43:58 -03:00
|
|
|
# python.perl by Fred L. Drake, Jr. <fdrake@acm.org> -*- perl -*-
|
1998-03-03 18:02:19 -04:00
|
|
|
#
|
|
|
|
# Heavily based on Guido van Rossum's myformat.perl (now obsolete).
|
|
|
|
#
|
|
|
|
# Extension to LaTeX2HTML for documents using myformat.sty.
|
|
|
|
# Subroutines of the form do_cmd_<name> here define translations
|
|
|
|
# for LaTeX commands \<name> defined in the corresponding .sty file.
|
|
|
|
|
|
|
|
package main;
|
|
|
|
|
2002-11-15 15:04:10 -04:00
|
|
|
use warnings;
|
2000-10-02 11:43:38 -03:00
|
|
|
use File::Basename;
|
|
|
|
|
1998-03-03 18:02:19 -04:00
|
|
|
|
1998-04-16 23:15:42 -03:00
|
|
|
sub next_argument{
|
1999-01-05 18:16:29 -04:00
|
|
|
my $param;
|
|
|
|
$param = missing_braces()
|
|
|
|
unless ((s/$next_pair_pr_rx/$param=$2;''/eo)
|
2003-09-05 12:43:58 -03:00
|
|
|
||(s/$next_pair_rx/$param=$2;''/eo));
|
1998-08-10 16:40:44 -03:00
|
|
|
return $param;
|
1998-04-16 23:15:42 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
sub next_optional_argument{
|
2002-05-23 14:59:16 -03:00
|
|
|
my($param, $rx) = ('', "^\\s*(\\[([^]]*)\\])?");
|
1998-04-17 17:04:09 -03:00
|
|
|
s/$rx/$param=$2;''/eo;
|
1998-08-10 16:40:44 -03:00
|
|
|
return $param;
|
1998-04-16 23:15:42 -03:00
|
|
|
}
|
|
|
|
|
2000-10-02 11:43:38 -03:00
|
|
|
sub make_icon_filename($){
|
2002-11-15 15:04:10 -04:00
|
|
|
my($myname, $mydir, $myext) = fileparse($_[0], '\..*');
|
2000-10-02 11:43:38 -03:00
|
|
|
chop $mydir;
|
|
|
|
if ($mydir eq '.') {
|
|
|
|
$mydir = $ICONSERVER;
|
|
|
|
}
|
|
|
|
$myext = ".$IMAGE_TYPE"
|
|
|
|
unless $myext;
|
|
|
|
return "$mydir$dd$myname$myext";
|
|
|
|
}
|
|
|
|
|
|
|
|
sub get_link_icon($){
|
2002-11-15 15:04:10 -04:00
|
|
|
my $url = $_[0];
|
2000-10-02 11:43:38 -03:00
|
|
|
if ($OFF_SITE_LINK_ICON && ($url =~ /^[-a-zA-Z0-9.]+:/)) {
|
|
|
|
# absolute URL; assume it points off-site
|
|
|
|
my $icon = make_icon_filename($OFF_SITE_LINK_ICON);
|
2001-06-20 18:29:30 -03:00
|
|
|
return (" <img src=\"$icon\"\n"
|
|
|
|
. ' border="0" class="offsitelink"'
|
2000-10-03 03:05:25 -03:00
|
|
|
. ($OFF_SITE_LINK_ICON_HEIGHT
|
2001-06-20 18:29:30 -03:00
|
|
|
? " height=\"$OFF_SITE_LINK_ICON_HEIGHT\""
|
2000-10-03 03:05:25 -03:00
|
|
|
: '')
|
|
|
|
. ($OFF_SITE_LINK_ICON_WIDTH
|
2001-06-20 18:29:30 -03:00
|
|
|
? " width=\"$OFF_SITE_LINK_ICON_WIDTH\""
|
2000-10-03 03:05:25 -03:00
|
|
|
: '')
|
2001-06-20 18:29:30 -03:00
|
|
|
. " alt=\"[off-site link]\"\n"
|
2003-08-05 00:45:37 -03:00
|
|
|
. " />");
|
2000-10-02 11:43:38 -03:00
|
|
|
}
|
|
|
|
return '';
|
|
|
|
}
|
1998-05-15 01:28:37 -03:00
|
|
|
|
|
|
|
# This is a fairly simple hack; it supports \let when it is used to create
|
|
|
|
# (or redefine) a macro to exactly be some other macro: \let\newname=\oldname.
|
1998-05-15 13:59:38 -03:00
|
|
|
# Many possible uses of \let aren't supported or aren't supported correctly.
|
1998-05-15 01:28:37 -03:00
|
|
|
#
|
|
|
|
sub do_cmd_let{
|
|
|
|
local($_) = @_;
|
|
|
|
my $matched = 0;
|
1998-05-15 10:45:54 -03:00
|
|
|
s/[\\]([a-zA-Z]+)\s*(=\s*)?[\\]([a-zA-Z]*)/$matched=1; ''/e;
|
1998-05-15 01:28:37 -03:00
|
|
|
if ($matched) {
|
2003-09-05 12:43:58 -03:00
|
|
|
my($new, $old) = ($1, $3);
|
|
|
|
eval "sub do_cmd_$new { do_cmd_$old" . '(@_); }';
|
|
|
|
print "\ndefining handler for \\$new using \\$old\n";
|
1998-05-15 01:28:37 -03:00
|
|
|
}
|
1998-05-15 10:45:54 -03:00
|
|
|
else {
|
2003-09-05 12:43:58 -03:00
|
|
|
s/[\\]([a-zA-Z]+)\s*(=\s*)?([^\\])/$matched=1; ''/es;
|
|
|
|
if ($matched) {
|
|
|
|
my($new, $char) = ($1, $3);
|
|
|
|
eval "sub do_cmd_$new { \"\\$char\" . \$_[0]; }";
|
|
|
|
print "\ndefining handler for \\$new to insert '$char'\n";
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
write_warnings("Could not interpret \\let construct...");
|
|
|
|
}
|
1998-05-15 10:45:54 -03:00
|
|
|
}
|
1998-08-10 16:40:44 -03:00
|
|
|
return $_;
|
1998-05-15 01:28:37 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-06-15 19:41:48 -03:00
|
|
|
# the older version of LaTeX2HTML we use doesn't support this, but we use it:
|
|
|
|
|
2002-11-15 15:04:10 -04:00
|
|
|
sub do_cmd_textasciitilde{ '~' . $_[0]; }
|
|
|
|
sub do_cmd_textasciicircum{ '^' . $_[0]; }
|
|
|
|
sub do_cmd_textbar{ '|' . $_[0]; }
|
2003-07-10 14:04:45 -03:00
|
|
|
sub do_cmd_texteuro { '€' . $_[0]; }
|
2002-11-15 15:04:10 -04:00
|
|
|
sub do_cmd_textgreater{ '>' . $_[0]; }
|
|
|
|
sub do_cmd_textless{ '<' . $_[0]; }
|
|
|
|
sub do_cmd_textunderscore{ '_' . $_[0]; }
|
|
|
|
sub do_cmd_infinity{ '∞' . $_[0]; }
|
|
|
|
sub do_cmd_plusminus{ '±' . $_[0]; }
|
2004-01-23 04:52:28 -04:00
|
|
|
sub do_cmd_guilabel{
|
|
|
|
return use_wrappers($_[0]. '<span class="guilabel">', '</span>'); }
|
2003-07-16 11:01:56 -03:00
|
|
|
sub do_cmd_menuselection{
|
2004-01-23 04:52:28 -04:00
|
|
|
return use_wrappers($_[0], '<span class="guilabel">', '</span>'); }
|
|
|
|
sub do_cmd_sub{
|
|
|
|
return '</span> > <span class="guilabel">' . $_[0]; }
|
2000-06-15 19:41:48 -03:00
|
|
|
|
|
|
|
|
1998-03-03 18:02:19 -04:00
|
|
|
# words typeset in a special way (not in HTML though)
|
|
|
|
|
2002-11-15 15:04:10 -04:00
|
|
|
sub do_cmd_ABC{ 'ABC' . $_[0]; }
|
2004-11-12 21:20:24 -04:00
|
|
|
sub do_cmd_UNIX{ '<span class="Unix">Unix</span>' . $_[0]; }
|
|
|
|
sub do_cmd_LaTeX{ '<span class="LaTeX">LaTeX</span>' . $_[0]; }
|
2004-11-13 01:46:18 -04:00
|
|
|
sub do_cmd_TeX{ '<span class="TeX">TeX</span>' . $_[0]; }
|
2002-11-15 15:04:10 -04:00
|
|
|
sub do_cmd_ASCII{ 'ASCII' . $_[0]; }
|
|
|
|
sub do_cmd_POSIX{ 'POSIX' . $_[0]; }
|
|
|
|
sub do_cmd_C{ 'C' . $_[0]; }
|
|
|
|
sub do_cmd_Cpp{ 'C++' . $_[0]; }
|
|
|
|
sub do_cmd_EOF{ 'EOF' . $_[0]; }
|
|
|
|
sub do_cmd_NULL{ '<tt class="constant">NULL</tt>' . $_[0]; }
|
1998-03-03 18:02:19 -04:00
|
|
|
|
2002-11-15 15:04:10 -04:00
|
|
|
sub do_cmd_e{ '\' . $_[0]; }
|
1998-03-03 18:02:19 -04:00
|
|
|
|
1998-05-14 18:00:28 -03:00
|
|
|
$DEVELOPER_ADDRESS = '';
|
do_cmd_shortversion(),
do_cmd_setshortversion(): Implementation for new markup.
convert_args(): New helper function.
do_cmd_optional(): Modified to understand when it is called from within
a convert_args() invocation.
do_env_funcdesc(),
do_env_funcdescni(),
do_cmd_funcline(),
do_cmd_funclineni(),
handle_classlike_descriptor(),
do_env_methoddesc(),
do_end_methoddescni(),
do_cmd_methodline(),
do_cmd_methodlineni(): Modified to use helper convert_args().
The convert_args() helper and related changes fix the generation of HTML
for the \optional markup, so that bogus </var>...<var> is not generated.
This closes SourceForge bug #113800.
2000-09-14 17:17:23 -03:00
|
|
|
$SHORT_VERSION = '';
|
2001-06-20 18:29:30 -03:00
|
|
|
$RELEASE_INFO = '';
|
2000-10-25 13:15:13 -03:00
|
|
|
$PACKAGE_VERSION = '';
|
1998-03-03 18:02:19 -04:00
|
|
|
|
2002-11-15 15:04:10 -04:00
|
|
|
sub do_cmd_version{ $PACKAGE_VERSION . $_[0]; }
|
|
|
|
sub do_cmd_shortversion{ $SHORT_VERSION . $_[0]; }
|
1998-03-03 18:02:19 -04:00
|
|
|
sub do_cmd_release{
|
|
|
|
local($_) = @_;
|
2000-10-25 13:15:13 -03:00
|
|
|
$PACKAGE_VERSION = next_argument();
|
1998-08-10 16:40:44 -03:00
|
|
|
return $_;
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
2001-06-20 18:29:30 -03:00
|
|
|
sub do_cmd_setreleaseinfo{
|
|
|
|
local($_) = @_;
|
|
|
|
$RELEASE_INFO = next_argument();
|
|
|
|
return $_;
|
|
|
|
}
|
|
|
|
|
do_cmd_shortversion(),
do_cmd_setshortversion(): Implementation for new markup.
convert_args(): New helper function.
do_cmd_optional(): Modified to understand when it is called from within
a convert_args() invocation.
do_env_funcdesc(),
do_env_funcdescni(),
do_cmd_funcline(),
do_cmd_funclineni(),
handle_classlike_descriptor(),
do_env_methoddesc(),
do_end_methoddescni(),
do_cmd_methodline(),
do_cmd_methodlineni(): Modified to use helper convert_args().
The convert_args() helper and related changes fix the generation of HTML
for the \optional markup, so that bogus </var>...<var> is not generated.
This closes SourceForge bug #113800.
2000-09-14 17:17:23 -03:00
|
|
|
sub do_cmd_setshortversion{
|
|
|
|
local($_) = @_;
|
|
|
|
$SHORT_VERSION = next_argument();
|
|
|
|
return $_;
|
|
|
|
}
|
|
|
|
|
1998-03-03 18:02:19 -04:00
|
|
|
sub do_cmd_authoraddress{
|
|
|
|
local($_) = @_;
|
1998-05-14 18:00:28 -03:00
|
|
|
$DEVELOPER_ADDRESS = next_argument();
|
1998-08-10 16:40:44 -03:00
|
|
|
return $_;
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
sub do_cmd_hackscore{
|
|
|
|
local($_) = @_;
|
1998-04-16 23:15:42 -03:00
|
|
|
next_argument();
|
1998-08-10 16:40:44 -03:00
|
|
|
return '_' . $_;
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
2003-12-30 12:19:28 -04:00
|
|
|
# Helper used in many places that arbitrary code-like text appears:
|
|
|
|
|
|
|
|
sub codetext($){
|
|
|
|
my $text = "$_[0]";
|
2004-11-11 01:42:13 -04:00
|
|
|
# Make sure that "---" is not converted to "--" later when
|
|
|
|
# LaTeX2HTML tries converting em-dashes based on the conventional
|
|
|
|
# TeX font ligatures:
|
2003-12-30 12:19:28 -04:00
|
|
|
$text =~ s/--/-\-/go;
|
|
|
|
return $text;
|
|
|
|
}
|
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub use_wrappers($$$){
|
1998-04-16 23:15:42 -03:00
|
|
|
local($_,$before,$after) = @_;
|
|
|
|
my $stuff = next_argument();
|
1998-08-10 16:40:44 -03:00
|
|
|
return $before . $stuff . $after . $_;
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
2003-12-30 12:19:28 -04:00
|
|
|
sub use_code_wrappers($$$){
|
|
|
|
local($_,$before,$after) = @_;
|
|
|
|
my $stuff = codetext(next_argument());
|
|
|
|
return $before . $stuff . $after . $_;
|
|
|
|
}
|
|
|
|
|
do_cmd_shortversion(),
do_cmd_setshortversion(): Implementation for new markup.
convert_args(): New helper function.
do_cmd_optional(): Modified to understand when it is called from within
a convert_args() invocation.
do_env_funcdesc(),
do_env_funcdescni(),
do_cmd_funcline(),
do_cmd_funclineni(),
handle_classlike_descriptor(),
do_env_methoddesc(),
do_end_methoddescni(),
do_cmd_methodline(),
do_cmd_methodlineni(): Modified to use helper convert_args().
The convert_args() helper and related changes fix the generation of HTML
for the \optional markup, so that bogus </var>...<var> is not generated.
This closes SourceForge bug #113800.
2000-09-14 17:17:23 -03:00
|
|
|
$IN_DESC_HANDLER = 0;
|
1998-04-16 23:15:42 -03:00
|
|
|
sub do_cmd_optional{
|
do_cmd_shortversion(),
do_cmd_setshortversion(): Implementation for new markup.
convert_args(): New helper function.
do_cmd_optional(): Modified to understand when it is called from within
a convert_args() invocation.
do_env_funcdesc(),
do_env_funcdescni(),
do_cmd_funcline(),
do_cmd_funclineni(),
handle_classlike_descriptor(),
do_env_methoddesc(),
do_end_methoddescni(),
do_cmd_methodline(),
do_cmd_methodlineni(): Modified to use helper convert_args().
The convert_args() helper and related changes fix the generation of HTML
for the \optional markup, so that bogus </var>...<var> is not generated.
This closes SourceForge bug #113800.
2000-09-14 17:17:23 -03:00
|
|
|
if ($IN_DESC_HANDLER) {
|
2002-11-15 15:04:10 -04:00
|
|
|
return use_wrappers($_[0], "</var><big>\[</big><var>",
|
do_cmd_shortversion(),
do_cmd_setshortversion(): Implementation for new markup.
convert_args(): New helper function.
do_cmd_optional(): Modified to understand when it is called from within
a convert_args() invocation.
do_env_funcdesc(),
do_env_funcdescni(),
do_cmd_funcline(),
do_cmd_funclineni(),
handle_classlike_descriptor(),
do_env_methoddesc(),
do_end_methoddescni(),
do_cmd_methodline(),
do_cmd_methodlineni(): Modified to use helper convert_args().
The convert_args() helper and related changes fix the generation of HTML
for the \optional markup, so that bogus </var>...<var> is not generated.
This closes SourceForge bug #113800.
2000-09-14 17:17:23 -03:00
|
|
|
"</var><big>\]</big><var>");
|
|
|
|
}
|
|
|
|
else {
|
2002-11-15 15:04:10 -04:00
|
|
|
return use_wrappers($_[0], "<big>\[</big>", "<big>\]</big>");
|
do_cmd_shortversion(),
do_cmd_setshortversion(): Implementation for new markup.
convert_args(): New helper function.
do_cmd_optional(): Modified to understand when it is called from within
a convert_args() invocation.
do_env_funcdesc(),
do_env_funcdescni(),
do_cmd_funcline(),
do_cmd_funclineni(),
handle_classlike_descriptor(),
do_env_methoddesc(),
do_end_methoddescni(),
do_cmd_methodline(),
do_cmd_methodlineni(): Modified to use helper convert_args().
The convert_args() helper and related changes fix the generation of HTML
for the \optional markup, so that bogus </var>...<var> is not generated.
This closes SourceForge bug #113800.
2000-09-14 17:17:23 -03:00
|
|
|
}
|
1998-04-02 18:33:44 -04:00
|
|
|
}
|
|
|
|
|
1998-03-17 02:29:13 -04:00
|
|
|
# Logical formatting (some based on texinfo), needs to be converted to
|
|
|
|
# minimalist HTML. The "minimalist" is primarily to reduce the size of
|
|
|
|
# output files for users that read them over the network rather than
|
|
|
|
# from local repositories.
|
1998-03-03 18:02:19 -04:00
|
|
|
|
2002-11-15 15:04:10 -04:00
|
|
|
sub do_cmd_pytype{ return $_[0]; }
|
2000-08-03 14:25:44 -03:00
|
|
|
sub do_cmd_makevar{
|
2002-11-15 15:04:10 -04:00
|
|
|
return use_wrappers($_[0], '<span class="makevar">', '</span>'); }
|
1999-02-16 16:27:42 -04:00
|
|
|
sub do_cmd_code{
|
2003-12-30 12:19:28 -04:00
|
|
|
return use_code_wrappers($_[0], '<code>', '</code>'); }
|
1999-02-16 16:27:42 -04:00
|
|
|
sub do_cmd_module{
|
2002-11-15 15:04:10 -04:00
|
|
|
return use_wrappers($_[0], '<tt class="module">', '</tt>'); }
|
1999-02-16 16:27:42 -04:00
|
|
|
sub do_cmd_keyword{
|
2002-11-15 15:04:10 -04:00
|
|
|
return use_wrappers($_[0], '<tt class="keyword">', '</tt>'); }
|
1999-02-16 16:27:42 -04:00
|
|
|
sub do_cmd_exception{
|
2002-11-15 15:04:10 -04:00
|
|
|
return use_wrappers($_[0], '<tt class="exception">', '</tt>'); }
|
1999-02-16 16:27:42 -04:00
|
|
|
sub do_cmd_class{
|
2002-11-15 15:04:10 -04:00
|
|
|
return use_wrappers($_[0], '<tt class="class">', '</tt>'); }
|
1999-02-16 16:27:42 -04:00
|
|
|
sub do_cmd_function{
|
2002-11-15 15:04:10 -04:00
|
|
|
return use_wrappers($_[0], '<tt class="function">', '</tt>'); }
|
1999-02-16 16:27:42 -04:00
|
|
|
sub do_cmd_constant{
|
2002-11-15 15:04:10 -04:00
|
|
|
return use_wrappers($_[0], '<tt class="constant">', '</tt>'); }
|
1999-02-16 16:27:42 -04:00
|
|
|
sub do_cmd_member{
|
2002-11-15 15:04:10 -04:00
|
|
|
return use_wrappers($_[0], '<tt class="member">', '</tt>'); }
|
1999-02-16 16:27:42 -04:00
|
|
|
sub do_cmd_method{
|
2002-11-15 15:04:10 -04:00
|
|
|
return use_wrappers($_[0], '<tt class="method">', '</tt>'); }
|
1999-02-16 16:27:42 -04:00
|
|
|
sub do_cmd_cfunction{
|
2002-11-15 15:04:10 -04:00
|
|
|
return use_wrappers($_[0], '<tt class="cfunction">', '</tt>'); }
|
1999-02-16 16:27:42 -04:00
|
|
|
sub do_cmd_cdata{
|
2002-11-15 15:04:10 -04:00
|
|
|
return use_wrappers($_[0], '<tt class="cdata">', '</tt>'); }
|
1999-02-16 16:27:42 -04:00
|
|
|
sub do_cmd_ctype{
|
2002-11-15 15:04:10 -04:00
|
|
|
return use_wrappers($_[0], '<tt class="ctype">', '</tt>'); }
|
1999-02-16 16:27:42 -04:00
|
|
|
sub do_cmd_regexp{
|
2003-12-30 12:19:28 -04:00
|
|
|
return use_code_wrappers($_[0], '<tt class="regexp">', '</tt>'); }
|
1999-02-16 16:27:42 -04:00
|
|
|
sub do_cmd_character{
|
2003-12-30 12:19:28 -04:00
|
|
|
return use_code_wrappers($_[0], '"<tt class="character">', '</tt>"'); }
|
1999-02-16 16:27:42 -04:00
|
|
|
sub do_cmd_program{
|
2002-11-15 15:04:10 -04:00
|
|
|
return use_wrappers($_[0], '<b class="program">', '</b>'); }
|
1999-11-09 12:59:42 -04:00
|
|
|
sub do_cmd_programopt{
|
2002-11-15 15:04:10 -04:00
|
|
|
return use_wrappers($_[0], '<b class="programopt">', '</b>'); }
|
2000-04-11 15:46:59 -03:00
|
|
|
sub do_cmd_longprogramopt{
|
|
|
|
# note that the --- will be later converted to -- by LaTeX2HTML
|
2002-11-15 15:04:10 -04:00
|
|
|
return use_wrappers($_[0], '<b class="programopt">---', '</b>'); }
|
1999-02-16 16:27:42 -04:00
|
|
|
sub do_cmd_email{
|
2002-11-15 15:04:10 -04:00
|
|
|
return use_wrappers($_[0], '<span class="email">', '</span>'); }
|
2001-08-03 15:36:17 -03:00
|
|
|
sub do_cmd_mailheader{
|
2002-11-15 15:04:10 -04:00
|
|
|
return use_wrappers($_[0], '<span class="mailheader">', ':</span>'); }
|
1999-02-16 16:27:42 -04:00
|
|
|
sub do_cmd_mimetype{
|
2002-11-15 15:04:10 -04:00
|
|
|
return use_wrappers($_[0], '<span class="mimetype">', '</span>'); }
|
1999-02-16 16:27:42 -04:00
|
|
|
sub do_cmd_var{
|
2002-11-15 15:04:10 -04:00
|
|
|
return use_wrappers($_[0], "<var>", "</var>"); }
|
1999-02-16 16:27:42 -04:00
|
|
|
sub do_cmd_dfn{
|
2002-11-15 15:04:10 -04:00
|
|
|
return use_wrappers($_[0], '<i class="dfn">', '</i>'); }
|
1999-02-16 16:27:42 -04:00
|
|
|
sub do_cmd_emph{
|
2004-11-10 13:56:29 -04:00
|
|
|
return use_wrappers($_[0], '<em>', '</em>'); }
|
1999-02-16 16:27:42 -04:00
|
|
|
sub do_cmd_file{
|
2002-11-15 15:04:10 -04:00
|
|
|
return use_wrappers($_[0], '<span class="file">', '</span>'); }
|
1999-04-28 11:58:49 -03:00
|
|
|
sub do_cmd_filenq{
|
2002-11-15 15:04:10 -04:00
|
|
|
return do_cmd_file($_[0]); }
|
1999-02-16 16:27:42 -04:00
|
|
|
sub do_cmd_samp{
|
2003-12-30 12:19:28 -04:00
|
|
|
return use_code_wrappers($_[0], '"<tt class="samp">', '</tt>"'); }
|
1999-02-16 16:27:42 -04:00
|
|
|
sub do_cmd_kbd{
|
2002-11-15 15:04:10 -04:00
|
|
|
return use_wrappers($_[0], '<kbd>', '</kbd>'); }
|
1999-02-16 16:27:42 -04:00
|
|
|
sub do_cmd_strong{
|
2004-11-10 13:56:29 -04:00
|
|
|
return use_wrappers($_[0], '<strong>', '</strong>'); }
|
1999-03-25 12:57:04 -04:00
|
|
|
sub do_cmd_textbf{
|
2002-11-15 15:04:10 -04:00
|
|
|
return use_wrappers($_[0], '<b>', '</b>'); }
|
1999-03-25 12:57:04 -04:00
|
|
|
sub do_cmd_textit{
|
2002-11-15 15:04:10 -04:00
|
|
|
return use_wrappers($_[0], '<i>', '</i>'); }
|
2001-12-14 18:50:06 -04:00
|
|
|
# This can be changed/overridden for translations:
|
|
|
|
%NoticeNames = ('note' => 'Note:',
|
|
|
|
'warning' => 'Warning:',
|
|
|
|
);
|
|
|
|
|
2001-10-09 15:01:23 -03:00
|
|
|
sub do_cmd_note{
|
2001-12-14 18:50:06 -04:00
|
|
|
my $label = $NoticeNames{'note'};
|
2001-10-09 15:01:23 -03:00
|
|
|
return use_wrappers(
|
2002-11-15 15:04:10 -04:00
|
|
|
$_[0],
|
2001-12-14 18:50:06 -04:00
|
|
|
"<span class=\"note\"><b class=\"label\">$label</b>\n",
|
2001-10-09 15:01:23 -03:00
|
|
|
'</span>'); }
|
|
|
|
sub do_cmd_warning{
|
2001-12-14 18:50:06 -04:00
|
|
|
my $label = $NoticeNames{'warning'};
|
2001-10-09 15:01:23 -03:00
|
|
|
return use_wrappers(
|
2002-11-15 15:04:10 -04:00
|
|
|
$_[0],
|
2001-12-14 18:50:06 -04:00
|
|
|
"<span class=\"warning\"><b class=\"label\">$label</b>\n",
|
2001-10-09 15:01:23 -03:00
|
|
|
'</span>'); }
|
1999-03-25 12:57:04 -04:00
|
|
|
|
2001-12-14 18:50:06 -04:00
|
|
|
sub do_env_notice{
|
|
|
|
local($_) = @_;
|
|
|
|
my $notice = next_optional_argument();
|
|
|
|
if (!$notice) {
|
|
|
|
$notice = 'note';
|
|
|
|
}
|
|
|
|
my $label = $NoticeNames{$notice};
|
|
|
|
return ("<div class=\"$notice\"><b class=\"label\">$label</b>\n"
|
|
|
|
. $_
|
|
|
|
. '</div>');
|
|
|
|
}
|
|
|
|
|
2000-08-03 14:25:44 -03:00
|
|
|
sub do_cmd_moreargs{
|
2002-11-15 15:04:10 -04:00
|
|
|
return '...' . $_[0]; }
|
2000-08-03 14:25:44 -03:00
|
|
|
sub do_cmd_unspecified{
|
2002-11-15 15:04:10 -04:00
|
|
|
return '...' . $_[0]; }
|
2000-08-03 14:25:44 -03:00
|
|
|
|
1998-04-16 23:15:42 -03:00
|
|
|
|
1999-01-13 13:06:34 -04:00
|
|
|
sub do_cmd_refmodule{
|
|
|
|
# Insert the right magic to jump to the module definition.
|
|
|
|
local($_) = @_;
|
|
|
|
my $key = next_optional_argument();
|
|
|
|
my $module = next_argument();
|
|
|
|
$key = $module
|
|
|
|
unless $key;
|
2001-06-20 18:29:30 -03:00
|
|
|
return "<tt class=\"module\"><a href=\"module-$key.html\">$module</a></tt>"
|
2000-04-03 01:51:13 -03:00
|
|
|
. $_;
|
1999-01-13 13:06:34 -04:00
|
|
|
}
|
|
|
|
|
1998-04-01 18:44:56 -04:00
|
|
|
sub do_cmd_newsgroup{
|
|
|
|
local($_) = @_;
|
1998-04-16 23:15:42 -03:00
|
|
|
my $newsgroup = next_argument();
|
2000-10-02 11:43:38 -03:00
|
|
|
my $icon = get_link_icon("news:$newsgroup");
|
2001-06-20 18:29:30 -03:00
|
|
|
my $stuff = ("<a class=\"newsgroup\" href=\"news:$newsgroup\">"
|
|
|
|
. "$newsgroup$icon</a>");
|
1998-08-10 16:40:44 -03:00
|
|
|
return $stuff . $_;
|
1998-04-01 18:44:56 -04:00
|
|
|
}
|
1998-03-17 02:29:13 -04:00
|
|
|
|
|
|
|
sub do_cmd_envvar{
|
1998-03-03 18:02:19 -04:00
|
|
|
local($_) = @_;
|
1999-01-05 18:16:29 -04:00
|
|
|
my $envvar = next_argument();
|
2002-05-23 14:59:16 -03:00
|
|
|
my($name, $aname, $ahref) = new_link_info();
|
1998-04-08 20:10:54 -03:00
|
|
|
# The <tt> here is really to keep buildindex.py from making
|
|
|
|
# the variable name case-insensitive.
|
2001-01-22 13:33:24 -04:00
|
|
|
add_index_entry("environment variables!$envvar@<tt>$envvar</tt>",
|
2003-09-05 12:43:58 -03:00
|
|
|
$ahref);
|
2001-01-22 13:33:24 -04:00
|
|
|
add_index_entry("$envvar (environment variable)", $ahref);
|
2000-04-03 01:51:13 -03:00
|
|
|
$aname =~ s/<a/<a class="envvar"/;
|
2001-01-22 13:33:24 -04:00
|
|
|
return "$aname$envvar</a>" . $_;
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
sub do_cmd_url{
|
|
|
|
# use the URL as both text and hyperlink
|
|
|
|
local($_) = @_;
|
1998-04-16 23:15:42 -03:00
|
|
|
my $url = next_argument();
|
2000-10-02 11:43:38 -03:00
|
|
|
my $icon = get_link_icon($url);
|
1998-03-03 18:02:19 -04:00
|
|
|
$url =~ s/~/~/g;
|
2000-10-02 11:43:38 -03:00
|
|
|
return "<a class=\"url\" href=\"$url\">$url$icon</a>" . $_;
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
sub do_cmd_manpage{
|
|
|
|
# two parameters: \manpage{name}{section}
|
|
|
|
local($_) = @_;
|
1998-04-16 23:15:42 -03:00
|
|
|
my $page = next_argument();
|
|
|
|
my $section = next_argument();
|
2001-06-20 18:29:30 -03:00
|
|
|
return "<span class=\"manpage\"><i>$page</i>($section)</span>" . $_;
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
2002-04-02 22:47:14 -04:00
|
|
|
$PEP_FORMAT = "http://www.python.org/peps/pep-%04d.html";
|
2001-06-20 18:29:30 -03:00
|
|
|
#$RFC_FORMAT = "http://www.ietf.org/rfc/rfc%04d.txt";
|
|
|
|
$RFC_FORMAT = "http://www.faqs.org/rfcs/rfc%d.html";
|
2001-01-22 13:33:24 -04:00
|
|
|
|
|
|
|
sub get_rfc_url($$){
|
|
|
|
my($rfcnum, $format) = @_;
|
2001-06-20 18:29:30 -03:00
|
|
|
return sprintf($format, $rfcnum);
|
2000-09-09 03:07:37 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
sub do_cmd_pep{
|
|
|
|
local($_) = @_;
|
|
|
|
my $rfcnumber = next_argument();
|
|
|
|
my $id = "rfcref-" . ++$global{'max_id'};
|
2001-01-22 13:33:24 -04:00
|
|
|
my $href = get_rfc_url($rfcnumber, $PEP_FORMAT);
|
2000-10-02 11:43:38 -03:00
|
|
|
my $icon = get_link_icon($href);
|
2000-09-09 03:07:37 -03:00
|
|
|
# Save the reference
|
|
|
|
my $nstr = gen_index_id("Python Enhancement Proposals!PEP $rfcnumber", '');
|
|
|
|
$index{$nstr} .= make_half_href("$CURRENT_FILE#$id");
|
2004-10-29 16:47:52 -03:00
|
|
|
return ("<a class=\"rfc\" id='$id' xml:id='$id'\n"
|
2003-08-05 00:45:37 -03:00
|
|
|
. "href=\"$href\">PEP $rfcnumber$icon</a>" . $_);
|
2000-09-09 03:07:37 -03:00
|
|
|
}
|
|
|
|
|
1998-03-03 18:02:19 -04:00
|
|
|
sub do_cmd_rfc{
|
|
|
|
local($_) = @_;
|
1999-01-05 18:16:29 -04:00
|
|
|
my $rfcnumber = next_argument();
|
|
|
|
my $id = "rfcref-" . ++$global{'max_id'};
|
2001-01-22 13:33:24 -04:00
|
|
|
my $href = get_rfc_url($rfcnumber, $RFC_FORMAT);
|
2000-10-02 11:43:38 -03:00
|
|
|
my $icon = get_link_icon($href);
|
1998-03-03 18:02:19 -04:00
|
|
|
# Save the reference
|
1998-04-16 23:15:42 -03:00
|
|
|
my $nstr = gen_index_id("RFC!RFC $rfcnumber", '');
|
1999-01-05 18:16:29 -04:00
|
|
|
$index{$nstr} .= make_half_href("$CURRENT_FILE#$id");
|
2004-10-29 16:47:52 -03:00
|
|
|
return ("<a class=\"rfc\" id='$id' xml:id='$id'\nhref=\"$href\">"
|
2003-08-05 00:45:37 -03:00
|
|
|
. "RFC $rfcnumber$icon</a>" . $_);
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
2001-07-06 19:43:02 -03:00
|
|
|
sub do_cmd_ulink{
|
|
|
|
local($_) = @_;
|
|
|
|
my $text = next_argument();
|
|
|
|
my $url = next_argument();
|
|
|
|
return "<a class=\"ulink\" href=\"$url\"\n >$text</a>" . $_;
|
|
|
|
}
|
|
|
|
|
1999-11-09 12:59:42 -04:00
|
|
|
sub do_cmd_citetitle{
|
|
|
|
local($_) = @_;
|
|
|
|
my $url = next_optional_argument();
|
|
|
|
my $title = next_argument();
|
2000-10-02 11:43:38 -03:00
|
|
|
my $icon = get_link_icon($url);
|
1999-11-09 12:59:42 -04:00
|
|
|
my $repl = '';
|
|
|
|
if ($url) {
|
2004-11-03 23:23:04 -04:00
|
|
|
my $titletext = strip_html_markup("$title");
|
2001-06-20 18:29:30 -03:00
|
|
|
$repl = ("<em class=\"citetitle\"><a\n"
|
|
|
|
. " href=\"$url\"\n"
|
2004-11-03 23:23:04 -04:00
|
|
|
. " title=\"$titletext\"\n"
|
2000-10-02 11:43:38 -03:00
|
|
|
. " >$title$icon</a></em>");
|
1999-11-09 12:59:42 -04:00
|
|
|
}
|
|
|
|
else {
|
2001-06-20 18:29:30 -03:00
|
|
|
$repl = "<em class=\"citetitle\"\n >$title</em>";
|
1999-11-09 12:59:42 -04:00
|
|
|
}
|
|
|
|
return $repl . $_;
|
|
|
|
}
|
|
|
|
|
1998-03-03 18:02:19 -04:00
|
|
|
sub do_cmd_deprecated{
|
|
|
|
# two parameters: \deprecated{version}{whattodo}
|
|
|
|
local($_) = @_;
|
1998-04-16 23:15:42 -03:00
|
|
|
my $release = next_argument();
|
|
|
|
my $reason = next_argument();
|
2001-01-22 13:33:24 -04:00
|
|
|
return ('<div class="versionnote">'
|
|
|
|
. "<b>Deprecated since release $release.</b>"
|
2003-08-05 00:45:37 -03:00
|
|
|
. "\n$reason</div><p></p>"
|
2001-01-22 13:33:24 -04:00
|
|
|
. $_);
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub versionnote($$){
|
2001-04-18 00:11:04 -03:00
|
|
|
# one or two parameters: \versionnote[explanation]{version}
|
2002-11-15 15:04:10 -04:00
|
|
|
my $type = $_[0];
|
|
|
|
local $_ = $_[1];
|
2000-05-02 14:37:42 -03:00
|
|
|
my $explanation = next_optional_argument();
|
1998-07-27 17:33:17 -03:00
|
|
|
my $release = next_argument();
|
2006-12-19 18:06:09 -04:00
|
|
|
my $classes = "versionnote";
|
|
|
|
if ($release =~ /^(\d+)\./) {
|
|
|
|
$classes .= " versionnote$1";
|
|
|
|
}
|
2001-04-18 00:11:04 -03:00
|
|
|
my $text = "$type in version $release.";
|
2001-01-22 13:33:24 -04:00
|
|
|
if ($explanation) {
|
2001-04-18 00:11:04 -03:00
|
|
|
$text = "$type in version $release:\n$explanation.";
|
2000-05-02 14:37:42 -03:00
|
|
|
}
|
2006-12-19 18:06:09 -04:00
|
|
|
return "\n<span class=\"$classes\" \n>$text</span>\n" . $_;
|
1998-07-27 17:33:17 -03:00
|
|
|
}
|
|
|
|
|
2001-04-18 00:11:04 -03:00
|
|
|
sub do_cmd_versionadded{
|
2002-11-15 15:04:10 -04:00
|
|
|
return versionnote('New', $_[0]);
|
2001-04-18 00:11:04 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
sub do_cmd_versionchanged{
|
2002-11-15 15:04:10 -04:00
|
|
|
return versionnote('Changed', $_[0]);
|
2001-04-18 00:11:04 -03:00
|
|
|
}
|
|
|
|
|
1999-03-02 12:05:35 -04:00
|
|
|
#
|
1999-03-25 12:57:04 -04:00
|
|
|
# These function handle platform dependency tracking.
|
1999-03-02 12:05:35 -04:00
|
|
|
#
|
|
|
|
sub do_cmd_platform{
|
|
|
|
local($_) = @_;
|
|
|
|
my $platform = next_argument();
|
2001-06-20 18:29:30 -03:00
|
|
|
$ModulePlatforms{"<tt class=\"module\">$THIS_MODULE</tt>"} = $platform;
|
1999-03-02 12:05:35 -04:00
|
|
|
$platform = "Macintosh"
|
1999-04-21 11:00:29 -03:00
|
|
|
if $platform eq 'Mac';
|
2001-06-20 18:29:30 -03:00
|
|
|
return "\n<p class=\"availability\">Availability: <span"
|
|
|
|
. "\n class=\"platform\">$platform</span>.</p>\n" . $_;
|
1999-03-02 12:05:35 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
$IGNORE_PLATFORM_ANNOTATION = '';
|
|
|
|
sub do_cmd_ignorePlatformAnnotation{
|
|
|
|
local($_) = @_;
|
|
|
|
$IGNORE_PLATFORM_ANNOTATION = next_argument();
|
|
|
|
return $_;
|
|
|
|
}
|
|
|
|
|
1998-03-03 18:02:19 -04:00
|
|
|
|
|
|
|
# index commands
|
|
|
|
|
|
|
|
$INDEX_SUBITEM = "";
|
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub get_indexsubitem(){
|
1999-01-05 10:39:27 -04:00
|
|
|
return $INDEX_SUBITEM ? " $INDEX_SUBITEM" : '';
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
sub do_cmd_setindexsubitem{
|
|
|
|
local($_) = @_;
|
1999-02-10 17:17:04 -04:00
|
|
|
$INDEX_SUBITEM = next_argument();
|
1998-08-10 16:40:44 -03:00
|
|
|
return $_;
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
1998-03-12 17:03:26 -04:00
|
|
|
sub do_cmd_withsubitem{
|
1999-01-05 10:39:27 -04:00
|
|
|
# We can't really do the right thing, because LaTeX2HTML doesn't
|
1998-03-12 17:03:26 -04:00
|
|
|
# do things in the right order, but we need to at least strip this stuff
|
|
|
|
# out, and leave anything that the second argument expanded out to.
|
|
|
|
#
|
|
|
|
local($_) = @_;
|
1999-01-05 10:39:27 -04:00
|
|
|
my $oldsubitem = $INDEX_SUBITEM;
|
|
|
|
$INDEX_SUBITEM = next_argument();
|
1998-04-16 23:15:42 -03:00
|
|
|
my $stuff = next_argument();
|
1999-01-05 18:16:29 -04:00
|
|
|
my $br_id = ++$globals{'max_id'};
|
|
|
|
my $marker = "$O$br_id$C";
|
2001-12-11 16:49:23 -04:00
|
|
|
$stuff =~ s/^\s+//;
|
1999-01-05 10:39:27 -04:00
|
|
|
return
|
|
|
|
$stuff
|
1999-01-05 18:16:29 -04:00
|
|
|
. "\\setindexsubitem$marker$oldsubitem$marker"
|
1999-01-05 10:39:27 -04:00
|
|
|
. $_;
|
1998-03-12 17:03:26 -04:00
|
|
|
}
|
|
|
|
|
1998-04-16 23:15:42 -03:00
|
|
|
# This is the prologue macro which is required to start writing the
|
1999-05-13 15:36:54 -03:00
|
|
|
# mod\jobname.idx file; we can just ignore it. (Defining this suppresses
|
|
|
|
# a warning that \makemodindex is unknown.)
|
1998-04-16 23:15:42 -03:00
|
|
|
#
|
2002-11-15 15:04:10 -04:00
|
|
|
sub do_cmd_makemodindex{ return $_[0]; }
|
1998-03-12 17:03:26 -04:00
|
|
|
|
1998-03-27 01:16:10 -04:00
|
|
|
# We're in the document subdirectory when this happens!
|
1998-04-08 20:10:54 -03:00
|
|
|
#
|
1998-04-16 23:15:42 -03:00
|
|
|
open(IDXFILE, '>index.dat') || die "\n$!\n";
|
|
|
|
open(INTLABELS, '>intlabels.pl') || die "\n$!\n";
|
1998-04-08 20:10:54 -03:00
|
|
|
print INTLABELS "%internal_labels = ();\n";
|
2003-09-05 12:43:58 -03:00
|
|
|
print INTLABELS "1; # hack in case there are no entries\n\n";
|
1998-04-08 20:10:54 -03:00
|
|
|
|
|
|
|
# Using \0 for this is bad because we can't use common tools to work with the
|
|
|
|
# resulting files. Things like grep can be useful with this stuff!
|
|
|
|
#
|
|
|
|
$IDXFILE_FIELD_SEP = "\1";
|
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub write_idxfile($$){
|
|
|
|
my($ahref, $str) = @_;
|
1999-01-05 18:16:29 -04:00
|
|
|
print IDXFILE $ahref, $IDXFILE_FIELD_SEP, $str, "\n";
|
1998-03-27 01:16:10 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub gen_link($$){
|
|
|
|
my($node, $target) = @_;
|
2002-11-15 15:04:10 -04:00
|
|
|
print INTLABELS "\$internal_labels{\"$target\"} = \"/$node\";\n";
|
2001-06-20 18:29:30 -03:00
|
|
|
return "<a href=\"$node#$target\">";
|
1998-03-27 01:16:10 -04:00
|
|
|
}
|
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub add_index_entry($$){
|
1998-03-27 01:16:10 -04:00
|
|
|
# add an entry to the index structures; ignore the return value
|
2002-05-23 14:59:16 -03:00
|
|
|
my($str, $ahref) = @_;
|
1998-03-27 01:16:10 -04:00
|
|
|
$str = gen_index_id($str, '');
|
|
|
|
$index{$str} .= $ahref;
|
1999-01-05 18:16:29 -04:00
|
|
|
write_idxfile($ahref, $str);
|
1998-03-27 01:16:10 -04:00
|
|
|
}
|
|
|
|
|
2003-11-26 16:55:49 -04:00
|
|
|
sub new_link_name_info(){
|
1999-01-05 18:16:29 -04:00
|
|
|
my $name = "l2h-" . ++$globals{'max_id'};
|
1998-03-27 01:16:10 -04:00
|
|
|
my $ahref = gen_link($CURRENT_FILE, $name);
|
2003-11-26 16:55:49 -04:00
|
|
|
return ($name, $ahref);
|
|
|
|
}
|
|
|
|
|
|
|
|
sub new_link_info(){
|
|
|
|
my($name, $ahref) = new_link_name_info();
|
2004-10-29 16:47:52 -03:00
|
|
|
my $aname = "<a id='$name' xml:id='$name'>";
|
1998-03-27 01:16:10 -04:00
|
|
|
return ($name, $aname, $ahref);
|
|
|
|
}
|
|
|
|
|
1999-05-13 15:36:54 -03:00
|
|
|
$IndexMacroPattern = '';
|
2002-05-23 14:59:16 -03:00
|
|
|
sub define_indexing_macro(@){
|
1999-05-13 15:36:54 -03:00
|
|
|
my $count = @_;
|
|
|
|
my $i = 0;
|
|
|
|
for (; $i < $count; ++$i) {
|
2003-09-05 12:43:58 -03:00
|
|
|
my $name = $_[$i];
|
|
|
|
my $cmd = "idx_cmd_$name";
|
|
|
|
die "\nNo function $cmd() defined!\n"
|
|
|
|
if (!defined &$cmd);
|
|
|
|
eval ("sub do_cmd_$name { return process_index_macros("
|
|
|
|
. "\$_[0], '$name'); }");
|
|
|
|
if (length($IndexMacroPattern) == 0) {
|
|
|
|
$IndexMacroPattern = "$name";
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
$IndexMacroPattern .= "|$name";
|
|
|
|
}
|
1999-05-13 15:36:54 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
$DEBUG_INDEXING = 0;
|
2002-05-23 14:59:16 -03:00
|
|
|
sub process_index_macros($$){
|
1998-03-27 01:16:10 -04:00
|
|
|
local($_) = @_;
|
2003-09-05 12:43:58 -03:00
|
|
|
my $cmdname = $_[1]; # This is what triggered us in the first place;
|
|
|
|
# we know it's real, so just process it.
|
2002-05-23 14:59:16 -03:00
|
|
|
my($name, $aname, $ahref) = new_link_info();
|
1999-05-13 15:36:54 -03:00
|
|
|
my $cmd = "idx_cmd_$cmdname";
|
|
|
|
print "\nIndexing: \\$cmdname"
|
|
|
|
if $DEBUG_INDEXING;
|
2003-09-05 12:43:58 -03:00
|
|
|
&$cmd($ahref); # modifies $_ and adds index entries
|
1999-05-13 15:36:54 -03:00
|
|
|
while (/^[\s\n]*\\($IndexMacroPattern)</) {
|
2003-09-05 12:43:58 -03:00
|
|
|
$cmdname = "$1";
|
|
|
|
print " \\$cmdname"
|
|
|
|
if $DEBUG_INDEXING;
|
|
|
|
$cmd = "idx_cmd_$cmdname";
|
|
|
|
if (!defined &$cmd) {
|
|
|
|
last;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
s/^[\s\n]*\\$cmdname//;
|
|
|
|
&$cmd($ahref);
|
|
|
|
}
|
1999-05-13 15:36:54 -03:00
|
|
|
}
|
2004-04-08 12:30:12 -03:00
|
|
|
# XXX I don't remember why I added this to begin with.
|
|
|
|
# if (/^[ \t\r\n]/) {
|
|
|
|
# $_ = substr($_, 1);
|
|
|
|
# }
|
1998-08-10 16:40:44 -03:00
|
|
|
return "$aname$anchor_invisible_mark</a>" . $_;
|
1998-03-27 01:16:10 -04:00
|
|
|
}
|
|
|
|
|
1999-05-13 15:36:54 -03:00
|
|
|
define_indexing_macro('index');
|
2002-05-23 14:59:16 -03:00
|
|
|
sub idx_cmd_index($){
|
1999-01-05 18:16:29 -04:00
|
|
|
my $str = next_argument();
|
2002-11-15 15:04:10 -04:00
|
|
|
add_index_entry("$str", $_[0]);
|
1998-05-11 15:31:17 -03:00
|
|
|
}
|
|
|
|
|
1999-05-13 15:36:54 -03:00
|
|
|
define_indexing_macro('kwindex');
|
2002-05-23 14:59:16 -03:00
|
|
|
sub idx_cmd_kwindex($){
|
1999-05-13 15:36:54 -03:00
|
|
|
my $str = next_argument();
|
2002-11-15 15:04:10 -04:00
|
|
|
add_index_entry("<tt>$str</tt>!keyword", $_[0]);
|
|
|
|
add_index_entry("keyword!<tt>$str</tt>", $_[0]);
|
1999-05-13 15:36:54 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
define_indexing_macro('indexii');
|
2002-05-23 14:59:16 -03:00
|
|
|
sub idx_cmd_indexii($){
|
1999-01-05 18:16:29 -04:00
|
|
|
my $str1 = next_argument();
|
1998-04-16 23:15:42 -03:00
|
|
|
my $str2 = next_argument();
|
2002-11-15 15:04:10 -04:00
|
|
|
add_index_entry("$str1!$str2", $_[0]);
|
|
|
|
add_index_entry("$str2!$str1", $_[0]);
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
1999-05-13 15:36:54 -03:00
|
|
|
define_indexing_macro('indexiii');
|
2002-05-23 14:59:16 -03:00
|
|
|
sub idx_cmd_indexiii($){
|
1999-01-05 18:16:29 -04:00
|
|
|
my $str1 = next_argument();
|
1998-04-16 23:15:42 -03:00
|
|
|
my $str2 = next_argument();
|
|
|
|
my $str3 = next_argument();
|
2002-11-15 15:04:10 -04:00
|
|
|
add_index_entry("$str1!$str2 $str3", $_[0]);
|
|
|
|
add_index_entry("$str2!$str3, $str1", $_[0]);
|
|
|
|
add_index_entry("$str3!$str1 $str2", $_[0]);
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
1999-05-13 15:36:54 -03:00
|
|
|
define_indexing_macro('indexiv');
|
2002-05-23 14:59:16 -03:00
|
|
|
sub idx_cmd_indexiv($){
|
1999-01-05 18:16:29 -04:00
|
|
|
my $str1 = next_argument();
|
1998-04-16 23:15:42 -03:00
|
|
|
my $str2 = next_argument();
|
|
|
|
my $str3 = next_argument();
|
|
|
|
my $str4 = next_argument();
|
2002-11-15 15:04:10 -04:00
|
|
|
add_index_entry("$str1!$str2 $str3 $str4", $_[0]);
|
|
|
|
add_index_entry("$str2!$str3 $str4, $str1", $_[0]);
|
|
|
|
add_index_entry("$str3!$str4, $str1 $str2", $_[0]);
|
|
|
|
add_index_entry("$str4!$str1 $str2 $str3", $_[0]);
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
1999-05-13 15:36:54 -03:00
|
|
|
define_indexing_macro('ttindex');
|
2002-05-23 14:59:16 -03:00
|
|
|
sub idx_cmd_ttindex($){
|
2003-12-30 12:19:28 -04:00
|
|
|
my $str = codetext(next_argument());
|
1999-01-05 18:16:29 -04:00
|
|
|
my $entry = $str . get_indexsubitem();
|
2002-11-15 15:04:10 -04:00
|
|
|
add_index_entry($entry, $_[0]);
|
1998-03-17 02:29:13 -04:00
|
|
|
}
|
1998-03-03 18:02:19 -04:00
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub my_typed_index_helper($$){
|
|
|
|
my($word, $ahref) = @_;
|
1999-01-05 18:16:29 -04:00
|
|
|
my $str = next_argument();
|
1998-03-27 01:16:10 -04:00
|
|
|
add_index_entry("$str $word", $ahref);
|
|
|
|
add_index_entry("$word!$str", $ahref);
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
1999-05-13 15:36:54 -03:00
|
|
|
define_indexing_macro('stindex', 'opindex', 'exindex', 'obindex');
|
2002-11-15 15:04:10 -04:00
|
|
|
sub idx_cmd_stindex($){ my_typed_index_helper('statement', $_[0]); }
|
|
|
|
sub idx_cmd_opindex($){ my_typed_index_helper('operator', $_[0]); }
|
|
|
|
sub idx_cmd_exindex($){ my_typed_index_helper('exception', $_[0]); }
|
|
|
|
sub idx_cmd_obindex($){ my_typed_index_helper('object', $_[0]); }
|
1998-03-03 18:02:19 -04:00
|
|
|
|
1999-05-13 15:36:54 -03:00
|
|
|
define_indexing_macro('bifuncindex');
|
2002-05-23 14:59:16 -03:00
|
|
|
sub idx_cmd_bifuncindex($){
|
1999-01-05 18:16:29 -04:00
|
|
|
my $str = next_argument();
|
2001-06-20 18:29:30 -03:00
|
|
|
add_index_entry("<tt class=\"function\">$str()</tt> (built-in function)",
|
2002-11-15 15:04:10 -04:00
|
|
|
$_[0]);
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub make_mod_index_entry($$){
|
|
|
|
my($str, $define) = @_;
|
|
|
|
my($name, $aname, $ahref) = new_link_info();
|
1998-03-27 01:16:10 -04:00
|
|
|
# equivalent of add_index_entry() using $define instead of ''
|
1999-02-10 17:17:04 -04:00
|
|
|
$ahref =~ s/\#[-_a-zA-Z0-9]*\"/\"/
|
|
|
|
if ($define eq 'DEF');
|
1998-03-27 01:16:10 -04:00
|
|
|
$str = gen_index_id($str, $define);
|
|
|
|
$index{$str} .= $ahref;
|
1999-01-05 18:16:29 -04:00
|
|
|
write_idxfile($ahref, $str);
|
1998-03-27 01:16:10 -04:00
|
|
|
|
1998-03-17 02:29:13 -04:00
|
|
|
if ($define eq 'DEF') {
|
2003-09-05 12:43:58 -03:00
|
|
|
# add to the module index
|
2000-04-03 01:51:13 -03:00
|
|
|
$str =~ /(<tt.*<\/tt>)/;
|
|
|
|
my $nstr = $1;
|
2003-09-05 12:43:58 -03:00
|
|
|
$Modules{$nstr} .= $ahref;
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
2001-01-22 13:33:24 -04:00
|
|
|
return "$aname$anchor_invisible_mark2</a>";
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
1999-03-02 12:05:35 -04:00
|
|
|
|
1998-03-17 02:29:13 -04:00
|
|
|
$THIS_MODULE = '';
|
1998-03-27 01:16:10 -04:00
|
|
|
$THIS_CLASS = '';
|
1998-03-17 02:29:13 -04:00
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub define_module($$){
|
|
|
|
my($word, $name) = @_;
|
1998-03-17 02:29:13 -04:00
|
|
|
my $section_tag = join('', @curr_sec_id);
|
1999-05-17 12:00:32 -03:00
|
|
|
if ($word ne "built-in" && $word ne "extension"
|
2003-09-05 12:43:58 -03:00
|
|
|
&& $word ne "standard" && $word ne "") {
|
|
|
|
write_warnings("Bad module type '$word'"
|
|
|
|
. " for \\declaremodule (module $name)");
|
|
|
|
$word = "";
|
1999-05-17 12:00:32 -03:00
|
|
|
}
|
1998-03-03 18:02:19 -04:00
|
|
|
$word = "$word " if $word;
|
1998-07-24 19:16:04 -03:00
|
|
|
$THIS_MODULE = "$name";
|
2000-10-30 02:24:56 -04:00
|
|
|
$INDEX_SUBITEM = "(in module $name)";
|
1999-02-10 17:17:04 -04:00
|
|
|
print "[$name]";
|
2000-04-03 01:51:13 -03:00
|
|
|
return make_mod_index_entry(
|
2001-06-20 18:29:30 -03:00
|
|
|
"<tt class=\"module\">$name</tt> (${word}module)", 'DEF');
|
1998-07-24 19:16:04 -03:00
|
|
|
}
|
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub my_module_index_helper($$){
|
1998-07-24 19:16:04 -03:00
|
|
|
local($word, $_) = @_;
|
|
|
|
my $name = next_argument();
|
1998-08-10 16:40:44 -03:00
|
|
|
return define_module($word, $name) . $_;
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
2002-11-15 15:04:10 -04:00
|
|
|
sub do_cmd_modindex{ return my_module_index_helper('', $_[0]); }
|
|
|
|
sub do_cmd_bimodindex{ return my_module_index_helper('built-in', $_[0]); }
|
|
|
|
sub do_cmd_exmodindex{ return my_module_index_helper('extension', $_[0]); }
|
|
|
|
sub do_cmd_stmodindex{ return my_module_index_helper('standard', $_[0]); }
|
|
|
|
# local($_) = @_;
|
|
|
|
# my $name = next_argument();
|
|
|
|
# return define_module('standard', $name) . $_;
|
|
|
|
# }
|
1998-03-03 18:02:19 -04:00
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub ref_module_index_helper($$){
|
2000-04-26 15:05:24 -03:00
|
|
|
my($word, $ahref) = @_;
|
1999-05-13 15:36:54 -03:00
|
|
|
my $str = next_argument();
|
|
|
|
$word = "$word " if $word;
|
2001-06-20 18:29:30 -03:00
|
|
|
$str = "<tt class=\"module\">$str</tt> (${word}module)";
|
1999-05-13 15:36:54 -03:00
|
|
|
# can't use add_index_entry() since the 2nd arg to gen_index_id() is used;
|
|
|
|
# just inline it all here
|
|
|
|
$str = gen_index_id($str, 'REF');
|
|
|
|
$index{$str} .= $ahref;
|
|
|
|
write_idxfile($ahref, $str);
|
|
|
|
}
|
|
|
|
|
1998-03-03 18:02:19 -04:00
|
|
|
# these should be adjusted a bit....
|
1999-05-13 15:36:54 -03:00
|
|
|
define_indexing_macro('refmodindex', 'refbimodindex',
|
2003-09-05 12:43:58 -03:00
|
|
|
'refexmodindex', 'refstmodindex');
|
2002-11-15 15:04:10 -04:00
|
|
|
sub idx_cmd_refmodindex($){
|
|
|
|
return ref_module_index_helper('', $_[0]); }
|
|
|
|
sub idx_cmd_refbimodindex($){
|
|
|
|
return ref_module_index_helper('built-in', $_[0]); }
|
|
|
|
sub idx_cmd_refexmodindex($){
|
|
|
|
return ref_module_index_helper('extension', $_[0]);}
|
|
|
|
sub idx_cmd_refstmodindex($){
|
|
|
|
return ref_module_index_helper('standard', $_[0]); }
|
1998-03-03 18:02:19 -04:00
|
|
|
|
2002-11-15 15:04:10 -04:00
|
|
|
sub do_cmd_nodename{ return do_cmd_label($_[0]); }
|
1998-03-03 18:02:19 -04:00
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub init_myformat(){
|
2004-11-11 04:05:34 -04:00
|
|
|
# This depends on the override of text_cleanup() in l2hinit.perl;
|
|
|
|
# if that function cleans out empty tags, the first three of these
|
|
|
|
# variables must be set to comments.
|
|
|
|
#
|
2003-08-05 02:00:23 -03:00
|
|
|
# Thanks to Dave Kuhlman for figuring why some named anchors were
|
|
|
|
# being lost.
|
2004-11-11 04:05:34 -04:00
|
|
|
$anchor_invisible_mark = '';
|
|
|
|
$anchor_invisible_mark2 = '';
|
|
|
|
$anchor_mark = '';
|
1998-03-03 18:02:19 -04:00
|
|
|
$icons{'anchor_mark'} = '';
|
1998-03-27 01:16:10 -04:00
|
|
|
}
|
|
|
|
init_myformat();
|
1998-03-03 18:02:19 -04:00
|
|
|
|
1999-05-13 15:36:54 -03:00
|
|
|
# Create an index entry, but include the string in the target anchor
|
1998-03-03 18:02:19 -04:00
|
|
|
# instead of the dummy filler.
|
|
|
|
#
|
2002-05-23 14:59:16 -03:00
|
|
|
sub make_str_index_entry($){
|
2002-11-15 15:04:10 -04:00
|
|
|
my $str = $_[0];
|
2003-11-26 16:55:49 -04:00
|
|
|
my($name, $ahref) = new_link_name_info();
|
1998-03-27 01:16:10 -04:00
|
|
|
add_index_entry($str, $ahref);
|
2003-11-26 16:55:49 -04:00
|
|
|
if ($str =~ /^<[a-z]+\b/) {
|
|
|
|
my $s = "$str";
|
2004-10-29 16:47:52 -03:00
|
|
|
$s =~ s/^<([a-z]+)\b/<$1 id='$name' xml:id='$name'/;
|
2003-11-26 16:55:49 -04:00
|
|
|
return $s;
|
|
|
|
}
|
|
|
|
else {
|
2004-10-29 16:47:52 -03:00
|
|
|
return "<a id='$name' xml:id='$name'>$str</a>";
|
2003-11-26 16:55:49 -04:00
|
|
|
}
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
2001-07-06 19:43:02 -03:00
|
|
|
|
2002-10-30 17:38:32 -04:00
|
|
|
%TokenToTargetMapping = (); # language:token -> link target
|
|
|
|
%DefinedGrammars = (); # language -> full grammar text
|
|
|
|
%BackpatchGrammarFiles = (); # file -> 1 (hash of files to fixup)
|
2001-07-06 19:43:02 -03:00
|
|
|
|
|
|
|
sub do_cmd_token{
|
|
|
|
local($_) = @_;
|
|
|
|
my $token = next_argument();
|
|
|
|
my $target = $TokenToTargetMapping{"$CURRENT_GRAMMAR:$token"};
|
|
|
|
if ($token eq $CURRENT_TOKEN || $CURRENT_GRAMMAR eq '*') {
|
|
|
|
# recursive definition or display-only productionlist
|
|
|
|
return "$token";
|
|
|
|
}
|
|
|
|
if ($target eq '') {
|
|
|
|
$target = "<pyGrammarToken><$CURRENT_GRAMMAR><$token>";
|
|
|
|
if (! $BackpatchGrammarFiles{"$CURRENT_FILE"}) {
|
|
|
|
print "Adding '$CURRENT_FILE' to back-patch list.\n";
|
|
|
|
}
|
|
|
|
$BackpatchGrammarFiles{"$CURRENT_FILE"} = 1;
|
|
|
|
}
|
2004-11-10 13:02:43 -04:00
|
|
|
return "<a class='grammartoken' href=\"$target\">$token</a>" . $_;
|
2001-07-06 19:43:02 -03:00
|
|
|
}
|
|
|
|
|
2001-08-20 18:36:38 -03:00
|
|
|
sub do_cmd_grammartoken{
|
|
|
|
return do_cmd_token(@_);
|
|
|
|
}
|
|
|
|
|
2001-07-06 19:43:02 -03:00
|
|
|
sub do_env_productionlist{
|
|
|
|
local($_) = @_;
|
|
|
|
my $lang = next_optional_argument();
|
|
|
|
my $filename = "grammar-$lang.txt";
|
|
|
|
if ($lang eq '') {
|
|
|
|
$filename = 'grammar.txt';
|
|
|
|
}
|
|
|
|
local($CURRENT_GRAMMAR) = $lang;
|
|
|
|
$DefinedGrammars{$lang} .= $_;
|
|
|
|
return ("<dl><dd class=\"grammar\">\n"
|
|
|
|
. "<div class=\"productions\">\n"
|
2004-11-10 13:02:43 -04:00
|
|
|
. "<table>\n"
|
2001-07-06 19:43:02 -03:00
|
|
|
. translate_commands(translate_environments($_))
|
|
|
|
. "</table>\n"
|
|
|
|
. "</div>\n"
|
|
|
|
. (($lang eq '*')
|
|
|
|
? ''
|
|
|
|
: ("<a class=\"grammar-footer\"\n"
|
|
|
|
. " href=\"$filename\" type=\"text/plain\"\n"
|
|
|
|
. " >Download entire grammar as text.</a>\n"))
|
|
|
|
. "</dd></dl>");
|
|
|
|
}
|
|
|
|
|
|
|
|
sub do_cmd_production{
|
|
|
|
local($_) = @_;
|
|
|
|
my $token = next_argument();
|
|
|
|
my $defn = next_argument();
|
|
|
|
my $lang = $CURRENT_GRAMMAR;
|
|
|
|
local($CURRENT_TOKEN) = $token;
|
|
|
|
if ($lang eq '*') {
|
2004-11-10 13:02:43 -04:00
|
|
|
return ("<tr>\n"
|
|
|
|
. " <td>$token</td>\n"
|
|
|
|
. " <td>::=</td>\n"
|
|
|
|
. " <td>"
|
2001-07-06 19:43:02 -03:00
|
|
|
. translate_commands($defn)
|
2004-11-10 13:02:43 -04:00
|
|
|
. "</td></tr>"
|
2001-07-06 19:43:02 -03:00
|
|
|
. $_);
|
|
|
|
}
|
|
|
|
my $target;
|
|
|
|
if ($lang eq '') {
|
|
|
|
$target = "$CURRENT_FILE\#tok-$token";
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
$target = "$CURRENT_FILE\#tok-$lang-$token";
|
|
|
|
}
|
|
|
|
$TokenToTargetMapping{"$CURRENT_GRAMMAR:$token"} = $target;
|
2004-11-10 13:02:43 -04:00
|
|
|
return ("<tr>\n"
|
|
|
|
. " <td><a id='tok-$token' xml:id='tok-$token'>"
|
|
|
|
. "$token</a></td>\n"
|
|
|
|
. " <td>::=</td>\n"
|
|
|
|
. " <td>"
|
2001-07-06 19:43:02 -03:00
|
|
|
. translate_commands($defn)
|
2004-11-10 13:02:43 -04:00
|
|
|
. "</td></tr>"
|
2001-07-06 19:43:02 -03:00
|
|
|
. $_);
|
|
|
|
}
|
|
|
|
|
2002-03-15 19:21:37 -04:00
|
|
|
sub do_cmd_productioncont{
|
|
|
|
local($_) = @_;
|
|
|
|
my $defn = next_argument();
|
2002-06-18 15:30:28 -03:00
|
|
|
$defn =~ s/^( +)/' ' x length $1/e;
|
2004-11-10 13:02:43 -04:00
|
|
|
return ("<tr>\n"
|
|
|
|
. " <td></td>\n"
|
|
|
|
. " <td></td>\n"
|
2002-03-15 19:21:37 -04:00
|
|
|
. " <td><code>"
|
|
|
|
. translate_commands($defn)
|
|
|
|
. "</code></td></tr>"
|
|
|
|
. $_);
|
|
|
|
}
|
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub process_grammar_files(){
|
2001-07-06 19:43:02 -03:00
|
|
|
my $lang;
|
|
|
|
my $filename;
|
|
|
|
local($_);
|
|
|
|
print "process_grammar_files()\n";
|
|
|
|
foreach $lang (keys %DefinedGrammars) {
|
|
|
|
$filename = "grammar-$lang.txt";
|
|
|
|
if ($lang eq '*') {
|
|
|
|
next;
|
|
|
|
}
|
|
|
|
if ($lang eq '') {
|
|
|
|
$filename = 'grammar.txt';
|
|
|
|
}
|
|
|
|
open(GRAMMAR, ">$filename") || die "\n$!\n";
|
Four months of trunk changes (including a few releases...)
Merged revisions 51434-53004 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r51434 | neal.norwitz | 2006-08-21 20:20:10 +0200 (Mon, 21 Aug 2006) | 1 line
Fix a couple of ssize-t issues reported by Alexander Belopolsky on python-dev
........
r51439 | neal.norwitz | 2006-08-21 21:47:08 +0200 (Mon, 21 Aug 2006) | 6 lines
Patch #1542451: disallow continue anywhere under a finally
I'm undecided if this should be backported to 2.5 or 2.5.1.
Armin suggested to wait (I'm of the same opinion). Thomas W thinks
it's fine to go in 2.5.
........
r51443 | neal.norwitz | 2006-08-21 22:16:24 +0200 (Mon, 21 Aug 2006) | 4 lines
Handle a few more error conditions.
Klocwork 301 and 302. Will backport.
........
r51450 | neal.norwitz | 2006-08-22 00:21:19 +0200 (Tue, 22 Aug 2006) | 5 lines
Patch #1541585: fix buffer overrun when performing repr() on
a unicode string in a build with wide unicode (UCS-4) support.
This code could be improved, so add an XXX comment.
........
r51456 | neal.norwitz | 2006-08-22 01:44:48 +0200 (Tue, 22 Aug 2006) | 1 line
Try to get the windows bots working again with the new peephole.c
........
r51461 | anthony.baxter | 2006-08-22 09:36:59 +0200 (Tue, 22 Aug 2006) | 1 line
patch for documentation for recent uuid changes (from ping)
........
r51473 | neal.norwitz | 2006-08-22 15:56:56 +0200 (Tue, 22 Aug 2006) | 1 line
Alexander Belopolsky pointed out that pos is a size_t
........
r51489 | jeremy.hylton | 2006-08-22 22:46:00 +0200 (Tue, 22 Aug 2006) | 2 lines
Expose column offset information in parse trees.
........
r51497 | andrew.kuchling | 2006-08-23 01:13:43 +0200 (Wed, 23 Aug 2006) | 1 line
Move functional howto into trunk
........
r51515 | jeremy.hylton | 2006-08-23 20:37:43 +0200 (Wed, 23 Aug 2006) | 2 lines
Baby steps towards better tests for tokenize
........
r51525 | alex.martelli | 2006-08-23 22:42:02 +0200 (Wed, 23 Aug 2006) | 6 lines
x**2 should about equal x*x (including for a float x such that the result is
inf) but didn't; added a test to test_float to verify that, and ignored the
ERANGE value for errno in the pow operation to make the new test pass (with
help from Marilyn Davis at the Google Python Sprint -- thanks!).
........
r51526 | jeremy.hylton | 2006-08-23 23:14:03 +0200 (Wed, 23 Aug 2006) | 20 lines
Bug fixes large and small for tokenize.
Small: Always generate a NL or NEWLINE token following
a COMMENT token. The old code did not generate an NL token if
the comment was on a line by itself.
Large: The output of untokenize() will now match the
input exactly if it is passed the full token sequence. The
old, crufty output is still generated if a limited input
sequence is provided, where limited means that it does not
include position information for tokens.
Remaining bug: There is no CONTINUATION token (\) so there is no way
for untokenize() to handle such code.
Also, expanded the number of doctests in hopes of eventually removing
the old-style tests that compare against a golden file.
Bug fix candidate for Python 2.5.1. (Sigh.)
........
r51527 | jeremy.hylton | 2006-08-23 23:26:46 +0200 (Wed, 23 Aug 2006) | 5 lines
Replace dead code with an assert.
Now that COMMENT tokens are reliably followed by NL or NEWLINE,
there is never a need to add extra newlines in untokenize.
........
r51530 | alex.martelli | 2006-08-24 00:17:59 +0200 (Thu, 24 Aug 2006) | 7 lines
Reverting the patch that tried to fix the issue whereby x**2 raises
OverflowError while x*x succeeds and produces infinity; apparently
these inconsistencies cannot be fixed across ``all'' platforms and
there's a widespread feeling that therefore ``every'' platform
should keep suffering forevermore. Ah well.
........
r51565 | thomas.wouters | 2006-08-24 20:40:20 +0200 (Thu, 24 Aug 2006) | 6 lines
Fix SF bug #1545837: array.array borks on deepcopy.
array.__deepcopy__() needs to take an argument, even if it doesn't actually
use it. Will backport to 2.5 and 2.4 (if applicable.)
........
r51580 | martin.v.loewis | 2006-08-25 02:03:34 +0200 (Fri, 25 Aug 2006) | 3 lines
Patch #1545507: Exclude ctypes package in Win64 MSI file.
Will backport to 2.5.
........
r51589 | neal.norwitz | 2006-08-25 03:52:49 +0200 (Fri, 25 Aug 2006) | 1 line
importing types is not necessary if we use isinstance
........
r51604 | thomas.heller | 2006-08-25 09:27:33 +0200 (Fri, 25 Aug 2006) | 3 lines
Port _ctypes.pyd to win64 on AMD64.
........
r51605 | thomas.heller | 2006-08-25 09:34:51 +0200 (Fri, 25 Aug 2006) | 3 lines
Add missing file for _ctypes.pyd port to win64 on AMD64.
........
r51606 | thomas.heller | 2006-08-25 11:26:33 +0200 (Fri, 25 Aug 2006) | 6 lines
Build _ctypes.pyd for win AMD64 into the MSVC project file.
Since MSVC doesn't know about .asm files, a helper batch file is needed
to find ml64.exe in predefined locations. The helper script hardcodes
the path to the MS Platform SDK.
........
r51608 | armin.rigo | 2006-08-25 14:44:28 +0200 (Fri, 25 Aug 2006) | 4 lines
The regular expression engine in '_sre' can segfault when interpreting
bogus bytecode. It is unclear whether this is a real bug or a "won't
fix" case like bogus_code_obj.py.
........
r51617 | tim.peters | 2006-08-26 00:05:39 +0200 (Sat, 26 Aug 2006) | 2 lines
Whitespace normalization.
........
r51618 | tim.peters | 2006-08-26 00:06:44 +0200 (Sat, 26 Aug 2006) | 2 lines
Add missing svn:eol-style property to text files.
........
r51619 | tim.peters | 2006-08-26 00:26:21 +0200 (Sat, 26 Aug 2006) | 3 lines
A new test here relied on preserving invisible trailing
whitespace in expected output. Stop that.
........
r51624 | jack.diederich | 2006-08-26 20:42:06 +0200 (Sat, 26 Aug 2006) | 4 lines
- Move functions common to all path modules into genericpath.py and have the
OS speicifc path modules import them.
- Have os2emxpath import common functions fron ntpath instead of using copies
........
r51642 | neal.norwitz | 2006-08-29 07:40:58 +0200 (Tue, 29 Aug 2006) | 1 line
Fix a couple of typos.
........
r51647 | marc-andre.lemburg | 2006-08-29 12:34:12 +0200 (Tue, 29 Aug 2006) | 5 lines
Fix a buglet in the error reporting (SF bug report #1546372).
This should probably go into Python 2.5 or 2.5.1 as well.
........
r51663 | armin.rigo | 2006-08-31 10:51:06 +0200 (Thu, 31 Aug 2006) | 3 lines
Doc fix: hashlib objects don't always return a digest of 16 bytes.
Backport candidate for 2.5.
........
r51664 | nick.coghlan | 2006-08-31 14:00:43 +0200 (Thu, 31 Aug 2006) | 1 line
Fix the wrongheaded implementation of context management in the decimal module and add unit tests. (python-dev discussion is ongoing regarding what we do about Python 2.5)
........
r51665 | nick.coghlan | 2006-08-31 14:51:25 +0200 (Thu, 31 Aug 2006) | 1 line
Remove the old decimal context management tests from test_contextlib (guess who didn't run the test suite before committing...)
........
r51669 | brett.cannon | 2006-08-31 20:54:26 +0200 (Thu, 31 Aug 2006) | 4 lines
Make sure memory is properly cleaned up in file_init.
Backport candidate.
........
r51671 | brett.cannon | 2006-08-31 23:47:52 +0200 (Thu, 31 Aug 2006) | 2 lines
Fix comment about indentation level in C files.
........
r51674 | brett.cannon | 2006-09-01 00:42:37 +0200 (Fri, 01 Sep 2006) | 3 lines
Have pre-existing C files use 8 spaces indents (to match old PEP 7 style), but
have all new files use 4 spaces (to match current PEP 7 style).
........
r51676 | fred.drake | 2006-09-01 05:57:19 +0200 (Fri, 01 Sep 2006) | 3 lines
- SF patch #1550263: Enhance and correct unittest docs
- various minor cleanups for improved consistency
........
r51677 | georg.brandl | 2006-09-02 00:30:52 +0200 (Sat, 02 Sep 2006) | 2 lines
evalfile() should be execfile().
........
r51681 | neal.norwitz | 2006-09-02 04:43:17 +0200 (Sat, 02 Sep 2006) | 1 line
SF #1547931, fix typo (missing and). Will backport to 2.5
........
r51683 | neal.norwitz | 2006-09-02 04:50:35 +0200 (Sat, 02 Sep 2006) | 1 line
Bug #1548092: fix curses.tparm seg fault on invalid input. Needs backport to 2.5.1 and earlier.
........
r51684 | neal.norwitz | 2006-09-02 04:58:13 +0200 (Sat, 02 Sep 2006) | 4 lines
Bug #1550714: fix SystemError from itertools.tee on negative value for n.
Needs backport to 2.5.1 and earlier.
........
r51685 | nick.coghlan | 2006-09-02 05:54:17 +0200 (Sat, 02 Sep 2006) | 1 line
Make decimal.ContextManager a private implementation detail of decimal.localcontext()
........
r51686 | nick.coghlan | 2006-09-02 06:04:18 +0200 (Sat, 02 Sep 2006) | 1 line
Further corrections to the decimal module context management documentation
........
r51688 | raymond.hettinger | 2006-09-02 19:07:23 +0200 (Sat, 02 Sep 2006) | 1 line
Fix documentation nits for decimal context managers.
........
r51690 | neal.norwitz | 2006-09-02 20:51:34 +0200 (Sat, 02 Sep 2006) | 1 line
Add missing word in comment
........
r51691 | neal.norwitz | 2006-09-02 21:40:19 +0200 (Sat, 02 Sep 2006) | 7 lines
Hmm, this test has failed at least twice recently on the OpenBSD and
Debian sparc buildbots. Since this goes through a lot of tests
and hits the disk a lot it could be slow (especially if NFS is involved).
I'm not sure if that's the problem, but printing periodic msgs shouldn't hurt.
The code was stolen from test_compiler.
........
r51693 | nick.coghlan | 2006-09-03 03:02:00 +0200 (Sun, 03 Sep 2006) | 1 line
Fix final documentation nits before backporting decimal module fixes to 2.5
........
r51694 | nick.coghlan | 2006-09-03 03:06:07 +0200 (Sun, 03 Sep 2006) | 1 line
Typo fix for decimal docs
........
r51697 | nick.coghlan | 2006-09-03 03:20:46 +0200 (Sun, 03 Sep 2006) | 1 line
NEWS entry on trunk for decimal module changes
........
r51704 | raymond.hettinger | 2006-09-04 17:32:48 +0200 (Mon, 04 Sep 2006) | 1 line
Fix endcase for str.rpartition()
........
r51716 | tim.peters | 2006-09-05 04:18:09 +0200 (Tue, 05 Sep 2006) | 12 lines
"Conceptual" merge of rev 51711 from the 2.5 branch.
i_divmod(): As discussed on Python-Dev, changed the overflow
checking to live happily with recent gcc optimizations that
assume signed integer arithmetic never overflows.
This differs from the corresponding change on the 2.5 and 2.4
branches, using a less obscure approach, but one that /may/
tickle platform idiocies in their definitions of LONG_MIN.
The 2.4 + 2.5 change avoided introducing a dependence on
LONG_MIN, at the cost of substantially goofier code.
........
r51717 | tim.peters | 2006-09-05 04:21:19 +0200 (Tue, 05 Sep 2006) | 2 lines
Whitespace normalization.
........
r51719 | tim.peters | 2006-09-05 04:22:17 +0200 (Tue, 05 Sep 2006) | 2 lines
Add missing svn:eol-style property to text files.
........
r51720 | neal.norwitz | 2006-09-05 04:24:03 +0200 (Tue, 05 Sep 2006) | 2 lines
Fix SF bug #1546288, crash in dict_equal.
........
r51721 | neal.norwitz | 2006-09-05 04:25:41 +0200 (Tue, 05 Sep 2006) | 1 line
Fix SF #1552093, eval docstring typo (3 ps in mapping)
........
r51724 | neal.norwitz | 2006-09-05 04:35:08 +0200 (Tue, 05 Sep 2006) | 1 line
This was found by Guido AFAIK on p3yk (sic) branch.
........
r51725 | neal.norwitz | 2006-09-05 04:36:20 +0200 (Tue, 05 Sep 2006) | 1 line
Add a NEWS entry for str.rpartition() change
........
r51728 | neal.norwitz | 2006-09-05 04:57:01 +0200 (Tue, 05 Sep 2006) | 1 line
Patch #1540470, for OpenBSD 4.0. Backport candidate for 2.[34].
........
r51729 | neal.norwitz | 2006-09-05 05:53:08 +0200 (Tue, 05 Sep 2006) | 12 lines
Bug #1520864 (again): unpacking singleton tuples in list comprehensions and
generator expressions (x for x, in ... ) works again.
Sigh, I only fixed for loops the first time, not list comps and genexprs too.
I couldn't find any more unpacking cases where there is a similar bug lurking.
This code should be refactored to eliminate the duplication. I'm sure
the listcomp/genexpr code can be refactored. I'm not sure if the for loop
can re-use any of the same code though.
Will backport to 2.5 (the only place it matters).
........
r51731 | neal.norwitz | 2006-09-05 05:58:26 +0200 (Tue, 05 Sep 2006) | 1 line
Add a comment about some refactoring. (There's probably more that should be done.) I will reformat this file in the next checkin due to the inconsistent tabs/spaces.
........
r51732 | neal.norwitz | 2006-09-05 06:00:12 +0200 (Tue, 05 Sep 2006) | 1 line
M-x untabify
........
r51737 | hyeshik.chang | 2006-09-05 14:07:09 +0200 (Tue, 05 Sep 2006) | 7 lines
Fix a few bugs on cjkcodecs found by Oren Tirosh:
- gbk and gb18030 codec now handle U+30FB KATAKANA MIDDLE DOT correctly.
- iso2022_jp_2 codec now encodes into G0 for KS X 1001, GB2312
codepoints to conform the standard.
- iso2022_jp_3 and iso2022_jp_2004 codec can encode JIS X 2013:2
codepoints now.
........
r51738 | hyeshik.chang | 2006-09-05 14:14:57 +0200 (Tue, 05 Sep 2006) | 2 lines
Fix a typo: 2013 -> 0213
........
r51740 | georg.brandl | 2006-09-05 14:44:58 +0200 (Tue, 05 Sep 2006) | 3 lines
Bug #1552618: change docs of dict.has_key() to reflect recommendation
to use "in".
........
r51742 | andrew.kuchling | 2006-09-05 15:02:40 +0200 (Tue, 05 Sep 2006) | 1 line
Rearrange example a bit, and show rpartition() when separator is not found
........
r51744 | andrew.kuchling | 2006-09-05 15:15:41 +0200 (Tue, 05 Sep 2006) | 1 line
[Bug #1525469] SimpleXMLRPCServer still uses the sys.exc_{value,type} module-level globals instead of calling sys.exc_info(). Reported by Russell Warren
........
r51745 | andrew.kuchling | 2006-09-05 15:19:18 +0200 (Tue, 05 Sep 2006) | 3 lines
[Bug #1526834] Fix crash in pdb when you do 'b f(';
the function name was placed into a regex pattern and the unbalanced paren
caused re.compile() to report an error
........
r51751 | kristjan.jonsson | 2006-09-05 19:58:12 +0200 (Tue, 05 Sep 2006) | 6 lines
Update the PCBuild8 solution.
Facilitate cross-compilation by having binaries in separate Win32 and x64 directories.
Rationalized configs by making proper use of platforms/configurations.
Remove pythoncore_pgo project.
Add new PGIRelease and PGORelease configurations to perform Profile Guided Optimisation.
Removed I64 support, but this can be easily added by copying the x64 platform settings.
........
r51758 | gustavo.niemeyer | 2006-09-06 03:58:52 +0200 (Wed, 06 Sep 2006) | 3 lines
Fixing #1531862: Do not close standard file descriptors in the
subprocess module.
........
r51760 | neal.norwitz | 2006-09-06 05:58:34 +0200 (Wed, 06 Sep 2006) | 1 line
Revert 51758 because it broke all the buildbots
........
r51762 | georg.brandl | 2006-09-06 08:03:59 +0200 (Wed, 06 Sep 2006) | 3 lines
Bug #1551427: fix a wrong NULL pointer check in the win32 version
of os.urandom().
........
r51765 | georg.brandl | 2006-09-06 08:09:31 +0200 (Wed, 06 Sep 2006) | 3 lines
Bug #1550983: emit better error messages for erroneous relative
imports (if not in package and if beyond toplevel package).
........
r51767 | neal.norwitz | 2006-09-06 08:28:06 +0200 (Wed, 06 Sep 2006) | 1 line
with and as are now keywords. There are some generated files I can't recreate.
........
r51770 | georg.brandl | 2006-09-06 08:50:05 +0200 (Wed, 06 Sep 2006) | 5 lines
Bug #1542051: Exceptions now correctly call PyObject_GC_UnTrack.
Also make sure that every exception class has __module__ set to
'exceptions'.
........
r51785 | georg.brandl | 2006-09-06 22:05:58 +0200 (Wed, 06 Sep 2006) | 2 lines
Fix missing import of the types module in logging.config.
........
r51789 | marc-andre.lemburg | 2006-09-06 22:40:22 +0200 (Wed, 06 Sep 2006) | 3 lines
Add news item for bug fix of SF bug report #1546372.
........
r51797 | gustavo.niemeyer | 2006-09-07 02:48:33 +0200 (Thu, 07 Sep 2006) | 3 lines
Fixed subprocess bug #1531862 again, after removing tests
offending buildbot
........
r51798 | raymond.hettinger | 2006-09-07 04:42:48 +0200 (Thu, 07 Sep 2006) | 1 line
Fix refcounts and add error checks.
........
r51803 | nick.coghlan | 2006-09-07 12:50:34 +0200 (Thu, 07 Sep 2006) | 1 line
Fix the speed regression in inspect.py by adding another cache to speed up getmodule(). Patch #1553314
........
r51805 | ronald.oussoren | 2006-09-07 14:03:10 +0200 (Thu, 07 Sep 2006) | 2 lines
Fix a glaring error and update some version numbers.
........
r51814 | andrew.kuchling | 2006-09-07 15:56:23 +0200 (Thu, 07 Sep 2006) | 1 line
Typo fix
........
r51815 | andrew.kuchling | 2006-09-07 15:59:38 +0200 (Thu, 07 Sep 2006) | 8 lines
[Bug #1552726] Avoid repeatedly polling in interactive mode -- only put a timeout on the select()
if an input hook has been defined. Patch by Richard Boulton.
This select() code is only executed with readline 2.1, or if
READLINE_CALLBACKS is defined.
Backport candidate for 2.5, 2.4, probably earlier versions too.
........
r51816 | armin.rigo | 2006-09-07 17:06:00 +0200 (Thu, 07 Sep 2006) | 2 lines
Add a warning notice on top of the generated grammar.txt.
........
r51819 | thomas.heller | 2006-09-07 20:56:28 +0200 (Thu, 07 Sep 2006) | 5 lines
Anonymous structure fields that have a bit-width specified did not work,
and they gave a strange error message from PyArg_ParseTuple:
function takes exactly 2 arguments (3 given).
With tests.
........
r51820 | thomas.heller | 2006-09-07 21:09:54 +0200 (Thu, 07 Sep 2006) | 4 lines
The cast function did not accept c_char_p or c_wchar_p instances
as first argument, and failed with a 'bad argument to internal function'
error message.
........
r51827 | nick.coghlan | 2006-09-08 12:04:38 +0200 (Fri, 08 Sep 2006) | 1 line
Add missing NEWS entry for rev 51803
........
r51828 | andrew.kuchling | 2006-09-08 15:25:23 +0200 (Fri, 08 Sep 2006) | 1 line
Add missing word
........
r51829 | andrew.kuchling | 2006-09-08 15:35:49 +0200 (Fri, 08 Sep 2006) | 1 line
Explain SQLite a bit more clearly
........
r51830 | andrew.kuchling | 2006-09-08 15:36:36 +0200 (Fri, 08 Sep 2006) | 1 line
Explain SQLite a bit more clearly
........
r51832 | andrew.kuchling | 2006-09-08 16:02:45 +0200 (Fri, 08 Sep 2006) | 1 line
Use native SQLite types
........
r51833 | andrew.kuchling | 2006-09-08 16:03:01 +0200 (Fri, 08 Sep 2006) | 1 line
Use native SQLite types
........
r51835 | andrew.kuchling | 2006-09-08 16:05:10 +0200 (Fri, 08 Sep 2006) | 1 line
Fix typo in example
........
r51837 | brett.cannon | 2006-09-09 09:11:46 +0200 (Sat, 09 Sep 2006) | 6 lines
Remove the __unicode__ method from exceptions. Allows unicode() to be called
on exception classes. Would require introducing a tp_unicode slot to make it
work otherwise.
Fixes bug #1551432 and will be backported.
........
r51854 | neal.norwitz | 2006-09-11 06:24:09 +0200 (Mon, 11 Sep 2006) | 8 lines
Forward port of 51850 from release25-maint branch.
As mentioned on python-dev, reverting patch #1504333 because it introduced
an infinite loop in rev 47154.
This patch also adds a test to prevent the regression.
........
r51855 | neal.norwitz | 2006-09-11 06:28:16 +0200 (Mon, 11 Sep 2006) | 5 lines
Properly handle a NULL returned from PyArena_New().
(Also fix some whitespace)
Klocwork #364.
........
r51856 | neal.norwitz | 2006-09-11 06:32:57 +0200 (Mon, 11 Sep 2006) | 1 line
Add a "crasher" taken from the sgml bug report referenced in the comment
........
r51858 | georg.brandl | 2006-09-11 11:38:35 +0200 (Mon, 11 Sep 2006) | 12 lines
Forward-port of rev. 51857:
Building with HP's cc on HP-UX turned up a couple of problems.
_PyGILState_NoteThreadState was declared as static inconsistently.
Make it static as it's not necessary outside of this module.
Some tests failed because errno was reset to 0. (I think the tests
that failed were at least: test_fcntl and test_mailbox).
Ensure that errno doesn't change after a call to Py_END_ALLOW_THREADS.
This only affected debug builds.
........
r51865 | martin.v.loewis | 2006-09-12 21:49:20 +0200 (Tue, 12 Sep 2006) | 2 lines
Forward-port 51862: Add sgml_input.html.
........
r51866 | andrew.kuchling | 2006-09-12 22:50:23 +0200 (Tue, 12 Sep 2006) | 1 line
Markup typo fix
........
r51867 | andrew.kuchling | 2006-09-12 23:09:02 +0200 (Tue, 12 Sep 2006) | 1 line
Some editing, markup fixes
........
r51868 | andrew.kuchling | 2006-09-12 23:21:51 +0200 (Tue, 12 Sep 2006) | 1 line
More wordsmithing
........
r51877 | andrew.kuchling | 2006-09-14 13:22:18 +0200 (Thu, 14 Sep 2006) | 1 line
Make --help mention that -v can be supplied multiple times
........
r51878 | andrew.kuchling | 2006-09-14 13:28:50 +0200 (Thu, 14 Sep 2006) | 1 line
Rewrite help message to remove some of the parentheticals. (There were a lot of them.)
........
r51883 | ka-ping.yee | 2006-09-15 02:34:19 +0200 (Fri, 15 Sep 2006) | 2 lines
Fix grammar errors and improve clarity.
........
r51885 | georg.brandl | 2006-09-15 07:22:24 +0200 (Fri, 15 Sep 2006) | 3 lines
Correct elementtree module index entry.
........
r51889 | fred.drake | 2006-09-15 17:18:04 +0200 (Fri, 15 Sep 2006) | 4 lines
- fix module name in links in formatted documentation
- minor markup cleanup
(forward-ported from release25-maint revision 51888)
........
r51891 | fred.drake | 2006-09-15 18:11:27 +0200 (Fri, 15 Sep 2006) | 3 lines
revise explanation of returns_unicode to reflect bool values
and to include the default value
(merged from release25-maint revision 51890)
........
r51897 | martin.v.loewis | 2006-09-16 19:36:37 +0200 (Sat, 16 Sep 2006) | 2 lines
Patch #1557515: Add RLIMIT_SBSIZE.
........
r51903 | ronald.oussoren | 2006-09-17 20:42:53 +0200 (Sun, 17 Sep 2006) | 2 lines
Port of revision 51902 in release25-maint to the trunk
........
r51904 | ronald.oussoren | 2006-09-17 21:23:27 +0200 (Sun, 17 Sep 2006) | 3 lines
Tweak Mac/Makefile in to ensure that pythonw gets rebuild when the major version
of python changes (2.5 -> 2.6). Bug #1552935.
........
r51913 | guido.van.rossum | 2006-09-18 23:36:16 +0200 (Mon, 18 Sep 2006) | 2 lines
Make this thing executable.
........
r51920 | gregory.p.smith | 2006-09-19 19:35:04 +0200 (Tue, 19 Sep 2006) | 5 lines
Fixes a bug with bsddb.DB.stat where the flags and txn keyword
arguments are transposed. (reported by Louis Zechtzer)
..already committed to release24-maint
..needs committing to release25-maint
........
r51926 | brett.cannon | 2006-09-20 20:34:28 +0200 (Wed, 20 Sep 2006) | 3 lines
Accidentally didn't commit Misc/NEWS entry on when __unicode__() was removed
from exceptions.
........
r51927 | brett.cannon | 2006-09-20 20:43:13 +0200 (Wed, 20 Sep 2006) | 6 lines
Allow exceptions to be directly sliced again
(e.g., ``BaseException(1,2,3)[0:2]``).
Discovered in Python 2.5.0 by Thomas Heller and reported to python-dev. This
should be backported to 2.5 .
........
r51928 | brett.cannon | 2006-09-20 21:28:35 +0200 (Wed, 20 Sep 2006) | 2 lines
Make python.vim output more deterministic.
........
r51949 | walter.doerwald | 2006-09-21 17:09:55 +0200 (Thu, 21 Sep 2006) | 2 lines
Fix typo.
........
r51950 | jack.diederich | 2006-09-21 19:50:26 +0200 (Thu, 21 Sep 2006) | 5 lines
* regression bug, count_next was coercing a Py_ssize_t to an unsigned Py_size_t
which breaks negative counts
* added test for negative numbers
will backport to 2.5.1
........
r51953 | jack.diederich | 2006-09-21 22:34:49 +0200 (Thu, 21 Sep 2006) | 1 line
added itertools.count(-n) fix
........
r51971 | neal.norwitz | 2006-09-22 10:16:26 +0200 (Fri, 22 Sep 2006) | 10 lines
Fix %zd string formatting on Mac OS X so it prints negative numbers.
In addition to testing positive numbers, verify negative numbers work in configure.
In order to avoid compiler warnings on OS X 10.4, also change the order of the check
for the format character to use (PY_FORMAT_SIZE_T) in the sprintf format
for Py_ssize_t. This patch changes PY_FORMAT_SIZE_T from "" to "l" if it wasn't
defined at configure time. Need to verify the buildbot results.
Backport candidate (if everyone thinks this patch can't be improved).
........
r51972 | neal.norwitz | 2006-09-22 10:18:10 +0200 (Fri, 22 Sep 2006) | 7 lines
Bug #1557232: fix seg fault with def f((((x)))) and def f(((x),)).
These tests should be improved. Hopefully this fixes variations when
flipping back and forth between fpdef and fplist.
Backport candidate.
........
r51975 | neal.norwitz | 2006-09-22 10:47:23 +0200 (Fri, 22 Sep 2006) | 4 lines
Mostly revert this file to the same version as before. Only force setting
of PY_FORMAT_SIZE_T to "l" for Mac OSX. I don't know a better define
to use. This should get rid of the warnings on other platforms and Mac too.
........
r51986 | fred.drake | 2006-09-23 02:26:31 +0200 (Sat, 23 Sep 2006) | 1 line
add boilerplate "What's New" document so the docs will build
........
r51987 | neal.norwitz | 2006-09-23 06:11:38 +0200 (Sat, 23 Sep 2006) | 1 line
Remove extra semi-colons reported by Johnny Lee on python-dev. Backport if anyone cares.
........
r51989 | neal.norwitz | 2006-09-23 20:11:58 +0200 (Sat, 23 Sep 2006) | 1 line
SF Bug #1563963, add missing word and cleanup first sentance
........
r51990 | brett.cannon | 2006-09-23 21:53:20 +0200 (Sat, 23 Sep 2006) | 3 lines
Make output on test_strptime() be more verbose in face of failure. This is in
hopes that more information will help debug the failing test on HPPA Ubuntu.
........
r51991 | georg.brandl | 2006-09-24 12:36:01 +0200 (Sun, 24 Sep 2006) | 2 lines
Fix webbrowser.BackgroundBrowser on Windows.
........
r51993 | georg.brandl | 2006-09-24 14:35:36 +0200 (Sun, 24 Sep 2006) | 4 lines
Fix a bug in the parser's future statement handling that led to "with"
not being recognized as a keyword after, e.g., this statement:
from __future__ import division, with_statement
........
r51995 | georg.brandl | 2006-09-24 14:50:24 +0200 (Sun, 24 Sep 2006) | 4 lines
Fix a bug in traceback.format_exception_only() that led to an error
being raised when print_exc() was called without an exception set.
In version 2.4, this printed "None", restored that behavior.
........
r52000 | armin.rigo | 2006-09-25 17:16:26 +0200 (Mon, 25 Sep 2006) | 2 lines
Another crasher.
........
r52011 | brett.cannon | 2006-09-27 01:38:24 +0200 (Wed, 27 Sep 2006) | 2 lines
Make the error message for when the time data and format do not match clearer.
........
r52014 | andrew.kuchling | 2006-09-27 18:37:30 +0200 (Wed, 27 Sep 2006) | 1 line
Add news item for rev. 51815
........
r52018 | andrew.kuchling | 2006-09-27 21:23:05 +0200 (Wed, 27 Sep 2006) | 1 line
Make examples do error checking on Py_InitModule
........
r52032 | brett.cannon | 2006-09-29 00:10:14 +0200 (Fri, 29 Sep 2006) | 2 lines
Very minor grammatical fix in a comment.
........
r52048 | george.yoshida | 2006-09-30 07:14:02 +0200 (Sat, 30 Sep 2006) | 4 lines
SF bug #1567976 : fix typo
Will backport to 2.5.
........
r52051 | gregory.p.smith | 2006-09-30 08:08:20 +0200 (Sat, 30 Sep 2006) | 2 lines
wording change
........
r52053 | georg.brandl | 2006-09-30 09:24:48 +0200 (Sat, 30 Sep 2006) | 2 lines
Bug #1567375: a minor logical glitch in example description.
........
r52056 | georg.brandl | 2006-09-30 09:31:57 +0200 (Sat, 30 Sep 2006) | 3 lines
Bug #1565661: in webbrowser, split() the command for the default
GNOME browser in case it is a command with args.
........
r52058 | georg.brandl | 2006-09-30 10:43:30 +0200 (Sat, 30 Sep 2006) | 4 lines
Patch #1567691: super() and new.instancemethod() now don't accept
keyword arguments any more (previously they accepted them, but didn't
use them).
........
r52061 | georg.brandl | 2006-09-30 11:03:42 +0200 (Sat, 30 Sep 2006) | 3 lines
Bug #1566800: make sure that EnvironmentError can be called with any
number of arguments, as was the case in Python 2.4.
........
r52063 | georg.brandl | 2006-09-30 11:06:45 +0200 (Sat, 30 Sep 2006) | 2 lines
Bug #1566663: remove obsolete example from datetime docs.
........
r52065 | georg.brandl | 2006-09-30 11:13:21 +0200 (Sat, 30 Sep 2006) | 3 lines
Bug #1566602: correct failure of posixpath unittest when $HOME ends
with a slash.
........
r52068 | georg.brandl | 2006-09-30 12:58:01 +0200 (Sat, 30 Sep 2006) | 3 lines
Bug #1457823: cgi.(Sv)FormContentDict's constructor now takes
keep_blank_values and strict_parsing keyword arguments.
........
r52069 | georg.brandl | 2006-09-30 13:06:47 +0200 (Sat, 30 Sep 2006) | 3 lines
Bug #1560617: in pyclbr, return full module name not only for classes,
but also for functions.
........
r52072 | georg.brandl | 2006-09-30 13:17:34 +0200 (Sat, 30 Sep 2006) | 3 lines
Bug #1556784: allow format strings longer than 127 characters in
datetime's strftime function.
........
r52075 | georg.brandl | 2006-09-30 13:22:28 +0200 (Sat, 30 Sep 2006) | 3 lines
Bug #1446043: correctly raise a LookupError if an encoding name given
to encodings.search_function() contains a dot.
........
r52078 | georg.brandl | 2006-09-30 14:02:57 +0200 (Sat, 30 Sep 2006) | 3 lines
Bug #1546052: clarify that PyString_FromString(AndSize) copies the
string pointed to by its parameter.
........
r52080 | georg.brandl | 2006-09-30 14:16:03 +0200 (Sat, 30 Sep 2006) | 3 lines
Convert test_import to unittest.
........
r52083 | kurt.kaiser | 2006-10-01 23:16:45 +0200 (Sun, 01 Oct 2006) | 5 lines
Some syntax errors were being caught by tokenize during the tabnanny
check, resulting in obscure error messages. Do the syntax check
first. Bug 1562716, 1562719
........
r52084 | kurt.kaiser | 2006-10-01 23:54:37 +0200 (Sun, 01 Oct 2006) | 3 lines
Add comment explaining that error msgs may be due to user code when
running w/o subprocess.
........
r52086 | martin.v.loewis | 2006-10-02 16:55:51 +0200 (Mon, 02 Oct 2006) | 3 lines
Fix test for uintptr_t. Fixes #1568842.
Will backport.
........
r52089 | martin.v.loewis | 2006-10-02 17:20:37 +0200 (Mon, 02 Oct 2006) | 3 lines
Guard uintptr_t test with HAVE_STDINT_H, test for
stdint.h. Will backport.
........
r52100 | vinay.sajip | 2006-10-03 20:02:37 +0200 (Tue, 03 Oct 2006) | 1 line
Documentation omitted the additional parameter to LogRecord.__init__ which was added in 2.5. (See SF #1569622).
........
r52101 | vinay.sajip | 2006-10-03 20:20:26 +0200 (Tue, 03 Oct 2006) | 1 line
Documentation clarified to mention optional parameters.
........
r52102 | vinay.sajip | 2006-10-03 20:21:56 +0200 (Tue, 03 Oct 2006) | 1 line
Modified LogRecord.__init__ to make the func parameter optional. (See SF #1569622).
........
r52121 | brett.cannon | 2006-10-03 23:58:55 +0200 (Tue, 03 Oct 2006) | 2 lines
Fix minor typo in a comment.
........
r52123 | brett.cannon | 2006-10-04 01:23:14 +0200 (Wed, 04 Oct 2006) | 2 lines
Convert test_imp over to unittest.
........
r52128 | barry.warsaw | 2006-10-04 04:06:36 +0200 (Wed, 04 Oct 2006) | 3 lines
decode_rfc2231(): As Christian Robottom Reis points out, it makes no sense to
test for parts > 3 when we use .split(..., 2).
........
r52129 | jeremy.hylton | 2006-10-04 04:24:52 +0200 (Wed, 04 Oct 2006) | 9 lines
Fix for SF bug 1569998: break permitted inside try.
The compiler was checking that there was something on the fblock
stack, but not that there was a loop on the stack. Fixed that and
added a test for the specific syntax error.
Bug fix candidate.
........
r52130 | martin.v.loewis | 2006-10-04 07:47:34 +0200 (Wed, 04 Oct 2006) | 4 lines
Fix integer negation and absolute value to not rely
on undefined behaviour of the C compiler anymore.
Will backport to 2.5 and 2.4.
........
r52135 | martin.v.loewis | 2006-10-04 11:21:20 +0200 (Wed, 04 Oct 2006) | 1 line
Forward port r52134: Add uuids for 2.4.4.
........
r52137 | armin.rigo | 2006-10-04 12:23:57 +0200 (Wed, 04 Oct 2006) | 3 lines
Compilation problem caused by conflicting typedefs for uint32_t
(unsigned long vs. unsigned int).
........
r52139 | armin.rigo | 2006-10-04 14:17:45 +0200 (Wed, 04 Oct 2006) | 23 lines
Forward-port of r52136,52138: a review of overflow-detecting code.
* unified the way intobject, longobject and mystrtoul handle
values around -sys.maxint-1.
* in general, trying to entierely avoid overflows in any computation
involving signed ints or longs is extremely involved. Fixed a few
simple cases where a compiler might be too clever (but that's all
guesswork).
* more overflow checks against bad data in marshal.c.
* 2.5 specific: fixed a number of places that were still confusing int
and Py_ssize_t. Some of them could potentially have caused
"real-world" breakage.
* list.pop(x): fixing overflow issues on x was messy. I just reverted
to PyArg_ParseTuple("n"), which does the right thing. (An obscure
test was trying to give a Decimal to list.pop()... doesn't make
sense any more IMHO)
* trying to write a few tests...
........
r52147 | andrew.kuchling | 2006-10-04 15:42:43 +0200 (Wed, 04 Oct 2006) | 6 lines
Cause a PyObject_Malloc() failure to trigger a MemoryError, and then
add 'if (PyErr_Occurred())' checks to various places so that NULL is
returned properly.
2.4 backport candidate.
........
r52148 | martin.v.loewis | 2006-10-04 17:25:28 +0200 (Wed, 04 Oct 2006) | 1 line
Add MSVC8 project files to create wininst-8.exe.
........
r52196 | brett.cannon | 2006-10-06 00:02:31 +0200 (Fri, 06 Oct 2006) | 7 lines
Clarify what "re-initialization" means for init_builtin() and init_dynamic().
Also remove warning about re-initialization as possibly raising an execption as
both call _PyImport_FindExtension() which pulls any module that was already
imported from the Python process' extension cache and just copies the __dict__
into the module stored in sys.modules.
........
r52200 | fred.drake | 2006-10-06 02:03:45 +0200 (Fri, 06 Oct 2006) | 3 lines
- update links
- remove Sleepycat name now that they have been bought
........
r52204 | andrew.kuchling | 2006-10-06 12:41:01 +0200 (Fri, 06 Oct 2006) | 1 line
Case fix
........
r52208 | georg.brandl | 2006-10-06 14:46:08 +0200 (Fri, 06 Oct 2006) | 3 lines
Fix name.
........
r52211 | andrew.kuchling | 2006-10-06 15:18:26 +0200 (Fri, 06 Oct 2006) | 1 line
[Bug #1545341] Allow 'classifier' parameter to be a tuple as well as a list. Will backport.
........
r52212 | armin.rigo | 2006-10-06 18:33:22 +0200 (Fri, 06 Oct 2006) | 4 lines
A very minor bug fix: this code looks like it is designed to accept
any hue value and do the modulo itself, except it doesn't quite do
it in all cases. At least, the "cannot get here" comment was wrong.
........
r52213 | andrew.kuchling | 2006-10-06 20:51:55 +0200 (Fri, 06 Oct 2006) | 1 line
Comment grammar
........
r52218 | skip.montanaro | 2006-10-07 13:05:02 +0200 (Sat, 07 Oct 2006) | 6 lines
Note that the excel_tab class is registered as the "excel-tab" dialect.
Fixes 1572471. Make a similar change for the excel class and clean up
references to the Dialects and Formatting Parameters section in a few
places.
........
r52221 | georg.brandl | 2006-10-08 09:11:54 +0200 (Sun, 08 Oct 2006) | 3 lines
Add missing NEWS entry for rev. 52129.
........
r52223 | hyeshik.chang | 2006-10-08 15:48:34 +0200 (Sun, 08 Oct 2006) | 3 lines
Bug #1572832: fix a bug in ISO-2022 codecs which may cause segfault
when encoding non-BMP unicode characters. (Submitted by Ray Chason)
........
r52227 | ronald.oussoren | 2006-10-08 19:37:58 +0200 (Sun, 08 Oct 2006) | 4 lines
Add version number to the link to the python documentation in
/Developer/Documentation/Python, better for users that install multiple versions
of python.
........
r52229 | ronald.oussoren | 2006-10-08 19:40:02 +0200 (Sun, 08 Oct 2006) | 2 lines
Fix for bug #1570284
........
r52233 | ronald.oussoren | 2006-10-08 19:49:52 +0200 (Sun, 08 Oct 2006) | 6 lines
MacOSX: distutils changes the values of BASECFLAGS and LDFLAGS when using a
universal build of python on OSX 10.3 to ensure that those flags can be used
to compile code (the universal build uses compiler flags that aren't supported
on 10.3). This patches gives the same treatment to CFLAGS, PY_CFLAGS and
BLDSHARED.
........
r52236 | ronald.oussoren | 2006-10-08 19:51:46 +0200 (Sun, 08 Oct 2006) | 5 lines
MacOSX: The universal build requires that users have the MacOSX10.4u SDK
installed to build extensions. This patch makes distutils emit a warning when
the compiler should use an SDK but that SDK is not installed, hopefully reducing
some confusion.
........
r52238 | ronald.oussoren | 2006-10-08 20:18:26 +0200 (Sun, 08 Oct 2006) | 3 lines
MacOSX: add more logic to recognize the correct startup file to patch to the
shell profile patching post-install script.
........
r52242 | andrew.kuchling | 2006-10-09 19:10:12 +0200 (Mon, 09 Oct 2006) | 1 line
Add news item for rev. 52211 change
........
r52245 | andrew.kuchling | 2006-10-09 20:05:19 +0200 (Mon, 09 Oct 2006) | 1 line
Fix wording in comment
........
r52251 | georg.brandl | 2006-10-09 21:03:06 +0200 (Mon, 09 Oct 2006) | 2 lines
Patch #1572724: fix typo ('=' instead of '==') in _msi.c.
........
r52255 | barry.warsaw | 2006-10-09 21:43:24 +0200 (Mon, 09 Oct 2006) | 2 lines
List gc.get_count() in the module docstring.
........
r52257 | martin.v.loewis | 2006-10-09 22:44:25 +0200 (Mon, 09 Oct 2006) | 1 line
Bug #1565150: Fix subsecond processing for os.utime on Windows.
........
r52268 | ronald.oussoren | 2006-10-10 09:55:06 +0200 (Tue, 10 Oct 2006) | 2 lines
MacOSX: fix permission problem in the generated installer
........
r52293 | georg.brandl | 2006-10-12 09:38:04 +0200 (Thu, 12 Oct 2006) | 2 lines
Bug #1575746: fix typo in property() docs.
........
r52295 | georg.brandl | 2006-10-12 09:57:21 +0200 (Thu, 12 Oct 2006) | 3 lines
Bug #813342: Start the IDLE subprocess with -Qnew if the parent
is started with that option.
........
r52297 | georg.brandl | 2006-10-12 10:22:53 +0200 (Thu, 12 Oct 2006) | 2 lines
Bug #1565919: document set types in the Language Reference.
........
r52299 | georg.brandl | 2006-10-12 11:20:33 +0200 (Thu, 12 Oct 2006) | 3 lines
Bug #1550524: better heuristics to find correct class definition
in inspect.findsource().
........
r52301 | georg.brandl | 2006-10-12 11:47:12 +0200 (Thu, 12 Oct 2006) | 4 lines
Bug #1548891: The cStringIO.StringIO() constructor now encodes unicode
arguments with the system default encoding just like the write()
method does, instead of converting it to a raw buffer.
........
r52303 | georg.brandl | 2006-10-12 13:14:40 +0200 (Thu, 12 Oct 2006) | 2 lines
Bug #1546628: add a note about urlparse.urljoin() and absolute paths.
........
r52305 | georg.brandl | 2006-10-12 13:27:59 +0200 (Thu, 12 Oct 2006) | 3 lines
Bug #1545497: when given an explicit base, int() did ignore NULs
embedded in the string to convert.
........
r52307 | georg.brandl | 2006-10-12 13:41:11 +0200 (Thu, 12 Oct 2006) | 3 lines
Add a note to fpectl docs that it's not built by default
(bug #1556261).
........
r52309 | georg.brandl | 2006-10-12 13:46:57 +0200 (Thu, 12 Oct 2006) | 3 lines
Bug #1560114: the Mac filesystem does have accurate information
about the case of filenames.
........
r52311 | georg.brandl | 2006-10-12 13:59:27 +0200 (Thu, 12 Oct 2006) | 2 lines
Small grammar fix, thanks Sjoerd.
........
r52313 | georg.brandl | 2006-10-12 14:03:07 +0200 (Thu, 12 Oct 2006) | 2 lines
Fix tarfile depending on buggy int('1\0', base) behavior.
........
r52315 | georg.brandl | 2006-10-12 14:33:07 +0200 (Thu, 12 Oct 2006) | 2 lines
Bug #1283491: follow docstring convention wrt. keyword-able args in sum().
........
r52316 | georg.brandl | 2006-10-12 15:08:16 +0200 (Thu, 12 Oct 2006) | 3 lines
Bug #1560179: speed up posixpath.(dir|base)name
........
r52327 | brett.cannon | 2006-10-14 08:36:45 +0200 (Sat, 14 Oct 2006) | 3 lines
Clean up the language of a sentence relating to the connect() function and
user-defined datatypes.
........
r52332 | neal.norwitz | 2006-10-14 23:33:38 +0200 (Sat, 14 Oct 2006) | 3 lines
Update the peephole optimizer to remove more dead code (jumps after returns)
and inline jumps to returns.
........
r52333 | martin.v.loewis | 2006-10-15 09:54:40 +0200 (Sun, 15 Oct 2006) | 4 lines
Patch #1576954: Update VC6 build directory; remove redundant
files in VC7. Will backport to 2.5.
........
r52335 | martin.v.loewis | 2006-10-15 10:43:33 +0200 (Sun, 15 Oct 2006) | 1 line
Patch #1576166: Support os.utime for directories on Windows NT+.
........
r52336 | martin.v.loewis | 2006-10-15 10:51:22 +0200 (Sun, 15 Oct 2006) | 2 lines
Patch #1577551: Add ctypes and ET build support for VC6.
Will backport to 2.5.
........
r52338 | martin.v.loewis | 2006-10-15 11:35:51 +0200 (Sun, 15 Oct 2006) | 1 line
Loosen the test for equal time stamps.
........
r52339 | martin.v.loewis | 2006-10-15 11:43:39 +0200 (Sun, 15 Oct 2006) | 2 lines
Bug #1567666: Emulate GetFileAttributesExA for Win95.
Will backport to 2.5.
........
r52341 | martin.v.loewis | 2006-10-15 13:02:07 +0200 (Sun, 15 Oct 2006) | 2 lines
Round to int, because some systems support sub-second time stamps in stat, but not in utime.
Also be consistent with modifying only mtime, not atime.
........
r52342 | martin.v.loewis | 2006-10-15 13:57:40 +0200 (Sun, 15 Oct 2006) | 2 lines
Set the eol-style for project files to "CRLF".
........
r52343 | martin.v.loewis | 2006-10-15 13:59:56 +0200 (Sun, 15 Oct 2006) | 3 lines
Drop binary property on dsp files, set eol-style
to CRLF instead.
........
r52344 | martin.v.loewis | 2006-10-15 14:01:43 +0200 (Sun, 15 Oct 2006) | 2 lines
Remove binary property, set eol-style to CRLF instead.
........
r52346 | martin.v.loewis | 2006-10-15 16:30:38 +0200 (Sun, 15 Oct 2006) | 2 lines
Mention the bdist_msi module. Will backport to 2.5.
........
r52354 | brett.cannon | 2006-10-16 05:09:52 +0200 (Mon, 16 Oct 2006) | 3 lines
Fix turtle so that you can launch the demo2 function on its own instead of only
when the module is launched as a script.
........
r52356 | martin.v.loewis | 2006-10-17 17:18:06 +0200 (Tue, 17 Oct 2006) | 2 lines
Patch #1457736: Update VC6 to use current PCbuild settings.
Will backport to 2.5.
........
r52360 | martin.v.loewis | 2006-10-17 20:09:55 +0200 (Tue, 17 Oct 2006) | 2 lines
Remove obsolete file. Will backport.
........
r52363 | martin.v.loewis | 2006-10-17 20:59:23 +0200 (Tue, 17 Oct 2006) | 4 lines
Forward-port r52358:
- Bug #1578513: Cross compilation was broken by a change to configure.
Repair so that it's back to how it was in 2.4.3.
........
r52365 | thomas.heller | 2006-10-17 21:30:48 +0200 (Tue, 17 Oct 2006) | 6 lines
ctypes callback functions only support 'fundamental' result types.
Check this and raise an error when something else is used - before
this change ctypes would hang or crash when such a callback was
called. This is a partial fix for #1574584.
Will backport to release25-maint.
........
r52377 | tim.peters | 2006-10-18 07:06:06 +0200 (Wed, 18 Oct 2006) | 2 lines
newIobject(): repaired incorrect cast to quiet MSVC warning.
........
r52378 | tim.peters | 2006-10-18 07:09:12 +0200 (Wed, 18 Oct 2006) | 2 lines
Whitespace normalization.
........
r52379 | tim.peters | 2006-10-18 07:10:28 +0200 (Wed, 18 Oct 2006) | 2 lines
Add missing svn:eol-style to text files.
........
r52387 | martin.v.loewis | 2006-10-19 12:58:46 +0200 (Thu, 19 Oct 2006) | 3 lines
Add check for the PyArg_ParseTuple format, and declare
it if it is supported.
........
r52388 | martin.v.loewis | 2006-10-19 13:00:37 +0200 (Thu, 19 Oct 2006) | 3 lines
Fix various minor errors in passing arguments to
PyArg_ParseTuple.
........
r52389 | martin.v.loewis | 2006-10-19 18:01:37 +0200 (Thu, 19 Oct 2006) | 2 lines
Restore CFLAGS after checking for __attribute__
........
r52390 | andrew.kuchling | 2006-10-19 23:55:55 +0200 (Thu, 19 Oct 2006) | 1 line
[Bug #1576348] Fix typo in example
........
r52414 | walter.doerwald | 2006-10-22 10:59:41 +0200 (Sun, 22 Oct 2006) | 2 lines
Port test___future__ to unittest.
........
r52415 | ronald.oussoren | 2006-10-22 12:45:18 +0200 (Sun, 22 Oct 2006) | 3 lines
Patch #1580674: with this patch os.readlink uses the filesystem encoding to
decode unicode objects and returns an unicode object when the argument is one.
........
r52416 | martin.v.loewis | 2006-10-22 12:46:18 +0200 (Sun, 22 Oct 2006) | 3 lines
Patch #1580872: Remove duplicate declaration of PyCallable_Check.
Will backport to 2.5.
........
r52418 | martin.v.loewis | 2006-10-22 12:55:15 +0200 (Sun, 22 Oct 2006) | 4 lines
- Patch #1560695: Add .note.GNU-stack to ctypes' sysv.S so that
ctypes isn't considered as requiring executable stacks.
Will backport to 2.5.
........
r52420 | martin.v.loewis | 2006-10-22 15:45:13 +0200 (Sun, 22 Oct 2006) | 3 lines
Remove passwd.adjunct.byname from list of maps
for test_nis. Will backport to 2.5.
........
r52431 | georg.brandl | 2006-10-24 18:54:16 +0200 (Tue, 24 Oct 2006) | 2 lines
Patch [ 1583506 ] tarfile.py: 100-char filenames are truncated
........
r52446 | andrew.kuchling | 2006-10-26 21:10:46 +0200 (Thu, 26 Oct 2006) | 1 line
[Bug #1579796] Wrong syntax for PyDateTime_IMPORT in documentation. Reported by David Faure.
........
r52449 | andrew.kuchling | 2006-10-26 21:16:46 +0200 (Thu, 26 Oct 2006) | 1 line
Typo fix
........
r52452 | martin.v.loewis | 2006-10-27 08:16:31 +0200 (Fri, 27 Oct 2006) | 3 lines
Patch #1549049: Rewrite type conversion in structmember.
Fixes #1545696 and #1566140. Will backport to 2.5.
........
r52454 | martin.v.loewis | 2006-10-27 08:42:27 +0200 (Fri, 27 Oct 2006) | 2 lines
Check for values.h. Will backport.
........
r52456 | martin.v.loewis | 2006-10-27 09:06:52 +0200 (Fri, 27 Oct 2006) | 2 lines
Get DBL_MAX from float.h not values.h. Will backport.
........
r52458 | martin.v.loewis | 2006-10-27 09:13:28 +0200 (Fri, 27 Oct 2006) | 2 lines
Patch #1567274: Support SMTP over TLS.
........
r52459 | andrew.kuchling | 2006-10-27 13:33:29 +0200 (Fri, 27 Oct 2006) | 1 line
Set svn:keywords property
........
r52460 | andrew.kuchling | 2006-10-27 13:36:41 +0200 (Fri, 27 Oct 2006) | 1 line
Add item
........
r52461 | andrew.kuchling | 2006-10-27 13:37:01 +0200 (Fri, 27 Oct 2006) | 1 line
Some wording changes and markup fixes
........
r52462 | andrew.kuchling | 2006-10-27 14:18:38 +0200 (Fri, 27 Oct 2006) | 1 line
[Bug #1585690] Note that line_num was added in Python 2.5
........
r52464 | andrew.kuchling | 2006-10-27 14:50:38 +0200 (Fri, 27 Oct 2006) | 1 line
[Bug #1583946] Reword description of server and issuer
........
r52466 | andrew.kuchling | 2006-10-27 15:06:25 +0200 (Fri, 27 Oct 2006) | 1 line
[Bug #1562583] Mention the set_reuse_addr() method
........
r52469 | andrew.kuchling | 2006-10-27 15:22:46 +0200 (Fri, 27 Oct 2006) | 4 lines
[Bug #1542016] Report PCALL_POP value. This makes the return value of sys.callstats() match its docstring.
Backport candidate. Though it's an API change, this is a pretty obscure
portion of the API.
........
r52473 | andrew.kuchling | 2006-10-27 16:53:41 +0200 (Fri, 27 Oct 2006) | 1 line
Point users to the subprocess module in the docs for os.system, os.spawn*, os.popen2, and the popen2 and commands modules
........
r52476 | andrew.kuchling | 2006-10-27 18:39:10 +0200 (Fri, 27 Oct 2006) | 1 line
[Bug #1576241] Let functools.wraps work with built-in functions
........
r52478 | andrew.kuchling | 2006-10-27 18:55:34 +0200 (Fri, 27 Oct 2006) | 1 line
[Bug #1575506] The _singlefileMailbox class was using the wrong file object in its flush() method, causing an error
........
r52480 | andrew.kuchling | 2006-10-27 19:06:16 +0200 (Fri, 27 Oct 2006) | 1 line
Clarify docstring
........
r52481 | andrew.kuchling | 2006-10-27 19:11:23 +0200 (Fri, 27 Oct 2006) | 5 lines
[Patch #1574068 by Scott Dial] urllib and urllib2 were using
base64.encodestring() for encoding authentication data.
encodestring() can include newlines for very long input, which
produced broken HTTP headers.
........
r52483 | andrew.kuchling | 2006-10-27 20:13:46 +0200 (Fri, 27 Oct 2006) | 1 line
Check db_setup_debug for a few print statements; change sqlite_setup_debug to False
........
r52484 | andrew.kuchling | 2006-10-27 20:15:02 +0200 (Fri, 27 Oct 2006) | 1 line
[Patch #1503717] Tiny patch from Chris AtLee to stop a lengthy line from being printed
........
r52485 | thomas.heller | 2006-10-27 20:31:36 +0200 (Fri, 27 Oct 2006) | 5 lines
WindowsError.str should display the windows error code,
not the posix error code; with test.
Fixes #1576174.
Will backport to release25-maint.
........
r52487 | thomas.heller | 2006-10-27 21:05:53 +0200 (Fri, 27 Oct 2006) | 4 lines
Modulefinder now handles absolute and relative imports, including
tests.
Will backport to release25-maint.
........
r52488 | georg.brandl | 2006-10-27 22:39:43 +0200 (Fri, 27 Oct 2006) | 2 lines
Patch #1552024: add decorator support to unparse.py demo script.
........
r52492 | walter.doerwald | 2006-10-28 12:47:12 +0200 (Sat, 28 Oct 2006) | 2 lines
Port test_bufio to unittest.
........
r52493 | georg.brandl | 2006-10-28 15:10:17 +0200 (Sat, 28 Oct 2006) | 6 lines
Convert test_global, test_scope and test_grammar to unittest.
I tried to enclose all tests which must be run at the toplevel
(instead of inside a method) in exec statements.
........
r52494 | georg.brandl | 2006-10-28 15:11:41 +0200 (Sat, 28 Oct 2006) | 3 lines
Update outstanding bugs test file.
........
r52495 | georg.brandl | 2006-10-28 15:51:49 +0200 (Sat, 28 Oct 2006) | 3 lines
Convert test_math to unittest.
........
r52496 | georg.brandl | 2006-10-28 15:56:58 +0200 (Sat, 28 Oct 2006) | 3 lines
Convert test_opcodes to unittest.
........
r52497 | georg.brandl | 2006-10-28 18:04:04 +0200 (Sat, 28 Oct 2006) | 2 lines
Fix nth() itertool recipe.
........
r52500 | georg.brandl | 2006-10-28 22:25:09 +0200 (Sat, 28 Oct 2006) | 2 lines
make test_grammar pass with python -O
........
r52501 | neal.norwitz | 2006-10-28 23:15:30 +0200 (Sat, 28 Oct 2006) | 6 lines
Add some asserts. In sysmodule, I think these were to try to silence
some warnings from Klokwork. They verify the assumptions of the format
of svn version output.
The assert in the thread module helped debug a problem on HP-UX.
........
r52502 | neal.norwitz | 2006-10-28 23:16:54 +0200 (Sat, 28 Oct 2006) | 5 lines
Fix warnings with HP's C compiler. It doesn't recognize that infinite
loops are, um, infinite. These conditions should not be able to happen.
Will backport.
........
r52503 | neal.norwitz | 2006-10-28 23:17:51 +0200 (Sat, 28 Oct 2006) | 5 lines
Fix crash in test on HP-UX. Apparently, it's not possible to delete a lock if
it's held (even by the current thread).
Will backport.
........
r52504 | neal.norwitz | 2006-10-28 23:19:07 +0200 (Sat, 28 Oct 2006) | 6 lines
Fix bug #1565514, SystemError not raised on too many nested blocks.
It seems like this should be a different error than SystemError, but
I don't have any great ideas and SystemError was raised in 2.4 and earlier.
Will backport.
........
r52505 | neal.norwitz | 2006-10-28 23:20:12 +0200 (Sat, 28 Oct 2006) | 4 lines
Prevent crash if alloc of garbage fails. Found by Typo.pl.
Will backport.
........
r52506 | neal.norwitz | 2006-10-28 23:21:00 +0200 (Sat, 28 Oct 2006) | 4 lines
Don't inline Py_ADDRESS_IN_RANGE with gcc 4+ either.
Will backport.
........
r52513 | neal.norwitz | 2006-10-28 23:56:49 +0200 (Sat, 28 Oct 2006) | 2 lines
Fix test_modulefinder so it doesn't fail when run after test_distutils.
........
r52514 | neal.norwitz | 2006-10-29 00:12:26 +0200 (Sun, 29 Oct 2006) | 4 lines
From SF 1557890, fix problem of using wrong type in example.
Will backport.
........
r52517 | georg.brandl | 2006-10-29 09:39:22 +0100 (Sun, 29 Oct 2006) | 4 lines
Fix codecs.EncodedFile which did not use file_encoding in 2.5.0, and
fix all codecs file wrappers to work correctly with the "with"
statement (bug #1586513).
........
r52519 | georg.brandl | 2006-10-29 09:47:08 +0100 (Sun, 29 Oct 2006) | 3 lines
Clean up a leftover from old listcomp generation code.
........
r52520 | georg.brandl | 2006-10-29 09:53:06 +0100 (Sun, 29 Oct 2006) | 4 lines
Bug #1586448: the compiler module now emits the same bytecode for
list comprehensions as the builtin compiler, using the LIST_APPEND
opcode.
........
r52521 | georg.brandl | 2006-10-29 10:01:01 +0100 (Sun, 29 Oct 2006) | 3 lines
Remove trailing comma.
........
r52522 | georg.brandl | 2006-10-29 10:05:04 +0100 (Sun, 29 Oct 2006) | 3 lines
Bug #1357915: allow all sequence types for shell arguments in
subprocess.
........
r52524 | georg.brandl | 2006-10-29 10:16:12 +0100 (Sun, 29 Oct 2006) | 3 lines
Patch #1583880: fix tarfile's problems with long names and posix/
GNU modes.
........
r52526 | georg.brandl | 2006-10-29 10:18:00 +0100 (Sun, 29 Oct 2006) | 3 lines
Test assert if __debug__ is true.
........
r52527 | georg.brandl | 2006-10-29 10:32:16 +0100 (Sun, 29 Oct 2006) | 2 lines
Fix the new EncodedFile test to work with big endian platforms.
........
r52529 | georg.brandl | 2006-10-29 15:39:09 +0100 (Sun, 29 Oct 2006) | 2 lines
Bug #1586613: fix zlib and bz2 codecs' incremental en/decoders.
........
r52532 | georg.brandl | 2006-10-29 19:01:08 +0100 (Sun, 29 Oct 2006) | 2 lines
Bug #1586773: extend hashlib docstring.
........
r52534 | neal.norwitz | 2006-10-29 19:30:10 +0100 (Sun, 29 Oct 2006) | 4 lines
Update comments, remove commented out code.
Move assembler structure next to assembler code to make it easier to
move it to a separate file.
........
r52535 | georg.brandl | 2006-10-29 19:31:42 +0100 (Sun, 29 Oct 2006) | 3 lines
Bug #1576657: when setting a KeyError for a tuple key, make sure that
the tuple isn't used as the "exception arguments tuple".
........
r52537 | georg.brandl | 2006-10-29 20:13:40 +0100 (Sun, 29 Oct 2006) | 3 lines
Convert test_mmap to unittest.
........
r52538 | georg.brandl | 2006-10-29 20:20:45 +0100 (Sun, 29 Oct 2006) | 3 lines
Convert test_poll to unittest.
........
r52539 | georg.brandl | 2006-10-29 20:24:43 +0100 (Sun, 29 Oct 2006) | 3 lines
Convert test_nis to unittest.
........
r52540 | georg.brandl | 2006-10-29 20:35:03 +0100 (Sun, 29 Oct 2006) | 3 lines
Convert test_types to unittest.
........
r52541 | georg.brandl | 2006-10-29 20:51:16 +0100 (Sun, 29 Oct 2006) | 3 lines
Convert test_cookie to unittest.
........
r52542 | georg.brandl | 2006-10-29 21:09:12 +0100 (Sun, 29 Oct 2006) | 3 lines
Convert test_cgi to unittest.
........
r52543 | georg.brandl | 2006-10-29 21:24:01 +0100 (Sun, 29 Oct 2006) | 3 lines
Completely convert test_httplib to unittest.
........
r52544 | georg.brandl | 2006-10-29 21:28:26 +0100 (Sun, 29 Oct 2006) | 2 lines
Convert test_MimeWriter to unittest.
........
r52545 | georg.brandl | 2006-10-29 21:31:17 +0100 (Sun, 29 Oct 2006) | 3 lines
Convert test_openpty to unittest.
........
r52546 | georg.brandl | 2006-10-29 21:35:12 +0100 (Sun, 29 Oct 2006) | 3 lines
Remove leftover test output file.
........
r52547 | georg.brandl | 2006-10-29 22:54:18 +0100 (Sun, 29 Oct 2006) | 3 lines
Move the check for openpty to the beginning.
........
r52548 | walter.doerwald | 2006-10-29 23:06:28 +0100 (Sun, 29 Oct 2006) | 2 lines
Add tests for basic argument errors.
........
r52549 | walter.doerwald | 2006-10-30 00:02:27 +0100 (Mon, 30 Oct 2006) | 3 lines
Add tests for incremental codecs with an errors
argument.
........
r52550 | neal.norwitz | 2006-10-30 00:39:03 +0100 (Mon, 30 Oct 2006) | 1 line
Fix refleak
........
r52552 | neal.norwitz | 2006-10-30 00:58:36 +0100 (Mon, 30 Oct 2006) | 1 line
I'm assuming this is correct, it fixes the tests so they pass again
........
r52555 | vinay.sajip | 2006-10-31 18:32:37 +0100 (Tue, 31 Oct 2006) | 1 line
Change to improve speed of _fixupChildren
........
r52556 | vinay.sajip | 2006-10-31 18:34:31 +0100 (Tue, 31 Oct 2006) | 1 line
Added relativeCreated to Formatter doc (has been in the system for a long time - was unaccountably left out of the docs and not noticed until now).
........
r52588 | thomas.heller | 2006-11-02 20:48:24 +0100 (Thu, 02 Nov 2006) | 5 lines
Replace the XXX marker in the 'Arrays and pointers' reference manual
section with a link to the tutorial sections.
Will backport to release25-maint.
........
r52592 | thomas.heller | 2006-11-02 21:22:29 +0100 (Thu, 02 Nov 2006) | 6 lines
Fix a code example by adding a missing import.
Fixes #1557890.
Will backport to release25-maint.
........
r52598 | tim.peters | 2006-11-03 03:32:46 +0100 (Fri, 03 Nov 2006) | 2 lines
Whitespace normalization.
........
r52619 | martin.v.loewis | 2006-11-04 19:14:06 +0100 (Sat, 04 Nov 2006) | 4 lines
- Patch #1060577: Extract list of RPM files from spec file in
bdist_rpm
Will backport to 2.5.
........
r52621 | neal.norwitz | 2006-11-04 20:25:22 +0100 (Sat, 04 Nov 2006) | 4 lines
Bug #1588287: fix invalid assertion for `1,2` in debug builds.
Will backport
........
r52630 | andrew.kuchling | 2006-11-05 22:04:37 +0100 (Sun, 05 Nov 2006) | 1 line
Update link
........
r52631 | skip.montanaro | 2006-11-06 15:34:52 +0100 (Mon, 06 Nov 2006) | 1 line
note that user can control directory location even if default dir is used
........
r52644 | ronald.oussoren | 2006-11-07 16:53:38 +0100 (Tue, 07 Nov 2006) | 2 lines
Fix a number of typos in strings and comments (sf#1589070)
........
r52647 | ronald.oussoren | 2006-11-07 17:00:34 +0100 (Tue, 07 Nov 2006) | 2 lines
Whitespace changes to make the source more compliant with PEP8 (SF#1589070)
........
r52651 | thomas.heller | 2006-11-07 19:01:18 +0100 (Tue, 07 Nov 2006) | 3 lines
Fix markup.
Will backport to release25-maint.
........
r52653 | thomas.heller | 2006-11-07 19:20:47 +0100 (Tue, 07 Nov 2006) | 3 lines
Fix grammatical error as well.
Will backport to release25-maint.
........
r52657 | andrew.kuchling | 2006-11-07 21:39:16 +0100 (Tue, 07 Nov 2006) | 1 line
Add missing word
........
r52662 | martin.v.loewis | 2006-11-08 07:46:37 +0100 (Wed, 08 Nov 2006) | 4 lines
Correctly forward exception in instance_contains().
Fixes #1591996. Patch contributed by Neal Norwitz.
Will backport.
........
r52664 | martin.v.loewis | 2006-11-08 07:48:36 +0100 (Wed, 08 Nov 2006) | 2 lines
News entry for 52662.
........
r52665 | martin.v.loewis | 2006-11-08 08:35:55 +0100 (Wed, 08 Nov 2006) | 2 lines
Patch #1351744: Add askyesnocancel helper for tkMessageBox.
........
r52666 | georg.brandl | 2006-11-08 08:45:59 +0100 (Wed, 08 Nov 2006) | 2 lines
Patch #1592072: fix docs for return value of PyErr_CheckSignals.
........
r52668 | georg.brandl | 2006-11-08 11:04:29 +0100 (Wed, 08 Nov 2006) | 3 lines
Bug #1592533: rename variable in heapq doc example, to avoid shadowing
"sorted".
........
r52671 | andrew.kuchling | 2006-11-08 14:35:34 +0100 (Wed, 08 Nov 2006) | 1 line
Add section on the functional module
........
r52672 | andrew.kuchling | 2006-11-08 15:14:30 +0100 (Wed, 08 Nov 2006) | 1 line
Add section on operator module; make a few edits
........
r52673 | andrew.kuchling | 2006-11-08 15:24:03 +0100 (Wed, 08 Nov 2006) | 1 line
Add table of contents; this required fixing a few headings. Some more smalle edits.
........
r52674 | andrew.kuchling | 2006-11-08 15:30:14 +0100 (Wed, 08 Nov 2006) | 1 line
More edits
........
r52686 | martin.v.loewis | 2006-11-09 12:06:03 +0100 (Thu, 09 Nov 2006) | 3 lines
Patch #838546: Make terminal become controlling in pty.fork().
Will backport to 2.5.
........
r52688 | martin.v.loewis | 2006-11-09 12:27:32 +0100 (Thu, 09 Nov 2006) | 2 lines
Patch #1592250: Add elidge argument to Tkinter.Text.search.
........
r52690 | andrew.kuchling | 2006-11-09 14:27:07 +0100 (Thu, 09 Nov 2006) | 7 lines
[Bug #1569790] mailbox.Maildir.get_folder() loses factory information
Both the Maildir and MH classes had this bug; the patch fixes both classes
and adds a test.
Will backport to 25-maint.
........
r52692 | andrew.kuchling | 2006-11-09 14:51:14 +0100 (Thu, 09 Nov 2006) | 1 line
[Patch #1514544 by David Watson] use fsync() to ensure data is really on disk
........
r52695 | walter.doerwald | 2006-11-09 17:23:26 +0100 (Thu, 09 Nov 2006) | 2 lines
Replace C++ comment with C comment (fixes SF bug #1593525).
........
r52712 | andrew.kuchling | 2006-11-09 22:16:46 +0100 (Thu, 09 Nov 2006) | 11 lines
[Patch #1514543] mailbox (Maildir): avoid losing messages on name clash
Two changes:
Where possible, use link()/remove() to move files into a directory; this
makes it easier to avoid overwriting an existing file.
Use _create_carefully() to create files in tmp/, which uses O_EXCL.
Backport candidate.
........
r52716 | phillip.eby | 2006-11-10 01:33:36 +0100 (Fri, 10 Nov 2006) | 4 lines
Fix SF#1566719: not creating site-packages (or other target directory) when
installing .egg-info for a project that contains no modules or packages,
while using --root (as in bdist_rpm).
........
r52719 | andrew.kuchling | 2006-11-10 14:14:01 +0100 (Fri, 10 Nov 2006) | 1 line
Reword entry
........
r52725 | andrew.kuchling | 2006-11-10 15:39:01 +0100 (Fri, 10 Nov 2006) | 1 line
[Feature request #1542920] Link to wsgi.org
........
r52731 | georg.brandl | 2006-11-11 19:29:11 +0100 (Sat, 11 Nov 2006) | 2 lines
Bug #1594742: wrong word in stringobject doc.
........
r52733 | georg.brandl | 2006-11-11 19:32:47 +0100 (Sat, 11 Nov 2006) | 2 lines
Bug #1594758: wording improvement for dict.update() docs.
........
r52736 | martin.v.loewis | 2006-11-12 11:32:47 +0100 (Sun, 12 Nov 2006) | 3 lines
Patch #1065257: Support passing open files as body in
HTTPConnection.request().
........
r52737 | martin.v.loewis | 2006-11-12 11:41:39 +0100 (Sun, 12 Nov 2006) | 2 lines
Patch #1355023: support whence argument for GzipFile.seek.
........
r52738 | martin.v.loewis | 2006-11-12 19:24:26 +0100 (Sun, 12 Nov 2006) | 2 lines
Bug #1067760: Deprecate passing floats to file.seek.
........
r52739 | martin.v.loewis | 2006-11-12 19:48:13 +0100 (Sun, 12 Nov 2006) | 3 lines
Patch #1359217: Ignore 2xx response before 150 response.
Will backport to 2.5.
........
r52741 | martin.v.loewis | 2006-11-12 19:56:03 +0100 (Sun, 12 Nov 2006) | 4 lines
Patch #1360200: Use unmangled_version RPM spec field to deal with
file name mangling.
Will backport to 2.5.
........
r52753 | walter.doerwald | 2006-11-15 17:23:46 +0100 (Wed, 15 Nov 2006) | 2 lines
Fix typo.
........
r52754 | georg.brandl | 2006-11-15 18:42:03 +0100 (Wed, 15 Nov 2006) | 2 lines
Bug #1594809: add a note to README regarding PYTHONPATH and make install.
........
r52762 | georg.brandl | 2006-11-16 16:05:14 +0100 (Thu, 16 Nov 2006) | 2 lines
Bug #1597576: mention that the new base64 api has been introduced in py2.4.
........
r52764 | georg.brandl | 2006-11-16 17:50:59 +0100 (Thu, 16 Nov 2006) | 3 lines
Bug #1597824: return the registered function from atexit.register()
to facilitate usage as a decorator.
........
r52765 | georg.brandl | 2006-11-16 18:08:45 +0100 (Thu, 16 Nov 2006) | 4 lines
Bug #1588217: don't parse "= " as a soft line break in binascii's
a2b_qp() function, instead leave it in the string as quopri.decode()
does.
........
r52776 | andrew.kuchling | 2006-11-17 14:30:25 +0100 (Fri, 17 Nov 2006) | 17 lines
Remove file-locking in MH.pack() method.
This change looks massive but it's mostly a re-indenting after
removing some try...finally blocks.
Also adds a test case that does a pack() while the mailbox is locked; this
test would have turned up bugs in the original code on some platforms.
In both nmh and GNU Mailutils' implementation of MH-format mailboxes,
no locking is done of individual message files when renaming them.
The original mailbox.py code did do locking, which meant that message
files had to be opened. This code was buggy on certain platforms
(found through reading the code); there were code paths that closed
the file object and then called _unlock_file() on it.
Will backport to 25-maint once I see how the buildbots react to this patch.
........
r52780 | martin.v.loewis | 2006-11-18 19:00:23 +0100 (Sat, 18 Nov 2006) | 5 lines
Patch #1538878: Don't make tkSimpleDialog dialogs transient if
the parent window is withdrawn. This mirrors what dialog.tcl
does.
Will backport to 2.5.
........
r52782 | martin.v.loewis | 2006-11-18 19:05:35 +0100 (Sat, 18 Nov 2006) | 4 lines
Patch #1594554: Always close a tkSimpleDialog on ok(), even
if an exception occurs.
Will backport to 2.5.
........
r52784 | martin.v.loewis | 2006-11-18 19:42:11 +0100 (Sat, 18 Nov 2006) | 3 lines
Patch #1472877: Fix Tix subwidget name resolution.
Will backport to 2.5.
........
r52786 | andrew.kuchling | 2006-11-18 23:17:33 +0100 (Sat, 18 Nov 2006) | 1 line
Expand checking in test_sha
........
r52787 | georg.brandl | 2006-11-19 09:48:30 +0100 (Sun, 19 Nov 2006) | 3 lines
Patch [ 1586791 ] better error msgs for some TypeErrors
........
r52788 | martin.v.loewis | 2006-11-19 11:41:41 +0100 (Sun, 19 Nov 2006) | 4 lines
Make cStringIO.truncate raise IOError for negative
arguments (even for -1). Fixes the last bit of
#1359365.
........
r52789 | andrew.kuchling | 2006-11-19 19:40:01 +0100 (Sun, 19 Nov 2006) | 1 line
Add a test case of data w/ bytes > 127
........
r52790 | martin.v.loewis | 2006-11-19 19:51:54 +0100 (Sun, 19 Nov 2006) | 3 lines
Patch #1070046: Marshal new-style objects like InstanceType
in xmlrpclib.
........
r52792 | neal.norwitz | 2006-11-19 22:26:53 +0100 (Sun, 19 Nov 2006) | 4 lines
Speed up function calls into the math module by using METH_O.
There should be no functional changes. However, the error msgs are
slightly different. Also verified that the module dict is not NULL on init.
........
r52794 | george.yoshida | 2006-11-20 03:24:48 +0100 (Mon, 20 Nov 2006) | 2 lines
markup fix
........
r52795 | georg.brandl | 2006-11-20 08:12:58 +0100 (Mon, 20 Nov 2006) | 3 lines
Further markup fix.
........
r52800 | andrew.kuchling | 2006-11-20 14:39:37 +0100 (Mon, 20 Nov 2006) | 2 lines
Jython compatibility fix: if uu.decode() opened its output file, be sure to
close it.
........
r52811 | neal.norwitz | 2006-11-21 06:26:22 +0100 (Tue, 21 Nov 2006) | 9 lines
Bug #1599782: Fix segfault on bsddb.db.DB().type().
The problem is that _DB_get_type() can't be called without the GIL
because it calls a bunch of PyErr_* APIs when an error occurs.
There were no other cases in this file that it was called without the GIL.
Removing the BEGIN/END THREAD around _DB_get_type() made everything work.
Will backport.
........
r52814 | neal.norwitz | 2006-11-21 06:51:51 +0100 (Tue, 21 Nov 2006) | 1 line
Oops, convert tabs to spaces
........
r52815 | neal.norwitz | 2006-11-21 07:23:44 +0100 (Tue, 21 Nov 2006) | 1 line
Fix SF #1599879, socket.gethostname should ref getfqdn directly.
........
r52817 | martin.v.loewis | 2006-11-21 19:20:25 +0100 (Tue, 21 Nov 2006) | 4 lines
Conditionalize definition of _CRT_SECURE_NO_DEPRECATE
and _CRT_NONSTDC_NO_DEPRECATE.
Will backport.
........
r52821 | martin.v.loewis | 2006-11-22 09:50:02 +0100 (Wed, 22 Nov 2006) | 4 lines
Patch #1362975: Rework CodeContext indentation algorithm to
avoid hard-coding pixel widths. Also make the text's scrollbar
a child of the text frame, not the top widget.
........
r52826 | walter.doerwald | 2006-11-23 06:03:56 +0100 (Thu, 23 Nov 2006) | 3 lines
Change decode() so that it works with a buffer (i.e. unicode(..., 'utf-8-sig'))
SF bug #1601501.
........
r52833 | georg.brandl | 2006-11-23 10:55:07 +0100 (Thu, 23 Nov 2006) | 2 lines
Bug #1601630: little improvement to getopt docs
........
r52835 | michael.hudson | 2006-11-23 14:54:04 +0100 (Thu, 23 Nov 2006) | 3 lines
a test for an error condition not covered by existing tests
(noticed this when writing the equivalent code for pypy)
........
r52839 | raymond.hettinger | 2006-11-23 22:06:03 +0100 (Thu, 23 Nov 2006) | 1 line
Fix and/add typo
........
r52840 | raymond.hettinger | 2006-11-23 22:35:19 +0100 (Thu, 23 Nov 2006) | 1 line
... and the number of the counting shall be three.
........
r52841 | thomas.heller | 2006-11-24 19:45:39 +0100 (Fri, 24 Nov 2006) | 1 line
Fix bug #1598620: A ctypes structure cannot contain itself.
........
r52843 | martin.v.loewis | 2006-11-25 16:39:19 +0100 (Sat, 25 Nov 2006) | 3 lines
Disable _XOPEN_SOURCE on NetBSD 1.x.
Will backport to 2.5
........
r52845 | georg.brandl | 2006-11-26 20:27:47 +0100 (Sun, 26 Nov 2006) | 2 lines
Bug #1603321: make pstats.Stats accept Unicode file paths.
........
r52850 | georg.brandl | 2006-11-27 19:46:21 +0100 (Mon, 27 Nov 2006) | 2 lines
Bug #1603789: grammatical error in Tkinter docs.
........
r52855 | thomas.heller | 2006-11-28 21:21:54 +0100 (Tue, 28 Nov 2006) | 7 lines
Fix #1563807: _ctypes built on AIX fails with ld ffi error.
The contents of ffi_darwin.c must be compiled unless __APPLE__ is
defined and __ppc__ is not.
Will backport.
........
r52862 | armin.rigo | 2006-11-29 22:59:22 +0100 (Wed, 29 Nov 2006) | 3 lines
Forgot a case where the locals can now be a general mapping
instead of just a dictionary. (backporting...)
........
r52872 | guido.van.rossum | 2006-11-30 20:23:13 +0100 (Thu, 30 Nov 2006) | 2 lines
Update version.
........
r52890 | walter.doerwald | 2006-12-01 17:59:47 +0100 (Fri, 01 Dec 2006) | 3 lines
Move xdrlib tests from the module into a separate test script,
port the tests to unittest and add a few new tests.
........
r52900 | raymond.hettinger | 2006-12-02 03:00:39 +0100 (Sat, 02 Dec 2006) | 1 line
Add name to credits (for untokenize).
........
r52905 | martin.v.loewis | 2006-12-03 10:54:46 +0100 (Sun, 03 Dec 2006) | 2 lines
Move IDLE news into NEWS.txt.
........
r52906 | martin.v.loewis | 2006-12-03 12:23:45 +0100 (Sun, 03 Dec 2006) | 4 lines
Patch #1544279: Improve thread-safety of the socket module by moving
the sock_addr_t storage out of the socket object.
Will backport to 2.5.
........
r52908 | martin.v.loewis | 2006-12-03 13:01:53 +0100 (Sun, 03 Dec 2006) | 3 lines
Patch #1371075: Make ConfigParser accept optional dict type
for ordering, sorting, etc.
........
r52910 | matthias.klose | 2006-12-03 18:16:41 +0100 (Sun, 03 Dec 2006) | 2 lines
- Fix build failure on kfreebsd and on the hurd.
........
r52915 | george.yoshida | 2006-12-04 12:41:54 +0100 (Mon, 04 Dec 2006) | 2 lines
fix a versionchanged tag
........
r52917 | george.yoshida | 2006-12-05 06:39:50 +0100 (Tue, 05 Dec 2006) | 3 lines
Fix pickle doc typo
Patch #1608758
........
r52938 | georg.brandl | 2006-12-06 23:21:18 +0100 (Wed, 06 Dec 2006) | 2 lines
Patch #1610437: fix a tarfile bug with long filename headers.
........
r52945 | brett.cannon | 2006-12-07 00:38:48 +0100 (Thu, 07 Dec 2006) | 3 lines
Fix a bad assumption that all objects assigned to '__loader__' on a module
will have a '_files' attribute.
........
r52951 | georg.brandl | 2006-12-07 10:30:06 +0100 (Thu, 07 Dec 2006) | 3 lines
RFE #1592899: mention string.maketrans() in docs for str.translate,
remove reference to the old regex module in the former's doc.
........
r52962 | raymond.hettinger | 2006-12-08 04:17:18 +0100 (Fri, 08 Dec 2006) | 1 line
Eliminate two redundant calls to PyObject_Hash().
........
r52963 | raymond.hettinger | 2006-12-08 05:24:33 +0100 (Fri, 08 Dec 2006) | 3 lines
Port Armin's fix for a dict resize vulnerability (svn revision 46589, sf bug 1456209).
........
r52964 | raymond.hettinger | 2006-12-08 05:57:50 +0100 (Fri, 08 Dec 2006) | 4 lines
Port Georg's dictobject.c fix keys that were tuples got unpacked on the way to setting a KeyError (svn revision 52535, sf bug
1576657).
........
r52966 | raymond.hettinger | 2006-12-08 18:35:25 +0100 (Fri, 08 Dec 2006) | 2 lines
Add test for SF bug 1576657
........
r52970 | georg.brandl | 2006-12-08 21:46:11 +0100 (Fri, 08 Dec 2006) | 3 lines
#1577756: svnversion doesn't react to LANG=C, use LC_ALL=C to force
English output.
........
r52972 | georg.brandl | 2006-12-09 10:08:29 +0100 (Sat, 09 Dec 2006) | 3 lines
Patch #1608267: fix a race condition in os.makedirs() is the directory
to be created is already there.
........
r52975 | matthias.klose | 2006-12-09 13:15:27 +0100 (Sat, 09 Dec 2006) | 2 lines
- Fix the build of the library reference in info format.
........
r52994 | neal.norwitz | 2006-12-11 02:01:06 +0100 (Mon, 11 Dec 2006) | 1 line
Fix a typo
........
r52996 | georg.brandl | 2006-12-11 08:56:33 +0100 (Mon, 11 Dec 2006) | 2 lines
Move errno imports back to individual functions.
........
r52998 | vinay.sajip | 2006-12-11 15:07:16 +0100 (Mon, 11 Dec 2006) | 1 line
Patch by Jeremy Katz (SF #1609407)
........
r53000 | vinay.sajip | 2006-12-11 15:26:23 +0100 (Mon, 11 Dec 2006) | 1 line
Patch by "cuppatea" (SF #1503765)
........
2006-12-13 00:49:30 -04:00
|
|
|
print GRAMMAR "##################################################\n";
|
|
|
|
print GRAMMAR "# This file is only meant to be a guide, #\n";
|
|
|
|
print GRAMMAR "# and differs in small ways from the real #\n";
|
|
|
|
print GRAMMAR "# grammar. The exact reference is the file #\n";
|
|
|
|
print GRAMMAR "# Grammar/Grammar distributed with the source. #\n";
|
|
|
|
print GRAMMAR "##################################################\n";
|
2001-07-06 19:43:02 -03:00
|
|
|
print GRAMMAR strip_grammar_markup($DefinedGrammars{$lang});
|
|
|
|
close(GRAMMAR);
|
|
|
|
print "Wrote grammar file $filename\n";
|
|
|
|
}
|
|
|
|
my $PATTERN = '<pyGrammarToken><([^>]*)><([^>]*)>';
|
|
|
|
foreach $filename (keys %BackpatchGrammarFiles) {
|
|
|
|
print "\nBack-patching grammar links in $filename\n";
|
|
|
|
my $buffer;
|
|
|
|
open(GRAMMAR, "<$filename") || die "\n$!\n";
|
|
|
|
# read all of the file into the buffer
|
|
|
|
sysread(GRAMMAR, $buffer, 1024*1024);
|
|
|
|
close(GRAMMAR);
|
|
|
|
while ($buffer =~ /$PATTERN/) {
|
|
|
|
my($lang, $token) = ($1, $2);
|
|
|
|
my $target = $TokenToTargetMapping{"$lang:$token"};
|
|
|
|
my $source = "<pyGrammarToken><$lang><$token>";
|
|
|
|
$buffer =~ s/$source/$target/g;
|
|
|
|
}
|
|
|
|
open(GRAMMAR, ">$filename") || die "\n$!\n";
|
|
|
|
print GRAMMAR $buffer;
|
|
|
|
close(GRAMMAR);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub strip_grammar_markup($){
|
2001-07-06 19:43:02 -03:00
|
|
|
local($_) = @_;
|
2002-03-15 19:21:37 -04:00
|
|
|
s/\\productioncont/ /g;
|
2002-11-15 15:04:10 -04:00
|
|
|
s/\\production(<<\d+>>)(.+)\1/\n$2 ::= /g;
|
|
|
|
s/\\token(<<\d+>>)(.+)\1/$2/g;
|
|
|
|
s/\\e([^a-zA-Z])/\\$1/g;
|
2001-07-06 19:43:02 -03:00
|
|
|
s/<<\d+>>//g;
|
|
|
|
s/;SPMgt;/>/g;
|
|
|
|
s/;SPMlt;/</g;
|
|
|
|
s/;SPMquot;/\"/g;
|
|
|
|
return $_;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-04-03 01:51:13 -03:00
|
|
|
$REFCOUNTS_LOADED = 0;
|
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub load_refcounts(){
|
2000-04-03 01:51:13 -03:00
|
|
|
$REFCOUNTS_LOADED = 1;
|
|
|
|
|
2002-11-15 15:04:10 -04:00
|
|
|
my($myname, $mydir, $myext) = fileparse(__FILE__, '\..*');
|
2003-09-05 12:43:58 -03:00
|
|
|
chop $mydir; # remove trailing '/'
|
2000-04-03 01:51:13 -03:00
|
|
|
($myname, $mydir, $myext) = fileparse($mydir, '\..*');
|
2003-09-05 12:43:58 -03:00
|
|
|
chop $mydir; # remove trailing '/'
|
2000-04-03 01:51:13 -03:00
|
|
|
$mydir = getcwd() . "$dd$mydir"
|
|
|
|
unless $mydir =~ s|^/|/|;
|
|
|
|
local $_;
|
|
|
|
my $filename = "$mydir${dd}api${dd}refcounts.dat";
|
|
|
|
open(REFCOUNT_FILE, "<$filename") || die "\n$!\n";
|
|
|
|
print "[loading API refcount data]";
|
|
|
|
while (<REFCOUNT_FILE>) {
|
2000-04-10 15:26:45 -03:00
|
|
|
if (/([a-zA-Z0-9_]+):PyObject\*:([a-zA-Z0-9_]*):(0|[-+]1|null):(.*)$/) {
|
2000-04-03 01:51:13 -03:00
|
|
|
my($func, $param, $count, $comment) = ($1, $2, $3, $4);
|
|
|
|
#print "\n$func($param) --> $count";
|
|
|
|
$REFCOUNTS{"$func:$param"} = $count;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub get_refcount($$){
|
|
|
|
my($func, $param) = @_;
|
2000-04-03 01:51:13 -03:00
|
|
|
load_refcounts()
|
|
|
|
unless $REFCOUNTS_LOADED;
|
|
|
|
return $REFCOUNTS{"$func:$param"};
|
|
|
|
}
|
|
|
|
|
2001-10-26 00:09:27 -03:00
|
|
|
|
|
|
|
$TLSTART = '<span class="typelabel">';
|
2002-06-18 15:24:16 -03:00
|
|
|
$TLEND = '</span> ';
|
2001-10-26 00:09:27 -03:00
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub cfuncline_helper($$$){
|
|
|
|
my($type, $name, $args) = @_;
|
2000-04-03 01:51:13 -03:00
|
|
|
my $idx = make_str_index_entry(
|
2002-04-15 17:48:40 -03:00
|
|
|
"<tt class=\"cfunction\">$name()</tt>" . get_indexsubitem());
|
1998-04-16 23:15:42 -03:00
|
|
|
$idx =~ s/ \(.*\)//;
|
2003-09-05 12:43:58 -03:00
|
|
|
$idx =~ s/\(\)//; # ???? - why both of these?
|
2002-11-15 15:04:10 -04:00
|
|
|
$args =~ s/(\s|\*)([a-z_][a-z_0-9]*),/$1<var>$2<\/var>,/g;
|
|
|
|
$args =~ s/(\s|\*)([a-z_][a-z_0-9]*)$/$1<var>$2<\/var>/s;
|
2002-11-13 15:16:37 -04:00
|
|
|
return ('<table cellpadding="0" cellspacing="0"><tr valign="baseline">'
|
|
|
|
. "<td><nobr>$type\ <b>$idx</b>(</nobr></td>"
|
|
|
|
. "<td>$args)</td>"
|
|
|
|
. '</tr></table>');
|
2002-04-15 17:48:40 -03:00
|
|
|
}
|
|
|
|
sub do_cmd_cfuncline{
|
|
|
|
local($_) = @_;
|
|
|
|
my $type = next_argument();
|
|
|
|
my $name = next_argument();
|
|
|
|
my $args = next_argument();
|
|
|
|
my $siginfo = cfuncline_helper($type, $name, $args);
|
|
|
|
return "<dt>$siginfo\n<dd>" . $_;
|
|
|
|
}
|
|
|
|
sub do_env_cfuncdesc{
|
|
|
|
local($_) = @_;
|
|
|
|
my $type = next_argument();
|
|
|
|
my $name = next_argument();
|
|
|
|
my $args = next_argument();
|
|
|
|
my $siginfo = cfuncline_helper($type, $name, $args);
|
|
|
|
my $result_rc = get_refcount($name, '');
|
2000-04-03 01:51:13 -03:00
|
|
|
my $rcinfo = '';
|
|
|
|
if ($result_rc eq '+1') {
|
2000-08-11 17:04:19 -03:00
|
|
|
$rcinfo = 'New reference';
|
2000-04-03 01:51:13 -03:00
|
|
|
}
|
|
|
|
elsif ($result_rc eq '0') {
|
2000-08-11 17:04:19 -03:00
|
|
|
$rcinfo = 'Borrowed reference';
|
2000-04-03 01:51:13 -03:00
|
|
|
}
|
2000-04-10 15:26:45 -03:00
|
|
|
elsif ($result_rc eq 'null') {
|
2000-08-11 17:04:19 -03:00
|
|
|
$rcinfo = 'Always <tt class="constant">NULL</tt>';
|
2000-04-10 15:26:45 -03:00
|
|
|
}
|
2000-04-03 01:51:13 -03:00
|
|
|
if ($rcinfo ne '') {
|
2000-08-11 17:04:19 -03:00
|
|
|
$rcinfo = ( "\n<div class=\"refcount-info\">"
|
|
|
|
. "\n <span class=\"label\">Return value:</span>"
|
|
|
|
. "\n <span class=\"value\">$rcinfo.</span>"
|
|
|
|
. "\n</div>");
|
2000-04-03 01:51:13 -03:00
|
|
|
}
|
2003-08-05 00:45:37 -03:00
|
|
|
return "<dl><dt>$siginfo</dt>\n<dd>"
|
2000-04-03 01:51:13 -03:00
|
|
|
. $rcinfo
|
1998-08-10 16:40:44 -03:00
|
|
|
. $_
|
2003-08-05 00:45:37 -03:00
|
|
|
. '</dd></dl>';
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
2002-04-15 14:46:00 -03:00
|
|
|
sub do_cmd_cmemberline{
|
|
|
|
local($_) = @_;
|
|
|
|
my $container = next_argument();
|
|
|
|
my $type = next_argument();
|
|
|
|
my $name = next_argument();
|
|
|
|
my $idx = make_str_index_entry("<tt class=\"cmember\">$name</tt>"
|
2002-04-15 16:35:29 -03:00
|
|
|
. " ($container member)");
|
2002-04-15 14:46:00 -03:00
|
|
|
$idx =~ s/ \(.*\)//;
|
2003-08-05 00:45:37 -03:00
|
|
|
return "<dt>$type <b>$idx</b></dt>\n<dd>"
|
2002-04-15 14:46:00 -03:00
|
|
|
. $_;
|
|
|
|
}
|
|
|
|
sub do_env_cmemberdesc{
|
|
|
|
local($_) = @_;
|
|
|
|
my $container = next_argument();
|
|
|
|
my $type = next_argument();
|
|
|
|
my $name = next_argument();
|
|
|
|
my $idx = make_str_index_entry("<tt class=\"cmember\">$name</tt>"
|
2002-04-15 16:35:29 -03:00
|
|
|
. " ($container member)");
|
2002-04-15 14:46:00 -03:00
|
|
|
$idx =~ s/ \(.*\)//;
|
2003-08-05 00:45:37 -03:00
|
|
|
return "<dl><dt>$type <b>$idx</b></dt>\n<dd>"
|
2002-04-15 14:46:00 -03:00
|
|
|
. $_
|
|
|
|
. '</dl>';
|
|
|
|
}
|
|
|
|
|
2000-04-03 01:51:13 -03:00
|
|
|
sub do_env_csimplemacrodesc{
|
|
|
|
local($_) = @_;
|
|
|
|
my $name = next_argument();
|
2001-06-20 18:29:30 -03:00
|
|
|
my $idx = make_str_index_entry("<tt class=\"macro\">$name</tt>");
|
2003-08-05 00:45:37 -03:00
|
|
|
return "<dl><dt><b>$idx</b></dt>\n<dd>"
|
2000-04-03 01:51:13 -03:00
|
|
|
. $_
|
|
|
|
. '</dl>'
|
|
|
|
}
|
|
|
|
|
1998-03-03 18:02:19 -04:00
|
|
|
sub do_env_ctypedesc{
|
|
|
|
local($_) = @_;
|
2000-04-03 01:51:13 -03:00
|
|
|
my $index_name = next_optional_argument();
|
1999-01-05 18:16:29 -04:00
|
|
|
my $type_name = next_argument();
|
2000-04-03 01:51:13 -03:00
|
|
|
$index_name = $type_name
|
|
|
|
unless $index_name;
|
2002-05-23 14:59:16 -03:00
|
|
|
my($name, $aname, $ahref) = new_link_info();
|
2001-06-20 18:29:30 -03:00
|
|
|
add_index_entry("<tt class=\"ctype\">$index_name</tt> (C type)", $ahref);
|
2003-08-05 00:45:37 -03:00
|
|
|
return "<dl><dt><b><tt class=\"ctype\">$aname$type_name</a></tt></b></dt>"
|
|
|
|
. "\n<dd>"
|
1998-08-10 16:40:44 -03:00
|
|
|
. $_
|
|
|
|
. '</dl>'
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
sub do_env_cvardesc{
|
|
|
|
local($_) = @_;
|
1998-04-16 23:15:42 -03:00
|
|
|
my $var_type = next_argument();
|
1999-01-05 18:16:29 -04:00
|
|
|
my $var_name = next_argument();
|
2001-06-20 18:29:30 -03:00
|
|
|
my $idx = make_str_index_entry("<tt class=\"cdata\">$var_name</tt>"
|
2003-09-05 12:43:58 -03:00
|
|
|
. get_indexsubitem());
|
1998-04-16 23:15:42 -03:00
|
|
|
$idx =~ s/ \(.*\)//;
|
2003-08-05 00:45:37 -03:00
|
|
|
return "<dl><dt>$var_type <b>$idx</b></dt>\n"
|
1998-08-10 16:40:44 -03:00
|
|
|
. '<dd>'
|
|
|
|
. $_
|
2003-08-05 00:45:37 -03:00
|
|
|
. '</dd></dl>';
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
do_cmd_shortversion(),
do_cmd_setshortversion(): Implementation for new markup.
convert_args(): New helper function.
do_cmd_optional(): Modified to understand when it is called from within
a convert_args() invocation.
do_env_funcdesc(),
do_env_funcdescni(),
do_cmd_funcline(),
do_cmd_funclineni(),
handle_classlike_descriptor(),
do_env_methoddesc(),
do_end_methoddescni(),
do_cmd_methodline(),
do_cmd_methodlineni(): Modified to use helper convert_args().
The convert_args() helper and related changes fix the generation of HTML
for the \optional markup, so that bogus </var>...<var> is not generated.
This closes SourceForge bug #113800.
2000-09-14 17:17:23 -03:00
|
|
|
sub convert_args($){
|
|
|
|
local($IN_DESC_HANDLER) = 1;
|
|
|
|
local($_) = @_;
|
|
|
|
return translate_commands($_);
|
|
|
|
}
|
|
|
|
|
2002-06-18 15:24:16 -03:00
|
|
|
sub funcline_helper($$$){
|
|
|
|
my($first, $idxitem, $arglist) = @_;
|
|
|
|
return (($first ? '<dl>' : '')
|
2002-11-13 15:16:37 -04:00
|
|
|
. '<dt><table cellpadding="0" cellspacing="0"><tr valign="baseline">'
|
|
|
|
. "\n <td><nobr><b>$idxitem</b>(</nobr></td>"
|
2003-08-05 00:45:37 -03:00
|
|
|
. "\n <td><var>$arglist</var>)</td></tr></table></dt>\n<dd>");
|
2002-06-18 15:24:16 -03:00
|
|
|
}
|
|
|
|
|
1998-03-03 18:02:19 -04:00
|
|
|
sub do_env_funcdesc{
|
|
|
|
local($_) = @_;
|
1998-04-16 23:15:42 -03:00
|
|
|
my $function_name = next_argument();
|
do_cmd_shortversion(),
do_cmd_setshortversion(): Implementation for new markup.
convert_args(): New helper function.
do_cmd_optional(): Modified to understand when it is called from within
a convert_args() invocation.
do_env_funcdesc(),
do_env_funcdescni(),
do_cmd_funcline(),
do_cmd_funclineni(),
handle_classlike_descriptor(),
do_env_methoddesc(),
do_end_methoddescni(),
do_cmd_methodline(),
do_cmd_methodlineni(): Modified to use helper convert_args().
The convert_args() helper and related changes fix the generation of HTML
for the \optional markup, so that bogus </var>...<var> is not generated.
This closes SourceForge bug #113800.
2000-09-14 17:17:23 -03:00
|
|
|
my $arg_list = convert_args(next_argument());
|
2001-06-20 18:29:30 -03:00
|
|
|
my $idx = make_str_index_entry("<tt class=\"function\">$function_name()"
|
|
|
|
. '</tt>'
|
2003-09-05 12:43:58 -03:00
|
|
|
. get_indexsubitem());
|
1998-04-16 23:15:42 -03:00
|
|
|
$idx =~ s/ \(.*\)//;
|
1999-01-05 18:16:29 -04:00
|
|
|
$idx =~ s/\(\)<\/tt>/<\/tt>/;
|
2002-06-18 15:24:16 -03:00
|
|
|
return funcline_helper(1, $idx, $arg_list) . $_ . '</dl>';
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
sub do_env_funcdescni{
|
|
|
|
local($_) = @_;
|
1998-04-16 23:15:42 -03:00
|
|
|
my $function_name = next_argument();
|
do_cmd_shortversion(),
do_cmd_setshortversion(): Implementation for new markup.
convert_args(): New helper function.
do_cmd_optional(): Modified to understand when it is called from within
a convert_args() invocation.
do_env_funcdesc(),
do_env_funcdescni(),
do_cmd_funcline(),
do_cmd_funclineni(),
handle_classlike_descriptor(),
do_env_methoddesc(),
do_end_methoddescni(),
do_cmd_methodline(),
do_cmd_methodlineni(): Modified to use helper convert_args().
The convert_args() helper and related changes fix the generation of HTML
for the \optional markup, so that bogus </var>...<var> is not generated.
This closes SourceForge bug #113800.
2000-09-14 17:17:23 -03:00
|
|
|
my $arg_list = convert_args(next_argument());
|
2002-06-18 15:24:16 -03:00
|
|
|
my $prefix = "<tt class=\"function\">$function_name</tt>";
|
|
|
|
return funcline_helper(1, $prefix, $arg_list) . $_ . '</dl>';
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
sub do_cmd_funcline{
|
|
|
|
local($_) = @_;
|
1998-04-16 23:15:42 -03:00
|
|
|
my $function_name = next_argument();
|
do_cmd_shortversion(),
do_cmd_setshortversion(): Implementation for new markup.
convert_args(): New helper function.
do_cmd_optional(): Modified to understand when it is called from within
a convert_args() invocation.
do_env_funcdesc(),
do_env_funcdescni(),
do_cmd_funcline(),
do_cmd_funclineni(),
handle_classlike_descriptor(),
do_env_methoddesc(),
do_end_methoddescni(),
do_cmd_methodline(),
do_cmd_methodlineni(): Modified to use helper convert_args().
The convert_args() helper and related changes fix the generation of HTML
for the \optional markup, so that bogus </var>...<var> is not generated.
This closes SourceForge bug #113800.
2000-09-14 17:17:23 -03:00
|
|
|
my $arg_list = convert_args(next_argument());
|
2001-06-20 18:29:30 -03:00
|
|
|
my $prefix = "<tt class=\"function\">$function_name()</tt>";
|
1999-04-21 12:58:58 -03:00
|
|
|
my $idx = make_str_index_entry($prefix . get_indexsubitem());
|
|
|
|
$prefix =~ s/\(\)//;
|
|
|
|
|
2002-06-18 15:24:16 -03:00
|
|
|
return funcline_helper(0, $prefix, $arg_list) . $_;
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
1999-07-12 13:50:09 -03:00
|
|
|
sub do_cmd_funclineni{
|
|
|
|
local($_) = @_;
|
|
|
|
my $function_name = next_argument();
|
do_cmd_shortversion(),
do_cmd_setshortversion(): Implementation for new markup.
convert_args(): New helper function.
do_cmd_optional(): Modified to understand when it is called from within
a convert_args() invocation.
do_env_funcdesc(),
do_env_funcdescni(),
do_cmd_funcline(),
do_cmd_funclineni(),
handle_classlike_descriptor(),
do_env_methoddesc(),
do_end_methoddescni(),
do_cmd_methodline(),
do_cmd_methodlineni(): Modified to use helper convert_args().
The convert_args() helper and related changes fix the generation of HTML
for the \optional markup, so that bogus </var>...<var> is not generated.
This closes SourceForge bug #113800.
2000-09-14 17:17:23 -03:00
|
|
|
my $arg_list = convert_args(next_argument());
|
2001-06-20 18:29:30 -03:00
|
|
|
my $prefix = "<tt class=\"function\">$function_name</tt>";
|
1999-07-12 13:50:09 -03:00
|
|
|
|
2002-06-18 15:24:16 -03:00
|
|
|
return funcline_helper(0, $prefix, $arg_list) . $_;
|
1999-07-12 13:50:09 -03:00
|
|
|
}
|
|
|
|
|
1998-03-03 18:02:19 -04:00
|
|
|
# Change this flag to index the opcode entries. I don't think it's very
|
|
|
|
# useful to index them, since they're only presented to describe the dis
|
|
|
|
# module.
|
|
|
|
#
|
|
|
|
$INDEX_OPCODES = 0;
|
|
|
|
|
|
|
|
sub do_env_opcodedesc{
|
|
|
|
local($_) = @_;
|
1998-04-16 23:15:42 -03:00
|
|
|
my $opcode_name = next_argument();
|
1999-01-05 18:16:29 -04:00
|
|
|
my $arg_list = next_argument();
|
1998-04-16 23:15:42 -03:00
|
|
|
my $idx;
|
|
|
|
if ($INDEX_OPCODES) {
|
2003-09-05 12:43:58 -03:00
|
|
|
$idx = make_str_index_entry("<tt class=\"opcode\">$opcode_name</tt>"
|
2001-06-20 18:29:30 -03:00
|
|
|
. ' (byte code instruction)');
|
2003-09-05 12:43:58 -03:00
|
|
|
$idx =~ s/ \(byte code instruction\)//;
|
1998-04-16 23:15:42 -03:00
|
|
|
}
|
|
|
|
else {
|
2003-09-05 12:43:58 -03:00
|
|
|
$idx = "<tt class=\"opcode\">$opcode_name</tt>";
|
1998-04-16 23:15:42 -03:00
|
|
|
}
|
|
|
|
my $stuff = "<dl><dt><b>$idx</b>";
|
1998-03-03 18:02:19 -04:00
|
|
|
if ($arg_list) {
|
2003-09-05 12:43:58 -03:00
|
|
|
$stuff .= " <var>$arg_list</var>";
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
2003-08-05 00:45:37 -03:00
|
|
|
return $stuff . "</dt>\n<dd>" . $_ . '</dt></dl>';
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
sub do_env_datadesc{
|
|
|
|
local($_) = @_;
|
1999-01-05 18:16:29 -04:00
|
|
|
my $dataname = next_argument();
|
|
|
|
my $idx = make_str_index_entry("<tt>$dataname</tt>" . get_indexsubitem());
|
1998-04-16 23:15:42 -03:00
|
|
|
$idx =~ s/ \(.*\)//;
|
2003-08-05 00:45:37 -03:00
|
|
|
return "<dl><dt><b>$idx</b></dt>\n<dd>"
|
1998-08-10 16:40:44 -03:00
|
|
|
. $_
|
2003-09-05 12:43:58 -03:00
|
|
|
. '</dd></dl>';
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
sub do_env_datadescni{
|
|
|
|
local($_) = @_;
|
1998-04-16 23:15:42 -03:00
|
|
|
my $idx = next_argument();
|
|
|
|
if (! $STRING_INDEX_TT) {
|
2003-09-05 12:43:58 -03:00
|
|
|
$idx = "<tt>$idx</tt>";
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
2003-08-05 00:45:37 -03:00
|
|
|
return "<dl><dt><b>$idx</b></dt>\n<dd>" . $_ . '</dd></dl>';
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
sub do_cmd_dataline{
|
|
|
|
local($_) = @_;
|
1999-01-05 18:16:29 -04:00
|
|
|
my $data_name = next_argument();
|
|
|
|
my $idx = make_str_index_entry("<tt>$data_name</tt>" . get_indexsubitem());
|
1998-03-03 18:02:19 -04:00
|
|
|
$idx =~ s/ \(.*\)//;
|
2003-08-05 00:45:37 -03:00
|
|
|
return "<dt><b>$idx</b></dt><dd>" . $_;
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
2000-04-10 14:47:14 -03:00
|
|
|
sub do_cmd_datalineni{
|
|
|
|
local($_) = @_;
|
|
|
|
my $data_name = next_argument();
|
2003-08-05 00:45:37 -03:00
|
|
|
return "<dt><b><tt>$data_name</tt></b></dt><dd>" . $_;
|
2000-04-10 14:47:14 -03:00
|
|
|
}
|
|
|
|
|
1998-03-27 01:16:10 -04:00
|
|
|
sub do_env_excdesc{
|
|
|
|
local($_) = @_;
|
1999-01-05 18:16:29 -04:00
|
|
|
my $excname = next_argument();
|
2001-06-20 18:29:30 -03:00
|
|
|
my $idx = make_str_index_entry("<tt class=\"exception\">$excname</tt>");
|
2003-08-05 00:45:37 -03:00
|
|
|
return ("<dl><dt><b>${TLSTART}exception$TLEND$idx</b></dt>"
|
2001-10-26 00:09:27 -03:00
|
|
|
. "\n<dd>"
|
|
|
|
. $_
|
2003-08-05 00:45:37 -03:00
|
|
|
. '</dd></dl>');
|
1998-03-27 01:16:10 -04:00
|
|
|
}
|
|
|
|
|
1998-08-10 16:40:44 -03:00
|
|
|
sub do_env_fulllineitems{ return do_env_itemize(@_); }
|
1998-03-03 18:02:19 -04:00
|
|
|
|
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub handle_classlike_descriptor($$){
|
2000-09-09 03:07:37 -03:00
|
|
|
local($_, $what) = @_;
|
1998-04-16 23:15:42 -03:00
|
|
|
$THIS_CLASS = next_argument();
|
do_cmd_shortversion(),
do_cmd_setshortversion(): Implementation for new markup.
convert_args(): New helper function.
do_cmd_optional(): Modified to understand when it is called from within
a convert_args() invocation.
do_env_funcdesc(),
do_env_funcdescni(),
do_cmd_funcline(),
do_cmd_funclineni(),
handle_classlike_descriptor(),
do_env_methoddesc(),
do_end_methoddescni(),
do_cmd_methodline(),
do_cmd_methodlineni(): Modified to use helper convert_args().
The convert_args() helper and related changes fix the generation of HTML
for the \optional markup, so that bogus </var>...<var> is not generated.
This closes SourceForge bug #113800.
2000-09-14 17:17:23 -03:00
|
|
|
my $arg_list = convert_args(next_argument());
|
1999-01-05 18:16:29 -04:00
|
|
|
$idx = make_str_index_entry(
|
2003-09-05 12:43:58 -03:00
|
|
|
"<tt class=\"$what\">$THIS_CLASS</tt> ($what in $THIS_MODULE)" );
|
1998-04-16 23:15:42 -03:00
|
|
|
$idx =~ s/ \(.*\)//;
|
2002-06-18 15:24:16 -03:00
|
|
|
my $prefix = "$TLSTART$what$TLEND$idx";
|
|
|
|
return funcline_helper(1, $prefix, $arg_list) . $_ . '</dl>';
|
1998-03-27 01:16:10 -04:00
|
|
|
}
|
|
|
|
|
2000-09-09 03:07:37 -03:00
|
|
|
sub do_env_classdesc{
|
2002-11-15 15:04:10 -04:00
|
|
|
return handle_classlike_descriptor($_[0], "class");
|
2000-09-09 03:07:37 -03:00
|
|
|
}
|
|
|
|
|
2001-05-10 22:00:30 -03:00
|
|
|
sub do_env_classdescstar{
|
|
|
|
local($_) = @_;
|
|
|
|
$THIS_CLASS = next_argument();
|
|
|
|
$idx = make_str_index_entry(
|
2003-09-05 12:43:58 -03:00
|
|
|
"<tt class=\"class\">$THIS_CLASS</tt> (class in $THIS_MODULE)");
|
2001-05-10 22:00:30 -03:00
|
|
|
$idx =~ s/ \(.*\)//;
|
2002-06-18 15:24:16 -03:00
|
|
|
my $prefix = "${TLSTART}class$TLEND$idx";
|
|
|
|
# Can't use funcline_helper() since there is no args list.
|
|
|
|
return "<dl><dt><b>$prefix</b>\n<dd>" . $_ . '</dl>';
|
2001-05-10 22:00:30 -03:00
|
|
|
}
|
|
|
|
|
2000-09-09 03:07:37 -03:00
|
|
|
sub do_env_excclassdesc{
|
2002-11-15 15:04:10 -04:00
|
|
|
return handle_classlike_descriptor($_[0], "exception");
|
2000-09-09 03:07:37 -03:00
|
|
|
}
|
|
|
|
|
1998-03-27 01:16:10 -04:00
|
|
|
|
|
|
|
sub do_env_methoddesc{
|
|
|
|
local($_) = @_;
|
1998-04-16 23:15:42 -03:00
|
|
|
my $class_name = next_optional_argument();
|
|
|
|
$class_name = $THIS_CLASS
|
|
|
|
unless $class_name;
|
1999-01-12 00:16:51 -04:00
|
|
|
my $method = next_argument();
|
do_cmd_shortversion(),
do_cmd_setshortversion(): Implementation for new markup.
convert_args(): New helper function.
do_cmd_optional(): Modified to understand when it is called from within
a convert_args() invocation.
do_env_funcdesc(),
do_env_funcdescni(),
do_cmd_funcline(),
do_cmd_funclineni(),
handle_classlike_descriptor(),
do_env_methoddesc(),
do_end_methoddescni(),
do_cmd_methodline(),
do_cmd_methodlineni(): Modified to use helper convert_args().
The convert_args() helper and related changes fix the generation of HTML
for the \optional markup, so that bogus </var>...<var> is not generated.
This closes SourceForge bug #113800.
2000-09-14 17:17:23 -03:00
|
|
|
my $arg_list = convert_args(next_argument());
|
1998-04-16 23:15:42 -03:00
|
|
|
my $extra = '';
|
|
|
|
if ($class_name) {
|
2003-09-05 12:43:58 -03:00
|
|
|
$extra = " ($class_name method)";
|
1998-03-17 02:29:13 -04:00
|
|
|
}
|
2001-06-20 18:29:30 -03:00
|
|
|
my $idx = make_str_index_entry(
|
|
|
|
"<tt class=\"method\">$method()</tt>$extra");
|
1998-04-16 23:15:42 -03:00
|
|
|
$idx =~ s/ \(.*\)//;
|
|
|
|
$idx =~ s/\(\)//;
|
2002-06-18 15:24:16 -03:00
|
|
|
return funcline_helper(1, $idx, $arg_list) . $_ . '</dl>';
|
1998-03-17 02:29:13 -04:00
|
|
|
}
|
|
|
|
|
1998-03-27 01:16:10 -04:00
|
|
|
|
1999-01-05 10:39:27 -04:00
|
|
|
sub do_cmd_methodline{
|
|
|
|
local($_) = @_;
|
|
|
|
my $class_name = next_optional_argument();
|
|
|
|
$class_name = $THIS_CLASS
|
|
|
|
unless $class_name;
|
|
|
|
my $method = next_argument();
|
do_cmd_shortversion(),
do_cmd_setshortversion(): Implementation for new markup.
convert_args(): New helper function.
do_cmd_optional(): Modified to understand when it is called from within
a convert_args() invocation.
do_env_funcdesc(),
do_env_funcdescni(),
do_cmd_funcline(),
do_cmd_funclineni(),
handle_classlike_descriptor(),
do_env_methoddesc(),
do_end_methoddescni(),
do_cmd_methodline(),
do_cmd_methodlineni(): Modified to use helper convert_args().
The convert_args() helper and related changes fix the generation of HTML
for the \optional markup, so that bogus </var>...<var> is not generated.
This closes SourceForge bug #113800.
2000-09-14 17:17:23 -03:00
|
|
|
my $arg_list = convert_args(next_argument());
|
1999-01-05 10:39:27 -04:00
|
|
|
my $extra = '';
|
|
|
|
if ($class_name) {
|
2003-09-05 12:43:58 -03:00
|
|
|
$extra = " ($class_name method)";
|
1999-01-05 10:39:27 -04:00
|
|
|
}
|
2001-06-20 18:29:30 -03:00
|
|
|
my $idx = make_str_index_entry(
|
|
|
|
"<tt class=\"method\">$method()</tt>$extra");
|
1999-01-05 10:39:27 -04:00
|
|
|
$idx =~ s/ \(.*\)//;
|
|
|
|
$idx =~ s/\(\)//;
|
2002-06-18 15:24:16 -03:00
|
|
|
return funcline_helper(0, $idx, $arg_list) . $_;
|
1999-01-05 10:39:27 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-09-10 15:59:13 -03:00
|
|
|
sub do_cmd_methodlineni{
|
|
|
|
local($_) = @_;
|
|
|
|
next_optional_argument();
|
|
|
|
my $method = next_argument();
|
do_cmd_shortversion(),
do_cmd_setshortversion(): Implementation for new markup.
convert_args(): New helper function.
do_cmd_optional(): Modified to understand when it is called from within
a convert_args() invocation.
do_env_funcdesc(),
do_env_funcdescni(),
do_cmd_funcline(),
do_cmd_funclineni(),
handle_classlike_descriptor(),
do_env_methoddesc(),
do_end_methoddescni(),
do_cmd_methodline(),
do_cmd_methodlineni(): Modified to use helper convert_args().
The convert_args() helper and related changes fix the generation of HTML
for the \optional markup, so that bogus </var>...<var> is not generated.
This closes SourceForge bug #113800.
2000-09-14 17:17:23 -03:00
|
|
|
my $arg_list = convert_args(next_argument());
|
2002-06-18 15:24:16 -03:00
|
|
|
return funcline_helper(0, $method, $arg_list) . $_;
|
1998-09-10 15:59:13 -03:00
|
|
|
}
|
|
|
|
|
1998-03-27 01:16:10 -04:00
|
|
|
sub do_env_methoddescni{
|
|
|
|
local($_) = @_;
|
1998-04-16 23:15:42 -03:00
|
|
|
next_optional_argument();
|
|
|
|
my $method = next_argument();
|
do_cmd_shortversion(),
do_cmd_setshortversion(): Implementation for new markup.
convert_args(): New helper function.
do_cmd_optional(): Modified to understand when it is called from within
a convert_args() invocation.
do_env_funcdesc(),
do_env_funcdescni(),
do_cmd_funcline(),
do_cmd_funclineni(),
handle_classlike_descriptor(),
do_env_methoddesc(),
do_end_methoddescni(),
do_cmd_methodline(),
do_cmd_methodlineni(): Modified to use helper convert_args().
The convert_args() helper and related changes fix the generation of HTML
for the \optional markup, so that bogus </var>...<var> is not generated.
This closes SourceForge bug #113800.
2000-09-14 17:17:23 -03:00
|
|
|
my $arg_list = convert_args(next_argument());
|
2002-06-18 15:24:16 -03:00
|
|
|
return funcline_helper(1, $method, $arg_list) . $_ . '</dl>';
|
1998-03-27 01:16:10 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
sub do_env_memberdesc{
|
|
|
|
local($_) = @_;
|
1998-04-16 23:15:42 -03:00
|
|
|
my $class = next_optional_argument();
|
1999-01-05 18:16:29 -04:00
|
|
|
my $member = next_argument();
|
1998-03-27 01:16:10 -04:00
|
|
|
$class = $THIS_CLASS
|
|
|
|
unless $class;
|
1998-04-16 23:15:42 -03:00
|
|
|
my $extra = '';
|
1999-04-21 11:00:29 -03:00
|
|
|
$extra = " ($class attribute)"
|
|
|
|
if ($class ne '');
|
2001-06-20 18:29:30 -03:00
|
|
|
my $idx = make_str_index_entry("<tt class=\"member\">$member</tt>$extra");
|
1998-03-27 01:16:10 -04:00
|
|
|
$idx =~ s/ \(.*\)//;
|
|
|
|
$idx =~ s/\(\)//;
|
2003-08-05 00:45:37 -03:00
|
|
|
return "<dl><dt><b>$idx</b></dt>\n<dd>" . $_ . '</dl>';
|
1998-03-27 01:16:10 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-04-17 17:04:09 -03:00
|
|
|
sub do_cmd_memberline{
|
|
|
|
local($_) = @_;
|
|
|
|
my $class = next_optional_argument();
|
1999-01-05 18:16:29 -04:00
|
|
|
my $member = next_argument();
|
1998-04-17 17:04:09 -03:00
|
|
|
$class = $THIS_CLASS
|
|
|
|
unless $class;
|
|
|
|
my $extra = '';
|
1999-04-21 11:00:29 -03:00
|
|
|
$extra = " ($class attribute)"
|
|
|
|
if ($class ne '');
|
2001-06-20 18:29:30 -03:00
|
|
|
my $idx = make_str_index_entry("<tt class=\"member\">$member</tt>$extra");
|
1998-04-17 17:04:09 -03:00
|
|
|
$idx =~ s/ \(.*\)//;
|
|
|
|
$idx =~ s/\(\)//;
|
2003-08-05 00:45:37 -03:00
|
|
|
return "<dt><b>$idx</b></dt><dd>" . $_;
|
1998-04-17 17:04:09 -03:00
|
|
|
}
|
|
|
|
|
2001-07-17 20:05:57 -03:00
|
|
|
|
1998-03-27 01:16:10 -04:00
|
|
|
sub do_env_memberdescni{
|
|
|
|
local($_) = @_;
|
1998-04-16 23:15:42 -03:00
|
|
|
next_optional_argument();
|
|
|
|
my $member = next_argument();
|
2003-08-05 00:45:37 -03:00
|
|
|
return "<dl><dt><b><tt class=\"member\">$member</tt></b></dt>\n<dd>"
|
2000-04-03 01:51:13 -03:00
|
|
|
. $_
|
2003-08-05 00:45:37 -03:00
|
|
|
. '</dd></dl>';
|
1998-03-27 01:16:10 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-04-17 17:04:09 -03:00
|
|
|
sub do_cmd_memberlineni{
|
|
|
|
local($_) = @_;
|
|
|
|
next_optional_argument();
|
|
|
|
my $member = next_argument();
|
2003-08-05 00:45:37 -03:00
|
|
|
return "<dt><b><tt class=\"member\">$member</tt></b></dt>\n<dd>" . $_;
|
1998-04-17 17:04:09 -03:00
|
|
|
}
|
|
|
|
|
2001-07-17 20:05:57 -03:00
|
|
|
|
2004-11-10 11:49:25 -04:00
|
|
|
# For tables, we include a class on every cell to allow the CSS to set
|
|
|
|
# the text-align property; this is because support for styling columns
|
|
|
|
# via the <col> element appears nearly non-existant on even the latest
|
|
|
|
# browsers (Mozilla 1.7 is stable at the time of this writing).
|
|
|
|
# Hopefully this can be improved as browsers evolve.
|
|
|
|
|
2001-07-17 20:05:57 -03:00
|
|
|
@col_aligns = ('<td>', '<td>', '<td>', '<td>', '<td>');
|
1998-03-03 18:02:19 -04:00
|
|
|
|
2001-08-16 18:56:24 -03:00
|
|
|
%FontConversions = ('cdata' => 'tt class="cdata"',
|
|
|
|
'character' => 'tt class="character"',
|
|
|
|
'class' => 'tt class="class"',
|
|
|
|
'command' => 'code',
|
|
|
|
'constant' => 'tt class="constant"',
|
|
|
|
'exception' => 'tt class="exception"',
|
|
|
|
'file' => 'tt class="file"',
|
|
|
|
'filenq' => 'tt class="file"',
|
|
|
|
'kbd' => 'kbd',
|
|
|
|
'member' => 'tt class="member"',
|
|
|
|
'programopt' => 'b',
|
|
|
|
'textrm' => '',
|
|
|
|
);
|
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub fix_font($){
|
1999-04-28 11:58:49 -03:00
|
|
|
# do a little magic on a font name to get the right behavior in the first
|
|
|
|
# column of the output table
|
2002-11-15 15:04:10 -04:00
|
|
|
my $font = $_[0];
|
2001-08-16 18:56:24 -03:00
|
|
|
if (defined $FontConversions{$font}) {
|
|
|
|
$font = $FontConversions{$font};
|
2001-01-22 13:33:24 -04:00
|
|
|
}
|
1999-04-28 11:58:49 -03:00
|
|
|
return $font;
|
|
|
|
}
|
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub figure_column_alignment($){
|
2002-11-15 15:04:10 -04:00
|
|
|
my $a = $_[0];
|
|
|
|
if (!defined $a) {
|
|
|
|
return '';
|
|
|
|
}
|
2000-04-03 01:51:13 -03:00
|
|
|
my $mark = substr($a, 0, 1);
|
|
|
|
my $r = '';
|
|
|
|
if ($mark eq 'c')
|
2004-11-10 11:37:54 -04:00
|
|
|
{ $r = ' class="center"'; }
|
2000-04-03 01:51:13 -03:00
|
|
|
elsif ($mark eq 'r')
|
2004-11-10 11:37:54 -04:00
|
|
|
{ $r = ' class="right" '; }
|
2000-04-03 01:51:13 -03:00
|
|
|
elsif ($mark eq 'l')
|
2004-11-10 11:37:54 -04:00
|
|
|
{ $r = ' class="left" '; }
|
2000-04-03 01:51:13 -03:00
|
|
|
elsif ($mark eq 'p')
|
2004-11-10 11:37:54 -04:00
|
|
|
{ $r = ' class="left" '; }
|
2000-04-03 01:51:13 -03:00
|
|
|
return $r;
|
|
|
|
}
|
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub setup_column_alignments($){
|
1998-03-03 18:02:19 -04:00
|
|
|
local($_) = @_;
|
2002-11-15 15:04:10 -04:00
|
|
|
my($s1, $s2, $s3, $s4, $s5) = split(/[|]/,$_);
|
2000-04-03 01:51:13 -03:00
|
|
|
my $a1 = figure_column_alignment($s1);
|
|
|
|
my $a2 = figure_column_alignment($s2);
|
|
|
|
my $a3 = figure_column_alignment($s3);
|
|
|
|
my $a4 = figure_column_alignment($s4);
|
2001-07-17 20:05:57 -03:00
|
|
|
my $a5 = figure_column_alignment($s5);
|
2000-04-03 01:51:13 -03:00
|
|
|
$col_aligns[0] = "<td$a1 valign=\"baseline\">";
|
|
|
|
$col_aligns[1] = "<td$a2>";
|
|
|
|
$col_aligns[2] = "<td$a3>";
|
|
|
|
$col_aligns[3] = "<td$a4>";
|
2001-07-17 20:05:57 -03:00
|
|
|
$col_aligns[4] = "<td$a5>";
|
1999-04-28 10:54:30 -03:00
|
|
|
# return the aligned header start tags
|
2001-07-17 20:05:57 -03:00
|
|
|
return ("<th$a1>", "<th$a2>", "<th$a3>", "<th$a4>", "<th$a5>");
|
2000-04-03 01:51:13 -03:00
|
|
|
}
|
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub get_table_col1_fonts(){
|
2000-04-03 01:51:13 -03:00
|
|
|
my $font = $globals{'lineifont'};
|
2002-05-23 14:59:16 -03:00
|
|
|
my($sfont, $efont) = ('', '');
|
2000-04-03 01:51:13 -03:00
|
|
|
if ($font) {
|
|
|
|
$sfont = "<$font>";
|
|
|
|
$efont = "</$font>";
|
|
|
|
$efont =~ s/ .*>/>/;
|
|
|
|
}
|
2000-11-30 03:17:27 -04:00
|
|
|
return ($sfont, $efont);
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
sub do_env_tableii{
|
|
|
|
local($_) = @_;
|
2002-05-23 14:59:16 -03:00
|
|
|
my $arg = next_argument();
|
|
|
|
my($th1, $th2, $th3, $th4, $th5) = setup_column_alignments($arg);
|
1999-04-28 11:58:49 -03:00
|
|
|
my $font = fix_font(next_argument());
|
1998-04-16 23:15:42 -03:00
|
|
|
my $h1 = next_argument();
|
|
|
|
my $h2 = next_argument();
|
1999-04-28 11:58:49 -03:00
|
|
|
s/[\s\n]+//;
|
1998-04-16 23:15:42 -03:00
|
|
|
$globals{'lineifont'} = $font;
|
2000-04-03 01:51:13 -03:00
|
|
|
my $a1 = $col_aligns[0];
|
|
|
|
my $a2 = $col_aligns[1];
|
|
|
|
s/\\lineii</\\lineii[$a1|$a2]</g;
|
2004-11-10 15:22:05 -04:00
|
|
|
return '<div class="center"><table class="realtable">'
|
2003-09-05 12:43:58 -03:00
|
|
|
. "\n <thead>"
|
2004-11-10 11:37:54 -04:00
|
|
|
. "\n <tr>"
|
|
|
|
. "\n $th1$h1</th>"
|
|
|
|
. "\n $th2$h2</th>"
|
2003-09-05 12:43:58 -03:00
|
|
|
. "\n </tr>"
|
|
|
|
. "\n </thead>"
|
2004-11-10 11:37:54 -04:00
|
|
|
. "\n <tbody>"
|
2003-09-05 12:43:58 -03:00
|
|
|
. $_
|
|
|
|
. "\n </tbody>"
|
2004-11-10 15:22:05 -04:00
|
|
|
. "\n</table></div>";
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
2000-09-21 12:58:02 -03:00
|
|
|
sub do_env_longtableii{
|
|
|
|
return do_env_tableii(@_);
|
|
|
|
}
|
|
|
|
|
1998-03-03 18:02:19 -04:00
|
|
|
sub do_cmd_lineii{
|
|
|
|
local($_) = @_;
|
2000-04-03 01:51:13 -03:00
|
|
|
my $aligns = next_optional_argument();
|
1998-04-16 23:15:42 -03:00
|
|
|
my $c1 = next_argument();
|
|
|
|
my $c2 = next_argument();
|
1999-04-28 11:58:49 -03:00
|
|
|
s/[\s\n]+//;
|
2002-05-23 14:59:16 -03:00
|
|
|
my($sfont, $efont) = get_table_col1_fonts();
|
|
|
|
my($c1align, $c2align) = split('\|', $aligns);
|
2004-11-10 11:37:54 -04:00
|
|
|
return "\n <tr>$c1align$sfont$c1$efont</td>\n"
|
|
|
|
. " $c2align$c2</td></tr>"
|
2003-09-05 12:43:58 -03:00
|
|
|
. $_;
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
sub do_env_tableiii{
|
|
|
|
local($_) = @_;
|
2002-05-23 14:59:16 -03:00
|
|
|
my $arg = next_argument();
|
|
|
|
my($th1, $th2, $th3, $th4, $th5) = setup_column_alignments($arg);
|
1999-04-28 11:58:49 -03:00
|
|
|
my $font = fix_font(next_argument());
|
1998-04-16 23:15:42 -03:00
|
|
|
my $h1 = next_argument();
|
|
|
|
my $h2 = next_argument();
|
|
|
|
my $h3 = next_argument();
|
1999-04-28 11:58:49 -03:00
|
|
|
s/[\s\n]+//;
|
1998-04-16 23:15:42 -03:00
|
|
|
$globals{'lineifont'} = $font;
|
2000-04-03 01:51:13 -03:00
|
|
|
my $a1 = $col_aligns[0];
|
|
|
|
my $a2 = $col_aligns[1];
|
|
|
|
my $a3 = $col_aligns[2];
|
|
|
|
s/\\lineiii</\\lineiii[$a1|$a2|$a3]</g;
|
2004-11-10 15:22:05 -04:00
|
|
|
return '<div class="center"><table class="realtable">'
|
2003-09-05 12:43:58 -03:00
|
|
|
. "\n <thead>"
|
2004-11-10 11:37:54 -04:00
|
|
|
. "\n <tr>"
|
|
|
|
. "\n $th1$h1</th>"
|
|
|
|
. "\n $th2$h2</th>"
|
|
|
|
. "\n $th3$h3</th>"
|
2003-09-05 12:43:58 -03:00
|
|
|
. "\n </tr>"
|
|
|
|
. "\n </thead>"
|
2004-11-10 11:37:54 -04:00
|
|
|
. "\n <tbody>"
|
2003-09-05 12:43:58 -03:00
|
|
|
. $_
|
|
|
|
. "\n </tbody>"
|
2004-11-10 15:22:05 -04:00
|
|
|
. "\n</table></div>";
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
2000-09-21 12:58:02 -03:00
|
|
|
sub do_env_longtableiii{
|
|
|
|
return do_env_tableiii(@_);
|
|
|
|
}
|
|
|
|
|
1998-03-03 18:02:19 -04:00
|
|
|
sub do_cmd_lineiii{
|
|
|
|
local($_) = @_;
|
2000-04-03 01:51:13 -03:00
|
|
|
my $aligns = next_optional_argument();
|
1998-04-16 23:15:42 -03:00
|
|
|
my $c1 = next_argument();
|
2001-07-17 20:05:57 -03:00
|
|
|
my $c2 = next_argument();
|
1998-04-16 23:15:42 -03:00
|
|
|
my $c3 = next_argument();
|
1999-04-28 11:58:49 -03:00
|
|
|
s/[\s\n]+//;
|
2002-05-23 14:59:16 -03:00
|
|
|
my($sfont, $efont) = get_table_col1_fonts();
|
|
|
|
my($c1align, $c2align, $c3align) = split('\|', $aligns);
|
2004-11-10 11:37:54 -04:00
|
|
|
return "\n <tr>$c1align$sfont$c1$efont</td>\n"
|
1999-04-28 11:58:49 -03:00
|
|
|
. " $c2align$c2</td>\n"
|
2004-11-10 11:37:54 -04:00
|
|
|
. " $c3align$c3</td></tr>"
|
2003-09-05 12:43:58 -03:00
|
|
|
. $_;
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
1998-07-24 19:16:04 -03:00
|
|
|
sub do_env_tableiv{
|
|
|
|
local($_) = @_;
|
2002-05-23 14:59:16 -03:00
|
|
|
my $arg = next_argument();
|
|
|
|
my($th1, $th2, $th3, $th4, $th5) = setup_column_alignments($arg);
|
1999-04-28 11:58:49 -03:00
|
|
|
my $font = fix_font(next_argument());
|
1998-07-24 19:16:04 -03:00
|
|
|
my $h1 = next_argument();
|
|
|
|
my $h2 = next_argument();
|
|
|
|
my $h3 = next_argument();
|
|
|
|
my $h4 = next_argument();
|
1999-04-28 11:58:49 -03:00
|
|
|
s/[\s\n]+//;
|
1998-07-24 19:16:04 -03:00
|
|
|
$globals{'lineifont'} = $font;
|
2000-04-03 01:51:13 -03:00
|
|
|
my $a1 = $col_aligns[0];
|
|
|
|
my $a2 = $col_aligns[1];
|
|
|
|
my $a3 = $col_aligns[2];
|
|
|
|
my $a4 = $col_aligns[3];
|
|
|
|
s/\\lineiv</\\lineiv[$a1|$a2|$a3|$a4]</g;
|
2004-11-10 15:22:05 -04:00
|
|
|
return '<div class="center"><table class="realtable">'
|
2003-09-05 12:43:58 -03:00
|
|
|
. "\n <thead>"
|
2004-11-10 11:37:54 -04:00
|
|
|
. "\n <tr>"
|
|
|
|
. "\n $th1$h1</th>"
|
|
|
|
. "\n $th2$h2</th>"
|
|
|
|
. "\n $th3$h3</th>"
|
|
|
|
. "\n $th4$h4</th>"
|
2003-09-05 12:43:58 -03:00
|
|
|
. "\n </tr>"
|
|
|
|
. "\n </thead>"
|
2004-11-10 11:37:54 -04:00
|
|
|
. "\n <tbody>"
|
2003-09-05 12:43:58 -03:00
|
|
|
. $_
|
|
|
|
. "\n </tbody>"
|
2004-11-10 15:22:05 -04:00
|
|
|
. "\n</table></div>";
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
2000-09-21 12:58:02 -03:00
|
|
|
sub do_env_longtableiv{
|
|
|
|
return do_env_tableiv(@_);
|
|
|
|
}
|
|
|
|
|
1998-07-24 19:16:04 -03:00
|
|
|
sub do_cmd_lineiv{
|
1998-03-03 18:02:19 -04:00
|
|
|
local($_) = @_;
|
2000-04-03 01:51:13 -03:00
|
|
|
my $aligns = next_optional_argument();
|
1998-07-24 19:16:04 -03:00
|
|
|
my $c1 = next_argument();
|
2003-09-05 12:43:58 -03:00
|
|
|
my $c2 = next_argument();
|
1998-07-24 19:16:04 -03:00
|
|
|
my $c3 = next_argument();
|
|
|
|
my $c4 = next_argument();
|
1999-04-28 11:58:49 -03:00
|
|
|
s/[\s\n]+//;
|
2002-05-23 14:59:16 -03:00
|
|
|
my($sfont, $efont) = get_table_col1_fonts();
|
|
|
|
my($c1align, $c2align, $c3align, $c4align) = split('\|', $aligns);
|
2004-11-10 11:37:54 -04:00
|
|
|
return "\n <tr>$c1align$sfont$c1$efont</td>\n"
|
1999-04-28 11:58:49 -03:00
|
|
|
. " $c2align$c2</td>\n"
|
2003-09-05 12:43:58 -03:00
|
|
|
. " $c3align$c3</td>\n"
|
2004-11-10 11:37:54 -04:00
|
|
|
. " $c4align$c4</td></tr>"
|
2003-09-05 12:43:58 -03:00
|
|
|
. $_;
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
2001-07-17 20:05:57 -03:00
|
|
|
sub do_env_tablev{
|
|
|
|
local($_) = @_;
|
2002-05-23 14:59:16 -03:00
|
|
|
my $arg = next_argument();
|
|
|
|
my($th1, $th2, $th3, $th4, $th5) = setup_column_alignments($arg);
|
2001-07-17 20:05:57 -03:00
|
|
|
my $font = fix_font(next_argument());
|
|
|
|
my $h1 = next_argument();
|
|
|
|
my $h2 = next_argument();
|
|
|
|
my $h3 = next_argument();
|
|
|
|
my $h4 = next_argument();
|
|
|
|
my $h5 = next_argument();
|
|
|
|
s/[\s\n]+//;
|
|
|
|
$globals{'lineifont'} = $font;
|
|
|
|
my $a1 = $col_aligns[0];
|
|
|
|
my $a2 = $col_aligns[1];
|
|
|
|
my $a3 = $col_aligns[2];
|
|
|
|
my $a4 = $col_aligns[3];
|
|
|
|
my $a5 = $col_aligns[4];
|
|
|
|
s/\\linev</\\linev[$a1|$a2|$a3|$a4|$a5]</g;
|
2004-11-10 15:22:05 -04:00
|
|
|
return '<div class="center"><table class="realtable">'
|
2003-09-05 12:43:58 -03:00
|
|
|
. "\n <thead>"
|
2004-11-10 11:37:54 -04:00
|
|
|
. "\n <tr>"
|
|
|
|
. "\n $th1$h1</th>"
|
|
|
|
. "\n $th2$h2</th>"
|
|
|
|
. "\n $th3$h3</th>"
|
|
|
|
. "\n $th4$h4</th>"
|
|
|
|
. "\n $th5$h5</th>"
|
2003-09-05 12:43:58 -03:00
|
|
|
. "\n </tr>"
|
|
|
|
. "\n </thead>"
|
2004-11-10 11:37:54 -04:00
|
|
|
. "\n <tbody>"
|
2003-09-05 12:43:58 -03:00
|
|
|
. $_
|
|
|
|
. "\n </tbody>"
|
2004-11-10 15:22:05 -04:00
|
|
|
. "\n</table></div>";
|
2001-07-17 20:05:57 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
sub do_env_longtablev{
|
|
|
|
return do_env_tablev(@_);
|
|
|
|
}
|
|
|
|
|
|
|
|
sub do_cmd_linev{
|
|
|
|
local($_) = @_;
|
|
|
|
my $aligns = next_optional_argument();
|
|
|
|
my $c1 = next_argument();
|
|
|
|
my $c2 = next_argument();
|
|
|
|
my $c3 = next_argument();
|
|
|
|
my $c4 = next_argument();
|
|
|
|
my $c5 = next_argument();
|
|
|
|
s/[\s\n]+//;
|
2002-05-23 14:59:16 -03:00
|
|
|
my($sfont, $efont) = get_table_col1_fonts();
|
|
|
|
my($c1align, $c2align, $c3align, $c4align, $c5align) = split('\|',$aligns);
|
2004-11-10 11:37:54 -04:00
|
|
|
return "\n <tr>$c1align$sfont$c1$efont</td>\n"
|
2001-07-17 20:05:57 -03:00
|
|
|
. " $c2align$c2</td>\n"
|
2003-09-05 12:43:58 -03:00
|
|
|
. " $c3align$c3</td>\n"
|
|
|
|
. " $c4align$c4</td>\n"
|
2004-11-10 11:37:54 -04:00
|
|
|
. " $c5align$c5</td></tr>"
|
2003-09-05 12:43:58 -03:00
|
|
|
. $_;
|
2001-07-17 20:05:57 -03:00
|
|
|
}
|
|
|
|
|
2000-08-31 03:22:54 -03:00
|
|
|
|
|
|
|
# These can be used to control the title page appearance;
|
|
|
|
# they need a little bit of documentation.
|
|
|
|
#
|
|
|
|
# If $TITLE_PAGE_GRAPHIC is set, it should be the name of a file in the
|
|
|
|
# $ICONSERVER directory, or include path information (other than "./"). The
|
|
|
|
# default image type will be assumed if an extension is not provided.
|
|
|
|
#
|
|
|
|
# If specified, the "title page" will contain two colums: one containing the
|
|
|
|
# title/author/etc., and the other containing the graphic. Use the other
|
|
|
|
# four variables listed here to control specific details of the layout; all
|
|
|
|
# are optional.
|
|
|
|
#
|
|
|
|
# $TITLE_PAGE_GRAPHIC = "my-company-logo";
|
|
|
|
# $TITLE_PAGE_GRAPHIC_COLWIDTH = "30%";
|
|
|
|
# $TITLE_PAGE_GRAPHIC_WIDTH = 150;
|
|
|
|
# $TITLE_PAGE_GRAPHIC_HEIGHT = 150;
|
|
|
|
# $TITLE_PAGE_GRAPHIC_ON_RIGHT = 0;
|
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub make_my_titlepage(){
|
2000-08-31 03:22:54 -03:00
|
|
|
my $the_title = "";
|
1998-03-03 18:02:19 -04:00
|
|
|
if ($t_title) {
|
2003-09-05 12:43:58 -03:00
|
|
|
$the_title .= "\n<h1>$t_title</h1>";
|
2000-08-31 03:22:54 -03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
write_warnings("\nThis document has no title.");
|
|
|
|
}
|
1998-03-03 18:02:19 -04:00
|
|
|
if ($t_author) {
|
2003-09-05 12:43:58 -03:00
|
|
|
if ($t_authorURL) {
|
|
|
|
my $href = translate_commands($t_authorURL);
|
|
|
|
$href = make_named_href('author', $href,
|
|
|
|
"<b><font size=\"+2\">$t_author"
|
2001-06-20 18:29:30 -03:00
|
|
|
. '</font></b>');
|
2003-09-05 12:43:58 -03:00
|
|
|
$the_title .= "\n<p>$href</p>";
|
|
|
|
}
|
2000-08-31 03:22:54 -03:00
|
|
|
else {
|
2003-09-05 12:43:58 -03:00
|
|
|
$the_title .= ("\n<p><b><font size=\"+2\">$t_author"
|
2001-06-20 18:29:30 -03:00
|
|
|
. '</font></b></p>');
|
2003-09-05 12:43:58 -03:00
|
|
|
}
|
2000-08-31 03:22:54 -03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
write_warnings("\nThere is no author for this document.");
|
|
|
|
}
|
1998-03-03 18:02:19 -04:00
|
|
|
if ($t_institute) {
|
2000-08-31 03:22:54 -03:00
|
|
|
$the_title .= "\n<p>$t_institute</p>";
|
|
|
|
}
|
1998-05-14 18:00:28 -03:00
|
|
|
if ($DEVELOPER_ADDRESS) {
|
2000-08-31 03:22:54 -03:00
|
|
|
$the_title .= "\n<p>$DEVELOPER_ADDRESS</p>";
|
|
|
|
}
|
1998-03-03 18:02:19 -04:00
|
|
|
if ($t_affil) {
|
2003-09-05 12:43:58 -03:00
|
|
|
$the_title .= "\n<p><i>$t_affil</i></p>";
|
2000-08-31 03:22:54 -03:00
|
|
|
}
|
1998-03-03 18:02:19 -04:00
|
|
|
if ($t_date) {
|
2003-09-05 12:43:58 -03:00
|
|
|
$the_title .= "\n<p>";
|
|
|
|
if ($PACKAGE_VERSION) {
|
|
|
|
$the_title .= ('<strong>Release '
|
2003-08-05 00:45:37 -03:00
|
|
|
. "$PACKAGE_VERSION$RELEASE_INFO</strong><br />\n");
|
2000-08-31 03:22:54 -03:00
|
|
|
}
|
2003-09-05 12:43:58 -03:00
|
|
|
$the_title .= "<strong>$t_date</strong></p>"
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
if ($t_address) {
|
2003-09-05 12:43:58 -03:00
|
|
|
$the_title .= "\n<p>$t_address</p>";
|
2000-08-31 03:22:54 -03:00
|
|
|
}
|
|
|
|
else {
|
2003-08-05 00:45:37 -03:00
|
|
|
$the_title .= "\n<p></p>";
|
2000-08-31 03:22:54 -03:00
|
|
|
}
|
1998-03-03 18:02:19 -04:00
|
|
|
if ($t_email) {
|
2003-09-05 12:43:58 -03:00
|
|
|
$the_title .= "\n<p>$t_email</p>";
|
2000-08-31 03:22:54 -03:00
|
|
|
}
|
|
|
|
return $the_title;
|
|
|
|
}
|
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub make_my_titlegraphic(){
|
2000-10-02 11:43:38 -03:00
|
|
|
my $filename = make_icon_filename($TITLE_PAGE_GRAPHIC);
|
2000-08-31 03:22:54 -03:00
|
|
|
my $graphic = "<td class=\"titlegraphic\"";
|
|
|
|
$graphic .= " width=\"$TITLE_PAGE_GRAPHIC_COLWIDTH\""
|
|
|
|
if ($TITLE_PAGE_GRAPHIC_COLWIDTH);
|
|
|
|
$graphic .= "><img";
|
|
|
|
$graphic .= " width=\"$TITLE_PAGE_GRAPHIC_WIDTH\""
|
|
|
|
if ($TITLE_PAGE_GRAPHIC_WIDTH);
|
|
|
|
$graphic .= " height=\"$TITLE_PAGE_GRAPHIC_HEIGHT\""
|
|
|
|
if ($TITLE_PAGE_GRAPHIC_HEIGHT);
|
2003-08-05 00:45:37 -03:00
|
|
|
$graphic .= "\n src=\"$filename\" /></td>\n";
|
2000-08-31 03:22:54 -03:00
|
|
|
return $graphic;
|
|
|
|
}
|
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub do_cmd_maketitle{
|
2000-08-31 03:22:54 -03:00
|
|
|
local($_) = @_;
|
2002-10-30 17:38:32 -04:00
|
|
|
my $the_title = "\n";
|
|
|
|
if ($EXTERNAL_UP_LINK) {
|
2003-08-05 00:45:37 -03:00
|
|
|
# This generates a <link> element in the wrong place (the
|
2002-10-30 17:38:32 -04:00
|
|
|
# body), but I don't see any other way to get this generated
|
|
|
|
# at all. Browsers like Mozilla, that support navigation
|
|
|
|
# links, can make use of this.
|
|
|
|
$the_title .= ("<link rel='up' href='$EXTERNAL_UP_LINK'"
|
|
|
|
. ($EXTERNAL_UP_TITLE
|
|
|
|
? " title='$EXTERNAL_UP_TITLE'" : '')
|
2003-08-05 00:45:37 -03:00
|
|
|
. " />\n");
|
2002-10-30 17:38:32 -04:00
|
|
|
}
|
|
|
|
$the_title .= '<div class="titlepage">';
|
2000-08-31 03:22:54 -03:00
|
|
|
if ($TITLE_PAGE_GRAPHIC) {
|
|
|
|
if ($TITLE_PAGE_GRAPHIC_ON_RIGHT) {
|
|
|
|
$the_title .= ("\n<table border=\"0\" width=\"100%\">"
|
|
|
|
. "<tr align=\"right\">\n<td>"
|
|
|
|
. make_my_titlepage()
|
|
|
|
. "</td>\n"
|
|
|
|
. make_my_titlegraphic()
|
|
|
|
. "</tr>\n</table>");
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
$the_title .= ("\n<table border=\"0\" width=\"100%\"><tr>\n"
|
|
|
|
. make_my_titlegraphic()
|
|
|
|
. "<td>"
|
|
|
|
. make_my_titlepage()
|
|
|
|
. "</td></tr>\n</table>");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2004-11-10 15:22:05 -04:00
|
|
|
$the_title .= ("\n<div class='center'>"
|
2000-08-31 03:22:54 -03:00
|
|
|
. make_my_titlepage()
|
2004-11-10 15:22:05 -04:00
|
|
|
. "\n</div>");
|
2000-08-31 03:22:54 -03:00
|
|
|
}
|
|
|
|
$the_title .= "\n</div>";
|
|
|
|
return $the_title . $_;
|
1998-03-03 18:02:19 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-07-24 19:16:04 -03:00
|
|
|
#
|
|
|
|
# Module synopsis support
|
|
|
|
#
|
|
|
|
|
|
|
|
require SynopsisTable;
|
|
|
|
|
1998-07-25 00:31:46 -03:00
|
|
|
sub get_chapter_id(){
|
|
|
|
my $id = do_cmd_thechapter('');
|
2002-11-15 15:04:10 -04:00
|
|
|
$id =~ s/<SPAN CLASS="arabic">(\d+)<\/SPAN>/$1/;
|
1998-08-04 19:07:18 -03:00
|
|
|
$id =~ s/\.//;
|
1998-07-25 00:31:46 -03:00
|
|
|
return $id;
|
1998-07-24 19:16:04 -03:00
|
|
|
}
|
|
|
|
|
2000-09-09 03:07:37 -03:00
|
|
|
# 'chapter' => 'SynopsisTable instance'
|
|
|
|
%ModuleSynopses = ();
|
1998-07-25 00:31:46 -03:00
|
|
|
|
|
|
|
sub get_synopsis_table($){
|
2002-11-15 15:04:10 -04:00
|
|
|
my $chap = $_[0];
|
1998-07-25 00:31:46 -03:00
|
|
|
my $key;
|
|
|
|
foreach $key (keys %ModuleSynopses) {
|
2003-09-05 12:43:58 -03:00
|
|
|
if ($key eq $chap) {
|
|
|
|
return $ModuleSynopses{$chap};
|
|
|
|
}
|
1998-07-24 19:16:04 -03:00
|
|
|
}
|
2000-09-09 03:07:37 -03:00
|
|
|
my $st = SynopsisTable->new();
|
1998-07-25 00:31:46 -03:00
|
|
|
$ModuleSynopses{$chap} = $st;
|
1998-07-24 19:16:04 -03:00
|
|
|
return $st;
|
|
|
|
}
|
|
|
|
|
1998-08-10 16:40:44 -03:00
|
|
|
sub do_cmd_moduleauthor{
|
|
|
|
local($_) = @_;
|
|
|
|
next_argument();
|
|
|
|
next_argument();
|
|
|
|
return $_;
|
|
|
|
}
|
|
|
|
|
|
|
|
sub do_cmd_sectionauthor{
|
|
|
|
local($_) = @_;
|
|
|
|
next_argument();
|
|
|
|
next_argument();
|
|
|
|
return $_;
|
|
|
|
}
|
|
|
|
|
1998-07-24 19:16:04 -03:00
|
|
|
sub do_cmd_declaremodule{
|
|
|
|
local($_) = @_;
|
|
|
|
my $key = next_optional_argument();
|
|
|
|
my $type = next_argument();
|
|
|
|
my $name = next_argument();
|
|
|
|
my $st = get_synopsis_table(get_chapter_id());
|
|
|
|
#
|
|
|
|
$key = $name unless $key;
|
|
|
|
$type = 'built-in' if $type eq 'builtin';
|
|
|
|
$st->declare($name, $key, $type);
|
|
|
|
define_module($type, $name);
|
1998-08-10 16:40:44 -03:00
|
|
|
return anchor_label("module-$key",$CURRENT_FILE,$_)
|
1998-07-24 19:16:04 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
sub do_cmd_modulesynopsis{
|
|
|
|
local($_) = @_;
|
|
|
|
my $st = get_synopsis_table(get_chapter_id());
|
1999-04-13 19:08:59 -03:00
|
|
|
$st->set_synopsis($THIS_MODULE, translate_commands(next_argument()));
|
1998-08-10 16:40:44 -03:00
|
|
|
return $_;
|
1998-07-24 19:16:04 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
sub do_cmd_localmoduletable{
|
|
|
|
local($_) = @_;
|
|
|
|
my $chap = get_chapter_id();
|
2000-09-09 03:07:37 -03:00
|
|
|
my $st = get_synopsis_table($chap);
|
|
|
|
$st->set_file("$CURRENT_FILE");
|
1999-03-02 12:05:35 -04:00
|
|
|
return "<tex2html-localmoduletable><$chap>\\tableofchildlinks[off]" . $_;
|
1998-07-24 19:16:04 -03:00
|
|
|
}
|
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub process_all_localmoduletables(){
|
2000-09-09 03:07:37 -03:00
|
|
|
my $key;
|
|
|
|
foreach $key (keys %ModuleSynopses) {
|
2002-11-15 15:04:10 -04:00
|
|
|
my $st = $ModuleSynopses{$key};
|
|
|
|
my $file = $st->get_file();
|
2000-09-09 03:07:37 -03:00
|
|
|
if ($file) {
|
|
|
|
process_localmoduletables_in_file($file);
|
|
|
|
}
|
|
|
|
else {
|
2001-06-23 00:13:30 -03:00
|
|
|
print "\nsynopsis table $key has no file association\n";
|
2000-09-09 03:07:37 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub process_localmoduletables_in_file($){
|
2002-11-15 15:04:10 -04:00
|
|
|
my $file = $_[0];
|
2000-09-09 03:07:37 -03:00
|
|
|
open(MYFILE, "<$file");
|
|
|
|
local($_);
|
|
|
|
sysread(MYFILE, $_, 1024*1024);
|
|
|
|
close(MYFILE);
|
|
|
|
# need to get contents of file in $_
|
1999-03-02 12:05:35 -04:00
|
|
|
while (/<tex2html-localmoduletable><(\d+)>/) {
|
2003-09-05 12:43:58 -03:00
|
|
|
my $match = $&;
|
|
|
|
my $chap = $1;
|
|
|
|
my $st = get_synopsis_table($chap);
|
|
|
|
my $data = $st->tohtml();
|
|
|
|
s/$match/$data/;
|
1998-07-24 19:16:04 -03:00
|
|
|
}
|
2000-09-09 03:07:37 -03:00
|
|
|
open(MYFILE,">$file");
|
|
|
|
print MYFILE $_;
|
|
|
|
close(MYFILE);
|
1998-07-24 19:16:04 -03:00
|
|
|
}
|
2002-05-23 14:59:16 -03:00
|
|
|
sub process_python_state(){
|
1999-03-02 12:05:35 -04:00
|
|
|
process_all_localmoduletables();
|
2001-07-06 19:43:02 -03:00
|
|
|
process_grammar_files();
|
1999-03-02 12:05:35 -04:00
|
|
|
}
|
1998-07-24 19:16:04 -03:00
|
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
# "See also:" -- references placed at the end of a \section
|
|
|
|
#
|
|
|
|
|
|
|
|
sub do_env_seealso{
|
2001-06-20 18:29:30 -03:00
|
|
|
return ("<div class=\"seealso\">\n "
|
2004-11-10 04:08:26 -04:00
|
|
|
. "<p class=\"heading\">See Also:</p>\n"
|
2002-11-15 15:04:10 -04:00
|
|
|
. $_[0]
|
2001-06-20 18:29:30 -03:00
|
|
|
. '</div>');
|
1998-07-24 19:16:04 -03:00
|
|
|
}
|
|
|
|
|
2001-11-30 14:09:54 -04:00
|
|
|
sub do_env_seealsostar{
|
|
|
|
return ("<div class=\"seealso-simple\">\n "
|
2002-11-15 15:04:10 -04:00
|
|
|
. $_[0]
|
2001-11-30 14:09:54 -04:00
|
|
|
. '</div>');
|
|
|
|
}
|
|
|
|
|
1998-07-24 19:16:04 -03:00
|
|
|
sub do_cmd_seemodule{
|
|
|
|
# Insert the right magic to jump to the module definition. This should
|
|
|
|
# work most of the time, at least for repeat builds....
|
|
|
|
local($_) = @_;
|
|
|
|
my $key = next_optional_argument();
|
|
|
|
my $module = next_argument();
|
|
|
|
my $text = next_argument();
|
1999-05-11 12:42:51 -03:00
|
|
|
my $period = '.';
|
1998-07-24 19:16:04 -03:00
|
|
|
$key = $module
|
|
|
|
unless $key;
|
1999-05-11 12:42:51 -03:00
|
|
|
if ($text =~ /\.$/) {
|
2003-09-05 12:43:58 -03:00
|
|
|
$period = '';
|
1999-05-11 12:42:51 -03:00
|
|
|
}
|
2004-11-10 04:07:00 -04:00
|
|
|
return ('<dl compact="compact" class="seemodule">'
|
2001-06-20 18:29:30 -03:00
|
|
|
. "\n <dt>Module <b><tt class=\"module\">"
|
|
|
|
. "<a href=\"module-$key.html\">$module</a></tt>:</b>"
|
|
|
|
. "\n <dd>$text$period\n </dl>"
|
|
|
|
. $_);
|
1998-07-24 19:16:04 -03:00
|
|
|
}
|
|
|
|
|
2001-04-12 01:03:22 -03:00
|
|
|
sub strip_html_markup($){
|
2002-11-15 15:04:10 -04:00
|
|
|
my $str = $_[0];
|
2001-04-12 01:03:22 -03:00
|
|
|
my $s = "$str";
|
|
|
|
$s =~ s/<[a-zA-Z0-9]+(\s+[a-zA-Z0-9]+(\s*=\s*(\'[^\']*\'|\"[^\"]*\"|[a-zA-Z0-9]+))?)*\s*>//g;
|
|
|
|
$s =~ s/<\/[a-zA-Z0-9]+>//g;
|
|
|
|
return $s;
|
|
|
|
}
|
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub handle_rfclike_reference($$$){
|
2001-01-22 13:33:24 -04:00
|
|
|
local($_, $what, $format) = @_;
|
2000-04-26 15:05:24 -03:00
|
|
|
my $rfcnum = next_argument();
|
|
|
|
my $title = next_argument();
|
|
|
|
my $text = next_argument();
|
2001-01-22 13:33:24 -04:00
|
|
|
my $url = get_rfc_url($rfcnum, $format);
|
2000-10-02 11:43:38 -03:00
|
|
|
my $icon = get_link_icon($url);
|
2001-04-12 01:03:22 -03:00
|
|
|
my $attrtitle = strip_html_markup($title);
|
2004-11-10 04:07:00 -04:00
|
|
|
return '<dl compact="compact" class="seerfc">'
|
2000-04-26 15:05:24 -03:00
|
|
|
. "\n <dt><a href=\"$url\""
|
2001-04-12 01:03:22 -03:00
|
|
|
. "\n title=\"$attrtitle\""
|
2000-10-03 03:05:25 -03:00
|
|
|
. "\n >$what $rfcnum, <em>$title</em>$icon</a>"
|
2000-04-26 15:05:24 -03:00
|
|
|
. "\n <dd>$text\n </dl>"
|
|
|
|
. $_;
|
|
|
|
}
|
|
|
|
|
2000-09-09 03:07:37 -03:00
|
|
|
sub do_cmd_seepep{
|
2002-11-15 15:04:10 -04:00
|
|
|
return handle_rfclike_reference($_[0], "PEP", $PEP_FORMAT);
|
2000-09-09 03:07:37 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
sub do_cmd_seerfc{
|
2002-10-30 17:38:32 -04:00
|
|
|
# XXX Would be nice to add links to the text/plain and PDF versions.
|
2002-11-15 15:04:10 -04:00
|
|
|
return handle_rfclike_reference($_[0], "RFC", $RFC_FORMAT);
|
2000-09-09 03:07:37 -03:00
|
|
|
}
|
|
|
|
|
2000-09-12 14:52:33 -03:00
|
|
|
sub do_cmd_seetitle{
|
|
|
|
local($_) = @_;
|
|
|
|
my $url = next_optional_argument();
|
|
|
|
my $title = next_argument();
|
|
|
|
my $text = next_argument();
|
|
|
|
if ($url) {
|
2000-10-03 03:05:25 -03:00
|
|
|
my $icon = get_link_icon($url);
|
2004-11-10 04:07:00 -04:00
|
|
|
return '<dl compact="compact" class="seetitle">'
|
2000-09-12 14:52:33 -03:00
|
|
|
. "\n <dt><em class=\"citetitle\"><a href=\"$url\""
|
2003-08-05 00:45:37 -03:00
|
|
|
. "\n >$title$icon</a></em></dt>"
|
|
|
|
. "\n <dd>$text</dd>\n </dl>"
|
2000-09-12 14:52:33 -03:00
|
|
|
. $_;
|
|
|
|
}
|
2004-11-10 04:07:00 -04:00
|
|
|
return '<dl compact="compact" class="seetitle">'
|
2000-09-12 14:52:33 -03:00
|
|
|
. "\n <dt><em class=\"citetitle\""
|
2003-08-05 00:45:37 -03:00
|
|
|
. "\n >$title</em></dt>"
|
|
|
|
. "\n <dd>$text</dd>\n </dl>"
|
2000-09-12 14:52:33 -03:00
|
|
|
. $_;
|
|
|
|
}
|
|
|
|
|
2004-01-08 10:57:27 -04:00
|
|
|
sub do_cmd_seelink{
|
|
|
|
local($_) = @_;
|
|
|
|
my $url = next_argument();
|
|
|
|
my $linktext = next_argument();
|
|
|
|
my $text = next_argument();
|
|
|
|
my $icon = get_link_icon($url);
|
2004-11-10 04:07:00 -04:00
|
|
|
return '<dl compact="compact" class="seeurl">'
|
2004-01-08 10:57:27 -04:00
|
|
|
. "\n <dt><a href='$url'"
|
|
|
|
. "\n >$linktext$icon</a></dt>"
|
|
|
|
. "\n <dd>$text</dd>\n </dl>"
|
|
|
|
. $_;
|
|
|
|
}
|
|
|
|
|
2000-05-09 13:17:51 -03:00
|
|
|
sub do_cmd_seeurl{
|
|
|
|
local($_) = @_;
|
|
|
|
my $url = next_argument();
|
|
|
|
my $text = next_argument();
|
2000-10-02 11:43:38 -03:00
|
|
|
my $icon = get_link_icon($url);
|
2004-11-10 04:07:00 -04:00
|
|
|
return '<dl compact="compact" class="seeurl">'
|
2000-05-09 13:17:51 -03:00
|
|
|
. "\n <dt><a href=\"$url\""
|
2003-08-05 00:45:37 -03:00
|
|
|
. "\n class=\"url\">$url$icon</a></dt>"
|
|
|
|
. "\n <dd>$text</dd>\n </dl>"
|
2000-05-09 13:17:51 -03:00
|
|
|
. $_;
|
|
|
|
}
|
|
|
|
|
1998-07-24 19:16:04 -03:00
|
|
|
sub do_cmd_seetext{
|
1999-04-28 10:54:30 -03:00
|
|
|
local($_) = @_;
|
|
|
|
my $content = next_argument();
|
2003-08-05 00:45:37 -03:00
|
|
|
return '<div class="seetext"><p>' . $content . '</p></div>' . $_;
|
1998-07-24 19:16:04 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-05-20 18:32:09 -03:00
|
|
|
#
|
|
|
|
# Definition list support.
|
|
|
|
#
|
|
|
|
|
|
|
|
sub do_env_definitions{
|
2003-08-05 00:45:37 -03:00
|
|
|
return '<dl class="definitions">' . $_[0] . "</dl>\n";
|
1998-05-20 18:32:09 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
sub do_cmd_term{
|
|
|
|
local($_) = @_;
|
1999-01-05 18:16:29 -04:00
|
|
|
my $term = next_argument();
|
2002-05-23 14:59:16 -03:00
|
|
|
my($name, $aname, $ahref) = new_link_info();
|
1998-05-20 18:32:09 -03:00
|
|
|
# could easily add an index entry here...
|
2003-08-05 00:45:37 -03:00
|
|
|
return "<dt><b>$aname" . $term . "</a></b></dt>\n<dd>" . $_;
|
1998-05-20 18:32:09 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-07-15 19:00:36 -03:00
|
|
|
# Commands listed here have process-order dependencies; these often
|
|
|
|
# are related to indexing operations.
|
|
|
|
# XXX Not sure why funclineni, methodlineni, and samp are here.
|
|
|
|
#
|
1999-02-05 14:31:29 -04:00
|
|
|
process_commands_wrap_deferred(<<_RAW_ARG_DEFERRED_CMDS_);
|
1999-02-10 17:17:04 -04:00
|
|
|
declaremodule # [] # {} # {}
|
2002-11-13 13:55:17 -04:00
|
|
|
funcline # {} # {}
|
|
|
|
funclineni # {} # {}
|
1999-02-10 17:17:04 -04:00
|
|
|
memberline # [] # {}
|
|
|
|
methodline # [] # {} # {}
|
2002-11-13 13:55:17 -04:00
|
|
|
methodlineni # [] # {} # {}
|
1999-02-10 17:17:04 -04:00
|
|
|
modulesynopsis # {}
|
2003-07-15 19:00:36 -03:00
|
|
|
bifuncindex # {}
|
|
|
|
exindex # {}
|
|
|
|
indexii # {} # {}
|
|
|
|
indexiii # {} # {} # {}
|
|
|
|
indexiv # {} # {} # {} # {}
|
|
|
|
kwindex # {}
|
|
|
|
obindex # {}
|
|
|
|
opindex # {}
|
|
|
|
stindex # {}
|
1999-03-02 12:05:35 -04:00
|
|
|
platform # {}
|
1999-02-05 14:31:29 -04:00
|
|
|
samp # {}
|
1999-02-10 17:17:04 -04:00
|
|
|
setindexsubitem # {}
|
1999-02-12 18:06:32 -04:00
|
|
|
withsubitem # {} # {}
|
1999-02-05 14:31:29 -04:00
|
|
|
_RAW_ARG_DEFERRED_CMDS_
|
|
|
|
|
|
|
|
|
2002-04-15 15:41:31 -03:00
|
|
|
$alltt_start = '<div class="verbatim"><pre>';
|
|
|
|
$alltt_end = '</pre></div>';
|
2001-04-10 14:13:39 -03:00
|
|
|
|
2002-05-23 14:59:16 -03:00
|
|
|
sub do_env_alltt{
|
2001-04-10 14:13:39 -03:00
|
|
|
local ($_) = @_;
|
|
|
|
local($closures,$reopens,@open_block_tags);
|
|
|
|
|
|
|
|
# get the tag-strings for all open tags
|
|
|
|
local(@keep_open_tags) = @$open_tags_R;
|
|
|
|
($closures,$reopens) = &preserve_open_tags() if (@$open_tags_R);
|
|
|
|
|
|
|
|
# get the tags for text-level tags only
|
|
|
|
$open_tags_R = [ @keep_open_tags ];
|
|
|
|
local($local_closures, $local_reopens);
|
|
|
|
($local_closures, $local_reopens,@open_block_tags)
|
|
|
|
= &preserve_open_block_tags
|
2003-09-05 12:43:58 -03:00
|
|
|
if (@$open_tags_R);
|
2001-04-10 14:13:39 -03:00
|
|
|
|
|
|
|
$open_tags_R = [ @open_block_tags ];
|
|
|
|
|
|
|
|
do {
|
2003-09-05 12:43:58 -03:00
|
|
|
local($open_tags_R) = [ @open_block_tags ];
|
|
|
|
local(@save_open_tags) = ();
|
2001-04-10 14:13:39 -03:00
|
|
|
|
2003-09-05 12:43:58 -03:00
|
|
|
local($cnt) = ++$global{'max_id'};
|
|
|
|
$_ = join('',"$O$cnt$C\\tt$O", ++$global{'max_id'}, $C
|
|
|
|
, $_ , $O, $global{'max_id'}, "$C$O$cnt$C");
|
2001-04-10 14:13:39 -03:00
|
|
|
|
2003-09-05 12:43:58 -03:00
|
|
|
$_ = &translate_environments($_);
|
|
|
|
$_ = &translate_commands($_) if (/\\/);
|
2001-04-10 14:13:39 -03:00
|
|
|
|
2003-09-05 12:43:00 -03:00
|
|
|
# remove spurious <BR> someone sticks in; not sure where they
|
|
|
|
# actually come from
|
|
|
|
# XXX the replacement space is there to accomodate something
|
|
|
|
# broken that inserts a space in front of the first line of
|
|
|
|
# the environment
|
|
|
|
s/<BR>/ /gi;
|
2001-04-10 14:13:39 -03:00
|
|
|
|
2003-09-05 12:43:58 -03:00
|
|
|
$_ = join('', $closures, $alltt_start, $local_reopens
|
|
|
|
, $_
|
|
|
|
, &balance_tags() #, $local_closures
|
|
|
|
, $alltt_end, $reopens);
|
|
|
|
undef $open_tags_R; undef @save_open_tags;
|
2001-04-10 14:13:39 -03:00
|
|
|
};
|
|
|
|
$open_tags_R = [ @keep_open_tags ];
|
2003-12-30 12:19:28 -04:00
|
|
|
return codetext($_);
|
2001-04-10 14:13:39 -03:00
|
|
|
}
|
|
|
|
|
2004-04-01 00:30:29 -04:00
|
|
|
# List of all filenames produced by do_cmd_verbatiminput()
|
2002-06-17 12:01:05 -03:00
|
|
|
%VerbatimFiles = ();
|
|
|
|
@VerbatimOutputs = ();
|
|
|
|
|
|
|
|
sub get_verbatim_output_name($){
|
2002-11-15 15:04:10 -04:00
|
|
|
my $file = $_[0];
|
2002-06-17 12:01:05 -03:00
|
|
|
#
|
|
|
|
# Re-write the source filename to always use a .txt extension
|
|
|
|
# so that Web servers will present it as text/plain. This is
|
|
|
|
# needed since there is no other even moderately reliable way
|
|
|
|
# to get the right Content-Type header on text files for
|
|
|
|
# servers which we can't configure (like python.org mirrors).
|
|
|
|
#
|
|
|
|
if (defined $VerbatimFiles{$file}) {
|
|
|
|
# We've seen this one before; re-use the same output file.
|
|
|
|
return $VerbatimFiles{$file};
|
|
|
|
}
|
2002-11-15 15:04:10 -04:00
|
|
|
my($srcname, $srcdir, $srcext) = fileparse($file, '\..*');
|
2002-06-17 12:01:05 -03:00
|
|
|
$filename = "$srcname.txt";
|
|
|
|
#
|
|
|
|
# We need to determine if our default filename is already
|
|
|
|
# being used, and find a new one it it is. If the name is in
|
|
|
|
# used, this algorithm will first attempt to include the
|
|
|
|
# source extension as part of the name, and if that is also in
|
|
|
|
# use (if the same file is included multiple times, or if
|
|
|
|
# another source file has that as the base name), a counter is
|
|
|
|
# used instead.
|
|
|
|
#
|
|
|
|
my $found = 1;
|
|
|
|
FIND:
|
|
|
|
while ($found) {
|
|
|
|
foreach $fn (@VerbatimOutputs) {
|
|
|
|
if ($fn eq $filename) {
|
|
|
|
if ($found == 1) {
|
|
|
|
$srcext =~ s/^[.]//; # Remove '.' from extension
|
|
|
|
$filename = "$srcname-$srcext.txt";
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
$filename = "$srcname-$found.txt";
|
|
|
|
}
|
|
|
|
++$found;
|
|
|
|
next FIND;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$found = 0;
|
|
|
|
}
|
|
|
|
push @VerbatimOutputs, $filename;
|
|
|
|
$VerbatimFiles{$file} = $filename;
|
|
|
|
return $filename;
|
|
|
|
}
|
|
|
|
|
2001-06-15 18:31:57 -03:00
|
|
|
sub do_cmd_verbatiminput{
|
|
|
|
local($_) = @_;
|
|
|
|
my $fname = next_argument();
|
|
|
|
my $file;
|
|
|
|
my $found = 0;
|
|
|
|
my $texpath;
|
|
|
|
# Search TEXINPUTS for the input file, the way we're supposed to:
|
|
|
|
foreach $texpath (split /$envkey/, $TEXINPUTS) {
|
|
|
|
$file = "$texpath$dd$fname";
|
|
|
|
last if ($found = (-f $file));
|
|
|
|
}
|
2002-06-17 12:01:05 -03:00
|
|
|
my $filename = '';
|
2001-06-15 18:31:57 -03:00
|
|
|
my $text;
|
|
|
|
if ($found) {
|
|
|
|
open(MYFILE, "<$file") || die "\n$!\n";
|
|
|
|
read(MYFILE, $text, 1024*1024);
|
|
|
|
close(MYFILE);
|
2002-06-17 12:01:05 -03:00
|
|
|
$filename = get_verbatim_output_name($file);
|
|
|
|
# Now that we have a filename, write it out.
|
|
|
|
open(MYFILE, ">$filename");
|
2001-07-06 19:43:02 -03:00
|
|
|
print MYFILE $text;
|
|
|
|
close(MYFILE);
|
2001-06-15 18:31:57 -03:00
|
|
|
#
|
|
|
|
# These rewrites convert the raw text to something that will
|
|
|
|
# be properly visible as HTML and also will pass through the
|
|
|
|
# vagaries of conversion through LaTeX2HTML. The order in
|
|
|
|
# which the specific rewrites are performed is significant.
|
|
|
|
#
|
|
|
|
$text =~ s/\&/\&/g;
|
|
|
|
# These need to happen before the normal < and > re-writes,
|
|
|
|
# since we need to avoid LaTeX2HTML's attempt to perform
|
|
|
|
# ligature processing without regard to context (since it
|
|
|
|
# doesn't have font information).
|
|
|
|
$text =~ s/--/-&\#45;/g;
|
|
|
|
$text =~ s/<</\<\&\#60;/g;
|
|
|
|
$text =~ s/>>/\>\&\#62;/g;
|
|
|
|
# Just normal re-writes...
|
|
|
|
$text =~ s/</\</g;
|
|
|
|
$text =~ s/>/\>/g;
|
|
|
|
# These last isn't needed for the HTML, but is needed to get
|
|
|
|
# past LaTeX2HTML processing TeX macros. We use \ instead
|
|
|
|
# of / since many browsers don't support that.
|
|
|
|
$text =~ s/\\/\&\#92;/g;
|
|
|
|
}
|
|
|
|
else {
|
2002-06-17 12:01:05 -03:00
|
|
|
return '<b>Could not locate requested file <i>$fname</i>!</b>\n';
|
|
|
|
}
|
|
|
|
my $note = 'Download as text.';
|
|
|
|
if ($file ne $filename) {
|
|
|
|
$note = ('Download as text (original file name: <span class="file">'
|
|
|
|
. $fname
|
|
|
|
. '</span>).');
|
2001-06-15 18:31:57 -03:00
|
|
|
}
|
2002-04-15 15:41:31 -03:00
|
|
|
return ("<div class=\"verbatim\">\n<pre>"
|
2001-06-15 18:31:57 -03:00
|
|
|
. $text
|
2002-04-15 15:41:31 -03:00
|
|
|
. "</pre>\n<div class=\"footer\">\n"
|
2002-06-17 12:01:05 -03:00
|
|
|
. "<a href=\"$filename\" type=\"text/plain\""
|
|
|
|
. ">$note</a>"
|
2002-04-15 15:41:31 -03:00
|
|
|
. "\n</div></div>"
|
2001-06-15 18:31:57 -03:00
|
|
|
. $_);
|
|
|
|
}
|
2001-04-10 14:13:39 -03:00
|
|
|
|
2003-09-05 12:43:58 -03:00
|
|
|
1; # This must be the last line
|