[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Abort empty line for empty @def* command line
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: Abort empty line for empty @def* command line |
|
Date: |
Sun, 04 Sep 2022 18:26:09 -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 0232f99a25 Abort empty line for empty @def* command line
0232f99a25 is described below
commit 0232f99a251dac188371ca844510463f85c0eb54
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Sep 5 00:25:56 2022 +0200
Abort empty line for empty @def* command line
* tp/Texinfo/ParserNonXS.pm (_parse_def, _end_line),
tp/Texinfo/XS/parsetexi/def.c (parse_def),
tp/Texinfo/XS/parsetexi/end_line.c (end_line): call
abort_empty_line before parsing definition command line to
collect space after command in case there are no arguments at all.
* tp/Texinfo/Convert/TexinfoXML.pm (_convert): remove end of line
from @def* leading spaces.
---
ChangeLog | 13 ++
tp/Texinfo/Convert/TexinfoXML.pm | 13 +-
tp/Texinfo/ParserNonXS.pm | 16 +-
tp/Texinfo/XS/parsetexi/def.c | 5 -
tp/Texinfo/XS/parsetexi/end_line.c | 3 +
tp/t/results/def/all_empty_def.pl | 162 +++++----------------
tp/t/results/def/empty_def_arguments.pl | 18 +--
tp/t/results/def/no_category_or_no_name.pl | 36 +----
.../res_parser/formatting_xml/formatting.xml | 8 +-
9 files changed, 83 insertions(+), 191 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d55d2d6468..bb3622f110 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2022-09-04 Patrice Dumas <pertusus@free.fr>
+
+ Abort empty line for empty @def* command line
+
+ * tp/Texinfo/ParserNonXS.pm (_parse_def, _end_line),
+ tp/Texinfo/XS/parsetexi/def.c (parse_def),
+ tp/Texinfo/XS/parsetexi/end_line.c (end_line): call
+ abort_empty_line before parsing definition command line to
+ collect space after command in case there are no arguments at all.
+
+ * tp/Texinfo/Convert/TexinfoXML.pm (_convert): remove end of line
+ from @def* leading spaces.
+
2022-09-04 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/ParserNonXS.pm (_end_line): no empty content in
diff --git a/tp/Texinfo/Convert/TexinfoXML.pm b/tp/Texinfo/Convert/TexinfoXML.pm
index 6c73089925..46cebdb841 100644
--- a/tp/Texinfo/Convert/TexinfoXML.pm
+++ b/tp/Texinfo/Convert/TexinfoXML.pm
@@ -1547,8 +1547,19 @@ sub _convert($$;$)
}
if ($element->{'type'} eq 'def_line') {
if ($element->{'cmdname'}) {
+ my $leading_spaces_attribute_spec = [];
+ if ($element->{'extra'}
+ and $element->{'extra'}->{'spaces_before_argument'}
+ and $element->{'extra'}->{'spaces_before_argument'} ne '') {
+ my $leading_spaces = $element->{'extra'}->{'spaces_before_argument'};
+ # may happen without any argument, remove as a \n is added below
+ $leading_spaces =~ s/\n//;
+ $leading_spaces_attribute_spec = ['spaces', _protect_in_spaces(
+ $leading_spaces)]
+ if ($leading_spaces ne '');
+ }
$result .= $self->open_element($element->{'cmdname'},
- [_leading_spaces_before_argument($element)]);
+ $leading_spaces_attribute_spec);
}
$result .= $self->open_element('definitionterm');
$result .= $self->_index_entry($element);
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 074b9a2a88..f62126622d 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -2517,18 +2517,9 @@ sub _parse_def($$$)
my ($self, $command, $current) = @_;
my $contents = $current->{'contents'};
- my $empty_spaces_after_command;
my @new_contents;
my @contents = @$contents;
- if ($contents[0] and $contents[0]->{'type'}
- and ($contents[0]->{'type'} eq 'empty_spaces_after_command'
- or $contents[0]->{'type'} eq 'empty_line_after_command')) {
- # FIXME this only happens if there is no argument at all, otherwise the
- # types should already be put in extra by _abort_empty_line. Would
- # probably be better to call _abort_empty_line before.
- $empty_spaces_after_command = shift @contents;
- }
if ($def_aliases{$command}) {
my $real_command = $def_aliases{$command};
@@ -2650,8 +2641,6 @@ sub _parse_def($$$)
if (scalar(@contents) > 0) {
splice @new_contents, -scalar(@contents);
}
- unshift @new_contents, $empty_spaces_after_command
- if $empty_spaces_after_command;
@contents = map (_split_delimiters($self, $_), @contents );
@new_contents = (@new_contents, @contents);
@@ -2971,7 +2960,8 @@ sub _end_line($$$)
and $current->{'parent'}->{'type'} eq 'def_line') {
my ($error) = $self->_pop_context(['ct_def'], $source_info, $current);
die if ($error);
- #_abort_empty_line($self, $current);
+ # in case there are no arguments at all, it needs to be called here.
+ _abort_empty_line($self, $current);
my $def_command = $current->{'parent'}->{'extra'}->{'def_command'};
my $arguments = _parse_def($self, $def_command, $current);
if (scalar(@$arguments)) {
@@ -2985,7 +2975,7 @@ sub _end_line($$$)
$def_parsed_hash->{$arg->[0]} = $arg->[1];
}
$current->{'parent'}->{'extra'}->{'def_parsed_hash'} = $def_parsed_hash;
- # do an standard index entry tree
+ # do a standard index entry tree
my $index_entry;
if (defined($def_parsed_hash->{'name'})) {
$index_entry = $def_parsed_hash->{'name'}
diff --git a/tp/Texinfo/XS/parsetexi/def.c b/tp/Texinfo/XS/parsetexi/def.c
index b2bddb205f..e205f30bf2 100644
--- a/tp/Texinfo/XS/parsetexi/def.c
+++ b/tp/Texinfo/XS/parsetexi/def.c
@@ -274,11 +274,6 @@ parse_def (enum command_id command, ELEMENT *current)
ret = malloc (sizeof (DEF_INFO));
memset (ret, 0, sizeof (DEF_INFO));
- if (current->contents.number > 0
- && (current->contents.list[0]->type == ET_empty_spaces_after_command
- || current->contents.list[0]->type == ET_empty_line_after_command))
- contents_idx++;
-
split_def_args (current, contents_idx);
/* Check for "def alias" - for example @defun for @deffn. */
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c
b/tp/Texinfo/XS/parsetexi/end_line.c
index 1b4578482b..b9d17e1f7d 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -2170,6 +2170,9 @@ end_line (ELEMENT *current)
free (stripped);
}
+ /* in case there are no arguments at all, it needs to be called here. */
+ abort_empty_line (¤t, NULL);
+
def_info = parse_def (def_command, current);
/* Record the index entry if def_info is not empty. */
diff --git a/tp/t/results/def/all_empty_def.pl
b/tp/t/results/def/all_empty_def.pl
index 71cccccf3b..8a57d31a74 100644
--- a/tp/t/results/def/all_empty_def.pl
+++ b/tp/t/results/def/all_empty_def.pl
@@ -15,17 +15,7 @@ $result_trees{'all_empty_def'} = {
{
'args' => [
{
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
- ],
+ 'contents' => [],
'parent' => {},
'type' => 'block_line_arg'
}
@@ -74,7 +64,9 @@ $result_trees{'all_empty_def'} = {
}
],
'extra' => {
- 'end_command' => {}
+ 'end_command' => {},
+ 'spaces_before_argument' => '
+'
},
'parent' => {},
'source_info' => {
@@ -95,17 +87,7 @@ $result_trees{'all_empty_def'} = {
{
'args' => [
{
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
- ],
+ 'contents' => [],
'parent' => {},
'type' => 'block_line_arg'
}
@@ -154,7 +136,9 @@ $result_trees{'all_empty_def'} = {
}
],
'extra' => {
- 'end_command' => {}
+ 'end_command' => {},
+ 'spaces_before_argument' => '
+'
},
'parent' => {},
'source_info' => {
@@ -175,17 +159,7 @@ $result_trees{'all_empty_def'} = {
{
'args' => [
{
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
- ],
+ 'contents' => [],
'parent' => {},
'type' => 'block_line_arg'
}
@@ -234,7 +208,9 @@ $result_trees{'all_empty_def'} = {
}
],
'extra' => {
- 'end_command' => {}
+ 'end_command' => {},
+ 'spaces_before_argument' => '
+'
},
'parent' => {},
'source_info' => {
@@ -255,17 +231,7 @@ $result_trees{'all_empty_def'} = {
{
'args' => [
{
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
- ],
+ 'contents' => [],
'parent' => {},
'type' => 'block_line_arg'
}
@@ -314,7 +280,9 @@ $result_trees{'all_empty_def'} = {
}
],
'extra' => {
- 'end_command' => {}
+ 'end_command' => {},
+ 'spaces_before_argument' => '
+'
},
'parent' => {},
'source_info' => {
@@ -335,17 +303,7 @@ $result_trees{'all_empty_def'} = {
{
'args' => [
{
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
- ],
+ 'contents' => [],
'parent' => {},
'type' => 'block_line_arg'
}
@@ -394,7 +352,9 @@ $result_trees{'all_empty_def'} = {
}
],
'extra' => {
- 'end_command' => {}
+ 'end_command' => {},
+ 'spaces_before_argument' => '
+'
},
'parent' => {},
'source_info' => {
@@ -415,17 +375,7 @@ $result_trees{'all_empty_def'} = {
{
'args' => [
{
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
- ],
+ 'contents' => [],
'parent' => {},
'type' => 'block_line_arg'
}
@@ -474,7 +424,9 @@ $result_trees{'all_empty_def'} = {
}
],
'extra' => {
- 'end_command' => {}
+ 'end_command' => {},
+ 'spaces_before_argument' => '
+'
},
'parent' => {},
'source_info' => {
@@ -495,17 +447,7 @@ $result_trees{'all_empty_def'} = {
{
'args' => [
{
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
- ],
+ 'contents' => [],
'parent' => {},
'type' => 'block_line_arg'
}
@@ -554,7 +496,9 @@ $result_trees{'all_empty_def'} = {
}
],
'extra' => {
- 'end_command' => {}
+ 'end_command' => {},
+ 'spaces_before_argument' => '
+'
},
'parent' => {},
'source_info' => {
@@ -575,17 +519,7 @@ $result_trees{'all_empty_def'} = {
{
'args' => [
{
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
- ],
+ 'contents' => [],
'parent' => {},
'type' => 'block_line_arg'
}
@@ -634,7 +568,9 @@ $result_trees{'all_empty_def'} = {
}
],
'extra' => {
- 'end_command' => {}
+ 'end_command' => {},
+ 'spaces_before_argument' => '
+'
},
'parent' => {},
'source_info' => {
@@ -655,17 +591,7 @@ $result_trees{'all_empty_def'} = {
{
'args' => [
{
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
- ],
+ 'contents' => [],
'parent' => {},
'type' => 'block_line_arg'
}
@@ -714,7 +640,9 @@ $result_trees{'all_empty_def'} = {
}
],
'extra' => {
- 'end_command' => {}
+ 'end_command' => {},
+ 'spaces_before_argument' => '
+'
},
'parent' => {},
'source_info' => {
@@ -730,8 +658,6 @@ $result_trees{'all_empty_def'} = {
],
'type' => 'document_root'
};
-$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[0];
-$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[0];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
@@ -740,8 +666,6 @@
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'par
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'all_empty_def'}{'contents'}[0];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'all_empty_def'}{'contents'}[0];
-$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[2];
-$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[2];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
@@ -750,8 +674,6 @@
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'par
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'all_empty_def'}{'contents'}[0];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[3]{'parent'} =
$result_trees{'all_empty_def'}{'contents'}[0];
-$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[4];
-$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[4];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
@@ -760,8 +682,6 @@
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'par
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[4]{'parent'} =
$result_trees{'all_empty_def'}{'contents'}[0];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[5]{'parent'} =
$result_trees{'all_empty_def'}{'contents'}[0];
-$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[6];
-$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[6];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0];
@@ -770,8 +690,6 @@
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'par
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[6]{'parent'} =
$result_trees{'all_empty_def'}{'contents'}[0];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[7]{'parent'} =
$result_trees{'all_empty_def'}{'contents'}[0];
-$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[8];
-$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[8]{'contents'}[0];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'parent'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[8];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0];
@@ -780,8 +698,6 @@
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'par
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[8]{'extra'}{'end_command'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[8]{'parent'} =
$result_trees{'all_empty_def'}{'contents'}[0];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[9]{'parent'} =
$result_trees{'all_empty_def'}{'contents'}[0];
-$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[10];
-$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[10]{'contents'}[0];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'parent'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[10];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0];
@@ -790,8 +706,6 @@
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'pa
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[10]{'extra'}{'end_command'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[10]{'contents'}[1];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[10]{'parent'} =
$result_trees{'all_empty_def'}{'contents'}[0];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[11]{'parent'} =
$result_trees{'all_empty_def'}{'contents'}[0];
-$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[12];
-$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[12]{'contents'}[0];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'parent'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[12];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0];
@@ -800,8 +714,6 @@
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'pa
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[12]{'extra'}{'end_command'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[12]{'contents'}[1];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[12]{'parent'} =
$result_trees{'all_empty_def'}{'contents'}[0];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[13]{'parent'} =
$result_trees{'all_empty_def'}{'contents'}[0];
-$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[14];
-$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[14]{'contents'}[0];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'parent'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[14];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'args'}[0];
@@ -810,8 +722,6 @@
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'pa
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[14]{'extra'}{'end_command'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[14]{'contents'}[1];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[14]{'parent'} =
$result_trees{'all_empty_def'}{'contents'}[0];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[15]{'parent'} =
$result_trees{'all_empty_def'}{'contents'}[0];
-$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[16];
-$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[16]{'contents'}[0];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'parent'}
= $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[16];
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'args'}[0];
diff --git a/tp/t/results/def/empty_def_arguments.pl
b/tp/t/results/def/empty_def_arguments.pl
index dfd811ed93..a27ea77628 100644
--- a/tp/t/results/def/empty_def_arguments.pl
+++ b/tp/t/results/def/empty_def_arguments.pl
@@ -220,17 +220,7 @@ $result_trees{'empty_def_arguments'} = {
{
'args' => [
{
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
- ],
+ 'contents' => [],
'parent' => {},
'type' => 'line_arg'
}
@@ -238,7 +228,9 @@ $result_trees{'empty_def_arguments'} = {
'cmdname' => 'deffnx',
'extra' => {
'def_command' => 'deffn',
- 'original_def_cmdname' => 'deffnx'
+ 'original_def_cmdname' => 'deffnx',
+ 'spaces_before_argument' => '
+'
},
'parent' => {},
'source_info' => {
@@ -680,8 +672,6 @@
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[1
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
diff --git a/tp/t/results/def/no_category_or_no_name.pl
b/tp/t/results/def/no_category_or_no_name.pl
index d098caf21e..14df950c70 100644
--- a/tp/t/results/def/no_category_or_no_name.pl
+++ b/tp/t/results/def/no_category_or_no_name.pl
@@ -15,17 +15,7 @@ $result_trees{'no_category_or_no_name'} = {
{
'args' => [
{
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
- ],
+ 'contents' => [],
'parent' => {},
'type' => 'block_line_arg'
}
@@ -91,7 +81,9 @@ $result_trees{'no_category_or_no_name'} = {
}
],
'extra' => {
- 'end_command' => {}
+ 'end_command' => {},
+ 'spaces_before_argument' => '
+'
},
'parent' => {},
'source_info' => {
@@ -374,17 +366,7 @@ $result_trees{'no_category_or_no_name'} = {
{
'args' => [
{
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
- ],
+ 'contents' => [],
'parent' => {},
'type' => 'line_arg'
}
@@ -392,7 +374,9 @@ $result_trees{'no_category_or_no_name'} = {
'cmdname' => 'deffnx',
'extra' => {
'def_command' => 'deffn',
- 'original_def_cmdname' => 'deffnx'
+ 'original_def_cmdname' => 'deffnx',
+ 'spaces_before_argument' => '
+'
},
'parent' => {},
'source_info' => {
@@ -468,8 +452,6 @@ $result_trees{'no_category_or_no_name'} = {
],
'type' => 'document_root'
};
-$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[0];
-$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[0];
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -516,8 +498,6 @@
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
= $result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4];
-$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
-$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0];
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
= $result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4];
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'contents'}[0];
diff --git a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
index 15417765c4..9df19e4beb 100644
--- a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
@@ -2296,7 +2296,7 @@ in verbatim ''
<!-- c Paragraph ended before @deffngeneral was complete. -->
<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="52"><var>invalid</var></indexterm><defcategory>fsetinv</defcategory>
<deffunction><var>invalid</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
<deffnx spaces=" "><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory> </definitionterm></deffnx>
-<deffnx><definitionterm></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm></definitionterm></deffnx>
<deffnx spaces="
"><definitionterm><defcategory>aaa</defcategory></definitionterm></deffnx>
<deffnx><definitionterm><defcategory
bracketed="on"></defcategory></definitionterm></deffnx>
<deffnx><definitionterm><defcategory
bracketed="on">truc</defcategory></definitionterm></deffnx>
@@ -3435,7 +3435,7 @@ in verbatim ''
<!-- c Paragraph ended before @deffngeneral was complete. -->
<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="104"><var>invalid</var></indexterm><defcategory>fsetinv</defcategory>
<deffunction><var>invalid</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
<deffnx spaces=" "><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory> </definitionterm></deffnx>
-<deffnx><definitionterm></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm></definitionterm></deffnx>
<deffnx spaces="
"><definitionterm><defcategory>aaa</defcategory></definitionterm></deffnx>
<deffnx><definitionterm><defcategory
bracketed="on"></defcategory></definitionterm></deffnx>
<deffnx><definitionterm><defcategory
bracketed="on">truc</defcategory></definitionterm></deffnx>
@@ -4601,7 +4601,7 @@ in verbatim ''
<!-- c Paragraph ended before @deffngeneral was complete. -->
<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="156"><var>invalid</var></indexterm><defcategory>fsetinv</defcategory>
<deffunction><var>invalid</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
<deffnx spaces=" "><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory> </definitionterm></deffnx>
-<deffnx><definitionterm></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm></definitionterm></deffnx>
<deffnx spaces="
"><definitionterm><defcategory>aaa</defcategory></definitionterm></deffnx>
<deffnx><definitionterm><defcategory
bracketed="on"></defcategory></definitionterm></deffnx>
<deffnx><definitionterm><defcategory
bracketed="on">truc</defcategory></definitionterm></deffnx>
@@ -5735,7 +5735,7 @@ Various deff lines
<!-- c Paragraph ended before @deffngeneral was complete. -->
</pre><deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="208"><var>invalid</var></indexterm><defcategory>fsetinv</defcategory>
<deffunction><var>invalid</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
<deffnx spaces=" "><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory> </definitionterm></deffnx>
-<deffnx><definitionterm></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm></definitionterm></deffnx>
<deffnx spaces="
"><definitionterm><defcategory>aaa</defcategory></definitionterm></deffnx>
<deffnx><definitionterm><defcategory
bracketed="on"></defcategory></definitionterm></deffnx>
<deffnx><definitionterm><defcategory
bracketed="on">truc</defcategory></definitionterm></deffnx>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: Abort empty line for empty @def* command line,
Patrice Dumas <=