[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[7850] change @tie{ } to @tie{} in document string
From: |
gavinsmith0123 |
Subject: |
[7850] change @tie{ } to @tie{} in document string |
Date: |
Sun, 25 Jun 2017 10:04:47 -0400 (EDT) |
Revision: 7850
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7850
Author: gavin
Date: 2017-06-25 10:04:46 -0400 (Sun, 25 Jun 2017)
Log Message:
-----------
change @tie{ } to @tie{} in document string
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Convert/Plaintext.pm
trunk/tp/Texinfo/Parser.pm
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2017-06-25 13:57:27 UTC (rev 7849)
+++ trunk/ChangeLog 2017-06-25 14:04:46 UTC (rev 7850)
@@ -1,3 +1,11 @@
+2017-06-25 Gavin Smith <address@hidden>
+
+ * tp/Texinfo/Convert/Plaintext.pm (_convert) <def commands>:
+ Change "@tie{ }" to "@tie{} in document strings passed to gdt.
+ * tp/Texinfo/Parser.pm (_parse_texi) <closing a brace command>:
+ Don't check if we are being called from gdt and the closed
+ command was @tie.
+
2017-06-24 Gavin Smith <address@hidden>
* tp/Texinfo/Parser.pm (_parse_texi): Remove debugging code
Modified: trunk/tp/Texinfo/Convert/Plaintext.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Plaintext.pm 2017-06-25 13:57:27 UTC (rev
7849)
+++ trunk/tp/Texinfo/Convert/Plaintext.pm 2017-06-25 14:04:46 UTC (rev
7850)
@@ -2755,12 +2755,12 @@
or $command eq 'deftypevr')
and !$root->{'extra'}->{'def_parsed_hash'}->{'type'})) {
if ($arguments) {
- $tree = $self->gdt("address@hidden }-- {category}: {name}
{arguments}", {
+ $tree = $self->gdt("address@hidden {category}: {name}
{arguments}", {
'category' =>
$root->{'extra'}->{'def_parsed_hash'}->{'category'},
'name' => $name,
'arguments' => $arguments});
} else {
- $tree = $self->gdt("address@hidden }-- {category}: {name}", {
+ $tree = $self->gdt("address@hidden {category}: {name}", {
'category' =>
$root->{'extra'}->{'def_parsed_hash'}->{'category'},
'name' => $name});
}
@@ -2773,10 +2773,10 @@
'type' => $root->{'extra'}->{'def_parsed_hash'}->{'type'},
'arguments' => $arguments};
if ($self->get_conf('deftypefnnewline') eq 'on') {
- $tree = $self->gdt("address@hidden }--
{category}:address@hidden@*{name} {arguments}",
+ $tree = $self->gdt("address@hidden
{category}:address@hidden@*{name} {arguments}",
$strings);
} else {
- $tree = $self->gdt("address@hidden }-- {category}: {type} {name}
{arguments}",
+ $tree = $self->gdt("address@hidden {category}: {type} {name}
{arguments}",
$strings);
}
} else {
@@ -2785,10 +2785,10 @@
'type' => $root->{'extra'}->{'def_parsed_hash'}->{'type'},
'name' => $name};
if ($self->get_conf('deftypefnnewline') eq 'on') {
- $tree = $self->gdt("address@hidden }--
{category}:address@hidden@*{name}",
+ $tree = $self->gdt("address@hidden
{category}:address@hidden@*{name}",
$strings);
} else {
- $tree = $self->gdt("address@hidden }-- {category}: {type}
{name}",
+ $tree = $self->gdt("address@hidden {category}: {type} {name}",
$strings);
}
}
@@ -2796,13 +2796,13 @@
or ($command eq 'deftypecv'
and !$root->{'extra'}->{'def_parsed_hash'}->{'type'})) {
if ($arguments) {
- $tree = $self->gdt("address@hidden }-- {category} of {class}:
{name} {arguments}", {
+ $tree = $self->gdt("address@hidden {category} of {class}: {name}
{arguments}", {
'category' =>
$root->{'extra'}->{'def_parsed_hash'}->{'category'},
'name' => $name,
'class' =>
$root->{'extra'}->{'def_parsed_hash'}->{'class'},
'arguments' => $arguments});
} else {
- $tree = $self->gdt("address@hidden }-- {category} of {class}:
{name}", {
+ $tree = $self->gdt("address@hidden {category} of {class}: {name}",
{
'category' =>
$root->{'extra'}->{'def_parsed_hash'}->{'category'},
'class' =>
$root->{'extra'}->{'def_parsed_hash'}->{'class'},
'name' => $name});
@@ -2811,13 +2811,13 @@
or ($command eq 'deftypeop'
and !$root->{'extra'}->{'def_parsed_hash'}->{'type'})) {
if ($arguments) {
- $tree = $self->gdt("address@hidden }-- {category} on {class}:
{name} {arguments}", {
+ $tree = $self->gdt("address@hidden {category} on {class}: {name}
{arguments}", {
'category' =>
$root->{'extra'}->{'def_parsed_hash'}->{'category'},
'name' => $name,
'class' =>
$root->{'extra'}->{'def_parsed_hash'}->{'class'},
'arguments' => $arguments});
} else {
- $tree = $self->gdt("address@hidden }-- {category} on {class}:
{name}", {
+ $tree = $self->gdt("address@hidden {category} on {class}: {name}",
{
'category' =>
$root->{'extra'}->{'def_parsed_hash'}->{'category'},
'class' =>
$root->{'extra'}->{'def_parsed_hash'}->{'class'},
'name' => $name});
@@ -2832,11 +2832,11 @@
'arguments' => $arguments};
if ($self->get_conf('deftypefnnewline') eq 'on') {
$tree
- = $self->gdt("address@hidden }-- {category} on
{class}:address@hidden@*{name} {arguments}",
+ = $self->gdt("address@hidden {category} on
{class}:address@hidden@*{name} {arguments}",
$strings);
} else {
$tree
- = $self->gdt("address@hidden }-- {category} on {class}: {type}
{name} {arguments}",
+ = $self->gdt("address@hidden {category} on {class}: {type}
{name} {arguments}",
$strings);
}
} else {
@@ -2847,11 +2847,11 @@
'name' => $name};
if ($self->get_conf('deftypefnnewline') eq 'on') {
$tree
- = $self->gdt("address@hidden }-- {category} on
{class}:address@hidden@*{name}",
+ = $self->gdt("address@hidden {category} on
{class}:address@hidden@*{name}",
$strings);
} else {
$tree
- = $self->gdt("address@hidden }-- {category} on {class}: {type}
{name}",
+ = $self->gdt("address@hidden {category} on {class}: {type}
{name}",
$strings);
}
}
@@ -2865,11 +2865,11 @@
'arguments' => $arguments};
if ($self->get_conf('deftypefnnewline') eq 'on') {
$tree
- = $self->gdt("address@hidden }-- {category} of
{class}:address@hidden@*{name} {arguments}",
+ = $self->gdt("address@hidden {category} of
{class}:address@hidden@*{name} {arguments}",
$strings);
} else {
$tree
- = $self->gdt("address@hidden }-- {category} of {class}: {type}
{name} {arguments}",
+ = $self->gdt("address@hidden {category} of {class}: {type}
{name} {arguments}",
$strings);
}
} else {
@@ -2880,11 +2880,11 @@
'name' => $name};
if ($self->get_conf('deftypefnnewline') eq 'on') {
$tree
- = $self->gdt("address@hidden }-- {category} of
{class}:address@hidden@*{name}",
+ = $self->gdt("address@hidden {category} of
{class}:address@hidden@*{name}",
$strings);
} else {
$tree
- = $self->gdt("address@hidden }-- {category} of {class}: {type}
{name}",
+ = $self->gdt("address@hidden {category} of {class}: {type}
{name}",
$strings);
}
}
Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm 2017-06-25 13:57:27 UTC (rev 7849)
+++ trunk/tp/Texinfo/Parser.pm 2017-06-25 14:04:46 UTC (rev 7850)
@@ -5101,12 +5101,9 @@
if (defined($brace_commands{$closed_command})
and $brace_commands{$closed_command} == 0
and @{$current->{'contents'}}) {
- if (!($self->{'in_gdt'} and $closed_command eq 'tie')) {
- $self->line_warn(sprintf($self->__(
- "command address@hidden does not accept
arguments"),
- $closed_command), $line_nr);
- }
- # TODO: Change @tie{ } to @tie{} in Plaintext.pm
+ $self->line_warn(sprintf($self->__(
+ "command address@hidden does not accept
arguments"),
+ $closed_command), $line_nr);
}
if ($current->{'parent'}->{'cmdname'} eq 'anchor') {
$current->{'parent'}->{'line_nr'} = $line_nr;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [7850] change @tie{ } to @tie{} in document string,
gavinsmith0123 <=