X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Ftexi2html;h=7cb22fa94bdc576fb31276f26a3eab240e057a7d;hb=919347c164606c3f1544b2e8bd62f505aeda80a1;hp=16ecd4a890aa76f0bc0239a19b7c295c04f62662;hpb=615bf3b3d2a8573ed6fb9ddc0055745e163ac999;p=pintos-anon diff --git a/doc/texi2html b/doc/texi2html index 16ecd4a..7cb22fa 100755 --- a/doc/texi2html +++ b/doc/texi2html @@ -3443,7 +3443,7 @@ sub pass1 ############################################################# # 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 @@ -3512,7 +3512,7 @@ sub pass1 $after = ''; } $args =~ s|\\\\|\\|g; - $args =~ s|\\{|{|g; + $args =~ s|\\\{|{|g; $args =~ s|\\}|}|g; if (@{$macros->{$name}->{Args}} > 1) { @@ -4920,7 +4920,7 @@ sub pass2 # # xref # - while (/\@(x|px|info|)ref{([^{}]+)(}?)/) + while (/\@(x|px|info|)ref\{([^{}]+)(}?)/) { # 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 - if ($name =~ /^appendix/ || defined(@appendix_sec_num)) + if ($name =~ /^appendix/ || @appendix_sec_num) { # appendix style - if (defined(@appendix_sec_num)) + if (@appendix_sec_num) { &incr_sec_num($level, @appendix_sec_num); } @@ -5660,7 +5660,7 @@ sub update_sec_num else { # normal style - if (defined(@normal_sec_num)) + if (@normal_sec_num) { &incr_sec_num($level, @normal_sec_num); } @@ -6163,7 +6163,7 @@ sub substitute_style { $changed = 0; $done = ''; - while (/\@(\w+){([^\{\}]+)}/ || /\@(,){([^\{\}]+)}/) + while (/\@(\w+)\{([^\{\}]+)}/ || /\@(,)\{([^\{\}]+)}/) { $text = &apply_style($1, $2); if ($text)