[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[8004] remove use of brace_command_contents
From: |
gavinsmith0123 |
Subject: |
[8004] remove use of brace_command_contents |
Date: |
Mon, 4 Jun 2018 06:55:34 -0400 (EDT) |
Revision: 8004
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8004
Author: gavin
Date: 2018-06-04 06:55:33 -0400 (Mon, 04 Jun 2018)
Log Message:
-----------
remove use of brace_command_contents
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Transformations.pm
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2018-06-04 09:46:18 UTC (rev 8003)
+++ trunk/ChangeLog 2018-06-04 10:55:33 UTC (rev 8004)
@@ -1,5 +1,11 @@
2018-06-04 Gavin Smith <address@hidden>
+ * tp/Texinfo/Transformations.pm (_reference_to_arg):
+ Refer to 'args' array instead of 'brace_command_contents'.
+ (Makes a couple of tests failing since 2017-10-29 pass.)
+
+2018-06-04 Gavin Smith <address@hidden>
+
* tp/Texinfo/Convert/Plaintext.pm (_convert):
When checking if a node name in a cross-reference includes a
`.', do not include in the check any manual name that may have
Modified: trunk/tp/Texinfo/Transformations.pm
===================================================================
--- trunk/tp/Texinfo/Transformations.pm 2018-06-04 09:46:18 UTC (rev 8003)
+++ trunk/tp/Texinfo/Transformations.pm 2018-06-04 10:55:33 UTC (rev 8004)
@@ -153,8 +153,7 @@
if ($current->{'cmdname'} and
$Texinfo::Common::ref_commands{$current->{'cmdname'}}
- and $current->{'extra'}
- and $current->{'extra'}->{'brace_command_contents'}) {
+ and $current->{'args'}) {
my @args_try_order;
if ($current->{'cmdname'} eq 'inforef') {
@args_try_order = (0, 1, 2);
@@ -162,14 +161,13 @@
@args_try_order = (0, 1, 2, 4, 3);
}
foreach my $index (@args_try_order) {
- if (defined($current->{'args'}->[$index])
- and
defined($current->{'extra'}->{'brace_command_contents'}->[$index])) {
+ if (defined($current->{'args'}->[$index])) {
# This a double checking that there is some content.
# Not sure that it is useful.
my $text =
Texinfo::Convert::Text::convert($current->{'args'}->[$index]);
if (defined($text) and $text =~ /\S/) {
- my $result = {'contents' =>
- $current->{'extra'}->{'brace_command_contents'}->[$index],
+ my $result
+ = {'contents' => $current->{'args'}->[$index]->{'contents'},
'parent' => $current->{'parent'}};
return ($result);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [8004] remove use of brace_command_contents,
gavinsmith0123 <=