branch master updated: * tp/Texinfo/Convert/TexinfoMarkup.pm (

texinfo-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert):

From:	Patrice Dumas
Subject:	branch master updated: * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): keep the last empty argument of a brace command to be able to reconstitute trailing empty arguments in the original Texinfo code.
Date:	Sat, 01 Oct 2022 11:53:49 -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 daec30377a * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): keep the 
last empty argument of a brace command to be able to reconstitute trailing 
empty arguments in the original Texinfo code.
daec30377a is described below

commit daec30377a2461734df4d8a47018961e67c0892a
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Oct 1 17:53:39 2022 +0200

    * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): keep the last empty
    argument of a brace command to be able to reconstitute trailing empty
    arguments in the original Texinfo code.
---
 ChangeLog                                          |  6 +++
 tp/Texinfo/Convert/TexinfoMarkup.pm                | 15 +++++++
 .../converters_tests/ref_error_formatting.pl       |  6 +--
 tp/t/results/converters_tests/refs_formatting.pl   |  4 +-
 tp/t/results/converters_tests/top_in_ref.pl        |  4 +-
 .../res_parser/formatting_xml/formatting.xml       | 48 +++++++++++-----------
 util/txixml2texi.pl                                |  2 -
 7 files changed, 52 insertions(+), 33 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ceef8b743c..5f9b57bd42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-10-01  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): keep the last empty
+       argument of a brace command to be able to reconstitute trailing empty
+       arguments in the original Texinfo code.
+
 2022-10-01  Patrice Dumas  <pertusus@free.fr>
 
        * util/texinfo.dtd: update for change in spaces attributes.
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm 
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index bedc4ce2ba..9018aa84e6 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -1031,6 +1031,7 @@ sub _convert($$;$)
       if ($Texinfo::Common::context_brace_commands{$element->{'cmdname'}}) {
         push @{$self->{'document_context'}}, {'monospace' => [0]};
       }
+      my $last_empty_element;
       my $args_or_one_arg_cmd = '';
       my $arg_index = 0;
       foreach my $format_element (@format_elements) {
@@ -1064,6 +1065,17 @@ sub _convert($$;$)
             $args_or_one_arg_cmd .=
                  $self->txi_markup_open_element($format_element, 
$attribute).$arg
                       .$self->txi_markup_close_element($format_element);
+            $last_empty_element = undef;
+          # we keep the last empty argument to be able to prepend it to be able
+          # to reconstitute trailing empty arguments in the original Texinfo 
code.
+          # For example, for @bracecmd{a,b,,c,,} we keep the last (6th 
argument)
+          # empty element.
+          # Not if in inline conditionals as we are not interested in empty 
ignored
+          # inline conditional arguments.
+          } elsif (defined($main_cmdname)
+                   and not $brace_commands{$element->{'cmdname'}} eq 'inline') 
{
+            $last_empty_element = 
$self->txi_markup_open_element($format_element)
+                                  
.$self->txi_markup_close_element($format_element);
           }
           $attribute = [];
         } else {
@@ -1071,6 +1083,9 @@ sub _convert($$;$)
         }
         $arg_index++;
       }
+      if ($last_empty_element) {
+        $args_or_one_arg_cmd .= $last_empty_element;
+      }
       if ($Texinfo::Common::context_brace_commands{$element->{'cmdname'}}) {
         pop @{$self->{'document_context'}};
       }
diff --git a/tp/t/results/converters_tests/ref_error_formatting.pl 
b/tp/t/results/converters_tests/ref_error_formatting.pl
index 0a7649423a..de930cef11 100644
--- a/tp/t/results/converters_tests/ref_error_formatting.pl
+++ b/tp/t/results/converters_tests/ref_error_formatting.pl
@@ -4392,7 +4392,7 @@ $result_converted{'xml'}->{'ref_error_formatting'} = '
 <code>&arobase;ref&lbrace;node,,title&rbrace;</code> <ref 
label="node"><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
 <code>&arobase;ref&lbrace;node,,,file name&rbrace;</code> <ref label="node" 
manual="file name"><xrefnodename>node</xrefnodename><xrefinfofile>file 
name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;node,,,,manual&rbrace;</code> <ref 
label="node"><xrefnodename>node</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref&lbrace;node,cross ref name,title,&rbrace;</code> <ref 
label="node"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;node,cross ref name,title,&rbrace;</code> <ref 
label="node"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile></xrefinfofile></ref>
 <code>&arobase;ref&lbrace;node,cross ref name,,file name&rbrace;</code> <ref 
label="node" manual="file 
name"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;node,cross ref name,,,manual&rbrace;</code> <ref 
label="node"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;node,cross ref name,title,file name&rbrace;</code> 
<ref label="node" manual="file 
name"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile></ref>
@@ -4402,7 +4402,7 @@ $result_converted{'xml'}->{'ref_error_formatting'} = '
 <code>&arobase;ref&lbrace;node,,title,,manual&rbrace;</code> <ref 
label="node"><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;node,,title, file name, manual&rbrace;</code> <ref 
label="node" manual="file 
name"><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
 spaces=" ">file name</xrefinfofile><xrefprintedname spaces=" 
">manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;node,,,file name,manual&rbrace;</code> <ref 
label="node" manual="file 
name"><xrefnodename>node</xrefnodename><xrefinfofile>file 
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref&lbrace;,cross ref name,title,&rbrace;</code> 
<ref><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;,cross ref name,title,&rbrace;</code> 
<ref><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile></xrefinfofile></ref>
 <code>&arobase;ref&lbrace;,cross ref name,,file name&rbrace;</code> <ref 
manual="file name"><xrefinfoname>cross ref 
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;,cross ref name,,,manual&rbrace;</code> 
<ref><xrefinfoname>cross ref 
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;,cross ref name,title,file name&rbrace;</code> <ref 
manual="file name"><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile></ref>
@@ -4416,7 +4416,7 @@ $result_converted{'xml'}->{'ref_error_formatting'} = '
 <para><code>&arobase;inforef&lbrace;,cross ref name &rbrace;</code> 
<inforef><inforefrefname>cross ref name </inforefrefname></inforef>
 <code>&arobase;inforef&lbrace;,,file name&rbrace;</code> <inforef manual="file 
name"><inforefinfoname>file name</inforefinfoname></inforef>
 <code>&arobase;inforef&lbrace;,cross ref name, file name&rbrace;</code> 
<inforef manual="file name"><inforefrefname>cross ref 
name</inforefrefname><inforefinfoname spaces=" ">file 
name</inforefinfoname></inforef>
-<code>&arobase;inforef&lbrace;&rbrace;</code> <inforef></inforef>
+<code>&arobase;inforef&lbrace;&rbrace;</code> 
<inforef><inforefnodename></inforefnodename></inforef>
 </para>
 <para><code>&arobase;inforef&lbrace;node, cross ref name, file 
name&rbrace;</code> <inforef label="node" manual="file 
name"><inforefnodename>node</inforefnodename><inforefrefname spaces=" ">cross 
ref name</inforefrefname><inforefinfoname spaces=" ">file 
name</inforefinfoname></inforef>
 <code>&arobase;inforef&lbrace;node&rbrace;</code> <inforef 
label="node"><inforefnodename>node</inforefnodename></inforef>
diff --git a/tp/t/results/converters_tests/refs_formatting.pl 
b/tp/t/results/converters_tests/refs_formatting.pl
index ad98f0c715..7c72040156 100644
--- a/tp/t/results/converters_tests/refs_formatting.pl
+++ b/tp/t/results/converters_tests/refs_formatting.pl
@@ -4408,7 +4408,7 @@ $result_converted{'xml'}->{'refs_formatting'} = '<node 
name="chapter" spaces=" "
 <code>&arobase;ref&lbrace;chapter,,title&rbrace;</code> <ref 
label="chapter"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
 <code>&arobase;ref&lbrace;chapter,,,file name&rbrace;</code> <ref 
label="chapter" manual="file 
name"><xrefnodename>chapter</xrefnodename><xrefinfofile>file 
name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;chapter,,,,manual&rbrace;</code> <ref 
label="chapter"><xrefnodename>chapter</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref&lbrace;chapter,cross ref name,title,&rbrace;</code> <ref 
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;chapter,cross ref name,title,&rbrace;</code> <ref 
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile></xrefinfofile></ref>
 <code>&arobase;ref&lbrace;chapter,cross ref name,,file name&rbrace;</code> 
<ref label="chapter" manual="file 
name"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;chapter,cross ref name,,,manual&rbrace;</code> <ref 
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;chapter,cross ref name,title,file 
name&rbrace;</code> <ref label="chapter" manual="file 
name"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile></ref>
@@ -4423,7 +4423,7 @@ $result_converted{'xml'}->{'refs_formatting'} = '<node 
name="chapter" spaces=" "
 <code>&arobase;ref&lbrace;(pman)anode,,title&rbrace;</code> <ref label="anode" 
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
 <code>&arobase;ref&lbrace;(pman)anode,,,file name&rbrace;</code> <ref 
label="anode" manual="file 
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file 
name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;(pman)anode,,,,manual&rbrace;</code> <ref 
label="anode" 
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref&lbrace;(pman)anode,cross ref name,title,&rbrace;</code> 
<ref label="anode" 
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;(pman)anode,cross ref name,title,&rbrace;</code> 
<ref label="anode" 
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile></xrefinfofile></ref>
 <code>&arobase;ref&lbrace;(pman)anode,cross ref name,,file name&rbrace;</code> 
<ref label="anode" manual="file 
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;(pman)anode,cross ref name,,,manual&rbrace;</code> 
<ref label="anode" 
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;(pman)anode,cross ref name,title,file 
name&rbrace;</code> <ref label="anode" manual="file 
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile></ref>
diff --git a/tp/t/results/converters_tests/top_in_ref.pl 
b/tp/t/results/converters_tests/top_in_ref.pl
index 26496e1033..efb8a26512 100644
--- a/tp/t/results/converters_tests/top_in_ref.pl
+++ b/tp/t/results/converters_tests/top_in_ref.pl
@@ -4416,7 +4416,7 @@ $result_converted{'xml'}->{'top_in_ref'} = '<node 
name="Top" spaces=" "><nodenam
 <code>&arobase;ref&lbrace;Top,,title&rbrace;</code> <ref 
label="Top"><xrefnodename>Top</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
 <code>&arobase;ref&lbrace;Top,,,file name&rbrace;</code> <ref label="Top" 
manual="file name"><xrefnodename>Top</xrefnodename><xrefinfofile>file 
name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;Top,,,,manual&rbrace;</code> <ref 
label="Top"><xrefnodename>Top</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref&lbrace;Top,cross ref name,title,&rbrace;</code> <ref 
label="Top"><xrefnodename>Top</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;Top,cross ref name,title,&rbrace;</code> <ref 
label="Top"><xrefnodename>Top</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile></xrefinfofile></ref>
 <code>&arobase;ref&lbrace;Top,cross ref name,,file name&rbrace;</code> <ref 
label="Top" manual="file 
name"><xrefnodename>Top</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;Top,cross ref name,,,manual&rbrace;</code> <ref 
label="Top"><xrefnodename>Top</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;Top,cross ref name,title,file name&rbrace;</code> 
<ref label="Top" manual="file 
name"><xrefnodename>Top</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile></ref>
@@ -4431,7 +4431,7 @@ $result_converted{'xml'}->{'top_in_ref'} = '<node 
name="Top" spaces=" "><nodenam
 <code>&arobase;ref&lbrace;(pman)Top,,title&rbrace;</code> <ref label="Top" 
manual="pman"><xrefnodename>(pman)Top</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
 <code>&arobase;ref&lbrace;(pman)Top,,,file name&rbrace;</code> <ref 
label="Top" manual="file 
name"><xrefnodename>(pman)Top</xrefnodename><xrefinfofile>file 
name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;(pman)Top,,,,manual&rbrace;</code> <ref label="Top" 
manual="pman"><xrefnodename>(pman)Top</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref&lbrace;(pman)Top,cross ref name,title,&rbrace;</code> <ref 
label="Top" 
manual="pman"><xrefnodename>(pman)Top</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;(pman)Top,cross ref name,title,&rbrace;</code> <ref 
label="Top" 
manual="pman"><xrefnodename>(pman)Top</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile></xrefinfofile></ref>
 <code>&arobase;ref&lbrace;(pman)Top,cross ref name,,file name&rbrace;</code> 
<ref label="Top" manual="file 
name"><xrefnodename>(pman)Top</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;(pman)Top,cross ref name,,,manual&rbrace;</code> 
<ref label="Top" 
manual="pman"><xrefnodename>(pman)Top</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;(pman)Top,cross ref name,title,file 
name&rbrace;</code> <ref label="Top" manual="file 
name"><xrefnodename>(pman)Top</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile></ref>
diff --git a/tp/tests/layout/res_parser/formatting_xml/formatting.xml 
b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
index 934ec39188..712f2375b0 100644
--- a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
@@ -1377,7 +1377,7 @@ but , ,&noeos;
 <code>&arobase;uref&lbrace;--a,,--c&rbrace;</code> 
<uref><urefurl>--a</urefurl><urefreplacement>&textndash;c</urefreplacement></uref>
 <code>&arobase;uref&lbrace;,,--c&rbrace;</code> 
<uref><urefreplacement>&textndash;c</urefreplacement></uref>
 <code>&arobase;url&lbrace;--a,--b&rbrace;</code> 
<url><urefurl>--a</urefurl><urefdesc>&textndash;b</urefdesc></url>
-<code>&arobase;url&lbrace;--a,&rbrace;</code> <url><urefurl>--a</urefurl></url>
+<code>&arobase;url&lbrace;--a,&rbrace;</code> 
<url><urefurl>--a</urefurl><urefdesc></urefdesc></url>
 <code>&arobase;url&lbrace;,--b&rbrace;</code> 
<url><urefdesc>&textndash;b</urefdesc></url>
 <code>&arobase;var&lbrace;--a&rbrace;</code> <var>&textndash;a</var>
 <code>&arobase;verb&lbrace;:--a:&rbrace;</code> <verb delimiter=":">--a</verb>
@@ -1994,7 +1994,7 @@ ref</xrefinfoname><xrefprinteddesc spaces=" ">a 
comma&comma; in title</xrefprint
 <code>&arobase;ref&lbrace;chapter,,title&rbrace;</code> <ref 
label="chapter"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
 <code>&arobase;ref&lbrace;chapter,,,file name&rbrace;</code> <ref 
label="chapter" manual="file 
name"><xrefnodename>chapter</xrefnodename><xrefinfofile>file 
name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;chapter,,,,manual&rbrace;</code> <ref 
label="chapter"><xrefnodename>chapter</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref&lbrace;chapter,cross ref name,title,&rbrace;</code> <ref 
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;chapter,cross ref name,title,&rbrace;</code> <ref 
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile></xrefinfofile></ref>
 <code>&arobase;ref&lbrace;chapter,cross ref name,,file name&rbrace;</code> 
<ref label="chapter" manual="file 
name"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;chapter,cross ref name,,,manual&rbrace;</code> <ref 
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;chapter,cross ref name,title,file 
name&rbrace;</code> <ref label="chapter" manual="file 
name"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile></ref>
@@ -2010,7 +2010,7 @@ ref</xrefinfoname><xrefprinteddesc spaces=" ">a 
comma&comma; in title</xrefprint
 <code>&arobase;ref&lbrace;(pman)anode,,title&rbrace;</code> <ref label="anode" 
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
 <code>&arobase;ref&lbrace;(pman)anode,,,file name&rbrace;</code> <ref 
label="anode" manual="file 
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file 
name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;(pman)anode,,,,manual&rbrace;</code> <ref 
label="anode" 
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref&lbrace;(pman)anode,cross ref name,title,&rbrace;</code> 
<ref label="anode" 
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;(pman)anode,cross ref name,title,&rbrace;</code> 
<ref label="anode" 
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile></xrefinfofile></ref>
 <code>&arobase;ref&lbrace;(pman)anode,cross ref name,,file name&rbrace;</code> 
<ref label="anode" manual="file 
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;(pman)anode,cross ref name,,,manual&rbrace;</code> 
<ref label="anode" 
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;(pman)anode,cross ref name,title,file 
name&rbrace;</code> <ref label="anode" manual="file 
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile></ref>
@@ -2319,7 +2319,7 @@ in verbatim ''
 <code>&arobase;ref&lbrace;node,,title&rbrace;</code> <ref 
label="node"><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
 <code>&arobase;ref&lbrace;node,,,file name&rbrace;</code> <ref label="node" 
manual="file name"><xrefnodename>node</xrefnodename><xrefinfofile>file 
name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;node,,,,manual&rbrace;</code> <ref 
label="node"><xrefnodename>node</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref&lbrace;node,cross ref name,title,&rbrace;</code> <ref 
label="node"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;node,cross ref name,title,&rbrace;</code> <ref 
label="node"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile></xrefinfofile></ref>
 <code>&arobase;ref&lbrace;node,cross ref name,,file name&rbrace;</code> <ref 
label="node" manual="file 
name"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;node,cross ref name,,,manual&rbrace;</code> <ref 
label="node"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;node,cross ref name,title,file name&rbrace;</code> 
<ref label="node" manual="file 
name"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile></ref>
@@ -2330,7 +2330,7 @@ in verbatim ''
 <code>&arobase;ref&lbrace;chapter,,title, file name, manual&rbrace;</code> 
<ref label="chapter" manual="file 
name"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
 spaces=" ">file name</xrefinfofile><xrefprintedname spaces=" 
">manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;node,,title, file name, manual&rbrace;</code> <ref 
label="node" manual="file 
name"><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
 spaces=" ">file name</xrefinfofile><xrefprintedname spaces=" 
">manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;node,,,file name,manual&rbrace;</code> <ref 
label="node" manual="file 
name"><xrefnodename>node</xrefnodename><xrefinfofile>file 
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref&lbrace;,cross ref name,title,&rbrace;</code> 
<ref><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;,cross ref name,title,&rbrace;</code> 
<ref><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile></xrefinfofile></ref>
 <code>&arobase;ref&lbrace;,cross ref name,,file name&rbrace;</code> <ref 
manual="file name"><xrefinfoname>cross ref 
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;,cross ref name,,,manual&rbrace;</code> 
<ref><xrefinfoname>cross ref 
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;,cross ref name,title,file name&rbrace;</code> <ref 
manual="file name"><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile></ref>
@@ -2344,7 +2344,7 @@ in verbatim ''
 <para><code>&arobase;inforef&lbrace;,cross ref name &rbrace;</code> 
<inforef><inforefrefname>cross ref name </inforefrefname></inforef>
 <code>&arobase;inforef&lbrace;,,file name&rbrace;</code> <inforef manual="file 
name"><inforefinfoname>file name</inforefinfoname></inforef>
 <code>&arobase;inforef&lbrace;,cross ref name, file name&rbrace;</code> 
<inforef manual="file name"><inforefrefname>cross ref 
name</inforefrefname><inforefinfoname spaces=" ">file 
name</inforefinfoname></inforef>
-<code>&arobase;inforef&lbrace;&rbrace;</code> <inforef></inforef>
+<code>&arobase;inforef&lbrace;&rbrace;</code> 
<inforef><inforefnodename></inforefnodename></inforef>
 </para>
 
 </copying>
@@ -2516,7 +2516,7 @@ but , ,&noeos;
 <code>&arobase;uref&lbrace;--a,,--c&rbrace;</code> 
<uref><urefurl>--a</urefurl><urefreplacement>&textndash;c</urefreplacement></uref>
 <code>&arobase;uref&lbrace;,,--c&rbrace;</code> 
<uref><urefreplacement>&textndash;c</urefreplacement></uref>
 <code>&arobase;url&lbrace;--a,--b&rbrace;</code> 
<url><urefurl>--a</urefurl><urefdesc>&textndash;b</urefdesc></url>
-<code>&arobase;url&lbrace;--a,&rbrace;</code> <url><urefurl>--a</urefurl></url>
+<code>&arobase;url&lbrace;--a,&rbrace;</code> 
<url><urefurl>--a</urefurl><urefdesc></urefdesc></url>
 <code>&arobase;url&lbrace;,--b&rbrace;</code> 
<url><urefdesc>&textndash;b</urefdesc></url>
 <code>&arobase;var&lbrace;--a&rbrace;</code> <var>&textndash;a</var>
 <code>&arobase;verb&lbrace;:--a:&rbrace;</code> <verb delimiter=":">--a</verb>
@@ -3133,7 +3133,7 @@ ref</xrefinfoname><xrefprinteddesc spaces=" ">a 
comma&comma; in title</xrefprint
 <code>&arobase;ref&lbrace;chapter,,title&rbrace;</code> <ref 
label="chapter"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
 <code>&arobase;ref&lbrace;chapter,,,file name&rbrace;</code> <ref 
label="chapter" manual="file 
name"><xrefnodename>chapter</xrefnodename><xrefinfofile>file 
name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;chapter,,,,manual&rbrace;</code> <ref 
label="chapter"><xrefnodename>chapter</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref&lbrace;chapter,cross ref name,title,&rbrace;</code> <ref 
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;chapter,cross ref name,title,&rbrace;</code> <ref 
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile></xrefinfofile></ref>
 <code>&arobase;ref&lbrace;chapter,cross ref name,,file name&rbrace;</code> 
<ref label="chapter" manual="file 
name"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;chapter,cross ref name,,,manual&rbrace;</code> <ref 
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;chapter,cross ref name,title,file 
name&rbrace;</code> <ref label="chapter" manual="file 
name"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile></ref>
@@ -3149,7 +3149,7 @@ ref</xrefinfoname><xrefprinteddesc spaces=" ">a 
comma&comma; in title</xrefprint
 <code>&arobase;ref&lbrace;(pman)anode,,title&rbrace;</code> <ref label="anode" 
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
 <code>&arobase;ref&lbrace;(pman)anode,,,file name&rbrace;</code> <ref 
label="anode" manual="file 
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file 
name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;(pman)anode,,,,manual&rbrace;</code> <ref 
label="anode" 
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref&lbrace;(pman)anode,cross ref name,title,&rbrace;</code> 
<ref label="anode" 
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;(pman)anode,cross ref name,title,&rbrace;</code> 
<ref label="anode" 
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile></xrefinfofile></ref>
 <code>&arobase;ref&lbrace;(pman)anode,cross ref name,,file name&rbrace;</code> 
<ref label="anode" manual="file 
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;(pman)anode,cross ref name,,,manual&rbrace;</code> 
<ref label="anode" 
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;(pman)anode,cross ref name,title,file 
name&rbrace;</code> <ref label="anode" manual="file 
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile></ref>
@@ -3458,7 +3458,7 @@ in verbatim ''
 <code>&arobase;ref&lbrace;node,,title&rbrace;</code> <ref 
label="node"><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
 <code>&arobase;ref&lbrace;node,,,file name&rbrace;</code> <ref label="node" 
manual="file name"><xrefnodename>node</xrefnodename><xrefinfofile>file 
name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;node,,,,manual&rbrace;</code> <ref 
label="node"><xrefnodename>node</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref&lbrace;node,cross ref name,title,&rbrace;</code> <ref 
label="node"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;node,cross ref name,title,&rbrace;</code> <ref 
label="node"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile></xrefinfofile></ref>
 <code>&arobase;ref&lbrace;node,cross ref name,,file name&rbrace;</code> <ref 
label="node" manual="file 
name"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;node,cross ref name,,,manual&rbrace;</code> <ref 
label="node"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;node,cross ref name,title,file name&rbrace;</code> 
<ref label="node" manual="file 
name"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile></ref>
@@ -3469,7 +3469,7 @@ in verbatim ''
 <code>&arobase;ref&lbrace;chapter,,title, file name, manual&rbrace;</code> 
<ref label="chapter" manual="file 
name"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
 spaces=" ">file name</xrefinfofile><xrefprintedname spaces=" 
">manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;node,,title, file name, manual&rbrace;</code> <ref 
label="node" manual="file 
name"><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
 spaces=" ">file name</xrefinfofile><xrefprintedname spaces=" 
">manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;node,,,file name,manual&rbrace;</code> <ref 
label="node" manual="file 
name"><xrefnodename>node</xrefnodename><xrefinfofile>file 
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref&lbrace;,cross ref name,title,&rbrace;</code> 
<ref><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;,cross ref name,title,&rbrace;</code> 
<ref><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile></xrefinfofile></ref>
 <code>&arobase;ref&lbrace;,cross ref name,,file name&rbrace;</code> <ref 
manual="file name"><xrefinfoname>cross ref 
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;,cross ref name,,,manual&rbrace;</code> 
<ref><xrefinfoname>cross ref 
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;,cross ref name,title,file name&rbrace;</code> <ref 
manual="file name"><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile></ref>
@@ -3483,7 +3483,7 @@ in verbatim ''
 <para><code>&arobase;inforef&lbrace;,cross ref name &rbrace;</code> 
<inforef><inforefrefname>cross ref name </inforefrefname></inforef>
 <code>&arobase;inforef&lbrace;,,file name&rbrace;</code> <inforef manual="file 
name"><inforefinfoname>file name</inforefinfoname></inforef>
 <code>&arobase;inforef&lbrace;,cross ref name, file name&rbrace;</code> 
<inforef manual="file name"><inforefrefname>cross ref 
name</inforefrefname><inforefinfoname spaces=" ">file 
name</inforefinfoname></inforef>
-<code>&arobase;inforef&lbrace;&rbrace;</code> <inforef></inforef>
+<code>&arobase;inforef&lbrace;&rbrace;</code> 
<inforef><inforefnodename></inforefnodename></inforef>
 </para>
 
 
@@ -3682,7 +3682,7 @@ but , ,&noeos;
 <code>&arobase;uref&lbrace;--a,,--c&rbrace;</code> 
<uref><urefurl>--a</urefurl><urefreplacement>&textndash;c</urefreplacement></uref>
 <code>&arobase;uref&lbrace;,,--c&rbrace;</code> 
<uref><urefreplacement>&textndash;c</urefreplacement></uref>
 <code>&arobase;url&lbrace;--a,--b&rbrace;</code> 
<url><urefurl>--a</urefurl><urefdesc>&textndash;b</urefdesc></url>
-<code>&arobase;url&lbrace;--a,&rbrace;</code> <url><urefurl>--a</urefurl></url>
+<code>&arobase;url&lbrace;--a,&rbrace;</code> 
<url><urefurl>--a</urefurl><urefdesc></urefdesc></url>
 <code>&arobase;url&lbrace;,--b&rbrace;</code> 
<url><urefdesc>&textndash;b</urefdesc></url>
 <code>&arobase;var&lbrace;--a&rbrace;</code> <var>&textndash;a</var>
 <code>&arobase;verb&lbrace;:--a:&rbrace;</code> <verb delimiter=":">--a</verb>
@@ -4299,7 +4299,7 @@ ref</xrefinfoname><xrefprinteddesc spaces=" ">a 
comma&comma; in title</xrefprint
 <code>&arobase;ref&lbrace;chapter,,title&rbrace;</code> <ref 
label="chapter"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
 <code>&arobase;ref&lbrace;chapter,,,file name&rbrace;</code> <ref 
label="chapter" manual="file 
name"><xrefnodename>chapter</xrefnodename><xrefinfofile>file 
name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;chapter,,,,manual&rbrace;</code> <ref 
label="chapter"><xrefnodename>chapter</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref&lbrace;chapter,cross ref name,title,&rbrace;</code> <ref 
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;chapter,cross ref name,title,&rbrace;</code> <ref 
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile></xrefinfofile></ref>
 <code>&arobase;ref&lbrace;chapter,cross ref name,,file name&rbrace;</code> 
<ref label="chapter" manual="file 
name"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;chapter,cross ref name,,,manual&rbrace;</code> <ref 
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;chapter,cross ref name,title,file 
name&rbrace;</code> <ref label="chapter" manual="file 
name"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile></ref>
@@ -4315,7 +4315,7 @@ ref</xrefinfoname><xrefprinteddesc spaces=" ">a 
comma&comma; in title</xrefprint
 <code>&arobase;ref&lbrace;(pman)anode,,title&rbrace;</code> <ref label="anode" 
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
 <code>&arobase;ref&lbrace;(pman)anode,,,file name&rbrace;</code> <ref 
label="anode" manual="file 
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file 
name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;(pman)anode,,,,manual&rbrace;</code> <ref 
label="anode" 
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref&lbrace;(pman)anode,cross ref name,title,&rbrace;</code> 
<ref label="anode" 
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;(pman)anode,cross ref name,title,&rbrace;</code> 
<ref label="anode" 
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile></xrefinfofile></ref>
 <code>&arobase;ref&lbrace;(pman)anode,cross ref name,,file name&rbrace;</code> 
<ref label="anode" manual="file 
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;(pman)anode,cross ref name,,,manual&rbrace;</code> 
<ref label="anode" 
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;(pman)anode,cross ref name,title,file 
name&rbrace;</code> <ref label="anode" manual="file 
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile></ref>
@@ -4624,7 +4624,7 @@ in verbatim ''
 <code>&arobase;ref&lbrace;node,,title&rbrace;</code> <ref 
label="node"><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
 <code>&arobase;ref&lbrace;node,,,file name&rbrace;</code> <ref label="node" 
manual="file name"><xrefnodename>node</xrefnodename><xrefinfofile>file 
name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;node,,,,manual&rbrace;</code> <ref 
label="node"><xrefnodename>node</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref&lbrace;node,cross ref name,title,&rbrace;</code> <ref 
label="node"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;node,cross ref name,title,&rbrace;</code> <ref 
label="node"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile></xrefinfofile></ref>
 <code>&arobase;ref&lbrace;node,cross ref name,,file name&rbrace;</code> <ref 
label="node" manual="file 
name"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;node,cross ref name,,,manual&rbrace;</code> <ref 
label="node"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;node,cross ref name,title,file name&rbrace;</code> 
<ref label="node" manual="file 
name"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile></ref>
@@ -4635,7 +4635,7 @@ in verbatim ''
 <code>&arobase;ref&lbrace;chapter,,title, file name, manual&rbrace;</code> 
<ref label="chapter" manual="file 
name"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
 spaces=" ">file name</xrefinfofile><xrefprintedname spaces=" 
">manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;node,,title, file name, manual&rbrace;</code> <ref 
label="node" manual="file 
name"><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
 spaces=" ">file name</xrefinfofile><xrefprintedname spaces=" 
">manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;node,,,file name,manual&rbrace;</code> <ref 
label="node" manual="file 
name"><xrefnodename>node</xrefnodename><xrefinfofile>file 
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref&lbrace;,cross ref name,title,&rbrace;</code> 
<ref><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;,cross ref name,title,&rbrace;</code> 
<ref><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile></xrefinfofile></ref>
 <code>&arobase;ref&lbrace;,cross ref name,,file name&rbrace;</code> <ref 
manual="file name"><xrefinfoname>cross ref 
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;,cross ref name,,,manual&rbrace;</code> 
<ref><xrefinfoname>cross ref 
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;,cross ref name,title,file name&rbrace;</code> <ref 
manual="file name"><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile></ref>
@@ -4649,7 +4649,7 @@ in verbatim ''
 <para><code>&arobase;inforef&lbrace;,cross ref name &rbrace;</code> 
<inforef><inforefrefname>cross ref name </inforefrefname></inforef>
 <code>&arobase;inforef&lbrace;,,file name&rbrace;</code> <inforef manual="file 
name"><inforefinfoname>file name</inforefinfoname></inforef>
 <code>&arobase;inforef&lbrace;,cross ref name, file name&rbrace;</code> 
<inforef manual="file name"><inforefrefname>cross ref 
name</inforefrefname><inforefinfoname spaces=" ">file 
name</inforefinfoname></inforef>
-<code>&arobase;inforef&lbrace;&rbrace;</code> <inforef></inforef>
+<code>&arobase;inforef&lbrace;&rbrace;</code> 
<inforef><inforefnodename></inforefnodename></inforef>
 </para>
 
 
@@ -4816,7 +4816,7 @@ but , ,&noeos;
 <code>&arobase;uref&lbrace;--a,,--c&rbrace;</code> 
<uref><urefurl>--a</urefurl><urefreplacement>--c</urefreplacement></uref>
 <code>&arobase;uref&lbrace;,,--c&rbrace;</code> 
<uref><urefreplacement>--c</urefreplacement></uref>
 <code>&arobase;url&lbrace;--a,--b&rbrace;</code> 
<url><urefurl>--a</urefurl><urefdesc>--b</urefdesc></url>
-<code>&arobase;url&lbrace;--a,&rbrace;</code> <url><urefurl>--a</urefurl></url>
+<code>&arobase;url&lbrace;--a,&rbrace;</code> 
<url><urefurl>--a</urefurl><urefdesc></urefdesc></url>
 <code>&arobase;url&lbrace;,--b&rbrace;</code> 
<url><urefdesc>--b</urefdesc></url>
 <code>&arobase;var&lbrace;--a&rbrace;</code> <var>--a</var>
 <code>&arobase;verb&lbrace;:--a:&rbrace;</code> <verb delimiter=":">--a</verb>
@@ -5433,7 +5433,7 @@ ref</xrefinfoname><xrefprinteddesc spaces=" ">a 
comma&comma; in title</xrefprint
 <code>&arobase;ref&lbrace;chapter,,title&rbrace;</code> <ref 
label="chapter"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
 <code>&arobase;ref&lbrace;chapter,,,file name&rbrace;</code> <ref 
label="chapter" manual="file 
name"><xrefnodename>chapter</xrefnodename><xrefinfofile>file 
name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;chapter,,,,manual&rbrace;</code> <ref 
label="chapter"><xrefnodename>chapter</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref&lbrace;chapter,cross ref name,title,&rbrace;</code> <ref 
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;chapter,cross ref name,title,&rbrace;</code> <ref 
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile></xrefinfofile></ref>
 <code>&arobase;ref&lbrace;chapter,cross ref name,,file name&rbrace;</code> 
<ref label="chapter" manual="file 
name"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;chapter,cross ref name,,,manual&rbrace;</code> <ref 
label="chapter"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;chapter,cross ref name,title,file 
name&rbrace;</code> <ref label="chapter" manual="file 
name"><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile></ref>
@@ -5449,7 +5449,7 @@ ref</xrefinfoname><xrefprinteddesc spaces=" ">a 
comma&comma; in title</xrefprint
 <code>&arobase;ref&lbrace;(pman)anode,,title&rbrace;</code> <ref label="anode" 
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
 <code>&arobase;ref&lbrace;(pman)anode,,,file name&rbrace;</code> <ref 
label="anode" manual="file 
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file 
name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;(pman)anode,,,,manual&rbrace;</code> <ref 
label="anode" 
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref&lbrace;(pman)anode,cross ref name,title,&rbrace;</code> 
<ref label="anode" 
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;(pman)anode,cross ref name,title,&rbrace;</code> 
<ref label="anode" 
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile></xrefinfofile></ref>
 <code>&arobase;ref&lbrace;(pman)anode,cross ref name,,file name&rbrace;</code> 
<ref label="anode" manual="file 
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;(pman)anode,cross ref name,,,manual&rbrace;</code> 
<ref label="anode" 
manual="pman"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;(pman)anode,cross ref name,title,file 
name&rbrace;</code> <ref label="anode" manual="file 
name"><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile></ref>
@@ -5758,7 +5758,7 @@ Various deff lines
 <code>&arobase;ref&lbrace;node,,title&rbrace;</code> <ref 
label="node"><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
 <code>&arobase;ref&lbrace;node,,,file name&rbrace;</code> <ref label="node" 
manual="file name"><xrefnodename>node</xrefnodename><xrefinfofile>file 
name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;node,,,,manual&rbrace;</code> <ref 
label="node"><xrefnodename>node</xrefnodename><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref&lbrace;node,cross ref name,title,&rbrace;</code> <ref 
label="node"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;node,cross ref name,title,&rbrace;</code> <ref 
label="node"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile></xrefinfofile></ref>
 <code>&arobase;ref&lbrace;node,cross ref name,,file name&rbrace;</code> <ref 
label="node" manual="file 
name"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;node,cross ref name,,,manual&rbrace;</code> <ref 
label="node"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;node,cross ref name,title,file name&rbrace;</code> 
<ref label="node" manual="file 
name"><xrefnodename>node</xrefnodename><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile></ref>
@@ -5769,7 +5769,7 @@ Various deff lines
 <code>&arobase;ref&lbrace;chapter,,title, file name, manual&rbrace;</code> 
<ref label="chapter" manual="file 
name"><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
 spaces=" ">file name</xrefinfofile><xrefprintedname spaces=" 
">manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;node,,title, file name, manual&rbrace;</code> <ref 
label="node" manual="file 
name"><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
 spaces=" ">file name</xrefinfofile><xrefprintedname spaces=" 
">manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;node,,,file name,manual&rbrace;</code> <ref 
label="node" manual="file 
name"><xrefnodename>node</xrefnodename><xrefinfofile>file 
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref&lbrace;,cross ref name,title,&rbrace;</code> 
<ref><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
+<code>&arobase;ref&lbrace;,cross ref name,title,&rbrace;</code> 
<ref><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile></xrefinfofile></ref>
 <code>&arobase;ref&lbrace;,cross ref name,,file name&rbrace;</code> <ref 
manual="file name"><xrefinfoname>cross ref 
name</xrefinfoname><xrefinfofile>file name</xrefinfofile></ref>
 <code>&arobase;ref&lbrace;,cross ref name,,,manual&rbrace;</code> 
<ref><xrefinfoname>cross ref 
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
 <code>&arobase;ref&lbrace;,cross ref name,title,file name&rbrace;</code> <ref 
manual="file name"><xrefinfoname>cross ref 
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file 
name</xrefinfofile></ref>
@@ -5783,7 +5783,7 @@ Various deff lines
 <code>&arobase;inforef&lbrace;,cross ref name &rbrace;</code> 
<inforef><inforefrefname>cross ref name </inforefrefname></inforef>
 <code>&arobase;inforef&lbrace;,,file name&rbrace;</code> <inforef manual="file 
name"><inforefinfoname>file name</inforefinfoname></inforef>
 <code>&arobase;inforef&lbrace;,cross ref name, file name&rbrace;</code> 
<inforef manual="file name"><inforefrefname>cross ref 
name</inforefrefname><inforefinfoname spaces=" ">file 
name</inforefinfoname></inforef>
-<code>&arobase;inforef&lbrace;&rbrace;</code> <inforef></inforef>
+<code>&arobase;inforef&lbrace;&rbrace;</code> 
<inforef><inforefnodename></inforefnodename></inforef>
 
 
 <clear name="inexample" line=" inexample"></clear>
diff --git a/util/txixml2texi.pl b/util/txixml2texi.pl
index 4e20da53d0..0da510bd67 100755
--- a/util/txixml2texi.pl
+++ b/util/txixml2texi.pl
@@ -17,8 +17,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-# FIXME Space before subentry missing.  Space after columnfractions missing
-# 
 # Original author: Patrice Dumas <pertusus@free.fr>
 
 use strict;
[Prev in Thread]
Current Thread
[Next in Thread]
branch master updated: * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): keep the last empty argument of a brace command to be able to reconstitute trailing empty arguments in the original Texinfo code., Patrice Dumas <=
Prev by Date: branch master updated: * util/texinfo.dtd: update for change in spaces attributes.
Next by Date: branch master updated: * doc/texinfo.tex (\image): Add more space around @center @image.
Previous by thread: branch master updated: * util/texinfo.dtd: update for change in spaces attributes.
Next by thread: branch master updated: * doc/texinfo.tex (\image): Add more space around @center @image.
Index(es):
- Date
- Thread