[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Handle txidefnamenospace/omit_def_name_space in H
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: Handle txidefnamenospace/omit_def_name_space in HTML |
|
Date: |
Mon, 01 Aug 2022 18:00:39 -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 fab4d997cd Handle txidefnamenospace/omit_def_name_space in HTML
fab4d997cd is described below
commit fab4d997cde3c81174c84fe7fb5e3d7fb909cd7b
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Aug 2 00:00:25 2022 +0200
Handle txidefnamenospace/omit_def_name_space in HTML
* tp/Texinfo/Convert/HTML.pm (_convert_def_line_type): handle
omit_def_name_space as in LaTeX.
---
ChangeLog | 7 +
tp/Texinfo/Convert/HTML.pm | 7 +-
tp/t/19def.t | 7 +-
tp/t/results/def/omit_def_space.pl | 385 ++++++++++++++++++++++++++++++++-----
4 files changed, 355 insertions(+), 51 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 66a547c9aa..dabbdd4ddf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-07-31 Patrice Dumas <pertusus@free.fr>
+
+ Handle txidefnamenospace/omit_def_name_space in HTML
+
+ * tp/Texinfo/Convert/HTML.pm (_convert_def_line_type): handle
+ omit_def_name_space as in LaTeX.
+
2022-07-31 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/HTML.pm (_convert_def_line_type): with DEF_TABLE,
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index c04d532446..40d5eacd0d 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -5892,6 +5892,11 @@ sub _convert_def_line_type($$$$)
.'</code>';
}
+ my $def_space = ' ';
+ if ($element->{'parent'}->{'extra'}->{'omit_def_name_space'}) {
+ $def_space = '';
+ }
+
my $result_arguments = '';
if ($arguments) {
# arguments not only metasyntactic variables
@@ -5923,7 +5928,7 @@ sub _convert_def_line_type($$$$)
$def_call .= $result_name;
- $def_call .= ' ' . $result_arguments if ($result_arguments ne '');
+ $def_call .= $def_space . $result_arguments if ($result_arguments ne '');
if (!$self->get_conf('DEF_TABLE')) {
my $category;
diff --git a/tp/t/19def.t b/tp/t/19def.t
index b48d8de493..3df0561794 100644
--- a/tp/t/19def.t
+++ b/tp/t/19def.t
@@ -558,9 +558,14 @@ Documentation of @code{foo}.
',
{'test_formats' => ['plaintext']}],
['omit_def_space',
-'@set txidefnamenospace
+'@node Top
+
+@node first
+
+@set txidefnamenospace
@defun function (arg1, arg2)
+@defunx another (aarg)
explain
@end defun
',
diff --git a/tp/t/results/def/omit_def_space.pl
b/tp/t/results/def/omit_def_space.pl
index ec622829b6..bba01cdac6 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -8,7 +8,83 @@ use utf8;
$result_trees{'omit_def_space'} = {
'contents' => [
{
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'before_node_section'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Top'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'Top'
+ }
+ ],
+ 'normalized' => 'Top',
+ 'spaces_before_argument' => ' '
+ },
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'first'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
{
'args' => [
{
@@ -161,6 +237,7 @@ $result_trees{'omit_def_space'} = {
'index_ignore_chars' => {},
'index_name' => 'fn',
'index_type_command' => 'defun',
+ 'node' => {},
'number' => 1
},
'original_def_cmdname' => 'defun'
@@ -168,7 +245,118 @@ $result_trees{'omit_def_space'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 7,
+ 'macro' => ''
+ },
+ 'type' => 'def_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Function'
+ }
+ ],
+ 'extra' => {
+ 'def_role' => 'category'
+ },
+ 'parent' => {},
+ 'type' => 'bracketed_inserted'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'spaces_inserted'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'name'
+ },
+ 'parent' => {},
+ 'text' => 'another'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'delimiter'
+ },
+ 'parent' => {},
+ 'text' => '(',
+ 'type' => 'delimiter'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'parent' => {},
+ 'text' => 'aarg'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'delimiter'
+ },
+ 'parent' => {},
+ 'text' => ')',
+ 'type' => 'delimiter'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'defunx',
+ 'extra' => {
+ 'def_command' => 'defun',
+ 'def_parsed_hash' => {
+ 'category' => {},
+ 'name' => {}
+ },
+ 'index_entry' => {
+ 'command' => {},
+ 'content' => [
+ {}
+ ],
+ 'content_normalized' => [
+ {}
+ ],
+ 'in_code' => 1,
+ 'index_at_command' => 'defunx',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'fn',
+ 'index_type_command' => 'defun',
+ 'node' => {},
+ 'number' => 2
+ },
+ 'original_def_cmdname' => 'defunx',
+ 'spaces_before_argument' => ' '
+ },
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 8,
'macro' => ''
},
'type' => 'def_line'
@@ -216,7 +404,7 @@ $result_trees{'omit_def_space'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 5,
+ 'line_nr' => 10,
'macro' => ''
}
}
@@ -229,74 +417,148 @@ $result_trees{'omit_def_space'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 7,
'macro' => ''
}
}
],
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'first'
+ }
+ ],
+ 'normalized' => 'first',
+ 'spaces_before_argument' => ' '
+ },
'parent' => {},
- 'type' => 'before_node_section'
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
}
],
'type' => 'document_root'
};
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[0];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[0];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'omit_def_space'}{'contents'}[0];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'omit_def_space'}{'contents'}[0];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
= $result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
=
$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
= $result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
= $result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
-$result_trees{'omit_def_space'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'omit_def_space'}{'contents'}[0];
$result_trees{'omit_def_space'}{'contents'}[0]{'parent'} =
$result_trees{'omit_def_space'};
-
-$result_texis{'omit_def_space'} = '@set txidefnamenospace
+$result_trees{'omit_def_space'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'omit_def_space'}{'contents'}[1]{'args'}[0];
+$result_trees{'omit_def_space'}{'contents'}[1]{'args'}[0]{'parent'} =
$result_trees{'omit_def_space'}{'contents'}[1];
+$result_trees{'omit_def_space'}{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'omit_def_space'}{'contents'}[1];
+$result_trees{'omit_def_space'}{'contents'}[1]{'extra'}{'node_content'}[0] =
$result_trees{'omit_def_space'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'omit_def_space'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
= $result_trees{'omit_def_space'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'omit_def_space'}{'contents'}[1]{'parent'} =
$result_trees{'omit_def_space'};
+$result_trees{'omit_def_space'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'omit_def_space'}{'contents'}[2]{'args'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'args'}[0]{'parent'} =
$result_trees{'omit_def_space'}{'contents'}[2];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[0]{'parent'} =
$result_trees{'omit_def_space'}{'contents'}[2];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[1];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[1]{'args'}[1]{'parent'}
= $result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[1];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[1]{'parent'} =
$result_trees{'omit_def_space'}{'contents'}[2];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[2]{'parent'} =
$result_trees{'omit_def_space'}{'contents'}[2];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
= $result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
= $result_trees{'omit_def_space'}{'contents'}[2];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[4]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[5]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[7]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
= $result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}[0]
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
= $result_trees{'omit_def_space'}{'contents'}[2];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[2];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'parent'}
= $result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[3];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'parent'}
= $result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
= $result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[3];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'parent'} =
$result_trees{'omit_def_space'}{'contents'}[2];
+$result_trees{'omit_def_space'}{'contents'}[2]{'extra'}{'node_content'}[0] =
$result_trees{'omit_def_space'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
= $result_trees{'omit_def_space'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'parent'} =
$result_trees{'omit_def_space'};
+
+$result_texis{'omit_def_space'} = '@node Top
+
+@node first
+
+@set txidefnamenospace
@defun function (arg1, arg2)
+@defunx another (aarg)
explain
@end defun
';
$result_texts{'omit_def_space'} = '
+
+
Function: function (arg1, arg2)
+Function: another (aarg)
explain
';
-$result_errors{'omit_def_space'} = [
- {
- 'error_line' => 'warning: entry for index `fn\' outside of any node
-',
- 'file_name' => '',
- 'line_nr' => 3,
- 'macro' => '',
- 'text' => 'entry for index `fn\' outside of any node',
- 'type' => 'warning'
+$result_nodes{'omit_def_space'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ },
+ 'structure' => {
+ 'node_next' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'first'
+ },
+ 'structure' => {
+ 'node_prev' => {}
+ }
+ }
}
-];
+};
+$result_nodes{'omit_def_space'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
= $result_nodes{'omit_def_space'};
+
+$result_menus{'omit_def_space'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ },
+ 'structure' => {}
+};
+
+$result_errors{'omit_def_space'} = [];
$result_floats{'omit_def_space'} = {};
@@ -304,6 +566,7 @@ $result_floats{'omit_def_space'} = {};
$result_indices_sort_strings{'omit_def_space'} = {
'fn' => [
+ 'another',
'function'
]
};
@@ -311,6 +574,7 @@ $result_indices_sort_strings{'omit_def_space'} = {
$result_converted{'plaintext'}->{'omit_def_space'} = ' -- Function: function
(arg1, arg2)
+ -- Function: another (aarg)
explain
';
@@ -328,6 +592,7 @@ $result_converted{'html'}->{'omit_def_space'} = '<!DOCTYPE
html>
<meta name="distribution" content="global">
<meta name="viewport" content="width=device-width,initial-scale=1">
+<link href="#Top" rel="start" title="Top">
<style type="text/css">
<!--
a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em}
@@ -340,9 +605,23 @@ span:hover a.copiable-link {visibility: visible}
</head>
<body lang="en">
+<a class="node-id" id="Top"></a><div class="nav-panel">
+<p>
+Next: <a href="#first" accesskey="n" rel="next">first</a> </p>
+</div>
+<h1 class="node">Top</h1>
+
+<hr>
+<a class="node-id" id="first"></a><div class="nav-panel">
+<p>
+Previous: <a href="#Top" accesskey="p" rel="prev">Top</a> </p>
+</div>
+<h4 class="node">first</h4>
+
<dl class="first-deffn first-defun-alias-first-deffn">
-<dt class="deffn defun-alias-deffn" id="index-function"><span
class="category-def">Function: </span><span><code
class="def-name">function</code> <span class="def-meta-var-arguments"><i
class="slanted">(arg1, arg2)</i></span><a class="copiable-link"
href=\'#index-function\'> ¶</a></span></dt>
+<dt class="deffn defun-alias-deffn" id="index-function"><span
class="category-def">Function: </span><span><code
class="def-name">function</code><span class="def-meta-var-arguments"><i
class="slanted">(arg1, arg2)</i></span><a class="copiable-link"
href=\'#index-function\'> ¶</a></span></dt>
+<dt class="deffnx defunx-alias-deffnx def-cmd-deffn" id="index-another"><span
class="category-def">Function: </span><span><code
class="def-name">another</code><span class="def-meta-var-arguments"><i
class="slanted">(aarg)</i></span><a class="copiable-link"
href=\'#index-another\'> ¶</a></span></dt>
<dd><p>explain
</p></dd></dl>
@@ -363,12 +642,20 @@ $result_converted_errors{'html'}->{'omit_def_space'} = [
-$result_converted{'latex'}->{'omit_def_space'} = '
+$result_converted{'latex'}->{'omit_def_space'} = '\\label{anchor:Top}%
+\\label{anchor:first}%
+
+
\\noindent\\texttt{function\\EmbracOn{}\\textnormal{\\textsl{(arg1,
arg2)}}\\EmbracOff{}}\\hfill[Function]
\\index[fn]{function@\\texttt{function}}%
+\\noindent\\texttt{another\\EmbracOn{}\\textnormal{\\textsl{(aarg)}}\\EmbracOff{}}\\hfill[Function]
+
+
+
+\\index[fn]{another@\\texttt{another}}%
explain
';
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: Handle txidefnamenospace/omit_def_name_space in HTML,
Patrice Dumas <=