[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[8166] TexinfoXML strip trailing spaces from index entry
|
From: |
gavinsmith0123 |
|
Subject: |
[8166] TexinfoXML strip trailing spaces from index entry |
|
Date: |
Sat, 15 Sep 2018 08:07:03 -0400 (EDT) |
Revision: 8166
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8166
Author: gavin
Date: 2018-09-15 08:07:03 -0400 (Sat, 15 Sep 2018)
Log Message:
-----------
TexinfoXML strip trailing spaces from index entry
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Convert/TexinfoXML.pm
trunk/tp/t/results/coverage/def.pl
trunk/tp/t/results/xml_tests/commands_and_spaces.pl
trunk/tp/tests/layout/res_parser/formatting_xml/formatting.xml
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2018-09-15 11:59:39 UTC (rev 8165)
+++ trunk/ChangeLog 2018-09-15 12:07:03 UTC (rev 8166)
@@ -1,5 +1,10 @@
2018-09-15 Gavin Smith <address@hidden>
+ * tp/Texinfo/Convert/TexinfoXML.pm (_index_entry): Remove
+ trailing spaces from the text of an index entry.
+
+2018-09-15 Gavin Smith <address@hidden>
+
* tp/Texinfo/Convert/TexinfoXML.pm (_convert) <def line>: Remove
trailing spaces from bracketed terms.
Modified: trunk/tp/Texinfo/Convert/TexinfoXML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/TexinfoXML.pm 2018-09-15 11:59:39 UTC (rev
8165)
+++ trunk/tp/Texinfo/Convert/TexinfoXML.pm 2018-09-15 12:07:03 UTC (rev
8166)
@@ -521,6 +521,7 @@
$self->{'document_context'}->[-1]->{'monospace'}->[-1] = 1
if ($index_entry->{'in_code'});
$result .= $self->_convert({'contents' => $index_entry->{'content'}});
+ $result =~ s/\s*$//;
pop @{$self->{'document_context'}};
$result .= $self->close_element('indexterm');
return $result;
Modified: trunk/tp/t/results/coverage/def.pl
===================================================================
--- trunk/tp/t/results/coverage/def.pl 2018-09-15 11:59:39 UTC (rev 8165)
+++ trunk/tp/t/results/coverage/def.pl 2018-09-15 12:07:03 UTC (rev 8166)
@@ -2425,7 +2425,7 @@
<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="4">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="5">log
trap</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="6">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on"
spaces=" ">log trap1</deffunction> <defparam bracketed="on"></defparam>
</definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn" number="7">log trap2
</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on">log
trap2</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="7">log
trap2</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap2</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="8"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="9"><b>id
<samp>i</samp> ule</b></indexterm><defcategory>cmde2</defcategory>
<deffunction><b>id <samp>i</samp> ule</b></deffunction>
<defparam>truc</defparam></definitionterm></deffnx>
<deffnx><definitionterm><indexterm index="fn"
number="10">machin</indexterm><defcategory bracketed="on"></defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
Modified: trunk/tp/t/results/xml_tests/commands_and_spaces.pl
===================================================================
--- trunk/tp/t/results/xml_tests/commands_and_spaces.pl 2018-09-15 11:59:39 UTC
(rev 8165)
+++ trunk/tp/t/results/xml_tests/commands_and_spaces.pl 2018-09-15 12:07:03 UTC
(rev 8166)
@@ -2466,7 +2466,7 @@
</para>
<para><indicateurl spaces=" ">http://ggg </indicateurl>
</para>
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="1">machin </indexterm><defcategory bracketed="on" spaces="
">truc</defcategory> <deffunction bracketed="on" spaces="
">machin</deffunction> <defparam bracketed="on" spaces=" ">bidule</defparam>
<defparam bracketed="on" spaces=" ">chose</defparam> <defparam bracketed="on"
spaces=" ">arg</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn"
number="1">machin</indexterm><defcategory bracketed="on" spaces="
">truc</defcategory> <deffunction bracketed="on" spaces="
">machin</deffunction> <defparam bracketed="on" spaces=" ">bidule</defparam>
<defparam bracketed="on" spaces=" ">chose</defparam> <defparam bracketed="on"
spaces=" ">arg</defparam></definitionterm>
<definitionitem><para>T
</para></definitionitem></deffn>
Modified: trunk/tp/tests/layout/res_parser/formatting_xml/formatting.xml
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_xml/formatting.xml
2018-09-15 11:59:39 UTC (rev 8165)
+++ trunk/tp/tests/layout/res_parser/formatting_xml/formatting.xml
2018-09-15 12:07:03 UTC (rev 8166)
@@ -1112,7 +1112,7 @@
<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="6">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="7">log
trap</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="8">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on"
spaces=" ">log trap1</deffunction> <defparam bracketed="on"></defparam>
</definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn" number="9">log trap2
</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on">log
trap2</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="9">log
trap2</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap2</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="10"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="11"><b>id
<samp>i</samp> ule</b></indexterm><defcategory>cmde2</defcategory>
<deffunction><b>id <samp>i</samp> ule</b></deffunction>
<defparam>truc</defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory> </definitionterm></deffnx>
@@ -1712,7 +1712,7 @@
<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="39">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="40">log
trap</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="41">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on"
spaces=" ">log trap1</deffunction> <defparam bracketed="on"></defparam>
</definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn" number="42">log trap2
</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on">log
trap2</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="42">log
trap2</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap2</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="43"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="44"><b>id
<samp>i</samp> ule</b></indexterm><defcategory>cmde2</defcategory>
<deffunction><b>id <samp>i</samp> ule</b></deffunction>
<defparam>truc</defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory> </definitionterm></deffnx>
@@ -2312,7 +2312,7 @@
<deffnx spaces=" "><definitionterm><indexterm index="fn"
number="72">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="73">log
trap</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="74">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on"
spaces=" ">log trap1</deffunction> <defparam bracketed="on"></defparam>
</definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn" number="75">log trap2
</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on">log
trap2</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="75">log
trap2</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap2</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="76"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="77"><b>id
<samp>i</samp> ule</b></indexterm><defcategory>cmde2</defcategory>
<deffunction><b>id <samp>i</samp> ule</b></deffunction>
<defparam>truc</defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory> </definitionterm></deffnx>
@@ -2906,7 +2906,7 @@
</pre><deffnx spaces=" "><definitionterm><indexterm index="fn"
number="105">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="106">log
trap</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="107">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on"
spaces=" ">log trap1</deffunction> <defparam bracketed="on"></defparam>
</definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn" number="108">log
trap2 </indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap2</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="108">log
trap2</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap2</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="109"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn" number="110"><b>id
<samp>i</samp> ule</b></indexterm><defcategory>cmde2</defcategory>
<deffunction><b>id <samp>i</samp> ule</b></deffunction>
<defparam>truc</defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory> </definitionterm></deffnx>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [8166] TexinfoXML strip trailing spaces from index entry,
gavinsmith0123 <=