[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/ParserNonXS.pm (_parse_def), tp/Texi
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/ParserNonXS.pm (_parse_def), tp/Texinfo/XS/parsetexi/def.c (parse_def): set type untranslated and associate translation context even if @documentlanguage is not set at the time of parsing. @documentlanguage may indeed be set when converting. Report from Gavin. |
|
Date: |
Wed, 01 Nov 2023 18:26:47 -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 965090bc78 * tp/Texinfo/ParserNonXS.pm (_parse_def),
tp/Texinfo/XS/parsetexi/def.c (parse_def): set type untranslated and associate
translation context even if @documentlanguage is not set at the time of
parsing. @documentlanguage may indeed be set when converting. Report from
Gavin.
965090bc78 is described below
commit 965090bc780eb8ec7d38a3828fa064b1c8bb0a20
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Nov 1 23:26:37 2023 +0100
* tp/Texinfo/ParserNonXS.pm (_parse_def),
tp/Texinfo/XS/parsetexi/def.c (parse_def): set type untranslated and
associate translation context even if @documentlanguage is not set at
the time of parsing. @documentlanguage may indeed be set when
converting. Report from Gavin.
---
ChangeLog | 8 ++
tp/Texinfo/ParserNonXS.pm | 16 +--
tp/Texinfo/XS/parsetexi/def.c | 9 +-
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 +-
23 files changed, 348 insertions(+), 99 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 88ff669eb1..585c6e7eac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-11-01 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/ParserNonXS.pm (_parse_def),
+ tp/Texinfo/XS/parsetexi/def.c (parse_def): set type untranslated and
+ associate translation context even if @documentlanguage is not set at
+ the time of parsing. @documentlanguage may indeed be set when
+ converting. Report from Gavin.
+
2023-11-01 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/HTML.pm (_html_convert_output): if a special
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index faace47e58..a6b5808757 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -3176,14 +3176,16 @@ 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). If
- # documentlanguage is set it needs to be translated during the conversion.
+ # 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;
+ }
if (defined($self->{'documentlanguage'})) {
- $content->{'type'} = 'untranslated';
- $content->{'extra'} = {'documentlanguage' =>
$self->{'documentlanguage'}};
- if (defined($translation_context)) {
- $content->{'extra'}->{'translation_context'} = $translation_context;
- }
+ $content->{'extra'} = {} if (!$content->{'extra'});
+ $content->{'extra'}->{'documentlanguage'} = $self->{'documentlanguage'};
}
@{$bracketed->{'contents'}} = ($content);
diff --git a/tp/Texinfo/XS/parsetexi/def.c b/tp/Texinfo/XS/parsetexi/def.c
index 211d4f3880..418febf9e6 100644
--- a/tp/Texinfo/XS/parsetexi/def.c
+++ b/tp/Texinfo/XS/parsetexi/def.c
@@ -375,14 +375,15 @@ 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/results/converters_tests/complex_nestings.pl
b/tp/t/results/converters_tests/complex_nestings.pl
index 2b828011cd..a592fcc311 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -170,7 +170,11 @@ $result_trees{'complex_nestings'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of
functions for @defun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -299,7 +303,11 @@ $result_trees{'complex_nestings'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of
functions for @defun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -528,7 +536,11 @@ $result_trees{'complex_nestings'} = {
{
'contents' => [
{
- 'text' => 'Variable'
+ 'extra' => {
+ 'translation_context' =>
'category of variables for @defvar'
+ },
+ 'text' => 'Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -621,7 +633,11 @@ $result_trees{'complex_nestings'} = {
{
'contents' => [
{
- 'text' => 'Variable'
+ 'extra' => {
+ 'translation_context' =>
'category of variables for @defvar'
+ },
+ 'text' => 'Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
diff --git a/tp/t/results/converters_tests/definition_commands.pl
b/tp/t/results/converters_tests/definition_commands.pl
index a81b62c4c3..8c8d916ef8 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -794,7 +794,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -956,7 +957,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -1159,7 +1161,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -1362,7 +1365,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -1565,7 +1569,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -1768,7 +1773,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -1971,7 +1977,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -2219,7 +2226,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -2467,7 +2475,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -2715,7 +2724,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -2963,7 +2973,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -3211,7 +3222,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -3459,7 +3471,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -3707,7 +3720,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -3955,7 +3969,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -4269,7 +4284,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -4350,7 +4366,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -4452,7 +4469,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -4554,7 +4572,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -4656,7 +4675,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -4758,7 +4778,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -4860,7 +4881,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -4977,7 +4999,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -5094,7 +5117,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -5211,7 +5235,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -5328,7 +5353,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -5445,7 +5471,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -5562,7 +5589,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -5679,7 +5707,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -5796,7 +5825,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -6880,7 +6910,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -7874,7 +7905,8 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -9645,7 +9677,11 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of functions
for @defun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -9865,7 +9901,11 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of functions
for @defun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'extra' => {
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 0626813535..afae23c348 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -225,7 +225,11 @@ $result_trees{'test_deftypefnnewline'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of functions
for @deftypefun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -1398,7 +1402,11 @@ $result_trees{'test_deftypefnnewline'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of functions
for @deftypefun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'extra' => {
diff --git a/tp/t/results/def/all_commands.pl b/tp/t/results/def/all_commands.pl
index 4c21ec8d19..a04dbb4795 100644
--- a/tp/t/results/def/all_commands.pl
+++ b/tp/t/results/def/all_commands.pl
@@ -2252,7 +2252,11 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of functions
for @defun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -2385,7 +2389,8 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'text' => 'Macro'
+ 'text' => 'Macro',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -2518,7 +2523,8 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -2651,7 +2657,11 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'text' => 'Variable'
+ 'extra' => {
+ 'translation_context' => 'category of variables
for @defvar'
+ },
+ 'text' => 'Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -2771,7 +2781,11 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'text' => 'Variable'
+ 'extra' => {
+ 'translation_context' => 'category of variables
for @defvar'
+ },
+ 'text' => 'Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -2917,7 +2931,8 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'text' => 'User Option'
+ 'text' => 'User Option',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -3037,7 +3052,11 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of functions
for @deftypefun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -3183,7 +3202,11 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'text' => 'Variable'
+ 'extra' => {
+ 'translation_context' => 'category of variables in
typed languages for @deftypevar'
+ },
+ 'text' => 'Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -3316,7 +3339,11 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'text' => 'Instance Variable'
+ 'extra' => {
+ 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
+ },
+ 'text' => 'Instance Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -3486,7 +3513,11 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'text' => 'Instance Variable'
+ 'extra' => {
+ 'translation_context' => 'category of instance
variables with data type in object-oriented programming for @deftypeivar'
+ },
+ 'text' => 'Instance Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -3669,7 +3700,11 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'text' => 'Method'
+ 'extra' => {
+ 'translation_context' => 'category of methods in
object-oriented programming for @defmethod'
+ },
+ 'text' => 'Method',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -3852,7 +3887,11 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'text' => 'Method'
+ 'extra' => {
+ 'translation_context' => 'category of methods with
data type in object-oriented programming for @deftypemethod'
+ },
+ 'text' => 'Method',
+ 'type' => 'untranslated'
}
],
'extra' => {
diff --git a/tp/t/results/def/all_commands_delimiters.pl
b/tp/t/results/def/all_commands_delimiters.pl
index c31192abfa..966bd9789a 100644
--- a/tp/t/results/def/all_commands_delimiters.pl
+++ b/tp/t/results/def/all_commands_delimiters.pl
@@ -7535,7 +7535,11 @@ $result_trees{'all_commands_delimiters'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of functions
for @defun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'extra' => {
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index 277cf71052..2b5cc73288 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -7619,7 +7619,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of functions
for @defun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'extra' => {
diff --git a/tp/t/results/def/all_commands_printindex.pl
b/tp/t/results/def/all_commands_printindex.pl
index 392c0babe7..c8dcada77c 100644
--- a/tp/t/results/def/all_commands_printindex.pl
+++ b/tp/t/results/def/all_commands_printindex.pl
@@ -2325,7 +2325,11 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of functions
for @defun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -2459,7 +2463,8 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'text' => 'Macro'
+ 'text' => 'Macro',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -2593,7 +2598,8 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'text' => 'Special Form'
+ 'text' => 'Special Form',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -2727,7 +2733,11 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'text' => 'Variable'
+ 'extra' => {
+ 'translation_context' => 'category of variables
for @defvar'
+ },
+ 'text' => 'Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -2848,7 +2858,11 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'text' => 'Variable'
+ 'extra' => {
+ 'translation_context' => 'category of variables
for @defvar'
+ },
+ 'text' => 'Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -2995,7 +3009,8 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'text' => 'User Option'
+ 'text' => 'User Option',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -3116,7 +3131,11 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of functions
for @deftypefun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -3263,7 +3282,11 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'text' => 'Variable'
+ 'extra' => {
+ 'translation_context' => 'category of variables in
typed languages for @deftypevar'
+ },
+ 'text' => 'Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -3397,7 +3420,11 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'text' => 'Instance Variable'
+ 'extra' => {
+ 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
+ },
+ 'text' => 'Instance Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -3568,7 +3595,11 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'text' => 'Instance Variable'
+ 'extra' => {
+ 'translation_context' => 'category of instance
variables with data type in object-oriented programming for @deftypeivar'
+ },
+ 'text' => 'Instance Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -3752,7 +3783,11 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'text' => 'Method'
+ 'extra' => {
+ 'translation_context' => 'category of methods in
object-oriented programming for @defmethod'
+ },
+ 'text' => 'Method',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -3936,7 +3971,11 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'text' => 'Method'
+ 'extra' => {
+ 'translation_context' => 'category of methods with
data type in object-oriented programming for @deftypemethod'
+ },
+ 'text' => 'Method',
+ 'type' => 'untranslated'
}
],
'extra' => {
diff --git a/tp/t/results/def/def_defx_mismatch.pl
b/tp/t/results/def/def_defx_mismatch.pl
index 90f3f7f090..f3fad02ce0 100644
--- a/tp/t/results/def/def_defx_mismatch.pl
+++ b/tp/t/results/def/def_defx_mismatch.pl
@@ -19,7 +19,11 @@ $result_trees{'def_defx_mismatch'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of functions
for @defun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'extra' => {
diff --git a/tp/t/results/def/empty_deftype.pl
b/tp/t/results/def/empty_deftype.pl
index 3442c8635c..f5269a3761 100644
--- a/tp/t/results/def/empty_deftype.pl
+++ b/tp/t/results/def/empty_deftype.pl
@@ -19,7 +19,11 @@ $result_trees{'empty_deftype'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of functions
for @deftypefun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -210,7 +214,11 @@ $result_trees{'empty_deftype'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of functions
for @defun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -383,7 +391,11 @@ $result_trees{'empty_deftype'} = {
{
'contents' => [
{
- 'text' => 'Method'
+ 'extra' => {
+ 'translation_context' => 'category of methods with
data type in object-oriented programming for @deftypemethod'
+ },
+ 'text' => 'Method',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -624,7 +636,11 @@ $result_trees{'empty_deftype'} = {
{
'contents' => [
{
- 'text' => 'Method'
+ 'extra' => {
+ 'translation_context' => 'category of methods in
object-oriented programming for @defmethod'
+ },
+ 'text' => 'Method',
+ 'type' => 'untranslated'
}
],
'extra' => {
diff --git a/tp/t/results/def/not_closed.pl b/tp/t/results/def/not_closed.pl
index 1ce7a803f7..cc85ee601e 100644
--- a/tp/t/results/def/not_closed.pl
+++ b/tp/t/results/def/not_closed.pl
@@ -154,7 +154,11 @@ $result_trees{'not_closed'} = {
{
'contents' => [
{
- 'text' => 'Variable'
+ 'extra' => {
+ 'translation_context' => 'category of
variables for @defvar'
+ },
+ 'text' => 'Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
diff --git a/tp/t/results/def/omit_def_space.pl
b/tp/t/results/def/omit_def_space.pl
index a09e788003..6a65c06a0b 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -106,7 +106,11 @@ $result_trees{'omit_def_space'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of functions
for @defun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -209,7 +213,11 @@ $result_trees{'omit_def_space'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of functions
for @defun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'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 ea9c9142bb..58b581b98c 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
@@ -33,7 +33,11 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of
functions for @deftypefun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -428,7 +432,11 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of functions
for @deftypefun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'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 c8ef6c3835..1e2e7bd0b8 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
@@ -77,7 +77,11 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of
functions for @deftypefun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -393,7 +397,11 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of functions
for @deftypefun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'extra' => {
diff --git a/tp/t/results/indices/empty_string_index_entry.pl
b/tp/t/results/indices/empty_string_index_entry.pl
index 65686c6651..84ea674ddf 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -268,7 +268,11 @@ $result_trees{'empty_string_index_entry'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of functions
for @defun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -379,7 +383,11 @@ $result_trees{'empty_string_index_entry'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of functions
for @defun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'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 30c1c7bac4..b4ff6eaad4 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -83,7 +83,11 @@ $result_trees{'printindex_index_entry_in_copying'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of
functions for @defun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -151,7 +155,11 @@ $result_trees{'printindex_index_entry_in_copying'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of
functions for @defun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'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 ef58a1a5d2..ca76bdd6e1 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,7 +83,11 @@
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of
functions for @defun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'extra' => {
@@ -151,7 +155,11 @@
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of
functions for @defun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'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 50354d2b13..9c965d010a 100644
--- a/tp/t/results/indices/same_index_entry_merged_indices.pl
+++ b/tp/t/results/indices/same_index_entry_merged_indices.pl
@@ -343,7 +343,11 @@ $result_trees{'same_index_entry_merged_indices'} = {
{
'contents' => [
{
- 'text' => 'Variable'
+ 'extra' => {
+ 'translation_context' => 'category of variables
for @defvar'
+ },
+ 'text' => 'Variable',
+ 'type' => 'untranslated'
}
],
'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 a85ab8a3bc..81839175f7 100644
--- a/tp/t/results/invalid_nestings/def_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/def_in_style_command.pl
@@ -43,7 +43,11 @@ $result_trees{'def_in_style_command'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of functions
for @defun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'extra' => {
diff --git a/tp/t/results/latex_tests/brace_in_index.pl
b/tp/t/results/latex_tests/brace_in_index.pl
index 97874292f0..5cdc426d9d 100644
--- a/tp/t/results/latex_tests/brace_in_index.pl
+++ b/tp/t/results/latex_tests/brace_in_index.pl
@@ -292,7 +292,11 @@ $result_trees{'brace_in_index'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of functions
for @defun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'extra' => {
diff --git a/tp/t/results/preformatted/def_in_example.pl
b/tp/t/results/preformatted/def_in_example.pl
index 84b6146e35..4309bdcd4c 100644
--- a/tp/t/results/preformatted/def_in_example.pl
+++ b/tp/t/results/preformatted/def_in_example.pl
@@ -33,7 +33,11 @@ $result_trees{'def_in_example'} = {
{
'contents' => [
{
- 'text' => 'Function'
+ 'extra' => {
+ 'translation_context' => 'category of
functions for @defun'
+ },
+ 'text' => 'Function',
+ 'type' => 'untranslated'
}
],
'extra' => {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/ParserNonXS.pm (_parse_def), tp/Texinfo/XS/parsetexi/def.c (parse_def): set type untranslated and associate translation context even if @documentlanguage is not set at the time of parsing. @documentlanguage may indeed be set when converting. Report from Gavin.,
Patrice Dumas <=