Bug 13187 fixed: xmltoformat did not include imageobjects in output 77/13977/3
Calixte DENIZET [Tue, 11 Mar 2014 15:16:52 +0000 (16:16 +0100)]
Change-Id: I14c75bdd483f6e89a201ed3ca01f044d11648dea

scilab/CHANGES_5.5.X
scilab/modules/helptools/src/java/org/scilab/modules/helptools/DocbookTagConverter.java
scilab/modules/helptools/src/java/org/scilab/modules/helptools/SciDocMain.java

index 2940b3c..af97bf1 100644 (file)
@@ -700,6 +700,8 @@ Scilab Bug Fixes
 
 * Bug #13186 fixed - csvRead freezed Scilab if separator was an empty string.
 
+* Bug #13187 fixed - xmltoformat did not include "imageobjects" in output.
+
 * Bug #13188 fixed - The output argument of eomday function was not pre-dimensioned.
 
 * Bug #13191 fixed - isempty(rational) returned an error message.
index e9d7d69..be50ae1 100644 (file)
@@ -314,6 +314,13 @@ public abstract class DocbookTagConverter extends DefaultHandler implements Conv
      * {@inheritDoc}
      */
     public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
+        if (publicId != null) {
+            publicId = publicId.replaceAll(" ", "%20");
+        }
+        if (systemId != null) {
+            systemId = systemId.replaceAll(" ", "%20");
+        }
+
         currentFileName = systemId;
         currentBaseName = new File(systemId).getName();
 
index 2e8323f..ad22149 100644 (file)
@@ -127,18 +127,24 @@ public final class SciDocMain {
 
             switch (format) {
                 case JAVAHELP:
-                    imgConvert.loadMD5s(ScilabConstants.SCI.getPath() + "/modules/helptools/etc");
+                    if (!isToolbox) {
+                        imgConvert.loadMD5s(ScilabConstants.SCI.getPath() + "/modules/helptools/etc");
+                    }
                     converter = new JavaHelpDocbookTagConverter(sourceDoc, this, imgConvert);
                     break;
                 case HTML:
                     converter = new HTMLDocbookTagConverter(sourceDoc, this, imgConvert);
                     break;
                 case WEB:
-                    imgConvert.loadMD5s(ScilabConstants.SCI.getPath() + "/modules/helptools/etc");
+                    if (!isToolbox) {
+                        imgConvert.loadMD5s(ScilabConstants.SCI.getPath() + "/modules/helptools/etc");
+                    }
                     converter = new HTMLDocbookTagConverter(sourceDoc, this, imgConvert);
                     break;
                 case CHM:
-                    imgConvert.loadMD5s(ScilabConstants.SCI.getPath() + "/modules/helptools/etc");
+                    if (!isToolbox) {
+                        imgConvert.loadMD5s(ScilabConstants.SCI.getPath() + "/modules/helptools/etc");
+                    }
                     converter = new CHMDocbookTagConverter(sourceDoc, this, imgConvert);
                     break;
                 case FO: