]>
Commit | Line | Data |
---|---|---|
6dfaef86 JR |
1 | --- gettext-0.19.8.1/gettext-runtime/libasprintf/texi2html.orig 2015-12-08 13:50:04.000000000 +0100 |
2 | +++ gettext-0.19.8.1/gettext-runtime/libasprintf/texi2html 2017-09-03 11:56:03.019241853 +0200 | |
3 | @@ -879,7 +879,7 @@ | |
4 | s/\@refill\s+//g; | |
5 | # other substitutions | |
6 | &simple_substitutions; | |
7 | - s/\@value{($VARRE)}/$value{$1}/eg; | |
8 | + s/\@value\{($VARRE)\}/$value{$1}/eg; | |
9 | s/\@footnote\{/\@footnote$docu_doc\{/g; # mark footnotes, cf. pass 4 | |
10 | # | |
11 | # analyze the tag again | |
12 | @@ -1204,7 +1204,7 @@ | |
13 | # | |
14 | # xref | |
15 | # | |
16 | - while (/\@(x|px|info|)ref{($XREFRE)(}?)/o) { | |
17 | + while (/\@(x|px|info|)ref\{($XREFRE)(\}?)/o) { | |
18 | # note: Texinfo may accept other characters | |
19 | ($type, $nodes, $full) = ($1, $2, $3); | |
20 | ($before, $after) = ($`, $'); | |
21 | @@ -1810,7 +1810,7 @@ | |
22 | while ($changed) { | |
23 | $changed = 0; | |
24 | $done = ''; | |
25 | - while (/\@(\w+|"|\~|,|\^){([^\{\}]+)}/) { | |
26 | + while (/\@\(\w+|"|\~|,|\^\)\{([^\{\}]+)\}/) { | |
27 | $text = &apply_style($1, $2); | |
28 | if ($text) { | |
29 | $_ = "$`$text$'"; | |
30 | --- gettext-0.19.8.1/gettext-tools/doc/texi2html.orig 2017-09-03 11:56:41.053102137 +0200 | |
31 | +++ gettext-0.19.8.1/gettext-tools/doc/texi2html 2017-09-03 11:57:44.060639306 +0200 | |
32 | @@ -879,7 +879,7 @@ | |
33 | s/\@refill\s+//g; | |
34 | # other substitutions | |
35 | &simple_substitutions; | |
36 | - s/\@value{($VARRE)}/$value{$1}/eg; | |
37 | + s/\@value\{($VARRE)\}/$value{$1}/eg; | |
38 | s/\@footnote\{/\@footnote$docu_doc\{/g; # mark footnotes, cf. pass 4 | |
39 | # | |
40 | # analyze the tag again | |
41 | @@ -1204,7 +1204,7 @@ | |
42 | # | |
43 | # xref | |
44 | # | |
45 | - while (/\@(x|px|info|)ref{($XREFRE)(}?)/o) { | |
46 | + while (/\@(x|px|info|)ref\{($XREFRE)(\}?)/o) { | |
47 | # note: Texinfo may accept other characters | |
48 | ($type, $nodes, $full) = ($1, $2, $3); | |
49 | ($before, $after) = ($`, $'); | |
50 | @@ -1810,7 +1810,7 @@ | |
51 | while ($changed) { | |
52 | $changed = 0; | |
53 | $done = ''; | |
54 | - while (/\@(\w+|"|\~|,|\^){([^\{\}]+)}/) { | |
55 | + while (/\@(\w+|"|\~|,|\^)\{([^\{\}]+)\}/) { | |
56 | $text = &apply_style($1, $2); | |
57 | if ($text) { | |
58 | $_ = "$`$text$'"; |