summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scilab/CHANGES_5.3.X21
-rw-r--r--scilab/Makefile.in1
-rw-r--r--scilab/build.incl.xml2
-rwxr-xr-xscilab/configure638
-rw-r--r--scilab/configure.ac11
-rw-r--r--scilab/contrib/Makefile.in1
-rw-r--r--scilab/etc/classpath.xml.in6
-rw-r--r--scilab/etc/classpath.xml.vc17
-rw-r--r--scilab/libs/MALLOC/Makefile.in1
-rw-r--r--scilab/libs/Makefile.in1
-rw-r--r--scilab/libs/doublylinkedlist/Makefile.in1
-rw-r--r--scilab/libs/dynamiclibrary/Makefile.in1
-rw-r--r--scilab/libs/hashtable/Makefile.in1
-rw-r--r--scilab/libs/libst/Makefile.in1
-rw-r--r--scilab/m4/docbook.m44
-rw-r--r--scilab/modules/Makefile.in1
-rw-r--r--scilab/modules/action_binding/Makefile.in1
-rw-r--r--scilab/modules/api_scilab/Makefile.in1
-rw-r--r--scilab/modules/arnoldi/Makefile.in1
-rw-r--r--scilab/modules/atoms/Makefile.in1
-rw-r--r--scilab/modules/boolean/Makefile.in1
-rw-r--r--scilab/modules/cacsd/Makefile.in1
-rw-r--r--scilab/modules/call_scilab/Makefile.in1
-rw-r--r--scilab/modules/compatibility_functions/Makefile.in1
-rw-r--r--scilab/modules/completion/Makefile.in1
-rw-r--r--scilab/modules/console/Makefile.in1
-rw-r--r--scilab/modules/core/Makefile.in1
-rw-r--r--scilab/modules/data_structures/Makefile.in1
-rw-r--r--scilab/modules/demo_tools/Makefile.in1
-rw-r--r--scilab/modules/development_tools/Makefile.in1
-rw-r--r--scilab/modules/development_tools/src/fake/Makefile.in1
-rw-r--r--scilab/modules/differential_equations/Makefile.in1
-rw-r--r--scilab/modules/double/Makefile.in1
-rw-r--r--scilab/modules/dynamic_link/Makefile.in1
-rw-r--r--scilab/modules/elementary_functions/Makefile.in3
-rw-r--r--scilab/modules/fftw/Makefile.in1
-rw-r--r--scilab/modules/fileio/Makefile.in1
-rw-r--r--scilab/modules/functions/Makefile.in4
-rw-r--r--scilab/modules/genetic_algorithms/Makefile.in1
-rw-r--r--scilab/modules/graphic_export/Makefile.in1
-rw-r--r--scilab/modules/graphics/Makefile.in1
-rw-r--r--scilab/modules/graphics/graphics.iss1
-rw-r--r--scilab/modules/gui/Makefile.in1
-rw-r--r--scilab/modules/hdf5/Makefile.in1
-rw-r--r--scilab/modules/helptools/Makefile.in1
-rw-r--r--scilab/modules/helptools/examples/example_1/help/en_US/example_1_function_1.xml11
-rw-r--r--scilab/modules/helptools/examples/example_1/help/fr_FR/example_1_function_1.xml14
-rw-r--r--scilab/modules/helptools/fopconf.xml158
-rw-r--r--scilab/modules/helptools/helptools.iss1
-rw-r--r--scilab/modules/helptools/schema/extendedStyle.xsl18
-rw-r--r--scilab/modules/helptools/src/java/org/scilab/modules/helptools/BuildDocObject.java39
-rw-r--r--scilab/modules/helptools/src/java/org/scilab/modules/helptools/BuildPDF.java14
-rw-r--r--scilab/modules/helptools/src/java/org/scilab/modules/helptools/CopyConvert.java108
-rw-r--r--scilab/modules/history_manager/Makefile.in1
-rw-r--r--scilab/modules/integer/Makefile.in1
-rw-r--r--scilab/modules/interpolation/Makefile.in1
-rw-r--r--scilab/modules/intersci/Makefile.in1
-rw-r--r--scilab/modules/io/Makefile.in1
-rw-r--r--scilab/modules/javasci/Makefile.in1
-rw-r--r--scilab/modules/jvm/Makefile.in1
-rw-r--r--scilab/modules/linear_algebra/Makefile.in1
-rw-r--r--scilab/modules/localization/Makefile.in1
-rw-r--r--scilab/modules/m2sci/Makefile.in1
-rw-r--r--scilab/modules/maple2scilab/Makefile.in1
-rw-r--r--scilab/modules/matio/Makefile.in3
-rw-r--r--scilab/modules/mexlib/Makefile.in1
-rw-r--r--scilab/modules/optimization/Makefile.in1
-rw-r--r--scilab/modules/output_stream/Makefile.in1
-rw-r--r--scilab/modules/overloading/Makefile.in1
-rw-r--r--scilab/modules/parameters/Makefile.in1
-rw-r--r--scilab/modules/polynomials/Makefile.in1
-rw-r--r--scilab/modules/pvm/Makefile.in1
-rw-r--r--scilab/modules/randlib/Makefile.in1
-rw-r--r--scilab/modules/renderer/Makefile.in1
-rw-r--r--scilab/modules/scicos/Makefile.in1
-rw-r--r--scilab/modules/scicos_blocks/Makefile.in1
-rw-r--r--scilab/modules/shell/Makefile.in1
-rw-r--r--scilab/modules/signal_processing/Makefile.in1
-rw-r--r--scilab/modules/simulated_annealing/Makefile.in1
-rw-r--r--scilab/modules/sound/Makefile.in1
-rw-r--r--scilab/modules/sparse/Makefile.in1
-rw-r--r--scilab/modules/special_functions/Makefile.in1
-rw-r--r--scilab/modules/spreadsheet/Makefile.in1
-rw-r--r--scilab/modules/statistics/Makefile.in1
-rw-r--r--scilab/modules/string/Makefile.in3
-rw-r--r--scilab/modules/symbolic/Makefile.in1
-rw-r--r--scilab/modules/tclsci/Makefile.in1
-rw-r--r--scilab/modules/texmacs/Makefile.in1
-rw-r--r--scilab/modules/time/Makefile.in1
-rw-r--r--scilab/modules/umfpack/Makefile.in1
-rw-r--r--scilab/modules/windows_tools/Makefile.in1
-rw-r--r--scilab/modules/xcos/Makefile.in1
-rw-r--r--scilab/modules/xpad/Makefile.in1
-rw-r--r--scilab/scilab-lib-doc.properties.in3
-rw-r--r--scilab/scilab-lib-doc.properties.vc3
-rw-r--r--scilab/scilab-lib.properties.vc2
96 files changed, 1094 insertions, 63 deletions
diff --git a/scilab/CHANGES_5.3.X b/scilab/CHANGES_5.3.X
index 9228a07..5d86c78 100644
--- a/scilab/CHANGES_5.3.X
+++ b/scilab/CHANGES_5.3.X
@@ -8,6 +8,12 @@ Core:
8* Faster access to primitive table (internal). This change improves the overall 8* Faster access to primitive table (internal). This change improves the overall
9speed of Scilab. 9speed of Scilab.
10 10
11Documentation:
12==============
13
14* It is now possible to use LaTeX inline in the documentation. Thanks to
15 Calixte Denizet for this feature. (See bug #4329)
16
11Xcos: 17Xcos:
12===== 18=====
13 19
@@ -16,7 +22,8 @@ Xcos:
16Compilation: 22Compilation:
17============ 23============
18 24
19* On Windows, Pentium III class (or equivalent) with SSE instructions is required. 25* On Windows, Pentium III class (or equivalent) with SSE instructions is
26 required.
20 27
21* Windows 2000 is no more supported as operating system. 28* Windows 2000 is no more supported as operating system.
22 29
@@ -28,10 +35,15 @@ helptools:
28* %helps_modules (global variable in scilab) is defined only when 35* %helps_modules (global variable in scilab) is defined only when
29 scilab build help and no more at scilab's startup. 36 scilab build help and no more at scilab's startup.
30 37
38Text rendering:
39===============
40
41* \textsuperscript LateX was not supported. (See bug #6573)
42
31Tests: 43Tests:
32====== 44======
33 45
34* Mechanism of unitary tests for Java code based on testng added and used 46* Mechanism of unitary tests for Java code based on TestNG added and used
35 47
36Removed functions (previously declared as obsolete): 48Removed functions (previously declared as obsolete):
37==================================================== 49====================================================
@@ -65,11 +77,12 @@ Removed functions (previously declared as obsolete):
65Bug fixes: 77Bug fixes:
66========== 78==========
67 79
68* bug 6419 fixed - gstacksize() There was no way to retrieve minimum from scilab. 80* bug 6419 fixed - gstacksize() There was no way to retrieve minimum from Scilab.
69 81
70* bug 6484 fixed - file did not return filenale of a opened fortran file. 82* bug 6484 fixed - file did not return filenale of a opened fortran file.
71 83
72* bug 6511 fixed - mseek and mtell did not manage files > 2 Gbytes on 64 bits. 84* bug 6511 fixed - mseek and mtell did not manage files > 2 Gbytes on 64 bits
85 Windows.
73 86
74* bug 6516 fixed - fullfile did not remove blanks and not create a valid path. 87* bug 6516 fixed - fullfile did not remove blanks and not create a valid path.
75 88
diff --git a/scilab/Makefile.in b/scilab/Makefile.in
index 5556290..a3a488a 100644
--- a/scilab/Makefile.in
+++ b/scilab/Makefile.in
@@ -406,6 +406,7 @@ JGRAPHX = @JGRAPHX@
406JHALL = @JHALL@ 406JHALL = @JHALL@
407JHDF5 = @JHDF5@ 407JHDF5 = @JHDF5@
408JLATEXMATH = @JLATEXMATH@ 408JLATEXMATH = @JLATEXMATH@
409JLATEXMATH_FOP = @JLATEXMATH_FOP@
409JOGL = @JOGL@ 410JOGL = @JOGL@
410JROSETTA_API = @JROSETTA_API@ 411JROSETTA_API = @JROSETTA_API@
411JROSETTA_ENGINE = @JROSETTA_ENGINE@ 412JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/build.incl.xml b/scilab/build.incl.xml
index 5001716..c844f45 100644
--- a/scilab/build.incl.xml
+++ b/scilab/build.incl.xml
@@ -105,6 +105,8 @@
105 105
106 <pathelement location="${fop.jar}"/> 106 <pathelement location="${fop.jar}"/>
107 107
108 <pathelement location="${jlatexmath-fop.jar}"/>
109
108 <pathelement location="${avalon-framework.jar}"/> 110 <pathelement location="${avalon-framework.jar}"/>
109 111
110 <pathelement location="${avalon-framework-impl.jar}"/> 112 <pathelement location="${avalon-framework-impl.jar}"/>
diff --git a/scilab/configure b/scilab/configure
index 17fe12b..c05d3d9 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -636,6 +636,7 @@ BUILD_HELP_TRUE
636HELP_ENABLE 636HELP_ENABLE
637DOCBOOK_ROOT 637DOCBOOK_ROOT
638AVALON_FRAMEWORK 638AVALON_FRAMEWORK
639JLATEXMATH_FOP
639XML_APIS_EXT 640XML_APIS_EXT
640XMLGRAPHICS_COMMONS 641XMLGRAPHICS_COMMONS
641COMMONS_IO 642COMMONS_IO
@@ -740,6 +741,10 @@ JAVA_DEBUG_OPTIONS
740JAVA_HOME 741JAVA_HOME
741JAVA_JNI_LIBS 742JAVA_JNI_LIBS
742JAVA_JNI_INCLUDE 743JAVA_JNI_INCLUDE
744JUNIT
745BSH
746QDOX
747TESTNG
743ANTLR 748ANTLR
744COMMONS_BEANUTILS 749COMMONS_BEANUTILS
745CHECKSTYLE 750CHECKSTYLE
@@ -9840,7 +9845,7 @@ $as_echo "$ac_java_classpath" >&6; }
9840$as_echo_n "checking to see if the java compiler works... " >&6; } 9845$as_echo_n "checking to see if the java compiler works... " >&6; }
9841 9846
9842 cat << \EOF > conftest.java 9847 cat << \EOF > conftest.java
9843// #line 9843 "configure" 9848// #line 9848 "configure"
9844 9849
9845 9850
9846public class conftest { 9851public class conftest {
@@ -9900,7 +9905,7 @@ $as_echo_n "checking type of jvm... " >&6; }
9900 if test "x$ac_java_jvm_name" = "x" ; then 9905 if test "x$ac_java_jvm_name" = "x" ; then
9901 9906
9902 cat << \EOF > conftest.java 9907 cat << \EOF > conftest.java
9903// #line 9903 "configure" 9908// #line 9908 "configure"
9904import gnu.java.io.EncodingManager; 9909import gnu.java.io.EncodingManager;
9905 9910
9906public class conftest { 9911public class conftest {
@@ -9958,7 +9963,7 @@ $as_echo_n "checking java API version... " >&6; }
9958 9963
9959 9964
9960 cat << \EOF > conftest.java 9965 cat << \EOF > conftest.java
9961// #line 9961 "configure" 9966// #line 9966 "configure"
9962import java.nio.charset.Charset; 9967import java.nio.charset.Charset;
9963 9968
9964public class conftest { 9969public class conftest {
@@ -9997,7 +10002,7 @@ EOF
9997 10002
9998 10003
9999 cat << \EOF > conftest.java 10004 cat << \EOF > conftest.java
10000// #line 10000 "configure" 10005// #line 10005 "configure"
10001import java.lang.StringBuilder; 10006import java.lang.StringBuilder;
10002 10007
10003public class conftest { 10008public class conftest {
@@ -11247,7 +11252,7 @@ $as_echo_n "checking jgraphx... " >&6; }
11247 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11252 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11248 11253
11249 cat << \EOF > conftest.java 11254 cat << \EOF > conftest.java
11250// #line 11250 "configure" 11255// #line 11255 "configure"
11251import com.mxgraph.model.mxCell; 11256import com.mxgraph.model.mxCell;
11252 11257
11253public class conftest { 11258public class conftest {
@@ -11334,7 +11339,7 @@ $as_echo_n "checking minimal version (1.2.0.7) of jgraphx... " >&6; }
11334 export ac_java_classpath="$JGRAPHX:$ac_java_classpath" 11339 export ac_java_classpath="$JGRAPHX:$ac_java_classpath"
11335 11340
11336 cat << \EOF > conftest.java 11341 cat << \EOF > conftest.java
11337// #line 11337 "configure" 11342// #line 11342 "configure"
11338import com.mxgraph.view.mxGraph; 11343import com.mxgraph.view.mxGraph;
11339 11344
11340public class conftest { 11345public class conftest {
@@ -11398,7 +11403,7 @@ $as_echo_n "checking flexdock... " >&6; }
11398 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11403 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11399 11404
11400 cat << \EOF > conftest.java 11405 cat << \EOF > conftest.java
11401// #line 11401 "configure" 11406// #line 11406 "configure"
11402import org.flexdock.docking.DockingManager; 11407import org.flexdock.docking.DockingManager;
11403 11408
11404public class conftest { 11409public class conftest {
@@ -11499,7 +11504,7 @@ $as_echo_n "checking looks... " >&6; }
11499 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11504 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11500 11505
11501 cat << \EOF > conftest.java 11506 cat << \EOF > conftest.java
11502// #line 11502 "configure" 11507// #line 11507 "configure"
11503import com.jgoodies.looks.common.RenderingUtils; 11508import com.jgoodies.looks.common.RenderingUtils;
11504 11509
11505public class conftest { 11510public class conftest {
@@ -11600,7 +11605,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
11600 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11605 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11601 11606
11602 cat << \EOF > conftest.java 11607 cat << \EOF > conftest.java
11603// #line 11603 "configure" 11608// #line 11608 "configure"
11604import com.jgoodies.looks.common.RenderingUtils; 11609import com.jgoodies.looks.common.RenderingUtils;
11605 11610
11606public class conftest { 11611public class conftest {
@@ -11702,7 +11707,7 @@ $as_echo_n "checking skinlf... " >&6; }
11702 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11707 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11703 11708
11704 cat << \EOF > conftest.java 11709 cat << \EOF > conftest.java
11705// #line 11705 "configure" 11710// #line 11710 "configure"
11706import com.l2fprod.util.AccessUtils; 11711import com.l2fprod.util.AccessUtils;
11707 11712
11708public class conftest { 11713public class conftest {
@@ -11803,7 +11808,7 @@ $as_echo_n "checking jogl... " >&6; }
11803 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11808 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11804 11809
11805 cat << \EOF > conftest.java 11810 cat << \EOF > conftest.java
11806// #line 11806 "configure" 11811// #line 11811 "configure"
11807import javax.media.opengl.glu.GLUnurbs; 11812import javax.media.opengl.glu.GLUnurbs;
11808 11813
11809public class conftest { 11814public class conftest {
@@ -12004,7 +12009,7 @@ $as_echo_n "checking gluegen-rt... " >&6; }
12004 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12009 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12005 12010
12006 cat << \EOF > conftest.java 12011 cat << \EOF > conftest.java
12007// #line 12007 "configure" 12012// #line 12012 "configure"
12008import com.sun.gluegen.runtime.CPU; 12013import com.sun.gluegen.runtime.CPU;
12009 12014
12010public class conftest { 12015public class conftest {
@@ -12160,7 +12165,7 @@ $as_echo_n "checking jhall... " >&6; }
12160 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12165 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12161 12166
12162 cat << \EOF > conftest.java 12167 cat << \EOF > conftest.java
12163// #line 12163 "configure" 12168// #line 12168 "configure"
12164import javax.help.JHelp; 12169import javax.help.JHelp;
12165 12170
12166public class conftest { 12171public class conftest {
@@ -12261,7 +12266,7 @@ $as_echo_n "checking javahelp2... " >&6; }
12261 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12266 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12262 12267
12263 cat << \EOF > conftest.java 12268 cat << \EOF > conftest.java
12264// #line 12264 "configure" 12269// #line 12269 "configure"
12265import javax.help.JHelp; 12270import javax.help.JHelp;
12266 12271
12267public class conftest { 12272public class conftest {
@@ -12363,7 +12368,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
12363 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12368 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12364 12369
12365 cat << \EOF > conftest.java 12370 cat << \EOF > conftest.java
12366// #line 12366 "configure" 12371// #line 12371 "configure"
12367import com.artenum.rosetta.interfaces.core.ConsoleConfiguration; 12372import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
12368 12373
12369public class conftest { 12374public class conftest {
@@ -12464,7 +12469,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
12464 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12469 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12465 12470
12466 cat << \EOF > conftest.java 12471 cat << \EOF > conftest.java
12467// #line 12467 "configure" 12472// #line 12472 "configure"
12468import com.artenum.rosetta.core.action.AbstractConsoleAction; 12473import com.artenum.rosetta.core.action.AbstractConsoleAction;
12469 12474
12470public class conftest { 12475public class conftest {
@@ -12567,7 +12572,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
12567 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12572 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12568 12573
12569 cat << \EOF > conftest.java 12574 cat << \EOF > conftest.java
12570// #line 12570 "configure" 12575// #line 12575 "configure"
12571import net.sourceforge.jeuclid.LayoutContext; 12576import net.sourceforge.jeuclid.LayoutContext;
12572 12577
12573public class conftest { 12578public class conftest {
@@ -12670,7 +12675,7 @@ $as_echo_n "checking jhdf5... " >&6; }
12670 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12675 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12671 12676
12672 cat << \EOF > conftest.java 12677 cat << \EOF > conftest.java
12673// #line 12673 "configure" 12678// #line 12678 "configure"
12674import ncsa.hdf.hdf5lib.HDF5Constants; 12679import ncsa.hdf.hdf5lib.HDF5Constants;
12675 12680
12676public class conftest { 12681public class conftest {
@@ -12772,7 +12777,7 @@ $as_echo_n "checking commons-logging... " >&6; }
12772 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12777 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12773 12778
12774 cat << \EOF > conftest.java 12779 cat << \EOF > conftest.java
12775// #line 12775 "configure" 12780// #line 12780 "configure"
12776import org.apache.commons.logging.LogFactory; 12781import org.apache.commons.logging.LogFactory;
12777 12782
12778public class conftest { 12783public class conftest {
@@ -12852,7 +12857,7 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar commons-lo
12852 COMMONS_LOGGING=$PACKAGE_JAR_FILE 12857 COMMONS_LOGGING=$PACKAGE_JAR_FILE
12853 12858
12854 12859
12855 # JLaTeXMath 12860 # JLaTeXMath
12856 12861
12857 { $as_echo "$as_me:${as_lineno-$LINENO}: checking jlatexmath" >&5 12862 { $as_echo "$as_me:${as_lineno-$LINENO}: checking jlatexmath" >&5
12858$as_echo_n "checking jlatexmath... " >&6; } 12863$as_echo_n "checking jlatexmath... " >&6; }
@@ -12873,7 +12878,7 @@ $as_echo_n "checking jlatexmath... " >&6; }
12873 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12878 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12874 12879
12875 cat << \EOF > conftest.java 12880 cat << \EOF > conftest.java
12876// #line 12876 "configure" 12881// #line 12881 "configure"
12877import org.scilab.forge.jlatexmath.TeXFormula; 12882import org.scilab.forge.jlatexmath.TeXFormula;
12878 12883
12879public class conftest { 12884public class conftest {
@@ -12950,7 +12955,57 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jlatexmath
12950 fi 12955 fi
12951 fi 12956 fi
12952 12957
12953 JLATEXMATH=$PACKAGE_JAR_FILE 12958 JLATEXMATH=$PACKAGE_JAR_FILE
12959
12960
12961
12962 { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (0.8.8) of jlatexmath" >&5
12963$as_echo_n "checking minimal version (0.8.8) of jlatexmath... " >&6; }
12964 saved_ac_java_classpath=$ac_java_classpath
12965 export ac_java_classpath="$JLATEXMATH:$ac_java_classpath"
12966
12967 cat << \EOF > conftest.java
12968// #line 12968 "configure"
12969import org.scilab.forge.jlatexmath.TeXFormula;
12970
12971public class conftest {
12972 public static void main(String[] argv) {
12973 String minVersion="0.8.8";
12974 if (minVersion.compareTo(TeXFormula.VERSION) > 0) {
12975 System.exit(-1);
12976 }
12977
12978 }
12979}
12980EOF
12981
12982 CLASSPATH=$ac_java_classpath
12983 export CLASSPATH
12984 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
12985 if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
12986 if test ""yes"" = "no"; then
12987 echo "yes" >&5
12988 echo "yes"
12989 else
12990 cmd="$JAVA conftest"
12991 if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then
12992 echo "yes" >&5
12993 echo "yes"
12994 else
12995 echo "configure: failed program was:" >&5
12996 cat conftest.java >&5
12997 echo "configure: CLASSPATH was $CLASSPATH" >&5
12998 as_fn_error "Wrong version of jlatexmath. Expected at least 0.8.8" "$LINENO" 5
12999 fi
13000 fi
13001 else
13002 echo "configure: failed program was:" >&5
13003 cat conftest.java >&5
13004 echo "configure: CLASSPATH was $CLASSPATH" >&5
13005 as_fn_error "Wrong version of jlatexmath. Expected at least 0.8.8" "$LINENO" 5
13006 fi
13007
13008 ac_java_classpath=$saved_ac_java_classpath
12954 13009
12955 13010
12956 13011
@@ -12980,7 +13035,7 @@ $as_echo_n "checking checkstyle... " >&6; }
12980 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13035 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12981 13036
12982 cat << \EOF > conftest.java 13037 cat << \EOF > conftest.java
12983// #line 12983 "configure" 13038// #line 13038 "configure"
12984import com.puppycrawl.tools.checkstyle.CheckStyleTask; 13039import com.puppycrawl.tools.checkstyle.CheckStyleTask;
12985 13040
12986public class conftest { 13041public class conftest {
@@ -13081,7 +13136,7 @@ $as_echo_n "checking commons-beanutils... " >&6; }
13081 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13136 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13082 13137
13083 cat << \EOF > conftest.java 13138 cat << \EOF > conftest.java
13084// #line 13084 "configure" 13139// #line 13139 "configure"
13085import org.apache.commons.beanutils.Converter; 13140import org.apache.commons.beanutils.Converter;
13086 13141
13087public class conftest { 13142public class conftest {
@@ -13182,7 +13237,7 @@ $as_echo_n "checking antlr... " >&6; }
13182 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13237 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13183 13238
13184 cat << \EOF > conftest.java 13239 cat << \EOF > conftest.java
13185// #line 13185 "configure" 13240// #line 13240 "configure"
13186import antlr.TokenStreamException; 13241import antlr.TokenStreamException;
13187 13242
13188public class conftest { 13243public class conftest {
@@ -13262,6 +13317,411 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar antlr used
13262 ANTLR=$PACKAGE_JAR_FILE 13317 ANTLR=$PACKAGE_JAR_FILE
13263 13318
13264 13319
13320 # Test NG (java unitary test)
13321
13322 { $as_echo "$as_me:${as_lineno-$LINENO}: checking testng" >&5
13323$as_echo_n "checking testng... " >&6; }
13324 PACKAGE_JAR_FILE=
13325 found_jar=no
13326 saved_ac_java_classpath=$ac_java_classpath
13327 DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)"
13328 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
13329 for jar in "$jardir/testng.jar" "$jardir/libtestng.jar" "$jardir/libtestng-java.jar" "$jardir/testng*.jar"; do
13330# jar=`echo $jar|sed -e 's/ /\\ /'`
13331# echo "protected $jar"
13332# jar_resolved=`ls $jar 2>/dev/null`
13333# echo "looking for $jar_resolved"
13334# TODO check the behaviour when spaces
13335 jars_resolved=`ls $jar 2>/dev/null`
13336 for jar_resolved in $jars_resolved; do # If several jars matches
13337 if test -e "$jar_resolved"; then
13338 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13339
13340 cat << \EOF > conftest.java
13341// #line 13341 "configure"
13342import org.testng.TestNG;
13343
13344public class conftest {
13345 public static void main(String[] argv) {
13346
13347 }
13348}
13349EOF
13350
13351 CLASSPATH=$ac_java_classpath
13352 export CLASSPATH
13353 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
13354 if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
13355 if test ""no"" = "no"; then
13356 echo "yes" >&5
13357
13358 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
13359$as_echo "$jar_resolved" >&6; }
13360 found_jar=yes
13361 PACKAGE_JAR_FILE=$jar_resolved
13362 break
13363
13364 else
13365 cmd="$JAVA conftest"
13366 if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then
13367 echo "yes" >&5
13368
13369 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
13370$as_echo "$jar_resolved" >&6; }
13371 found_jar=yes
13372 PACKAGE_JAR_FILE=$jar_resolved
13373 break
13374
13375 else
13376 echo "configure: failed program was:" >&5
13377 cat conftest.java >&5
13378 echo "configure: CLASSPATH was $CLASSPATH" >&5
13379
13380 ac_java_classpath=$saved_ac_java_classpath
13381
13382
13383 fi
13384 fi
13385 else
13386 echo "configure: failed program was:" >&5
13387 cat conftest.java >&5
13388 echo "configure: CLASSPATH was $CLASSPATH" >&5
13389
13390 ac_java_classpath=$saved_ac_java_classpath
13391
13392
13393 fi
13394
13395 fi
13396 done
13397 # If ls returns several results and the first one is OK, stop the search
13398 if test "$found_jar" = "yes"; then
13399 break
13400 fi
13401 done
13402 # If found, no need to search in other directory
13403 if test "$found_jar" = "yes"; then
13404 break
13405 fi
13406 done
13407 if test "$found_jar" = "no"; then
13408 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13409$as_echo "no" >&6; }
13410 if test ""yes"" = "yes"; then
13411 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar testng used by TestNG - Unit tests (looking for package org.testng.TestNG)" >&5
13412$as_echo "$as_me: WARNING: Could not find or use the Java package/jar testng used by TestNG - Unit tests (looking for package org.testng.TestNG)" >&2;}
13413 else
13414 as_fn_error "Could not find or use the Java package/jar testng used by TestNG - Unit tests (looking for package org.testng.TestNG)" "$LINENO" 5
13415 fi
13416 fi
13417
13418 TESTNG=$PACKAGE_JAR_FILE
13419
13420
13421 # Qdox (parses declarations and Javadoc) - dependency of TestNG
13422
13423 { $as_echo "$as_me:${as_lineno-$LINENO}: checking qdox" >&5
13424$as_echo_n "checking qdox... " >&6; }
13425 PACKAGE_JAR_FILE=
13426 found_jar=no
13427 saved_ac_java_classpath=$ac_java_classpath
13428 DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)"
13429 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
13430 for jar in "$jardir/qdox.jar" "$jardir/libqdox.jar" "$jardir/libqdox-java.jar" "$jardir/qdox*.jar"; do
13431# jar=`echo $jar|sed -e 's/ /\\ /'`
13432# echo "protected $jar"
13433# jar_resolved=`ls $jar 2>/dev/null`
13434# echo "looking for $jar_resolved"
13435# TODO check the behaviour when spaces
13436 jars_resolved=`ls $jar 2>/dev/null`
13437 for jar_resolved in $jars_resolved; do # If several jars matches
13438 if test -e "$jar_resolved"; then
13439 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13440
13441 cat << \EOF > conftest.java
13442// #line 13442 "configure"
13443import com.thoughtworks.qdox.tools.QDoxTester;
13444
13445public class conftest {
13446 public static void main(String[] argv) {
13447
13448 }
13449}
13450EOF
13451
13452 CLASSPATH=$ac_java_classpath
13453 export CLASSPATH
13454 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
13455 if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
13456 if test ""no"" = "no"; then
13457 echo "yes" >&5
13458
13459 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
13460$as_echo "$jar_resolved" >&6; }
13461 found_jar=yes
13462 PACKAGE_JAR_FILE=$jar_resolved
13463 break
13464
13465 else
13466 cmd="$JAVA conftest"
13467 if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then
13468 echo "yes" >&5
13469
13470 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
13471$as_echo "$jar_resolved" >&6; }
13472 found_jar=yes
13473 PACKAGE_JAR_FILE=$jar_resolved
13474 break
13475
13476 else
13477 echo "configure: failed program was:" >&5
13478 cat conftest.java >&5
13479 echo "configure: CLASSPATH was $CLASSPATH" >&5
13480
13481 ac_java_classpath=$saved_ac_java_classpath
13482
13483
13484 fi
13485 fi
13486 else
13487 echo "configure: failed program was:" >&5
13488 cat conftest.java >&5
13489 echo "configure: CLASSPATH was $CLASSPATH" >&5
13490
13491 ac_java_classpath=$saved_ac_java_classpath
13492
13493
13494 fi
13495
13496 fi
13497 done
13498 # If ls returns several results and the first one is OK, stop the search
13499 if test "$found_jar" = "yes"; then
13500 break
13501 fi
13502 done
13503 # If found, no need to search in other directory
13504 if test "$found_jar" = "yes"; then
13505 break
13506 fi
13507 done
13508 if test "$found_jar" = "no"; then
13509 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13510$as_echo "no" >&6; }
13511 if test ""yes"" = "yes"; then
13512 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar qdox used by Parses declarations and Javadoc (looking for package com.thoughtworks.qdox.tools.QDoxTester)" >&5
13513$as_echo "$as_me: WARNING: Could not find or use the Java package/jar qdox used by Parses declarations and Javadoc (looking for package com.thoughtworks.qdox.tools.QDoxTester)" >&2;}
13514 else
13515 as_fn_error "Could not find or use the Java package/jar qdox used by Parses declarations and Javadoc (looking for package com.thoughtworks.qdox.tools.QDoxTester)" "$LINENO" 5
13516 fi
13517 fi
13518
13519 QDOX=$PACKAGE_JAR_FILE
13520
13521
13522 # bsh (Java scripting environment) - dependency of TestNG
13523
13524 { $as_echo "$as_me:${as_lineno-$LINENO}: checking bsh" >&5
13525$as_echo_n "checking bsh... " >&6; }
13526 PACKAGE_JAR_FILE=
13527 found_jar=no
13528 saved_ac_java_classpath=$ac_java_classpath
13529 DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)"
13530 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
13531 for jar in "$jardir/bsh.jar" "$jardir/libbsh.jar" "$jardir/libbsh-java.jar" "$jardir/bsh*.jar"; do
13532# jar=`echo $jar|sed -e 's/ /\\ /'`
13533# echo "protected $jar"
13534# jar_resolved=`ls $jar 2>/dev/null`
13535# echo "looking for $jar_resolved"
13536# TODO check the behaviour when spaces
13537 jars_resolved=`ls $jar 2>/dev/null`
13538 for jar_resolved in $jars_resolved; do # If several jars matches
13539 if test -e "$jar_resolved"; then
13540 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13541
13542 cat << \EOF > conftest.java
13543// #line 13543 "configure"
13544import bsh.Console;
13545
13546public class conftest {
13547 public static void main(String[] argv) {
13548
13549 }
13550}
13551EOF
13552
13553 CLASSPATH=$ac_java_classpath
13554 export CLASSPATH
13555 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
13556 if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
13557 if test ""no"" = "no"; then
13558 echo "yes" >&5
13559
13560 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
13561$as_echo "$jar_resolved" >&6; }
13562 found_jar=yes
13563 PACKAGE_JAR_FILE=$jar_resolved
13564 break
13565
13566 else
13567 cmd="$JAVA conftest"
13568 if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then
13569 echo "yes" >&5
13570
13571 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
13572$as_echo "$jar_resolved" >&6; }
13573 found_jar=yes
13574 PACKAGE_JAR_FILE=$jar_resolved
13575 break
13576
13577 else
13578 echo "configure: failed program was:" >&5
13579 cat conftest.java >&5
13580 echo "configure: CLASSPATH was $CLASSPATH" >&5
13581
13582 ac_java_classpath=$saved_ac_java_classpath
13583
13584
13585 fi
13586 fi
13587 else
13588 echo "configure: failed program was:" >&5
13589 cat conftest.java >&5
13590 echo "configure: CLASSPATH was $CLASSPATH" >&5
13591
13592 ac_java_classpath=$saved_ac_java_classpath
13593
13594
13595 fi
13596
13597 fi
13598 done
13599 # If ls returns several results and the first one is OK, stop the search
13600 if test "$found_jar" = "yes"; then
13601 break
13602 fi
13603 done
13604 # If found, no need to search in other directory
13605 if test "$found_jar" = "yes"; then
13606 break
13607 fi
13608 done
13609 if test "$found_jar" = "no"; then
13610 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13611$as_echo "no" >&6; }
13612 if test ""yes"" = "yes"; then
13613 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar bsh used by Java scripting environment (looking for package bsh.Console)" >&5
13614$as_echo "$as_me: WARNING: Could not find or use the Java package/jar bsh used by Java scripting environment (looking for package bsh.Console)" >&2;}
13615 else
13616 as_fn_error "Could not find or use the Java package/jar bsh used by Java scripting environment (looking for package bsh.Console)" "$LINENO" 5
13617 fi
13618 fi
13619
13620 BSH=$PACKAGE_JAR_FILE
13621
13622
13623 # Junit - dependency of TestNG
13624
13625 { $as_echo "$as_me:${as_lineno-$LINENO}: checking junit" >&5
13626$as_echo_n "checking junit... " >&6; }
13627 PACKAGE_JAR_FILE=
13628 found_jar=no
13629 saved_ac_java_classpath=$ac_java_classpath
13630 DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)"
13631 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
13632 for jar in "$jardir/junit.jar" "$jardir/libjunit.jar" "$jardir/libjunit-java.jar" "$jardir/junit*.jar"; do
13633# jar=`echo $jar|sed -e 's/ /\\ /'`
13634# echo "protected $jar"
13635# jar_resolved=`ls $jar 2>/dev/null`
13636# echo "looking for $jar_resolved"
13637# TODO check the behaviour when spaces
13638 jars_resolved=`ls $jar 2>/dev/null`
13639 for jar_resolved in $jars_resolved; do # If several jars matches
13640 if test -e "$jar_resolved"; then
13641 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13642
13643 cat << \EOF > conftest.java
13644// #line 13644 "configure"
13645import junit.framework.Assert;
13646
13647public class conftest {
13648 public static void main(String[] argv) {
13649
13650 }
13651}
13652EOF
13653
13654 CLASSPATH=$ac_java_classpath
13655 export CLASSPATH
13656 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
13657 if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
13658 if test ""no"" = "no"; then
13659 echo "yes" >&5
13660
13661 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
13662$as_echo "$jar_resolved" >&6; }
13663 found_jar=yes
13664 PACKAGE_JAR_FILE=$jar_resolved
13665 break
13666
13667 else
13668 cmd="$JAVA conftest"
13669 if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then
13670 echo "yes" >&5
13671
13672 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
13673$as_echo "$jar_resolved" >&6; }
13674 found_jar=yes
13675 PACKAGE_JAR_FILE=$jar_resolved
13676 break
13677
13678 else
13679 echo "configure: failed program was:" >&5
13680 cat conftest.java >&5
13681 echo "configure: CLASSPATH was $CLASSPATH" >&5
13682
13683 ac_java_classpath=$saved_ac_java_classpath
13684
13685
13686 fi
13687 fi
13688 else
13689 echo "configure: failed program was:" >&5
13690 cat conftest.java >&5
13691 echo "configure: CLASSPATH was $CLASSPATH" >&5
13692
13693 ac_java_classpath=$saved_ac_java_classpath
13694
13695
13696 fi
13697
13698 fi
13699 done
13700 # If ls returns several results and the first one is OK, stop the search
13701 if test "$found_jar" = "yes"; then
13702 break
13703 fi
13704 done
13705 # If found, no need to search in other directory
13706 if test "$found_jar" = "yes"; then
13707 break
13708 fi
13709 done
13710 if test "$found_jar" = "no"; then
13711 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13712$as_echo "no" >&6; }
13713 if test ""yes"" = "yes"; then
13714 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar junit used by Unitary tests (looking for package junit.framework.Assert)" >&5
13715$as_echo "$as_me: WARNING: Could not find or use the Java package/jar junit used by Unitary tests (looking for package junit.framework.Assert)" >&2;}
13716 else
13717 as_fn_error "Could not find or use the Java package/jar junit used by Unitary tests (looking for package junit.framework.Assert)" "$LINENO" 5
13718 fi
13719 fi
13720
13721 JUNIT=$PACKAGE_JAR_FILE
13722
13723
13724
13265 else 13725 else
13266 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Sun javac not found: I will not build the java interface" >&5 13726 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Sun javac not found: I will not build the java interface" >&5
13267$as_echo "$as_me: WARNING: Sun javac not found: I will not build the java interface" >&2;} 13727$as_echo "$as_me: WARNING: Sun javac not found: I will not build the java interface" >&2;}
@@ -21370,7 +21830,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
21370{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5 21830{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
21371$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; } 21831$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
21372cat > conftest.$ac_ext <<EOF 21832cat > conftest.$ac_ext <<EOF
21373#line 21373 "configure" 21833#line 21833 "configure"
21374#include "confdefs.h" 21834#include "confdefs.h"
21375 21835
21376#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME" 21836#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -21682,7 +22142,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
21682$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; } 22142$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
21683 22143
21684cat > conftest.$ac_ext <<EOF 22144cat > conftest.$ac_ext <<EOF
21685#line 21685 "configure" 22145#line 22145 "configure"
21686#include "confdefs.h" 22146#include "confdefs.h"
21687 22147
21688#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME" 22148#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -22264,7 +22724,7 @@ $as_echo_n "checking batik-all... " >&6; }
22264 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 22724 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22265 22725
22266 cat << \EOF > conftest.java 22726 cat << \EOF > conftest.java
22267// #line 22267 "configure" 22727// #line 22727 "configure"
22268import org.apache.batik.parser.Parser; 22728import org.apache.batik.parser.Parser;
22269 22729
22270public class conftest { 22730public class conftest {
@@ -22365,7 +22825,7 @@ $as_echo_n "checking batik... " >&6; }
22365 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 22825 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22366 22826
22367 cat << \EOF > conftest.java 22827 cat << \EOF > conftest.java
22368// #line 22368 "configure" 22828// #line 22828 "configure"
22369import org.apache.batik.parser.Parser; 22829import org.apache.batik.parser.Parser;
22370 22830
22371public class conftest { 22831public class conftest {
@@ -22468,7 +22928,7 @@ $as_echo_n "checking saxon... " >&6; }
22468 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 22928 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22469 22929
22470 cat << \EOF > conftest.java 22930 cat << \EOF > conftest.java
22471// #line 22471 "configure" 22931// #line 22931 "configure"
22472import com.icl.saxon.Loader; 22932import com.icl.saxon.Loader;
22473 22933
22474public class conftest { 22934public class conftest {
@@ -22569,7 +23029,7 @@ $as_echo_n "checking fop... " >&6; }
22569 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 23029 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22570 23030
22571 cat << \EOF > conftest.java 23031 cat << \EOF > conftest.java
22572// #line 22572 "configure" 23032// #line 23032 "configure"
22573import org.apache.fop.pdf.PDFInfo; 23033import org.apache.fop.pdf.PDFInfo;
22574 23034
22575public class conftest { 23035public class conftest {
@@ -22670,7 +23130,7 @@ $as_echo_n "checking commons-io... " >&6; }
22670 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 23130 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22671 23131
22672 cat << \EOF > conftest.java 23132 cat << \EOF > conftest.java
22673// #line 22673 "configure" 23133// #line 23133 "configure"
22674import org.apache.commons.io.output.CountingOutputStream; 23134import org.apache.commons.io.output.CountingOutputStream;
22675 23135
22676public class conftest { 23136public class conftest {
@@ -22771,7 +23231,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
22771 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 23231 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22772 23232
22773 cat << \EOF > conftest.java 23233 cat << \EOF > conftest.java
22774// #line 22774 "configure" 23234// #line 23234 "configure"
22775import org.apache.xmlgraphics.util.Service; 23235import org.apache.xmlgraphics.util.Service;
22776 23236
22777public class conftest { 23237public class conftest {
@@ -22872,7 +23332,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
22872 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 23332 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22873 23333
22874 cat << \EOF > conftest.java 23334 cat << \EOF > conftest.java
22875// #line 22875 "configure" 23335// #line 23335 "configure"
22876import org.w3c.dom.svg.SVGDocument; 23336import org.w3c.dom.svg.SVGDocument;
22877 23337
22878public class conftest { 23338public class conftest {
@@ -22973,7 +23433,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; }
22973 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 23433 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
22974 23434
22975 cat << \EOF > conftest.java 23435 cat << \EOF > conftest.java
22976// #line 22976 "configure" 23436// #line 23436 "configure"
22977import org.w3c.dom.svg.SVGDocument; 23437import org.w3c.dom.svg.SVGDocument;
22978 23438
22979public class conftest { 23439public class conftest {
@@ -23056,6 +23516,106 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar xml-common
23056 23516
23057 23517
23058 23518
23519 # JLaTeXMath
23520
23521 { $as_echo "$as_me:${as_lineno-$LINENO}: checking jlatexmath-fop" >&5
23522$as_echo_n "checking jlatexmath-fop... " >&6; }
23523 PACKAGE_JAR_FILE=
23524 found_jar=no
23525 saved_ac_java_classpath=$ac_java_classpath
23526 DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)"
23527 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
23528 for jar in "$jardir/jlatexmath-fop.jar" "$jardir/libjlatexmath-fop.jar" "$jardir/libjlatexmath-fop-java.jar" "$jardir/jlatexmath-fop*.jar"; do
23529# jar=`echo $jar|sed -e 's/ /\\ /'`
23530# echo "protected $jar"
23531# jar_resolved=`ls $jar 2>/dev/null`
23532# echo "looking for $jar_resolved"
23533# TODO check the behaviour when spaces
23534 jars_resolved=`ls $jar 2>/dev/null`
23535 for jar_resolved in $jars_resolved; do # If several jars matches
23536 if test -e "$jar_resolved"; then
23537 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
23538
23539 cat << \EOF > conftest.java
23540// #line 23540 "configure"
23541import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
23542
23543public class conftest {
23544 public static void main(String[] argv) {
23545
23546 }
23547}
23548EOF
23549
23550 CLASSPATH=$ac_java_classpath
23551 export CLASSPATH
23552 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
23553 if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
23554 if test ""no"" = "no"; then
23555 echo "yes" >&5
23556
23557 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
23558$as_echo "$jar_resolved" >&6; }
23559 found_jar=yes
23560 PACKAGE_JAR_FILE=$jar_resolved
23561 break
23562
23563 else
23564 cmd="$JAVA conftest"
23565 if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then
23566 echo "yes" >&5
23567
23568 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
23569$as_echo "$jar_resolved" >&6; }
23570 found_jar=yes
23571 PACKAGE_JAR_FILE=$jar_resolved
23572 break
23573
23574 else
23575 echo "configure: failed program was:" >&5
23576 cat conftest.java >&5
23577 echo "configure: CLASSPATH was $CLASSPATH" >&5
23578
23579 ac_java_classpath=$saved_ac_java_classpath
23580
23581
23582 fi
23583 fi
23584 else
23585 echo "configure: failed program was:" >&5
23586 cat conftest.java >&5
23587 echo "configure: CLASSPATH was $CLASSPATH" >&5
23588
23589 ac_java_classpath=$saved_ac_java_classpath
23590
23591
23592 fi
23593
23594 fi
23595 done
23596 # If ls returns several results and the first one is OK, stop the search
23597 if test "$found_jar" = "yes"; then
23598 break
23599 fi
23600 done
23601 # If found, no need to search in other directory
23602 if test "$found_jar" = "yes"; then
23603 break
23604 fi
23605 done
23606 if test "$found_jar" = "no"; then
23607 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
23608$as_echo "no" >&6; }
23609 if test "" = "yes"; then
23610 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jlatexmath-fop used by LaTex Rendering - FOP plugin (looking for package org.scilab.forge.jlatexmath.fop.JLaTeXMathObj)" >&5
23611$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jlatexmath-fop used by LaTex Rendering - FOP plugin (looking for package org.scilab.forge.jlatexmath.fop.JLaTeXMathObj)" >&2;}
23612 else
23613 as_fn_error "Could not find or use the Java package/jar jlatexmath-fop used by LaTex Rendering - FOP plugin (looking for package org.scilab.forge.jlatexmath.fop.JLaTeXMathObj)" "$LINENO" 5
23614 fi
23615 fi
23616
23617 JLATEXMATH_FOP=$PACKAGE_JAR_FILE
23618
23059 23619
23060 # Avalon Framework (PDF) 23620 # Avalon Framework (PDF)
23061 23621
@@ -23078,7 +23638,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
23078 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 23638 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
23079 23639
23080 cat << \EOF > conftest.java 23640 cat << \EOF > conftest.java
23081// #line 23081 "configure" 23641// #line 23641 "configure"
23082import org.apache.avalon.framework.configuration.ConfigurationException; 23642import org.apache.avalon.framework.configuration.ConfigurationException;
23083 23643
23084public class conftest { 23644public class conftest {
@@ -29349,7 +29909,7 @@ else
29349 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 29909 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
29350 lt_status=$lt_dlunknown 29910 lt_status=$lt_dlunknown
29351 cat > conftest.$ac_ext <<_LT_EOF 29911 cat > conftest.$ac_ext <<_LT_EOF
29352#line 29352 "configure" 29912#line 29912 "configure"
29353#include "confdefs.h" 29913#include "confdefs.h"
29354 29914
29355#if HAVE_DLFCN_H 29915#if HAVE_DLFCN_H
@@ -29455,7 +30015,7 @@ else
29455 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 30015 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
29456 lt_status=$lt_dlunknown 30016 lt_status=$lt_dlunknown
29457 cat > conftest.$ac_ext <<_LT_EOF 30017 cat > conftest.$ac_ext <<_LT_EOF
29458#line 29458 "configure" 30018#line 30018 "configure"
29459#include "confdefs.h" 30019#include "confdefs.h"
29460 30020
29461#if HAVE_DLFCN_H 30021#if HAVE_DLFCN_H
@@ -38852,6 +39412,7 @@ if test $HELP_ENABLE = yes; then
38852 echo " Batik (SVG) ............ = $BATIK" 39412 echo " Batik (SVG) ............ = $BATIK"
38853 echo " Saxon XSLT ............. = $SAXON" 39413 echo " Saxon XSLT ............. = $SAXON"
38854 echo " FOP (XML => PDF) ....... = $FOP" 39414 echo " FOP (XML => PDF) ....... = $FOP"
39415 echo " JLaTeXMath-FOP ......... = $JLATEXMATH_FOP"
38855 echo " Commons I/O ............ = $COMMONS_IO" 39416 echo " Commons I/O ............ = $COMMONS_IO"
38856 echo " XML graphics commons ... = $XMLGRAPHICS_COMMONS" 39417 echo " XML graphics commons ... = $XMLGRAPHICS_COMMONS"
38857 echo " XML commons external ... = $XML_APIS_EXT" 39418 echo " XML commons external ... = $XML_APIS_EXT"
@@ -38900,6 +39461,7 @@ echo "Code quality (optional):"
38900echo " Checkstyle .......... = $CHECKSTYLE" 39461echo " Checkstyle .......... = $CHECKSTYLE"
38901echo " Commons-beanutils ... = $COMMONS_BEANUTILS" 39462echo " Commons-beanutils ... = $COMMONS_BEANUTILS"
38902echo " Antlr ............... = $ANTLR" 39463echo " Antlr ............... = $ANTLR"
39464echo " TestNG .............. = $TESTNG"
38903echo " splint .............. = $SPLINT" 39465echo " splint .............. = $SPLINT"
38904 39466
38905echo "" 39467echo ""
diff --git a/scilab/configure.ac b/scilab/configure.ac
index 7a10770..78863cc 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -769,10 +769,12 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
769 COMMONS_LOGGING=$PACKAGE_JAR_FILE 769 COMMONS_LOGGING=$PACKAGE_JAR_FILE
770 AC_SUBST(COMMONS_LOGGING) 770 AC_SUBST(COMMONS_LOGGING)
771 771
772 # JLaTeXMath 772 # JLaTeXMath
773 AC_JAVA_CHECK_PACKAGE([jlatexmath],[org.scilab.forge.jlatexmath.TeXFormula],[LaTex Rendering]) 773 AC_JAVA_CHECK_PACKAGE([jlatexmath],[org.scilab.forge.jlatexmath.TeXFormula],[LaTex Rendering])
774 JLATEXMATH=$PACKAGE_JAR_FILE 774 JLATEXMATH=$PACKAGE_JAR_FILE
775 AC_SUBST(JLATEXMATH) 775 AC_SUBST(JLATEXMATH)
776
777 AC_JAVA_CHECK_VERSION_PACKAGE([jlatexmath],[import org.scilab.forge.jlatexmath.TeXFormula;],$JLATEXMATH,[0.8.8],[TeXFormula.VERSION])
776 778
777 AC_DEFINE([WITH_GUI],[],[With the JAVA stuff (GUI, Console, JOGL...)]) 779 AC_DEFINE([WITH_GUI],[],[With the JAVA stuff (GUI, Console, JOGL...)])
778 780
@@ -1801,6 +1803,7 @@ if test $HELP_ENABLE = yes; then
1801 echo " Batik (SVG) ............ = $BATIK" 1803 echo " Batik (SVG) ............ = $BATIK"
1802 echo " Saxon XSLT ............. = $SAXON" 1804 echo " Saxon XSLT ............. = $SAXON"
1803 echo " FOP (XML => PDF) ....... = $FOP" 1805 echo " FOP (XML => PDF) ....... = $FOP"
1806 echo " JLaTeXMath-FOP ......... = $JLATEXMATH_FOP"
1804 echo " Commons I/O ............ = $COMMONS_IO" 1807 echo " Commons I/O ............ = $COMMONS_IO"
1805 echo " XML graphics commons ... = $XMLGRAPHICS_COMMONS" 1808 echo " XML graphics commons ... = $XMLGRAPHICS_COMMONS"
1806 echo " XML commons external ... = $XML_APIS_EXT" 1809 echo " XML commons external ... = $XML_APIS_EXT"
diff --git a/scilab/contrib/Makefile.in b/scilab/contrib/Makefile.in
index b2057be..f8775f6 100644
--- a/scilab/contrib/Makefile.in
+++ b/scilab/contrib/Makefile.in
@@ -149,6 +149,7 @@ JGRAPHX = @JGRAPHX@
149JHALL = @JHALL@ 149JHALL = @JHALL@
150JHDF5 = @JHDF5@ 150JHDF5 = @JHDF5@
151JLATEXMATH = @JLATEXMATH@ 151JLATEXMATH = @JLATEXMATH@
152JLATEXMATH_FOP = @JLATEXMATH_FOP@
152JOGL = @JOGL@ 153JOGL = @JOGL@
153JROSETTA_API = @JROSETTA_API@ 154JROSETTA_API = @JROSETTA_API@
154JROSETTA_ENGINE = @JROSETTA_ENGINE@ 155JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/etc/classpath.xml.in b/scilab/etc/classpath.xml.in
index 671ff10..d888cf6 100644
--- a/scilab/etc/classpath.xml.in
+++ b/scilab/etc/classpath.xml.in
@@ -77,6 +77,11 @@ The option is "disableUnderMode" and can be:
77 <load on="documentationGeneration"/> 77 <load on="documentationGeneration"/>
78 <load on="graphics_mathml_textrendering"/> 78 <load on="graphics_mathml_textrendering"/>
79</path> 79</path>
80
81<path value="@JLATEXMATH_FOP@" load="onUse">
82 <load on="documentationGeneration"/>
83 <load on="pdf_ps_eps_graphic_export"/>
84</path>
80<path value="@FOP@" load="onUse"> 85<path value="@FOP@" load="onUse">
81 <load on="documentationGeneration"/> 86 <load on="documentationGeneration"/>
82 <load on="pdf_ps_eps_graphic_export"/> 87 <load on="pdf_ps_eps_graphic_export"/>
@@ -113,6 +118,7 @@ The option is "disableUnderMode" and can be:
113</path> 118</path>
114 119
115<path value="@JLATEXMATH@" load="onUse"> 120<path value="@JLATEXMATH@" load="onUse">
121 <load on="documentationGeneration"/>
116 <load on="graphics_latex_textrendering"/> 122 <load on="graphics_latex_textrendering"/>
117 <load on="pdf_ps_eps_graphic_export"/> 123 <load on="pdf_ps_eps_graphic_export"/>
118</path> 124</path>
diff --git a/scilab/etc/classpath.xml.vc b/scilab/etc/classpath.xml.vc
index 2c79b9be..c2fbb5d 100644
--- a/scilab/etc/classpath.xml.vc
+++ b/scilab/etc/classpath.xml.vc
@@ -119,10 +119,21 @@ The option is "disableUnderMode" and can be:
119 <load on="pdf_ps_eps_graphic_export"/> 119 <load on="pdf_ps_eps_graphic_export"/>
120</path> 120</path>
121 121
122<path value="$SCILAB/thirdparty/xalan.jar" load="onUse">
123 <load on="documentationGeneration"/>
124 <load on="pdf_ps_eps_graphic_export"/>
125</path>
126
122<path value="$SCILAB/thirdparty/jlatexmath-0.8.8.jar" load="onUse"> 127<path value="$SCILAB/thirdparty/jlatexmath-0.8.8.jar" load="onUse">
123 <load on="graphics_latex_textrendering"/> 128 <load on="documentationGeneration"/>
124 <load on="pdf_ps_eps_graphic_export"/> 129 <load on="graphics_latex_textrendering"/>
125</path> 130 <load on="pdf_ps_eps_graphic_export"/>
131</path>
132
133<path value="$SCILAB/thirdparty/jlatexmath-fop-0.8.8.jar" load="onUse">
134 <load on="documentationGeneration"/>
135 <load on="pdf_ps_eps_graphic_export"/>
136</path>
126 137
127<!-- helptools module doc generation --> 138<!-- helptools module doc generation -->
128<path value="$SCILAB/modules/helptools/jar/org.scilab.modules.helptools.jar" load="onUse"> 139<path value="$SCILAB/modules/helptools/jar/org.scilab.modules.helptools.jar" load="onUse">
diff --git a/scilab/libs/MALLOC/Makefile.in b/scilab/libs/MALLOC/Makefile.in
index a589263..9b44c1c 100644
--- a/scilab/libs/MALLOC/Makefile.in
+++ b/scilab/libs/MALLOC/Makefile.in
@@ -215,6 +215,7 @@ JGRAPHX = @JGRAPHX@
215JHALL = @JHALL@ 215JHALL = @JHALL@
216JHDF5 = @JHDF5@ 216JHDF5 = @JHDF5@
217JLATEXMATH = @JLATEXMATH@ 217JLATEXMATH = @JLATEXMATH@
218JLATEXMATH_FOP = @JLATEXMATH_FOP@
218JOGL = @JOGL@ 219JOGL = @JOGL@
219JROSETTA_API = @JROSETTA_API@ 220JROSETTA_API = @JROSETTA_API@
220JROSETTA_ENGINE = @JROSETTA_ENGINE@ 221JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/libs/Makefile.in b/scilab/libs/Makefile.in
index b00175a..cfe780d 100644
--- a/scilab/libs/Makefile.in
+++ b/scilab/libs/Makefile.in
@@ -187,6 +187,7 @@ JGRAPHX = @JGRAPHX@
187JHALL = @JHALL@ 187JHALL = @JHALL@
188JHDF5 = @JHDF5@ 188JHDF5 = @JHDF5@
189JLATEXMATH = @JLATEXMATH@ 189JLATEXMATH = @JLATEXMATH@
190JLATEXMATH_FOP = @JLATEXMATH_FOP@
190JOGL = @JOGL@ 191JOGL = @JOGL@
191JROSETTA_API = @JROSETTA_API@ 192JROSETTA_API = @JROSETTA_API@
192JROSETTA_ENGINE = @JROSETTA_ENGINE@ 193JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/libs/doublylinkedlist/Makefile.in b/scilab/libs/doublylinkedlist/Makefile.in
index 9e32496..01a43ed 100644
--- a/scilab/libs/doublylinkedlist/Makefile.in
+++ b/scilab/libs/doublylinkedlist/Makefile.in
@@ -217,6 +217,7 @@ JGRAPHX = @JGRAPHX@
217JHALL = @JHALL@ 217JHALL = @JHALL@
218JHDF5 = @JHDF5@ 218JHDF5 = @JHDF5@
219JLATEXMATH = @JLATEXMATH@ 219JLATEXMATH = @JLATEXMATH@
220JLATEXMATH_FOP = @JLATEXMATH_FOP@
220JOGL = @JOGL@ 221JOGL = @JOGL@
221JROSETTA_API = @JROSETTA_API@ 222JROSETTA_API = @JROSETTA_API@
222JROSETTA_ENGINE = @JROSETTA_ENGINE@ 223JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/libs/dynamiclibrary/Makefile.in b/scilab/libs/dynamiclibrary/Makefile.in
index 819b487..732f025 100644
--- a/scilab/libs/dynamiclibrary/Makefile.in
+++ b/scilab/libs/dynamiclibrary/Makefile.in
@@ -217,6 +217,7 @@ JGRAPHX = @JGRAPHX@
217JHALL = @JHALL@ 217JHALL = @JHALL@
218JHDF5 = @JHDF5@ 218JHDF5 = @JHDF5@
219JLATEXMATH = @JLATEXMATH@ 219JLATEXMATH = @JLATEXMATH@
220JLATEXMATH_FOP = @JLATEXMATH_FOP@
220JOGL = @JOGL@ 221JOGL = @JOGL@
221JROSETTA_API = @JROSETTA_API@ 222JROSETTA_API = @JROSETTA_API@
222JROSETTA_ENGINE = @JROSETTA_ENGINE@ 223JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/libs/hashtable/Makefile.in b/scilab/libs/hashtable/Makefile.in
index f690778..256315b 100644
--- a/scilab/libs/hashtable/Makefile.in
+++ b/scilab/libs/hashtable/Makefile.in
@@ -215,6 +215,7 @@ JGRAPHX = @JGRAPHX@
215JHALL = @JHALL@ 215JHALL = @JHALL@
216JHDF5 = @JHDF5@ 216JHDF5 = @JHDF5@
217JLATEXMATH = @JLATEXMATH@ 217JLATEXMATH = @JLATEXMATH@
218JLATEXMATH_FOP = @JLATEXMATH_FOP@
218JOGL = @JOGL@ 219JOGL = @JOGL@
219JROSETTA_API = @JROSETTA_API@ 220JROSETTA_API = @JROSETTA_API@
220JROSETTA_ENGINE = @JROSETTA_ENGINE@ 221JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/libs/libst/Makefile.in b/scilab/libs/libst/Makefile.in
index fc421cb..679f594 100644
--- a/scilab/libs/libst/Makefile.in
+++ b/scilab/libs/libst/Makefile.in
@@ -211,6 +211,7 @@ JGRAPHX = @JGRAPHX@
211JHALL = @JHALL@ 211JHALL = @JHALL@
212JHDF5 = @JHDF5@ 212JHDF5 = @JHDF5@
213JLATEXMATH = @JLATEXMATH@ 213JLATEXMATH = @JLATEXMATH@
214JLATEXMATH_FOP = @JLATEXMATH_FOP@
214JOGL = @JOGL@ 215JOGL = @JOGL@
215JROSETTA_API = @JROSETTA_API@ 216JROSETTA_API = @JROSETTA_API@
216JROSETTA_ENGINE = @JROSETTA_ENGINE@ 217JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/m4/docbook.m4 b/scilab/m4/docbook.m4
index 7fbbcca..24f63c3 100644
--- a/scilab/m4/docbook.m4
+++ b/scilab/m4/docbook.m4
@@ -77,6 +77,10 @@ AC_ARG_WITH(docbook,
77 77
78 78
79 79
80 # JLaTeXMath
81 AC_JAVA_CHECK_PACKAGE([jlatexmath-fop],[org.scilab.forge.jlatexmath.fop.JLaTeXMathObj],[LaTex Rendering - FOP plugin])
82 JLATEXMATH_FOP=$PACKAGE_JAR_FILE
83 AC_SUBST(JLATEXMATH_FOP)
80 84
81 # Avalon Framework (PDF) 85 # Avalon Framework (PDF)
82 AC_JAVA_CHECK_PACKAGE([avalon-framework],[org.apache.avalon.framework.configuration.ConfigurationException],[Common framework for Java server application]) 86 AC_JAVA_CHECK_PACKAGE([avalon-framework],[org.apache.avalon.framework.configuration.ConfigurationException],[Common framework for Java server application])
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index 92f0882..1c878d1 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -273,6 +273,7 @@ JGRAPHX = @JGRAPHX@
273JHALL = @JHALL@ 273JHALL = @JHALL@
274JHDF5 = @JHDF5@ 274JHDF5 = @JHDF5@
275JLATEXMATH = @JLATEXMATH@ 275JLATEXMATH = @JLATEXMATH@
276JLATEXMATH_FOP = @JLATEXMATH_FOP@
276JOGL = @JOGL@ 277JOGL = @JOGL@
277JROSETTA_API = @JROSETTA_API@ 278JROSETTA_API = @JROSETTA_API@
278JROSETTA_ENGINE = @JROSETTA_ENGINE@ 279JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/action_binding/Makefile.in b/scilab/modules/action_binding/Makefile.in
index 163ff0a..1bb45fa 100644
--- a/scilab/modules/action_binding/Makefile.in
+++ b/scilab/modules/action_binding/Makefile.in
@@ -238,6 +238,7 @@ JGRAPHX = @JGRAPHX@
238JHALL = @JHALL@ 238JHALL = @JHALL@
239JHDF5 = @JHDF5@ 239JHDF5 = @JHDF5@
240JLATEXMATH = @JLATEXMATH@ 240JLATEXMATH = @JLATEXMATH@
241JLATEXMATH_FOP = @JLATEXMATH_FOP@
241JOGL = @JOGL@ 242JOGL = @JOGL@
242JROSETTA_API = @JROSETTA_API@ 243JROSETTA_API = @JROSETTA_API@
243JROSETTA_ENGINE = @JROSETTA_ENGINE@ 244JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/api_scilab/Makefile.in b/scilab/modules/api_scilab/Makefile.in
index e3d3268..bb18c45 100644
--- a/scilab/modules/api_scilab/Makefile.in
+++ b/scilab/modules/api_scilab/Makefile.in
@@ -232,6 +232,7 @@ JGRAPHX = @JGRAPHX@
232JHALL = @JHALL@ 232JHALL = @JHALL@
233JHDF5 = @JHDF5@ 233JHDF5 = @JHDF5@
234JLATEXMATH = @JLATEXMATH@ 234JLATEXMATH = @JLATEXMATH@
235JLATEXMATH_FOP = @JLATEXMATH_FOP@
235JOGL = @JOGL@ 236JOGL = @JOGL@
236JROSETTA_API = @JROSETTA_API@ 237JROSETTA_API = @JROSETTA_API@
237JROSETTA_ENGINE = @JROSETTA_ENGINE@ 238JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/arnoldi/Makefile.in b/scilab/modules/arnoldi/Makefile.in
index d839ccb..ea1d4f7 100644
--- a/scilab/modules/arnoldi/Makefile.in
+++ b/scilab/modules/arnoldi/Makefile.in
@@ -254,6 +254,7 @@ JGRAPHX = @JGRAPHX@
254JHALL = @JHALL@ 254JHALL = @JHALL@
255JHDF5 = @JHDF5@ 255JHDF5 = @JHDF5@
256JLATEXMATH = @JLATEXMATH@ 256JLATEXMATH = @JLATEXMATH@
257JLATEXMATH_FOP = @JLATEXMATH_FOP@
257JOGL = @JOGL@ 258JOGL = @JOGL@
258JROSETTA_API = @JROSETTA_API@ 259JROSETTA_API = @JROSETTA_API@
259JROSETTA_ENGINE = @JROSETTA_ENGINE@ 260JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/atoms/Makefile.in b/scilab/modules/atoms/Makefile.in
index 99de7ef..a42a90e 100644
--- a/scilab/modules/atoms/Makefile.in
+++ b/scilab/modules/atoms/Makefile.in
@@ -194,6 +194,7 @@ JGRAPHX = @JGRAPHX@
194JHALL = @JHALL@ 194JHALL = @JHALL@
195JHDF5 = @JHDF5@ 195JHDF5 = @JHDF5@
196JLATEXMATH = @JLATEXMATH@ 196JLATEXMATH = @JLATEXMATH@
197JLATEXMATH_FOP = @JLATEXMATH_FOP@
197JOGL = @JOGL@ 198JOGL = @JOGL@
198JROSETTA_API = @JROSETTA_API@ 199JROSETTA_API = @JROSETTA_API@
199JROSETTA_ENGINE = @JROSETTA_ENGINE@ 200JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/boolean/Makefile.in b/scilab/modules/boolean/Makefile.in
index 6a0dc7e..99127e5 100644
--- a/scilab/modules/boolean/Makefile.in
+++ b/scilab/modules/boolean/Makefile.in
@@ -233,6 +233,7 @@ JGRAPHX = @JGRAPHX@
233JHALL = @JHALL@ 233JHALL = @JHALL@
234JHDF5 = @JHDF5@ 234JHDF5 = @JHDF5@
235JLATEXMATH = @JLATEXMATH@ 235JLATEXMATH = @JLATEXMATH@
236JLATEXMATH_FOP = @JLATEXMATH_FOP@
236JOGL = @JOGL@ 237JOGL = @JOGL@
237JROSETTA_API = @JROSETTA_API@ 238JROSETTA_API = @JROSETTA_API@
238JROSETTA_ENGINE = @JROSETTA_ENGINE@ 239JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/cacsd/Makefile.in b/scilab/modules/cacsd/Makefile.in
index a15defb..89c73b4 100644
--- a/scilab/modules/cacsd/Makefile.in
+++ b/scilab/modules/cacsd/Makefile.in
@@ -328,6 +328,7 @@ JGRAPHX = @JGRAPHX@
328JHALL = @JHALL@ 328JHALL = @JHALL@
329JHDF5 = @JHDF5@ 329JHDF5 = @JHDF5@
330JLATEXMATH = @JLATEXMATH@ 330JLATEXMATH = @JLATEXMATH@
331JLATEXMATH_FOP = @JLATEXMATH_FOP@
331JOGL = @JOGL@ 332JOGL = @JOGL@
332JROSETTA_API = @JROSETTA_API@ 333JROSETTA_API = @JROSETTA_API@
333JROSETTA_ENGINE = @JROSETTA_ENGINE@ 334JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/call_scilab/Makefile.in b/scilab/modules/call_scilab/Makefile.in
index 0c62abd..67c21db 100644
--- a/scilab/modules/call_scilab/Makefile.in
+++ b/scilab/modules/call_scilab/Makefile.in
@@ -229,6 +229,7 @@ JGRAPHX = @JGRAPHX@
229JHALL = @JHALL@ 229JHALL = @JHALL@
230JHDF5 = @JHDF5@ 230JHDF5 = @JHDF5@
231JLATEXMATH = @JLATEXMATH@ 231JLATEXMATH = @JLATEXMATH@
232JLATEXMATH_FOP = @JLATEXMATH_FOP@
232JOGL = @JOGL@ 233JOGL = @JOGL@
233JROSETTA_API = @JROSETTA_API@ 234JROSETTA_API = @JROSETTA_API@
234JROSETTA_ENGINE = @JROSETTA_ENGINE@ 235JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/compatibility_functions/Makefile.in b/scilab/modules/compatibility_functions/Makefile.in
index 11ac5cf..482c7d9 100644
--- a/scilab/modules/compatibility_functions/Makefile.in
+++ b/scilab/modules/compatibility_functions/Makefile.in
@@ -193,6 +193,7 @@ JGRAPHX = @JGRAPHX@
193JHALL = @JHALL@ 193JHALL = @JHALL@
194JHDF5 = @JHDF5@ 194JHDF5 = @JHDF5@
195JLATEXMATH = @JLATEXMATH@ 195JLATEXMATH = @JLATEXMATH@
196JLATEXMATH_FOP = @JLATEXMATH_FOP@
196JOGL = @JOGL@ 197JOGL = @JOGL@
197JROSETTA_API = @JROSETTA_API@ 198JROSETTA_API = @JROSETTA_API@
198JROSETTA_ENGINE = @JROSETTA_ENGINE@ 199JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/completion/Makefile.in b/scilab/modules/completion/Makefile.in
index 94792ce..42dc95b 100644
--- a/scilab/modules/completion/Makefile.in
+++ b/scilab/modules/completion/Makefile.in
@@ -255,6 +255,7 @@ JGRAPHX = @JGRAPHX@
255JHALL = @JHALL@ 255JHALL = @JHALL@
256JHDF5 = @JHDF5@ 256JHDF5 = @JHDF5@
257JLATEXMATH = @JLATEXMATH@ 257JLATEXMATH = @JLATEXMATH@
258JLATEXMATH_FOP = @JLATEXMATH_FOP@
258JOGL = @JOGL@ 259JOGL = @JOGL@
259JROSETTA_API = @JROSETTA_API@ 260JROSETTA_API = @JROSETTA_API@
260JROSETTA_ENGINE = @JROSETTA_ENGINE@ 261JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/console/Makefile.in b/scilab/modules/console/Makefile.in
index 4a2e3d4..a8b8f27 100644
--- a/scilab/modules/console/Makefile.in
+++ b/scilab/modules/console/Makefile.in
@@ -267,6 +267,7 @@ JGRAPHX = @JGRAPHX@
267JHALL = @JHALL@ 267JHALL = @JHALL@
268JHDF5 = @JHDF5@ 268JHDF5 = @JHDF5@
269JLATEXMATH = @JLATEXMATH@ 269JLATEXMATH = @JLATEXMATH@
270JLATEXMATH_FOP = @JLATEXMATH_FOP@
270JOGL = @JOGL@ 271JOGL = @JOGL@
271JROSETTA_API = @JROSETTA_API@ 272JROSETTA_API = @JROSETTA_API@
272JROSETTA_ENGINE = @JROSETTA_ENGINE@ 273JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/core/Makefile.in b/scilab/modules/core/Makefile.in
index c2471ef..b1165a1 100644
--- a/scilab/modules/core/Makefile.in
+++ b/scilab/modules/core/Makefile.in
@@ -466,6 +466,7 @@ JGRAPHX = @JGRAPHX@
466JHALL = @JHALL@ 466JHALL = @JHALL@
467JHDF5 = @JHDF5@ 467JHDF5 = @JHDF5@
468JLATEXMATH = @JLATEXMATH@ 468JLATEXMATH = @JLATEXMATH@
469JLATEXMATH_FOP = @JLATEXMATH_FOP@
469JOGL = @JOGL@ 470JOGL = @JOGL@
470JROSETTA_API = @JROSETTA_API@ 471JROSETTA_API = @JROSETTA_API@
471JROSETTA_ENGINE = @JROSETTA_ENGINE@ 472JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/data_structures/Makefile.in b/scilab/modules/data_structures/Makefile.in
index 53fe905..bf5fa0e 100644
--- a/scilab/modules/data_structures/Makefile.in
+++ b/scilab/modules/data_structures/Makefile.in
@@ -264,6 +264,7 @@ JGRAPHX = @JGRAPHX@
264JHALL = @JHALL@ 264JHALL = @JHALL@
265JHDF5 = @JHDF5@ 265JHDF5 = @JHDF5@
266JLATEXMATH = @JLATEXMATH@ 266JLATEXMATH = @JLATEXMATH@
267JLATEXMATH_FOP = @JLATEXMATH_FOP@
267JOGL = @JOGL@ 268JOGL = @JOGL@
268JROSETTA_API = @JROSETTA_API@ 269JROSETTA_API = @JROSETTA_API@
269JROSETTA_ENGINE = @JROSETTA_ENGINE@ 270JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/demo_tools/Makefile.in b/scilab/modules/demo_tools/Makefile.in
index b226ef3..7457de2 100644
--- a/scilab/modules/demo_tools/Makefile.in
+++ b/scilab/modules/demo_tools/Makefile.in
@@ -192,6 +192,7 @@ JGRAPHX = @JGRAPHX@
192JHALL = @JHALL@ 192JHALL = @JHALL@
193JHDF5 = @JHDF5@ 193JHDF5 = @JHDF5@
194JLATEXMATH = @JLATEXMATH@ 194JLATEXMATH = @JLATEXMATH@
195JLATEXMATH_FOP = @JLATEXMATH_FOP@
195JOGL = @JOGL@ 196JOGL = @JOGL@
196JROSETTA_API = @JROSETTA_API@ 197JROSETTA_API = @JROSETTA_API@
197JROSETTA_ENGINE = @JROSETTA_ENGINE@ 198JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/development_tools/Makefile.in b/scilab/modules/development_tools/Makefile.in
index 1eecddc..736a1aa 100644
--- a/scilab/modules/development_tools/Makefile.in
+++ b/scilab/modules/development_tools/Makefile.in
@@ -191,6 +191,7 @@ JGRAPHX = @JGRAPHX@
191JHALL = @JHALL@ 191JHALL = @JHALL@
192JHDF5 = @JHDF5@ 192JHDF5 = @JHDF5@
193JLATEXMATH = @JLATEXMATH@ 193JLATEXMATH = @JLATEXMATH@
194JLATEXMATH_FOP = @JLATEXMATH_FOP@
194JOGL = @JOGL@ 195JOGL = @JOGL@
195JROSETTA_API = @JROSETTA_API@ 196JROSETTA_API = @JROSETTA_API@
196JROSETTA_ENGINE = @JROSETTA_ENGINE@ 197JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/development_tools/src/fake/Makefile.in b/scilab/modules/development_tools/src/fake/Makefile.in
index 7e6d748..3f3f9be 100644
--- a/scilab/modules/development_tools/src/fake/Makefile.in
+++ b/scilab/modules/development_tools/src/fake/Makefile.in
@@ -142,6 +142,7 @@ JGRAPHX = @JGRAPHX@
142JHALL = @JHALL@ 142JHALL = @JHALL@
143JHDF5 = @JHDF5@ 143JHDF5 = @JHDF5@
144JLATEXMATH = @JLATEXMATH@ 144JLATEXMATH = @JLATEXMATH@
145JLATEXMATH_FOP = @JLATEXMATH_FOP@
145JOGL = @JOGL@ 146JOGL = @JOGL@
146JROSETTA_API = @JROSETTA_API@ 147JROSETTA_API = @JROSETTA_API@
147JROSETTA_ENGINE = @JROSETTA_ENGINE@ 148JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/differential_equations/Makefile.in b/scilab/modules/differential_equations/Makefile.in
index 10a965b..133201e 100644
--- a/scilab/modules/differential_equations/Makefile.in
+++ b/scilab/modules/differential_equations/Makefile.in
@@ -275,6 +275,7 @@ JGRAPHX = @JGRAPHX@
275JHALL = @JHALL@ 275JHALL = @JHALL@
276JHDF5 = @JHDF5@ 276JHDF5 = @JHDF5@
277JLATEXMATH = @JLATEXMATH@ 277JLATEXMATH = @JLATEXMATH@
278JLATEXMATH_FOP = @JLATEXMATH_FOP@
278JOGL = @JOGL@ 279JOGL = @JOGL@
279JROSETTA_API = @JROSETTA_API@ 280JROSETTA_API = @JROSETTA_API@
280JROSETTA_ENGINE = @JROSETTA_ENGINE@ 281JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/double/Makefile.in b/scilab/modules/double/Makefile.in
index 6a904b4..55fc80b 100644
--- a/scilab/modules/double/Makefile.in
+++ b/scilab/modules/double/Makefile.in
@@ -233,6 +233,7 @@ JGRAPHX = @JGRAPHX@
233JHALL = @JHALL@ 233JHALL = @JHALL@
234JHDF5 = @JHDF5@ 234JHDF5 = @JHDF5@
235JLATEXMATH = @JLATEXMATH@ 235JLATEXMATH = @JLATEXMATH@
236JLATEXMATH_FOP = @JLATEXMATH_FOP@
236JOGL = @JOGL@ 237JOGL = @JOGL@
237JROSETTA_API = @JROSETTA_API@ 238JROSETTA_API = @JROSETTA_API@
238JROSETTA_ENGINE = @JROSETTA_ENGINE@ 239JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/dynamic_link/Makefile.in b/scilab/modules/dynamic_link/Makefile.in
index 25bed5d..c7bcce2 100644
--- a/scilab/modules/dynamic_link/Makefile.in
+++ b/scilab/modules/dynamic_link/Makefile.in
@@ -250,6 +250,7 @@ JGRAPHX = @JGRAPHX@
250JHALL = @JHALL@ 250JHALL = @JHALL@
251JHDF5 = @JHDF5@ 251JHDF5 = @JHDF5@
252JLATEXMATH = @JLATEXMATH@ 252JLATEXMATH = @JLATEXMATH@
253JLATEXMATH_FOP = @JLATEXMATH_FOP@
253JOGL = @JOGL@ 254JOGL = @JOGL@
254JROSETTA_API = @JROSETTA_API@ 255JROSETTA_API = @JROSETTA_API@
255JROSETTA_ENGINE = @JROSETTA_ENGINE@ 256JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/elementary_functions/Makefile.in b/scilab/modules/elementary_functions/Makefile.in
index 4b1df27..0db03e5 100644
--- a/scilab/modules/elementary_functions/Makefile.in
+++ b/scilab/modules/elementary_functions/Makefile.in
@@ -474,7 +474,7 @@ am__objects_7 = libscielementary_functions_la-sci_f_isequal.lo \
474 libscielementary_functions_la-sci_f_conj.lo \ 474 libscielementary_functions_la-sci_f_conj.lo \
475 libscielementary_functions_la-sci_f_int.lo \ 475 libscielementary_functions_la-sci_f_int.lo \
476 libscielementary_functions_la-sci_f_imult.lo \ 476 libscielementary_functions_la-sci_f_imult.lo \
477 libscielementary_functions_la-sci_f_exp.lo 477 libscielementary_functions_la-sci_f_exp.lo
478am__objects_8 = 478am__objects_8 =
479am_libscielementary_functions_la_OBJECTS = $(am__objects_1) \ 479am_libscielementary_functions_la_OBJECTS = $(am__objects_1) \
480 $(am__objects_2) $(am__objects_3) $(am__objects_4) \ 480 $(am__objects_2) $(am__objects_3) $(am__objects_4) \
@@ -599,6 +599,7 @@ JGRAPHX = @JGRAPHX@
599JHALL = @JHALL@ 599JHALL = @JHALL@
600JHDF5 = @JHDF5@ 600JHDF5 = @JHDF5@
601JLATEXMATH = @JLATEXMATH@ 601JLATEXMATH = @JLATEXMATH@
602JLATEXMATH_FOP = @JLATEXMATH_FOP@
602JOGL = @JOGL@ 603JOGL = @JOGL@
603JROSETTA_API = @JROSETTA_API@ 604JROSETTA_API = @JROSETTA_API@
604JROSETTA_ENGINE = @JROSETTA_ENGINE@ 605JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/fftw/Makefile.in b/scilab/modules/fftw/Makefile.in
index 232bda6..ccbd1b1 100644
--- a/scilab/modules/fftw/Makefile.in
+++ b/scilab/modules/fftw/Makefile.in
@@ -252,6 +252,7 @@ JGRAPHX = @JGRAPHX@
252JHALL = @JHALL@ 252JHALL = @JHALL@
253JHDF5 = @JHDF5@ 253JHDF5 = @JHDF5@
254JLATEXMATH = @JLATEXMATH@ 254JLATEXMATH = @JLATEXMATH@
255JLATEXMATH_FOP = @JLATEXMATH_FOP@
255JOGL = @JOGL@ 256JOGL = @JOGL@
256JROSETTA_API = @JROSETTA_API@ 257JROSETTA_API = @JROSETTA_API@
257JROSETTA_ENGINE = @JROSETTA_ENGINE@ 258JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/fileio/Makefile.in b/scilab/modules/fileio/Makefile.in
index 22ccc9f..1b69eb3 100644
--- a/scilab/modules/fileio/Makefile.in
+++ b/scilab/modules/fileio/Makefile.in
@@ -282,6 +282,7 @@ JGRAPHX = @JGRAPHX@
282JHALL = @JHALL@ 282JHALL = @JHALL@
283JHDF5 = @JHDF5@ 283JHDF5 = @JHDF5@
284JLATEXMATH = @JLATEXMATH@ 284JLATEXMATH = @JLATEXMATH@
285JLATEXMATH_FOP = @JLATEXMATH_FOP@
285JOGL = @JOGL@ 286JOGL = @JOGL@
286JROSETTA_API = @JROSETTA_API@ 287JROSETTA_API = @JROSETTA_API@
287JROSETTA_ENGINE = @JROSETTA_ENGINE@ 288JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/functions/Makefile.in b/scilab/modules/functions/Makefile.in
index 0cd2aa0..510643a 100644
--- a/scilab/modules/functions/Makefile.in
+++ b/scilab/modules/functions/Makefile.in
@@ -125,8 +125,7 @@ am__objects_3 = libscifunctions_la-gw_functions.lo \
125 libscifunctions_la-sci_whereis.lo \ 125 libscifunctions_la-sci_whereis.lo \
126 libscifunctions_la-sci_librarieslist.lo \ 126 libscifunctions_la-sci_librarieslist.lo \
127 libscifunctions_la-sci_libraryinfo.lo 127 libscifunctions_la-sci_libraryinfo.lo
128am__objects_4 = intlib.lo intdeff.lo intexecstr.lo \ 128am__objects_4 = intlib.lo intdeff.lo intexecstr.lo intexec.lo
129 intexec.lo
130am_libscifunctions_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ 129am_libscifunctions_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
131 $(am__objects_3) $(am__objects_4) 130 $(am__objects_3) $(am__objects_4)
132libscifunctions_la_OBJECTS = $(am_libscifunctions_la_OBJECTS) 131libscifunctions_la_OBJECTS = $(am_libscifunctions_la_OBJECTS)
@@ -243,6 +242,7 @@ JGRAPHX = @JGRAPHX@
243JHALL = @JHALL@ 242JHALL = @JHALL@
244JHDF5 = @JHDF5@ 243JHDF5 = @JHDF5@
245JLATEXMATH = @JLATEXMATH@ 244JLATEXMATH = @JLATEXMATH@
245JLATEXMATH_FOP = @JLATEXMATH_FOP@
246JOGL = @JOGL@ 246JOGL = @JOGL@
247JROSETTA_API = @JROSETTA_API@ 247JROSETTA_API = @JROSETTA_API@
248JROSETTA_ENGINE = @JROSETTA_ENGINE@ 248JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/genetic_algorithms/Makefile.in b/scilab/modules/genetic_algorithms/Makefile.in
index df93152..27bb2a7 100644
--- a/scilab/modules/genetic_algorithms/Makefile.in
+++ b/scilab/modules/genetic_algorithms/Makefile.in
@@ -195,6 +195,7 @@ JGRAPHX = @JGRAPHX@
195JHALL = @JHALL@ 195JHALL = @JHALL@
196JHDF5 = @JHDF5@ 196JHDF5 = @JHDF5@
197JLATEXMATH = @JLATEXMATH@ 197JLATEXMATH = @JLATEXMATH@
198JLATEXMATH_FOP = @JLATEXMATH_FOP@
198JOGL = @JOGL@ 199JOGL = @JOGL@
199JROSETTA_API = @JROSETTA_API@ 200JROSETTA_API = @JROSETTA_API@
200JROSETTA_ENGINE = @JROSETTA_ENGINE@ 201JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/graphic_export/Makefile.in b/scilab/modules/graphic_export/Makefile.in
index 14798e2..63ac660 100644
--- a/scilab/modules/graphic_export/Makefile.in
+++ b/scilab/modules/graphic_export/Makefile.in
@@ -269,6 +269,7 @@ JGRAPHX = @JGRAPHX@
269JHALL = @JHALL@ 269JHALL = @JHALL@
270JHDF5 = @JHDF5@ 270JHDF5 = @JHDF5@
271JLATEXMATH = @JLATEXMATH@ 271JLATEXMATH = @JLATEXMATH@
272JLATEXMATH_FOP = @JLATEXMATH_FOP@
272JOGL = @JOGL@ 273JOGL = @JOGL@
273JROSETTA_API = @JROSETTA_API@ 274JROSETTA_API = @JROSETTA_API@
274JROSETTA_ENGINE = @JROSETTA_ENGINE@ 275JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/graphics/Makefile.in b/scilab/modules/graphics/Makefile.in
index ca2e8ec..69e98ea 100644
--- a/scilab/modules/graphics/Makefile.in
+++ b/scilab/modules/graphics/Makefile.in
@@ -604,6 +604,7 @@ JGRAPHX = @JGRAPHX@
604JHALL = @JHALL@ 604JHALL = @JHALL@
605JHDF5 = @JHDF5@ 605JHDF5 = @JHDF5@
606JLATEXMATH = @JLATEXMATH@ 606JLATEXMATH = @JLATEXMATH@
607JLATEXMATH_FOP = @JLATEXMATH_FOP@
607JOGL = @JOGL@ 608JOGL = @JOGL@
608JROSETTA_API = @JROSETTA_API@ 609JROSETTA_API = @JROSETTA_API@
609JROSETTA_ENGINE = @JROSETTA_ENGINE@ 610JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/graphics/graphics.iss b/scilab/modules/graphics/graphics.iss
index 9ae8d2d..00530f2 100644
--- a/scilab/modules/graphics/graphics.iss
+++ b/scilab/modules/graphics/graphics.iss
@@ -16,6 +16,7 @@ Source: modules\{#GRAPHICS}\license.txt; DestDir: {app}\modules\{#GRAPHICS}; Com
16Source: modules\{#GRAPHICS}\changelog.txt; DestDir: {app}\modules\{#GRAPHICS}; Components: {#COMPN_GRAPHICS} 16Source: modules\{#GRAPHICS}\changelog.txt; DestDir: {app}\modules\{#GRAPHICS}; Components: {#COMPN_GRAPHICS}
17; 17;
18Source: thirdparty\jlatexmath-0.8.8.jar;DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS} 18Source: thirdparty\jlatexmath-0.8.8.jar;DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS}
19Source: thirdparty\jlatexmath-fop-0.8.8.jar;DestDir: {app}\thirdparty; Components: {#COMPN_GRAPHICS}
19; 20;
20Source: bin\graphics.dll; DestDir: {app}\bin; Components: {#COMPN_GRAPHICS} 21Source: bin\graphics.dll; DestDir: {app}\bin; Components: {#COMPN_GRAPHICS}
21; 22;
diff --git a/scilab/modules/gui/Makefile.in b/scilab/modules/gui/Makefile.in
index 841338b..4ad1e38 100644
--- a/scilab/modules/gui/Makefile.in
+++ b/scilab/modules/gui/Makefile.in
@@ -357,6 +357,7 @@ JGRAPHX = @JGRAPHX@
357JHALL = @JHALL@ 357JHALL = @JHALL@
358JHDF5 = @JHDF5@ 358JHDF5 = @JHDF5@
359JLATEXMATH = @JLATEXMATH@ 359JLATEXMATH = @JLATEXMATH@
360JLATEXMATH_FOP = @JLATEXMATH_FOP@
360JOGL = @JOGL@ 361JOGL = @JOGL@
361JROSETTA_API = @JROSETTA_API@ 362JROSETTA_API = @JROSETTA_API@
362JROSETTA_ENGINE = @JROSETTA_ENGINE@ 363JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/hdf5/Makefile.in b/scilab/modules/hdf5/Makefile.in
index 6e4cfc0..722a8ae 100644
--- a/scilab/modules/hdf5/Makefile.in
+++ b/scilab/modules/hdf5/Makefile.in
@@ -283,6 +283,7 @@ JGRAPHX = @JGRAPHX@
283JHALL = @JHALL@ 283JHALL = @JHALL@
284JHDF5 = @JHDF5@ 284JHDF5 = @JHDF5@
285JLATEXMATH = @JLATEXMATH@ 285JLATEXMATH = @JLATEXMATH@
286JLATEXMATH_FOP = @JLATEXMATH_FOP@
286JOGL = @JOGL@ 287JOGL = @JOGL@
287JROSETTA_API = @JROSETTA_API@ 288JROSETTA_API = @JROSETTA_API@
288JROSETTA_ENGINE = @JROSETTA_ENGINE@ 289JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/helptools/Makefile.in b/scilab/modules/helptools/Makefile.in
index 2e80b76..6d9476c 100644
--- a/scilab/modules/helptools/Makefile.in
+++ b/scilab/modules/helptools/Makefile.in
@@ -257,6 +257,7 @@ JGRAPHX = @JGRAPHX@
257JHALL = @JHALL@ 257JHALL = @JHALL@
258JHDF5 = @JHDF5@ 258JHDF5 = @JHDF5@
259JLATEXMATH = @JLATEXMATH@ 259JLATEXMATH = @JLATEXMATH@
260JLATEXMATH_FOP = @JLATEXMATH_FOP@
260JOGL = @JOGL@ 261JOGL = @JOGL@
261JROSETTA_API = @JROSETTA_API@ 262JROSETTA_API = @JROSETTA_API@
262JROSETTA_ENGINE = @JROSETTA_ENGINE@ 263JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/helptools/examples/example_1/help/en_US/example_1_function_1.xml b/scilab/modules/helptools/examples/example_1/help/en_US/example_1_function_1.xml
index 85d4cea..a65147a 100644
--- a/scilab/modules/helptools/examples/example_1/help/en_US/example_1_function_1.xml
+++ b/scilab/modules/helptools/examples/example_1/help/en_US/example_1_function_1.xml
@@ -250,6 +250,17 @@
250 </informalequation> 250 </informalequation>
251 </para> 251 </para>
252 </refsection> 252 </refsection>
253
254 <refsection>
255 <title>Example of LaTeX inclusion: Inline</title>
256 <para>
257 <latex><![CDATA[
258\phi_n(\kappa) = \frac{1}{4\pi^2\kappa^2} \int_0^\infty \frac{\sin(\kappa R)}{\kappa R} \frac{\partial}{\partial R}\left[ R^2\frac{\partial D_n(R)}{\partial R}\right]\,dR
259 ]]>
260 </latex>
261 </para>
262 </refsection>
263
253 264
254 <refsection> 265 <refsection>
255 <title>Examples</title> 266 <title>Examples</title>
diff --git a/scilab/modules/helptools/examples/example_1/help/fr_FR/example_1_function_1.xml b/scilab/modules/helptools/examples/example_1/help/fr_FR/example_1_function_1.xml
index 24f83d6..3518dc1 100644
--- a/scilab/modules/helptools/examples/example_1/help/fr_FR/example_1_function_1.xml
+++ b/scilab/modules/helptools/examples/example_1/help/fr_FR/example_1_function_1.xml
@@ -75,7 +75,7 @@
75 </refsection> 75 </refsection>
76 76
77 <refsection> 77 <refsection>
78 <title>Example of MathML inclusion : Inline</title> 78 <title>Exemple d'inclusion MathML : Inline</title>
79 <para> 79 <para>
80 <informalequation> 80 <informalequation>
81 <mediaobject> 81 <mediaobject>
@@ -227,9 +227,19 @@
227 </informalequation> 227 </informalequation>
228 </para> 228 </para>
229 </refsection> 229 </refsection>
230
231 <refsection>
232 <title>Exemple of LaTeX inclusion : Inline</title>
233 <para>
234 <latex><![CDATA[
235\phi_n(\kappa) = \frac{1}{4\pi^2\kappa^2} \int_0^\infty \frac{\sin(\kappa R)}{\kappa R} \frac{\partial}{\partial R}\left[ R^2\frac{\partial D_n(R)}{\partial R}\right]\,dR
236 ]]>
237 </latex>
238 </para>
239 </refsection>
230 240
231 <refsection> 241 <refsection>
232 <title>Examples</title> 242 <title>Exemples</title>
233 <programlisting role="example"><![CDATA[ 243 <programlisting role="example"><![CDATA[
234 244
235// Commentaires 245// Commentaires
diff --git a/scilab/modules/helptools/fopconf.xml b/scilab/modules/helptools/fopconf.xml
new file mode 100644
index 0000000..5762f59
--- /dev/null
+++ b/scilab/modules/helptools/fopconf.xml
@@ -0,0 +1,158 @@
1<?xml version="1.0"?>
2<!--
3 Licensed to the Apache Software Foundation (ASF) under one or more
4 contributor license agreements. See the NOTICE file distributed with
5 this work for additional information regarding copyright ownership.
6 The ASF licenses this file to You under the Apache License, Version 2.0
7 (the "License"); you may not use this file except in compliance with
8 the License. You may obtain a copy of the License at
9
10 http://www.apache.org/licenses/LICENSE-2.0
11
12 Unless required by applicable law or agreed to in writing, software
13 distributed under the License is distributed on an "AS IS" BASIS,
14 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15 See the License for the specific language governing permissions and
16 limitations under the License.
17-->
18<!-- $Id: fop.xconf 447325 2006-09-18 08:55:33Z jeremias $ -->
19
20<!--
21
22This is an example configuration file for FOP.
23This file contains the same settings as the default values
24and will have no effect if used unchanged.
25
26Relative config url's will be resolved relative to
27the location of this file.
28
29-->
30
31<!-- NOTE: This is the version of the configuration -->
32<fop version="1.0">
33
34 <!-- Base URL for resolving relative URLs -->
35 <base>.</base>
36
37 <!-- Source resolution in dpi (dots/pixels per inch) for determining the size of pixels in SVG and bitmap images, default: 72dpi -->
38 <source-resolution>72</source-resolution>
39 <!-- Target resolution in dpi (dots/pixels per inch) for specifying the target resolution for generated bitmaps, default: 72dpi -->
40 <target-resolution>72</target-resolution>
41
42 <!-- Default page-height and page-width, in case
43 value is specified as auto -->
44 <default-page-settings height="11in" width="8.26in"/>
45
46 <!-- Information for specific renderers -->
47 <!-- Uses renderer mime type for renderers -->
48 <renderers>
49 <renderer mime="application/pdf">
50 <filterList>
51 <!-- provides compression using zlib flate (default is on) -->
52 <value>flate</value>
53
54 <!-- encodes binary data into printable ascii characters (default off)
55 This provides about a 4:5 expansion of data size -->
56 <!-- <value>ascii-85</value> -->
57
58 <!-- encodes binary data with hex representation (default off)
59 This filter is not recommended as it doubles the data size -->
60 <!-- <value>ascii-hex</value> -->
61 </filterList>
62
63 <fonts>
64 <auto-detect/>
65 <!-- embedded fonts -->
66 <!--
67 This information must exactly match the font specified
68 in the fo file. Otherwise it will use a default font.
69
70 For example,
71 <fo:inline font-family="Arial" font-weight="bold" font-style="normal">
72 Arial-normal-normal font
73 </fo:inline>
74 for the font triplet specified by:
75 <font-triplet name="Arial" style="normal" weight="bold"/>
76
77 If you do not want to embed the font in the pdf document
78 then do not include the "embed-url" attribute.
79 The font will be needed where the document is viewed
80 for it to be displayed properly.
81
82 possible styles: normal | italic | oblique | backslant
83 possible weights: normal | bold | 100 | 200 | 300 | 400
84 | 500 | 600 | 700 | 800 | 900
85 (normal = 400, bold = 700)
86 -->
87
88 <!--
89 <font metrics-url="arial.xml" kerning="yes" embed-url="arial.ttf">
90 <font-triplet name="Arial" style="normal" weight="normal"/>
91 <font-triplet name="ArialMT" style="normal" weight="normal"/>
92 </font>
93 <font metrics-url="arialb.xml" kerning="yes" embed-url="arialb.ttf">
94 <font-triplet name="Arial" style="normal" weight="bold"/>
95 <font-triplet name="ArialMT" style="normal" weight="bold"/>
96 </font>
97 -->
98 </fonts>
99
100 <!-- This option lets you specify additional options on an XML handler -->
101 <!--xml-handler namespace="http://www.w3.org/2000/svg">
102 <stroke-text>false</stroke-text>
103 </xml-handler-->
104
105 </renderer>
106
107 <renderer mime="application/postscript">
108 <!-- This option forces the PS renderer to rotate landscape pages -->
109 <!--auto-rotate-landscape>true</auto-rotate-landscape-->
110
111 <!-- This option lets you specify additional options on an XML handler -->
112 <!--xml-handler namespace="http://www.w3.org/2000/svg">
113 <stroke-text>false</stroke-text>
114 </xml-handler-->
115 </renderer>
116
117 <renderer mime="application/vnd.hp-PCL">
118 </renderer>
119
120 <!-- MIF does not have a renderer
121 <renderer mime="application/vnd.mif">
122 </renderer>
123 -->
124
125 <renderer mime="image/svg+xml">
126 <format type="paginated"/>
127 <link value="true"/>
128 <strokeText value="false"/>
129 </renderer>
130
131 <renderer mime="application/awt">
132 </renderer>
133
134 <renderer mime="image/png">
135 <!--transparent-page-background>true</transparent-page-background-->
136 </renderer>
137
138 <renderer mime="image/tiff">
139 <!--transparent-page-background>true</transparent-page-background-->
140 <!--compression>CCITT T.6</compression-->
141 </renderer>
142
143 <renderer mime="text/xml">
144 </renderer>
145
146 <!-- RTF does not have a renderer
147 <renderer mime="text/rtf">
148 </renderer>
149 -->
150
151 <renderer mime="text/plain">
152 <pageSize columns="80"/>
153 </renderer>
154
155 </renderers>
156
157</fop>
158
diff --git a/scilab/modules/helptools/helptools.iss b/scilab/modules/helptools/helptools.iss
index aa3a1b7..f35deef 100644
--- a/scilab/modules/helptools/helptools.iss
+++ b/scilab/modules/helptools/helptools.iss
@@ -58,6 +58,7 @@ Source: thirdparty\xml-apis-ext.jar;DestDir: {app}\thirdparty; Components: {#COM
58Source: thirdparty\xmlgraphics-commons-1.3.1.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 58Source: thirdparty\xmlgraphics-commons-1.3.1.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
59Source: thirdparty\xmlgraphics-commons.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 59Source: thirdparty\xmlgraphics-commons.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
60Source: thirdparty\xmlgraphics-commons.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 60Source: thirdparty\xmlgraphics-commons.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
61Source: thirdparty\xalan.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
61; 62;
62Source: thirdparty\batik-all-1.7.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 63Source: thirdparty\batik-all-1.7.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
63; 64;
diff --git a/scilab/modules/helptools/schema/extendedStyle.xsl b/scilab/modules/helptools/schema/extendedStyle.xsl
new file mode 100644
index 0000000..1653097
--- /dev/null
+++ b/scilab/modules/helptools/schema/extendedStyle.xsl
@@ -0,0 +1,18 @@
1<?xml version='1.0'?>
2<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
3 xmlns:fo="http://www.w3.org/1999/XSL/Format"
4 xmlns:latex="http://forge.scilab.org/p/jlatexmath"
5 version='1.0'>
6
7<xsl:include href="STYLE_DOC"/>
8
9<xsl:template match="latex:*">
10 <fo:instream-foreign-object>
11 <xsl:copy>
12 <xsl:copy-of select="@*"/>
13 <xsl:apply-templates/>
14 </xsl:copy>
15 </fo:instream-foreign-object>
16</xsl:template>
17
18</xsl:stylesheet>
diff --git a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/BuildDocObject.java b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/BuildDocObject.java
index c22884c..a640d5b 100644
--- a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/BuildDocObject.java
+++ b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/BuildDocObject.java
@@ -55,6 +55,7 @@ public class BuildDocObject extends StyleSheet {
55 private String docbookPath; 55 private String docbookPath;
56 private String styleDoc; 56 private String styleDoc;
57 private ArrayList<String> specificArgs = new ArrayList<String>(); 57 private ArrayList<String> specificArgs = new ArrayList<String>();
58 private boolean isLatexConverted = true;
58 59
59 /** 60 /**
60 * Creator ... creates the BuildDocObject object 61 * Creator ... creates the BuildDocObject object
@@ -118,6 +119,7 @@ public class BuildDocObject extends StyleSheet {
118 * @param format the format (among the list CHM, HTML, PDF, JH, PS) 119 * @param format the format (among the list CHM, HTML, PDF, JH, PS)
119 */ 120 */
120 public void setExportFormat(String format) { 121 public void setExportFormat(String format) {
122
121 // Need to work with a String instead of a enum since it needs 123 // Need to work with a String instead of a enum since it needs
122 // to be called from C/C++ and GIWS doesn't manage this type. 124 // to be called from C/C++ and GIWS doesn't manage this type.
123 // Can be CHM, HTML, PDF, JavaHelp, Postscript 125 // Can be CHM, HTML, PDF, JavaHelp, Postscript
@@ -132,7 +134,7 @@ public class BuildDocObject extends StyleSheet {
132 specificArgs.add("shade.verbatim=1"); 134 specificArgs.add("shade.verbatim=1");
133 specificArgs.add("img.src.path=" + outputDirectory); 135 specificArgs.add("img.src.path=" + outputDirectory);
134 this.styleDoc = docbookPath + "/fo/docbook.xsl"; 136 this.styleDoc = docbookPath + "/fo/docbook.xsl";
135 137 this.isLatexConverted = false;
136 } 138 }
137 139
138 /* HTML Format */ 140 /* HTML Format */
@@ -220,7 +222,8 @@ public class BuildDocObject extends StyleSheet {
220 CopyConvert copyConvert = new CopyConvert(); 222 CopyConvert copyConvert = new CopyConvert();
221 copyConvert.setVerbose(true); 223 copyConvert.setVerbose(true);
222 copyConvert.setPrintFormat(this.format); 224 copyConvert.setPrintFormat(this.format);
223 225 copyConvert.setLatexConverted(isLatexConverted);
226
224 try { 227 try {
225 copyConvert.run(new File(masterXML), masterXMLTransformed); 228 copyConvert.run(new File(masterXML), masterXMLTransformed);
226 } catch (SAXParseException e) { 229 } catch (SAXParseException e) {
@@ -241,7 +244,9 @@ public class BuildDocObject extends StyleSheet {
241 + masterXMLTransformed + COLON_WITH_QUOTES + Helpers.reason(e)); 244 + masterXMLTransformed + COLON_WITH_QUOTES + Helpers.reason(e));
242 return null; 245 return null;
243 } 246 }
247
244 return masterXMLTransformed.getAbsolutePath(); 248 return masterXMLTransformed.getAbsolutePath();
249
245 } 250 }
246 251
247 /** 252 /**
@@ -259,6 +264,31 @@ public class BuildDocObject extends StyleSheet {
259 return this.outputDirectory; 264 return this.outputDirectory;
260 } 265 }
261 266
267/**
268 * Preprocess the extendedStyle.xsl file
269 * Basically, we load the xsl and replace STYLE_DOC by the actual path
270 * to the xsl file since docbook cannot replace env variables
271 * @return the path to the preprocessed file
272 */
273
274 private File generateExtendedStyle() {
275 String mainStyleDoc = SCI + "/modules/helptools/schema/extendedStyle.xsl";
276 try {
277 String contentMainStyleDoc = Helpers.loadString(new File(mainStyleDoc), "UTF-8");
278
279 /* STYLE_DOC is a predefined variable */
280 File tmpFileForURI = new File(this.styleDoc);
281 contentMainStyleDoc = contentMainStyleDoc.replaceAll("STYLE_DOC", tmpFileForURI.toURI().toString());
282
283 File temporaryStyleFile = File.createTempFile("style_",".xsl");
284
285 Helpers.saveString(contentMainStyleDoc, temporaryStyleFile, "UTF-8");
286 return temporaryStyleFile;
287 } catch (java.io.IOException e) {
288 System.err.println("Could not convert "+mainStyleDoc);
289 return null;
290 }
291 }
262 292
263 /** 293 /**
264 * Launch the whole Saxon process 294 * Launch the whole Saxon process
@@ -283,6 +313,8 @@ public class BuildDocObject extends StyleSheet {
283 throw new FileNotFoundException(COULD_NOT_FIND_STYLE_DOC + this.styleDoc); 313 throw new FileNotFoundException(COULD_NOT_FIND_STYLE_DOC + this.styleDoc);
284 } 314 }
285 315
316 File processedStyle = generateExtendedStyle();
317
286 if (!new File(this.outputDirectory).isDirectory()) { 318 if (!new File(this.outputDirectory).isDirectory()) {
287 throw new FileNotFoundException("Could not find directory: " + this.outputDirectory); 319 throw new FileNotFoundException("Could not find directory: " + this.outputDirectory);
288 } 320 }
@@ -300,7 +332,7 @@ public class BuildDocObject extends StyleSheet {
300 } 332 }
301 //args.add("-t"); 333 //args.add("-t");
302 args.add(sourceDocProcessed); 334 args.add(sourceDocProcessed);
303 args.add(this.styleDoc); 335 args.add(processedStyle.getAbsolutePath());
304 args.add("base.dir=" + this.outputDirectory); 336 args.add("base.dir=" + this.outputDirectory);
305 args.add("html.stylesheet=" + new File(styleSheet).getName()); 337 args.add("html.stylesheet=" + new File(styleSheet).getName());
306 args.addAll(specificArgs); 338 args.addAll(specificArgs);
@@ -315,6 +347,7 @@ public class BuildDocObject extends StyleSheet {
315 /* Delete the master temp file to avoid to be shipped with the rest */ 347 /* Delete the master temp file to avoid to be shipped with the rest */
316 new File(sourceDocProcessed).delete(); 348 new File(sourceDocProcessed).delete();
317 } 349 }
350 processedStyle.delete();
318 351
319 return this.postProcess(); 352 return this.postProcess();
320 353
diff --git a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/BuildPDF.java b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/BuildPDF.java
index 4f2fe6b..f1e156f 100644
--- a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/BuildPDF.java
+++ b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/BuildPDF.java
@@ -34,6 +34,10 @@ import org.apache.fop.apps.FopFactory;
34import org.apache.fop.apps.Fop; 34import org.apache.fop.apps.Fop;
35import org.apache.fop.apps.MimeConstants; 35import org.apache.fop.apps.MimeConstants;
36import org.apache.fop.apps.FormattingResults; 36import org.apache.fop.apps.FormattingResults;
37import org.xml.sax.SAXException;
38
39import org.scilab.forge.jlatexmath.fop.JLaTeXMathElementMapping;
40import org.scilab.forge.jlatexmath.fop.JLaTeXMathXMLHandler;
37 41
38/** 42/**
39 * This class manages the build of the PDF file 43 * This class manages the build of the PDF file
@@ -68,8 +72,12 @@ public final class BuildPDF {
68 } 72 }
69 73
70 try { 74 try {
71 FopFactory fopFactory = FopFactory.newInstance(); 75 FopFactory fopFactory = FopFactory.newInstance();
72 // Step 3: Construct fop with desired output format 76 fopFactory.addElementMapping(new JLaTeXMathElementMapping());
77 fopFactory.getXMLHandlerRegistry().addXMLHandler(new JLaTeXMathXMLHandler());
78 fopFactory.setUserConfig(new File(System.getenv("SCI") + "/modules/helptools/fopconf.xml"));
79
80 // Step 3: Construct fop with desired output format
73 OutputStream out = new BufferedOutputStream(new FileOutputStream(fileName)); 81 OutputStream out = new BufferedOutputStream(new FileOutputStream(fileName));
74 Fop fop; 82 Fop fop;
75 if (format.equalsIgnoreCase("PS")) { 83 if (format.equalsIgnoreCase("PS")) {
@@ -105,6 +113,8 @@ public final class BuildPDF {
105 System.out.println(e.getLocalizedMessage()); 113 System.out.println(e.getLocalizedMessage());
106 } catch (IOException e) { 114 } catch (IOException e) {
107 System.out.println(e.getLocalizedMessage()); 115 System.out.println(e.getLocalizedMessage());
116 } catch (SAXException e) {
117 System.out.println(e.getLocalizedMessage());
108 } 118 }
109 119
110 return fileName; 120 return fileName;
diff --git a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/CopyConvert.java b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/CopyConvert.java
index d69bc4f..f787f03 100644
--- a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/CopyConvert.java
+++ b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/CopyConvert.java
@@ -52,6 +52,9 @@ import net.sourceforge.jeuclid.MutableLayoutContext;
52import net.sourceforge.jeuclid.context.LayoutContextImpl; 52import net.sourceforge.jeuclid.context.LayoutContextImpl;
53import net.sourceforge.jeuclid.converter.Converter; 53import net.sourceforge.jeuclid.converter.Converter;
54 54
55import org.scilab.forge.jlatexmath.TeXConstants;
56import org.scilab.forge.jlatexmath.TeXFormula;
57import java.awt.Color;
55 58
56/** 59/**
57 * @TODO add comment 60 * @TODO add comment
@@ -84,6 +87,8 @@ public class CopyConvert extends DefaultHandler implements ErrorHandler {
84 private File gs; 87 private File gs;
85 private File ps2pdf; 88 private File ps2pdf;
86 89
90 private LaTeXElement latexElem = null;
91 private boolean isLatexConverted = true;
87 92
88 public void setVerbose(boolean verbose){ 93 public void setVerbose(boolean verbose){
89 this.verbose=verbose; 94 this.verbose=verbose;
@@ -92,6 +97,10 @@ public class CopyConvert extends DefaultHandler implements ErrorHandler {
92 public void setPrintFormat(String printFormat){ 97 public void setPrintFormat(String printFormat){
93 this.printFormat=printFormat; 98 this.printFormat=printFormat;
94 } 99 }
100
101 public void setLatexConverted(boolean isLatexConverted){
102 this.isLatexConverted = isLatexConverted;
103 }
95 104
96 // ----------------------------------------------------------------------- 105 // -----------------------------------------------------------------------
97 106
@@ -180,8 +189,14 @@ public class CopyConvert extends DefaultHandler implements ErrorHandler {
180 Attributes atts) 189 Attributes atts)
181 throws SAXException { 190 throws SAXException {
182 out.write('<'); 191 out.write('<');
192
193 if ("latex".equals(localName)) {
194 latexElem = new LaTeXElement(atts, isLatexConverted);
195 return;
196 }
197
183 out.write(qName); 198 out.write(qName);
184 199
185 boolean isImage = "imagedata".equals(localName); 200 boolean isImage = "imagedata".equals(localName);
186 boolean isGraphicsFile = false; 201 boolean isGraphicsFile = false;
187 202
@@ -304,6 +319,12 @@ public class CopyConvert extends DefaultHandler implements ErrorHandler {
304 319
305 public void endElement(String uri, String localName, String qName) 320 public void endElement(String uri, String localName, String qName)
306 throws SAXException { 321 throws SAXException {
322 if ("latex".equals(localName)) {
323 latexElem.generate();
324 latexElem = null;
325 return;
326 }
327
307 if ("imagedata".equals(localName) && mainOut != null) { 328 if ("imagedata".equals(localName) && mainOut != null) {
308 String rootName = "graphics-" + graphicsCounter; 329 String rootName = "graphics-" + graphicsCounter;
309 String baseName = rootName + ".tmp"; 330 String baseName = rootName + ".tmp";
@@ -358,6 +379,11 @@ public class CopyConvert extends DefaultHandler implements ErrorHandler {
358 379
359 public void characters(char[] ch, int start, int length) 380 public void characters(char[] ch, int start, int length)
360 throws SAXException { 381 throws SAXException {
382 if (latexElem != null) {
383 latexElem.setLaTeX(new String(ch, start, length));
384 return;
385 }
386
361 Helpers.escapeXML(ch, start, length, out); 387 Helpers.escapeXML(ch, start, length, out);
362 } 388 }
363 389
@@ -785,4 +811,84 @@ public class CopyConvert extends DefaultHandler implements ErrorHandler {
785 } 811 }
786 return 0; 812 return 0;
787 } 813 }
814
815 protected class LaTeXElement {
816 int size = 18;
817 Color fg = null, bg = null;
818 int disp = TeXConstants.STYLE_DISPLAY;
819 String code = "imagedata";
820 String LaTeX = "";
821 boolean exported;
822 String attribs;
823
824 protected LaTeXElement(Attributes attrs, boolean exported) {
825 this.exported = exported;
826 int n = attrs.getLength();
827 String fgS = "", bgS = "";
828 String dispS = "display";
829 String align = "center";
830
831 for (int i = 0; i < n; i++) {
832 String attr = attrs.getValue(i);
833 String name = attrs.getLocalName(i);
834 if ("align".equals(name)) {
835 code += " align=\'" + attr + "\'";
836 align = attr;
837 } else if ("display".equals(name)) {
838 if ("text".equals(attr)) {
839 disp = TeXConstants.STYLE_TEXT;
840 } else if ("script".equals(attr)) {
841 disp = TeXConstants.STYLE_SCRIPT;
842 } else if ("script_script".equals(attr)) {
843 disp = TeXConstants.STYLE_SCRIPT_SCRIPT;
844 }
845 dispS = attr;
846 } else if ("size".equals(name)) {
847 try {
848 size = Integer.parseInt(attr);
849 } catch (NumberFormatException e) {
850 size = 16;
851 }
852 } else if ("fg".equals(name)) {
853 fg = Color.decode(attr);
854 fgS = attr;
855 } else if ("bg".equals(name)) {
856 bg = Color.decode(attr);
857 bgS = attr;
858 }
859 }
860
861 attribs = " align='" + align + "'";
862 attribs += " size='" + size + "'";
863 attribs += " display='" + dispS + "'";
864 if (bg != null) {
865 attribs += " bg='" + bgS + "'";
866 }
867 if (fg != null) {
868 attribs += " fg='" + fgS + "'";
869 }
870 }
871
872 protected void setLaTeX(String str) {
873 LaTeX += str;
874 }
875
876 protected void generate() {
877 if (exported) {
878 generatePNG();
879 return;
880 }
881 out.write("latex" + attribs + " xmlns=\"http://forge.scilab.org/p/jlatexmath\"><![CDATA[" + LaTeX + "]]></latex>");
882 }
883
884
885 protected void generatePNG() {
886 TeXFormula tf = new TeXFormula(LaTeX);
887 File f = new File(outDir, "graphics-" + (++graphicsCounter) + "_latex.png");
888 tf.createPNG(disp, size, f.getPath(), bg, fg);
889
890 out.write(code + " fileref='graphics-" + graphicsCounter + "_latex.png'/>");
891 }
892 }
893
788} 894}
diff --git a/scilab/modules/history_manager/Makefile.in b/scilab/modules/history_manager/Makefile.in
index b581876..dbf7375 100644
--- a/scilab/modules/history_manager/Makefile.in
+++ b/scilab/modules/history_manager/Makefile.in
@@ -280,6 +280,7 @@ JGRAPHX = @JGRAPHX@
280JHALL = @JHALL@ 280JHALL = @JHALL@
281JHDF5 = @JHDF5@ 281JHDF5 = @JHDF5@
282JLATEXMATH = @JLATEXMATH@ 282JLATEXMATH = @JLATEXMATH@
283JLATEXMATH_FOP = @JLATEXMATH_FOP@
283JOGL = @JOGL@ 284JOGL = @JOGL@
284JROSETTA_API = @JROSETTA_API@ 285JROSETTA_API = @JROSETTA_API@
285JROSETTA_ENGINE = @JROSETTA_ENGINE@ 286JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/integer/Makefile.in b/scilab/modules/integer/Makefile.in
index d05cb05..5755cc7 100644
--- a/scilab/modules/integer/Makefile.in
+++ b/scilab/modules/integer/Makefile.in
@@ -268,6 +268,7 @@ JGRAPHX = @JGRAPHX@
268JHALL = @JHALL@ 268JHALL = @JHALL@
269JHDF5 = @JHDF5@ 269JHDF5 = @JHDF5@
270JLATEXMATH = @JLATEXMATH@ 270JLATEXMATH = @JLATEXMATH@
271JLATEXMATH_FOP = @JLATEXMATH_FOP@
271JOGL = @JOGL@ 272JOGL = @JOGL@
272JROSETTA_API = @JROSETTA_API@ 273JROSETTA_API = @JROSETTA_API@
273JROSETTA_ENGINE = @JROSETTA_ENGINE@ 274JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/interpolation/Makefile.in b/scilab/modules/interpolation/Makefile.in
index 4f8aadf..f68c012 100644
--- a/scilab/modules/interpolation/Makefile.in
+++ b/scilab/modules/interpolation/Makefile.in
@@ -250,6 +250,7 @@ JGRAPHX = @JGRAPHX@
250JHALL = @JHALL@ 250JHALL = @JHALL@
251JHDF5 = @JHDF5@ 251JHDF5 = @JHDF5@
252JLATEXMATH = @JLATEXMATH@ 252JLATEXMATH = @JLATEXMATH@
253JLATEXMATH_FOP = @JLATEXMATH_FOP@
253JOGL = @JOGL@ 254JOGL = @JOGL@
254JROSETTA_API = @JROSETTA_API@ 255JROSETTA_API = @JROSETTA_API@
255JROSETTA_ENGINE = @JROSETTA_ENGINE@ 256JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index 809ca1e..1be051c 100644
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -233,6 +233,7 @@ JGRAPHX = @JGRAPHX@
233JHALL = @JHALL@ 233JHALL = @JHALL@
234JHDF5 = @JHDF5@ 234JHDF5 = @JHDF5@
235JLATEXMATH = @JLATEXMATH@ 235JLATEXMATH = @JLATEXMATH@
236JLATEXMATH_FOP = @JLATEXMATH_FOP@
236JOGL = @JOGL@ 237JOGL = @JOGL@
237JROSETTA_API = @JROSETTA_API@ 238JROSETTA_API = @JROSETTA_API@
238JROSETTA_ENGINE = @JROSETTA_ENGINE@ 239JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/io/Makefile.in b/scilab/modules/io/Makefile.in
index 67e72be..5337608 100644
--- a/scilab/modules/io/Makefile.in
+++ b/scilab/modules/io/Makefile.in
@@ -254,6 +254,7 @@ JGRAPHX = @JGRAPHX@
254JHALL = @JHALL@ 254JHALL = @JHALL@
255JHDF5 = @JHDF5@ 255JHDF5 = @JHDF5@
256JLATEXMATH = @JLATEXMATH@ 256JLATEXMATH = @JLATEXMATH@
257JLATEXMATH_FOP = @JLATEXMATH_FOP@
257JOGL = @JOGL@ 258JOGL = @JOGL@
258JROSETTA_API = @JROSETTA_API@ 259JROSETTA_API = @JROSETTA_API@
259JROSETTA_ENGINE = @JROSETTA_ENGINE@ 260JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/javasci/Makefile.in b/scilab/modules/javasci/Makefile.in
index b6359f8..67f7af3 100644
--- a/scilab/modules/javasci/Makefile.in
+++ b/scilab/modules/javasci/Makefile.in
@@ -245,6 +245,7 @@ JGRAPHX = @JGRAPHX@
245JHALL = @JHALL@ 245JHALL = @JHALL@
246JHDF5 = @JHDF5@ 246JHDF5 = @JHDF5@
247JLATEXMATH = @JLATEXMATH@ 247JLATEXMATH = @JLATEXMATH@
248JLATEXMATH_FOP = @JLATEXMATH_FOP@
248JOGL = @JOGL@ 249JOGL = @JOGL@
249JROSETTA_API = @JROSETTA_API@ 250JROSETTA_API = @JROSETTA_API@
250JROSETTA_ENGINE = @JROSETTA_ENGINE@ 251JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/jvm/Makefile.in b/scilab/modules/jvm/Makefile.in
index 886ff9a..ecc2a4b 100644
--- a/scilab/modules/jvm/Makefile.in
+++ b/scilab/modules/jvm/Makefile.in
@@ -260,6 +260,7 @@ JGRAPHX = @JGRAPHX@
260JHALL = @JHALL@ 260JHALL = @JHALL@
261JHDF5 = @JHDF5@ 261JHDF5 = @JHDF5@
262JLATEXMATH = @JLATEXMATH@ 262JLATEXMATH = @JLATEXMATH@
263JLATEXMATH_FOP = @JLATEXMATH_FOP@
263JOGL = @JOGL@ 264JOGL = @JOGL@
264JROSETTA_API = @JROSETTA_API@ 265JROSETTA_API = @JROSETTA_API@
265JROSETTA_ENGINE = @JROSETTA_ENGINE@ 266JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/linear_algebra/Makefile.in b/scilab/modules/linear_algebra/Makefile.in
index 64c7af4..11262ab 100644
--- a/scilab/modules/linear_algebra/Makefile.in
+++ b/scilab/modules/linear_algebra/Makefile.in
@@ -270,6 +270,7 @@ JGRAPHX = @JGRAPHX@
270JHALL = @JHALL@ 270JHALL = @JHALL@
271JHDF5 = @JHDF5@ 271JHDF5 = @JHDF5@
272JLATEXMATH = @JLATEXMATH@ 272JLATEXMATH = @JLATEXMATH@
273JLATEXMATH_FOP = @JLATEXMATH_FOP@
273JOGL = @JOGL@ 274JOGL = @JOGL@
274JROSETTA_API = @JROSETTA_API@ 275JROSETTA_API = @JROSETTA_API@
275JROSETTA_ENGINE = @JROSETTA_ENGINE@ 276JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/localization/Makefile.in b/scilab/modules/localization/Makefile.in
index 0dbad79..f0b7b16 100644
--- a/scilab/modules/localization/Makefile.in
+++ b/scilab/modules/localization/Makefile.in
@@ -257,6 +257,7 @@ JGRAPHX = @JGRAPHX@
257JHALL = @JHALL@ 257JHALL = @JHALL@
258JHDF5 = @JHDF5@ 258JHDF5 = @JHDF5@
259JLATEXMATH = @JLATEXMATH@ 259JLATEXMATH = @JLATEXMATH@
260JLATEXMATH_FOP = @JLATEXMATH_FOP@
260JOGL = @JOGL@ 261JOGL = @JOGL@
261JROSETTA_API = @JROSETTA_API@ 262JROSETTA_API = @JROSETTA_API@
262JROSETTA_ENGINE = @JROSETTA_ENGINE@ 263JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/m2sci/Makefile.in b/scilab/modules/m2sci/Makefile.in
index 5bf30be..973b373 100644
--- a/scilab/modules/m2sci/Makefile.in
+++ b/scilab/modules/m2sci/Makefile.in
@@ -190,6 +190,7 @@ JGRAPHX = @JGRAPHX@
190JHALL = @JHALL@ 190JHALL = @JHALL@
191JHDF5 = @JHDF5@ 191JHDF5 = @JHDF5@
192JLATEXMATH = @JLATEXMATH@ 192JLATEXMATH = @JLATEXMATH@
193JLATEXMATH_FOP = @JLATEXMATH_FOP@
193JOGL = @JOGL@ 194JOGL = @JOGL@
194JROSETTA_API = @JROSETTA_API@ 195JROSETTA_API = @JROSETTA_API@
195JROSETTA_ENGINE = @JROSETTA_ENGINE@ 196JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/maple2scilab/Makefile.in b/scilab/modules/maple2scilab/Makefile.in
index a1327e3..48cb10c 100644
--- a/scilab/modules/maple2scilab/Makefile.in
+++ b/scilab/modules/maple2scilab/Makefile.in
@@ -190,6 +190,7 @@ JGRAPHX = @JGRAPHX@
190JHALL = @JHALL@ 190JHALL = @JHALL@
191JHDF5 = @JHDF5@ 191JHDF5 = @JHDF5@
192JLATEXMATH = @JLATEXMATH@ 192JLATEXMATH = @JLATEXMATH@
193JLATEXMATH_FOP = @JLATEXMATH_FOP@
193JOGL = @JOGL@ 194JOGL = @JOGL@
194JROSETTA_API = @JROSETTA_API@ 195JROSETTA_API = @JROSETTA_API@
195JROSETTA_ENGINE = @JROSETTA_ENGINE@ 196JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/matio/Makefile.in b/scilab/modules/matio/Makefile.in
index 50791a8..b6c0386 100644
--- a/scilab/modules/matio/Makefile.in
+++ b/scilab/modules/matio/Makefile.in
@@ -1,4 +1,4 @@
1# Makefile.in generated by automake 1.11 from Makefile.am. 1# Makefile.in generated by automake 1.11.1 from Makefile.am.
2# @configure_input@ 2# @configure_input@
3 3
4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -257,6 +257,7 @@ JGRAPHX = @JGRAPHX@
257JHALL = @JHALL@ 257JHALL = @JHALL@
258JHDF5 = @JHDF5@ 258JHDF5 = @JHDF5@
259JLATEXMATH = @JLATEXMATH@ 259JLATEXMATH = @JLATEXMATH@
260JLATEXMATH_FOP = @JLATEXMATH_FOP@
260JOGL = @JOGL@ 261JOGL = @JOGL@
261JROSETTA_API = @JROSETTA_API@ 262JROSETTA_API = @JROSETTA_API@
262JROSETTA_ENGINE = @JROSETTA_ENGINE@ 263JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/mexlib/Makefile.in b/scilab/modules/mexlib/Makefile.in
index 9498984..a1864b2 100644
--- a/scilab/modules/mexlib/Makefile.in
+++ b/scilab/modules/mexlib/Makefile.in
@@ -234,6 +234,7 @@ JGRAPHX = @JGRAPHX@
234JHALL = @JHALL@ 234JHALL = @JHALL@
235JHDF5 = @JHDF5@ 235JHDF5 = @JHDF5@
236JLATEXMATH = @JLATEXMATH@ 236JLATEXMATH = @JLATEXMATH@
237JLATEXMATH_FOP = @JLATEXMATH_FOP@
237JOGL = @JOGL@ 238JOGL = @JOGL@
238JROSETTA_API = @JROSETTA_API@ 239JROSETTA_API = @JROSETTA_API@
239JROSETTA_ENGINE = @JROSETTA_ENGINE@ 240JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/optimization/Makefile.in b/scilab/modules/optimization/Makefile.in
index 45d0672..ac68134 100644
--- a/scilab/modules/optimization/Makefile.in
+++ b/scilab/modules/optimization/Makefile.in
@@ -261,6 +261,7 @@ JGRAPHX = @JGRAPHX@
261JHALL = @JHALL@ 261JHALL = @JHALL@
262JHDF5 = @JHDF5@ 262JHDF5 = @JHDF5@
263JLATEXMATH = @JLATEXMATH@ 263JLATEXMATH = @JLATEXMATH@
264JLATEXMATH_FOP = @JLATEXMATH_FOP@
264JOGL = @JOGL@ 265JOGL = @JOGL@
265JROSETTA_API = @JROSETTA_API@ 266JROSETTA_API = @JROSETTA_API@
266JROSETTA_ENGINE = @JROSETTA_ENGINE@ 267JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/output_stream/Makefile.in b/scilab/modules/output_stream/Makefile.in
index b985e6f..613b808 100644
--- a/scilab/modules/output_stream/Makefile.in
+++ b/scilab/modules/output_stream/Makefile.in
@@ -265,6 +265,7 @@ JGRAPHX = @JGRAPHX@
265JHALL = @JHALL@ 265JHALL = @JHALL@
266JHDF5 = @JHDF5@ 266JHDF5 = @JHDF5@
267JLATEXMATH = @JLATEXMATH@ 267JLATEXMATH = @JLATEXMATH@
268JLATEXMATH_FOP = @JLATEXMATH_FOP@
268JOGL = @JOGL@ 269JOGL = @JOGL@
269JROSETTA_API = @JROSETTA_API@ 270JROSETTA_API = @JROSETTA_API@
270JROSETTA_ENGINE = @JROSETTA_ENGINE@ 271JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/overloading/Makefile.in b/scilab/modules/overloading/Makefile.in
index 408fd54..65029cc 100644
--- a/scilab/modules/overloading/Makefile.in
+++ b/scilab/modules/overloading/Makefile.in
@@ -191,6 +191,7 @@ JGRAPHX = @JGRAPHX@
191JHALL = @JHALL@ 191JHALL = @JHALL@
192JHDF5 = @JHDF5@ 192JHDF5 = @JHDF5@
193JLATEXMATH = @JLATEXMATH@ 193JLATEXMATH = @JLATEXMATH@
194JLATEXMATH_FOP = @JLATEXMATH_FOP@
194JOGL = @JOGL@ 195JOGL = @JOGL@
195JROSETTA_API = @JROSETTA_API@ 196JROSETTA_API = @JROSETTA_API@
196JROSETTA_ENGINE = @JROSETTA_ENGINE@ 197JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/parameters/Makefile.in b/scilab/modules/parameters/Makefile.in
index e22d624..e08ee06 100644
--- a/scilab/modules/parameters/Makefile.in
+++ b/scilab/modules/parameters/Makefile.in
@@ -194,6 +194,7 @@ JGRAPHX = @JGRAPHX@
194JHALL = @JHALL@ 194JHALL = @JHALL@
195JHDF5 = @JHDF5@ 195JHDF5 = @JHDF5@
196JLATEXMATH = @JLATEXMATH@ 196JLATEXMATH = @JLATEXMATH@
197JLATEXMATH_FOP = @JLATEXMATH_FOP@
197JOGL = @JOGL@ 198JOGL = @JOGL@
198JROSETTA_API = @JROSETTA_API@ 199JROSETTA_API = @JROSETTA_API@
199JROSETTA_ENGINE = @JROSETTA_ENGINE@ 200JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/polynomials/Makefile.in b/scilab/modules/polynomials/Makefile.in
index 7d803dd..d6efa1f 100644
--- a/scilab/modules/polynomials/Makefile.in
+++ b/scilab/modules/polynomials/Makefile.in
@@ -264,6 +264,7 @@ JGRAPHX = @JGRAPHX@
264JHALL = @JHALL@ 264JHALL = @JHALL@
265JHDF5 = @JHDF5@ 265JHDF5 = @JHDF5@
266JLATEXMATH = @JLATEXMATH@ 266JLATEXMATH = @JLATEXMATH@
267JLATEXMATH_FOP = @JLATEXMATH_FOP@
267JOGL = @JOGL@ 268JOGL = @JOGL@
268JROSETTA_API = @JROSETTA_API@ 269JROSETTA_API = @JROSETTA_API@
269JROSETTA_ENGINE = @JROSETTA_ENGINE@ 270JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/pvm/Makefile.in b/scilab/modules/pvm/Makefile.in
index 37bc35a..ae2bd08 100644
--- a/scilab/modules/pvm/Makefile.in
+++ b/scilab/modules/pvm/Makefile.in
@@ -305,6 +305,7 @@ JGRAPHX = @JGRAPHX@
305JHALL = @JHALL@ 305JHALL = @JHALL@
306JHDF5 = @JHDF5@ 306JHDF5 = @JHDF5@
307JLATEXMATH = @JLATEXMATH@ 307JLATEXMATH = @JLATEXMATH@
308JLATEXMATH_FOP = @JLATEXMATH_FOP@
308JOGL = @JOGL@ 309JOGL = @JOGL@
309JROSETTA_API = @JROSETTA_API@ 310JROSETTA_API = @JROSETTA_API@
310JROSETTA_ENGINE = @JROSETTA_ENGINE@ 311JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/randlib/Makefile.in b/scilab/modules/randlib/Makefile.in
index e4a21ff..f275e11 100644
--- a/scilab/modules/randlib/Makefile.in
+++ b/scilab/modules/randlib/Makefile.in
@@ -238,6 +238,7 @@ JGRAPHX = @JGRAPHX@
238JHALL = @JHALL@ 238JHALL = @JHALL@
239JHDF5 = @JHDF5@ 239JHDF5 = @JHDF5@
240JLATEXMATH = @JLATEXMATH@ 240JLATEXMATH = @JLATEXMATH@
241JLATEXMATH_FOP = @JLATEXMATH_FOP@
241JOGL = @JOGL@ 242JOGL = @JOGL@
242JROSETTA_API = @JROSETTA_API@ 243JROSETTA_API = @JROSETTA_API@
243JROSETTA_ENGINE = @JROSETTA_ENGINE@ 244JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/renderer/Makefile.in b/scilab/modules/renderer/Makefile.in
index 43afc2c..6dc6aae 100644
--- a/scilab/modules/renderer/Makefile.in
+++ b/scilab/modules/renderer/Makefile.in
@@ -500,6 +500,7 @@ JGRAPHX = @JGRAPHX@
500JHALL = @JHALL@ 500JHALL = @JHALL@
501JHDF5 = @JHDF5@ 501JHDF5 = @JHDF5@
502JLATEXMATH = @JLATEXMATH@ 502JLATEXMATH = @JLATEXMATH@
503JLATEXMATH_FOP = @JLATEXMATH_FOP@
503JOGL = @JOGL@ 504JOGL = @JOGL@
504JROSETTA_API = @JROSETTA_API@ 505JROSETTA_API = @JROSETTA_API@
505JROSETTA_ENGINE = @JROSETTA_ENGINE@ 506JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/scicos/Makefile.in b/scilab/modules/scicos/Makefile.in
index 14071c9..250c506 100644
--- a/scilab/modules/scicos/Makefile.in
+++ b/scilab/modules/scicos/Makefile.in
@@ -395,6 +395,7 @@ JGRAPHX = @JGRAPHX@
395JHALL = @JHALL@ 395JHALL = @JHALL@
396JHDF5 = @JHDF5@ 396JHDF5 = @JHDF5@
397JLATEXMATH = @JLATEXMATH@ 397JLATEXMATH = @JLATEXMATH@
398JLATEXMATH_FOP = @JLATEXMATH_FOP@
398JOGL = @JOGL@ 399JOGL = @JOGL@
399JROSETTA_API = @JROSETTA_API@ 400JROSETTA_API = @JROSETTA_API@
400JROSETTA_ENGINE = @JROSETTA_ENGINE@ 401JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/scicos_blocks/Makefile.in b/scilab/modules/scicos_blocks/Makefile.in
index 9212fd7..bee73e2 100644
--- a/scilab/modules/scicos_blocks/Makefile.in
+++ b/scilab/modules/scicos_blocks/Makefile.in
@@ -711,6 +711,7 @@ JGRAPHX = @JGRAPHX@
711JHALL = @JHALL@ 711JHALL = @JHALL@
712JHDF5 = @JHDF5@ 712JHDF5 = @JHDF5@
713JLATEXMATH = @JLATEXMATH@ 713JLATEXMATH = @JLATEXMATH@
714JLATEXMATH_FOP = @JLATEXMATH_FOP@
714JOGL = @JOGL@ 715JOGL = @JOGL@
715JROSETTA_API = @JROSETTA_API@ 716JROSETTA_API = @JROSETTA_API@
716JROSETTA_ENGINE = @JROSETTA_ENGINE@ 717JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/shell/Makefile.in b/scilab/modules/shell/Makefile.in
index 21b0a76..c0b3a03 100644
--- a/scilab/modules/shell/Makefile.in
+++ b/scilab/modules/shell/Makefile.in
@@ -247,6 +247,7 @@ JGRAPHX = @JGRAPHX@
247JHALL = @JHALL@ 247JHALL = @JHALL@
248JHDF5 = @JHDF5@ 248JHDF5 = @JHDF5@
249JLATEXMATH = @JLATEXMATH@ 249JLATEXMATH = @JLATEXMATH@
250JLATEXMATH_FOP = @JLATEXMATH_FOP@
250JOGL = @JOGL@ 251JOGL = @JOGL@
251JROSETTA_API = @JROSETTA_API@ 252JROSETTA_API = @JROSETTA_API@
252JROSETTA_ENGINE = @JROSETTA_ENGINE@ 253JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/signal_processing/Makefile.in b/scilab/modules/signal_processing/Makefile.in
index 0db0354..25b8156 100644
--- a/scilab/modules/signal_processing/Makefile.in
+++ b/scilab/modules/signal_processing/Makefile.in
@@ -256,6 +256,7 @@ JGRAPHX = @JGRAPHX@
256JHALL = @JHALL@ 256JHALL = @JHALL@
257JHDF5 = @JHDF5@ 257JHDF5 = @JHDF5@
258JLATEXMATH = @JLATEXMATH@ 258JLATEXMATH = @JLATEXMATH@
259JLATEXMATH_FOP = @JLATEXMATH_FOP@
259JOGL = @JOGL@ 260JOGL = @JOGL@
260JROSETTA_API = @JROSETTA_API@ 261JROSETTA_API = @JROSETTA_API@
261JROSETTA_ENGINE = @JROSETTA_ENGINE@ 262JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/simulated_annealing/Makefile.in b/scilab/modules/simulated_annealing/Makefile.in
index a1db9cb..1230caf 100644
--- a/scilab/modules/simulated_annealing/Makefile.in
+++ b/scilab/modules/simulated_annealing/Makefile.in
@@ -195,6 +195,7 @@ JGRAPHX = @JGRAPHX@
195JHALL = @JHALL@ 195JHALL = @JHALL@
196JHDF5 = @JHDF5@ 196JHDF5 = @JHDF5@
197JLATEXMATH = @JLATEXMATH@ 197JLATEXMATH = @JLATEXMATH@
198JLATEXMATH_FOP = @JLATEXMATH_FOP@
198JOGL = @JOGL@ 199JOGL = @JOGL@
199JROSETTA_API = @JROSETTA_API@ 200JROSETTA_API = @JROSETTA_API@
200JROSETTA_ENGINE = @JROSETTA_ENGINE@ 201JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/sound/Makefile.in b/scilab/modules/sound/Makefile.in
index 37ec7f1..dc43cb9 100644
--- a/scilab/modules/sound/Makefile.in
+++ b/scilab/modules/sound/Makefile.in
@@ -221,6 +221,7 @@ JGRAPHX = @JGRAPHX@
221JHALL = @JHALL@ 221JHALL = @JHALL@
222JHDF5 = @JHDF5@ 222JHDF5 = @JHDF5@
223JLATEXMATH = @JLATEXMATH@ 223JLATEXMATH = @JLATEXMATH@
224JLATEXMATH_FOP = @JLATEXMATH_FOP@
224JOGL = @JOGL@ 225JOGL = @JOGL@
225JROSETTA_API = @JROSETTA_API@ 226JROSETTA_API = @JROSETTA_API@
226JROSETTA_ENGINE = @JROSETTA_ENGINE@ 227JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/sparse/Makefile.in b/scilab/modules/sparse/Makefile.in
index f7e6cb1..a752751 100644
--- a/scilab/modules/sparse/Makefile.in
+++ b/scilab/modules/sparse/Makefile.in
@@ -271,6 +271,7 @@ JGRAPHX = @JGRAPHX@
271JHALL = @JHALL@ 271JHALL = @JHALL@
272JHDF5 = @JHDF5@ 272JHDF5 = @JHDF5@
273JLATEXMATH = @JLATEXMATH@ 273JLATEXMATH = @JLATEXMATH@
274JLATEXMATH_FOP = @JLATEXMATH_FOP@
274JOGL = @JOGL@ 275JOGL = @JOGL@
275JROSETTA_API = @JROSETTA_API@ 276JROSETTA_API = @JROSETTA_API@
276JROSETTA_ENGINE = @JROSETTA_ENGINE@ 277JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/special_functions/Makefile.in b/scilab/modules/special_functions/Makefile.in
index bc9d97c..96a58c0 100644
--- a/scilab/modules/special_functions/Makefile.in
+++ b/scilab/modules/special_functions/Makefile.in
@@ -251,6 +251,7 @@ JGRAPHX = @JGRAPHX@
251JHALL = @JHALL@ 251JHALL = @JHALL@
252JHDF5 = @JHDF5@ 252JHDF5 = @JHDF5@
253JLATEXMATH = @JLATEXMATH@ 253JLATEXMATH = @JLATEXMATH@
254JLATEXMATH_FOP = @JLATEXMATH_FOP@
254JOGL = @JOGL@ 255JOGL = @JOGL@
255JROSETTA_API = @JROSETTA_API@ 256JROSETTA_API = @JROSETTA_API@
256JROSETTA_ENGINE = @JROSETTA_ENGINE@ 257JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/spreadsheet/Makefile.in b/scilab/modules/spreadsheet/Makefile.in
index 21230cb..967b26f 100644
--- a/scilab/modules/spreadsheet/Makefile.in
+++ b/scilab/modules/spreadsheet/Makefile.in
@@ -232,6 +232,7 @@ JGRAPHX = @JGRAPHX@
232JHALL = @JHALL@ 232JHALL = @JHALL@
233JHDF5 = @JHDF5@ 233JHDF5 = @JHDF5@
234JLATEXMATH = @JLATEXMATH@ 234JLATEXMATH = @JLATEXMATH@
235JLATEXMATH_FOP = @JLATEXMATH_FOP@
235JOGL = @JOGL@ 236JOGL = @JOGL@
236JROSETTA_API = @JROSETTA_API@ 237JROSETTA_API = @JROSETTA_API@
237JROSETTA_ENGINE = @JROSETTA_ENGINE@ 238JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/statistics/Makefile.in b/scilab/modules/statistics/Makefile.in
index ac1a005..bfa5a7a 100644
--- a/scilab/modules/statistics/Makefile.in
+++ b/scilab/modules/statistics/Makefile.in
@@ -252,6 +252,7 @@ JGRAPHX = @JGRAPHX@
252JHALL = @JHALL@ 252JHALL = @JHALL@
253JHDF5 = @JHDF5@ 253JHDF5 = @JHDF5@
254JLATEXMATH = @JLATEXMATH@ 254JLATEXMATH = @JLATEXMATH@
255JLATEXMATH_FOP = @JLATEXMATH_FOP@
255JOGL = @JOGL@ 256JOGL = @JOGL@
256JROSETTA_API = @JROSETTA_API@ 257JROSETTA_API = @JROSETTA_API@
257JROSETTA_ENGINE = @JROSETTA_ENGINE@ 258JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/string/Makefile.in b/scilab/modules/string/Makefile.in
index 5800112..aad2199 100644
--- a/scilab/modules/string/Makefile.in
+++ b/scilab/modules/string/Makefile.in
@@ -1,4 +1,4 @@
1# Makefile.in generated by automake 1.11 from Makefile.am. 1# Makefile.in generated by automake 1.11.1 from Makefile.am.
2# @configure_input@ 2# @configure_input@
3 3
4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -266,6 +266,7 @@ JGRAPHX = @JGRAPHX@
266JHALL = @JHALL@ 266JHALL = @JHALL@
267JHDF5 = @JHDF5@ 267JHDF5 = @JHDF5@
268JLATEXMATH = @JLATEXMATH@ 268JLATEXMATH = @JLATEXMATH@
269JLATEXMATH_FOP = @JLATEXMATH_FOP@
269JOGL = @JOGL@ 270JOGL = @JOGL@
270JROSETTA_API = @JROSETTA_API@ 271JROSETTA_API = @JROSETTA_API@
271JROSETTA_ENGINE = @JROSETTA_ENGINE@ 272JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/symbolic/Makefile.in b/scilab/modules/symbolic/Makefile.in
index 4d49363..9d47ad5 100644
--- a/scilab/modules/symbolic/Makefile.in
+++ b/scilab/modules/symbolic/Makefile.in
@@ -236,6 +236,7 @@ JGRAPHX = @JGRAPHX@
236JHALL = @JHALL@ 236JHALL = @JHALL@
237JHDF5 = @JHDF5@ 237JHDF5 = @JHDF5@
238JLATEXMATH = @JLATEXMATH@ 238JLATEXMATH = @JLATEXMATH@
239JLATEXMATH_FOP = @JLATEXMATH_FOP@
239JOGL = @JOGL@ 240JOGL = @JOGL@
240JROSETTA_API = @JROSETTA_API@ 241JROSETTA_API = @JROSETTA_API@
241JROSETTA_ENGINE = @JROSETTA_ENGINE@ 242JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/tclsci/Makefile.in b/scilab/modules/tclsci/Makefile.in
index 22609bb..5ac7a0d 100644
--- a/scilab/modules/tclsci/Makefile.in
+++ b/scilab/modules/tclsci/Makefile.in
@@ -273,6 +273,7 @@ JGRAPHX = @JGRAPHX@
273JHALL = @JHALL@ 273JHALL = @JHALL@
274JHDF5 = @JHDF5@ 274JHDF5 = @JHDF5@
275JLATEXMATH = @JLATEXMATH@ 275JLATEXMATH = @JLATEXMATH@
276JLATEXMATH_FOP = @JLATEXMATH_FOP@
276JOGL = @JOGL@ 277JOGL = @JOGL@
277JROSETTA_API = @JROSETTA_API@ 278JROSETTA_API = @JROSETTA_API@
278JROSETTA_ENGINE = @JROSETTA_ENGINE@ 279JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/texmacs/Makefile.in b/scilab/modules/texmacs/Makefile.in
index 2821996..74f2ee2 100644
--- a/scilab/modules/texmacs/Makefile.in
+++ b/scilab/modules/texmacs/Makefile.in
@@ -190,6 +190,7 @@ JGRAPHX = @JGRAPHX@
190JHALL = @JHALL@ 190JHALL = @JHALL@
191JHDF5 = @JHDF5@ 191JHDF5 = @JHDF5@
192JLATEXMATH = @JLATEXMATH@ 192JLATEXMATH = @JLATEXMATH@
193JLATEXMATH_FOP = @JLATEXMATH_FOP@
193JOGL = @JOGL@ 194JOGL = @JOGL@
194JROSETTA_API = @JROSETTA_API@ 195JROSETTA_API = @JROSETTA_API@
195JROSETTA_ENGINE = @JROSETTA_ENGINE@ 196JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/time/Makefile.in b/scilab/modules/time/Makefile.in
index 6c07779..5d88d1a 100644
--- a/scilab/modules/time/Makefile.in
+++ b/scilab/modules/time/Makefile.in
@@ -228,6 +228,7 @@ JGRAPHX = @JGRAPHX@
228JHALL = @JHALL@ 228JHALL = @JHALL@
229JHDF5 = @JHDF5@ 229JHDF5 = @JHDF5@
230JLATEXMATH = @JLATEXMATH@ 230JLATEXMATH = @JLATEXMATH@
231JLATEXMATH_FOP = @JLATEXMATH_FOP@
231JOGL = @JOGL@ 232JOGL = @JOGL@
232JROSETTA_API = @JROSETTA_API@ 233JROSETTA_API = @JROSETTA_API@
233JROSETTA_ENGINE = @JROSETTA_ENGINE@ 234JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/umfpack/Makefile.in b/scilab/modules/umfpack/Makefile.in
index cc7019b..f6605d5 100644
--- a/scilab/modules/umfpack/Makefile.in
+++ b/scilab/modules/umfpack/Makefile.in
@@ -259,6 +259,7 @@ JGRAPHX = @JGRAPHX@
259JHALL = @JHALL@ 259JHALL = @JHALL@
260JHDF5 = @JHDF5@ 260JHDF5 = @JHDF5@
261JLATEXMATH = @JLATEXMATH@ 261JLATEXMATH = @JLATEXMATH@
262JLATEXMATH_FOP = @JLATEXMATH_FOP@
262JOGL = @JOGL@ 263JOGL = @JOGL@
263JROSETTA_API = @JROSETTA_API@ 264JROSETTA_API = @JROSETTA_API@
264JROSETTA_ENGINE = @JROSETTA_ENGINE@ 265JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/windows_tools/Makefile.in b/scilab/modules/windows_tools/Makefile.in
index 86f0aa0..54783d0 100644
--- a/scilab/modules/windows_tools/Makefile.in
+++ b/scilab/modules/windows_tools/Makefile.in
@@ -220,6 +220,7 @@ JGRAPHX = @JGRAPHX@
220JHALL = @JHALL@ 220JHALL = @JHALL@
221JHDF5 = @JHDF5@ 221JHDF5 = @JHDF5@
222JLATEXMATH = @JLATEXMATH@ 222JLATEXMATH = @JLATEXMATH@
223JLATEXMATH_FOP = @JLATEXMATH_FOP@
223JOGL = @JOGL@ 224JOGL = @JOGL@
224JROSETTA_API = @JROSETTA_API@ 225JROSETTA_API = @JROSETTA_API@
225JROSETTA_ENGINE = @JROSETTA_ENGINE@ 226JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/xcos/Makefile.in b/scilab/modules/xcos/Makefile.in
index ec36025..09b71c7 100644
--- a/scilab/modules/xcos/Makefile.in
+++ b/scilab/modules/xcos/Makefile.in
@@ -259,6 +259,7 @@ JGRAPHX = @JGRAPHX@
259JHALL = @JHALL@ 259JHALL = @JHALL@
260JHDF5 = @JHDF5@ 260JHDF5 = @JHDF5@
261JLATEXMATH = @JLATEXMATH@ 261JLATEXMATH = @JLATEXMATH@
262JLATEXMATH_FOP = @JLATEXMATH_FOP@
262JOGL = @JOGL@ 263JOGL = @JOGL@
263JROSETTA_API = @JROSETTA_API@ 264JROSETTA_API = @JROSETTA_API@
264JROSETTA_ENGINE = @JROSETTA_ENGINE@ 265JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/xpad/Makefile.in b/scilab/modules/xpad/Makefile.in
index 984a485..82d7fb9 100644
--- a/scilab/modules/xpad/Makefile.in
+++ b/scilab/modules/xpad/Makefile.in
@@ -253,6 +253,7 @@ JGRAPHX = @JGRAPHX@
253JHALL = @JHALL@ 253JHALL = @JHALL@
254JHDF5 = @JHDF5@ 254JHDF5 = @JHDF5@
255JLATEXMATH = @JLATEXMATH@ 255JLATEXMATH = @JLATEXMATH@
256JLATEXMATH_FOP = @JLATEXMATH_FOP@
256JOGL = @JOGL@ 257JOGL = @JOGL@
257JROSETTA_API = @JROSETTA_API@ 258JROSETTA_API = @JROSETTA_API@
258JROSETTA_ENGINE = @JROSETTA_ENGINE@ 259JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/scilab-lib-doc.properties.in b/scilab/scilab-lib-doc.properties.in
index 0634ea9..40592ea 100644
--- a/scilab/scilab-lib-doc.properties.in
+++ b/scilab/scilab-lib-doc.properties.in
@@ -10,6 +10,9 @@ saxon.jar=@SAXON@
10; Reusable components used by Batik and FOP 10; Reusable components used by Batik and FOP
11fop.jar=@FOP@ 11fop.jar=@FOP@
12 12
13; LaTeX plugin
14jlatexmath-fop.jar=@JLATEXMATH_FOP@
15
13; A complete MathML rendering solution 16; A complete MathML rendering solution
14jeuclid-core.jar=@JEUCLID_CORE@ 17jeuclid-core.jar=@JEUCLID_CORE@
15 18
diff --git a/scilab/scilab-lib-doc.properties.vc b/scilab/scilab-lib-doc.properties.vc
index b6c09cf..89e800a 100644
--- a/scilab/scilab-lib-doc.properties.vc
+++ b/scilab/scilab-lib-doc.properties.vc
@@ -10,6 +10,9 @@ saxon.jar=${thirdparty.dir}/saxon.jar
10; Reusable components used by Batik and FOP 10; Reusable components used by Batik and FOP
11fop.jar=${thirdparty.dir}/fop.jar 11fop.jar=${thirdparty.dir}/fop.jar
12 12
13; LaTeX plugin
14jlatexmath-fop.jar=${thirdparty.dir}/jlatexmath-fop-0.8.8.jar
15
13; A complete MathML rendering solution 16; A complete MathML rendering solution
14jeuclid-core.jar=${thirdparty.dir}/jeuclid-core.jar 17jeuclid-core.jar=${thirdparty.dir}/jeuclid-core.jar
15 18
diff --git a/scilab/scilab-lib.properties.vc b/scilab/scilab-lib.properties.vc
index 5fd5bd2..40583b8 100644
--- a/scilab/scilab-lib.properties.vc
+++ b/scilab/scilab-lib.properties.vc
@@ -18,7 +18,7 @@ jrosetta-API.jar=${thirdparty.dir}/jrosetta-API.jar
18 18
19jrosetta-engine.jar=${thirdparty.dir}/jrosetta-engine.jar 19jrosetta-engine.jar=${thirdparty.dir}/jrosetta-engine.jar
20 20
21jlatexmath.jar=${thirdparty.dir}/jlatexmath-0.8.8.jar 21jlatexmath.jar=${thirdparty.dir}/jlatexmath-fop-0.8.8.jar
22 22
23checkstyle.jar=${thirdparty.dir}/checkstyle/checkstyle-all-4.3.jar 23checkstyle.jar=${thirdparty.dir}/checkstyle/checkstyle-all-4.3.jar
24 24