[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Revert documentlanguage fix
|
From: |
Gavin D. Smith |
|
Subject: |
branch master updated: Revert documentlanguage fix |
|
Date: |
Sun, 05 Nov 2023 09:33:05 -0500 |
This is an automated email from the git hooks/post-receive script.
gavin pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new 0af3042bd3 Revert documentlanguage fix
0af3042bd3 is described below
commit 0af3042bd3e0bf945904dade600c8d080391b5f2
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Nov 5 14:32:40 2023 +0000
Revert documentlanguage fix
* tp/Texinfo/ParserNonXS.pm (_parse_def),
* tp/Texinfo/XS/parsetexi/def.c (parse_def): Do not set type
untranslated if @documentlanguage is not set at the time of parsing.
* tp/t/languages.t (no_documentlanguage_before_copying): Skip test.
This reverses change on 2023-01-11. Although it is correct,
it slows the program down a lot when a lot of @def* are used
and there is no @documentlanguage.
This gets back to the execution times from texi2any 7.1 (with XS
enabled only).
---
ChangeLog | 16 +++
tp/Texinfo/ParserNonXS.pm | 16 ++-
tp/Texinfo/XS/parsetexi/def.c | 9 +-
tp/t/languages.t | 2 +-
tp/t/results/converters_tests/complex_nestings.pl | 24 +----
.../converters_tests/definition_commands.pl | 108 +++++++--------------
.../converters_tests/test_deftypefnnewline.pl | 12 +--
tp/t/results/def/all_commands.pl | 63 +++---------
tp/t/results/def/all_commands_delimiters.pl | 6 +-
.../def/all_commands_delimiters_printindex.pl | 6 +-
tp/t/results/def/all_commands_printindex.pl | 63 +++---------
tp/t/results/def/def_defx_mismatch.pl | 6 +-
tp/t/results/def/empty_deftype.pl | 24 +----
tp/t/results/def/not_closed.pl | 6 +-
tp/t/results/def/omit_def_space.pl | 12 +--
.../deftypefnnewline_for_copying_after.pl | 12 +--
.../deftypefnnewline_for_copying_before.pl | 12 +--
tp/t/results/indices/empty_string_index_entry.pl | 12 +--
.../indices/printindex_index_entry_in_copying.pl | 12 +--
...ndex_index_entry_in_copying_no_insertcopying.pl | 12 +--
.../indices/same_index_entry_merged_indices.pl | 6 +-
.../invalid_nestings/def_in_style_command.pl | 6 +-
tp/t/results/latex_tests/brace_in_index.pl | 6 +-
tp/t/results/preformatted/def_in_example.pl | 6 +-
24 files changed, 116 insertions(+), 341 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index bc39e47fd7..7212aab50a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2023-11-05 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Revert documentlanguage fix
+
+ * tp/Texinfo/ParserNonXS.pm (_parse_def),
+ * tp/Texinfo/XS/parsetexi/def.c (parse_def): Do not set type
+ untranslated if @documentlanguage is not set at the time of parsing.
+ * tp/t/languages.t (no_documentlanguage_before_copying): Skip test.
+
+ This reverses change on 2023-01-11. Although it is correct,
+ it slows the program down a lot when a lot of @def* are used
+ and there is no @documentlanguage.
+
+ This gets back to the execution times from texi2any 7.1 (with XS
+ enabled only).
+
2023-11-05 Patrice Dumas <pertusus@free.fr>
Change customization of translations to target only translated string
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 964f264010..571410a18d 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -3176,16 +3176,14 @@ sub _parse_def($$$$)
my $bracketed = { 'type' => 'bracketed_inserted',
'parent' => $current };
my $content = { 'text' => $category, 'parent' => $bracketed };
- # the category string is an english string (such as Function).
- # It needs to be translated during the conversion.
- $content->{'type'} = 'untranslated';
- if (defined($translation_context)) {
- $content->{'extra'} = {} if (!$content->{'extra'});
- $content->{'extra'}->{'translation_context'} = $translation_context;
- }
+ # the category string is an english string (such as Function). If
+ # documentlanguage is set it needs to be translated during the conversion.
if (defined($self->{'documentlanguage'})) {
- $content->{'extra'} = {} if (!$content->{'extra'});
- $content->{'extra'}->{'documentlanguage'} = $self->{'documentlanguage'};
+ $content->{'type'} = 'untranslated';
+ $content->{'extra'} = {'documentlanguage' =>
$self->{'documentlanguage'}};
+ if (defined($translation_context)) {
+ $content->{'extra'}->{'translation_context'} = $translation_context;
+ }
}
@{$bracketed->{'contents'}} = ($content);
diff --git a/tp/Texinfo/XS/parsetexi/def.c b/tp/Texinfo/XS/parsetexi/def.c
index 418febf9e6..211d4f3880 100644
--- a/tp/Texinfo/XS/parsetexi/def.c
+++ b/tp/Texinfo/XS/parsetexi/def.c
@@ -375,15 +375,14 @@ parse_def (enum command_id command, ELEMENT *current)
e1 = new_element (ET_NONE);
text_append_n (&e1->text, category, strlen (category));
add_to_element_contents (e, e1);
-
- e1->type = ET_untranslated;
- if (def_aliases[i].translation_context)
- add_extra_string_dup (e1, "translation_context",
- def_aliases[i].translation_context);
if (global_documentlanguage && *global_documentlanguage)
{
+ e1->type = ET_untranslated;
add_extra_string_dup (e1, "documentlanguage",
global_documentlanguage);
+ if (def_aliases[i].translation_context)
+ add_extra_string_dup (e1, "translation_context",
+ def_aliases[i].translation_context);
}
e = new_element (ET_spaces_inserted);
diff --git a/tp/t/languages.t b/tp/t/languages.t
index a499719b75..19d12d8400 100644
--- a/tp/t/languages.t
+++ b/tp/t/languages.t
@@ -32,7 +32,7 @@ my @test_cases = (
@insertcopying
-'],
+', {'skip' => 'incorrect result'}],
# REMARK it is worth noting that the
# @defivar in @insertcopying after @documentlanguage de appears
# in german in the document, (and after @documentlanguage pt at
diff --git a/tp/t/results/converters_tests/complex_nestings.pl
b/tp/t/results/converters_tests/complex_nestings.pl
index a592fcc311..2b828011cd 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -170,11 +170,7 @@ $result_trees{'complex_nestings'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of
functions for @defun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
@@ -303,11 +299,7 @@ $result_trees{'complex_nestings'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of
functions for @defun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
@@ -536,11 +528,7 @@ $result_trees{'complex_nestings'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' =>
'category of variables for @defvar'
- },
- 'text' => 'Variable',
- 'type' => 'untranslated'
+ 'text' => 'Variable'
}
],
'extra' => {
@@ -633,11 +621,7 @@ $result_trees{'complex_nestings'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' =>
'category of variables for @defvar'
- },
- 'text' => 'Variable',
- 'type' => 'untranslated'
+ 'text' => 'Variable'
}
],
'extra' => {
diff --git a/tp/t/results/converters_tests/definition_commands.pl
b/tp/t/results/converters_tests/definition_commands.pl
index 8c8d916ef8..a81b62c4c3 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -794,8 +794,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -957,8 +956,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -1161,8 +1159,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -1365,8 +1362,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -1569,8 +1565,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -1773,8 +1768,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -1977,8 +1971,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -2226,8 +2219,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -2475,8 +2467,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -2724,8 +2715,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -2973,8 +2963,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -3222,8 +3211,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -3471,8 +3459,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -3720,8 +3707,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -3969,8 +3955,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -4284,8 +4269,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -4366,8 +4350,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -4469,8 +4452,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -4572,8 +4554,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -4675,8 +4656,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -4778,8 +4758,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -4881,8 +4860,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -4999,8 +4977,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -5117,8 +5094,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -5235,8 +5211,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -5353,8 +5328,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -5471,8 +5445,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -5589,8 +5562,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -5707,8 +5679,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -5825,8 +5796,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -6910,8 +6880,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -7905,8 +7874,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -9677,11 +9645,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of functions
for @defun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
@@ -9901,11 +9865,7 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of functions
for @defun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index afae23c348..0626813535 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -225,11 +225,7 @@ $result_trees{'test_deftypefnnewline'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of functions
for @deftypefun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
@@ -1402,11 +1398,7 @@ $result_trees{'test_deftypefnnewline'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of functions
for @deftypefun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
diff --git a/tp/t/results/def/all_commands.pl b/tp/t/results/def/all_commands.pl
index a04dbb4795..4c21ec8d19 100644
--- a/tp/t/results/def/all_commands.pl
+++ b/tp/t/results/def/all_commands.pl
@@ -2252,11 +2252,7 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of functions
for @defun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
@@ -2389,8 +2385,7 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'text' => 'Macro',
- 'type' => 'untranslated'
+ 'text' => 'Macro'
}
],
'extra' => {
@@ -2523,8 +2518,7 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -2657,11 +2651,7 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of variables
for @defvar'
- },
- 'text' => 'Variable',
- 'type' => 'untranslated'
+ 'text' => 'Variable'
}
],
'extra' => {
@@ -2781,11 +2771,7 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of variables
for @defvar'
- },
- 'text' => 'Variable',
- 'type' => 'untranslated'
+ 'text' => 'Variable'
}
],
'extra' => {
@@ -2931,8 +2917,7 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'text' => 'User Option',
- 'type' => 'untranslated'
+ 'text' => 'User Option'
}
],
'extra' => {
@@ -3052,11 +3037,7 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of functions
for @deftypefun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
@@ -3202,11 +3183,7 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of variables in
typed languages for @deftypevar'
- },
- 'text' => 'Variable',
- 'type' => 'untranslated'
+ 'text' => 'Variable'
}
],
'extra' => {
@@ -3339,11 +3316,7 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
- },
- 'text' => 'Instance Variable',
- 'type' => 'untranslated'
+ 'text' => 'Instance Variable'
}
],
'extra' => {
@@ -3513,11 +3486,7 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of instance
variables with data type in object-oriented programming for @deftypeivar'
- },
- 'text' => 'Instance Variable',
- 'type' => 'untranslated'
+ 'text' => 'Instance Variable'
}
],
'extra' => {
@@ -3700,11 +3669,7 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of methods in
object-oriented programming for @defmethod'
- },
- 'text' => 'Method',
- 'type' => 'untranslated'
+ 'text' => 'Method'
}
],
'extra' => {
@@ -3887,11 +3852,7 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of methods with
data type in object-oriented programming for @deftypemethod'
- },
- 'text' => 'Method',
- 'type' => 'untranslated'
+ 'text' => 'Method'
}
],
'extra' => {
diff --git a/tp/t/results/def/all_commands_delimiters.pl
b/tp/t/results/def/all_commands_delimiters.pl
index 966bd9789a..c31192abfa 100644
--- a/tp/t/results/def/all_commands_delimiters.pl
+++ b/tp/t/results/def/all_commands_delimiters.pl
@@ -7535,11 +7535,7 @@ $result_trees{'all_commands_delimiters'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of functions
for @defun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index 2b5cc73288..277cf71052 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -7619,11 +7619,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of functions
for @defun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
diff --git a/tp/t/results/def/all_commands_printindex.pl
b/tp/t/results/def/all_commands_printindex.pl
index c8dcada77c..392c0babe7 100644
--- a/tp/t/results/def/all_commands_printindex.pl
+++ b/tp/t/results/def/all_commands_printindex.pl
@@ -2325,11 +2325,7 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of functions
for @defun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
@@ -2463,8 +2459,7 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'text' => 'Macro',
- 'type' => 'untranslated'
+ 'text' => 'Macro'
}
],
'extra' => {
@@ -2598,8 +2593,7 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'text' => 'Special Form',
- 'type' => 'untranslated'
+ 'text' => 'Special Form'
}
],
'extra' => {
@@ -2733,11 +2727,7 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of variables
for @defvar'
- },
- 'text' => 'Variable',
- 'type' => 'untranslated'
+ 'text' => 'Variable'
}
],
'extra' => {
@@ -2858,11 +2848,7 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of variables
for @defvar'
- },
- 'text' => 'Variable',
- 'type' => 'untranslated'
+ 'text' => 'Variable'
}
],
'extra' => {
@@ -3009,8 +2995,7 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'text' => 'User Option',
- 'type' => 'untranslated'
+ 'text' => 'User Option'
}
],
'extra' => {
@@ -3131,11 +3116,7 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of functions
for @deftypefun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
@@ -3282,11 +3263,7 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of variables in
typed languages for @deftypevar'
- },
- 'text' => 'Variable',
- 'type' => 'untranslated'
+ 'text' => 'Variable'
}
],
'extra' => {
@@ -3420,11 +3397,7 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
- },
- 'text' => 'Instance Variable',
- 'type' => 'untranslated'
+ 'text' => 'Instance Variable'
}
],
'extra' => {
@@ -3595,11 +3568,7 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of instance
variables with data type in object-oriented programming for @deftypeivar'
- },
- 'text' => 'Instance Variable',
- 'type' => 'untranslated'
+ 'text' => 'Instance Variable'
}
],
'extra' => {
@@ -3783,11 +3752,7 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of methods in
object-oriented programming for @defmethod'
- },
- 'text' => 'Method',
- 'type' => 'untranslated'
+ 'text' => 'Method'
}
],
'extra' => {
@@ -3971,11 +3936,7 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of methods with
data type in object-oriented programming for @deftypemethod'
- },
- 'text' => 'Method',
- 'type' => 'untranslated'
+ 'text' => 'Method'
}
],
'extra' => {
diff --git a/tp/t/results/def/def_defx_mismatch.pl
b/tp/t/results/def/def_defx_mismatch.pl
index f3fad02ce0..90f3f7f090 100644
--- a/tp/t/results/def/def_defx_mismatch.pl
+++ b/tp/t/results/def/def_defx_mismatch.pl
@@ -19,11 +19,7 @@ $result_trees{'def_defx_mismatch'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of functions
for @defun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
diff --git a/tp/t/results/def/empty_deftype.pl
b/tp/t/results/def/empty_deftype.pl
index f5269a3761..3442c8635c 100644
--- a/tp/t/results/def/empty_deftype.pl
+++ b/tp/t/results/def/empty_deftype.pl
@@ -19,11 +19,7 @@ $result_trees{'empty_deftype'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of functions
for @deftypefun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
@@ -214,11 +210,7 @@ $result_trees{'empty_deftype'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of functions
for @defun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
@@ -391,11 +383,7 @@ $result_trees{'empty_deftype'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of methods with
data type in object-oriented programming for @deftypemethod'
- },
- 'text' => 'Method',
- 'type' => 'untranslated'
+ 'text' => 'Method'
}
],
'extra' => {
@@ -636,11 +624,7 @@ $result_trees{'empty_deftype'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of methods in
object-oriented programming for @defmethod'
- },
- 'text' => 'Method',
- 'type' => 'untranslated'
+ 'text' => 'Method'
}
],
'extra' => {
diff --git a/tp/t/results/def/not_closed.pl b/tp/t/results/def/not_closed.pl
index cc85ee601e..1ce7a803f7 100644
--- a/tp/t/results/def/not_closed.pl
+++ b/tp/t/results/def/not_closed.pl
@@ -154,11 +154,7 @@ $result_trees{'not_closed'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of
variables for @defvar'
- },
- 'text' => 'Variable',
- 'type' => 'untranslated'
+ 'text' => 'Variable'
}
],
'extra' => {
diff --git a/tp/t/results/def/omit_def_space.pl
b/tp/t/results/def/omit_def_space.pl
index 6a65c06a0b..a09e788003 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -106,11 +106,7 @@ $result_trees{'omit_def_space'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of functions
for @defun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
@@ -213,11 +209,7 @@ $result_trees{'omit_def_space'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of functions
for @defun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
diff --git a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
index 58b581b98c..ea9c9142bb 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
@@ -33,11 +33,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of
functions for @deftypefun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
@@ -432,11 +428,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of functions
for @deftypefun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
diff --git a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
index 1e2e7bd0b8..c8ef6c3835 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
@@ -77,11 +77,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of
functions for @deftypefun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
@@ -397,11 +393,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of functions
for @deftypefun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
diff --git a/tp/t/results/indices/empty_string_index_entry.pl
b/tp/t/results/indices/empty_string_index_entry.pl
index 84ea674ddf..65686c6651 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -268,11 +268,7 @@ $result_trees{'empty_string_index_entry'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of functions
for @defun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
@@ -383,11 +379,7 @@ $result_trees{'empty_string_index_entry'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of functions
for @defun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
diff --git a/tp/t/results/indices/printindex_index_entry_in_copying.pl
b/tp/t/results/indices/printindex_index_entry_in_copying.pl
index b4ff6eaad4..30c1c7bac4 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -83,11 +83,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of
functions for @defun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
@@ -155,11 +151,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of
functions for @defun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
diff --git
a/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
b/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
index ca76bdd6e1..ef58a1a5d2 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
@@ -83,11 +83,7 @@
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of
functions for @defun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
@@ -155,11 +151,7 @@
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of
functions for @defun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
diff --git a/tp/t/results/indices/same_index_entry_merged_indices.pl
b/tp/t/results/indices/same_index_entry_merged_indices.pl
index 9c965d010a..50354d2b13 100644
--- a/tp/t/results/indices/same_index_entry_merged_indices.pl
+++ b/tp/t/results/indices/same_index_entry_merged_indices.pl
@@ -343,11 +343,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of variables
for @defvar'
- },
- 'text' => 'Variable',
- 'type' => 'untranslated'
+ 'text' => 'Variable'
}
],
'extra' => {
diff --git a/tp/t/results/invalid_nestings/def_in_style_command.pl
b/tp/t/results/invalid_nestings/def_in_style_command.pl
index 81839175f7..a85ab8a3bc 100644
--- a/tp/t/results/invalid_nestings/def_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/def_in_style_command.pl
@@ -43,11 +43,7 @@ $result_trees{'def_in_style_command'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of functions
for @defun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
diff --git a/tp/t/results/latex_tests/brace_in_index.pl
b/tp/t/results/latex_tests/brace_in_index.pl
index 5cdc426d9d..97874292f0 100644
--- a/tp/t/results/latex_tests/brace_in_index.pl
+++ b/tp/t/results/latex_tests/brace_in_index.pl
@@ -292,11 +292,7 @@ $result_trees{'brace_in_index'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of functions
for @defun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
diff --git a/tp/t/results/preformatted/def_in_example.pl
b/tp/t/results/preformatted/def_in_example.pl
index 4309bdcd4c..84b6146e35 100644
--- a/tp/t/results/preformatted/def_in_example.pl
+++ b/tp/t/results/preformatted/def_in_example.pl
@@ -33,11 +33,7 @@ $result_trees{'def_in_example'} = {
{
'contents' => [
{
- 'extra' => {
- 'translation_context' => 'category of
functions for @defun'
- },
- 'text' => 'Function',
- 'type' => 'untranslated'
+ 'text' => 'Function'
}
],
'extra' => {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: Revert documentlanguage fix,
Gavin D. Smith <=
- Prev by Date:
branch master updated: Change customization of translations to target only translated string
- Next by Date:
branch master updated: * tp/Texinfo/Convert/HTML.pm, tp/ext/highlight_syntax.pm, tp/init/documentation_examples.pm, tp/init/html32.pm, tp/t/init/ignore_and_comments_output.init, tp/t/init/mini_ker_t2h.init, tp/t/init/t2h_singular.init: handle undef contents for all commands and types conversion functions (and undef args).
- Previous by thread:
branch master updated: Change customization of translations to target only translated string
- Next by thread:
branch master updated: * tp/Texinfo/Convert/HTML.pm, tp/ext/highlight_syntax.pm, tp/init/documentation_examples.pm, tp/init/html32.pm, tp/t/init/ignore_and_comments_output.init, tp/t/init/mini_ker_t2h.init, tp/t/init/t2h_singular.init: handle undef contents for all commands and types conversion functions (and undef args).
- Index(es):