Re: [bug-gettext] [PATCH] fix perl's expression in texi2html

[Petr Ovtchenkov]

ping

On Mon, 13 Feb 2017 00:22:47 +0300
Petr Ovtchenkov <address@hidden> (by way of Petr Ovtchenkov <address@hidden>) 
wrote:

> Fix
> 
>   Unescaped left brace in regex is deprecated here (and will be fatal in Perl 
> 5.30), passed
> through in regex; marked by <-- HERE in m/\@(\w+|"|\~|,|\^){ <-- HERE 
> ([^\{\}]+)}/ at ./texi2html
> line 1813. Unescaped left brace in regex is illegal here in regex; marked by 
> <-- HERE in
> m/address@hidden <-- HERE ([^\s\{\}]+)}/ at ./texi2html line 882, <FH001> 
> line 3.
> 
> in v5.25.9.
> ---
>  gettext-tools/doc/texi2html | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/gettext-tools/doc/texi2html b/gettext-tools/doc/texi2html
> index 7c94d5b..69c9e84 100755
> --- a/gettext-tools/doc/texi2html
> +++ b/gettext-tools/doc/texi2html
> @@ -879,7 +879,7 @@ while ($_ = &next_line) {
>      s/address@hidden//g;
>      # other substitutions
>      &simple_substitutions;
> -    s/address@hidden($VARRE)}/$value{$1}/eg;
> +    s/address@hidden($VARRE)}/$value{$1}/eg;
>      s/address@hidden/address@hidden/g; # mark footnotes, cf. pass 4
>      #
>      # analyze the tag again
> @@ -1204,7 +1204,7 @@ while (@lines) {
>      #
>      # xref
>      #
> -    while (/\@(x|px|info|)ref{($XREFRE)(}?)/o) {
> +    while (/\@(x|px|info|)ref\{($XREFRE)(}?)/o) {
>       # note: Texinfo may accept other characters
>       ($type, $nodes, $full) = ($1, $2, $3);
>       ($before, $after) = ($`, $');
> @@ -1810,7 +1810,7 @@ sub substitute_style {
>      while ($changed) {
>       $changed = 0;
>       $done = '';
> -     while (/\@(\w+|"|\~|,|\^){([^\{\}]+)}/) {
> +     while (/\@(\w+|"|\~|,|\^)\{([^\{\}]+)}/) {
>           $text = &apply_style($1, $2);
>           if ($text) {
>               $_ = "$`$text$'";
> -- 
> 2.10.1
> 
>