texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: * tp/Texinfo/XS/parsetexi/parser.c(process_remain


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/XS/parsetexi/parser.c(process_remaining_on_line): fix use of a pointer instead of value.
Date: Sat, 27 Aug 2022 11:10: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 23aad0a7f7 * 
tp/Texinfo/XS/parsetexi/parser.c(process_remaining_on_line): fix use of a 
pointer instead of value.
23aad0a7f7 is described below

commit 23aad0a7f717d0de7f611510218876972545b872
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Aug 27 17:09:59 2022 +0200

    * tp/Texinfo/XS/parsetexi/parser.c(process_remaining_on_line):
    fix use of a pointer instead of value.
---
 ChangeLog                                          |   5 +
 tp/Texinfo/XS/parsetexi/parser.c                   |   2 +-
 tp/t/02coverage.t                                  |  28 ++
 .../results/coverage/lettered_accent_and_spaces.pl | 508 ++++++++++++++++++++-
 .../coverage/spaces_after_braced_command.pl        | 153 ++++++-
 5 files changed, 684 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1b178eb332..b531dba913 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-08-27  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       * tp/Texinfo/XS/parsetexi/parser.c(process_remaining_on_line):
+       fix use of a pointer instead of value.
+
 2022-08-27  Patrice Dumas  <pertusus@free.fr>
 
        Only ignore one end of line after a brace command before a brace
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index 25701e0b98..c6839bf72f 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -1479,7 +1479,7 @@ superfluous_arg:
                  {
                    p = line + whitespaces_len;
                    xasprintf (&s, "%s%.*s",
-                             *previous_value,
+                              previous_value,
                              (int) (p - line), line);
                    free (k->value);
                    k->value = (ELEMENT *) s;
diff --git a/tp/t/02coverage.t b/tp/t/02coverage.t
index 87695c3e9d..ab8517ff06 100644
--- a/tp/t/02coverage.t
+++ b/tp/t/02coverage.t
@@ -19,6 +19,27 @@ my @test_cases = (
 '],
 ['lettered_accent_and_spaces',
 '@ringaccent    a
+
+@ringaccent
+{a}
+
+@ringaccent
+a
+
+@ringaccent
+  a
+
+@^ a
+
+@^
+a
+
+@^
+ a
+
+@^ {a
+}
+
 '],
 ['accent_and_dash',
 '@^{a--}'],
@@ -666,6 +687,13 @@ cut by blank line}
 @samp
 {v}
 
+@AA
+ {}
+
+@email
+{a, b 
+ }
+
 @TeX
 
 {}
diff --git a/tp/t/results/coverage/lettered_accent_and_spaces.pl 
b/tp/t/results/coverage/lettered_accent_and_spaces.pl
index 3d2503cf16..33337ebaed 100644
--- a/tp/t/results/coverage/lettered_accent_and_spaces.pl
+++ b/tp/t/results/coverage/lettered_accent_and_spaces.pl
@@ -44,6 +44,312 @@ $result_trees{'lettered_accent_and_spaces'} = {
           ],
           'parent' => {},
           'type' => 'paragraph'
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'a'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'brace_command_arg'
+                }
+              ],
+              'cmdname' => 'ringaccent',
+              'contents' => [],
+              'extra' => {
+                'spaces' => '
+'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 3,
+                'macro' => ''
+              }
+            },
+            {
+              'parent' => {},
+              'text' => '
+'
+            }
+          ],
+          'parent' => {},
+          'type' => 'paragraph'
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'a'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'following_arg'
+                }
+              ],
+              'cmdname' => 'ringaccent',
+              'contents' => [],
+              'extra' => {
+                'spaces' => '
+'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 6,
+                'macro' => ''
+              }
+            },
+            {
+              'parent' => {},
+              'text' => '
+'
+            }
+          ],
+          'parent' => {},
+          'type' => 'paragraph'
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'a'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'following_arg'
+                }
+              ],
+              'cmdname' => 'ringaccent',
+              'contents' => [],
+              'extra' => {
+                'spaces' => '
+  '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 9,
+                'macro' => ''
+              }
+            },
+            {
+              'parent' => {},
+              'text' => '
+'
+            }
+          ],
+          'parent' => {},
+          'type' => 'paragraph'
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'a'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'following_arg'
+                }
+              ],
+              'cmdname' => '^',
+              'contents' => [],
+              'extra' => {
+                'spaces' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 12,
+                'macro' => ''
+              }
+            },
+            {
+              'parent' => {},
+              'text' => '
+'
+            }
+          ],
+          'parent' => {},
+          'type' => 'paragraph'
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'a'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'following_arg'
+                }
+              ],
+              'cmdname' => '^',
+              'contents' => [],
+              'extra' => {
+                'spaces' => '
+'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 14,
+                'macro' => ''
+              }
+            },
+            {
+              'parent' => {},
+              'text' => '
+'
+            }
+          ],
+          'parent' => {},
+          'type' => 'paragraph'
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'a'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'following_arg'
+                }
+              ],
+              'cmdname' => '^',
+              'contents' => [],
+              'extra' => {
+                'spaces' => '
+ '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 17,
+                'macro' => ''
+              }
+            },
+            {
+              'parent' => {},
+              'text' => '
+'
+            }
+          ],
+          'parent' => {},
+          'type' => 'paragraph'
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'a
+'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'brace_command_arg'
+                }
+              ],
+              'cmdname' => '^',
+              'contents' => [],
+              'extra' => {
+                'spaces' => ' '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 20,
+                'macro' => ''
+              }
+            },
+            {
+              'parent' => {},
+              'text' => '
+'
+            }
+          ],
+          'parent' => {},
+          'type' => 'paragraph'
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
         }
       ],
       'parent' => {},
@@ -57,16 +363,142 @@ 
$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[0]{'conte
 
$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[2];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[2];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[4];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[4];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[6];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[6];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[7]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[8]{'contents'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[8];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[8];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[8]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[9]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[10]{'contents'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[10];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[10];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[10]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[11]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[12]{'contents'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[12];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[12];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[12]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[13]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[14]{'contents'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[14];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[14];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[14]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0];
+$result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'contents'}[15]{'parent'}
 = $result_trees{'lettered_accent_and_spaces'}{'contents'}[0];
 $result_trees{'lettered_accent_and_spaces'}{'contents'}[0]{'parent'} = 
$result_trees{'lettered_accent_and_spaces'};
 
 $result_texis{'lettered_accent_and_spaces'} = '@ringaccent    a
+
+@ringaccent
+{a}
+
+@ringaccent
+a
+
+@ringaccent
+  a
+
+@^ a
+
+@^
+a
+
+@^
+ a
+
+@^ {a
+}
+
 ';
 
 
 $result_texts{'lettered_accent_and_spaces'} = 'a*
+
+a*
+
+a*
+
+a*
+
+a^
+
+a^
+
+a^
+
+a
+^
+
 ';
 
-$result_errors{'lettered_accent_and_spaces'} = [];
+$result_errors{'lettered_accent_and_spaces'} = [
+  {
+    'error_line' => 'warning: command `@ringaccent\' must not be followed by 
new line
+',
+    'file_name' => '',
+    'line_nr' => 3,
+    'macro' => '',
+    'text' => 'command `@ringaccent\' must not be followed by new line',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => 'warning: command `@ringaccent\' must not be followed by 
new line
+',
+    'file_name' => '',
+    'line_nr' => 6,
+    'macro' => '',
+    'text' => 'command `@ringaccent\' must not be followed by new line',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => 'warning: command `@ringaccent\' must not be followed by 
new line
+',
+    'file_name' => '',
+    'line_nr' => 9,
+    'macro' => '',
+    'text' => 'command `@ringaccent\' must not be followed by new line',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => 'warning: command `@^\' must not be followed by new line
+',
+    'file_name' => '',
+    'line_nr' => 14,
+    'macro' => '',
+    'text' => 'command `@^\' must not be followed by new line',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => 'warning: command `@^\' must not be followed by new line
+',
+    'file_name' => '',
+    'line_nr' => 17,
+    'macro' => '',
+    'text' => 'command `@^\' must not be followed by new line',
+    'type' => 'warning'
+  }
+];
 
 
 $result_floats{'lettered_accent_and_spaces'} = {};
@@ -74,18 +506,86 @@ $result_floats{'lettered_accent_and_spaces'} = {};
 
 
 $result_converted{'plaintext'}->{'lettered_accent_and_spaces'} = 'å
+
+   å
+
+   å
+
+   å
+
+   â
+
+   â
+
+   â
+
+   a ̂
+
 ';
 
 
 $result_converted{'html_text'}->{'lettered_accent_and_spaces'} = '<p>&aring;
-</p>';
+</p>
+<p>&aring;
+</p>
+<p>&aring;
+</p>
+<p>&aring;
+</p>
+<p>&acirc;
+</p>
+<p>&acirc;
+</p>
+<p>&acirc;
+</p>
+<p>&a
+circ;
+</p>
+';
 
 
 $result_converted{'xml'}->{'lettered_accent_and_spaces'} = '<para><accent 
type="ring" spaces="    " bracketed="off">a</accent>
-</para>';
+</para>
+<para><accent type="ring" spaces="
+">a</accent>
+</para>
+<para><accent type="ring" spaces="
+" bracketed="off">a</accent>
+</para>
+<para><accent type="ring" spaces="
+  " bracketed="off">a</accent>
+</para>
+<para><accent type="circ" spaces=" " bracketed="off">a</accent>
+</para>
+<para><accent type="circ" spaces="
+" bracketed="off">a</accent>
+</para>
+<para><accent type="circ" spaces="
+ " bracketed="off">a</accent>
+</para>
+<para><accent type="circ" spaces=" ">a
+</accent>
+</para>
+';
 
 
 $result_converted{'docbook'}->{'lettered_accent_and_spaces'} = '<para>&#229;
-</para>';
+</para>
+<para>&#229;
+</para>
+<para>&#229;
+</para>
+<para>&#229;
+</para>
+<para>&#226;
+</para>
+<para>&#226;
+</para>
+<para>&#226;
+</para>
+<para>a
+&#770;
+</para>
+';
 
 1;
diff --git a/tp/t/results/coverage/spaces_after_braced_command.pl 
b/tp/t/results/coverage/spaces_after_braced_command.pl
index a2928748cb..5d72100d2e 100644
--- a/tp/t/results/coverage/spaces_after_braced_command.pl
+++ b/tp/t/results/coverage/spaces_after_braced_command.pl
@@ -91,6 +91,102 @@ $result_trees{'spaces_after_braced_command'} = {
         {
           'parent' => {},
           'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'contents' => [],
+                  'parent' => {},
+                  'type' => 'brace_command_arg'
+                }
+              ],
+              'cmdname' => 'AA',
+              'contents' => [],
+              'extra' => {
+                'spaces' => '
+ '
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 6,
+                'macro' => ''
+              }
+            },
+            {
+              'parent' => {},
+              'text' => '
+'
+            }
+          ],
+          'parent' => {},
+          'type' => 'paragraph'
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'a'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'brace_command_arg'
+                },
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'b 
+'
+                    }
+                  ],
+                  'extra' => {
+                    'spaces_after_argument' => ' ',
+                    'spaces_before_argument' => ' '
+                  },
+                  'parent' => {},
+                  'type' => 'brace_command_arg'
+                }
+              ],
+              'cmdname' => 'email',
+              'contents' => [],
+              'extra' => {
+                'spaces' => '
+'
+              },
+              'parent' => {},
+              'source_info' => {
+                'file_name' => '',
+                'line_nr' => 9,
+                'macro' => ''
+              }
+            },
+            {
+              'parent' => {},
+              'text' => '
+'
+            }
+          ],
+          'parent' => {},
+          'type' => 'paragraph'
+        },
+        {
+          'parent' => {},
+          'text' => '
 ',
           'type' => 'empty_line'
         },
@@ -106,7 +202,7 @@ $result_trees{'spaces_after_braced_command'} = {
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
-                'line_nr' => 6,
+                'line_nr' => 13,
                 'macro' => ''
               }
             },
@@ -143,10 +239,23 @@ 
$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[2]{'cont
 
$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'spaces_after_braced_command'}{'contents'}[0];
 
$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'spaces_after_braced_command'}{'contents'}[0];
+$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
 
$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[4];
-$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'spaces_after_braced_command'}{'contents'}[0];
+$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'spaces_after_braced_command'}{'contents'}[0];
+$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0];
+$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
+$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[1];
+$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[1]{'parent'}
 = 
$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
+$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[6];
+$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[6];
+$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'spaces_after_braced_command'}{'contents'}[0];
+$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[7]{'parent'}
 = $result_trees{'spaces_after_braced_command'}{'contents'}[0];
+$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'parent'}
 = $result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[8];
+$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'parent'}
 = $result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[8];
+$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'parent'}
 = $result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[8];
+$result_trees{'spaces_after_braced_command'}{'contents'}[0]{'contents'}[8]{'parent'}
 = $result_trees{'spaces_after_braced_command'}{'contents'}[0];
 $result_trees{'spaces_after_braced_command'}{'contents'}[0]{'parent'} = 
$result_trees{'spaces_after_braced_command'};
 
 $result_texis{'spaces_after_braced_command'} = '@code {b}
@@ -154,6 +263,13 @@ $result_texis{'spaces_after_braced_command'} = '@code {b}
 @samp
 {v}
 
+@AA
+ {}
+
+@email
+{a, b 
+ }
+
 @TeX
 
 
@@ -164,6 +280,11 @@ $result_texts{'spaces_after_braced_command'} = 'b
 
 v
 
+AA
+
+b 
+
+
 TeX
 
 ';
@@ -179,11 +300,29 @@ $result_errors{'spaces_after_braced_command'} = [
     'type' => 'warning'
   },
   {
-    'error_line' => 'warning: command `@TeX\' must not be followed by new line
+    'error_line' => 'warning: command `@AA\' must not be followed by new line
 ',
     'file_name' => '',
     'line_nr' => 6,
     'macro' => '',
+    'text' => 'command `@AA\' must not be followed by new line',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => 'warning: command `@email\' must not be followed by new 
line
+',
+    'file_name' => '',
+    'line_nr' => 9,
+    'macro' => '',
+    'text' => 'command `@email\' must not be followed by new line',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => 'warning: command `@TeX\' must not be followed by new line
+',
+    'file_name' => '',
+    'line_nr' => 13,
+    'macro' => '',
     'text' => 'command `@TeX\' must not be followed by new line',
     'type' => 'warning'
   },
@@ -191,7 +330,7 @@ $result_errors{'spaces_after_braced_command'} = [
     'error_line' => 'warning: command `@TeX\' must not be followed by new line
 ',
     'file_name' => '',
-    'line_nr' => 7,
+    'line_nr' => 14,
     'macro' => '',
     'text' => 'command `@TeX\' must not be followed by new line',
     'type' => 'warning'
@@ -200,7 +339,7 @@ $result_errors{'spaces_after_braced_command'} = [
     'error_line' => '@TeX expected braces
 ',
     'file_name' => '',
-    'line_nr' => 7,
+    'line_nr' => 14,
     'macro' => '',
     'text' => '@TeX expected braces',
     'type' => 'error'
@@ -209,7 +348,7 @@ $result_errors{'spaces_after_braced_command'} = [
     'error_line' => 'misplaced {
 ',
     'file_name' => '',
-    'line_nr' => 8,
+    'line_nr' => 15,
     'macro' => '',
     'text' => 'misplaced {',
     'type' => 'error'
@@ -218,7 +357,7 @@ $result_errors{'spaces_after_braced_command'} = [
     'error_line' => 'misplaced }
 ',
     'file_name' => '',
-    'line_nr' => 8,
+    'line_nr' => 15,
     'macro' => '',
     'text' => 'misplaced }',
     'type' => 'error'



reply via email to

[Prev in Thread] Current Thread [Next in Thread]