branch master updated: * doc/texinfo.texi (@link), NEWS: Document @link. * doc/texinfo.texi (Info Format FAQ): Mention possibility of @link.

[Gavin D. Smith]

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 2288f0d230 * doc/texinfo.texi (@link), NEWS: Document @link. * 
doc/texinfo.texi (Info Format FAQ): Mention possibility of @link.
2288f0d230 is described below

commit 2288f0d23075c49bbc938f30adcf79a2a0a70d96
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Mon Jul 10 21:56:45 2023 +0100

    * doc/texinfo.texi (@link), NEWS: Document @link.
    * doc/texinfo.texi (Info Format FAQ): Mention possibility of @link.
---
 tp/Texinfo/Convert/TexinfoMarkup.pm   |  4 +++-
 tp/t/results/converters_tests/link.pl | 12 ++++++------
 util/texinfo.dtd                      | 13 +++++++++++++
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm 
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index 4165ba8b57..54203ff8f2 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -184,6 +184,7 @@ our %commands_args_elements = (
   'email' => ['emailaddress', 'emailname'],
   'uref' => ['urefurl', 'urefdesc', 'urefreplacement'],
   'url' => ['urefurl', 'urefdesc', 'urefreplacement'],
+  'link' => ['linknodename', 'linkrefname', 'linkinfofile'],
   'inforef' => ['inforefnodename', 'inforefrefname', 'inforefinfoname'],
   'image' => ['imagefile', 'imagewidth', 'imageheight',
               'alttext', 'imageextension'],
@@ -1196,7 +1197,8 @@ sub _convert($$;$)
           }
           my $manual;
           my $manual_arg_index = 3;
-          if ($element->{'cmdname'} eq 'inforef') {
+          if ($element->{'cmdname'} eq 'link'
+                or $element->{'cmdname'} eq 'inforef') {
             $manual_arg_index = 2;
           }
           if (defined($element->{'args'}->[$manual_arg_index])
diff --git a/tp/t/results/converters_tests/link.pl 
b/tp/t/results/converters_tests/link.pl
index 113dabf147..a5ba64a4e5 100644
--- a/tp/t/results/converters_tests/link.pl
+++ b/tp/t/results/converters_tests/link.pl
@@ -716,22 +716,22 @@ $result_converted{'xml'}->{'link'} = '<node name="One" 
spaces=" "><nodename>One<
 <para>xrefautomaticsectiontitle off
 <xrefautomaticsectiontitle spaces=" " value="off" 
line="off"></xrefautomaticsectiontitle>
 </para>
-<para><link>One</link>
+<para><link label="One"><linknodename>One</linknodename></link>
 </para>
-<para><link>One</link>
+<para><link label="One"><linknodename>One</linknodename><linkrefname spaces=" 
">label</linkrefname></link>
 </para>
 <para>xrefautomaticsectiontitle on
 <xrefautomaticsectiontitle spaces=" " value="on" 
line="on"></xrefautomaticsectiontitle>
 </para>
-<para><link>One</link>
+<para><link label="One"><linknodename>One</linknodename></link>
 </para>
-<para><link>One</link>
+<para><link label="One"><linknodename>One</linknodename><linkrefname spaces=" 
">label</linkrefname></link>
 </para>
 <para>external link
 </para>
-<para><link>Introduction</link>
+<para><link label="Introduction" 
manual="bash"><linknodename>Introduction</linknodename><linkinfofile>bash</linkinfofile></link>
 </para>
-<para><link>Introduction</link>
+<para><link label="Introduction" 
manual="bash"><linknodename>Introduction</linknodename><linkrefname>Bash</linkrefname><linkinfofile>bash</linkinfofile></link>
 </para>';
 
 
diff --git a/util/texinfo.dtd b/util/texinfo.dtd
index 7b4c114c8d..53b2aa756a 100644
--- a/util/texinfo.dtd
+++ b/util/texinfo.dtd
@@ -1298,6 +1298,19 @@
 <!ATTLIST xrefprinteddesc
           %spacesattr;>
 
+<!ELEMENT link (linknodename?, linkrefname?, linkinfofile?)>
+<!ATTLIST inforef
+          %xref.attr;>
+<!ELEMENT linknodename (#PCDATA | %Inline.phrase;)*>
+<!ATTLIST linknodename
+          %spacesattr;>
+<!ELEMENT linkrefname  (#PCDATA | %Inline.phrase;)*>
+<!ATTLIST linkrefname
+          %spacesattr;>
+<!ELEMENT linkinfofile (#PCDATA | %Inline.phrase;)*>
+<!ATTLIST linkinfofile
+          %spacesattr;>
+
 <!ELEMENT inforef (inforefnodename?, inforefrefname?, inforefinfoname?)>
 <!ATTLIST inforef
           %xref.attr;>