From: Samuel GOUGEON <sgougeon@free.fr>
Date: Wed, 1 Jun 2016 09:53:15 +0000 (+0200)
Subject: Add support to valign and nowrap features in <td> and <th> tags in help pages
X-Git-Tag: 6.0.0-beta-2~23
X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=commitdiff_plain;h=8a9880682ca657e99f852fd6931fd475f366bd50

Add support to valign and nowrap features in <td> and <th> tags in help pages

Change-Id: I66d1ece8b72b28d7b1461a043dbe20dc4600daf5
---

diff --git a/scilab/CHANGES b/scilab/CHANGES
index d6d8195..9f0fcb6 100644
--- a/scilab/CHANGES
+++ b/scilab/CHANGES
@@ -135,10 +135,10 @@ Other feature additions
   - fixed / improved:  members, part, ode, ode_optional_output, ode_roots, roots, printf, sprintf, iconvert, stdev, xlabel
   - rewriten: consolebox, double, isoview, householder
   - resorted: else, elseif, end, try, sciargs, global, halt, empty, power
+  - added: support to valign=".." and style="white-space:nowrap" attributes for <td> and <th> tags in help page tables
 
 * real(), imag(), conj() and isreal() now accept rational fractions
 
-
 Installation
 ============
 
diff --git a/scilab/modules/helptools/data/css/style.css b/scilab/modules/helptools/data/css/style.css
index a99242e..4edf170 100644
--- a/scilab/modules/helptools/data/css/style.css
+++ b/scilab/modules/helptools/data/css/style.css
@@ -350,7 +350,7 @@ div#cadre_help
 }
 
 table.revhistory
-{ 
+{
   width:80%;
   border-color:#CCCCCC;
   border-style:solid;
@@ -359,6 +359,11 @@ table.revhistory
 }
 
 table.revhistory tr.title td
-{ 
+{
   background-color: #9999CC;
 }
+
+td.revnumber
+{
+  vertical-align: top;
+}
diff --git a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/HTMLDocbookTagConverter.java b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/HTMLDocbookTagConverter.java
index d45105b..2c005a5 100644
--- a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/HTMLDocbookTagConverter.java
+++ b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/HTMLDocbookTagConverter.java
@@ -1521,12 +1521,14 @@ public class HTMLDocbookTagConverter extends DocbookTagConverter implements Temp
      * @throws SAXEception if an error is encountered
      */
     public String handleTd(final Map<String, String> attributes, final String contents) throws SAXException {
-        String align = attributes.get("align");
+        String align   = attributes.get("align");
+        String valign  = attributes.get("valign");
         String bgcolor = attributes.get("bgcolor");
         String colspan = attributes.get("colspan");
         String rowspan = attributes.get("rowspan");
+        String style   = attributes.get("style");   /*  for style="white-space:nowrap" */
 
-        return encloseContents("td", new String[] {"align", align, "bgcolor", bgcolor, "colspan", colspan, "rowspan", rowspan}, contents);
+        return encloseContents("td", new String[] {"align", align, "valign", valign, "bgcolor", bgcolor, "colspan", colspan, "rowspan", rowspan, "style", style}, contents);
     }
 
     /**
@@ -1873,7 +1875,11 @@ public class HTMLDocbookTagConverter extends DocbookTagConverter implements Temp
      * @throws SAXEception if an error is encountered
      */
     public String handleTh(final Map<String, String> attributes, final String contents) throws SAXException {
-        return encloseContents("th", contents);
+        String align = attributes.get("align");
+        String valign = attributes.get("valign");
+        String style   = attributes.get("style");   /*  for style="white-space:nowrap" */
+
+        return encloseContents("th", new String[] {"align", align, "valign", valign, "style", style}, contents);
     }
 
     /**