[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Save txidefnamenospace
|
From: |
Gavin D. Smith |
|
Subject: |
branch master updated: Save txidefnamenospace |
|
Date: |
Wed, 27 Jul 2022 11:30:58 -0400 |
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 f9f15aa0d9 Save txidefnamenospace
f9f15aa0d9 is described below
commit f9f15aa0d9da080bae0c54c4ffbafb870300748f
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Wed Jul 27 16:24:08 2022 +0100
Save txidefnamenospace
* tp/Texinfo/ParserNonXS.pm (_parse_texi) <def command>,
* tp/Texinfo/XS/parsetexi/handle_commands.c
(handle_block_command) <def command>: If txidefnamenospace flag
is set, set 'omit_def_name_space' extra value.
* tp/t/19def.t (omit_def_space): New test.
---
ChangeLog | 10 +
tp/Texinfo/ParserNonXS.pm | 3 +
tp/Texinfo/XS/parsetexi/handle_commands.c | 6 +
tp/t/19def.t | 7 +
tp/t/results/def/omit_def_space.pl | 312 ++++++++++++++++++++++++++++++
5 files changed, 338 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 0c183c0e48..163db3eb46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2022-07-27 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Save txidefnamenospace
+
+ * tp/Texinfo/ParserNonXS.pm (_parse_texi) <def command>,
+ * tp/Texinfo/XS/parsetexi/handle_commands.c
+ (handle_block_command) <def command>: If txidefnamenospace flag
+ is set, set 'omit_def_name_space' extra value.
+ * tp/t/19def.t (omit_def_space): New test.
+
2022-07-27 Gavin Smith <gavinsmith0123@gmail.com>
@set txidefnamenospace
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index a4b36101f8..134f93a233 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -5013,6 +5013,9 @@ sub _parse_texi($$$)
'contents' => [] };
push @{$current->{'contents'}}, $block;
$current = $current->{'contents'}->[-1];
+ if (defined($self->{'values'}->{'txidefnamenospace'})) {
+ $current->{'extra'}->{'omit_def_name_space'} = 1;
+ }
push @{$current->{'contents'}}, {
'type' => 'def_line',
'parent' => $current,
diff --git a/tp/Texinfo/XS/parsetexi/handle_commands.c
b/tp/Texinfo/XS/parsetexi/handle_commands.c
index e2478efb21..bc2350ac41 100644
--- a/tp/Texinfo/XS/parsetexi/handle_commands.c
+++ b/tp/Texinfo/XS/parsetexi/handle_commands.c
@@ -913,6 +913,12 @@ handle_block_command (ELEMENT *current, char **line_inout,
block->source_info = current_source_info;
add_to_element_contents (current, block);
current = block;
+
+ /* Check txidefnamenospace flag */
+ char *val = fetch_value ("txidefnamenospace");
+ if (val)
+ add_extra_integer (current, "omit_def_name_space", 1);
+
def_line = new_element (ET_def_line);
def_line->source_info = current_source_info;
add_to_element_contents (current, def_line);
diff --git a/tp/t/19def.t b/tp/t/19def.t
index 9c0568f3fb..755a0b69aa 100644
--- a/tp/t/19def.t
+++ b/tp/t/19def.t
@@ -557,6 +557,13 @@ Documentation of @code{foo}.
@end deftypefn
',
{'test_formats' => ['plaintext']}],
+['omit_def_space',
+'@set txidefnamenospace
+
+@defun function (arg1, arg2)
+explain
+@end defun
+']
);
my @test_printindex = ();
diff --git a/tp/t/results/def/omit_def_space.pl
b/tp/t/results/def/omit_def_space.pl
new file mode 100644
index 0000000000..2d1d37257a
--- /dev/null
+++ b/tp/t/results/def/omit_def_space.pl
@@ -0,0 +1,312 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'omit_def_space'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => 'txidefnamenospace',
+ 'type' => 'misc_arg'
+ },
+ {
+ 'parent' => {},
+ 'text' => '',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'set',
+ 'extra' => {
+ 'arg_line' => ' txidefnamenospace
+',
+ 'misc_args' => [
+ 'txidefnamenospace',
+ ''
+ ]
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'cmdname' => 'defun',
+ 'contents' => [
+ {
+ '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' => 'function'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'delimiter'
+ },
+ 'parent' => {},
+ 'text' => '(',
+ 'type' => 'delimiter'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'parent' => {},
+ 'text' => 'arg1'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'delimiter'
+ },
+ 'parent' => {},
+ 'text' => ',',
+ 'type' => 'delimiter'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'spaces'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'arg'
+ },
+ 'parent' => {},
+ 'text' => 'arg2'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'delimiter'
+ },
+ 'parent' => {},
+ 'text' => ')',
+ 'type' => 'delimiter'
+ },
+ {
+ 'extra' => {
+ 'def_role' => 'spaces'
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'extra' => {
+ 'def_command' => 'defun',
+ 'def_parsed_hash' => {
+ 'category' => {},
+ 'name' => {}
+ },
+ 'index_entry' => {
+ 'command' => {},
+ 'content' => [
+ {}
+ ],
+ 'content_normalized' => [
+ {}
+ ],
+ 'in_code' => 1,
+ 'index_at_command' => 'defun',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'fn',
+ 'index_type_command' => 'defun',
+ 'number' => 1
+ },
+ 'original_def_cmdname' => 'defun'
+ },
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ },
+ 'type' => 'def_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'explain
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'def_item'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'defun'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command_argument' => 'defun',
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'defun'
+ },
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'extra' => {
+ 'end_command' => {},
+ 'omit_def_name_space' => 1,
+ 'spaces_before_argument' => ' '
+ },
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'before_node_section'
+ }
+ ],
+ '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
+
+@defun function (arg1, arg2)
+explain
+@end defun
+';
+
+
+$result_texts{'omit_def_space'} = '
+Function: function (arg1, arg2)
+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_floats{'omit_def_space'} = {};
+
+
+$result_indices_sort_strings{'omit_def_space'} = {
+ 'fn' => [
+ 'function'
+ ]
+};
+
+
+1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: Save txidefnamenospace,
Gavin D. Smith <=