File scilab-build-with-fop-2_1.patch of Package scilab

Overview Repositories Revisions Requests Users Attributes Meta

File scilab-build-with-fop-2_1.patch of Package scilab (Revision b4a52c1143b2d58f8f29ad54e0081cb5)

Currently displaying revision b4a52c1143b2d58f8f29ad54e0081cb5 , Show latest

--- a/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java
+++ b/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java
@@ -43,10 +43,10 @@ public class FopConverter extends Contai
         String fileName = outputDirectory + "/" + baseName + "." + format.name().toLowerCase();
 
         try {
-            FopFactory fopFactory = FopFactory.newInstance();
+            final File configuration = new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml");
+            FopFactory fopFactory = FopFactory.newInstance(configuration);
             fopFactory.addElementMapping(new JLaTeXMathElementMapping());
             fopFactory.getXMLHandlerRegistry().addXMLHandler(new JLaTeXMathXMLHandler());
-            fopFactory.setUserConfig(new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml"));
 
             // Step 3: Construct fop with desired output format
             OutputStream out = new BufferedOutputStream(new FileOutputStream(fileName));
--- a/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java
+++ b/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java
@@ -114,11 +114,10 @@ public class CodeExporter extends FOCode
      * @param format the page format
      */
     public void convert(String code, int[] lineNumberArray, String fileName, String type, String title, PageFormat format) {
-        FopFactory fopFactory = FopFactory.newInstance();
         OutputStream out = null;
 
         try {
-            fopFactory.setUserConfig(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml"));
+            FopFactory fopFactory = FopFactory.newInstance(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml"));
             FOUserAgent userAgent = fopFactory.newFOUserAgent();
             userAgent.setProducer(CREATOR);
             userAgent.setTitle(title);

Places

File scilab-build-with-fop-2_1.patch of Package scilab (Revision b4a52c1143b2d58f8f29ad54e0081cb5)

Places