summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2009-10-12 11:12:48 +0200
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2009-10-12 11:12:48 +0200
commit838088968ab1b32bd9a7d7e7de26a8830eab37c4 (patch)
tree8464071574e85ec63537893b436b9874fd6fc309
parent3e4167f46119f46904fcaa826f51e83ffc7a1a06 (diff)
parent860ea89846000bfd48f5c657437a8513052d93cc (diff)
downloadscilab-838088968ab1b32bd9a7d7e7de26a8830eab37c4.zip
scilab-838088968ab1b32bd9a7d7e7de26a8830eab37c4.tar.gz
Merge of the textrendering branch into the master
-rw-r--r--scilab/Makefile.in1
-rw-r--r--scilab/build.incl.xml2
-rwxr-xr-xscilab/configure137
-rw-r--r--scilab/configure.ac5
-rw-r--r--scilab/contrib/Makefile.in1
-rw-r--r--scilab/etc/classpath.xml.in5
-rw-r--r--scilab/etc/classpath.xml.vc5
-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/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.in1
-rw-r--r--scilab/modules/fftw/Makefile.in1
-rw-r--r--scilab/modules/fileio/Makefile.in1
-rw-r--r--scilab/modules/functions/Makefile.in1
-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/gui/Makefile.in1
-rw-r--r--scilab/modules/hdf5/Makefile.in1
-rw-r--r--scilab/modules/helptools/Makefile.in1
-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.in1
-rw-r--r--scilab/modules/metanet/Makefile.in1
-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/renderer/src/java/org/scilab/modules/renderer/textDrawing/MathMLObjectGL.java116
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/textDrawing/TeXObjectGL.java98
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/textRendering/SciTextRenderer.java50
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/textRendering/SpecialTextRenderer.java136
-rw-r--r--scilab/modules/scicos/Makefile.in1
-rw-r--r--scilab/modules/scicos_blocks/Makefile.in1
-rw-r--r--scilab/modules/scipad/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.in1
-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/xpad/Makefile.in1
-rw-r--r--scilab/scilab-lib.properties.in2
-rw-r--r--scilab/scilab-lib.properties.vc2
89 files changed, 598 insertions, 38 deletions
diff --git a/scilab/Makefile.in b/scilab/Makefile.in
index e35518a..a2150eb 100644
--- a/scilab/Makefile.in
+++ b/scilab/Makefile.in
@@ -390,6 +390,7 @@ JDB = @JDB@
390JEUCLID_CORE = @JEUCLID_CORE@ 390JEUCLID_CORE = @JEUCLID_CORE@
391JHALL = @JHALL@ 391JHALL = @JHALL@
392JHDF5 = @JHDF5@ 392JHDF5 = @JHDF5@
393JLATEXMATH = @JLATEXMATH@
393JOGL = @JOGL@ 394JOGL = @JOGL@
394JROSETTA_API = @JROSETTA_API@ 395JROSETTA_API = @JROSETTA_API@
395JROSETTA_ENGINE = @JROSETTA_ENGINE@ 396JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/build.incl.xml b/scilab/build.incl.xml
index bc87221..148a563 100644
--- a/scilab/build.incl.xml
+++ b/scilab/build.incl.xml
@@ -84,6 +84,8 @@
84 <pathelement location="${fop.jar}"/> 84 <pathelement location="${fop.jar}"/>
85 85
86 <pathelement location="${jeuclid-core.jar}"/> 86 <pathelement location="${jeuclid-core.jar}"/>
87
88 <pathelement location="${jlatexmath.jar}"/>
87 </path> 89 </path>
88 90
89 <taskdef resource="checkstyletask.properties" classpathref="checkstyle.classpath"/> 91 <taskdef resource="checkstyletask.properties" classpathref="checkstyle.classpath"/>
diff --git a/scilab/configure b/scilab/configure
index 2c44c6a..ab34ca9 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -740,6 +740,7 @@ JAVA_JNI_INCLUDE
740ANTLR 740ANTLR
741COMMONS_BEANUTILS 741COMMONS_BEANUTILS
742CHECKSTYLE 742CHECKSTYLE
743JLATEXMATH
743COMMONS_LOGGING 744COMMONS_LOGGING
744JHDF5 745JHDF5
745JROSETTA_ENGINE 746JROSETTA_ENGINE
@@ -9810,7 +9811,7 @@ $as_echo "$ac_java_classpath" >&6; }
9810$as_echo_n "checking to see if the java compiler works... " >&6; } 9811$as_echo_n "checking to see if the java compiler works... " >&6; }
9811 9812
9812 cat << \EOF > conftest.java 9813 cat << \EOF > conftest.java
9813// #line 9813 "configure" 9814// #line 9814 "configure"
9814 9815
9815 9816
9816public class conftest { 9817public class conftest {
@@ -9858,7 +9859,7 @@ $as_echo_n "checking type of jvm... " >&6; }
9858 if test "x$ac_java_jvm_name" = "x" ; then 9859 if test "x$ac_java_jvm_name" = "x" ; then
9859 9860
9860 cat << \EOF > conftest.java 9861 cat << \EOF > conftest.java
9861// #line 9861 "configure" 9862// #line 9862 "configure"
9862import gnu.java.io.EncodingManager; 9863import gnu.java.io.EncodingManager;
9863 9864
9864public class conftest { 9865public class conftest {
@@ -9904,7 +9905,7 @@ $as_echo_n "checking java API version... " >&6; }
9904 9905
9905 9906
9906 cat << \EOF > conftest.java 9907 cat << \EOF > conftest.java
9907// #line 9907 "configure" 9908// #line 9908 "configure"
9908import java.nio.charset.Charset; 9909import java.nio.charset.Charset;
9909 9910
9910public class conftest { 9911public class conftest {
@@ -9931,7 +9932,7 @@ EOF
9931 9932
9932 9933
9933 cat << \EOF > conftest.java 9934 cat << \EOF > conftest.java
9934// #line 9934 "configure" 9935// #line 9935 "configure"
9935import java.lang.StringBuilder; 9936import java.lang.StringBuilder;
9936 9937
9937public class conftest { 9938public class conftest {
@@ -11168,7 +11169,7 @@ $as_echo_n "checking flexdock... " >&6; }
11168 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11169 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11169 11170
11170 cat << \EOF > conftest.java 11171 cat << \EOF > conftest.java
11171// #line 11171 "configure" 11172// #line 11172 "configure"
11172import org.flexdock.docking.DockingManager; 11173import org.flexdock.docking.DockingManager;
11173 11174
11174public class conftest { 11175public class conftest {
@@ -11240,7 +11241,7 @@ $as_echo_n "checking looks... " >&6; }
11240 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11241 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11241 11242
11242 cat << \EOF > conftest.java 11243 cat << \EOF > conftest.java
11243// #line 11243 "configure" 11244// #line 11244 "configure"
11244import com.jgoodies.looks.common.RenderingUtils; 11245import com.jgoodies.looks.common.RenderingUtils;
11245 11246
11246public class conftest { 11247public class conftest {
@@ -11312,7 +11313,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
11312 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11313 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11313 11314
11314 cat << \EOF > conftest.java 11315 cat << \EOF > conftest.java
11315// #line 11315 "configure" 11316// #line 11316 "configure"
11316import com.jgoodies.looks.common.RenderingUtils; 11317import com.jgoodies.looks.common.RenderingUtils;
11317 11318
11318public class conftest { 11319public class conftest {
@@ -11385,7 +11386,7 @@ $as_echo_n "checking skinlf... " >&6; }
11385 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11386 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11386 11387
11387 cat << \EOF > conftest.java 11388 cat << \EOF > conftest.java
11388// #line 11388 "configure" 11389// #line 11389 "configure"
11389import com.l2fprod.util.AccessUtils; 11390import com.l2fprod.util.AccessUtils;
11390 11391
11391public class conftest { 11392public class conftest {
@@ -11457,7 +11458,7 @@ $as_echo_n "checking jogl... " >&6; }
11457 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11458 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11458 11459
11459 cat << \EOF > conftest.java 11460 cat << \EOF > conftest.java
11460// #line 11460 "configure" 11461// #line 11461 "configure"
11461import javax.media.opengl.glu.GLUnurbs; 11462import javax.media.opengl.glu.GLUnurbs;
11462 11463
11463public class conftest { 11464public class conftest {
@@ -11529,7 +11530,7 @@ $as_echo_n "checking jhall... " >&6; }
11529 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11530 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11530 11531
11531 cat << \EOF > conftest.java 11532 cat << \EOF > conftest.java
11532// #line 11532 "configure" 11533// #line 11533 "configure"
11533import javax.help.JHelp; 11534import javax.help.JHelp;
11534 11535
11535public class conftest { 11536public class conftest {
@@ -11601,7 +11602,7 @@ $as_echo_n "checking javahelp2... " >&6; }
11601 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11602 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11602 11603
11603 cat << \EOF > conftest.java 11604 cat << \EOF > conftest.java
11604// #line 11604 "configure" 11605// #line 11605 "configure"
11605import javax.help.JHelp; 11606import javax.help.JHelp;
11606 11607
11607public class conftest { 11608public class conftest {
@@ -11674,7 +11675,7 @@ $as_echo_n "checking gluegen-rt... " >&6; }
11674 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11675 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11675 11676
11676 cat << \EOF > conftest.java 11677 cat << \EOF > conftest.java
11677// #line 11677 "configure" 11678// #line 11678 "configure"
11678import com.sun.gluegen.runtime.CPU; 11679import com.sun.gluegen.runtime.CPU;
11679 11680
11680public class conftest { 11681public class conftest {
@@ -11746,7 +11747,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
11746 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11747 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11747 11748
11748 cat << \EOF > conftest.java 11749 cat << \EOF > conftest.java
11749// #line 11749 "configure" 11750// #line 11750 "configure"
11750import com.artenum.rosetta.interfaces.core.ConsoleConfiguration; 11751import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
11751 11752
11752public class conftest { 11753public class conftest {
@@ -11818,7 +11819,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
11818 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11819 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11819 11820
11820 cat << \EOF > conftest.java 11821 cat << \EOF > conftest.java
11821// #line 11821 "configure" 11822// #line 11822 "configure"
11822import com.artenum.rosetta.core.action.AbstractConsoleAction; 11823import com.artenum.rosetta.core.action.AbstractConsoleAction;
11823 11824
11824public class conftest { 11825public class conftest {
@@ -11891,7 +11892,7 @@ $as_echo_n "checking jhdf5... " >&6; }
11891 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11892 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11892 11893
11893 cat << \EOF > conftest.java 11894 cat << \EOF > conftest.java
11894// #line 11894 "configure" 11895// #line 11895 "configure"
11895import ncsa.hdf.hdf5lib.HDF5Constants; 11896import ncsa.hdf.hdf5lib.HDF5Constants;
11896 11897
11897public class conftest { 11898public class conftest {
@@ -11964,7 +11965,7 @@ $as_echo_n "checking commons-logging... " >&6; }
11964 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11965 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11965 11966
11966 cat << \EOF > conftest.java 11967 cat << \EOF > conftest.java
11967// #line 11967 "configure" 11968// #line 11968 "configure"
11968import org.apache.commons.logging.LogFactory; 11969import org.apache.commons.logging.LogFactory;
11969 11970
11970public class conftest { 11971public class conftest {
@@ -12016,6 +12017,78 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar commons-lo
12016 COMMONS_LOGGING=$PACKAGE_JAR_FILE 12017 COMMONS_LOGGING=$PACKAGE_JAR_FILE
12017 12018
12018 12019
12020 # JLaTeXMath
12021
12022 { $as_echo "$as_me:${as_lineno-$LINENO}: checking jlatexmath" >&5
12023$as_echo_n "checking jlatexmath... " >&6; }
12024 PACKAGE_JAR_FILE=
12025 found_jar=no
12026 saved_ac_java_classpath=$ac_java_classpath
12027 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)"
12028 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
12029 for jar in "$jardir/jlatexmath.jar" "$jardir/libjlatexmath.jar" "$jardir/libjlatexmath-java.jar" "$jardir/jlatexmath*.jar"; do
12030# jar=`echo $jar|sed -e 's/ /\\ /'`
12031# echo "protected $jar"
12032# jar_resolved=`ls $jar 2>/dev/null`
12033# echo "looking for $jar_resolved"
12034# TODO check the behaviour when spaces
12035 jar_resolved=`ls $jar 2>/dev/null`
12036 if test -e "$jar_resolved"; then
12037 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12038
12039 cat << \EOF > conftest.java
12040// #line 12040 "configure"
12041import org.scilab.forge.jlatexmath.TeXFormula;
12042
12043public class conftest {
12044 public static void main(String[] argv) {
12045
12046 }
12047}
12048EOF
12049
12050 CLASSPATH=$ac_java_classpath
12051 export CLASSPATH
12052 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
12053 if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
12054 echo "yes" >&5
12055
12056 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
12057$as_echo "$jar_resolved" >&6; }
12058 found_jar=yes
12059 PACKAGE_JAR_FILE=$jar_resolved
12060 break
12061
12062 else
12063 echo "configure: failed program was:" >&5
12064 cat conftest.java >&5
12065 echo "configure: CLASSPATH was $CLASSPATH" >&5
12066
12067 ac_java_classpath=$saved_ac_java_classpath
12068
12069
12070 fi
12071
12072 fi
12073 done
12074 if test "$found_jar" = "yes"; then
12075 break
12076 fi
12077 done
12078 if test "$found_jar" = "no"; then
12079 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12080$as_echo "no" >&6; }
12081 if test "" = "yes"; then
12082 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jlatexmath used by LaTex Rendering (looking for package org.scilab.forge.jlatexmath.TeXFormula)" >&5
12083$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jlatexmath used by LaTex Rendering (looking for package org.scilab.forge.jlatexmath.TeXFormula)" >&2;}
12084 else
12085 as_fn_error "Could not find or use the Java package/jar jlatexmath used by LaTex Rendering (looking for package org.scilab.forge.jlatexmath.TeXFormula)" "$LINENO" 5
12086 fi
12087 fi
12088
12089 JLATEXMATH=$PACKAGE_JAR_FILE
12090
12091
12019 12092
12020$as_echo "#define WITH_GUI /**/" >>confdefs.h 12093$as_echo "#define WITH_GUI /**/" >>confdefs.h
12021 12094
@@ -12042,7 +12115,7 @@ $as_echo_n "checking checkstyle... " >&6; }
12042 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12115 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12043 12116
12044 cat << \EOF > conftest.java 12117 cat << \EOF > conftest.java
12045// #line 12045 "configure" 12118// #line 12118 "configure"
12046import com.puppycrawl.tools.checkstyle.CheckStyleTask; 12119import com.puppycrawl.tools.checkstyle.CheckStyleTask;
12047 12120
12048public class conftest { 12121public class conftest {
@@ -12114,7 +12187,7 @@ $as_echo_n "checking commons-beanutils... " >&6; }
12114 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12187 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12115 12188
12116 cat << \EOF > conftest.java 12189 cat << \EOF > conftest.java
12117// #line 12117 "configure" 12190// #line 12190 "configure"
12118import org.apache.commons.beanutils.Converter; 12191import org.apache.commons.beanutils.Converter;
12119 12192
12120public class conftest { 12193public class conftest {
@@ -12186,7 +12259,7 @@ $as_echo_n "checking antlr... " >&6; }
12186 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12259 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12187 12260
12188 cat << \EOF > conftest.java 12261 cat << \EOF > conftest.java
12189// #line 12189 "configure" 12262// #line 12262 "configure"
12190import antlr.TokenStreamException; 12263import antlr.TokenStreamException;
12191 12264
12192public class conftest { 12265public class conftest {
@@ -20237,7 +20310,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
20237{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5 20310{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
20238$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; } 20311$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
20239cat > conftest.$ac_ext <<EOF 20312cat > conftest.$ac_ext <<EOF
20240#line 20240 "configure" 20313#line 20313 "configure"
20241#include "confdefs.h" 20314#include "confdefs.h"
20242 20315
20243#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME" 20316#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -20549,7 +20622,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
20549$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; } 20622$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
20550 20623
20551cat > conftest.$ac_ext <<EOF 20624cat > conftest.$ac_ext <<EOF
20552#line 20552 "configure" 20625#line 20625 "configure"
20553#include "confdefs.h" 20626#include "confdefs.h"
20554 20627
20555#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME" 20628#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -21130,7 +21203,7 @@ $as_echo_n "checking batik-all... " >&6; }
21130 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21203 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21131 21204
21132 cat << \EOF > conftest.java 21205 cat << \EOF > conftest.java
21133// #line 21133 "configure" 21206// #line 21206 "configure"
21134import org.apache.batik.parser.Parser; 21207import org.apache.batik.parser.Parser;
21135 21208
21136public class conftest { 21209public class conftest {
@@ -21202,7 +21275,7 @@ $as_echo_n "checking batik... " >&6; }
21202 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21275 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21203 21276
21204 cat << \EOF > conftest.java 21277 cat << \EOF > conftest.java
21205// #line 21205 "configure" 21278// #line 21278 "configure"
21206import org.apache.batik.parser.Parser; 21279import org.apache.batik.parser.Parser;
21207 21280
21208public class conftest { 21281public class conftest {
@@ -21276,7 +21349,7 @@ $as_echo_n "checking saxon... " >&6; }
21276 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21349 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21277 21350
21278 cat << \EOF > conftest.java 21351 cat << \EOF > conftest.java
21279// #line 21279 "configure" 21352// #line 21352 "configure"
21280import com.icl.saxon.Loader; 21353import com.icl.saxon.Loader;
21281 21354
21282public class conftest { 21355public class conftest {
@@ -21348,7 +21421,7 @@ $as_echo_n "checking fop... " >&6; }
21348 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21421 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21349 21422
21350 cat << \EOF > conftest.java 21423 cat << \EOF > conftest.java
21351// #line 21351 "configure" 21424// #line 21424 "configure"
21352import org.apache.fop.pdf.PDFInfo; 21425import org.apache.fop.pdf.PDFInfo;
21353 21426
21354public class conftest { 21427public class conftest {
@@ -21420,7 +21493,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
21420 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21493 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21421 21494
21422 cat << \EOF > conftest.java 21495 cat << \EOF > conftest.java
21423// #line 21423 "configure" 21496// #line 21496 "configure"
21424import net.sourceforge.jeuclid.LayoutContext; 21497import net.sourceforge.jeuclid.LayoutContext;
21425 21498
21426public class conftest { 21499public class conftest {
@@ -21492,7 +21565,7 @@ $as_echo_n "checking commons-io... " >&6; }
21492 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21565 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21493 21566
21494 cat << \EOF > conftest.java 21567 cat << \EOF > conftest.java
21495// #line 21495 "configure" 21568// #line 21568 "configure"
21496import org.apache.commons.io.output.CountingOutputStream; 21569import org.apache.commons.io.output.CountingOutputStream;
21497 21570
21498public class conftest { 21571public class conftest {
@@ -21564,7 +21637,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
21564 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21637 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21565 21638
21566 cat << \EOF > conftest.java 21639 cat << \EOF > conftest.java
21567// #line 21567 "configure" 21640// #line 21640 "configure"
21568import org.apache.xmlgraphics.util.Service; 21641import org.apache.xmlgraphics.util.Service;
21569 21642
21570public class conftest { 21643public class conftest {
@@ -21636,7 +21709,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
21636 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21709 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21637 21710
21638 cat << \EOF > conftest.java 21711 cat << \EOF > conftest.java
21639// #line 21639 "configure" 21712// #line 21712 "configure"
21640import org.w3c.dom.svg.SVGDocument; 21713import org.w3c.dom.svg.SVGDocument;
21641 21714
21642public class conftest { 21715public class conftest {
@@ -21709,7 +21782,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
21709 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21782 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21710 21783
21711 cat << \EOF > conftest.java 21784 cat << \EOF > conftest.java
21712// #line 21712 "configure" 21785// #line 21785 "configure"
21713import org.apache.avalon.framework.configuration.ConfigurationException; 21786import org.apache.avalon.framework.configuration.ConfigurationException;
21714 21787
21715public class conftest { 21788public class conftest {
@@ -27952,7 +28025,7 @@ else
27952 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 28025 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
27953 lt_status=$lt_dlunknown 28026 lt_status=$lt_dlunknown
27954 cat > conftest.$ac_ext <<_LT_EOF 28027 cat > conftest.$ac_ext <<_LT_EOF
27955#line 27955 "configure" 28028#line 28028 "configure"
27956#include "confdefs.h" 28029#include "confdefs.h"
27957 28030
27958#if HAVE_DLFCN_H 28031#if HAVE_DLFCN_H
@@ -28058,7 +28131,7 @@ else
28058 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 28131 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
28059 lt_status=$lt_dlunknown 28132 lt_status=$lt_dlunknown
28060 cat > conftest.$ac_ext <<_LT_EOF 28133 cat > conftest.$ac_ext <<_LT_EOF
28061#line 28061 "configure" 28134#line 28134 "configure"
28062#include "confdefs.h" 28135#include "confdefs.h"
28063 28136
28064#if HAVE_DLFCN_H 28137#if HAVE_DLFCN_H
diff --git a/scilab/configure.ac b/scilab/configure.ac
index 1477812..865696b 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -723,6 +723,11 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
723 COMMONS_LOGGING=$PACKAGE_JAR_FILE 723 COMMONS_LOGGING=$PACKAGE_JAR_FILE
724 AC_SUBST(COMMONS_LOGGING) 724 AC_SUBST(COMMONS_LOGGING)
725 725
726 # JLaTeXMath
727 AC_JAVA_CHECK_PACKAGE([jlatexmath],[org.scilab.forge.jlatexmath.TeXFormula],[LaTex Rendering])
728 JLATEXMATH=$PACKAGE_JAR_FILE
729 AC_SUBST(JLATEXMATH)
730
726 AC_DEFINE([WITH_GUI],[],[With the JAVA stuff (GUI, Console, JOGL...)]) 731 AC_DEFINE([WITH_GUI],[],[With the JAVA stuff (GUI, Console, JOGL...)])
727 732
728 fi 733 fi
diff --git a/scilab/contrib/Makefile.in b/scilab/contrib/Makefile.in
index 1ef2510..795eb62 100644
--- a/scilab/contrib/Makefile.in
+++ b/scilab/contrib/Makefile.in
@@ -145,6 +145,7 @@ JDB = @JDB@
145JEUCLID_CORE = @JEUCLID_CORE@ 145JEUCLID_CORE = @JEUCLID_CORE@
146JHALL = @JHALL@ 146JHALL = @JHALL@
147JHDF5 = @JHDF5@ 147JHDF5 = @JHDF5@
148JLATEXMATH = @JLATEXMATH@
148JOGL = @JOGL@ 149JOGL = @JOGL@
149JROSETTA_API = @JROSETTA_API@ 150JROSETTA_API = @JROSETTA_API@
150JROSETTA_ENGINE = @JROSETTA_ENGINE@ 151JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/etc/classpath.xml.in b/scilab/etc/classpath.xml.in
index 2aecb5a..4f52c06 100644
--- a/scilab/etc/classpath.xml.in
+++ b/scilab/etc/classpath.xml.in
@@ -37,6 +37,11 @@ The option is "disableUnderMode" and can be:
37<path value="@JHALL@"/> 37<path value="@JHALL@"/>
38 38
39<!-- Load when needed --> 39<!-- Load when needed -->
40<path value="@JLATEXMATH@" load="onUse">
41 <load on="graphics"/>
42 <load on="graphic_export"/>
43</path>
44
40<path value="@JOGL@" load="onUse"> 45<path value="@JOGL@" load="onUse">
41 <load on="graphics"/> 46 <load on="graphics"/>
42 <load on="graphic_export"/> 47 <load on="graphic_export"/>
diff --git a/scilab/etc/classpath.xml.vc b/scilab/etc/classpath.xml.vc
index 7313134..5f2efc0 100644
--- a/scilab/etc/classpath.xml.vc
+++ b/scilab/etc/classpath.xml.vc
@@ -37,6 +37,11 @@ The option is "disableUnderMode" and can be:
37<path value="$SCILAB/thirdparty/jhall.jar" load="startup"/> 37<path value="$SCILAB/thirdparty/jhall.jar" load="startup"/>
38 38
39<!-- Load when needed --> 39<!-- Load when needed -->
40<path value="$SCILAB/thirdparty/jlatexmath.jar" load="onUse">
41 <load on="graphics"/>
42 <load on="graphic_export"/>
43</path>
44
40<path value="$SCILAB/thirdparty/jogl.jar" load="onUse"> 45<path value="$SCILAB/thirdparty/jogl.jar" load="onUse">
41 <load on="graphics"/> 46 <load on="graphics"/>
42 <load on="graphic_export"/> 47 <load on="graphic_export"/>
diff --git a/scilab/libs/MALLOC/Makefile.in b/scilab/libs/MALLOC/Makefile.in
index a2c5896..1dce678 100644
--- a/scilab/libs/MALLOC/Makefile.in
+++ b/scilab/libs/MALLOC/Makefile.in
@@ -211,6 +211,7 @@ JDB = @JDB@
211JEUCLID_CORE = @JEUCLID_CORE@ 211JEUCLID_CORE = @JEUCLID_CORE@
212JHALL = @JHALL@ 212JHALL = @JHALL@
213JHDF5 = @JHDF5@ 213JHDF5 = @JHDF5@
214JLATEXMATH = @JLATEXMATH@
214JOGL = @JOGL@ 215JOGL = @JOGL@
215JROSETTA_API = @JROSETTA_API@ 216JROSETTA_API = @JROSETTA_API@
216JROSETTA_ENGINE = @JROSETTA_ENGINE@ 217JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/libs/Makefile.in b/scilab/libs/Makefile.in
index e60e065..b17b551 100644
--- a/scilab/libs/Makefile.in
+++ b/scilab/libs/Makefile.in
@@ -183,6 +183,7 @@ JDB = @JDB@
183JEUCLID_CORE = @JEUCLID_CORE@ 183JEUCLID_CORE = @JEUCLID_CORE@
184JHALL = @JHALL@ 184JHALL = @JHALL@
185JHDF5 = @JHDF5@ 185JHDF5 = @JHDF5@
186JLATEXMATH = @JLATEXMATH@
186JOGL = @JOGL@ 187JOGL = @JOGL@
187JROSETTA_API = @JROSETTA_API@ 188JROSETTA_API = @JROSETTA_API@
188JROSETTA_ENGINE = @JROSETTA_ENGINE@ 189JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/libs/doublylinkedlist/Makefile.in b/scilab/libs/doublylinkedlist/Makefile.in
index 679be86..5f43141 100644
--- a/scilab/libs/doublylinkedlist/Makefile.in
+++ b/scilab/libs/doublylinkedlist/Makefile.in
@@ -213,6 +213,7 @@ JDB = @JDB@
213JEUCLID_CORE = @JEUCLID_CORE@ 213JEUCLID_CORE = @JEUCLID_CORE@
214JHALL = @JHALL@ 214JHALL = @JHALL@
215JHDF5 = @JHDF5@ 215JHDF5 = @JHDF5@
216JLATEXMATH = @JLATEXMATH@
216JOGL = @JOGL@ 217JOGL = @JOGL@
217JROSETTA_API = @JROSETTA_API@ 218JROSETTA_API = @JROSETTA_API@
218JROSETTA_ENGINE = @JROSETTA_ENGINE@ 219JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/libs/dynamiclibrary/Makefile.in b/scilab/libs/dynamiclibrary/Makefile.in
index 7137cfd..9af59cb 100644
--- a/scilab/libs/dynamiclibrary/Makefile.in
+++ b/scilab/libs/dynamiclibrary/Makefile.in
@@ -213,6 +213,7 @@ JDB = @JDB@
213JEUCLID_CORE = @JEUCLID_CORE@ 213JEUCLID_CORE = @JEUCLID_CORE@
214JHALL = @JHALL@ 214JHALL = @JHALL@
215JHDF5 = @JHDF5@ 215JHDF5 = @JHDF5@
216JLATEXMATH = @JLATEXMATH@
216JOGL = @JOGL@ 217JOGL = @JOGL@
217JROSETTA_API = @JROSETTA_API@ 218JROSETTA_API = @JROSETTA_API@
218JROSETTA_ENGINE = @JROSETTA_ENGINE@ 219JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/libs/hashtable/Makefile.in b/scilab/libs/hashtable/Makefile.in
index c0223c8..ccbb615 100644
--- a/scilab/libs/hashtable/Makefile.in
+++ b/scilab/libs/hashtable/Makefile.in
@@ -211,6 +211,7 @@ JDB = @JDB@
211JEUCLID_CORE = @JEUCLID_CORE@ 211JEUCLID_CORE = @JEUCLID_CORE@
212JHALL = @JHALL@ 212JHALL = @JHALL@
213JHDF5 = @JHDF5@ 213JHDF5 = @JHDF5@
214JLATEXMATH = @JLATEXMATH@
214JOGL = @JOGL@ 215JOGL = @JOGL@
215JROSETTA_API = @JROSETTA_API@ 216JROSETTA_API = @JROSETTA_API@
216JROSETTA_ENGINE = @JROSETTA_ENGINE@ 217JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/libs/libst/Makefile.in b/scilab/libs/libst/Makefile.in
index 4c0e320..7262eaf 100644
--- a/scilab/libs/libst/Makefile.in
+++ b/scilab/libs/libst/Makefile.in
@@ -207,6 +207,7 @@ JDB = @JDB@
207JEUCLID_CORE = @JEUCLID_CORE@ 207JEUCLID_CORE = @JEUCLID_CORE@
208JHALL = @JHALL@ 208JHALL = @JHALL@
209JHDF5 = @JHDF5@ 209JHDF5 = @JHDF5@
210JLATEXMATH = @JLATEXMATH@
210JOGL = @JOGL@ 211JOGL = @JOGL@
211JROSETTA_API = @JROSETTA_API@ 212JROSETTA_API = @JROSETTA_API@
212JROSETTA_ENGINE = @JROSETTA_ENGINE@ 213JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index afe4a35..687af7c 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -269,6 +269,7 @@ JDB = @JDB@
269JEUCLID_CORE = @JEUCLID_CORE@ 269JEUCLID_CORE = @JEUCLID_CORE@
270JHALL = @JHALL@ 270JHALL = @JHALL@
271JHDF5 = @JHDF5@ 271JHDF5 = @JHDF5@
272JLATEXMATH = @JLATEXMATH@
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/action_binding/Makefile.in b/scilab/modules/action_binding/Makefile.in
index 85ddb5e..6c57aa9 100644
--- a/scilab/modules/action_binding/Makefile.in
+++ b/scilab/modules/action_binding/Makefile.in
@@ -234,6 +234,7 @@ JDB = @JDB@
234JEUCLID_CORE = @JEUCLID_CORE@ 234JEUCLID_CORE = @JEUCLID_CORE@
235JHALL = @JHALL@ 235JHALL = @JHALL@
236JHDF5 = @JHDF5@ 236JHDF5 = @JHDF5@
237JLATEXMATH = @JLATEXMATH@
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/api_scilab/Makefile.in b/scilab/modules/api_scilab/Makefile.in
index 3fbe4a2..555a8d8 100644
--- a/scilab/modules/api_scilab/Makefile.in
+++ b/scilab/modules/api_scilab/Makefile.in
@@ -228,6 +228,7 @@ JDB = @JDB@
228JEUCLID_CORE = @JEUCLID_CORE@ 228JEUCLID_CORE = @JEUCLID_CORE@
229JHALL = @JHALL@ 229JHALL = @JHALL@
230JHDF5 = @JHDF5@ 230JHDF5 = @JHDF5@
231JLATEXMATH = @JLATEXMATH@
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/arnoldi/Makefile.in b/scilab/modules/arnoldi/Makefile.in
index 1c7c244..5c7e1fd 100644
--- a/scilab/modules/arnoldi/Makefile.in
+++ b/scilab/modules/arnoldi/Makefile.in
@@ -250,6 +250,7 @@ JDB = @JDB@
250JEUCLID_CORE = @JEUCLID_CORE@ 250JEUCLID_CORE = @JEUCLID_CORE@
251JHALL = @JHALL@ 251JHALL = @JHALL@
252JHDF5 = @JHDF5@ 252JHDF5 = @JHDF5@
253JLATEXMATH = @JLATEXMATH@
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/atoms/Makefile.in b/scilab/modules/atoms/Makefile.in
index 801728d..405e2ea 100644
--- a/scilab/modules/atoms/Makefile.in
+++ b/scilab/modules/atoms/Makefile.in
@@ -190,6 +190,7 @@ JDB = @JDB@
190JEUCLID_CORE = @JEUCLID_CORE@ 190JEUCLID_CORE = @JEUCLID_CORE@
191JHALL = @JHALL@ 191JHALL = @JHALL@
192JHDF5 = @JHDF5@ 192JHDF5 = @JHDF5@
193JLATEXMATH = @JLATEXMATH@
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/boolean/Makefile.in b/scilab/modules/boolean/Makefile.in
index 12217cc..77c804e 100644
--- a/scilab/modules/boolean/Makefile.in
+++ b/scilab/modules/boolean/Makefile.in
@@ -229,6 +229,7 @@ JDB = @JDB@
229JEUCLID_CORE = @JEUCLID_CORE@ 229JEUCLID_CORE = @JEUCLID_CORE@
230JHALL = @JHALL@ 230JHALL = @JHALL@
231JHDF5 = @JHDF5@ 231JHDF5 = @JHDF5@
232JLATEXMATH = @JLATEXMATH@
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/cacsd/Makefile.in b/scilab/modules/cacsd/Makefile.in
index b3eebbe..145fe19 100644
--- a/scilab/modules/cacsd/Makefile.in
+++ b/scilab/modules/cacsd/Makefile.in
@@ -324,6 +324,7 @@ JDB = @JDB@
324JEUCLID_CORE = @JEUCLID_CORE@ 324JEUCLID_CORE = @JEUCLID_CORE@
325JHALL = @JHALL@ 325JHALL = @JHALL@
326JHDF5 = @JHDF5@ 326JHDF5 = @JHDF5@
327JLATEXMATH = @JLATEXMATH@
327JOGL = @JOGL@ 328JOGL = @JOGL@
328JROSETTA_API = @JROSETTA_API@ 329JROSETTA_API = @JROSETTA_API@
329JROSETTA_ENGINE = @JROSETTA_ENGINE@ 330JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/call_scilab/Makefile.in b/scilab/modules/call_scilab/Makefile.in
index c1c7390..34eef70 100644
--- a/scilab/modules/call_scilab/Makefile.in
+++ b/scilab/modules/call_scilab/Makefile.in
@@ -225,6 +225,7 @@ JDB = @JDB@
225JEUCLID_CORE = @JEUCLID_CORE@ 225JEUCLID_CORE = @JEUCLID_CORE@
226JHALL = @JHALL@ 226JHALL = @JHALL@
227JHDF5 = @JHDF5@ 227JHDF5 = @JHDF5@
228JLATEXMATH = @JLATEXMATH@
228JOGL = @JOGL@ 229JOGL = @JOGL@
229JROSETTA_API = @JROSETTA_API@ 230JROSETTA_API = @JROSETTA_API@
230JROSETTA_ENGINE = @JROSETTA_ENGINE@ 231JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/compatibility_functions/Makefile.in b/scilab/modules/compatibility_functions/Makefile.in
index 331270f..c8421e4 100644
--- a/scilab/modules/compatibility_functions/Makefile.in
+++ b/scilab/modules/compatibility_functions/Makefile.in
@@ -189,6 +189,7 @@ JDB = @JDB@
189JEUCLID_CORE = @JEUCLID_CORE@ 189JEUCLID_CORE = @JEUCLID_CORE@
190JHALL = @JHALL@ 190JHALL = @JHALL@
191JHDF5 = @JHDF5@ 191JHDF5 = @JHDF5@
192JLATEXMATH = @JLATEXMATH@
192JOGL = @JOGL@ 193JOGL = @JOGL@
193JROSETTA_API = @JROSETTA_API@ 194JROSETTA_API = @JROSETTA_API@
194JROSETTA_ENGINE = @JROSETTA_ENGINE@ 195JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/completion/Makefile.in b/scilab/modules/completion/Makefile.in
index 4766fec..74bed405 100644
--- a/scilab/modules/completion/Makefile.in
+++ b/scilab/modules/completion/Makefile.in
@@ -251,6 +251,7 @@ JDB = @JDB@
251JEUCLID_CORE = @JEUCLID_CORE@ 251JEUCLID_CORE = @JEUCLID_CORE@
252JHALL = @JHALL@ 252JHALL = @JHALL@
253JHDF5 = @JHDF5@ 253JHDF5 = @JHDF5@
254JLATEXMATH = @JLATEXMATH@
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/console/Makefile.in b/scilab/modules/console/Makefile.in
index 07609d5..23bd288 100644
--- a/scilab/modules/console/Makefile.in
+++ b/scilab/modules/console/Makefile.in
@@ -263,6 +263,7 @@ JDB = @JDB@
263JEUCLID_CORE = @JEUCLID_CORE@ 263JEUCLID_CORE = @JEUCLID_CORE@
264JHALL = @JHALL@ 264JHALL = @JHALL@
265JHDF5 = @JHDF5@ 265JHDF5 = @JHDF5@
266JLATEXMATH = @JLATEXMATH@
266JOGL = @JOGL@ 267JOGL = @JOGL@
267JROSETTA_API = @JROSETTA_API@ 268JROSETTA_API = @JROSETTA_API@
268JROSETTA_ENGINE = @JROSETTA_ENGINE@ 269JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/core/Makefile.in b/scilab/modules/core/Makefile.in
index 9ee500d..d7c0062 100644
--- a/scilab/modules/core/Makefile.in
+++ b/scilab/modules/core/Makefile.in
@@ -452,6 +452,7 @@ JDB = @JDB@
452JEUCLID_CORE = @JEUCLID_CORE@ 452JEUCLID_CORE = @JEUCLID_CORE@
453JHALL = @JHALL@ 453JHALL = @JHALL@
454JHDF5 = @JHDF5@ 454JHDF5 = @JHDF5@
455JLATEXMATH = @JLATEXMATH@
455JOGL = @JOGL@ 456JOGL = @JOGL@
456JROSETTA_API = @JROSETTA_API@ 457JROSETTA_API = @JROSETTA_API@
457JROSETTA_ENGINE = @JROSETTA_ENGINE@ 458JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/data_structures/Makefile.in b/scilab/modules/data_structures/Makefile.in
index 976f73e..5ca427d 100644
--- a/scilab/modules/data_structures/Makefile.in
+++ b/scilab/modules/data_structures/Makefile.in
@@ -260,6 +260,7 @@ JDB = @JDB@
260JEUCLID_CORE = @JEUCLID_CORE@ 260JEUCLID_CORE = @JEUCLID_CORE@
261JHALL = @JHALL@ 261JHALL = @JHALL@
262JHDF5 = @JHDF5@ 262JHDF5 = @JHDF5@
263JLATEXMATH = @JLATEXMATH@
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/demo_tools/Makefile.in b/scilab/modules/demo_tools/Makefile.in
index 210ee3a..49fa5d3 100644
--- a/scilab/modules/demo_tools/Makefile.in
+++ b/scilab/modules/demo_tools/Makefile.in
@@ -188,6 +188,7 @@ JDB = @JDB@
188JEUCLID_CORE = @JEUCLID_CORE@ 188JEUCLID_CORE = @JEUCLID_CORE@
189JHALL = @JHALL@ 189JHALL = @JHALL@
190JHDF5 = @JHDF5@ 190JHDF5 = @JHDF5@
191JLATEXMATH = @JLATEXMATH@
191JOGL = @JOGL@ 192JOGL = @JOGL@
192JROSETTA_API = @JROSETTA_API@ 193JROSETTA_API = @JROSETTA_API@
193JROSETTA_ENGINE = @JROSETTA_ENGINE@ 194JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/development_tools/Makefile.in b/scilab/modules/development_tools/Makefile.in
index 7468b4c..d1cc7b6 100644
--- a/scilab/modules/development_tools/Makefile.in
+++ b/scilab/modules/development_tools/Makefile.in
@@ -187,6 +187,7 @@ JDB = @JDB@
187JEUCLID_CORE = @JEUCLID_CORE@ 187JEUCLID_CORE = @JEUCLID_CORE@
188JHALL = @JHALL@ 188JHALL = @JHALL@
189JHDF5 = @JHDF5@ 189JHDF5 = @JHDF5@
190JLATEXMATH = @JLATEXMATH@
190JOGL = @JOGL@ 191JOGL = @JOGL@
191JROSETTA_API = @JROSETTA_API@ 192JROSETTA_API = @JROSETTA_API@
192JROSETTA_ENGINE = @JROSETTA_ENGINE@ 193JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/development_tools/src/fake/Makefile.in b/scilab/modules/development_tools/src/fake/Makefile.in
index 2baaf1d..1d6e67c 100644
--- a/scilab/modules/development_tools/src/fake/Makefile.in
+++ b/scilab/modules/development_tools/src/fake/Makefile.in
@@ -138,6 +138,7 @@ JDB = @JDB@
138JEUCLID_CORE = @JEUCLID_CORE@ 138JEUCLID_CORE = @JEUCLID_CORE@
139JHALL = @JHALL@ 139JHALL = @JHALL@
140JHDF5 = @JHDF5@ 140JHDF5 = @JHDF5@
141JLATEXMATH = @JLATEXMATH@
141JOGL = @JOGL@ 142JOGL = @JOGL@
142JROSETTA_API = @JROSETTA_API@ 143JROSETTA_API = @JROSETTA_API@
143JROSETTA_ENGINE = @JROSETTA_ENGINE@ 144JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/differential_equations/Makefile.in b/scilab/modules/differential_equations/Makefile.in
index 7aba614..a4bdf2e 100644
--- a/scilab/modules/differential_equations/Makefile.in
+++ b/scilab/modules/differential_equations/Makefile.in
@@ -271,6 +271,7 @@ JDB = @JDB@
271JEUCLID_CORE = @JEUCLID_CORE@ 271JEUCLID_CORE = @JEUCLID_CORE@
272JHALL = @JHALL@ 272JHALL = @JHALL@
273JHDF5 = @JHDF5@ 273JHDF5 = @JHDF5@
274JLATEXMATH = @JLATEXMATH@
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/double/Makefile.in b/scilab/modules/double/Makefile.in
index 61114f6..8a1919e 100644
--- a/scilab/modules/double/Makefile.in
+++ b/scilab/modules/double/Makefile.in
@@ -229,6 +229,7 @@ JDB = @JDB@
229JEUCLID_CORE = @JEUCLID_CORE@ 229JEUCLID_CORE = @JEUCLID_CORE@
230JHALL = @JHALL@ 230JHALL = @JHALL@
231JHDF5 = @JHDF5@ 231JHDF5 = @JHDF5@
232JLATEXMATH = @JLATEXMATH@
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/dynamic_link/Makefile.in b/scilab/modules/dynamic_link/Makefile.in
index 7b4d435..2caa8e2 100644
--- a/scilab/modules/dynamic_link/Makefile.in
+++ b/scilab/modules/dynamic_link/Makefile.in
@@ -246,6 +246,7 @@ JDB = @JDB@
246JEUCLID_CORE = @JEUCLID_CORE@ 246JEUCLID_CORE = @JEUCLID_CORE@
247JHALL = @JHALL@ 247JHALL = @JHALL@
248JHDF5 = @JHDF5@ 248JHDF5 = @JHDF5@
249JLATEXMATH = @JLATEXMATH@
249JOGL = @JOGL@ 250JOGL = @JOGL@
250JROSETTA_API = @JROSETTA_API@ 251JROSETTA_API = @JROSETTA_API@
251JROSETTA_ENGINE = @JROSETTA_ENGINE@ 252JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/elementary_functions/Makefile.in b/scilab/modules/elementary_functions/Makefile.in
index a8ee7f7..610244a 100644
--- a/scilab/modules/elementary_functions/Makefile.in
+++ b/scilab/modules/elementary_functions/Makefile.in
@@ -598,6 +598,7 @@ JDB = @JDB@
598JEUCLID_CORE = @JEUCLID_CORE@ 598JEUCLID_CORE = @JEUCLID_CORE@
599JHALL = @JHALL@ 599JHALL = @JHALL@
600JHDF5 = @JHDF5@ 600JHDF5 = @JHDF5@
601JLATEXMATH = @JLATEXMATH@
601JOGL = @JOGL@ 602JOGL = @JOGL@
602JROSETTA_API = @JROSETTA_API@ 603JROSETTA_API = @JROSETTA_API@
603JROSETTA_ENGINE = @JROSETTA_ENGINE@ 604JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/fftw/Makefile.in b/scilab/modules/fftw/Makefile.in
index b57e0ad..ea5f765 100644
--- a/scilab/modules/fftw/Makefile.in
+++ b/scilab/modules/fftw/Makefile.in
@@ -248,6 +248,7 @@ JDB = @JDB@
248JEUCLID_CORE = @JEUCLID_CORE@ 248JEUCLID_CORE = @JEUCLID_CORE@
249JHALL = @JHALL@ 249JHALL = @JHALL@
250JHDF5 = @JHDF5@ 250JHDF5 = @JHDF5@
251JLATEXMATH = @JLATEXMATH@
251JOGL = @JOGL@ 252JOGL = @JOGL@
252JROSETTA_API = @JROSETTA_API@ 253JROSETTA_API = @JROSETTA_API@
253JROSETTA_ENGINE = @JROSETTA_ENGINE@ 254JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/fileio/Makefile.in b/scilab/modules/fileio/Makefile.in
index 06adcce..4675d4d 100644
--- a/scilab/modules/fileio/Makefile.in
+++ b/scilab/modules/fileio/Makefile.in
@@ -277,6 +277,7 @@ JDB = @JDB@
277JEUCLID_CORE = @JEUCLID_CORE@ 277JEUCLID_CORE = @JEUCLID_CORE@
278JHALL = @JHALL@ 278JHALL = @JHALL@
279JHDF5 = @JHDF5@ 279JHDF5 = @JHDF5@
280JLATEXMATH = @JLATEXMATH@
280JOGL = @JOGL@ 281JOGL = @JOGL@
281JROSETTA_API = @JROSETTA_API@ 282JROSETTA_API = @JROSETTA_API@
282JROSETTA_ENGINE = @JROSETTA_ENGINE@ 283JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/functions/Makefile.in b/scilab/modules/functions/Makefile.in
index 485578d..07a3e5d 100644
--- a/scilab/modules/functions/Makefile.in
+++ b/scilab/modules/functions/Makefile.in
@@ -240,6 +240,7 @@ JDB = @JDB@
240JEUCLID_CORE = @JEUCLID_CORE@ 240JEUCLID_CORE = @JEUCLID_CORE@
241JHALL = @JHALL@ 241JHALL = @JHALL@
242JHDF5 = @JHDF5@ 242JHDF5 = @JHDF5@
243JLATEXMATH = @JLATEXMATH@
243JOGL = @JOGL@ 244JOGL = @JOGL@
244JROSETTA_API = @JROSETTA_API@ 245JROSETTA_API = @JROSETTA_API@
245JROSETTA_ENGINE = @JROSETTA_ENGINE@ 246JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/genetic_algorithms/Makefile.in b/scilab/modules/genetic_algorithms/Makefile.in
index 6517e4f..c4d5183 100644
--- a/scilab/modules/genetic_algorithms/Makefile.in
+++ b/scilab/modules/genetic_algorithms/Makefile.in
@@ -191,6 +191,7 @@ JDB = @JDB@
191JEUCLID_CORE = @JEUCLID_CORE@ 191JEUCLID_CORE = @JEUCLID_CORE@
192JHALL = @JHALL@ 192JHALL = @JHALL@
193JHDF5 = @JHDF5@ 193JHDF5 = @JHDF5@
194JLATEXMATH = @JLATEXMATH@
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/graphic_export/Makefile.in b/scilab/modules/graphic_export/Makefile.in
index 01d143c..47bc07f 100644
--- a/scilab/modules/graphic_export/Makefile.in
+++ b/scilab/modules/graphic_export/Makefile.in
@@ -265,6 +265,7 @@ JDB = @JDB@
265JEUCLID_CORE = @JEUCLID_CORE@ 265JEUCLID_CORE = @JEUCLID_CORE@
266JHALL = @JHALL@ 266JHALL = @JHALL@
267JHDF5 = @JHDF5@ 267JHDF5 = @JHDF5@
268JLATEXMATH = @JLATEXMATH@
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/graphics/Makefile.in b/scilab/modules/graphics/Makefile.in
index 37af150..ec6917f 100644
--- a/scilab/modules/graphics/Makefile.in
+++ b/scilab/modules/graphics/Makefile.in
@@ -599,6 +599,7 @@ JDB = @JDB@
599JEUCLID_CORE = @JEUCLID_CORE@ 599JEUCLID_CORE = @JEUCLID_CORE@
600JHALL = @JHALL@ 600JHALL = @JHALL@
601JHDF5 = @JHDF5@ 601JHDF5 = @JHDF5@
602JLATEXMATH = @JLATEXMATH@
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/gui/Makefile.in b/scilab/modules/gui/Makefile.in
index 78e2958..a19227c 100644
--- a/scilab/modules/gui/Makefile.in
+++ b/scilab/modules/gui/Makefile.in
@@ -352,6 +352,7 @@ JDB = @JDB@
352JEUCLID_CORE = @JEUCLID_CORE@ 352JEUCLID_CORE = @JEUCLID_CORE@
353JHALL = @JHALL@ 353JHALL = @JHALL@
354JHDF5 = @JHDF5@ 354JHDF5 = @JHDF5@
355JLATEXMATH = @JLATEXMATH@
355JOGL = @JOGL@ 356JOGL = @JOGL@
356JROSETTA_API = @JROSETTA_API@ 357JROSETTA_API = @JROSETTA_API@
357JROSETTA_ENGINE = @JROSETTA_ENGINE@ 358JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/hdf5/Makefile.in b/scilab/modules/hdf5/Makefile.in
index 173bb06..9b9075a 100644
--- a/scilab/modules/hdf5/Makefile.in
+++ b/scilab/modules/hdf5/Makefile.in
@@ -242,6 +242,7 @@ JDB = @JDB@
242JEUCLID_CORE = @JEUCLID_CORE@ 242JEUCLID_CORE = @JEUCLID_CORE@
243JHALL = @JHALL@ 243JHALL = @JHALL@
244JHDF5 = @JHDF5@ 244JHDF5 = @JHDF5@
245JLATEXMATH = @JLATEXMATH@
245JOGL = @JOGL@ 246JOGL = @JOGL@
246JROSETTA_API = @JROSETTA_API@ 247JROSETTA_API = @JROSETTA_API@
247JROSETTA_ENGINE = @JROSETTA_ENGINE@ 248JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/helptools/Makefile.in b/scilab/modules/helptools/Makefile.in
index 08ae223..f11efb7 100644
--- a/scilab/modules/helptools/Makefile.in
+++ b/scilab/modules/helptools/Makefile.in
@@ -254,6 +254,7 @@ JDB = @JDB@
254JEUCLID_CORE = @JEUCLID_CORE@ 254JEUCLID_CORE = @JEUCLID_CORE@
255JHALL = @JHALL@ 255JHALL = @JHALL@
256JHDF5 = @JHDF5@ 256JHDF5 = @JHDF5@
257JLATEXMATH = @JLATEXMATH@
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/history_manager/Makefile.in b/scilab/modules/history_manager/Makefile.in
index 9a3d7de..0c86c00 100644
--- a/scilab/modules/history_manager/Makefile.in
+++ b/scilab/modules/history_manager/Makefile.in
@@ -276,6 +276,7 @@ JDB = @JDB@
276JEUCLID_CORE = @JEUCLID_CORE@ 276JEUCLID_CORE = @JEUCLID_CORE@
277JHALL = @JHALL@ 277JHALL = @JHALL@
278JHDF5 = @JHDF5@ 278JHDF5 = @JHDF5@
279JLATEXMATH = @JLATEXMATH@
279JOGL = @JOGL@ 280JOGL = @JOGL@
280JROSETTA_API = @JROSETTA_API@ 281JROSETTA_API = @JROSETTA_API@
281JROSETTA_ENGINE = @JROSETTA_ENGINE@ 282JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/integer/Makefile.in b/scilab/modules/integer/Makefile.in
index 9f70b21..2658bf6 100644
--- a/scilab/modules/integer/Makefile.in
+++ b/scilab/modules/integer/Makefile.in
@@ -264,6 +264,7 @@ JDB = @JDB@
264JEUCLID_CORE = @JEUCLID_CORE@ 264JEUCLID_CORE = @JEUCLID_CORE@
265JHALL = @JHALL@ 265JHALL = @JHALL@
266JHDF5 = @JHDF5@ 266JHDF5 = @JHDF5@
267JLATEXMATH = @JLATEXMATH@
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/interpolation/Makefile.in b/scilab/modules/interpolation/Makefile.in
index d2c4af3..f9c803f 100644
--- a/scilab/modules/interpolation/Makefile.in
+++ b/scilab/modules/interpolation/Makefile.in
@@ -246,6 +246,7 @@ JDB = @JDB@
246JEUCLID_CORE = @JEUCLID_CORE@ 246JEUCLID_CORE = @JEUCLID_CORE@
247JHALL = @JHALL@ 247JHALL = @JHALL@
248JHDF5 = @JHDF5@ 248JHDF5 = @JHDF5@
249JLATEXMATH = @JLATEXMATH@
249JOGL = @JOGL@ 250JOGL = @JOGL@
250JROSETTA_API = @JROSETTA_API@ 251JROSETTA_API = @JROSETTA_API@
251JROSETTA_ENGINE = @JROSETTA_ENGINE@ 252JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index dc46039..8caf7bb 100644
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -225,6 +225,7 @@ JDB = @JDB@
225JEUCLID_CORE = @JEUCLID_CORE@ 225JEUCLID_CORE = @JEUCLID_CORE@
226JHALL = @JHALL@ 226JHALL = @JHALL@
227JHDF5 = @JHDF5@ 227JHDF5 = @JHDF5@
228JLATEXMATH = @JLATEXMATH@
228JOGL = @JOGL@ 229JOGL = @JOGL@
229JROSETTA_API = @JROSETTA_API@ 230JROSETTA_API = @JROSETTA_API@
230JROSETTA_ENGINE = @JROSETTA_ENGINE@ 231JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/io/Makefile.in b/scilab/modules/io/Makefile.in
index 43cbe27..12c0daf 100644
--- a/scilab/modules/io/Makefile.in
+++ b/scilab/modules/io/Makefile.in
@@ -250,6 +250,7 @@ JDB = @JDB@
250JEUCLID_CORE = @JEUCLID_CORE@ 250JEUCLID_CORE = @JEUCLID_CORE@
251JHALL = @JHALL@ 251JHALL = @JHALL@
252JHDF5 = @JHDF5@ 252JHDF5 = @JHDF5@
253JLATEXMATH = @JLATEXMATH@
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/javasci/Makefile.in b/scilab/modules/javasci/Makefile.in
index 774da8b..6d104bc 100644
--- a/scilab/modules/javasci/Makefile.in
+++ b/scilab/modules/javasci/Makefile.in
@@ -241,6 +241,7 @@ JDB = @JDB@
241JEUCLID_CORE = @JEUCLID_CORE@ 241JEUCLID_CORE = @JEUCLID_CORE@
242JHALL = @JHALL@ 242JHALL = @JHALL@
243JHDF5 = @JHDF5@ 243JHDF5 = @JHDF5@
244JLATEXMATH = @JLATEXMATH@
244JOGL = @JOGL@ 245JOGL = @JOGL@
245JROSETTA_API = @JROSETTA_API@ 246JROSETTA_API = @JROSETTA_API@
246JROSETTA_ENGINE = @JROSETTA_ENGINE@ 247JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/jvm/Makefile.in b/scilab/modules/jvm/Makefile.in
index e900824..8c7444f 100644
--- a/scilab/modules/jvm/Makefile.in
+++ b/scilab/modules/jvm/Makefile.in
@@ -256,6 +256,7 @@ JDB = @JDB@
256JEUCLID_CORE = @JEUCLID_CORE@ 256JEUCLID_CORE = @JEUCLID_CORE@
257JHALL = @JHALL@ 257JHALL = @JHALL@
258JHDF5 = @JHDF5@ 258JHDF5 = @JHDF5@
259JLATEXMATH = @JLATEXMATH@
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/linear_algebra/Makefile.in b/scilab/modules/linear_algebra/Makefile.in
index 86e8b64..f8ce76a 100644
--- a/scilab/modules/linear_algebra/Makefile.in
+++ b/scilab/modules/linear_algebra/Makefile.in
@@ -266,6 +266,7 @@ JDB = @JDB@
266JEUCLID_CORE = @JEUCLID_CORE@ 266JEUCLID_CORE = @JEUCLID_CORE@
267JHALL = @JHALL@ 267JHALL = @JHALL@
268JHDF5 = @JHDF5@ 268JHDF5 = @JHDF5@
269JLATEXMATH = @JLATEXMATH@
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/localization/Makefile.in b/scilab/modules/localization/Makefile.in
index c959a7d..a2a21c4 100644
--- a/scilab/modules/localization/Makefile.in
+++ b/scilab/modules/localization/Makefile.in
@@ -247,6 +247,7 @@ JDB = @JDB@
247JEUCLID_CORE = @JEUCLID_CORE@ 247JEUCLID_CORE = @JEUCLID_CORE@
248JHALL = @JHALL@ 248JHALL = @JHALL@
249JHDF5 = @JHDF5@ 249JHDF5 = @JHDF5@
250JLATEXMATH = @JLATEXMATH@
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/m2sci/Makefile.in b/scilab/modules/m2sci/Makefile.in
index 778ea34..873cfdd 100644
--- a/scilab/modules/m2sci/Makefile.in
+++ b/scilab/modules/m2sci/Makefile.in
@@ -186,6 +186,7 @@ JDB = @JDB@
186JEUCLID_CORE = @JEUCLID_CORE@ 186JEUCLID_CORE = @JEUCLID_CORE@
187JHALL = @JHALL@ 187JHALL = @JHALL@
188JHDF5 = @JHDF5@ 188JHDF5 = @JHDF5@
189JLATEXMATH = @JLATEXMATH@
189JOGL = @JOGL@ 190JOGL = @JOGL@
190JROSETTA_API = @JROSETTA_API@ 191JROSETTA_API = @JROSETTA_API@
191JROSETTA_ENGINE = @JROSETTA_ENGINE@ 192JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/maple2scilab/Makefile.in b/scilab/modules/maple2scilab/Makefile.in
index 33013ed..27e2d84 100644
--- a/scilab/modules/maple2scilab/Makefile.in
+++ b/scilab/modules/maple2scilab/Makefile.in
@@ -186,6 +186,7 @@ JDB = @JDB@
186JEUCLID_CORE = @JEUCLID_CORE@ 186JEUCLID_CORE = @JEUCLID_CORE@
187JHALL = @JHALL@ 187JHALL = @JHALL@
188JHDF5 = @JHDF5@ 188JHDF5 = @JHDF5@
189JLATEXMATH = @JLATEXMATH@
189JOGL = @JOGL@ 190JOGL = @JOGL@
190JROSETTA_API = @JROSETTA_API@ 191JROSETTA_API = @JROSETTA_API@
191JROSETTA_ENGINE = @JROSETTA_ENGINE@ 192JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/matio/Makefile.in b/scilab/modules/matio/Makefile.in
index fc44151..1cdad66 100644
--- a/scilab/modules/matio/Makefile.in
+++ b/scilab/modules/matio/Makefile.in
@@ -252,6 +252,7 @@ JDB = @JDB@
252JEUCLID_CORE = @JEUCLID_CORE@ 252JEUCLID_CORE = @JEUCLID_CORE@
253JHALL = @JHALL@ 253JHALL = @JHALL@
254JHDF5 = @JHDF5@ 254JHDF5 = @JHDF5@
255JLATEXMATH = @JLATEXMATH@
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/metanet/Makefile.in b/scilab/modules/metanet/Makefile.in
index b9daf86..ff5cee5 100644
--- a/scilab/modules/metanet/Makefile.in
+++ b/scilab/modules/metanet/Makefile.in
@@ -256,6 +256,7 @@ JDB = @JDB@
256JEUCLID_CORE = @JEUCLID_CORE@ 256JEUCLID_CORE = @JEUCLID_CORE@
257JHALL = @JHALL@ 257JHALL = @JHALL@
258JHDF5 = @JHDF5@ 258JHDF5 = @JHDF5@
259JLATEXMATH = @JLATEXMATH@
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/mexlib/Makefile.in b/scilab/modules/mexlib/Makefile.in
index bfdf5d2..11f714b 100644
--- a/scilab/modules/mexlib/Makefile.in
+++ b/scilab/modules/mexlib/Makefile.in
@@ -230,6 +230,7 @@ JDB = @JDB@
230JEUCLID_CORE = @JEUCLID_CORE@ 230JEUCLID_CORE = @JEUCLID_CORE@
231JHALL = @JHALL@ 231JHALL = @JHALL@
232JHDF5 = @JHDF5@ 232JHDF5 = @JHDF5@
233JLATEXMATH = @JLATEXMATH@
233JOGL = @JOGL@ 234JOGL = @JOGL@
234JROSETTA_API = @JROSETTA_API@ 235JROSETTA_API = @JROSETTA_API@
235JROSETTA_ENGINE = @JROSETTA_ENGINE@ 236JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/optimization/Makefile.in b/scilab/modules/optimization/Makefile.in
index 97cfdf8..663cd83 100644
--- a/scilab/modules/optimization/Makefile.in
+++ b/scilab/modules/optimization/Makefile.in
@@ -256,6 +256,7 @@ JDB = @JDB@
256JEUCLID_CORE = @JEUCLID_CORE@ 256JEUCLID_CORE = @JEUCLID_CORE@
257JHALL = @JHALL@ 257JHALL = @JHALL@
258JHDF5 = @JHDF5@ 258JHDF5 = @JHDF5@
259JLATEXMATH = @JLATEXMATH@
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/output_stream/Makefile.in b/scilab/modules/output_stream/Makefile.in
index 3097047..3979f45 100644
--- a/scilab/modules/output_stream/Makefile.in
+++ b/scilab/modules/output_stream/Makefile.in
@@ -261,6 +261,7 @@ JDB = @JDB@
261JEUCLID_CORE = @JEUCLID_CORE@ 261JEUCLID_CORE = @JEUCLID_CORE@
262JHALL = @JHALL@ 262JHALL = @JHALL@
263JHDF5 = @JHDF5@ 263JHDF5 = @JHDF5@
264JLATEXMATH = @JLATEXMATH@
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/overloading/Makefile.in b/scilab/modules/overloading/Makefile.in
index 1928359..66a82dd 100644
--- a/scilab/modules/overloading/Makefile.in
+++ b/scilab/modules/overloading/Makefile.in
@@ -187,6 +187,7 @@ JDB = @JDB@
187JEUCLID_CORE = @JEUCLID_CORE@ 187JEUCLID_CORE = @JEUCLID_CORE@
188JHALL = @JHALL@ 188JHALL = @JHALL@
189JHDF5 = @JHDF5@ 189JHDF5 = @JHDF5@
190JLATEXMATH = @JLATEXMATH@
190JOGL = @JOGL@ 191JOGL = @JOGL@
191JROSETTA_API = @JROSETTA_API@ 192JROSETTA_API = @JROSETTA_API@
192JROSETTA_ENGINE = @JROSETTA_ENGINE@ 193JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/parameters/Makefile.in b/scilab/modules/parameters/Makefile.in
index 0b8cfba..c8e6c13 100644
--- a/scilab/modules/parameters/Makefile.in
+++ b/scilab/modules/parameters/Makefile.in
@@ -190,6 +190,7 @@ JDB = @JDB@
190JEUCLID_CORE = @JEUCLID_CORE@ 190JEUCLID_CORE = @JEUCLID_CORE@
191JHALL = @JHALL@ 191JHALL = @JHALL@
192JHDF5 = @JHDF5@ 192JHDF5 = @JHDF5@
193JLATEXMATH = @JLATEXMATH@
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/polynomials/Makefile.in b/scilab/modules/polynomials/Makefile.in
index 2bcde1e..cf6e2c2 100644
--- a/scilab/modules/polynomials/Makefile.in
+++ b/scilab/modules/polynomials/Makefile.in
@@ -260,6 +260,7 @@ JDB = @JDB@
260JEUCLID_CORE = @JEUCLID_CORE@ 260JEUCLID_CORE = @JEUCLID_CORE@
261JHALL = @JHALL@ 261JHALL = @JHALL@
262JHDF5 = @JHDF5@ 262JHDF5 = @JHDF5@
263JLATEXMATH = @JLATEXMATH@
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/pvm/Makefile.in b/scilab/modules/pvm/Makefile.in
index 19fd0e1..eede6aa 100644
--- a/scilab/modules/pvm/Makefile.in
+++ b/scilab/modules/pvm/Makefile.in
@@ -301,6 +301,7 @@ JDB = @JDB@
301JEUCLID_CORE = @JEUCLID_CORE@ 301JEUCLID_CORE = @JEUCLID_CORE@
302JHALL = @JHALL@ 302JHALL = @JHALL@
303JHDF5 = @JHDF5@ 303JHDF5 = @JHDF5@
304JLATEXMATH = @JLATEXMATH@
304JOGL = @JOGL@ 305JOGL = @JOGL@
305JROSETTA_API = @JROSETTA_API@ 306JROSETTA_API = @JROSETTA_API@
306JROSETTA_ENGINE = @JROSETTA_ENGINE@ 307JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/randlib/Makefile.in b/scilab/modules/randlib/Makefile.in
index fb1a8a4..19aa46f 100644
--- a/scilab/modules/randlib/Makefile.in
+++ b/scilab/modules/randlib/Makefile.in
@@ -234,6 +234,7 @@ JDB = @JDB@
234JEUCLID_CORE = @JEUCLID_CORE@ 234JEUCLID_CORE = @JEUCLID_CORE@
235JHALL = @JHALL@ 235JHALL = @JHALL@
236JHDF5 = @JHDF5@ 236JHDF5 = @JHDF5@
237JLATEXMATH = @JLATEXMATH@
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/renderer/Makefile.in b/scilab/modules/renderer/Makefile.in
index a18c4c4..0a4cd11 100644
--- a/scilab/modules/renderer/Makefile.in
+++ b/scilab/modules/renderer/Makefile.in
@@ -496,6 +496,7 @@ JDB = @JDB@
496JEUCLID_CORE = @JEUCLID_CORE@ 496JEUCLID_CORE = @JEUCLID_CORE@
497JHALL = @JHALL@ 497JHALL = @JHALL@
498JHDF5 = @JHDF5@ 498JHDF5 = @JHDF5@
499JLATEXMATH = @JLATEXMATH@
499JOGL = @JOGL@ 500JOGL = @JOGL@
500JROSETTA_API = @JROSETTA_API@ 501JROSETTA_API = @JROSETTA_API@
501JROSETTA_ENGINE = @JROSETTA_ENGINE@ 502JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/textDrawing/MathMLObjectGL.java b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/textDrawing/MathMLObjectGL.java
new file mode 100644
index 0000000..08ef7f6
--- /dev/null
+++ b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/textDrawing/MathMLObjectGL.java
@@ -0,0 +1,116 @@
1package org.scilab.modules.renderer.textDrawing;
2
3import java.io.IOException;
4import java.awt.Graphics2D;
5import java.awt.Color;
6import java.awt.image.BufferedImage;
7import java.awt.image.DataBufferInt;
8import java.awt.geom.AffineTransform;
9
10import java.nio.ByteBuffer;
11
12import javax.xml.parsers.ParserConfigurationException;
13
14import net.sourceforge.jeuclid.MathMLParserSupport;
15import net.sourceforge.jeuclid.MutableLayoutContext;
16import net.sourceforge.jeuclid.layout.JEuclidView;
17import net.sourceforge.jeuclid.context.LayoutContextImpl;
18import net.sourceforge.jeuclid.context.Parameter;
19
20import org.w3c.dom.Node;
21import org.w3c.dom.Document;
22import org.xml.sax.SAXException;
23
24/**
25 * MathML object
26 * @author Calixte Denizet
27 */
28public class MathMLObjectGL extends SpecialTextObjectGL {
29
30 private Document doc;
31 private JEuclidView jev;
32 private MutableLayoutContext parameters;
33 private final static Graphics2D tmpgrph = new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB).createGraphics();
34
35 private final static String mmlBeg = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE math PUBLIC \"-//W3C//DTD MathML 2.0//EN\" \"http://www.w3.org/Math/DTD/mathml2/mathml2.dtd\"><math mode=\"display\" xmlns=\"http://www.w3.org/1998/Math/MathML\">";
36 private final static String mmlEnd = "</math>";
37
38 /**
39 * Default constructor.
40 * @param content the MathML code
41 * @param color the color of the content
42 * @param fontSize the size of the font
43 */
44 public MathMLObjectGL(String content, Color color, float fontSize) {
45 this.parameters = new LayoutContextImpl(LayoutContextImpl.getDefaultLayoutContext());
46 this.parameters.setParameter(Parameter.MATHCOLOR, color);
47 this.parameters.setParameter(Parameter.MATHSIZE, fontSize);
48 this.jev = new JEuclidView((Node)contentToDocument(mmlBeg + content + mmlEnd), parameters, tmpgrph);
49 makeImage();
50 }
51
52 /**
53 * Set the color of the content
54 * @param color the color of the content
55 */
56 public void setColor(Color color) {
57 if (!parameters.getParameter(Parameter.MATHCOLOR).equals(color)) {
58 parameters.setParameter(Parameter.MATHCOLOR, color);
59 update();
60 }
61 }
62
63 /**
64 * Set the font size of the content
65 * @param fontSize the font size of the content
66 */
67 public void setFontSize(float fontSize) {
68 if ((Float) parameters.getParameter(Parameter.MATHSIZE) != fontSize) {
69 parameters.setParameter(Parameter.MATHSIZE, fontSize);
70 update();
71 }
72 }
73
74 private void update() {
75 this.jev = new JEuclidView((Node)doc, parameters, tmpgrph);
76 makeImage();
77 }
78
79 private Document contentToDocument(final String content) {
80 try {
81 doc = MathMLParserSupport.parseString(content);
82 } catch (final SAXException e) {
83 throw new RuntimeException(e);
84 } catch (final ParserConfigurationException e) {
85 throw new RuntimeException(e);
86 } catch (final IOException e) {
87 throw new RuntimeException(e);
88 }
89 return doc;
90 }
91
92 private void makeImage () {
93 width = (int)Math.ceil(jev.getWidth()) + 2;
94 int W = (int)width;
95 final int ascent = (int)Math.ceil(jev.getAscentHeight());
96 height = (int)Math.ceil(jev.getDescentHeight()) + ascent;
97 int H = (int)height;
98
99 BufferedImage bimg = new BufferedImage(W, H, BufferedImage.TYPE_INT_ARGB);
100
101 Graphics2D g2d = bimg.createGraphics();
102
103 AffineTransform gt = new AffineTransform();
104 gt.translate (0, H);
105 gt.scale (1, -1d);
106 g2d.transform (gt);
107
108 g2d.setColor(new Color(255, 255, 255, 0));
109 g2d.fillRect(0, 0, W, H);
110
111 jev.draw(g2d, 0, ascent);
112
113 int[] intData = ((DataBufferInt)bimg.getRaster().getDataBuffer()).getData();
114 buffer = ByteBuffer.wrap(ARGBtoRGBA(intData));
115 }
116}
diff --git a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/textDrawing/TeXObjectGL.java b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/textDrawing/TeXObjectGL.java
new file mode 100644
index 0000000..e3f0997
--- /dev/null
+++ b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/textDrawing/TeXObjectGL.java
@@ -0,0 +1,98 @@
1package org.scilab.modules.renderer.textDrawing;
2
3import java.awt.Graphics2D;
4import java.awt.Graphics;
5import java.awt.Component;
6import java.awt.Canvas;
7import java.awt.Color;
8import java.awt.Insets;
9import java.awt.image.BufferedImage;
10import java.awt.image.DataBufferInt;
11import java.awt.geom.AffineTransform;
12
13import java.nio.ByteBuffer;
14
15import org.scilab.forge.jlatexmath.TeXConstants;
16import org.scilab.forge.jlatexmath.TeXFormula;
17import org.scilab.forge.jlatexmath.TeXIcon;
18import org.scilab.forge.jlatexmath.ParseException;
19
20/**
21 * LaTeX object
22 * @author Calixte Denizet
23 */
24public class TeXObjectGL extends SpecialTextObjectGL {
25
26 private TeXIcon texi;
27 private TeXFormula formula;
28 private final static Component c = (Component)new Canvas();
29
30 /**
31 * Default constructor.
32 * @param content the LaTeX code
33 * @param color the color of the content
34 * @param fontSize the size of the font
35 */
36 public TeXObjectGL(String content, Color color, float fontSize) throws RuntimeException {
37 if (content.endsWith("$"))
38 content = content.substring(1, content.length()-1);
39 else
40 throw new RuntimeException();
41
42 try {
43 formula = new TeXFormula(content);
44 } catch (ParseException e) {
45 throw new RuntimeException();
46 }
47
48 formula.setBackground(new Color(255, 255, 255, 0));
49 this.texi = formula.createTeXIcon(TeXConstants.STYLE_DISPLAY, fontSize + 2);
50 setColor(color);
51 makeImage();
52 }
53
54 /**
55 * Set the color of the content
56 * @param color the color of the content
57 */
58 public void setColor(Color color) {
59 c.setForeground(color);
60 }
61
62 /**
63 * Set the font size of the content
64 * @param fontSize the font size of the content
65 */
66 public void setFontSize(float fontSize) {
67 this.texi = formula.createTeXIcon(TeXConstants.STYLE_DISPLAY, fontSize + 2);
68 makeImage();
69 }
70
71 private void makeImage () {
72 texi.setInsets(new Insets(1, 1, 1, 1));
73 width = texi.getIconWidth();
74 height = texi.getIconHeight();
75
76 if (width <= 0 || height <= 0) {
77 formula = new TeXFormula("An\\ error\\ occured,\\ please\\ contact\\ the\\ author\\ of\\ J\\LaTeX Math");
78 this.texi = formula.createTeXIcon(TeXConstants.STYLE_DISPLAY, 10);
79 texi.setInsets(new Insets(1, 1, 1, 1));
80 width = texi.getIconWidth();
81 height = texi.getIconHeight();
82 }
83
84 BufferedImage bimg = new BufferedImage((int)width, (int)height, BufferedImage.TYPE_INT_ARGB);
85
86 Graphics2D g2d = bimg.createGraphics();
87
88 AffineTransform gt = new AffineTransform();
89 gt.translate (0, height);
90 gt.scale (1, -1d);
91 g2d.transform (gt);
92
93 texi.paintIcon(c, (Graphics)g2d, 0, 0);
94
95 int[] intData = ((DataBufferInt)bimg.getRaster().getDataBuffer()).getData();
96 buffer = ByteBuffer.wrap(ARGBtoRGBA(intData));
97 }
98}
diff --git a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/textRendering/SciTextRenderer.java b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/textRendering/SciTextRenderer.java
index a8089ec..6ee9bc5 100644
--- a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/textRendering/SciTextRenderer.java
+++ b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/textRendering/SciTextRenderer.java
@@ -21,6 +21,7 @@ import javax.media.opengl.GL;
21import java.lang.reflect.Field; 21import java.lang.reflect.Field;
22import com.sun.opengl.util.j2d.TextRenderer; 22import com.sun.opengl.util.j2d.TextRenderer;
23 23
24
24/** 25/**
25 * Scilab adapted JOGL TextRenderer. Provides text rendering without aliasing. 26 * Scilab adapted JOGL TextRenderer. Provides text rendering without aliasing.
26 * @author Jean-Baptiste Silvy 27 * @author Jean-Baptiste Silvy
@@ -36,8 +37,13 @@ public class SciTextRenderer {
36 37
37 /** Actual object used for text rendering */ 38 /** Actual object used for text rendering */
38 private TextRenderer renderer; 39 private TextRenderer renderer;
40
41 /* Added by Calixte :
42 Object for MathML rendering */
43 private SpecialTextRenderer speRenderer;
44 /* End */
39 45
40 /** font size of the renderer object */ 46 /** font size of the renderer object */
41 private float scaleFactor; 47 private float scaleFactor;
42 48
43 private boolean useFractionalMetrics; 49 private boolean useFractionalMetrics;
@@ -48,8 +54,13 @@ public class SciTextRenderer {
48 * @param renderer mapped text renderer 54 * @param renderer mapped text renderer
49 */ 55 */
50 public SciTextRenderer(TextRenderer renderer, float fontSize) { 56 public SciTextRenderer(TextRenderer renderer, float fontSize) {
51 this.fontSize = fontSize; 57 this.fontSize = fontSize;
52 this.renderer = renderer; 58 this.renderer = renderer;
59
60 /* Add by Calixte */
61 this.speRenderer = new SpecialTextRenderer(renderer, fontSize);
62 /* End */
63
53 setUseFractionalMetrics(true); 64 setUseFractionalMetrics(true);
54 updateScaleFactor(); 65 updateScaleFactor();
55 } 66 }
@@ -74,8 +85,15 @@ public class SciTextRenderer {
74 * @param angle angle of the text to draw 85 * @param angle angle of the text to draw
75 */ 86 */
76 public void draw3D(GL gl, String str, double x, double y, double z, double angle) { 87 public void draw3D(GL gl, String str, double x, double y, double z, double angle) {
88 /* Added by Calixte */
89 if (str.charAt(0) == '<' || str.charAt(0) == '$') {
90 speRenderer.draw3D(str, (float) x, (float) y, (float) z, useFractionalMetrics ? scaleFactor : 1.0f);
91 return;
92 }
93 /* End */
94
77 // with OpenGL strings, angle is already set 95 // with OpenGL strings, angle is already set
78 if (useFractionalMetrics) { 96 if (useFractionalMetrics) {
79 renderer.draw3D(str, (float) x, (float) y, (float) z, scaleFactor); 97 renderer.draw3D(str, (float) x, (float) y, (float) z, scaleFactor);
80 } else { 98 } else {
81 // we need to add a little offset othrwise texture interpolation 99 // we need to add a little offset othrwise texture interpolation
@@ -105,7 +123,7 @@ public class SciTextRenderer {
105 */ 123 */
106 public void begin3DRendering(GL gl) { 124 public void begin3DRendering(GL gl) {
107 125
108 renderer.begin3DRendering(); 126 renderer.begin3DRendering();
109 127
110 // HACK HACK HACK for Intel drivers 128 // HACK HACK HACK for Intel drivers
111 // When text is rendered using normal texture mapping (no mipmap) 129 // When text is rendered using normal texture mapping (no mipmap)
@@ -121,7 +139,7 @@ public class SciTextRenderer {
121 * @param gl OpenGL pipeline 139 * @param gl OpenGL pipeline
122 */ 140 */
123 public void end3DRendering(GL gl) { 141 public void end3DRendering(GL gl) {
124 renderer.end3DRendering(); 142 renderer.end3DRendering();
125 } 143 }
126 144
127 /** 145 /**
@@ -150,6 +168,11 @@ public class SciTextRenderer {
150 */ 168 */
151 public void setFontSize(float newFontSize) { 169 public void setFontSize(float newFontSize) {
152 this.fontSize = newFontSize; 170 this.fontSize = newFontSize;
171
172 /* Added by Calixte */
173 speRenderer.setFontSize(newFontSize);
174 /* End */
175
153 updateScaleFactor(); 176 updateScaleFactor();
154 } 177 }
155 178
@@ -160,6 +183,10 @@ public class SciTextRenderer {
160 * @param blue blue channel 183 * @param blue blue channel
161 */ 184 */
162 public void setColor(double red, double green, double blue) { 185 public void setColor(double red, double green, double blue) {
186 /* Added by Calixte */
187 speRenderer.setColor((float) red, (float) green, (float) blue, 1.0f);
188 /* End */
189
163 renderer.setColor((float) red, (float) green, (float) blue, 1.0f); 190 renderer.setColor((float) red, (float) green, (float) blue, 1.0f);
164 } 191 }
165 192
@@ -168,6 +195,10 @@ public class SciTextRenderer {
168 * @param color array of size 3 containing the channels 195 * @param color array of size 3 containing the channels
169 */ 196 */
170 public void setColor(double[] color) { 197 public void setColor(double[] color) {
198 /* Added by Calixte */
199 speRenderer.setColor((float) color[0], (float) color[1], (float) color[2], 1.0f);
200 /* End */
201
171 renderer.setColor((float) color[0], (float) color[1], (float) color[2], 1.0f); 202 renderer.setColor((float) color[0], (float) color[1], (float) color[2], 1.0f);
172 } 203 }
173 204
@@ -177,7 +208,14 @@ public class SciTextRenderer {
177 * @return rectangle with the position, width and height. 208 * @return rectangle with the position, width and height.
178 */ 209 */
179 public Rectangle2D getBounds(String str) { 210 public Rectangle2D getBounds(String str) {
180 Rectangle2D res = renderer.getBounds(str); 211 Rectangle2D res;
212
213 /* Added by Calixte */
214 if (str.charAt(0) == '<' || str.charAt(0) == '$')
215 res = speRenderer.getBounds(str);
216 else
217 res = renderer.getBounds(str);
218 /* End */
181 219
182 // apply scale factor to the bounds 220 // apply scale factor to the bounds
183 res.setRect(res.getX(), res.getY(), 221 res.setRect(res.getX(), res.getY(),
diff --git a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/textRendering/SpecialTextRenderer.java b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/textRendering/SpecialTextRenderer.java
new file mode 100644
index 0000000..23fbec8
--- /dev/null
+++ b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/textRendering/SpecialTextRenderer.java
@@ -0,0 +1,136 @@
1package org.scilab.modules.renderer.utils.textRendering;
2
3import java.awt.geom.Rectangle2D;
4import java.awt.Color;
5import java.util.HashMap;
6
7import javax.media.opengl.GL;
8import javax.media.opengl.glu.GLU;
9import com.sun.opengl.util.j2d.TextRenderer;
10
11import org.scilab.modules.renderer.textDrawing.MathMLObjectGL;
12import org.scilab.modules.renderer.textDrawing.TeXObjectGL;
13import org.scilab.modules.renderer.textDrawing.SpecialTextObjectGL;
14
15/**
16 * Special Text Renderer (for MathML and LaTeX)
17 * @author Calixte Denizet
18 */
19public class SpecialTextRenderer {
20
21 /* I use the TextRenderer to render a string which isn't in mathml format
22 although it starts with a '<' or '$'*/
23 private TextRenderer textrenderer;
24
25 private Color color = Color.black;
26 private float fontSize;
27
28 private static HashMap<String, SpecialTextObjectGL> table = new HashMap<String, SpecialTextObjectGL>();
29
30 /**
31 * Default constructor.
32 * @param textrenderer a TextRenderer to display bad MathML code
33 */
34 public SpecialTextRenderer(TextRenderer textrenderer, float fontSize) {
35 this.textrenderer = textrenderer;
36 this.fontSize = fontSize + 4;
37 }
38
39 /**
40 * Construct a MathML object.
41 * @param content the MathML code
42 */
43 public SpecialTextObjectGL getContent(final String content) {
44 SpecialTextObjectGL spe;
45 if (!table.containsKey(content)) {
46 try {
47 spe = getSpecialTextObjectGL(content);
48
49 table.put(content, spe);
50 return spe;
51 }
52 catch (RuntimeException e) {
53 table.put(content, null);
54 return null;
55 }
56 }
57
58 spe = table.get(content);
59 if (spe != null) {
60 spe.setColor(color);
61 spe.setFontSize(fontSize);
62 }
63 return spe;
64 }
65
66 /**
67 * Get the boundaries.
68 * @param content the special code
69 */
70 public Rectangle2D getBounds(String content) {
71 SpecialTextObjectGL spe = getContent(content);
72 if (spe != null)
73 return new Rectangle2D.Float(0, 0, spe.getWidth(), spe.getHeight());
74 else
75 return textrenderer.getBounds(content);
76 }
77
78 /**
79 * Redefine setColor with four channels.
80 * @param r red channel
81 * @param g green channel
82 * @param b blue channel
83 * @param a alpha channel
84 */
85 public void setColor(float r, float g, float b, float a) {
86 this.color = new Color(r, g, b, a);
87 }
88
89 /**
90 * Modify the font size of the renderer.
91 * @param fontSize font size to use
92 */
93 public void setFontSize(float fontSize) {
94 this.fontSize = fontSize + 4;
95 }
96
97 /**
98 * Draw special content to the screen.
99 * @param content the special code
100 * @param x the x position
101 * @param y the y position
102 * @param z the z position
103 * @param scaleFactor the scale factor used in the TextRenderer
104 */
105 public void draw3D(String content, float x, float y, float z, float scaleFactor) {
106 SpecialTextObjectGL spe = getContent(content);
107 if (spe == null)
108 {
109 textrenderer.draw3D(content, x, y, z, scaleFactor);
110 return;
111 }
112
113 GL gl = GLU.getCurrentGL();
114
115 /* The method begin3DRendering of the object TextRenderer calls
116 the method of the same name in object Texture and it enables
117 texturing. When TEXTURE_2D is enabled, commands for drawing
118 don't work, so I disable it.
119 */
120 gl.glDisable(GL.GL_TEXTURE_2D);
121 gl.glRasterPos2f(x, y);
122 gl.glDrawPixels((int) spe.getWidth(), (int) spe.getHeight(), gl.GL_RGBA, gl.GL_UNSIGNED_BYTE, spe.getBuffer());
123 gl.glEnable(GL.GL_TEXTURE_2D);
124 }
125
126 private SpecialTextObjectGL getSpecialTextObjectGL(String content) {
127 switch (content.charAt(0)) {
128 case '<' :
129 return new MathMLObjectGL(content, color, fontSize);
130 case '$' :
131 return new TeXObjectGL(content, color, fontSize);
132 }
133
134 return null;
135 }
136}
diff --git a/scilab/modules/scicos/Makefile.in b/scilab/modules/scicos/Makefile.in
index 5f6982c..da292ab 100644
--- a/scilab/modules/scicos/Makefile.in
+++ b/scilab/modules/scicos/Makefile.in
@@ -392,6 +392,7 @@ JDB = @JDB@
392JEUCLID_CORE = @JEUCLID_CORE@ 392JEUCLID_CORE = @JEUCLID_CORE@
393JHALL = @JHALL@ 393JHALL = @JHALL@
394JHDF5 = @JHDF5@ 394JHDF5 = @JHDF5@
395JLATEXMATH = @JLATEXMATH@
395JOGL = @JOGL@ 396JOGL = @JOGL@
396JROSETTA_API = @JROSETTA_API@ 397JROSETTA_API = @JROSETTA_API@
397JROSETTA_ENGINE = @JROSETTA_ENGINE@ 398JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/scicos_blocks/Makefile.in b/scilab/modules/scicos_blocks/Makefile.in
index 48bb326..e6037c9 100644
--- a/scilab/modules/scicos_blocks/Makefile.in
+++ b/scilab/modules/scicos_blocks/Makefile.in
@@ -694,6 +694,7 @@ JDB = @JDB@
694JEUCLID_CORE = @JEUCLID_CORE@ 694JEUCLID_CORE = @JEUCLID_CORE@
695JHALL = @JHALL@ 695JHALL = @JHALL@
696JHDF5 = @JHDF5@ 696JHDF5 = @JHDF5@
697JLATEXMATH = @JLATEXMATH@
697JOGL = @JOGL@ 698JOGL = @JOGL@
698JROSETTA_API = @JROSETTA_API@ 699JROSETTA_API = @JROSETTA_API@
699JROSETTA_ENGINE = @JROSETTA_ENGINE@ 700JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/scipad/Makefile.in b/scilab/modules/scipad/Makefile.in
index 41495af..03e2c47 100644
--- a/scilab/modules/scipad/Makefile.in
+++ b/scilab/modules/scipad/Makefile.in
@@ -209,6 +209,7 @@ JDB = @JDB@
209JEUCLID_CORE = @JEUCLID_CORE@ 209JEUCLID_CORE = @JEUCLID_CORE@
210JHALL = @JHALL@ 210JHALL = @JHALL@
211JHDF5 = @JHDF5@ 211JHDF5 = @JHDF5@
212JLATEXMATH = @JLATEXMATH@
212JOGL = @JOGL@ 213JOGL = @JOGL@
213JROSETTA_API = @JROSETTA_API@ 214JROSETTA_API = @JROSETTA_API@
214JROSETTA_ENGINE = @JROSETTA_ENGINE@ 215JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/shell/Makefile.in b/scilab/modules/shell/Makefile.in
index b4ec074..c6ea31c 100644
--- a/scilab/modules/shell/Makefile.in
+++ b/scilab/modules/shell/Makefile.in
@@ -243,6 +243,7 @@ JDB = @JDB@
243JEUCLID_CORE = @JEUCLID_CORE@ 243JEUCLID_CORE = @JEUCLID_CORE@
244JHALL = @JHALL@ 244JHALL = @JHALL@
245JHDF5 = @JHDF5@ 245JHDF5 = @JHDF5@
246JLATEXMATH = @JLATEXMATH@
246JOGL = @JOGL@ 247JOGL = @JOGL@
247JROSETTA_API = @JROSETTA_API@ 248JROSETTA_API = @JROSETTA_API@
248JROSETTA_ENGINE = @JROSETTA_ENGINE@ 249JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/signal_processing/Makefile.in b/scilab/modules/signal_processing/Makefile.in
index d747a50..2c8a88b 100644
--- a/scilab/modules/signal_processing/Makefile.in
+++ b/scilab/modules/signal_processing/Makefile.in
@@ -252,6 +252,7 @@ JDB = @JDB@
252JEUCLID_CORE = @JEUCLID_CORE@ 252JEUCLID_CORE = @JEUCLID_CORE@
253JHALL = @JHALL@ 253JHALL = @JHALL@
254JHDF5 = @JHDF5@ 254JHDF5 = @JHDF5@
255JLATEXMATH = @JLATEXMATH@
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/simulated_annealing/Makefile.in b/scilab/modules/simulated_annealing/Makefile.in
index b0b853d..c65ecf8 100644
--- a/scilab/modules/simulated_annealing/Makefile.in
+++ b/scilab/modules/simulated_annealing/Makefile.in
@@ -191,6 +191,7 @@ JDB = @JDB@
191JEUCLID_CORE = @JEUCLID_CORE@ 191JEUCLID_CORE = @JEUCLID_CORE@
192JHALL = @JHALL@ 192JHALL = @JHALL@
193JHDF5 = @JHDF5@ 193JHDF5 = @JHDF5@
194JLATEXMATH = @JLATEXMATH@
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/sound/Makefile.in b/scilab/modules/sound/Makefile.in
index 8314bc9..5be6a80 100644
--- a/scilab/modules/sound/Makefile.in
+++ b/scilab/modules/sound/Makefile.in
@@ -217,6 +217,7 @@ JDB = @JDB@
217JEUCLID_CORE = @JEUCLID_CORE@ 217JEUCLID_CORE = @JEUCLID_CORE@
218JHALL = @JHALL@ 218JHALL = @JHALL@
219JHDF5 = @JHDF5@ 219JHDF5 = @JHDF5@
220JLATEXMATH = @JLATEXMATH@
220JOGL = @JOGL@ 221JOGL = @JOGL@
221JROSETTA_API = @JROSETTA_API@ 222JROSETTA_API = @JROSETTA_API@
222JROSETTA_ENGINE = @JROSETTA_ENGINE@ 223JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/sparse/Makefile.in b/scilab/modules/sparse/Makefile.in
index c547a4d..2a5ef74 100644
--- a/scilab/modules/sparse/Makefile.in
+++ b/scilab/modules/sparse/Makefile.in
@@ -267,6 +267,7 @@ JDB = @JDB@
267JEUCLID_CORE = @JEUCLID_CORE@ 267JEUCLID_CORE = @JEUCLID_CORE@
268JHALL = @JHALL@ 268JHALL = @JHALL@
269JHDF5 = @JHDF5@ 269JHDF5 = @JHDF5@
270JLATEXMATH = @JLATEXMATH@
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/special_functions/Makefile.in b/scilab/modules/special_functions/Makefile.in
index 8758fa6..d60dcf6 100644
--- a/scilab/modules/special_functions/Makefile.in
+++ b/scilab/modules/special_functions/Makefile.in
@@ -247,6 +247,7 @@ JDB = @JDB@
247JEUCLID_CORE = @JEUCLID_CORE@ 247JEUCLID_CORE = @JEUCLID_CORE@
248JHALL = @JHALL@ 248JHALL = @JHALL@
249JHDF5 = @JHDF5@ 249JHDF5 = @JHDF5@
250JLATEXMATH = @JLATEXMATH@
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/spreadsheet/Makefile.in b/scilab/modules/spreadsheet/Makefile.in
index 6c23d09..7a6ec89 100644
--- a/scilab/modules/spreadsheet/Makefile.in
+++ b/scilab/modules/spreadsheet/Makefile.in
@@ -228,6 +228,7 @@ JDB = @JDB@
228JEUCLID_CORE = @JEUCLID_CORE@ 228JEUCLID_CORE = @JEUCLID_CORE@
229JHALL = @JHALL@ 229JHALL = @JHALL@
230JHDF5 = @JHDF5@ 230JHDF5 = @JHDF5@
231JLATEXMATH = @JLATEXMATH@
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/statistics/Makefile.in b/scilab/modules/statistics/Makefile.in
index 506d2e4..c23f6aa 100644
--- a/scilab/modules/statistics/Makefile.in
+++ b/scilab/modules/statistics/Makefile.in
@@ -248,6 +248,7 @@ JDB = @JDB@
248JEUCLID_CORE = @JEUCLID_CORE@ 248JEUCLID_CORE = @JEUCLID_CORE@
249JHALL = @JHALL@ 249JHALL = @JHALL@
250JHDF5 = @JHDF5@ 250JHDF5 = @JHDF5@
251JLATEXMATH = @JLATEXMATH@
251JOGL = @JOGL@ 252JOGL = @JOGL@
252JROSETTA_API = @JROSETTA_API@ 253JROSETTA_API = @JROSETTA_API@
253JROSETTA_ENGINE = @JROSETTA_ENGINE@ 254JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/string/Makefile.in b/scilab/modules/string/Makefile.in
index 2078843..fdd0e6d 100644
--- a/scilab/modules/string/Makefile.in
+++ b/scilab/modules/string/Makefile.in
@@ -262,6 +262,7 @@ JDB = @JDB@
262JEUCLID_CORE = @JEUCLID_CORE@ 262JEUCLID_CORE = @JEUCLID_CORE@
263JHALL = @JHALL@ 263JHALL = @JHALL@
264JHDF5 = @JHDF5@ 264JHDF5 = @JHDF5@
265JLATEXMATH = @JLATEXMATH@
265JOGL = @JOGL@ 266JOGL = @JOGL@
266JROSETTA_API = @JROSETTA_API@ 267JROSETTA_API = @JROSETTA_API@
267JROSETTA_ENGINE = @JROSETTA_ENGINE@ 268JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/symbolic/Makefile.in b/scilab/modules/symbolic/Makefile.in
index 6de589e..021524d 100644
--- a/scilab/modules/symbolic/Makefile.in
+++ b/scilab/modules/symbolic/Makefile.in
@@ -232,6 +232,7 @@ JDB = @JDB@
232JEUCLID_CORE = @JEUCLID_CORE@ 232JEUCLID_CORE = @JEUCLID_CORE@
233JHALL = @JHALL@ 233JHALL = @JHALL@
234JHDF5 = @JHDF5@ 234JHDF5 = @JHDF5@
235JLATEXMATH = @JLATEXMATH@
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/tclsci/Makefile.in b/scilab/modules/tclsci/Makefile.in
index b51bbc1..d44ce1d 100644
--- a/scilab/modules/tclsci/Makefile.in
+++ b/scilab/modules/tclsci/Makefile.in
@@ -269,6 +269,7 @@ JDB = @JDB@
269JEUCLID_CORE = @JEUCLID_CORE@ 269JEUCLID_CORE = @JEUCLID_CORE@
270JHALL = @JHALL@ 270JHALL = @JHALL@
271JHDF5 = @JHDF5@ 271JHDF5 = @JHDF5@
272JLATEXMATH = @JLATEXMATH@
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/texmacs/Makefile.in b/scilab/modules/texmacs/Makefile.in
index 38bf399..9bbcafb 100644
--- a/scilab/modules/texmacs/Makefile.in
+++ b/scilab/modules/texmacs/Makefile.in
@@ -186,6 +186,7 @@ JDB = @JDB@
186JEUCLID_CORE = @JEUCLID_CORE@ 186JEUCLID_CORE = @JEUCLID_CORE@
187JHALL = @JHALL@ 187JHALL = @JHALL@
188JHDF5 = @JHDF5@ 188JHDF5 = @JHDF5@
189JLATEXMATH = @JLATEXMATH@
189JOGL = @JOGL@ 190JOGL = @JOGL@
190JROSETTA_API = @JROSETTA_API@ 191JROSETTA_API = @JROSETTA_API@
191JROSETTA_ENGINE = @JROSETTA_ENGINE@ 192JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/time/Makefile.in b/scilab/modules/time/Makefile.in
index 5d56653..d0e393f 100644
--- a/scilab/modules/time/Makefile.in
+++ b/scilab/modules/time/Makefile.in
@@ -224,6 +224,7 @@ JDB = @JDB@
224JEUCLID_CORE = @JEUCLID_CORE@ 224JEUCLID_CORE = @JEUCLID_CORE@
225JHALL = @JHALL@ 225JHALL = @JHALL@
226JHDF5 = @JHDF5@ 226JHDF5 = @JHDF5@
227JLATEXMATH = @JLATEXMATH@
227JOGL = @JOGL@ 228JOGL = @JOGL@
228JROSETTA_API = @JROSETTA_API@ 229JROSETTA_API = @JROSETTA_API@
229JROSETTA_ENGINE = @JROSETTA_ENGINE@ 230JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/umfpack/Makefile.in b/scilab/modules/umfpack/Makefile.in
index 824ea96..2ed3c35 100644
--- a/scilab/modules/umfpack/Makefile.in
+++ b/scilab/modules/umfpack/Makefile.in
@@ -255,6 +255,7 @@ JDB = @JDB@
255JEUCLID_CORE = @JEUCLID_CORE@ 255JEUCLID_CORE = @JEUCLID_CORE@
256JHALL = @JHALL@ 256JHALL = @JHALL@
257JHDF5 = @JHDF5@ 257JHDF5 = @JHDF5@
258JLATEXMATH = @JLATEXMATH@
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/windows_tools/Makefile.in b/scilab/modules/windows_tools/Makefile.in
index 2f5881d..0fde8b8 100644
--- a/scilab/modules/windows_tools/Makefile.in
+++ b/scilab/modules/windows_tools/Makefile.in
@@ -216,6 +216,7 @@ JDB = @JDB@
216JEUCLID_CORE = @JEUCLID_CORE@ 216JEUCLID_CORE = @JEUCLID_CORE@
217JHALL = @JHALL@ 217JHALL = @JHALL@
218JHDF5 = @JHDF5@ 218JHDF5 = @JHDF5@
219JLATEXMATH = @JLATEXMATH@
219JOGL = @JOGL@ 220JOGL = @JOGL@
220JROSETTA_API = @JROSETTA_API@ 221JROSETTA_API = @JROSETTA_API@
221JROSETTA_ENGINE = @JROSETTA_ENGINE@ 222JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/xpad/Makefile.in b/scilab/modules/xpad/Makefile.in
index ae65cfd..2fb8fb5 100644
--- a/scilab/modules/xpad/Makefile.in
+++ b/scilab/modules/xpad/Makefile.in
@@ -247,6 +247,7 @@ JDB = @JDB@
247JEUCLID_CORE = @JEUCLID_CORE@ 247JEUCLID_CORE = @JEUCLID_CORE@
248JHALL = @JHALL@ 248JHALL = @JHALL@
249JHDF5 = @JHDF5@ 249JHDF5 = @JHDF5@
250JLATEXMATH = @JLATEXMATH@
250JOGL = @JOGL@ 251JOGL = @JOGL@
251JROSETTA_API = @JROSETTA_API@ 252JROSETTA_API = @JROSETTA_API@
252JROSETTA_ENGINE = @JROSETTA_ENGINE@ 253JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/scilab-lib.properties.in b/scilab/scilab-lib.properties.in
index 18efaf9..63f55a2 100644
--- a/scilab/scilab-lib.properties.in
+++ b/scilab/scilab-lib.properties.in
@@ -23,6 +23,8 @@ commons-beanutils.jar=@COMMONS_BEANUTILS@
23 23
24antlr.jar=@ANTLR@ 24antlr.jar=@ANTLR@
25 25
26jlatexmath.jar=@JLATEXMATH@
27
26library.jvm.dir=${modules.dir}/jvm/${build.jar.dir}/ 28library.jvm.dir=${modules.dir}/jvm/${build.jar.dir}/
27library.jvm.name=org.scilab.modules.jvm.jar 29library.jvm.name=org.scilab.modules.jvm.jar
28 30
diff --git a/scilab/scilab-lib.properties.vc b/scilab/scilab-lib.properties.vc
index 7493fbc..3c82988 100644
--- a/scilab/scilab-lib.properties.vc
+++ b/scilab/scilab-lib.properties.vc
@@ -16,6 +16,8 @@ jrosetta-API.jar=${thirdparty.dir}/jrosetta-API.jar
16 16
17jrosetta-engine.jar=${thirdparty.dir}/jrosetta-engine.jar 17jrosetta-engine.jar=${thirdparty.dir}/jrosetta-engine.jar
18 18
19jlatexmath.jar=${thirdparty.dir}/jlatexmath.jar
20
19checkstyle.jar=${thirdparty.dir}/checkstyle/checkstyle-all-4.3.jar 21checkstyle.jar=${thirdparty.dir}/checkstyle/checkstyle-all-4.3.jar
20 22
21library.jvm.dir=${modules.dir}/jvm/${build.jar.dir}/ 23library.jvm.dir=${modules.dir}/jvm/${build.jar.dir}/