[tcl-rivet] branch master updated: * tests/commands.tcl: changing test on self closing element * [doc/rivet.xml.in|doc/rivet.xml]: removed delimiters of symbols expanded by svn * doc/xml/commands.xml: fixed entities in ::rivet::xml manual page

[mxmanghi]

This is an automated email from the ASF dual-hosted git repository.

mxmanghi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tcl-rivet.git


The following commit(s) were added to refs/heads/master by this push:
     new 6f10277      * tests/commands.tcl: changing test on self closing 
element * [doc/rivet.xml.in|doc/rivet.xml]: removed delimiters of symbols 
expanded by svn * doc/xml/commands.xml: fixed entities in ::rivet::xml manual 
page
6f10277 is described below

commit 6f1027745ca8f3bdc7b2cec8000af3a42f9226de
Author: Massimo Manghi <mxman...@apache.org>
AuthorDate: Wed Oct 17 11:31:55 2018 +0200

        * tests/commands.tcl: changing test on self closing element * 
[doc/rivet.xml.in|doc/rivet.xml]: removed delimiters of symbols expanded by svn 
* doc/xml/commands.xml: fixed entities in ::rivet::xml manual page
---
 ChangeLog            | 6 ++++++
 doc/rivet.xml        | 2 +-
 doc/rivet.xml.in     | 2 +-
 doc/xml/commands.xml | 6 +++---
 tests/commands.tcl   | 3 +--
 tests/commands.test  | 2 +-
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4eb6808..301bf41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-10-17 Massimo Manghi <mxman...@apache.org>
+    * tests/commands.tcl: changing test on self closing element
+    * [doc/rivet.xml.in|doc/rivet.xml]: removed delimiters of
+    symbols expanded by svn
+    * doc/xml/commands.xml: fixed entities in ::rivet::xml manual page
+
 2018-08-16 Massimo Manghi <mxman...@apache.org>
     * rivet/rivet-tcl/xml.tcl: changing form to support single self
     closing XML elements such as <tag attr1="val1" attr2="val2".... /> 
diff --git a/doc/rivet.xml b/doc/rivet.xml
index 850d3d9..d4543c7 100644
--- a/doc/rivet.xml
+++ b/doc/rivet.xml
@@ -90,7 +90,7 @@
        </articleinfo>
 
        <para>
-       This manual was generated on <?dbtimestamp format="A Y-m-d X" ?>$  $.
+       This manual was generated on <?dbtimestamp format="A Y-m-d X" ?>
        </para>
 
        <!-- Introduction -->
diff --git a/doc/rivet.xml.in b/doc/rivet.xml.in
index 422d9d6..cff925d 100644
--- a/doc/rivet.xml.in
+++ b/doc/rivet.xml.in
@@ -90,7 +90,7 @@
        </articleinfo>
 
        <para>
-       This manual was generated on <?dbtimestamp format="A Y-m-d X" ?>$  $.
+       This manual was generated on <?dbtimestamp format="A Y-m-d X" ?>
        </para>
 
        <!-- Introduction -->
diff --git a/doc/xml/commands.xml b/doc/xml/commands.xml
index 09a237e..4971cbf 100644
--- a/doc/xml/commands.xml
+++ b/doc/xml/commands.xml
@@ -2117,7 +2117,7 @@ form_request end</programlisting>
             </para>
             <programlisting><command>::rivet::xml "a string" [list div class 
box id testbox] b i</command>
 &lt;== &lt;div class=&quot;box&quot; 
id=&quot;testbox&quot;&gt;&lt;b&gt;&lt;i&gt;a 
string&lt;/i&gt;&lt;/b&gt;&lt;/div&gt;</programlisting>
-            <programlisting><command>::rivet::xml "text to be wrapped in XML" 
div [list a href "http://..../"; title "info message"]</command> 
+            <programlisting><command>::rivet::xml "text to be wrapped in XML" 
div [list a href http://..../ title "info message"]</command> 
 &lt;== &lt;div&gt;&lt;a href=&quot;http://..../&quot; title=&quot;info 
message&quot;&gt;text to be wrapped in 
XML&lt;/a&gt;&lt;/div&gt;</programlisting>  
                                <para>
                                        A single argument is interpreted as a 
list of tag name and attributes to be 
@@ -2129,9 +2129,9 @@ form_request end</programlisting>
                                        Unless the string is literally an empty 
string
                                </para>
                                <programlisting><command>::rivet::xml "" [list 
b a1 v1 a2 v2]</command>
-&lt;== &lt;b a1=&quot;v1&quot; a2=&quot;v2&quot;&gt;/b&gt;</programlisting>
+&lt;== &lt;b a1=&quot;v1&quot; a2=&quot;v2&quot;&gt;&lt;/b&gt;</programlisting>
                                <para>which is useful for generating 'script' 
elements in an HTML page header that wouldn't be understood 
-                               as such</para>
+                               as single closing element</para>
                                <programlisting><command>::rivet::xml "" [list 
script type "text/javascript" src js/myscripts.js]</command>
 &lt;== &lt;script type=&quot;text/javascript&quot; 
src=&quot;js/myscripts.js&quot;&gt;&lt;/script&gt;</programlisting>
        </refsect1>
diff --git a/tests/commands.tcl b/tests/commands.tcl
index 8165ee0..db06f97 100644
--- a/tests/commands.tcl
+++ b/tests/commands.tcl
@@ -15,13 +15,12 @@ if {[::rivet::var exists cmd]} {
 
             puts [::rivet::xml "a text string" a [list b a1 v1 a2 v2] [list c 
a1 v1 a2 v2]]
             puts [::rivet::xml "a text string" [list b a1 v1 a2 v2] [list c a1 
v1 a2 v2] a]
-
             puts [::rivet::xml "" [list b a1 v1 a2 v2] [list c a1 v1 a2 v2] a]
 
             # self closing single element
 
             puts [::rivet::xml [list a a1 v1 a2 v2]]
-            puts -nonewline [::rivet::xml p]
+            puts -nonewline [::rivet::xml br]
         }
         default {
             puts "invalid argument '$cmd'"
diff --git a/tests/commands.test b/tests/commands.test
index bbee9bd..a770583 100644
--- a/tests/commands.test
+++ b/tests/commands.test
@@ -13,4 +13,4 @@
 <b a1="v1" a2="v2"><c a1="v1" a2="v2"><a>a text string</a></c></b>
 <b a1="v1" a2="v2"><c a1="v1" a2="v2"><a></a></c></b>
 <a a1="v1" a2="v2"/>
-<p />}
+<br />}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@tcl.apache.org
For additional commands, e-mail: commits-h...@tcl.apache.org