projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix ld output with recent versions of GCC and binutils
[pintos-anon]
/
doc
/
texi2html
diff --git
a/doc/texi2html
b/doc/texi2html
index 16ecd4a890aa76f0bc0239a19b7c295c04f62662..7cb22fa94bdc576fb31276f26a3eab240e057a7d 100755
(executable)
--- a/
doc/texi2html
+++ b/
doc/texi2html
@@
-3443,7
+3443,7
@@
sub pass1
#############################################################
# value substitution before macro expansion, so that
# it works in macro arguments
#############################################################
# value substitution before macro expansion, so that
# it works in macro arguments
- s/\@value{($VARRE)}/$value{$1}/eg;
+ s/\@value
\
{($VARRE)}/$value{$1}/eg;
#############################################################
# macro substitution
#############################################################
# macro substitution
@@
-3512,7
+3512,7
@@
sub pass1
$after = '';
}
$args =~ s|\\\\|\\|g;
$after = '';
}
$args =~ s|\\\\|\\|g;
- $args =~ s|\\{|{|g;
+ $args =~ s|\\
\
{|{|g;
$args =~ s|\\}|}|g;
if (@{$macros->{$name}->{Args}} > 1)
{
$args =~ s|\\}|}|g;
if (@{$macros->{$name}->{Args}} > 1)
{
@@
-4920,7
+4920,7
@@
sub pass2
#
# xref
#
#
# xref
#
- while (/\@(x|px|info|)ref{([^{}]+)(}?)/)
+ while (/\@(x|px|info|)ref
\
{([^{}]+)(}?)/)
{
# note: Texinfo may accept other characters
($type, $nodes, $full) = ($1, $2, $3);
{
# note: Texinfo may accept other characters
($type, $nodes, $full) = ($1, $2, $3);
@@
-5644,10
+5644,10
@@
sub update_sec_num
my $ret;
$level--; # here we start at 0
my $ret;
$level--; # here we start at 0
- if ($name =~ /^appendix/ ||
defined(@appendix_sec_num)
)
+ if ($name =~ /^appendix/ ||
@appendix_sec_num
)
{
# appendix style
{
# appendix style
- if (
defined(@appendix_sec_num)
)
+ if (
@appendix_sec_num
)
{
&incr_sec_num($level, @appendix_sec_num);
}
{
&incr_sec_num($level, @appendix_sec_num);
}
@@
-5660,7
+5660,7
@@
sub update_sec_num
else
{
# normal style
else
{
# normal style
- if (
defined(@normal_sec_num)
)
+ if (
@normal_sec_num
)
{
&incr_sec_num($level, @normal_sec_num);
}
{
&incr_sec_num($level, @normal_sec_num);
}
@@
-6163,7
+6163,7
@@
sub substitute_style
{
$changed = 0;
$done = '';
{
$changed = 0;
$done = '';
- while (/\@(\w+)
{([^\{\}]+)}/ || /\@(,)
{([^\{\}]+)}/)
+ while (/\@(\w+)
\{([^\{\}]+)}/ || /\@(,)\
{([^\{\}]+)}/)
{
$text = &apply_style($1, $2);
if ($text)
{
$text = &apply_style($1, $2);
if ($text)