[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[8164] TexinfoXML def line trailing spaces in bracketed
|
From: |
gavinsmith0123 |
|
Subject: |
[8164] TexinfoXML def line trailing spaces in bracketed |
|
Date: |
Sat, 15 Sep 2018 07:59:12 -0400 (EDT) |
Revision: 8164
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8164
Author: gavin
Date: 2018-09-15 07:59:12 -0400 (Sat, 15 Sep 2018)
Log Message:
-----------
TexinfoXML def line trailing spaces in bracketed
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Convert/TexinfoXML.pm
trunk/tp/tests/layout/res_parser/formatting_xml/formatting.xml
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2018-09-12 19:24:28 UTC (rev 8163)
+++ trunk/ChangeLog 2018-09-15 11:59:12 UTC (rev 8164)
@@ -1,3 +1,8 @@
+2018-09-15 Gavin Smith <address@hidden>
+
+ * tp/Texinfo/Convert/TexinfoXML.pm (_convert) <def line>: Remove
+ trailing spaces from bracketed terms.
+
2018-09-12 Gavin Smith <address@hidden>
* tp/Texinfo/Convert/Converter.pm (_end_line_or_comment): Do
Modified: trunk/tp/Texinfo/Convert/TexinfoXML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/TexinfoXML.pm 2018-09-12 19:24:28 UTC (rev
8163)
+++ trunk/tp/Texinfo/Convert/TexinfoXML.pm 2018-09-15 11:59:12 UTC (rev
8164)
@@ -1496,6 +1496,7 @@
$content =~ s/\n$//;
$result .= $content;
} else {
+ $content =~ s/\s*$//;
my $attribute = [];
if ($type eq 'category' and $alias) {
push @$attribute, ('automatic', 'on');
Modified: trunk/tp/tests/layout/res_parser/formatting_xml/formatting.xml
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_xml/formatting.xml
2018-09-12 19:24:28 UTC (rev 8163)
+++ trunk/tp/tests/layout/res_parser/formatting_xml/formatting.xml
2018-09-15 11:59:12 UTC (rev 8164)
@@ -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] |
- [8164] TexinfoXML def line trailing spaces in bracketed,
gavinsmith0123 <=