From 906af0c16894835b4111ca5592640bc094ada980 Mon Sep 17 00:00:00 2001
From: Nicolas <nicolas.carrez@scilab-enterprises.com>
Date: Thu, 10 Mar 2016 15:55:31 +0100
Subject: [PATCH] * Bug #13939 fixed - HTML pages: itemizedlist <ul> were
 rendered as ordered ones

  help man : docbook tags were missorted. function and varname tags added

Change-Id: Ib447ff04bf97ecdafa1a41f80ec0257b7cf8b8b9
---
 scilab/CHANGES                              |    2 +
 scilab/modules/coverage/data/mod_style.css  |    6 +-
 scilab/modules/coverage/data/src_style.css  |    6 +-
 scilab/modules/helptools/data/css/style.css |    6 +-
 scilab/modules/helptools/help/en_US/man.xml |  147 ++++++++++++++++-----------
 5 files changed, 97 insertions(+), 70 deletions(-)

diff --git a/scilab/CHANGES b/scilab/CHANGES
index f5892d6..dc69bda 100644
--- a/scilab/CHANGES
+++ b/scilab/CHANGES
@@ -331,6 +331,8 @@ In 6.0.0:
 
 * Bug #13897 fixed - concatenating structures with same fields in mismatching orders failed
 
+* Bug #13939 fixed - in HTML help pages, itemizedlist <ul> were rendered as ordered ones
+
 * Bug #13965 fixed - The rendering of histograms with histplot() was poor
 
 * Bug #13974 fixed - isoview(xmin, xmax, ymin, ymax) was unhandy.
diff --git a/scilab/modules/coverage/data/mod_style.css b/scilab/modules/coverage/data/mod_style.css
index 6cd3e0c..52ee2b4f 100644
--- a/scilab/modules/coverage/data/mod_style.css
+++ b/scilab/modules/coverage/data/mod_style.css
@@ -335,16 +335,16 @@ a:hover {
 }
 
 .itemizedlist {
-    list-style-type: disk;
+    list-style-type: disc;
 }
 
 .inline-list li {
     display: inline;
-    list-style-type: disk;
+    list-style-type: disc;
 }
 
 .vert-list {
-    list-style-type: disk;
+    list-style-type: disc;
 }
 
 pre {
diff --git a/scilab/modules/coverage/data/src_style.css b/scilab/modules/coverage/data/src_style.css
index 66312fb..f7fcb2b 100644
--- a/scilab/modules/coverage/data/src_style.css
+++ b/scilab/modules/coverage/data/src_style.css
@@ -269,16 +269,16 @@ a:hover {
 }
 
 .itemizedlist {
-    list-style-type: disk;
+    list-style-type: disc;
 }
 
 .inline-list li {
     display: inline;
-    list-style-type: disk;
+    list-style-type: disc;
 }
 
 .vert-list {
-    list-style-type: disk;
+    list-style-type: disc;
 }
 
 pre {
diff --git a/scilab/modules/helptools/data/css/style.css b/scilab/modules/helptools/data/css/style.css
index 961dcc4..a99242e 100644
--- a/scilab/modules/helptools/data/css/style.css
+++ b/scilab/modules/helptools/data/css/style.css
@@ -114,16 +114,16 @@ a:hover {
 }
 
 .itemizedlist {
-    list-style-type: disk;
+    list-style-type: disc;
 }
 
 .inline-list li {
     display: inline;
-    list-style-type: disk;
+    list-style-type: disc;
 }
 
 .vert-list {
-    list-style-type: disk;
+    list-style-type: disc;
 }
 
 pre {
diff --git a/scilab/modules/helptools/help/en_US/man.xml b/scilab/modules/helptools/help/en_US/man.xml
index af4bc75..258330a 100644
--- a/scilab/modules/helptools/help/en_US/man.xml
+++ b/scilab/modules/helptools/help/en_US/man.xml
@@ -3,7 +3,7 @@
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA
  * Copyright (C) 2010 - DIGITEO - Allan CORNET
- * 
+ *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
@@ -63,7 +63,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink"
 xmlns:svg="http://www.w3.org/2000/svg"
 xmlns:ns4="http://www.w3.org/1999/xhtml"
 xmlns:mml="http://www.w3.org/1998/Math/MathML"
-xmlns:db="http://docbook.org/ns/docbook"&gt; 
+xmlns:db="http://docbook.org/ns/docbook"&gt;
  ]]></programlisting>
         <para role="bold">Example:</para>
         <programlisting role="example"><![CDATA[
@@ -137,8 +137,8 @@ end
   &lt;refsection&gt;
     &lt;title&gt;Description&lt;/title&gt;
     &lt;para&gt;
-      Add here a paragraph of the function description. 
-      Other paragraph can be added 
+      Add here a paragraph of the function description.
+      Other paragraph can be added
     &lt;/para&gt;
     &lt;para&gt;With a latex expression
     &lt;latex&gt;
@@ -221,7 +221,7 @@ end
     </refsection>
     <refsection>
         <title>List of docbook supported tags</title>
-        <para>Generic tags
+        <para>Sectionning and referencing tags:
             <informaltable border="1">
                 <tr>
                     <td>
@@ -231,9 +231,9 @@ end
                 </tr>
                 <tr>
                     <td>
-                        <ulink url="http://docbook.org/tdg/en/html/section.html">section</ulink>
+                        <ulink url="http://docbook.org/tdg/en/html/refsection.html">refsection</ulink>
                     </td>
-                    <td>A recursive section</td>
+                    <td>A recursive section in a refentry</td>
                 </tr>
                 <tr>
                     <td>
@@ -255,9 +255,9 @@ end
                 </tr>
                 <tr>
                     <td>
-                        <ulink url="http://docbook.org/tdg/en/html/title.html">title</ulink>
+                        <ulink url="http://docbook.org/tdg/en/html/section.html">section</ulink>
                     </td>
-                    <td>The text of the title of a section of a document or of a formal block-level element</td>
+                    <td>A recursive section</td>
                 </tr>
                 <tr>
                     <td>
@@ -265,12 +265,11 @@ end
                     </td>
                     <td>A paragraph</td>
                 </tr>
-                <tr>
-                    <td>
-                        <ulink url="http://docbook.org/tdg/en/html/literal.html">literal</ulink>
-                    </td>
-                    <td>Inline text that is some literal value</td>
-                </tr>
+            </informaltable>
+        </para>
+
+        <para>Contents types:
+            <informaltable border="1">
                 <tr>
                     <td>
                         <ulink url="http://docbook.org/tdg/en/html/refnamediv.html">refnamediv</ulink>
@@ -304,9 +303,16 @@ end
                 </tr>
                 <tr>
                     <td>
-                        <ulink url="http://docbook.org/tdg/en/html/refsection.html">refsection</ulink>
+                        <ulink url="http://docbook.org/tdg/en/html/title.html">title</ulink>
+                    </td>
+                    <td>The text of the title of a section of a document or of a formal block-level element</td>
+                </tr>
+                <tr>
+                    <td>
+                        <ulink url="http://docbook.org/tdg/en/html/informalequation.html">informalequation</ulink>
+                    </td>
+                    <td>A displayed mathematical equation without a title
                     </td>
-                    <td>A recursive section in a refentry</td>
                 </tr>
                 <tr>
                     <td>
@@ -322,100 +328,113 @@ end
                 </tr>
                 <tr>
                     <td>
-                        <ulink url="http://docbook.org/tdg/en/html/pubdate.html">pubdate</ulink>
+                        <ulink url="http://docbook.org/tdg/en/html/caption.html">caption</ulink>
                     </td>
-                    <td>The date of publication of a document</td>
+                    <td>A caption</td>
                 </tr>
                 <tr>
                     <td>
-                        <ulink url="http://docbook.org/tdg/en/html/link.html">link</ulink>
+                        <ulink url="http://docbook.org/tdg/en/html/pubdate.html">pubdate</ulink>
                     </td>
-                    <td>A hypertext link</td>
+                    <td>The date of publication of a document</td>
                 </tr>
                 <tr>
                     <td>
-                        <ulink url="http://docbook.org/tdg/en/html/ulink.html">ulink</ulink>
+                        <ulink url="http://docbook.org/tdg/en/html/bibliomset.html">bibliomset</ulink>
                     </td>
-                    <td>A link that addresses its target by means of a URL (Uniform Resource Locator)</td>
+                    <td>A 'cooked' container for related bibliographic information</td>
                 </tr>
                 <tr>
                     <td>
-                        <ulink url="http://docbook.org/tdg/en/html/xref.html">xref</ulink>
+                        <ulink url="http://docbook.org/tdg/en/html/bibliomixed.html">bibliomixed</ulink>
                     </td>
-                    <td>A cross reference to another part of the document</td>
+                    <td>An entry in a Bibliography</td>
                 </tr>
                 <tr>
                     <td>
-                        <ulink url="http://docbook.org/tdg/en/html/term.html">term</ulink>
+                        <ulink url="http://docbook.org/tdg/en/html/surname.html">surname</ulink>
                     </td>
-                    <td>The word or phrase being defined or described in a variable list</td>
+                    <td>A family name; in western cultures the 'last name'</td>
                 </tr>
                 <tr>
                     <td>
-                        <ulink url="http://docbook.org/tdg/en/html/emphasis.html">emphasis</ulink>
+                        <ulink url="http://docbook.org/tdg/en/html/firstname.html">firstname</ulink>
+                    </td>
+                    <td>The first name of a person
                     </td>
-                    <td>Emphasized text</td>
                 </tr>
                 <tr>
                     <td>
-                        <ulink url="http://docbook.org/tdg/en/html/informalequation.html">informalequation</ulink>
+                        <ulink url="http://docbook.org/tdg/en/html/replaceable.html">replaceable</ulink>
                     </td>
-                    <td>A displayed mathematical equation without a title
+                    <td>Content that may or must be replaced by the user
                     </td>
                 </tr>
+            </informaltable>
+        </para>
+        <para>Contents styles:
+            <informaltable border="1">
                 <tr>
                     <td>
-                        <ulink url="http://docbook.org/tdg/en/html/subscript.html">subscript</ulink>
+                        <ulink url="http://docbook.org/tdg/en/html/function.html">function</ulink>
                     </td>
+                    <td>The name of a function or subroutine, as in a programming language</td>
+                </tr>
+                <tr>
                     <td>
-                        A subscript (as in H<subscript>2</subscript>O, the molecular formula for water)
+                        <ulink url="http://docbook.org/tdg/en/html/varname.html">varname</ulink>
                     </td>
+                    <td>The name of a variable</td>
                 </tr>
                 <tr>
                     <td>
-                        <ulink url="http://docbook.org/tdg/en/html/superscript.html">superscript</ulink>
+                        <ulink url="http://docbook.org/tdg/en/html/literal.html">literal</ulink>
                     </td>
+                    <td>Inline text that is some literal value</td>
+                </tr>
+                <tr>
                     <td>
-                        A superscript (as in x<superscript>2</superscript>, the mathematical notation for x multiplied by itself)
+                        <ulink url="http://docbook.org/tdg/en/html/emphasis.html">emphasis</ulink>
                     </td>
+                    <td>Emphasized text</td>
                 </tr>
                 <tr>
                     <td>
-                        <ulink url="http://docbook.org/tdg/en/html/replaceable.html">replaceable</ulink>
+                        <ulink url="http://docbook.org/tdg/en/html/subscript.html">subscript</ulink>
                     </td>
-                    <td>Content that may or must be replaced by the user
+                    <td>
+                        A subscript (as in H<subscript>2</subscript>O, the molecular formula for water)
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <ulink url="http://docbook.org/tdg/en/html/caption.html">caption</ulink>
+                        <ulink url="http://docbook.org/tdg/en/html/superscript.html">superscript</ulink>
                     </td>
-                    <td>A caption</td>
-                </tr>
-                <tr>
                     <td>
-                        <ulink url="http://docbook.org/tdg/en/html/surname.html">surname</ulink>
+                        A superscript (as in x<superscript>2</superscript>, the mathematical notation for x multiplied by itself)
                     </td>
-                    <td>A family name; in western cultures the 'last name'</td>
                 </tr>
+            </informaltable>
+        </para>
+        <para>Links:
+            <informaltable border="1">
                 <tr>
                     <td>
-                        <ulink url="http://docbook.org/tdg/en/html/firstname.html">firstname</ulink>
-                    </td>
-                    <td>The first name of a person
+                        <ulink url="http://docbook.org/tdg/en/html/ulink.html">ulink</ulink>
                     </td>
+                    <td>A link that addresses its target by means of a URL (Uniform Resource Locator)</td>
                 </tr>
                 <tr>
                     <td>
-                        <ulink url="http://docbook.org/tdg/en/html/bibliomset.html">bibliomset</ulink>
+                        <ulink url="http://docbook.org/tdg/en/html/link.html">link</ulink>
                     </td>
-                    <td>A 'cooked' container for related bibliographic information</td>
+                    <td>A hypertext link</td>
                 </tr>
                 <tr>
                     <td>
-                        <ulink url="http://docbook.org/tdg/en/html/bibliomixed.html">bibliomixed</ulink>
+                        <ulink url="http://docbook.org/tdg/en/html/xref.html">xref</ulink>
                     </td>
-                    <td>An entry in a Bibliography</td>
+                    <td>A cross reference to another part of the document</td>
                 </tr>
             </informaltable>
         </para>
@@ -435,16 +454,24 @@ end
                 </tr>
                 <tr>
                     <td>
-                        <ulink url="http://docbook.org/tdg/en/html/listitem.html">listitem</ulink>
+                        <ulink url="http://docbook.org/tdg/en/html/itemizedlist.html">itemizedlist</ulink>
                     </td>
-                    <td>A wrapper for the elements of a list item
+                    <td>A list in which each entry is marked with a bullet or other dingbat
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <ulink url="http://docbook.org/tdg/en/html/varlistentry.html">varlistentry</ulink>
+                        <ulink url="http://docbook.org/tdg/en/html/orderedlist.html">orderedlist</ulink>
+                    </td>
+                    <td>A list in which each entry is marked with a sequentially incremented label
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <ulink url="http://docbook.org/tdg/en/html/listitem.html">listitem</ulink>
+                    </td>
+                    <td>A wrapper for the elements of a list item
                     </td>
-                    <td>A wrapper for a set of terms and the associated description in a variable list</td>
                 </tr>
                 <tr>
                     <td>
@@ -454,17 +481,15 @@ end
                 </tr>
                 <tr>
                     <td>
-                        <ulink url="http://docbook.org/tdg/en/html/itemizedlist.html">itemizedlist</ulink>
-                    </td>
-                    <td>A list in which each entry is marked with a bullet or other dingbat
+                        <ulink url="http://docbook.org/tdg/en/html/term.html">term</ulink>
                     </td>
+                    <td>The word or phrase being defined or described in a variable list</td>
                 </tr>
                 <tr>
                     <td>
-                        <ulink url="http://docbook.org/tdg/en/html/orderedlist.html">orderedlist</ulink>
-                    </td>
-                    <td>A list in which each entry is marked with a sequentially incremented label
+                        <ulink url="http://docbook.org/tdg/en/html/varlistentry.html">varlistentry</ulink>
                     </td>
+                    <td>A wrapper for a set of terms and the associated description in a variable list</td>
                 </tr>
             </informaltable>
         </para>
@@ -668,7 +693,7 @@ end
         <revhistory>
             <revision>
                 <revnumber>5.4.0</revnumber>
-                <revdescription>Management of tags &lt;note&gt;, &lt;caution&gt;, &lt;warning&gt;, &lt;important&gt; and &lt;tip&gt; 
+                <revdescription>Management of tags &lt;note&gt;, &lt;caution&gt;, &lt;warning&gt;, &lt;important&gt; and &lt;tip&gt;
                 </revdescription>
             </revision>
         </revhistory>
-- 
1.7.9.5