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/def.c (parse_def): Trea


From: Gavin D. Smith
Subject: branch master updated: * tp/Texinfo/XS/parsetexi/def.c (parse_def): Treat @deftypeline like @deftypefn in alternating between typearg and arg in arguments.
Date: Mon, 03 Apr 2023 18:25:03 -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 4cfd343eea * tp/Texinfo/XS/parsetexi/def.c (parse_def): Treat 
@deftypeline like @deftypefn in alternating between typearg and arg in 
arguments.
4cfd343eea is described below

commit 4cfd343eeaa3bb5e0deb5730f7a46f5da8576ed0
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Mon Apr 3 23:24:53 2023 +0100

    * tp/Texinfo/XS/parsetexi/def.c (parse_def): Treat @deftypeline
    like @deftypefn in alternating between typearg and arg in arguments.
---
 ChangeLog                       | 5 +++++
 tp/Texinfo/XS/parsetexi/def.c   | 4 ++--
 tp/t/results/def/deftypeline.pl | 6 +++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8186eedb50..052c0251ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-04-03  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * tp/Texinfo/XS/parsetexi/def.c (parse_def): Treat @deftypeline
+       like @deftypefn in alternating between typearg and arg in arguments.
+
 2023-04-03  Gavin Smith <gavinsmith0123@gmail.com>
 
        * tp/t/19def.t (deftypeline): New test.
diff --git a/tp/Texinfo/XS/parsetexi/def.c b/tp/Texinfo/XS/parsetexi/def.c
index 69c1250f02..854427184b 100644
--- a/tp/Texinfo/XS/parsetexi/def.c
+++ b/tp/Texinfo/XS/parsetexi/def.c
@@ -499,8 +499,8 @@ parse_def (enum command_id command, ELEMENT *current)
      the DocBook output. */
   /* In that case set_type_not_arg is both used to set to argtype and
      to switch sign to switch between arg and argtype */
-  if (command == CM_deftypefn || command == CM_deftypeop
-          || command == CM_deftp)
+  if (command == CM_deftypeline || command == CM_deftypefn
+      || command == CM_deftypeop || command == CM_deftp)
     set_type_not_arg = -1;
   else
     set_type_not_arg = 1;
diff --git a/tp/t/results/def/deftypeline.pl b/tp/t/results/def/deftypeline.pl
index dc322ea038..1cef975212 100644
--- a/tp/t/results/def/deftypeline.pl
+++ b/tp/t/results/def/deftypeline.pl
@@ -85,7 +85,7 @@ $result_trees{'deftypeline'} = {
                     },
                     {
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'typearg'
                       },
                       'text' => 'int'
                     },
@@ -133,7 +133,7 @@ $result_trees{'deftypeline'} = {
                     },
                     {
                       'extra' => {
-                        'def_role' => 'arg'
+                        'def_role' => 'typearg'
                       },
                       'text' => 'int'
                     },
@@ -403,7 +403,7 @@ $result_converted{'latex'}->{'deftypeline'} = 
'\\documentclass{book}
 ';
 
 
-$result_converted{'docbook'}->{'deftypeline'} = '<synopsis><phrase 
role="category"><emphasis role="bold">Function</emphasis>:</phrase> 
<returnvalue>long int</returnvalue> <varname>foo</varname> (<emphasis 
role="arg">int</emphasis> <emphasis 
role="arg"><replaceable>bar</replaceable></emphasis>, <emphasis 
role="arg">int</emphasis> <emphasis 
role="arg"><replaceable>baz</replaceable></emphasis>)</synopsis>
+$result_converted{'docbook'}->{'deftypeline'} = '<synopsis><phrase 
role="category"><emphasis role="bold">Function</emphasis>:</phrase> 
<returnvalue>long int</returnvalue> <varname>foo</varname> (<type>int</type> 
<emphasis role="arg"><replaceable>bar</replaceable></emphasis>, 
<type>int</type> <emphasis 
role="arg"><replaceable>baz</replaceable></emphasis>)</synopsis>
 <blockquote><para>&#8230;
 </para></blockquote>';
 



reply via email to

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