texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: * tp/Texinfo/Translations.pm (complete_indices):


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/Translations.pm (complete_indices): do not delete $entry->{'command'}->{'extra'}->{'documentlanguage'} from tree.
Date: Sat, 04 Sep 2021 18:11:23 -0400

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 9f1421e  * tp/Texinfo/Translations.pm (complete_indices): do not 
delete $entry->{'command'}->{'extra'}->{'documentlanguage'} from tree.
9f1421e is described below

commit 9f1421e49915e0bf08981d780eb8117ba2a5c41f
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Sep 5 00:11:12 2021 +0200

    * tp/Texinfo/Translations.pm (complete_indices): do not delete
    $entry->{'command'}->{'extra'}->{'documentlanguage'} from tree.
---
 ChangeLog                                                  | 5 +++++
 tp/TODO                                                    | 6 ------
 tp/Texinfo/Translations.pm                                 | 1 -
 tp/t/results/languages/multiple.pl                         | 3 +++
 tp/t/results/languages/multiple_lang_chapters.pl           | 3 +++
 tp/t/results/languages/multiple_lang_chapters_latex.pl     | 3 +++
 tp/t/results/languages/multiple_lang_chapters_texi2html.pl | 3 +++
 tp/t/results/languages/simple.pl                           | 1 +
 tp/t/results/languages/unknown_region.pl                   | 1 +
 9 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4e9a8a6..64cf748 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2021-09-05  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Translations.pm (complete_indices): do not delete
+       $entry->{'command'}->{'extra'}->{'documentlanguage'} from tree.
+
 2021-09-04  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Common.pm (%default_parser_common_customization),
diff --git a/tp/TODO b/tp/TODO
index 37db4c8..f2ff851 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -13,18 +13,12 @@ xmllint --nonet --noout --valid commands.xml
 Before next release
 ===================
 
-do not remove documentlanguage in index entries in complete_indices
-(remove delete $entry->{'command'}->{'extra'}->{'documentlanguage'};)
-
 Rename _set_global_multiple_commands
 
 check @{$converter_options->{'INCLUDE_DIRECTORIES'}} with more 
 than one output file
 FIXME isn't that done for each output file?
 
-Verify that Texinfo::Convert::TextContent really needs
-use Texinfo::Convert::Converter;
-
 complete_indices, gdt, some code in Text: add documentlanguage arg to gdt
 
 not internal (maybe move?)
diff --git a/tp/Texinfo/Translations.pm b/tp/Texinfo/Translations.pm
index 7f523ae..9ce5ef8 100644
--- a/tp/Texinfo/Translations.pm
+++ b/tp/Texinfo/Translations.pm
@@ -300,7 +300,6 @@ sub complete_indices
           # used for getting the translation.
           $self->{'documentlanguage'}
              = $entry->{'command'}->{'extra'}->{'documentlanguage'};
-          delete $entry->{'command'}->{'extra'}->{'documentlanguage'};
           if ($def_command eq 'defop'
               or $def_command eq 'deftypeop'
               or $def_command eq 'defmethod'
diff --git a/tp/t/results/languages/multiple.pl 
b/tp/t/results/languages/multiple.pl
index bf00784..454c242 100644
--- a/tp/t/results/languages/multiple.pl
+++ b/tp/t/results/languages/multiple.pl
@@ -144,6 +144,7 @@ $result_trees{'multiple'} = {
                       'class' => {},
                       'name' => {}
                     },
+                    'documentlanguage' => 'fr',
                     'index_entry' => {
                       'command' => {},
                       'content' => [
@@ -383,6 +384,7 @@ $result_trees{'multiple'} = {
                   'class' => {},
                   'name' => {}
                 },
+                'documentlanguage' => 'fr',
                 'index_entry' => {
                   'command' => {},
                   'content' => [
@@ -610,6 +612,7 @@ $result_trees{'multiple'} = {
                   'class' => {},
                   'name' => {}
                 },
+                'documentlanguage' => 'pt',
                 'index_entry' => {
                   'command' => {},
                   'content' => [
diff --git a/tp/t/results/languages/multiple_lang_chapters.pl 
b/tp/t/results/languages/multiple_lang_chapters.pl
index d3372fa..b4745cc 100644
--- a/tp/t/results/languages/multiple_lang_chapters.pl
+++ b/tp/t/results/languages/multiple_lang_chapters.pl
@@ -783,6 +783,7 @@ $result_trees{'multiple_lang_chapters'} = {
                   'class' => {},
                   'name' => {}
                 },
+                'documentlanguage' => 'ja',
                 'index_entry' => {
                   'command' => {},
                   'content' => [
@@ -1106,6 +1107,7 @@ $result_trees{'multiple_lang_chapters'} = {
                   'class' => {},
                   'name' => {}
                 },
+                'documentlanguage' => 'en',
                 'index_entry' => {
                   'command' => {},
                   'content' => [
@@ -1383,6 +1385,7 @@ $result_trees{'multiple_lang_chapters'} = {
                   'class' => {},
                   'name' => {}
                 },
+                'documentlanguage' => 'fr_FR',
                 'index_entry' => {
                   'command' => {},
                   'content' => [
diff --git a/tp/t/results/languages/multiple_lang_chapters_latex.pl 
b/tp/t/results/languages/multiple_lang_chapters_latex.pl
index d34a0a3..90ab087 100644
--- a/tp/t/results/languages/multiple_lang_chapters_latex.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_latex.pl
@@ -783,6 +783,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                   'class' => {},
                   'name' => {}
                 },
+                'documentlanguage' => 'ja',
                 'index_entry' => {
                   'command' => {},
                   'content' => [
@@ -1106,6 +1107,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                   'class' => {},
                   'name' => {}
                 },
+                'documentlanguage' => 'en',
                 'index_entry' => {
                   'command' => {},
                   'content' => [
@@ -1383,6 +1385,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                   'class' => {},
                   'name' => {}
                 },
+                'documentlanguage' => 'fr_FR',
                 'index_entry' => {
                   'command' => {},
                   'content' => [
diff --git a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl 
b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
index f2c3aad..fa5d649 100644
--- a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -754,6 +754,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                   'class' => {},
                   'name' => {}
                 },
+                'documentlanguage' => 'ja',
                 'index_entry' => {
                   'command' => {},
                   'content' => [
@@ -1077,6 +1078,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                   'class' => {},
                   'name' => {}
                 },
+                'documentlanguage' => 'en',
                 'index_entry' => {
                   'command' => {},
                   'content' => [
@@ -1354,6 +1356,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                   'class' => {},
                   'name' => {}
                 },
+                'documentlanguage' => 'fr_FR',
                 'index_entry' => {
                   'command' => {},
                   'content' => [
diff --git a/tp/t/results/languages/simple.pl b/tp/t/results/languages/simple.pl
index d437590..0956d16 100644
--- a/tp/t/results/languages/simple.pl
+++ b/tp/t/results/languages/simple.pl
@@ -161,6 +161,7 @@ $result_trees{'simple'} = {
                   'class' => {},
                   'name' => {}
                 },
+                'documentlanguage' => 'fr',
                 'index_entry' => {
                   'command' => {},
                   'content' => [
diff --git a/tp/t/results/languages/unknown_region.pl 
b/tp/t/results/languages/unknown_region.pl
index 3f4a90a..60a7605 100644
--- a/tp/t/results/languages/unknown_region.pl
+++ b/tp/t/results/languages/unknown_region.pl
@@ -161,6 +161,7 @@ $result_trees{'unknown_region'} = {
                   'class' => {},
                   'name' => {}
                 },
+                'documentlanguage' => 'fr_NOWHERE',
                 'index_entry' => {
                   'command' => {},
                   'content' => [



reply via email to

[Prev in Thread] Current Thread [Next in Thread]