texinfo-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[no subject]

From: Patrice Dumas
Date: Thu, 12 Oct 2023 17:11:08 -0400 (EDT) 
branch: master
commit 8c831f6718dacba33b3c829c01e30ea095cfb689
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Oct 12 23:11:02 2023 +0200

    Use translation context for definition aliases in converters
    
    * tp/Texinfo/Convert/HTML.pm (_convert), tp/Texinfo/Convert/LaTeX.pm
    (_convert), tp/Texinfo/Convert/Plaintext.pm (_convert),
    tp/Texinfo/Convert/Text.pm (_convert): use untranslated extra
    translation context if set.  Report and analysis by Gavin.
---
 ChangeLog                                          |  11 ++++++++-
 tp/Texinfo/Convert/HTML.pm                         |   9 ++++++-
 tp/Texinfo/Convert/LaTeX.pm                        |   9 ++++++-
 tp/Texinfo/Convert/Plaintext.pm                    |   9 ++++++-
 tp/Texinfo/Convert/Text.pm                         |  12 ++++++++--
 .../res_html/documentlanguage.html                 |   2 +-
 .../res_info/documentlanguage.info                 | Bin 554 -> 556 bytes
 .../results/languages/multiple_documentlanguage.pl |  26 ++++++++++-----------
 tp/t/results/languages/multiple_in_preamble.pl     |  14 +++++------
 .../languages/multiple_in_preamble_before_node.pl  |   8 +++----
 .../res_html/multiple_lang_chapters.html           |   2 +-
 .../res_info/multiple_lang_chapters.info           |   6 ++---
 .../res_latex/multiple_lang_chapters.tex           |   2 +-
 .../res_html/multiple_lang_chapters.html           |   2 +-
 .../res_info/multiple_lang_chapters.info           |   6 ++---
 tp/t/results/languages/simple_documentlanguage.pl  |   2 +-
 tp/t/results/languages/unknown_region.pl           |   6 ++---
 17 files changed, 82 insertions(+), 44 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cdb1c038e7..ac15ab41a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2023-10-12  Patrice Dumas <pertusus@free.fr>
+
+       Use translation context for definition aliases in converters
+
+       * tp/Texinfo/Convert/HTML.pm (_convert), tp/Texinfo/Convert/LaTeX.pm
+       (_convert), tp/Texinfo/Convert/Plaintext.pm (_convert),
+       tp/Texinfo/Convert/Text.pm (_convert): use untranslated extra
+       translation context if set.  Report and analysis by Gavin.
+
 2023-10-12  Patrice Dumas <pertusus@free.fr>
 
        Add definition aliases translation context in the tree if needed
@@ -8,7 +17,7 @@
        which returns the context too.  Use the context in _parse_def to
        add it to the tree for untranslated type.  Similarly in def_aliases in
        def.c add a translation context if needed and add it to the tree in
-       parse_def.
+       parse_def.  Report and analysis by Gavin.
 
        * po_document/Makevars (XGETTEXT_OPTIONS): add pgdt_context.
 
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 98bc0af10b..6fc17e5ea5 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -11655,7 +11655,14 @@ sub _convert($$;$)
       return $element->{'text'};
     }
     if ($element->{'type'} and $element->{'type'} eq 'untranslated') {
-      my $translated = $self->gdt($element->{'text'});
+      my $translated;
+      if ($element->{'extra'}
+          and $element->{'extra'}->{'translation_context'}) {
+        $translated = $self->pgdt($element->{'extra'}->{'translation_context'},
+                                  $element->{'text'});
+      } else {
+        $translated = $self->gdt($element->{'text'});
+      }
       my $result = $self->_convert($translated, 'translated TEXT');
       return $result;
     }
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index bd69401093..900ff986fb 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -2666,7 +2666,14 @@ sub _convert($$)
       $result .= _protect_text($self, $element->{'text'});
       return $result;
     } else {
-      my $tree = $self->gdt($element->{'text'});
+      my $tree;
+      if ($element->{'extra'}
+          and $element->{'extra'}->{'translation_context'}) {
+        $tree = $self->pgdt($element->{'extra'}->{'translation_context'},
+                            $element->{'text'});
+      } else {
+        $tree = $self->gdt($element->{'text'});
+      }
       my $converted = _convert($self, $tree);
       return $converted;
     }
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 7b34391500..d5ac4d3273 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -1832,7 +1832,14 @@ sub _convert($$)
                   add_text($formatter->{'container'}, $element->{'text'}));
       }
     } else {
-      my $tree = $self->gdt($element->{'text'});
+      my $tree;
+      if ($element->{'extra'}
+          and $element->{'extra'}->{'translation_context'}) {
+        $tree = $self->pgdt($element->{'extra'}->{'translation_context'},
+                            $element->{'text'});
+      } else {
+        $tree = $self->gdt($element->{'text'});
+      }
       my $converted = _convert($self, $tree);
       return $converted;
     }
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index 7511ecba15..3432f27849 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -439,10 +439,18 @@ sub _convert($;$)
       # the tree documentlanguage corresponds to the documentlanguage
       # at the place of the tree, but the converter may want to use
       # another documentlanguage, for instance the documentlanguage at
-      # the end of th epreamble, so we let the converter set it.
+      # the end of the preamble, so we let the converter set it.
       #my $tree = $options->{'converter'}->gdt($element->{'text'}, undef,
       #                  undef, $element->{'extra'}->{'documentlanguage'});
-      my $tree = $options->{'converter'}->gdt($element->{'text'});
+      my $tree;
+      if ($element->{'extra'}
+          and $element->{'extra'}->{'translation_context'}) {
+        $tree = $options->{'converter'}->pgdt(
+                            $element->{'extra'}->{'translation_context'},
+                            $element->{'text'});
+      } else {
+        $tree = $options->{'converter'}->gdt($element->{'text'});
+      }
       $result = _convert($tree, $options);
     } else {
       $result = $element->{'text'};
diff --git 
a/tp/t/results/languages/documentlanguage_option/res_html/documentlanguage.html 
b/tp/t/results/languages/documentlanguage_option/res_html/documentlanguage.html
index fdced276ab..a9fde2c2fa 100644
--- 
a/tp/t/results/languages/documentlanguage_option/res_html/documentlanguage.html
+++ 
b/tp/t/results/languages/documentlanguage_option/res_html/documentlanguage.html
@@ -54,7 +54,7 @@ Pr&eacute;c&eacute;dent: <a href="#Top" accesskey="p" 
rel="prev">top section</a>
 <p>Voir <a class="xref" href="#chapter">Chapter</a>.
 </p>
 <dl class="first-deftypeop first-deftypemethod-alias-first-deftypeop">
-<dt class="deftypeop deftypemethod-alias-deftypeop" 
id="index-name-on-class"><span class="category-def">Method de <code 
class="code">class</code>&nbsp;: </span><span><code 
class="def-type">data-type</code> <strong class="def-name">name</strong> <code 
class="def-code-arguments">arguments</code><a class="copiable-link" 
href="#index-name-on-class"> &para;</a></span></dt>
+<dt class="deftypeop deftypemethod-alias-deftypeop" 
id="index-name-on-class"><span class="category-def">M&eacute;thode de <code 
class="code">class</code>&nbsp;: </span><span><code 
class="def-type">data-type</code> <strong class="def-name">name</strong> <code 
class="def-code-arguments">arguments</code><a class="copiable-link" 
href="#index-name-on-class"> &para;</a></span></dt>
 <dd><p>Some text.
 </p></dd></dl>
 
diff --git 
a/tp/t/results/languages/documentlanguage_option/res_info/documentlanguage.info 
b/tp/t/results/languages/documentlanguage_option/res_info/documentlanguage.info
index c32efe9dab..5a0ce188e0 100644
Binary files 
a/tp/t/results/languages/documentlanguage_option/res_info/documentlanguage.info 
and 
b/tp/t/results/languages/documentlanguage_option/res_info/documentlanguage.info 
differ
diff --git a/tp/t/results/languages/multiple_documentlanguage.pl 
b/tp/t/results/languages/multiple_documentlanguage.pl
index 2a3a9be996..5447e3bb04 100644
--- a/tp/t/results/languages/multiple_documentlanguage.pl
+++ b/tp/t/results/languages/multiple_documentlanguage.pl
@@ -1129,16 +1129,16 @@ 
$result_converted{'plaintext'}->{'multiple_documentlanguage'} = 'top
 1 Chap
 ******
 
- -- Instance Variable de fr : BBB CCC
+ -- Variable d\'instance de fr : BBB CCC
      erreur→
 
  -- Instance Variable von copying: a b
      error→
 
- -- Instance Variable od hr: BBB CCC
+ -- Primjerak varijable od hr: BBB CCC
      greška→
 
- -- Instance Variable od copying: a b
+ -- Primjerak varijable od copying: a b
      greška→
 
 * Menu:
@@ -1152,7 +1152,7 @@ 
$result_converted{'plaintext'}->{'multiple_documentlanguage'} = 'top
 
 $result_converted{'info'}->{'multiple_documentlanguage'} = 'This is , produced 
from .
 
- -- Instance Variable de copying : a b
+ -- Variable d\'instance de copying : a b
      erreur→
 
 
@@ -1171,16 +1171,16 @@ File: ,  Node: chap,  Prev: Top,  Up: Top
 1 Chap
 ******
 
- -- Instance Variable de fr : BBB CCC
+ -- Variable d\'instance de fr : BBB CCC
      erreur→
 
  -- Instance Variable von copying: a b
      error→
 
- -- Instance Variable od hr: BBB CCC
+ -- Primjerak varijable od hr: BBB CCC
      greška→
 
- -- Instance Variable od copying: a b
+ -- Primjerak varijable od copying: a b
      greška→
 
 [index]
@@ -1193,8 +1193,8 @@ File: ,  Node: chap,  Prev: Top,  Up: Top
 
 
 Tag Table:
-Node: Top82
-Node: chap157
+Node: Top84
+Node: chap159
 
 End Tag Table
 
@@ -1210,7 +1210,7 @@ $result_converted{'html'}->{'multiple_documentlanguage'} 
= '<!DOCTYPE html>
 <!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<!-- Instance Variable de copying: a b
+<!-- Variable d\'instance de copying: a b
 erreur→ -->
 <title>top</title>
 
@@ -1260,7 +1260,7 @@ Pr&eacute;c&eacute;dent: <a href="#Top" accesskey="p" 
rel="prev">top</a>, Monter
 <h2 class="chapter" id="Chap"><span>1 Chap<a class="copiable-link" 
href="#Chap"> &para;</a></span></h2>
 
 <dl class="first-defcv first-defivar-alias-first-defcv">
-<dt class="defcv defivar-alias-defcv" id="index-BBB-of-fr"><span 
class="category-def">Instance Variable de <code class="code">fr</code>&nbsp;: 
</span><span><strong class="def-name">BBB</strong> <var 
class="def-var-arguments">CCC</var><a class="copiable-link" 
href="#index-BBB-of-fr"> &para;</a></span></dt>
+<dt class="defcv defivar-alias-defcv" id="index-BBB-of-fr"><span 
class="category-def">Variable d&rsquo;instance de <code 
class="code">fr</code>&nbsp;: </span><span><strong 
class="def-name">BBB</strong> <var class="def-var-arguments">CCC</var><a 
class="copiable-link" href="#index-BBB-of-fr"> &para;</a></span></dt>
 <dd><p>erreur&rarr;
 </p></dd></dl>
 
@@ -1272,12 +1272,12 @@ Pr&eacute;c&eacute;dent: <a href="#Top" accesskey="p" 
rel="prev">top</a>, Monter
 
 
 <dl class="first-defcv first-defivar-alias-first-defcv">
-<dt class="defcv defivar-alias-defcv" id="index-BBB-of-hr"><span 
class="category-def">Instance Variable od <code class="code">hr</code>: 
</span><span><strong class="def-name">BBB</strong> <var 
class="def-var-arguments">CCC</var><a class="copiable-link" 
href="#index-BBB-of-hr"> &para;</a></span></dt>
+<dt class="defcv defivar-alias-defcv" id="index-BBB-of-hr"><span 
class="category-def">Primjerak varijable od <code class="code">hr</code>: 
</span><span><strong class="def-name">BBB</strong> <var 
class="def-var-arguments">CCC</var><a class="copiable-link" 
href="#index-BBB-of-hr"> &para;</a></span></dt>
 <dd><p>greška&rarr;
 </p></dd></dl>
 
 <dl class="first-defcv first-defivar-alias-first-defcv">
-<dt class="defcv defivar-alias-defcv" id="index-copying-a-of-copying"><span 
class="category-def">Instance Variable od <code class="code">copying</code>: 
</span><span><strong class="def-name">a</strong> <var 
class="def-var-arguments">b</var><a class="copiable-link" 
href="#index-copying-a-of-copying"> &para;</a></span></dt>
+<dt class="defcv defivar-alias-defcv" id="index-copying-a-of-copying"><span 
class="category-def">Primjerak varijable od <code class="code">copying</code>: 
</span><span><strong class="def-name">a</strong> <var 
class="def-var-arguments">b</var><a class="copiable-link" 
href="#index-copying-a-of-copying"> &para;</a></span></dt>
 <dd><p>greška&rarr;
 </p></dd></dl>
 
diff --git a/tp/t/results/languages/multiple_in_preamble.pl 
b/tp/t/results/languages/multiple_in_preamble.pl
index 64a36ab02f..6ccb4e4da6 100644
--- a/tp/t/results/languages/multiple_in_preamble.pl
+++ b/tp/t/results/languages/multiple_in_preamble.pl
@@ -1009,7 +1009,7 @@ $result_converted{'plaintext'}->{'multiple_in_preamble'} 
= 'top section
 1 chap
 ******
 
- -- Instance Variable od hr: BBB CCC
+ -- Primjerak varijable od hr: BBB CCC
      greška→
 
  -- Instance Variable von de: FFF GGG
@@ -1018,7 +1018,7 @@ $result_converted{'plaintext'}->{'multiple_in_preamble'} 
= 'top section
 
 $result_converted{'info'}->{'multiple_in_preamble'} = 'This is , produced from 
.
 
- -- Instance Variable od copying: a b
+ -- Primjerak varijable od copying: a b
      greška→
 
 
@@ -1037,15 +1037,15 @@ File: ,  Node: chapter,  Prev: Top,  Up: Top
 1 chap
 ******
 
- -- Instance Variable od hr: BBB CCC
+ -- Primjerak varijable od hr: BBB CCC
      greška→
 
  -- Instance Variable von de: FFF GGG
 
 
 Tag Table:
-Node: Top82
-Node: chapter179
+Node: Top84
+Node: chapter181
 
 End Tag Table
 
@@ -1061,7 +1061,7 @@ $result_converted{'html'}->{'multiple_in_preamble'} = 
'<!DOCTYPE html>
 <!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<!-- Instance Variable od copying: a b
+<!-- Primjerak varijable od copying: a b
 greška→ -->
 <title>top section</title>
 
@@ -1106,7 +1106,7 @@ Prethodno: <a href="#Top" accesskey="p" rel="prev">top 
section</a>, Gore: <a hre
 <h2 class="chapter" id="chap"><span>1 chap<a class="copiable-link" 
href="#chap"> &para;</a></span></h2>
 
 <dl class="first-defcv first-defivar-alias-first-defcv">
-<dt class="defcv defivar-alias-defcv" id="index-BBB-of-hr"><span 
class="category-def">Instance Variable od <code class="code">hr</code>: 
</span><span><strong class="def-name">BBB</strong> <var 
class="def-var-arguments">CCC</var><a class="copiable-link" 
href="#index-BBB-of-hr"> &para;</a></span></dt>
+<dt class="defcv defivar-alias-defcv" id="index-BBB-of-hr"><span 
class="category-def">Primjerak varijable od <code class="code">hr</code>: 
</span><span><strong class="def-name">BBB</strong> <var 
class="def-var-arguments">CCC</var><a class="copiable-link" 
href="#index-BBB-of-hr"> &para;</a></span></dt>
 <dd><p>greška&rarr;
 </p></dd></dl>
 
diff --git a/tp/t/results/languages/multiple_in_preamble_before_node.pl 
b/tp/t/results/languages/multiple_in_preamble_before_node.pl
index 7244f77be4..0ea42dac0a 100644
--- a/tp/t/results/languages/multiple_in_preamble_before_node.pl
+++ b/tp/t/results/languages/multiple_in_preamble_before_node.pl
@@ -869,7 +869,7 @@ top section
 
 $result_converted{'info'}->{'multiple_in_preamble_before_node'} = 'This is , 
produced from .
 
- -- Instance Variable od copying: a b
+ -- Primjerak varijable od copying: a b
      greška→
 
    Text ending the preamble
@@ -895,8 +895,8 @@ File: ,  Node: chapter,  Prev: Top,  Up: Top
 
 
 Tag Table:
-Node: Top111
-Node: chapter208
+Node: Top113
+Node: chapter210
 
 End Tag Table
 
@@ -912,7 +912,7 @@ 
$result_converted{'html'}->{'multiple_in_preamble_before_node'} = '<!DOCTYPE htm
 <!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<!-- Instance Variable od copying: a b
+<!-- Primjerak varijable od copying: a b
 greška→ -->
 <title>top section</title>
 
diff --git 
a/tp/t/results/languages/multiple_lang_chapters/res_html/multiple_lang_chapters.html
 
b/tp/t/results/languages/multiple_lang_chapters/res_html/multiple_lang_chapters.html
index c1ea37bad7..4168efaa51 100644
--- 
a/tp/t/results/languages/multiple_lang_chapters/res_html/multiple_lang_chapters.html
+++ 
b/tp/t/results/languages/multiple_lang_chapters/res_html/multiple_lang_chapters.html
@@ -79,7 +79,7 @@ Suivant: <a href="#chapter-de" accesskey="n" 
rel="next">de</a>, Pr&eacute;c&eacu
 <h2 class="chapter" id="fr_005fFR"><span>3 fr_FR<a class="copiable-link" 
href="#fr_005fFR"> &para;</a></span></h2>
 
 <dl class="first-defcv first-defivar-alias-first-defcv">
-<dt class="defcv defivar-alias-defcv" id="index-BBB-of-AAA-2"><span 
class="category-def">Instance Variable de <code class="code">AAA</code>&nbsp;: 
</span><span><strong class="def-name">BBB</strong> <var 
class="def-var-arguments">CCC</var><a class="copiable-link" 
href="#index-BBB-of-AAA-2"> &para;</a></span></dt>
+<dt class="defcv defivar-alias-defcv" id="index-BBB-of-AAA-2"><span 
class="category-def">Variable d&rsquo;instance de <code 
class="code">AAA</code>&nbsp;: </span><span><strong 
class="def-name">BBB</strong> <var class="def-var-arguments">CCC</var><a 
class="copiable-link" href="#index-BBB-of-AAA-2"> &para;</a></span></dt>
 </dl>
 
 <hr>
diff --git 
a/tp/t/results/languages/multiple_lang_chapters/res_info/multiple_lang_chapters.info
 
b/tp/t/results/languages/multiple_lang_chapters/res_info/multiple_lang_chapters.info
index 572dbf383f..2bd7e80469 100644
--- 
a/tp/t/results/languages/multiple_lang_chapters/res_info/multiple_lang_chapters.info
+++ 
b/tp/t/results/languages/multiple_lang_chapters/res_info/multiple_lang_chapters.info
@@ -39,7 +39,7 @@ File: multiple_lang_chapters.info,  Node: chapter fr_FR,  
Next: chapter de,  Pre
 3 fr_FR
 *******
 
- -- Instance Variable de AAA : BBB CCC
+ -- Variable d'instance de AAA : BBB CCC
 
 
 File: multiple_lang_chapters.info,  Node: chapter de,  Next: chapter pt_BR,  
Prev: chapter fr_FR,  Up: Top
@@ -61,8 +61,8 @@ Node: Top81
 Node: chapter ja293
 Node: chapter en474
 Node: chapter fr_FR664
-Node: chapter de828
-Node: chapter pt_BR949
+Node: chapter de830
+Node: chapter pt_BR951
 
 End Tag Table
 
diff --git 
a/tp/t/results/languages/multiple_lang_chapters_latex/res_latex/multiple_lang_chapters.tex
 
b/tp/t/results/languages/multiple_lang_chapters_latex/res_latex/multiple_lang_chapters.tex
index 6150b27a9f..5c9b53ead3 100644
--- 
a/tp/t/results/languages/multiple_lang_chapters_latex/res_latex/multiple_lang_chapters.tex
+++ 
b/tp/t/results/languages/multiple_lang_chapters_latex/res_latex/multiple_lang_chapters.tex
@@ -99,7 +99,7 @@ In english. See 
\hyperref[anchor:chapter-ja]{\chaptername~\ref*{anchor:chapter-j
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{BBB \EmbracOn{}\textnormal{\textsl{CCC}}\EmbracOff{}}& [Instance 
Variable de \texttt{AAA}]
+\texttt{BBB \EmbracOn{}\textnormal{\textsl{CCC}}\EmbracOff{}}& [Variable 
d'instance de \texttt{AAA}]
 \end{tabularx}
 
 \index[vr]{BBB of AAA@\texttt{BBB\ of AAA}}%
diff --git 
a/tp/t/results/languages/multiple_lang_chapters_texi2html/res_html/multiple_lang_chapters.html
 
b/tp/t/results/languages/multiple_lang_chapters_texi2html/res_html/multiple_lang_chapters.html
index e4d8fa47a8..76d2092b13 100644
--- 
a/tp/t/results/languages/multiple_lang_chapters_texi2html/res_html/multiple_lang_chapters.html
+++ 
b/tp/t/results/languages/multiple_lang_chapters_texi2html/res_html/multiple_lang_chapters.html
@@ -124,7 +124,7 @@ td.name-direction-about {text-align:center}
 <h1 class="chapter" id="fr_005fFR"><span>3 fr_FR<a class="copiable-link" 
href="#fr_005fFR"> &para;</a></span></h1>
 
 <dl class="first-defcv first-defivar-alias-first-defcv">
-<dt class="defcv defivar-alias-defcv" id="index-BBB-of-AAA-2"><span 
class="category-def">Instance Variable de <code class="code">AAA</code>&nbsp;: 
</span><span><strong class="def-name">BBB</strong> <var 
class="def-var-arguments">CCC</var><a class="copiable-link" 
href="#index-BBB-of-AAA-2"> &para;</a></span></dt>
+<dt class="defcv defivar-alias-defcv" id="index-BBB-of-AAA-2"><span 
class="category-def">Variable d&rsquo;instance de <code 
class="code">AAA</code>&nbsp;: </span><span><strong 
class="def-name">BBB</strong> <var class="def-var-arguments">CCC</var><a 
class="copiable-link" href="#index-BBB-of-AAA-2"> &para;</a></span></dt>
 </dl>
 
 <hr>
diff --git 
a/tp/t/results/languages/multiple_lang_chapters_texi2html/res_info/multiple_lang_chapters.info
 
b/tp/t/results/languages/multiple_lang_chapters_texi2html/res_info/multiple_lang_chapters.info
index 572dbf383f..2bd7e80469 100644
--- 
a/tp/t/results/languages/multiple_lang_chapters_texi2html/res_info/multiple_lang_chapters.info
+++ 
b/tp/t/results/languages/multiple_lang_chapters_texi2html/res_info/multiple_lang_chapters.info
@@ -39,7 +39,7 @@ File: multiple_lang_chapters.info,  Node: chapter fr_FR,  
Next: chapter de,  Pre
 3 fr_FR
 *******
 
- -- Instance Variable de AAA : BBB CCC
+ -- Variable d'instance de AAA : BBB CCC
 
 
 File: multiple_lang_chapters.info,  Node: chapter de,  Next: chapter pt_BR,  
Prev: chapter fr_FR,  Up: Top
@@ -61,8 +61,8 @@ Node: Top81
 Node: chapter ja293
 Node: chapter en474
 Node: chapter fr_FR664
-Node: chapter de828
-Node: chapter pt_BR949
+Node: chapter de830
+Node: chapter pt_BR951
 
 End Tag Table
 
diff --git a/tp/t/results/languages/simple_documentlanguage.pl 
b/tp/t/results/languages/simple_documentlanguage.pl
index 353866e00d..79420fb303 100644
--- a/tp/t/results/languages/simple_documentlanguage.pl
+++ b/tp/t/results/languages/simple_documentlanguage.pl
@@ -341,7 +341,7 @@ $result_indices_sort_strings{'simple_documentlanguage'} = {
 
 
 
-$result_converted{'plaintext'}->{'simple_documentlanguage'} = ' -- Instance 
Variable de AAA : BBB CCC
+$result_converted{'plaintext'}->{'simple_documentlanguage'} = ' -- Variable 
d\'instance de AAA : BBB CCC
 ';
 
 1;
diff --git a/tp/t/results/languages/unknown_region.pl 
b/tp/t/results/languages/unknown_region.pl
index b33d9eb594..1b2b8dd70d 100644
--- a/tp/t/results/languages/unknown_region.pl
+++ b/tp/t/results/languages/unknown_region.pl
@@ -351,7 +351,7 @@ $result_indices_sort_strings{'unknown_region'} = {
 
 
 
-$result_converted{'plaintext'}->{'unknown_region'} = ' -- Instance Variable de 
AAA : BBB CCC
+$result_converted{'plaintext'}->{'unknown_region'} = ' -- Variable d\'instance 
de AAA : BBB CCC
 ';
 
 
@@ -363,7 +363,7 @@ File: ,  Node: Top,  Next: chap,  Up: (dir)
 
 File: ,  Node: chap,  Prev: Top
 
- -- Instance Variable de AAA : BBB CCC
+ -- Variable d\'instance de AAA : BBB CCC
 
 
 Tag Table:
@@ -419,7 +419,7 @@ Pr&eacute;c&eacute;dent: <a href="#Top" accesskey="p" 
rel="prev">Top</a> &nbsp;
 <h4 class="node"><span>chap<a class="copiable-link" href="#chap"> 
&para;</a></span></h4>
 
 <dl class="first-defcv first-defivar-alias-first-defcv">
-<dt class="defcv defivar-alias-defcv" id="index-BBB-of-AAA"><span 
class="category-def">Instance Variable de <code class="code">AAA</code>&nbsp;: 
</span><span><strong class="def-name">BBB</strong> <var 
class="def-var-arguments">CCC</var><a class="copiable-link" 
href="#index-BBB-of-AAA"> &para;</a></span></dt>
+<dt class="defcv defivar-alias-defcv" id="index-BBB-of-AAA"><span 
class="category-def">Variable d&rsquo;instance de <code 
class="code">AAA</code>&nbsp;: </span><span><strong 
class="def-name">BBB</strong> <var class="def-var-arguments">CCC</var><a 
class="copiable-link" href="#index-BBB-of-AAA"> &para;</a></span></dt>
 </dl>
reply via email to
[Prev in Thread] Current Thread [Next in Thread]