153 files changed, 1797 insertions, 1509 deletions

diff --git a/scilab/CHANGES_5.2.X b/scilab/CHANGES_5.2.X
index c46bb27..538382d 100644
--- a/scilab/CHANGES_5.2.X
+++ b/scilab/CHANGES_5.2.X
@@ -46,6 +46,7 @@ Xcos:
     - Java package (eg namespace) has been added to reduce the number of classes
       per package and improve readability.
     - org.scilab.modules.graph is independent from Xcos and can be safely used.
+    - the actions are now only instanciated per graph.
 
 * bug 4206 fixed - The CreateMask action didn't generate a valid submatrix.
 
@@ -134,9 +135,15 @@ Compilation:
 
 * Better detection of JOGL
 
+* Better check of the lib math (libm)
+
 * When two versions of the same jar libraries, in some cases, the system
   could not detect any of them
 
+* bug 5496 fixed - When the option --disable-build-help was enabled, the 
+                   check/use of jeuclid was disabled. It was causing build 
+                   issue since jeuclid is now necessary for graphics.
+
 * bug 5503 fixed - add /usr/lib/*/ and /usr/lib64/*/ in the search path when
                    looking for Java libraries (Fedora 12 for example)
 
@@ -258,6 +265,8 @@ Bug fixes:
 
 * bug 6547 fixed - 'uigetdir' crashed Scilab when returning some "root" path.
 
+* bug 6558 fixed - Infinite value was not plotted even if it was possible.
+
 
                Changes between version 5.2.0-beta1 and 5.2.0 of Scilab
                ==========================================================
@@ -2027,3 +2036,6 @@ Bug fixes:
 * bug 6468 fixed - wrong check in dnaupd.
 
 * bug 6495 fixed - in lqr, variable Q not defined.
+
+* bug 4785 fixed - tand(0) generated an error
+
diff --git a/scilab/Makefile.in b/scilab/Makefile.in
index f9caeaf..5556290 100644
--- a/scilab/Makefile.in
+++ b/scilab/Makefile.in
@@ -415,6 +415,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/configure b/scilab/configure
index 88eb0f7..c7a88c1 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -639,7 +639,6 @@ AVALON_FRAMEWORK
 XML_APIS_EXT
 XMLGRAPHICS_COMMONS
 COMMONS_IO
-JEUCLID_CORE
 FOP
 SAXON
 BATIK
@@ -719,6 +718,7 @@ MSGFMT
 GETTEXT_MACRO_VERSION
 USE_NLS
 POW_LIB
+LIBM
 GUI_ENABLE
 GIWS_FALSE
 GIWS_TRUE
@@ -740,16 +740,13 @@ JAVA_DEBUG_OPTIONS
 JAVA_HOME
 JAVA_JNI_LIBS
 JAVA_JNI_INCLUDE
-JUNIT
-BSH
-QDOX
-TESTNG
 ANTLR
 COMMONS_BEANUTILS
 CHECKSTYLE
 JLATEXMATH
 COMMONS_LOGGING
 JHDF5
+JEUCLID_CORE
 JROSETTA_ENGINE
 JROSETTA_API
 JHALL
@@ -9843,7 +9840,7 @@ $as_echo "$ac_java_classpath" >&6; }
 $as_echo_n "checking to see if the java compiler works... " >&6; }
 
     cat << \EOF > conftest.java
-// #line 9846 "configure"
+// #line 9843 "configure"
 
 
 public class conftest {
@@ -9903,7 +9900,7 @@ $as_echo_n "checking type of jvm... " >&6; }
     if test "x$ac_java_jvm_name" = "x" ; then
 
     cat << \EOF > conftest.java
-// #line 9906 "configure"
+// #line 9903 "configure"
 import gnu.java.io.EncodingManager;
 
 public class conftest {
@@ -9961,7 +9958,7 @@ $as_echo_n "checking java API version... " >&6; }
 
 
     cat << \EOF > conftest.java
-// #line 9964 "configure"
+// #line 9961 "configure"
 import java.nio.charset.Charset;
 
 public class conftest {
@@ -10000,7 +9997,7 @@ EOF
 
 
     cat << \EOF > conftest.java
-// #line 10003 "configure"
+// #line 10000 "configure"
 import java.lang.StringBuilder;
 
 public class conftest {
@@ -11250,7 +11247,7 @@ $as_echo_n "checking jgraphx... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 11253 "configure"
+// #line 11250 "configure"
 import com.mxgraph.model.mxCell;
 
 public class conftest {
@@ -11337,7 +11334,7 @@ $as_echo_n "checking minimal version (1.2.0.7) of jgraphx... " >&6; }
    export ac_java_classpath="$JGRAPHX:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 11340 "configure"
+// #line 11337 "configure"
 import com.mxgraph.view.mxGraph;
 
 public class conftest {
@@ -11401,7 +11398,7 @@ $as_echo_n "checking flexdock... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 11404 "configure"
+// #line 11401 "configure"
 import org.flexdock.docking.DockingManager;
 
 public class conftest {
@@ -11502,7 +11499,7 @@ $as_echo_n "checking looks... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 11505 "configure"
+// #line 11502 "configure"
 import com.jgoodies.looks.common.RenderingUtils;
 
 public class conftest {
@@ -11603,7 +11600,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 11606 "configure"
+// #line 11603 "configure"
 import com.jgoodies.looks.common.RenderingUtils;
 
 public class conftest {
@@ -11705,7 +11702,7 @@ $as_echo_n "checking skinlf... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 11708 "configure"
+// #line 11705 "configure"
 import com.l2fprod.util.AccessUtils;
 
 public class conftest {
@@ -11806,7 +11803,7 @@ $as_echo_n "checking jogl... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 11809 "configure"
+// #line 11806 "configure"
 import javax.media.opengl.glu.GLUnurbs;
 
 public class conftest {
@@ -12007,7 +12004,7 @@ $as_echo_n "checking gluegen-rt... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12010 "configure"
+// #line 12007 "configure"
 import com.sun.gluegen.runtime.CPU;
 
 public class conftest {
@@ -12163,7 +12160,7 @@ $as_echo_n "checking jhall... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12166 "configure"
+// #line 12163 "configure"
 import javax.help.JHelp;
 
 public class conftest {
@@ -12264,7 +12261,7 @@ $as_echo_n "checking javahelp2... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12267 "configure"
+// #line 12264 "configure"
 import javax.help.JHelp;
 
 public class conftest {
@@ -12366,7 +12363,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12369 "configure"
+// #line 12366 "configure"
 import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
 
 public class conftest {
@@ -12467,7 +12464,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12470 "configure"
+// #line 12467 "configure"
 import com.artenum.rosetta.core.action.AbstractConsoleAction;
 
 public class conftest {
@@ -12547,17 +12544,18 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jrosetta-e
                                 JROSETTA_ENGINE=$PACKAGE_JAR_FILE
 
 
-                                if test $HDF5_ENABLE = yes;  then
-                                # HDF5 java lib
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking jhdf5" >&5
-$as_echo_n "checking jhdf5... " >&6; }
+                                # MathML rendering solution
+                                # Used in both graphic & help
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking jeuclid-core" >&5
+$as_echo_n "checking jeuclid-core... " >&6; }
         PACKAGE_JAR_FILE=
         found_jar=no
         saved_ac_java_classpath=$ac_java_classpath
         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)"
     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
-      for jar in "$jardir/jhdf5.jar" "$jardir/libjhdf5.jar" "$jardir/libjhdf5-java.jar" "$jardir/jhdf5*.jar"; do
+      for jar in "$jardir/jeuclid-core.jar" "$jardir/libjeuclid-core.jar" "$jardir/libjeuclid-core-java.jar" "$jardir/jeuclid-core*.jar"; do
 #       jar=`echo $jar|sed -e 's/ /\\ /'`
 #       echo "protected $jar"
 #       jar_resolved=`ls $jar 2>/dev/null`
@@ -12569,8 +12567,8 @@ $as_echo_n "checking jhdf5... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12572 "configure"
-import ncsa.hdf.hdf5lib.HDF5Constants;
+// #line 12570 "configure"
+import net.sourceforge.jeuclid.LayoutContext;
 
 public class conftest {
     public static void main(String[] argv) {
@@ -12639,27 +12637,28 @@ $as_echo "$jar_resolved" >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
           if test "" = "yes"; then
-                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jhdf5 used by HDF5 Java library (looking for package ncsa.hdf.hdf5lib.HDF5Constants)" >&5
-$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jhdf5 used by HDF5 Java library (looking for package ncsa.hdf.hdf5lib.HDF5Constants)" >&2;}
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jeuclid-core used by MathML rendering solution (at least version 3.1.X) (looking for package net.sourceforge.jeuclid.LayoutContext)" >&5
+$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jeuclid-core used by MathML rendering solution (at least version 3.1.X) (looking for package net.sourceforge.jeuclid.LayoutContext)" >&2;}
           else
-                  as_fn_error "Could not find or use the Java package/jar jhdf5 used by HDF5 Java library (looking for package ncsa.hdf.hdf5lib.HDF5Constants)" "$LINENO" 5
+                  as_fn_error "Could not find or use the Java package/jar jeuclid-core used by MathML rendering solution (at least version 3.1.X) (looking for package net.sourceforge.jeuclid.LayoutContext)" "$LINENO" 5
           fi
     fi
 
-                                  JHDF5=$PACKAGE_JAR_FILE
+                                JEUCLID_CORE=$PACKAGE_JAR_FILE
 
-                                fi
 
-                                # Logging (flexdock dep)
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking commons-logging" >&5
-$as_echo_n "checking commons-logging... " >&6; }
+                                if test $HDF5_ENABLE = yes;  then
+                                # HDF5 java lib
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking jhdf5" >&5
+$as_echo_n "checking jhdf5... " >&6; }
         PACKAGE_JAR_FILE=
         found_jar=no
         saved_ac_java_classpath=$ac_java_classpath
         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)"
     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
-      for jar in "$jardir/commons-logging.jar" "$jardir/libcommons-logging.jar" "$jardir/libcommons-logging-java.jar" "$jardir/commons-logging*.jar"; do
+      for jar in "$jardir/jhdf5.jar" "$jardir/libjhdf5.jar" "$jardir/libjhdf5-java.jar" "$jardir/jhdf5*.jar"; do
 #       jar=`echo $jar|sed -e 's/ /\\ /'`
 #       echo "protected $jar"
 #       jar_resolved=`ls $jar 2>/dev/null`
@@ -12671,8 +12670,8 @@ $as_echo_n "checking commons-logging... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12674 "configure"
-import org.apache.commons.logging.LogFactory;
+// #line 12673 "configure"
+import ncsa.hdf.hdf5lib.HDF5Constants;
 
 public class conftest {
     public static void main(String[] argv) {
@@ -12741,26 +12740,27 @@ $as_echo "$jar_resolved" >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
           if test "" = "yes"; then
-                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar commons-logging used by Apache logging (looking for package org.apache.commons.logging.LogFactory)" >&5
-$as_echo "$as_me: WARNING: Could not find or use the Java package/jar commons-logging used by Apache logging (looking for package org.apache.commons.logging.LogFactory)" >&2;}
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jhdf5 used by HDF5 Java library (looking for package ncsa.hdf.hdf5lib.HDF5Constants)" >&5
+$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jhdf5 used by HDF5 Java library (looking for package ncsa.hdf.hdf5lib.HDF5Constants)" >&2;}
           else
-                  as_fn_error "Could not find or use the Java package/jar commons-logging used by Apache logging (looking for package org.apache.commons.logging.LogFactory)" "$LINENO" 5
+                  as_fn_error "Could not find or use the Java package/jar jhdf5 used by HDF5 Java library (looking for package ncsa.hdf.hdf5lib.HDF5Constants)" "$LINENO" 5
           fi
     fi
 
-                                COMMONS_LOGGING=$PACKAGE_JAR_FILE
+                                  JHDF5=$PACKAGE_JAR_FILE
 
+                                fi
 
-                                # JLaTeXMath
+                                # Logging (flexdock dep)
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking jlatexmath" >&5
-$as_echo_n "checking jlatexmath... " >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking commons-logging" >&5
+$as_echo_n "checking commons-logging... " >&6; }
         PACKAGE_JAR_FILE=
         found_jar=no
         saved_ac_java_classpath=$ac_java_classpath
         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)"
     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
-      for jar in "$jardir/jlatexmath.jar" "$jardir/libjlatexmath.jar" "$jardir/libjlatexmath-java.jar" "$jardir/jlatexmath*.jar"; do
+      for jar in "$jardir/commons-logging.jar" "$jardir/libcommons-logging.jar" "$jardir/libcommons-logging-java.jar" "$jardir/commons-logging*.jar"; do
 #       jar=`echo $jar|sed -e 's/ /\\ /'`
 #       echo "protected $jar"
 #       jar_resolved=`ls $jar 2>/dev/null`
@@ -12773,7 +12773,7 @@ $as_echo_n "checking jlatexmath... " >&6; }
 
     cat << \EOF > conftest.java
 // #line 12775 "configure"
-import org.scilab.forge.jlatexmath.TeXFormula;
+import org.apache.commons.logging.LogFactory;
 
 public class conftest {
     public static void main(String[] argv) {
@@ -12842,234 +12842,26 @@ $as_echo "$jar_resolved" >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
           if test "" = "yes"; then
-                { $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
-$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;}
-          else
-                  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
-          fi
-    fi
-
-                                JLATEXMATH=$PACKAGE_JAR_FILE
-
-
-
-$as_echo "#define WITH_GUI /**/" >>confdefs.h
-
-
-                fi
-
-                # Checkstyle (code checking)
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking checkstyle" >&5
-$as_echo_n "checking checkstyle... " >&6; }
-        PACKAGE_JAR_FILE=
-        found_jar=no
-        saved_ac_java_classpath=$ac_java_classpath
-        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)"
-    for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
-      for jar in "$jardir/checkstyle.jar" "$jardir/libcheckstyle.jar" "$jardir/libcheckstyle-java.jar" "$jardir/checkstyle*.jar"; do
-#       jar=`echo $jar|sed -e 's/ /\\ /'`
-#       echo "protected $jar"
-#       jar_resolved=`ls $jar 2>/dev/null`
-#       echo "looking for $jar_resolved"
-# TODO check the behaviour when spaces
-        jars_resolved=`ls $jar 2>/dev/null`
-        for jar_resolved in $jars_resolved; do # If several jars matches
-        if test -e "$jar_resolved"; then
-          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
-
-    cat << \EOF > conftest.java
-// #line 12882 "configure"
-import com.puppycrawl.tools.checkstyle.CheckStyleTask;
-
-public class conftest {
-    public static void main(String[] argv) {
-
-    }
-}
-EOF
-
-    CLASSPATH=$ac_java_classpath
-    export CLASSPATH
-    cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
-    if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
-       if test ""no"" = "no"; then
-           echo "yes" >&5
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
-$as_echo "$jar_resolved" >&6; }
-            found_jar=yes
-            PACKAGE_JAR_FILE=$jar_resolved
-            break
-
-           else
-                   cmd="$JAVA conftest"
-                   if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then
-                   echo "yes" >&5
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
-$as_echo "$jar_resolved" >&6; }
-            found_jar=yes
-            PACKAGE_JAR_FILE=$jar_resolved
-            break
-
-                        else
-                        echo "configure: failed program was:" >&5
-                                cat conftest.java >&5
-                        echo "configure: CLASSPATH was $CLASSPATH" >&5
-
-            ac_java_classpath=$saved_ac_java_classpath
-
-
-                                                fi
-                fi
-    else
-        echo "configure: failed program was:" >&5
-        cat conftest.java >&5
-        echo "configure: CLASSPATH was $CLASSPATH" >&5
-
-            ac_java_classpath=$saved_ac_java_classpath
-
-
-            fi
-
-        fi
-          done
-          # If ls returns several results and the first one is OK, stop the search
-      if test "$found_jar" = "yes"; then
-        break
-      fi
-      done
-          # If found, no need to search in other directory
-      if test "$found_jar" = "yes"; then
-        break
-      fi
-    done
-    if test "$found_jar" = "no"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-          if test ""yes"" = "yes"; then
-                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar checkstyle used by Checkstyle - code checking (looking for package com.puppycrawl.tools.checkstyle.CheckStyleTask)" >&5
-$as_echo "$as_me: WARNING: Could not find or use the Java package/jar checkstyle used by Checkstyle - code checking (looking for package com.puppycrawl.tools.checkstyle.CheckStyleTask)" >&2;}
-          else
-                  as_fn_error "Could not find or use the Java package/jar checkstyle used by Checkstyle - code checking (looking for package com.puppycrawl.tools.checkstyle.CheckStyleTask)" "$LINENO" 5
-          fi
-    fi
-
-                CHECKSTYLE=$PACKAGE_JAR_FILE
-
-
-                # Commons beanutils (dependency of checkstyle)
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking commons-beanutils" >&5
-$as_echo_n "checking commons-beanutils... " >&6; }
-        PACKAGE_JAR_FILE=
-        found_jar=no
-        saved_ac_java_classpath=$ac_java_classpath
-        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)"
-    for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
-      for jar in "$jardir/commons-beanutils.jar" "$jardir/libcommons-beanutils.jar" "$jardir/libcommons-beanutils-java.jar" "$jardir/commons-beanutils*.jar"; do
-#       jar=`echo $jar|sed -e 's/ /\\ /'`
-#       echo "protected $jar"
-#       jar_resolved=`ls $jar 2>/dev/null`
-#       echo "looking for $jar_resolved"
-# TODO check the behaviour when spaces
-        jars_resolved=`ls $jar 2>/dev/null`
-        for jar_resolved in $jars_resolved; do # If several jars matches
-        if test -e "$jar_resolved"; then
-          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
-
-    cat << \EOF > conftest.java
-// #line 12983 "configure"
-import org.apache.commons.beanutils.Converter;
-
-public class conftest {
-    public static void main(String[] argv) {
-
-    }
-}
-EOF
-
-    CLASSPATH=$ac_java_classpath
-    export CLASSPATH
-    cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
-    if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
-       if test ""no"" = "no"; then
-           echo "yes" >&5
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
-$as_echo "$jar_resolved" >&6; }
-            found_jar=yes
-            PACKAGE_JAR_FILE=$jar_resolved
-            break
-
-           else
-                   cmd="$JAVA conftest"
-                   if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then
-                   echo "yes" >&5
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
-$as_echo "$jar_resolved" >&6; }
-            found_jar=yes
-            PACKAGE_JAR_FILE=$jar_resolved
-            break
-
-                        else
-                        echo "configure: failed program was:" >&5
-                                cat conftest.java >&5
-                        echo "configure: CLASSPATH was $CLASSPATH" >&5
-
-            ac_java_classpath=$saved_ac_java_classpath
-
-
-                                                fi
-                fi
-    else
-        echo "configure: failed program was:" >&5
-        cat conftest.java >&5
-        echo "configure: CLASSPATH was $CLASSPATH" >&5
-
-            ac_java_classpath=$saved_ac_java_classpath
-
-
-            fi
-
-        fi
-          done
-          # If ls returns several results and the first one is OK, stop the search
-      if test "$found_jar" = "yes"; then
-        break
-      fi
-      done
-          # If found, no need to search in other directory
-      if test "$found_jar" = "yes"; then
-        break
-      fi
-    done
-    if test "$found_jar" = "no"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-          if test ""yes"" = "yes"; then
-                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar commons-beanutils used by Bean utility (looking for package org.apache.commons.beanutils.Converter)" >&5
-$as_echo "$as_me: WARNING: Could not find or use the Java package/jar commons-beanutils used by Bean utility (looking for package org.apache.commons.beanutils.Converter)" >&2;}
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar commons-logging used by Apache logging (looking for package org.apache.commons.logging.LogFactory)" >&5
+$as_echo "$as_me: WARNING: Could not find or use the Java package/jar commons-logging used by Apache logging (looking for package org.apache.commons.logging.LogFactory)" >&2;}
           else
-                  as_fn_error "Could not find or use the Java package/jar commons-beanutils used by Bean utility (looking for package org.apache.commons.beanutils.Converter)" "$LINENO" 5
+                  as_fn_error "Could not find or use the Java package/jar commons-logging used by Apache logging (looking for package org.apache.commons.logging.LogFactory)" "$LINENO" 5
           fi
     fi
 
-                COMMONS_BEANUTILS=$PACKAGE_JAR_FILE
+                                COMMONS_LOGGING=$PACKAGE_JAR_FILE
 
 
-                # antlr (dependency of checkstyle)
+                                # JLaTeXMath
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking antlr" >&5
-$as_echo_n "checking antlr... " >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking jlatexmath" >&5
+$as_echo_n "checking jlatexmath... " >&6; }
         PACKAGE_JAR_FILE=
         found_jar=no
         saved_ac_java_classpath=$ac_java_classpath
         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)"
     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
-      for jar in "$jardir/antlr.jar" "$jardir/libantlr.jar" "$jardir/libantlr-java.jar" "$jardir/antlr*.jar"; do
+      for jar in "$jardir/jlatexmath.jar" "$jardir/libjlatexmath.jar" "$jardir/libjlatexmath-java.jar" "$jardir/jlatexmath*.jar"; do
 #       jar=`echo $jar|sed -e 's/ /\\ /'`
 #       echo "protected $jar"
 #       jar_resolved=`ls $jar 2>/dev/null`
@@ -13081,8 +12873,8 @@ $as_echo_n "checking antlr... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13084 "configure"
-import antlr.TokenStreamException;
+// #line 12876 "configure"
+import org.scilab.forge.jlatexmath.TeXFormula;
 
 public class conftest {
     public static void main(String[] argv) {
@@ -13150,128 +12942,33 @@ $as_echo "$jar_resolved" >&6; }
     if test "$found_jar" = "no"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-          if test ""yes"" = "yes"; then
-                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar antlr used by language tool for constructing recognizers (looking for package antlr.TokenStreamException)" >&5
-$as_echo "$as_me: WARNING: Could not find or use the Java package/jar antlr used by language tool for constructing recognizers (looking for package antlr.TokenStreamException)" >&2;}
+          if test "" = "yes"; then
+                { $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
+$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;}
           else
-                  as_fn_error "Could not find or use the Java package/jar antlr used by language tool for constructing recognizers (looking for package antlr.TokenStreamException)" "$LINENO" 5
+                  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
           fi
     fi
 
-                ANTLR=$PACKAGE_JAR_FILE
-
-
-                # Test NG (java unitary test)
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking testng" >&5
-$as_echo_n "checking testng... " >&6; }
-        PACKAGE_JAR_FILE=
-        found_jar=no
-        saved_ac_java_classpath=$ac_java_classpath
-        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)"
-    for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
-      for jar in "$jardir/testng.jar" "$jardir/libtestng.jar" "$jardir/libtestng-java.jar" "$jardir/testng*.jar"; do
-#       jar=`echo $jar|sed -e 's/ /\\ /'`
-#       echo "protected $jar"
-#       jar_resolved=`ls $jar 2>/dev/null`
-#       echo "looking for $jar_resolved"
-# TODO check the behaviour when spaces
-        jars_resolved=`ls $jar 2>/dev/null`
-        for jar_resolved in $jars_resolved; do # If several jars matches
-        if test -e "$jar_resolved"; then
-          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
-
-    cat << \EOF > conftest.java
-// #line 13185 "configure"
-import org.testng.TestNG;
-
-public class conftest {
-    public static void main(String[] argv) {
-
-    }
-}
-EOF
-
-    CLASSPATH=$ac_java_classpath
-    export CLASSPATH
-    cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
-    if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
-       if test ""no"" = "no"; then
-           echo "yes" >&5
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
-$as_echo "$jar_resolved" >&6; }
-            found_jar=yes
-            PACKAGE_JAR_FILE=$jar_resolved
-            break
-
-           else
-                   cmd="$JAVA conftest"
-                   if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then
-                   echo "yes" >&5
+                                JLATEXMATH=$PACKAGE_JAR_FILE
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
-$as_echo "$jar_resolved" >&6; }
-            found_jar=yes
-            PACKAGE_JAR_FILE=$jar_resolved
-            break
 
-                        else
-                        echo "configure: failed program was:" >&5
-                                cat conftest.java >&5
-                        echo "configure: CLASSPATH was $CLASSPATH" >&5
 
-            ac_java_classpath=$saved_ac_java_classpath
+$as_echo "#define WITH_GUI /**/" >>confdefs.h
 
 
-                                                fi
                 fi
-    else
-        echo "configure: failed program was:" >&5
-        cat conftest.java >&5
-        echo "configure: CLASSPATH was $CLASSPATH" >&5
-
-            ac_java_classpath=$saved_ac_java_classpath
-
-
-            fi
-
-        fi
-          done
-          # If ls returns several results and the first one is OK, stop the search
-      if test "$found_jar" = "yes"; then
-        break
-      fi
-      done
-          # If found, no need to search in other directory
-      if test "$found_jar" = "yes"; then
-        break
-      fi
-    done
-    if test "$found_jar" = "no"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-          if test ""yes"" = "yes"; then
-                { $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
-$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;}
-          else
-                  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
-          fi
-    fi
-
-                TESTNG=$PACKAGE_JAR_FILE
 
+                # Checkstyle (code checking)
 
-                # Qdox (parses declarations and Javadoc) - dependency of TestNG
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking qdox" >&5
-$as_echo_n "checking qdox... " >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking checkstyle" >&5
+$as_echo_n "checking checkstyle... " >&6; }
         PACKAGE_JAR_FILE=
         found_jar=no
         saved_ac_java_classpath=$ac_java_classpath
         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)"
     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
-      for jar in "$jardir/qdox.jar" "$jardir/libqdox.jar" "$jardir/libqdox-java.jar" "$jardir/qdox*.jar"; do
+      for jar in "$jardir/checkstyle.jar" "$jardir/libcheckstyle.jar" "$jardir/libcheckstyle-java.jar" "$jardir/checkstyle*.jar"; do
 #       jar=`echo $jar|sed -e 's/ /\\ /'`
 #       echo "protected $jar"
 #       jar_resolved=`ls $jar 2>/dev/null`
@@ -13283,8 +12980,8 @@ $as_echo_n "checking qdox... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13286 "configure"
-import com.thoughtworks.qdox.tools.QDoxTester;
+// #line 12983 "configure"
+import com.puppycrawl.tools.checkstyle.CheckStyleTask;
 
 public class conftest {
     public static void main(String[] argv) {
@@ -13353,26 +13050,26 @@ $as_echo "$jar_resolved" >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
           if test ""yes"" = "yes"; then
-                { $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
-$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;}
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar checkstyle used by Checkstyle - code checking (looking for package com.puppycrawl.tools.checkstyle.CheckStyleTask)" >&5
+$as_echo "$as_me: WARNING: Could not find or use the Java package/jar checkstyle used by Checkstyle - code checking (looking for package com.puppycrawl.tools.checkstyle.CheckStyleTask)" >&2;}
           else
-                  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
+                  as_fn_error "Could not find or use the Java package/jar checkstyle used by Checkstyle - code checking (looking for package com.puppycrawl.tools.checkstyle.CheckStyleTask)" "$LINENO" 5
           fi
     fi
 
-                QDOX=$PACKAGE_JAR_FILE
+                CHECKSTYLE=$PACKAGE_JAR_FILE
 
 
-                # bsh (Java scripting environment) - dependency of TestNG
+                # Commons beanutils (dependency of checkstyle)
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking bsh" >&5
-$as_echo_n "checking bsh... " >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking commons-beanutils" >&5
+$as_echo_n "checking commons-beanutils... " >&6; }
         PACKAGE_JAR_FILE=
         found_jar=no
         saved_ac_java_classpath=$ac_java_classpath
         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)"
     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
-      for jar in "$jardir/bsh.jar" "$jardir/libbsh.jar" "$jardir/libbsh-java.jar" "$jardir/bsh*.jar"; do
+      for jar in "$jardir/commons-beanutils.jar" "$jardir/libcommons-beanutils.jar" "$jardir/libcommons-beanutils-java.jar" "$jardir/commons-beanutils*.jar"; do
 #       jar=`echo $jar|sed -e 's/ /\\ /'`
 #       echo "protected $jar"
 #       jar_resolved=`ls $jar 2>/dev/null`
@@ -13384,8 +13081,8 @@ $as_echo_n "checking bsh... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13387 "configure"
-import bsh.Console;
+// #line 13084 "configure"
+import org.apache.commons.beanutils.Converter;
 
 public class conftest {
     public static void main(String[] argv) {
@@ -13454,26 +13151,26 @@ $as_echo "$jar_resolved" >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
           if test ""yes"" = "yes"; then
-                { $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
-$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;}
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar commons-beanutils used by Bean utility (looking for package org.apache.commons.beanutils.Converter)" >&5
+$as_echo "$as_me: WARNING: Could not find or use the Java package/jar commons-beanutils used by Bean utility (looking for package org.apache.commons.beanutils.Converter)" >&2;}
           else
-                  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
+                  as_fn_error "Could not find or use the Java package/jar commons-beanutils used by Bean utility (looking for package org.apache.commons.beanutils.Converter)" "$LINENO" 5
           fi
     fi
 
-                BSH=$PACKAGE_JAR_FILE
+                COMMONS_BEANUTILS=$PACKAGE_JAR_FILE
 
 
-                # Junit - dependency of TestNG
+                # antlr (dependency of checkstyle)
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking junit" >&5
-$as_echo_n "checking junit... " >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking antlr" >&5
+$as_echo_n "checking antlr... " >&6; }
         PACKAGE_JAR_FILE=
         found_jar=no
         saved_ac_java_classpath=$ac_java_classpath
         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)"
     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
-      for jar in "$jardir/junit.jar" "$jardir/libjunit.jar" "$jardir/libjunit-java.jar" "$jardir/junit*.jar"; do
+      for jar in "$jardir/antlr.jar" "$jardir/libantlr.jar" "$jardir/libantlr-java.jar" "$jardir/antlr*.jar"; do
 #       jar=`echo $jar|sed -e 's/ /\\ /'`
 #       echo "protected $jar"
 #       jar_resolved=`ls $jar 2>/dev/null`
@@ -13485,8 +13182,8 @@ $as_echo_n "checking junit... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13488 "configure"
-import junit.framework.Assert;
+// #line 13185 "configure"
+import antlr.TokenStreamException;
 
 public class conftest {
     public static void main(String[] argv) {
@@ -13555,15 +13252,14 @@ $as_echo "$jar_resolved" >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
           if test ""yes"" = "yes"; then
-                { $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
-$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;}
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar antlr used by language tool for constructing recognizers (looking for package antlr.TokenStreamException)" >&5
+$as_echo "$as_me: WARNING: Could not find or use the Java package/jar antlr used by language tool for constructing recognizers (looking for package antlr.TokenStreamException)" >&2;}
           else
-                  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
+                  as_fn_error "Could not find or use the Java package/jar antlr used by language tool for constructing recognizers (looking for package antlr.TokenStreamException)" "$LINENO" 5
           fi
     fi
 
-                JUNIT=$PACKAGE_JAR_FILE
-
+                ANTLR=$PACKAGE_JAR_FILE
 
 
         else
@@ -14045,10 +13741,145 @@ fi
 done
 
 
+
+# Check of the libm (lib math). Macro provided by libtool.
+save_LDFLAGS="$LIBS"
+LIBM=
+case $host in
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _mwvalidcheckl in -lmw" >&5
+$as_echo_n "checking for _mwvalidcheckl in -lmw... " >&6; }
+if test "${ac_cv_lib_mw__mwvalidcheckl+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lmw  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char _mwvalidcheckl ();
+int
+main ()
+{
+return _mwvalidcheckl ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_mw__mwvalidcheckl=yes
+else
+  ac_cv_lib_mw__mwvalidcheckl=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mw__mwvalidcheckl" >&5
+$as_echo "$ac_cv_lib_mw__mwvalidcheckl" >&6; }
+if test "x$ac_cv_lib_mw__mwvalidcheckl" = x""yes; then :
+  LIBM="-lmw"
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
+$as_echo_n "checking for cos in -lm... " >&6; }
+if test "${ac_cv_lib_m_cos+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char cos ();
+int
+main ()
+{
+return cos ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_m_cos=yes
+else
+  ac_cv_lib_m_cos=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
+$as_echo "$ac_cv_lib_m_cos" >&6; }
+if test "x$ac_cv_lib_m_cos" = x""yes; then :
+  LIBM="$LIBM -lm"
+fi
+
+  ;;
+*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
+$as_echo_n "checking for cos in -lm... " >&6; }
+if test "${ac_cv_lib_m_cos+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char cos ();
+int
+main ()
+{
+return cos ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_m_cos=yes
+else
+  ac_cv_lib_m_cos=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
+$as_echo "$ac_cv_lib_m_cos" >&6; }
+if test "x$ac_cv_lib_m_cos" = x""yes; then :
+  LIBM="-lm"
+fi
+
+  ;;
+esac
+
+
+
 # Provided by math.h
-save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS -lm"
 
+LDFLAGS="$LDFLAGS $LIBM"
 for ac_func in pow sqrt finite floor
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -14091,8 +13922,8 @@ $as_echo "#define isinf(x) (!finite(x) && x==x)" >>confdefs.h
 
 fi
 
-
-LDFLAGS="$save_LDFLAGS"
+LIBS="$LIBS $LIBM"
+LDFLAGS="$save_LIBS"
 
 # Provided by regex.h
 for ac_func in re_comp
@@ -21539,7 +21370,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
 $as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
 cat > conftest.$ac_ext <<EOF
-#line 21542 "configure"
+#line 21373 "configure"
 #include "confdefs.h"
 
 #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -21851,7 +21682,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
 $as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
 
 cat > conftest.$ac_ext <<EOF
-#line 21854 "configure"
+#line 21685 "configure"
 #include "confdefs.h"
 
 #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -22433,7 +22264,7 @@ $as_echo_n "checking batik-all... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 22436 "configure"
+// #line 22267 "configure"
 import org.apache.batik.parser.Parser;
 
 public class conftest {
@@ -22534,7 +22365,7 @@ $as_echo_n "checking batik... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 22537 "configure"
+// #line 22368 "configure"
 import org.apache.batik.parser.Parser;
 
 public class conftest {
@@ -22637,7 +22468,7 @@ $as_echo_n "checking saxon... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 22640 "configure"
+// #line 22471 "configure"
 import com.icl.saxon.Loader;
 
 public class conftest {
@@ -22738,7 +22569,7 @@ $as_echo_n "checking fop... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 22741 "configure"
+// #line 22572 "configure"
 import org.apache.fop.pdf.PDFInfo;
 
 public class conftest {
@@ -22818,107 +22649,6 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar fop used b
         FOP=$PACKAGE_JAR_FILE
 
 
-        # MathML rendering solution
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking jeuclid-core" >&5
-$as_echo_n "checking jeuclid-core... " >&6; }
-        PACKAGE_JAR_FILE=
-        found_jar=no
-        saved_ac_java_classpath=$ac_java_classpath
-        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)"
-    for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
-      for jar in "$jardir/jeuclid-core.jar" "$jardir/libjeuclid-core.jar" "$jardir/libjeuclid-core-java.jar" "$jardir/jeuclid-core*.jar"; do
-#       jar=`echo $jar|sed -e 's/ /\\ /'`
-#       echo "protected $jar"
-#       jar_resolved=`ls $jar 2>/dev/null`
-#       echo "looking for $jar_resolved"
-# TODO check the behaviour when spaces
-        jars_resolved=`ls $jar 2>/dev/null`
-        for jar_resolved in $jars_resolved; do # If several jars matches
-        if test -e "$jar_resolved"; then
-          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
-
-    cat << \EOF > conftest.java
-// #line 22842 "configure"
-import net.sourceforge.jeuclid.LayoutContext;
-
-public class conftest {
-    public static void main(String[] argv) {
-
-    }
-}
-EOF
-
-    CLASSPATH=$ac_java_classpath
-    export CLASSPATH
-    cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
-    if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
-       if test ""no"" = "no"; then
-           echo "yes" >&5
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
-$as_echo "$jar_resolved" >&6; }
-            found_jar=yes
-            PACKAGE_JAR_FILE=$jar_resolved
-            break
-
-           else
-                   cmd="$JAVA conftest"
-                   if (echo $cmd >&5 ; eval $cmd >&5 2>&5); then
-                   echo "yes" >&5
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
-$as_echo "$jar_resolved" >&6; }
-            found_jar=yes
-            PACKAGE_JAR_FILE=$jar_resolved
-            break
-
-                        else
-                        echo "configure: failed program was:" >&5
-                                cat conftest.java >&5
-                        echo "configure: CLASSPATH was $CLASSPATH" >&5
-
-            ac_java_classpath=$saved_ac_java_classpath
-
-
-                                                fi
-                fi
-    else
-        echo "configure: failed program was:" >&5
-        cat conftest.java >&5
-        echo "configure: CLASSPATH was $CLASSPATH" >&5
-
-            ac_java_classpath=$saved_ac_java_classpath
-
-
-            fi
-
-        fi
-          done
-          # If ls returns several results and the first one is OK, stop the search
-      if test "$found_jar" = "yes"; then
-        break
-      fi
-      done
-          # If found, no need to search in other directory
-      if test "$found_jar" = "yes"; then
-        break
-      fi
-    done
-    if test "$found_jar" = "no"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-          if test "" = "yes"; then
-                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jeuclid-core used by MathML rendering solution (at least version 3.1.X) (looking for package net.sourceforge.jeuclid.LayoutContext)" >&5
-$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jeuclid-core used by MathML rendering solution (at least version 3.1.X) (looking for package net.sourceforge.jeuclid.LayoutContext)" >&2;}
-          else
-                  as_fn_error "Could not find or use the Java package/jar jeuclid-core used by MathML rendering solution (at least version 3.1.X) (looking for package net.sourceforge.jeuclid.LayoutContext)" "$LINENO" 5
-          fi
-    fi
-
-        JEUCLID_CORE=$PACKAGE_JAR_FILE
-
-
         # Commons I/O library
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking commons-io" >&5
@@ -22940,7 +22670,7 @@ $as_echo_n "checking commons-io... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 22943 "configure"
+// #line 22673 "configure"
 import org.apache.commons.io.output.CountingOutputStream;
 
 public class conftest {
@@ -23041,7 +22771,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 23044 "configure"
+// #line 22774 "configure"
 import org.apache.xmlgraphics.util.Service;
 
 public class conftest {
@@ -23142,7 +22872,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 23145 "configure"
+// #line 22875 "configure"
 import org.w3c.dom.svg.SVGDocument;
 
 public class conftest {
@@ -23243,7 +22973,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 23246 "configure"
+// #line 22976 "configure"
 import org.w3c.dom.svg.SVGDocument;
 
 public class conftest {
@@ -23348,7 +23078,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 23351 "configure"
+// #line 23081 "configure"
 import org.apache.avalon.framework.configuration.ConfigurationException;
 
 public class conftest {
@@ -29619,7 +29349,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 29622 "configure"
+#line 29352 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -29725,7 +29455,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 29728 "configure"
+#line 29458 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -39122,7 +38852,6 @@ if test $HELP_ENABLE = yes; then
    echo "  Batik (SVG) ............ = $BATIK"
    echo "  Saxon XSLT ............. = $SAXON"
    echo "  FOP (XML => PDF) ....... = $FOP"
-   echo "  Jeuclid (MathML) ....... = $JEUCLID_CORE"
    echo "  Commons I/O ............ = $COMMONS_IO"
    echo "  XML graphics commons ... = $XMLGRAPHICS_COMMONS"
    echo "  XML commons external ... = $XML_APIS_EXT"
@@ -39157,6 +38886,7 @@ echo "  JOGL ................ = $JOGL"
 echo "  JOGL LIBS (JNI) ..... = $JOGL_LIBS"
 echo "  Gluegen ............. = $GLUEGEN_RT"
 echo "  Gluegen LIBS (JNI) .. = $GLUEGEN_RT_LIBS"
+echo "  Jeuclid (MathML) .... = $JEUCLID_CORE"
 echo "  Jhall  .............. = $JHALL"
 echo "  Jrosetta (API) ...... = $JROSETTA_API"
 echo "  Jrosetta (Engine) ... = $JROSETTA_ENGINE"
@@ -39170,7 +38900,6 @@ echo "Code quality (optional):"
 echo "  Checkstyle .......... = $CHECKSTYLE"
 echo "  Commons-beanutils ... = $COMMONS_BEANUTILS"
 echo "  Antlr ............... = $ANTLR"
-echo "  TestNG .............. = $TESTNG"
 echo "  splint .............. = $SPLINT"
 
 echo ""
diff --git a/scilab/configure.ac b/scilab/configure.ac
index 98d97e8..cfca03e 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -749,6 +749,14 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
                                 JROSETTA_ENGINE=$PACKAGE_JAR_FILE
                                 AC_SUBST(JROSETTA_ENGINE)
 
+
+                                # MathML rendering solution
+                                # Used in both graphic & help 
+                                AC_JAVA_CHECK_PACKAGE([jeuclid-core],[net.sourceforge.jeuclid.LayoutContext],[MathML rendering solution (at least version 3.1.X)])
+                                JEUCLID_CORE=$PACKAGE_JAR_FILE
+                                AC_SUBST(JEUCLID_CORE)
+
+
                                 if test $HDF5_ENABLE = yes;  then
                                 # HDF5 java lib
                                   AC_JAVA_CHECK_PACKAGE([jhdf5],[ncsa.hdf.hdf5lib.HDF5Constants],[HDF5 Java library])
@@ -911,10 +919,14 @@ AC_CHECK_FUNCS([mkdir])
 # Provided by mman.h
 AC_CHECK_FUNCS([munmap])
 
+
+# Check of the libm (lib math). Macro provided by libtool.
+save_LDFLAGS="$LIBS"
+LT_LIB_M()
+
 # Provided by math.h
-save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS -lm"
 
+LDFLAGS="$LDFLAGS $LIBM"
 AC_CHECK_FUNCS([pow] [sqrt] [finite] [floor])
 
 AC_CHECK_FUNC([exp10],,[
@@ -927,8 +939,8 @@ AC_CHECK_FUNC([exp10],,[
 AC_CHECK_FUNC([isinf],,[
                 AC_DEFINE([isinf(x)],[(!finite(x) && x==x)],[Provide a macro to do isinf])
 ])
-
-LDFLAGS="$save_LDFLAGS"
+LIBS="$LIBS $LIBM"
+LDFLAGS="$save_LIBS"
 
 # Provided by regex.h
 AC_CHECK_FUNCS([re_comp])
@@ -1789,7 +1801,6 @@ if test $HELP_ENABLE = yes; then
    echo "  Batik (SVG) ............ = $BATIK"
    echo "  Saxon XSLT ............. = $SAXON"
    echo "  FOP (XML => PDF) ....... = $FOP"
-   echo "  Jeuclid (MathML) ....... = $JEUCLID_CORE"
    echo "  Commons I/O ............ = $COMMONS_IO"
    echo "  XML graphics commons ... = $XMLGRAPHICS_COMMONS"
    echo "  XML commons external ... = $XML_APIS_EXT"
@@ -1824,6 +1835,7 @@ echo "  JOGL ................ = $JOGL"
 echo "  JOGL LIBS (JNI) ..... = $JOGL_LIBS"
 echo "  Gluegen ............. = $GLUEGEN_RT"
 echo "  Gluegen LIBS (JNI) .. = $GLUEGEN_RT_LIBS"
+echo "  Jeuclid (MathML) .... = $JEUCLID_CORE"
 echo "  Jhall  .............. = $JHALL"
 echo "  Jrosetta (API) ...... = $JROSETTA_API"
 echo "  Jrosetta (Engine) ... = $JROSETTA_ENGINE"
diff --git a/scilab/contrib/Makefile.in b/scilab/contrib/Makefile.in
index 2243dd3..b2057be 100644
--- a/scilab/contrib/Makefile.in
+++ b/scilab/contrib/Makefile.in
@@ -158,6 +158,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/libs/MALLOC/Makefile.in b/scilab/libs/MALLOC/Makefile.in
index 6b3f5a0..a589263 100644
--- a/scilab/libs/MALLOC/Makefile.in
+++ b/scilab/libs/MALLOC/Makefile.in
@@ -224,6 +224,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/libs/Makefile.in b/scilab/libs/Makefile.in
index 6d6f573..b00175a 100644
--- a/scilab/libs/Makefile.in
+++ b/scilab/libs/Makefile.in
@@ -196,6 +196,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/libs/doublylinkedlist/Makefile.in b/scilab/libs/doublylinkedlist/Makefile.in
index 0a4cd33..9e32496 100644
--- a/scilab/libs/doublylinkedlist/Makefile.in
+++ b/scilab/libs/doublylinkedlist/Makefile.in
@@ -226,6 +226,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/libs/dynamiclibrary/Makefile.in b/scilab/libs/dynamiclibrary/Makefile.in
index 91f15bc0..819b487 100644
--- a/scilab/libs/dynamiclibrary/Makefile.in
+++ b/scilab/libs/dynamiclibrary/Makefile.in
@@ -226,6 +226,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/libs/hashtable/Makefile.in b/scilab/libs/hashtable/Makefile.in
index b1c4111..f690778 100644
--- a/scilab/libs/hashtable/Makefile.in
+++ b/scilab/libs/hashtable/Makefile.in
@@ -224,6 +224,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/libs/libst/Makefile.in b/scilab/libs/libst/Makefile.in
index 866df66..fc421cb 100644
--- a/scilab/libs/libst/Makefile.in
+++ b/scilab/libs/libst/Makefile.in
@@ -220,6 +220,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/m4/docbook.m4 b/scilab/m4/docbook.m4
index e017774..7fbbcca 100644
--- a/scilab/m4/docbook.m4
+++ b/scilab/m4/docbook.m4
@@ -54,11 +54,6 @@ AC_ARG_WITH(docbook,
         FOP=$PACKAGE_JAR_FILE
         AC_SUBST(FOP)
 
-        # MathML rendering solution
-        AC_JAVA_CHECK_PACKAGE([jeuclid-core],[net.sourceforge.jeuclid.LayoutContext],[MathML rendering solution (at least version 3.1.X)])
-        JEUCLID_CORE=$PACKAGE_JAR_FILE
-        AC_SUBST(JEUCLID_CORE)
-
         # Commons I/O library
         AC_JAVA_CHECK_PACKAGE([commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons I/O library])
         COMMONS_IO=$PACKAGE_JAR_FILE
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index 67c1d96..92f0882 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -282,6 +282,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/action_binding/Makefile.in b/scilab/modules/action_binding/Makefile.in
index 1e3da63..163ff0a 100644
--- a/scilab/modules/action_binding/Makefile.in
+++ b/scilab/modules/action_binding/Makefile.in
@@ -247,6 +247,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/api_scilab/Makefile.in b/scilab/modules/api_scilab/Makefile.in
index c8912dc..e3d3268 100644
--- a/scilab/modules/api_scilab/Makefile.in
+++ b/scilab/modules/api_scilab/Makefile.in
@@ -241,6 +241,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/arnoldi/Makefile.in b/scilab/modules/arnoldi/Makefile.in
index fc38387..d839ccb 100644
--- a/scilab/modules/arnoldi/Makefile.in
+++ b/scilab/modules/arnoldi/Makefile.in
@@ -263,6 +263,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/atoms/Makefile.in b/scilab/modules/atoms/Makefile.in
index 51a666c..99de7ef 100644
--- a/scilab/modules/atoms/Makefile.in
+++ b/scilab/modules/atoms/Makefile.in
@@ -203,6 +203,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/boolean/Makefile.in b/scilab/modules/boolean/Makefile.in
index a1dbb01..6a0dc7e 100644
--- a/scilab/modules/boolean/Makefile.in
+++ b/scilab/modules/boolean/Makefile.in
@@ -242,6 +242,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/cacsd/Makefile.in b/scilab/modules/cacsd/Makefile.in
index 50c18fa..a15defb 100644
--- a/scilab/modules/cacsd/Makefile.in
+++ b/scilab/modules/cacsd/Makefile.in
@@ -337,6 +337,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/call_scilab/Makefile.in b/scilab/modules/call_scilab/Makefile.in
index 522d64e..0c62abd 100644
--- a/scilab/modules/call_scilab/Makefile.in
+++ b/scilab/modules/call_scilab/Makefile.in
@@ -238,6 +238,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/compatibility_functions/Makefile.in b/scilab/modules/compatibility_functions/Makefile.in
index 916059b..11ac5cf 100644
--- a/scilab/modules/compatibility_functions/Makefile.in
+++ b/scilab/modules/compatibility_functions/Makefile.in
@@ -202,6 +202,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/completion/Makefile.in b/scilab/modules/completion/Makefile.in
index b25d471..94792ce 100644
--- a/scilab/modules/completion/Makefile.in
+++ b/scilab/modules/completion/Makefile.in
@@ -264,6 +264,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/console/Makefile.in b/scilab/modules/console/Makefile.in
index 2c385d0..4a2e3d4 100644
--- a/scilab/modules/console/Makefile.in
+++ b/scilab/modules/console/Makefile.in
@@ -276,6 +276,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/core/Makefile.in b/scilab/modules/core/Makefile.in
index e8d515a..c2471ef 100644
--- a/scilab/modules/core/Makefile.in
+++ b/scilab/modules/core/Makefile.in
@@ -475,6 +475,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/data_structures/Makefile.in b/scilab/modules/data_structures/Makefile.in
index b1eb8e1..53fe905 100644
--- a/scilab/modules/data_structures/Makefile.in
+++ b/scilab/modules/data_structures/Makefile.in
@@ -273,6 +273,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/demo_tools/Makefile.in b/scilab/modules/demo_tools/Makefile.in
index af7470e..b226ef3 100644
--- a/scilab/modules/demo_tools/Makefile.in
+++ b/scilab/modules/demo_tools/Makefile.in
@@ -201,6 +201,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/development_tools/Makefile.in b/scilab/modules/development_tools/Makefile.in
index a6c82ef..1eecddc 100644
--- a/scilab/modules/development_tools/Makefile.in
+++ b/scilab/modules/development_tools/Makefile.in
@@ -200,6 +200,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/development_tools/src/fake/Makefile.in b/scilab/modules/development_tools/src/fake/Makefile.in
index a904129..7e6d748 100644
--- a/scilab/modules/development_tools/src/fake/Makefile.in
+++ b/scilab/modules/development_tools/src/fake/Makefile.in
@@ -151,6 +151,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/differential_equations/Makefile.in b/scilab/modules/differential_equations/Makefile.in
index 8de7549..10a965b 100644
--- a/scilab/modules/differential_equations/Makefile.in
+++ b/scilab/modules/differential_equations/Makefile.in
@@ -284,6 +284,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/double/Makefile.in b/scilab/modules/double/Makefile.in
index de4a33d..6a904b4 100644
--- a/scilab/modules/double/Makefile.in
+++ b/scilab/modules/double/Makefile.in
@@ -242,6 +242,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/dynamic_link/Makefile.in b/scilab/modules/dynamic_link/Makefile.in
index aa17267..25bed5d 100644
--- a/scilab/modules/dynamic_link/Makefile.in
+++ b/scilab/modules/dynamic_link/Makefile.in
@@ -259,6 +259,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/elementary_functions/Makefile.in b/scilab/modules/elementary_functions/Makefile.in
index 9ad3d0a..d231aab 100644
--- a/scilab/modules/elementary_functions/Makefile.in
+++ b/scilab/modules/elementary_functions/Makefile.in
@@ -611,6 +611,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/elementary_functions/macros/tand.sci b/scilab/modules/elementary_functions/macros/tand.sci
index 43d0219..2394270 100644
--- a/scilab/modules/elementary_functions/macros/tand.sci
+++ b/scilab/modules/elementary_functions/macros/tand.sci
@@ -1,5 +1,6 @@
 // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 // Copyright (C) INRIA, Serge Steer
+// Copyright (C) 2010 - DIGITEO - Michael Baudin
 //
 // This file must be used under the terms of the CeCILL.
 // This source file is licensed as described in the file COPYING, which
@@ -8,19 +9,18 @@
 // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 function y = tand(x)
 // Tangent of x in degrees.
-  if ~isreal(x) then
+// tand(x) = tan(x*%pi/180) in the mathematical sense
+// But floating point numbers behave differently.
+// For example, tand(180) = 0 while tan(pi) = -1.225D-16
+  if ( ~isreal(x) ) then
     error(msprintf(gettext("%s: Wrong type for input argument #%d: Array of reals expected.\n"),"tand",1)); 
   end
-  
-  n = round(x/90);
-  x = x - n*90;
-  z = (x == 0);
-  m = pmodulo(n,2);
-  y = x
-  y(m==0) = tan(%pi/180*x(m==0));
-  if or(m==1) then
-    y(m==1 & ~z) = -1 ./ tan(%pi/180*x(m==1 & ~z));
-    y(m==1 & z & n>=0) = %inf;
-    y(m==1 & z & n<0) = -%inf;
-  end
+  // Argument reduction toward [-90,90[
+  n = round(x/180)
+  x = x - n*180
+  y = tan(%pi/180*x)
+  // Set all singular points to nan
+  m = pmodulo(x+90,180)
+  y(m==0) = %nan
 endfunction
+
diff --git a/scilab/modules/elementary_functions/tests/unit_tests/tand.dia.ref b/scilab/modules/elementary_functions/tests/unit_tests/tand.dia.ref
index 52d820e..2144325 100644
--- a/scilab/modules/elementary_functions/tests/unit_tests/tand.dia.ref
+++ b/scilab/modules/elementary_functions/tests/unit_tests/tand.dia.ref
@@ -1,394 +1,452 @@
 // =============================================================================
 // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 // Copyright (C) 2008 - INRIA - Serge Steer
+// Copyright (C) 2010 - DIGITEO - Michael Baudin
 //
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
 // <-- JVM NOT MANDATORY -->
+//
+// assert_close --
+//   Returns 1 if the two real matrices computed and expected are close,
+//   i.e. if the relative distance between computed and expected is lesser than epsilon.
+// Arguments
+//   computed, expected : the two matrices to compare
+//   epsilon : a small number
+//
+function flag = assert_close ( computed, expected, epsilon )
+  if expected==0.0 then
+    shift = norm(computed-expected);
+  else
+    shift = norm(computed-expected)/norm(expected);
+  end
+  if shift < epsilon then
+    flag = 1;
+  else
+    flag = 0;
+  end
+  if flag <> 1 then bugmes();quit;end
+endfunction
+//
+// assert_equal --
+//   Returns 1 if the two real matrices computed and expected are equal.
+// Arguments
+//   computed, expected : the two matrices to compare
+//   epsilon : a small number
+//
+function flag = assert_equal ( computed , expected )
+  if computed==expected then
+    flag = 1;
+  else
+    flag = 0;
+  end
+  if flag <> 1 then bugmes();quit;end
+endfunction
 // Maple code used to create reference
-// Digits := 40;
-// writeto("tand.ref"); interface(prettyprint = 0);
-// for i from 0 to 360 do if ((i<>90) and (i<>270) ) then print(-180+i, evalf[30](tan(-Pi+i*Pi/180), 30)) end end do;
+// Digits := 40; 
+// writeto("tand.ref"); interface(prettyprint = 0); 
+// for i from 0 to 360 do if ((i<>90) and (i<>270) ) then print(-180+i, evalf[30](tan(-Pi+i*Pi/180), 30)) end end do; 
 // writeto(terminal);
 ieee(2);
-pi=%pi;eps=%eps;Inf=%inf;NaN=%nan; //used to make following code runnable under Matlab
-ref=[-180, 0.
--179, 0.174550649282175857651288952197e-1
--178, 0.349207694917477305004026257737e-1
--177, 0.524077792830412040388058244741e-1
--176, 0.699268119435104136669210603231e-1
--175, 0.874886635259240052220186694350e-1
--174, .105104235265676462511502380140
--173, .122784560902904591134231136053
--172, .140540834702391446838117693433
--171, .158384440324536293838883092694
--170, .176326980708464973471090386869
--169, .194380309137718484243194224977
--168, .212556561670022125259591660570
--167, .230868191125563111748145613474
--166, .249328002843180691624039937805
--165, .267949192431122706472553658494
--164, .286745385758807940042758062732
--163, .305730681458660355734541958996
--162, .324919696232906326155871412215
--161, .344327613289665241957265839384
--160, .363970234266202361351047882776
--159, .383864035035415795971448408105
--158, .404026225835156811322348143579
--157, .424474816209604742023532062943
--156, .445228685308536163922367030644
--155, .466307658154998592830006194801
--154, .487732588565861422773111126616
--153, .509525449494428810513706911251
--152, .531709431661478748075915871842
--151, .554309051452768917820763092337
--150, .577350269189625764509148780503
--149, .600860619027560414878664426354
--148, .624869351909327509780510827950
--147, .649407593197510576982062911310
--146, .674508516842426632142460861996
--145, .700207538209709779458522719443
--144, .726542528005360885895466757481
--143, .753554050102794157073956448623
--142, .781285626506717397062949971961
--141, .809784033195007148036991374238
--140, .839099631177280011763127298122
--139, .869286737816226662200095638705
--138, .900404044297839945120477203883
--137, .932515086137661705612185627428
--136, .965688774807074045958027299699
--135, 1.
--134, 1.03553031379056950695883255125
--133, 1.07236871002468253294602774807
--132, 1.11061251482919287014348196417
--131, 1.15036840722100955587633102557
--130, 1.19175359259420995870530807186
--129, 1.23489715653505139855617469537
--128, 1.27994163219307878031102984757
--127, 1.32704482162041003715947257408
--126, 1.37638192047117353820720958191
--125, 1.42814800674211450216061848500
--124, 1.48256096851274025478715714915
--123, 1.53986496381458290482679697261
--122, 1.60033452904105035532673308117
--121, 1.66427948235051791103049617004
--120, 1.73205080756887729352744634151
--119, 1.80404775527142393738178474825
--118, 1.88072646534633201236083759582
--117, 1.96261050550515058230464042622
--116, 2.05030384157929621689901107053
--115, 2.14450692050955861635626079106
--114, 2.24603677390421605416332143840
--113, 2.35585236582375283393958666236
--112, 2.47508685341629582524001324606
--111, 2.60508906469380153625841233646
--110, 2.74747741945462227876166402648
--109, 2.90421087767582280257932553456
--108, 3.07768353717525340257029057602
--107, 3.27085261848414086530885625734
--106, 3.48741444384090865069622422508
--105, 3.73205080756887729352744634156
--104, 4.01078093353584471634571512944
--103, 4.33147587428415554554616775463
--102, 4.70463010947845423358623453738
--101, 5.14455401597031013472322071724
--100, 5.67128181961770953099441843983
--99, 6.31375151467504309897946424494
--98, 7.11536972238420874823056614360
--97, 8.14434642797459402382566139528
--96, 9.51436445422258492968397145491
--95, 11.4300523027613430672108555485
--94, 14.3006662567119279101280533475
--93, 19.0811366877282110634067487325
--92, 28.6362532829156035507565093210
--91, 57.2899616307594246872781475211
--89, -57.2899616307594246872781475211
--88, -28.6362532829156035507565093210
--87, -19.0811366877282110634067487325
--86, -14.3006662567119279101280533475
--85, -11.4300523027613430672108555485
--84, -9.51436445422258492968397145491
--83, -8.14434642797459402382566139528
--82, -7.11536972238420874823056614360
--81, -6.31375151467504309897946424494
--80, -5.67128181961770953099441843983
--79, -5.14455401597031013472322071724
--78, -4.70463010947845423358623453738
--77, -4.33147587428415554554616775463
--76, -4.01078093353584471634571512944
--75, -3.73205080756887729352744634156
--74, -3.48741444384090865069622422508
--73, -3.27085261848414086530885625734
--72, -3.07768353717525340257029057602
--71, -2.90421087767582280257932553456
--70, -2.74747741945462227876166402648
--69, -2.60508906469380153625841233646
--68, -2.47508685341629582524001324606
--67, -2.35585236582375283393958666236
--66, -2.24603677390421605416332143840
--65, -2.14450692050955861635626079106
--64, -2.05030384157929621689901107053
--63, -1.96261050550515058230464042622
--62, -1.88072646534633201236083759582
--61, -1.80404775527142393738178474825
--60, -1.73205080756887729352744634151
--59, -1.66427948235051791103049617004
--58, -1.60033452904105035532673308117
--57, -1.53986496381458290482679697261
--56, -1.48256096851274025478715714915
--55, -1.42814800674211450216061848500
--54, -1.37638192047117353820720958191
--53, -1.32704482162041003715947257408
--52, -1.27994163219307878031102984757
--51, -1.23489715653505139855617469537
--50, -1.19175359259420995870530807186
--49, -1.15036840722100955587633102557
--48, -1.11061251482919287014348196417
--47, -1.07236871002468253294602774807
--46, -1.03553031379056950695883255125
--45, -1.
--44, -.965688774807074045958027299699
--43, -.932515086137661705612185627428
--42, -.900404044297839945120477203883
--41, -.869286737816226662200095638705
--40, -.839099631177280011763127298122
--39, -.809784033195007148036991374238
--38, -.781285626506717397062949971961
--37, -.753554050102794157073956448623
--36, -.726542528005360885895466757481
--35, -.700207538209709779458522719443
--34, -.674508516842426632142460861996
--33, -.649407593197510576982062911310
--32, -.624869351909327509780510827950
--31, -.600860619027560414878664426354
--30, -.577350269189625764509148780503
--29, -.554309051452768917820763092337
--28, -.531709431661478748075915871842
--27, -.509525449494428810513706911251
--26, -.487732588565861422773111126616
--25, -.466307658154998592830006194801
--24, -.445228685308536163922367030644
--23, -.424474816209604742023532062943
--22, -.404026225835156811322348143579
--21, -.383864035035415795971448408105
--20, -.363970234266202361351047882776
--19, -.344327613289665241957265839384
--18, -.324919696232906326155871412215
--17, -.305730681458660355734541958996
--16, -.286745385758807940042758062732
--15, -.267949192431122706472553658494
--14, -.249328002843180691624039937805
--13, -.230868191125563111748145613474
--12, -.212556561670022125259591660570
--11, -.194380309137718484243194224977
--10, -.176326980708464973471090386869
--9, -.158384440324536293838883092694
--8, -.140540834702391446838117693433
--7, -.122784560902904591134231136053
--6, -.105104235265676462511502380140
--5, -0.874886635259240052220186694350e-1
--4, -0.699268119435104136669210603231e-1
--3, -0.524077792830412040388058244741e-1
--2, -0.349207694917477305004026257737e-1
--1, -0.174550649282175857651288952197e-1
-0, 0.
-1, 0.174550649282175857651288952197e-1
-2, 0.349207694917477305004026257737e-1
-3, 0.524077792830412040388058244741e-1
-4, 0.699268119435104136669210603231e-1
-5, 0.874886635259240052220186694350e-1
-6, .105104235265676462511502380140
-7, .122784560902904591134231136053
-8, .140540834702391446838117693433
-9, .158384440324536293838883092694
-10, .176326980708464973471090386869
-11, .194380309137718484243194224977
-12, .212556561670022125259591660570
-13, .230868191125563111748145613474
-14, .249328002843180691624039937805
-15, .267949192431122706472553658494
-16, .286745385758807940042758062732
-17, .305730681458660355734541958996
-18, .324919696232906326155871412215
-19, .344327613289665241957265839384
-20, .363970234266202361351047882776
-21, .383864035035415795971448408105
-22, .404026225835156811322348143579
-23, .424474816209604742023532062943
-24, .445228685308536163922367030644
-25, .466307658154998592830006194801
-26, .487732588565861422773111126616
-27, .509525449494428810513706911251
-28, .531709431661478748075915871842
-29, .554309051452768917820763092337
-30, .577350269189625764509148780503
-31, .600860619027560414878664426354
-32, .624869351909327509780510827950
-33, .649407593197510576982062911310
-34, .674508516842426632142460861996
-35, .700207538209709779458522719443
-36, .726542528005360885895466757481
-37, .753554050102794157073956448623
-38, .781285626506717397062949971961
-39, .809784033195007148036991374238
-40, .839099631177280011763127298122
-41, .869286737816226662200095638705
-42, .900404044297839945120477203883
-43, .932515086137661705612185627428
-44, .965688774807074045958027299699
-45, 1.
-46, 1.03553031379056950695883255125
-47, 1.07236871002468253294602774807
-48, 1.11061251482919287014348196417
-49, 1.15036840722100955587633102557
-50, 1.19175359259420995870530807186
-51, 1.23489715653505139855617469537
-52, 1.27994163219307878031102984757
-53, 1.32704482162041003715947257408
-54, 1.37638192047117353820720958191
-55, 1.42814800674211450216061848500
-56, 1.48256096851274025478715714915
-57, 1.53986496381458290482679697261
-58, 1.60033452904105035532673308117
-59, 1.66427948235051791103049617004
-60, 1.73205080756887729352744634151
-61, 1.80404775527142393738178474825
-62, 1.88072646534633201236083759582
-63, 1.96261050550515058230464042622
-64, 2.05030384157929621689901107053
-65, 2.14450692050955861635626079106
-66, 2.24603677390421605416332143840
-67, 2.35585236582375283393958666236
-68, 2.47508685341629582524001324606
-69, 2.60508906469380153625841233646
-70, 2.74747741945462227876166402648
-71, 2.90421087767582280257932553456
-72, 3.07768353717525340257029057602
-73, 3.27085261848414086530885625734
-74, 3.48741444384090865069622422508
-75, 3.73205080756887729352744634156
-76, 4.01078093353584471634571512944
-77, 4.33147587428415554554616775463
-78, 4.70463010947845423358623453738
-79, 5.14455401597031013472322071724
-80, 5.67128181961770953099441843983
-81, 6.31375151467504309897946424494
-82, 7.11536972238420874823056614360
-83, 8.14434642797459402382566139528
-84, 9.51436445422258492968397145491
-85, 11.4300523027613430672108555485
-86, 14.3006662567119279101280533475
-87, 19.0811366877282110634067487325
-88, 28.6362532829156035507565093210
-89, 57.2899616307594246872781475211
-91, -57.2899616307594246872781475211
-92, -28.6362532829156035507565093210
-93, -19.0811366877282110634067487325
-94, -14.3006662567119279101280533475
-95, -11.4300523027613430672108555485
-96, -9.51436445422258492968397145491
-97, -8.14434642797459402382566139528
-98, -7.11536972238420874823056614360
-99, -6.31375151467504309897946424494
-100, -5.67128181961770953099441843983
-101, -5.14455401597031013472322071724
-102, -4.70463010947845423358623453738
-103, -4.33147587428415554554616775463
-104, -4.01078093353584471634571512944
-105, -3.73205080756887729352744634156
-106, -3.48741444384090865069622422508
-107, -3.27085261848414086530885625734
-108, -3.07768353717525340257029057602
-109, -2.90421087767582280257932553456
-110, -2.74747741945462227876166402648
-111, -2.60508906469380153625841233646
-112, -2.47508685341629582524001324606
-113, -2.35585236582375283393958666236
-114, -2.24603677390421605416332143840
-115, -2.14450692050955861635626079106
-116, -2.05030384157929621689901107053
-117, -1.96261050550515058230464042622
-118, -1.88072646534633201236083759582
-119, -1.80404775527142393738178474825
-120, -1.73205080756887729352744634151
-121, -1.66427948235051791103049617004
-122, -1.60033452904105035532673308117
-123, -1.53986496381458290482679697261
-124, -1.48256096851274025478715714915
-125, -1.42814800674211450216061848500
-126, -1.37638192047117353820720958191
-127, -1.32704482162041003715947257408
-128, -1.27994163219307878031102984757
-129, -1.23489715653505139855617469537
-130, -1.19175359259420995870530807186
-131, -1.15036840722100955587633102557
-132, -1.11061251482919287014348196417
-133, -1.07236871002468253294602774807
-134, -1.03553031379056950695883255125
-135, -1.
-136, -.965688774807074045958027299699
-137, -.932515086137661705612185627428
-138, -.900404044297839945120477203883
-139, -.869286737816226662200095638705
-140, -.839099631177280011763127298122
-141, -.809784033195007148036991374238
-142, -.781285626506717397062949971961
-143, -.753554050102794157073956448623
-144, -.726542528005360885895466757481
-145, -.700207538209709779458522719443
-146, -.674508516842426632142460861996
-147, -.649407593197510576982062911310
-148, -.624869351909327509780510827950
-149, -.600860619027560414878664426354
-150, -.577350269189625764509148780503
-151, -.554309051452768917820763092337
-152, -.531709431661478748075915871842
-153, -.509525449494428810513706911251
-154, -.487732588565861422773111126616
-155, -.466307658154998592830006194801
-156, -.445228685308536163922367030644
-157, -.424474816209604742023532062943
-158, -.404026225835156811322348143579
-159, -.383864035035415795971448408105
-160, -.363970234266202361351047882776
-161, -.344327613289665241957265839384
-162, -.324919696232906326155871412215
-163, -.305730681458660355734541958996
-164, -.286745385758807940042758062732
-165, -.267949192431122706472553658494
-166, -.249328002843180691624039937805
-167, -.230868191125563111748145613474
-168, -.212556561670022125259591660570
-169, -.194380309137718484243194224977
-170, -.176326980708464973471090386869
-171, -.158384440324536293838883092694
-172, -.140540834702391446838117693433
-173, -.122784560902904591134231136053
-174, -.105104235265676462511502380140
-175, -0.874886635259240052220186694350e-1
-176, -0.699268119435104136669210603231e-1
-177, -0.524077792830412040388058244741e-1
-178, -0.349207694917477305004026257737e-1
-179, -0.174550649282175857651288952197e-1
-180, 0.
+//used to make following code runnable under Matlab
+pi=%pi;
+eps=%eps;
+Inf=%inf;
+NaN=%nan; 
+//
+x = (-180:180)';
+// Remove 90 (index #91) and -90 (index #271), 
+// where the value is %nan
+x([91 271]) = [];
+e=[
+0.
+0.174550649282175857651288952197e-1
+0.349207694917477305004026257737e-1
+0.524077792830412040388058244741e-1
+0.699268119435104136669210603231e-1
+0.874886635259240052220186694350e-1
+.105104235265676462511502380140
+.122784560902904591134231136053
+.140540834702391446838117693433
+.158384440324536293838883092694
+.176326980708464973471090386869
+.194380309137718484243194224977
+.212556561670022125259591660570
+.230868191125563111748145613474
+.249328002843180691624039937805
+.267949192431122706472553658494
+.286745385758807940042758062732
+.305730681458660355734541958996
+.324919696232906326155871412215
+.344327613289665241957265839384
+.363970234266202361351047882776
+.383864035035415795971448408105
+.404026225835156811322348143579
+.424474816209604742023532062943
+.445228685308536163922367030644
+.466307658154998592830006194801
+.487732588565861422773111126616
+.509525449494428810513706911251
+.531709431661478748075915871842
+.554309051452768917820763092337
+.577350269189625764509148780503
+.600860619027560414878664426354
+.624869351909327509780510827950
+.649407593197510576982062911310
+.674508516842426632142460861996
+.700207538209709779458522719443
+.726542528005360885895466757481
+.753554050102794157073956448623
+.781285626506717397062949971961
+.809784033195007148036991374238
+.839099631177280011763127298122
+.869286737816226662200095638705
+.900404044297839945120477203883
+.932515086137661705612185627428
+.965688774807074045958027299699
+1.
+1.03553031379056950695883255125
+1.07236871002468253294602774807
+1.11061251482919287014348196417
+1.15036840722100955587633102557
+1.19175359259420995870530807186
+1.23489715653505139855617469537
+1.27994163219307878031102984757
+1.32704482162041003715947257408
+1.37638192047117353820720958191
+1.42814800674211450216061848500
+1.48256096851274025478715714915
+1.53986496381458290482679697261
+1.60033452904105035532673308117
+1.66427948235051791103049617004
+1.73205080756887729352744634151
+1.80404775527142393738178474825
+1.88072646534633201236083759582
+1.96261050550515058230464042622
+2.05030384157929621689901107053
+2.14450692050955861635626079106
+2.24603677390421605416332143840
+2.35585236582375283393958666236
+2.47508685341629582524001324606
+2.60508906469380153625841233646
+2.74747741945462227876166402648
+2.90421087767582280257932553456
+3.07768353717525340257029057602
+3.27085261848414086530885625734
+3.48741444384090865069622422508
+3.73205080756887729352744634156
+4.01078093353584471634571512944
+4.33147587428415554554616775463
+4.70463010947845423358623453738
+5.14455401597031013472322071724
+5.67128181961770953099441843983
+6.31375151467504309897946424494
+7.11536972238420874823056614360
+8.14434642797459402382566139528
+9.51436445422258492968397145491
+11.4300523027613430672108555485
+14.3006662567119279101280533475
+19.0811366877282110634067487325
+28.6362532829156035507565093210
+57.2899616307594246872781475211
+-57.2899616307594246872781475211
+-28.6362532829156035507565093210
+-19.0811366877282110634067487325
+-14.3006662567119279101280533475
+-11.4300523027613430672108555485
+-9.51436445422258492968397145491
+-8.14434642797459402382566139528
+-7.11536972238420874823056614360
+-6.31375151467504309897946424494
+-5.67128181961770953099441843983
+-5.14455401597031013472322071724
+-4.70463010947845423358623453738
+-4.33147587428415554554616775463
+-4.01078093353584471634571512944
+-3.73205080756887729352744634156
+-3.48741444384090865069622422508
+-3.27085261848414086530885625734
+-3.07768353717525340257029057602
+-2.90421087767582280257932553456
+-2.74747741945462227876166402648
+-2.60508906469380153625841233646
+-2.47508685341629582524001324606
+-2.35585236582375283393958666236
+-2.24603677390421605416332143840
+-2.14450692050955861635626079106
+-2.05030384157929621689901107053
+-1.96261050550515058230464042622
+-1.88072646534633201236083759582
+-1.80404775527142393738178474825
+-1.73205080756887729352744634151
+-1.66427948235051791103049617004
+-1.60033452904105035532673308117
+-1.53986496381458290482679697261
+-1.48256096851274025478715714915
+-1.42814800674211450216061848500
+-1.37638192047117353820720958191
+-1.32704482162041003715947257408
+-1.27994163219307878031102984757
+-1.23489715653505139855617469537
+-1.19175359259420995870530807186
+-1.15036840722100955587633102557
+-1.11061251482919287014348196417
+-1.07236871002468253294602774807
+-1.03553031379056950695883255125
+-1.
+-.965688774807074045958027299699
+-.932515086137661705612185627428
+-.900404044297839945120477203883
+-.869286737816226662200095638705
+-.839099631177280011763127298122
+-.809784033195007148036991374238
+-.781285626506717397062949971961
+-.753554050102794157073956448623
+-.726542528005360885895466757481
+-.700207538209709779458522719443
+-.674508516842426632142460861996
+-.649407593197510576982062911310
+-.624869351909327509780510827950
+-.600860619027560414878664426354
+-.577350269189625764509148780503
+-.554309051452768917820763092337
+-.531709431661478748075915871842
+-.509525449494428810513706911251
+-.487732588565861422773111126616
+-.466307658154998592830006194801
+-.445228685308536163922367030644
+-.424474816209604742023532062943
+-.404026225835156811322348143579
+-.383864035035415795971448408105
+-.363970234266202361351047882776
+-.344327613289665241957265839384
+-.324919696232906326155871412215
+-.305730681458660355734541958996
+-.286745385758807940042758062732
+-.267949192431122706472553658494
+-.249328002843180691624039937805
+-.230868191125563111748145613474
+-.212556561670022125259591660570
+-.194380309137718484243194224977
+-.176326980708464973471090386869
+-.158384440324536293838883092694
+-.140540834702391446838117693433
+-.122784560902904591134231136053
+-.105104235265676462511502380140
+-0.874886635259240052220186694350e-1
+-0.699268119435104136669210603231e-1
+-0.524077792830412040388058244741e-1
+-0.349207694917477305004026257737e-1
+-0.174550649282175857651288952197e-1
+0.
+0.174550649282175857651288952197e-1
+0.349207694917477305004026257737e-1
+0.524077792830412040388058244741e-1
+0.699268119435104136669210603231e-1
+0.874886635259240052220186694350e-1
+.105104235265676462511502380140
+.122784560902904591134231136053
+.140540834702391446838117693433
+.158384440324536293838883092694
+.176326980708464973471090386869
+.194380309137718484243194224977
+.212556561670022125259591660570
+.230868191125563111748145613474
+.249328002843180691624039937805
+.267949192431122706472553658494
+.286745385758807940042758062732
+.305730681458660355734541958996
+.324919696232906326155871412215
+.344327613289665241957265839384
+.363970234266202361351047882776
+.383864035035415795971448408105
+.404026225835156811322348143579
+.424474816209604742023532062943
+.445228685308536163922367030644
+.466307658154998592830006194801
+.487732588565861422773111126616
+.509525449494428810513706911251
+.531709431661478748075915871842
+.554309051452768917820763092337
+.577350269189625764509148780503
+.600860619027560414878664426354
+.624869351909327509780510827950
+.649407593197510576982062911310
+.674508516842426632142460861996
+.700207538209709779458522719443
+.726542528005360885895466757481
+.753554050102794157073956448623
+.781285626506717397062949971961
+.809784033195007148036991374238
+.839099631177280011763127298122
+.869286737816226662200095638705
+.900404044297839945120477203883
+.932515086137661705612185627428
+.965688774807074045958027299699
+1.
+1.03553031379056950695883255125
+1.07236871002468253294602774807
+1.11061251482919287014348196417
+1.15036840722100955587633102557
+1.19175359259420995870530807186
+1.23489715653505139855617469537
+1.27994163219307878031102984757
+1.32704482162041003715947257408
+1.37638192047117353820720958191
+1.42814800674211450216061848500
+1.48256096851274025478715714915
+1.53986496381458290482679697261
+1.60033452904105035532673308117
+1.66427948235051791103049617004
+1.73205080756887729352744634151
+1.80404775527142393738178474825
+1.88072646534633201236083759582
+1.96261050550515058230464042622
+2.05030384157929621689901107053
+2.14450692050955861635626079106
+2.24603677390421605416332143840
+2.35585236582375283393958666236
+2.47508685341629582524001324606
+2.60508906469380153625841233646
+2.74747741945462227876166402648
+2.90421087767582280257932553456
+3.07768353717525340257029057602
+3.27085261848414086530885625734
+3.48741444384090865069622422508
+3.73205080756887729352744634156
+4.01078093353584471634571512944
+4.33147587428415554554616775463
+4.70463010947845423358623453738
+5.14455401597031013472322071724
+5.67128181961770953099441843983
+6.31375151467504309897946424494
+7.11536972238420874823056614360
+8.14434642797459402382566139528
+9.51436445422258492968397145491
+11.4300523027613430672108555485
+14.3006662567119279101280533475
+19.0811366877282110634067487325
+28.6362532829156035507565093210
+57.2899616307594246872781475211
+-57.2899616307594246872781475211
+-28.6362532829156035507565093210
+-19.0811366877282110634067487325
+-14.3006662567119279101280533475
+-11.4300523027613430672108555485
+-9.51436445422258492968397145491
+-8.14434642797459402382566139528
+-7.11536972238420874823056614360
+-6.31375151467504309897946424494
+-5.67128181961770953099441843983
+-5.14455401597031013472322071724
+-4.70463010947845423358623453738
+-4.33147587428415554554616775463
+-4.01078093353584471634571512944
+-3.73205080756887729352744634156
+-3.48741444384090865069622422508
+-3.27085261848414086530885625734
+-3.07768353717525340257029057602
+-2.90421087767582280257932553456
+-2.74747741945462227876166402648
+-2.60508906469380153625841233646
+-2.47508685341629582524001324606
+-2.35585236582375283393958666236
+-2.24603677390421605416332143840
+-2.14450692050955861635626079106
+-2.05030384157929621689901107053
+-1.96261050550515058230464042622
+-1.88072646534633201236083759582
+-1.80404775527142393738178474825
+-1.73205080756887729352744634151
+-1.66427948235051791103049617004
+-1.60033452904105035532673308117
+-1.53986496381458290482679697261
+-1.48256096851274025478715714915
+-1.42814800674211450216061848500
+-1.37638192047117353820720958191
+-1.32704482162041003715947257408
+-1.27994163219307878031102984757
+-1.23489715653505139855617469537
+-1.19175359259420995870530807186
+-1.15036840722100955587633102557
+-1.11061251482919287014348196417
+-1.07236871002468253294602774807
+-1.03553031379056950695883255125
+-1.
+-.965688774807074045958027299699
+-.932515086137661705612185627428
+-.900404044297839945120477203883
+-.869286737816226662200095638705
+-.839099631177280011763127298122
+-.809784033195007148036991374238
+-.781285626506717397062949971961
+-.753554050102794157073956448623
+-.726542528005360885895466757481
+-.700207538209709779458522719443
+-.674508516842426632142460861996
+-.649407593197510576982062911310
+-.624869351909327509780510827950
+-.600860619027560414878664426354
+-.577350269189625764509148780503
+-.554309051452768917820763092337
+-.531709431661478748075915871842
+-.509525449494428810513706911251
+-.487732588565861422773111126616
+-.466307658154998592830006194801
+-.445228685308536163922367030644
+-.424474816209604742023532062943
+-.404026225835156811322348143579
+-.383864035035415795971448408105
+-.363970234266202361351047882776
+-.344327613289665241957265839384
+-.324919696232906326155871412215
+-.305730681458660355734541958996
+-.286745385758807940042758062732
+-.267949192431122706472553658494
+-.249328002843180691624039937805
+-.230868191125563111748145613474
+-.212556561670022125259591660570
+-.194380309137718484243194224977
+-.176326980708464973471090386869
+-.158384440324536293838883092694
+-.140540834702391446838117693433
+-.122784560902904591134231136053
+-.105104235265676462511502380140
+-0.874886635259240052220186694350e-1
+-0.699268119435104136669210603231e-1
+-0.524077792830412040388058244741e-1
+-0.349207694917477305004026257737e-1
+-0.174550649282175857651288952197e-1
+0.
 ];
-x=ref(:,1);e=max(abs((ref(:,2)-tand(x))));
-if e>40*eps then bugmes();quit;end
-x=ref(:,1)+2^6*360; e=max(abs((ref(:,2)-tand(x))));
-if e>40*eps then bugmes();quit;end
-x=ref(:,1)+2^10*360; e=max(abs((ref(:,2)-tand(x))));
-if e>40*eps then bugmes();quit;end
-if tand(0)<>0 then bugmes();quit;end
-if tand(360)<>0 then bugmes();quit;end
-if tand(-360)<>0 then bugmes();quit;end
-if tand(90)<>%inf then bugmes();quit;end
-if tand(-90)<>-%inf then bugmes();quit;end
-if tand(180)<>0 then bugmes();quit;end
-if tand(-180)<>0 then bugmes();quit;end
-if tand(270)<>%inf then bugmes();quit;end
-if tand(-270)<>-%inf then bugmes();quit;end
-if or(abs(tand([30 45 60])-[1/sqrt(3) 1 sqrt(3) ])>2*%eps) then bugmes();quit;end
-if ~isnan(tand(-Inf)) then bugmes();quit;end
-if ~isnan(tand(Inf)) then bugmes();quit;end
-if ~isnan(tand(NaN)) then bugmes();quit;end
-if tand([])<>[] then bugmes();quit;end
+c = tand(x);
+assert_close ( c , e , 40 * %eps );
+// Turn a lot around the circle
+x1 = x + 2^6*360; 
+c = tand(x1);
+assert_close ( c , e , 40 * %eps );
+// Turn a lot around the circle, the other side
+x2 = x - 2^6*360; 
+c = tand(x2);
+assert_close ( c , e , 40 * %eps );
+assert_equal ( tand(0) , 0 );
+assert_equal ( tand(360) , 0 );
+assert_equal ( tand(-360) , 0 );
+assert_equal ( tand(180) , 0 );
+assert_equal ( tand(-180) , 0 );
+assert_close ( tand(30) , 1/sqrt(3) , %eps );
+assert_close ( tand(45) , 1         , 2 * %eps );
+assert_close ( tand(60) , sqrt(3)   , 2*%eps );
+assert_equal ( isnan(tand(90))  , %t );
+assert_equal ( isnan(tand(-90)) , %t );
+assert_equal ( isnan(tand(270)) , %t );
+assert_equal ( isnan(tand(-270)) , %t );
+assert_equal ( isnan(tand(-%inf)) , %t );
+assert_equal ( isnan(tand(%inf))  , %t );
+assert_equal ( isnan(tand(%nan))  , %t );
+assert_equal ( tand([])  , [] );
+ieee(0)
+assert_equal ( tand(0) , 0 );
+assert_close ( tand(30) , 1/sqrt(3) , %eps );
+assert_close ( tand(45) , 1         , 2 * %eps );
+assert_close ( tand(60) , sqrt(3)   , 2*%eps );
diff --git a/scilab/modules/elementary_functions/tests/unit_tests/tand.tst b/scilab/modules/elementary_functions/tests/unit_tests/tand.tst
index 30f01af..1b88df3 100644
--- a/scilab/modules/elementary_functions/tests/unit_tests/tand.tst
+++ b/scilab/modules/elementary_functions/tests/unit_tests/tand.tst
@@ -1,402 +1,467 @@
 // =============================================================================
 // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 // Copyright (C) 2008 - INRIA - Serge Steer
+// Copyright (C) 2010 - DIGITEO - Michael Baudin
 //
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
 
 // <-- JVM NOT MANDATORY -->
 
+//
+// assert_close --
+//   Returns 1 if the two real matrices computed and expected are close,
+//   i.e. if the relative distance between computed and expected is lesser than epsilon.
+// Arguments
+//   computed, expected : the two matrices to compare
+//   epsilon : a small number
+//
+function flag = assert_close ( computed, expected, epsilon )
+  if expected==0.0 then
+    shift = norm(computed-expected);
+  else
+    shift = norm(computed-expected)/norm(expected);
+  end
+  if shift < epsilon then
+    flag = 1;
+  else
+    flag = 0;
+  end
+  if flag <> 1 then pause,end
+endfunction
+//
+// assert_equal --
+//   Returns 1 if the two real matrices computed and expected are equal.
+// Arguments
+//   computed, expected : the two matrices to compare
+//   epsilon : a small number
+//
+function flag = assert_equal ( computed , expected )
+  if computed==expected then
+    flag = 1;
+  else
+    flag = 0;
+  end
+  if flag <> 1 then pause,end
+endfunction
+
 // Maple code used to create reference
 // Digits := 40; 
 // writeto("tand.ref"); interface(prettyprint = 0); 
 // for i from 0 to 360 do if ((i<>90) and (i<>270) ) then print(-180+i, evalf[30](tan(-Pi+i*Pi/180), 30)) end end do; 
 // writeto(terminal);
 ieee(2);
-pi=%pi;eps=%eps;Inf=%inf;NaN=%nan; //used to make following code runnable under Matlab
+//used to make following code runnable under Matlab
+pi=%pi;
+eps=%eps;
+Inf=%inf;
+NaN=%nan; 
+
+//
+x = (-180:180)';
+// Remove 90 (index #91) and -90 (index #271), 
+// where the value is %nan
+x([91 271]) = [];
 
-ref=[-180, 0.
--179, 0.174550649282175857651288952197e-1
--178, 0.349207694917477305004026257737e-1
--177, 0.524077792830412040388058244741e-1
--176, 0.699268119435104136669210603231e-1
--175, 0.874886635259240052220186694350e-1
--174, .105104235265676462511502380140
--173, .122784560902904591134231136053
--172, .140540834702391446838117693433
--171, .158384440324536293838883092694
--170, .176326980708464973471090386869
--169, .194380309137718484243194224977
--168, .212556561670022125259591660570
--167, .230868191125563111748145613474
--166, .249328002843180691624039937805
--165, .267949192431122706472553658494
--164, .286745385758807940042758062732
--163, .305730681458660355734541958996
--162, .324919696232906326155871412215
--161, .344327613289665241957265839384
--160, .363970234266202361351047882776
--159, .383864035035415795971448408105
--158, .404026225835156811322348143579
--157, .424474816209604742023532062943
--156, .445228685308536163922367030644
--155, .466307658154998592830006194801
--154, .487732588565861422773111126616
--153, .509525449494428810513706911251
--152, .531709431661478748075915871842
--151, .554309051452768917820763092337
--150, .577350269189625764509148780503
--149, .600860619027560414878664426354
--148, .624869351909327509780510827950
--147, .649407593197510576982062911310
--146, .674508516842426632142460861996
--145, .700207538209709779458522719443
--144, .726542528005360885895466757481
--143, .753554050102794157073956448623
--142, .781285626506717397062949971961
--141, .809784033195007148036991374238
--140, .839099631177280011763127298122
--139, .869286737816226662200095638705
--138, .900404044297839945120477203883
--137, .932515086137661705612185627428
--136, .965688774807074045958027299699
--135, 1.
--134, 1.03553031379056950695883255125
--133, 1.07236871002468253294602774807
--132, 1.11061251482919287014348196417
--131, 1.15036840722100955587633102557
--130, 1.19175359259420995870530807186
--129, 1.23489715653505139855617469537
--128, 1.27994163219307878031102984757
--127, 1.32704482162041003715947257408
--126, 1.37638192047117353820720958191
--125, 1.42814800674211450216061848500
--124, 1.48256096851274025478715714915
--123, 1.53986496381458290482679697261
--122, 1.60033452904105035532673308117
--121, 1.66427948235051791103049617004
--120, 1.73205080756887729352744634151
--119, 1.80404775527142393738178474825
--118, 1.88072646534633201236083759582
--117, 1.96261050550515058230464042622
--116, 2.05030384157929621689901107053
--115, 2.14450692050955861635626079106
--114, 2.24603677390421605416332143840
--113, 2.35585236582375283393958666236
--112, 2.47508685341629582524001324606
--111, 2.60508906469380153625841233646
--110, 2.74747741945462227876166402648
--109, 2.90421087767582280257932553456
--108, 3.07768353717525340257029057602
--107, 3.27085261848414086530885625734
--106, 3.48741444384090865069622422508
--105, 3.73205080756887729352744634156
--104, 4.01078093353584471634571512944
--103, 4.33147587428415554554616775463
--102, 4.70463010947845423358623453738
--101, 5.14455401597031013472322071724
--100, 5.67128181961770953099441843983
--99, 6.31375151467504309897946424494
--98, 7.11536972238420874823056614360
--97, 8.14434642797459402382566139528
--96, 9.51436445422258492968397145491
--95, 11.4300523027613430672108555485
--94, 14.3006662567119279101280533475
--93, 19.0811366877282110634067487325
--92, 28.6362532829156035507565093210
--91, 57.2899616307594246872781475211
--89, -57.2899616307594246872781475211
--88, -28.6362532829156035507565093210
--87, -19.0811366877282110634067487325
--86, -14.3006662567119279101280533475
--85, -11.4300523027613430672108555485
--84, -9.51436445422258492968397145491
--83, -8.14434642797459402382566139528
--82, -7.11536972238420874823056614360
--81, -6.31375151467504309897946424494
--80, -5.67128181961770953099441843983
--79, -5.14455401597031013472322071724
--78, -4.70463010947845423358623453738
--77, -4.33147587428415554554616775463
--76, -4.01078093353584471634571512944
--75, -3.73205080756887729352744634156
--74, -3.48741444384090865069622422508
--73, -3.27085261848414086530885625734
--72, -3.07768353717525340257029057602
--71, -2.90421087767582280257932553456
--70, -2.74747741945462227876166402648
--69, -2.60508906469380153625841233646
--68, -2.47508685341629582524001324606
--67, -2.35585236582375283393958666236
--66, -2.24603677390421605416332143840
--65, -2.14450692050955861635626079106
--64, -2.05030384157929621689901107053
--63, -1.96261050550515058230464042622
--62, -1.88072646534633201236083759582
--61, -1.80404775527142393738178474825
--60, -1.73205080756887729352744634151
--59, -1.66427948235051791103049617004
--58, -1.60033452904105035532673308117
--57, -1.53986496381458290482679697261
--56, -1.48256096851274025478715714915
--55, -1.42814800674211450216061848500
--54, -1.37638192047117353820720958191
--53, -1.32704482162041003715947257408
--52, -1.27994163219307878031102984757
--51, -1.23489715653505139855617469537
--50, -1.19175359259420995870530807186
--49, -1.15036840722100955587633102557
--48, -1.11061251482919287014348196417
--47, -1.07236871002468253294602774807
--46, -1.03553031379056950695883255125
--45, -1.
--44, -.965688774807074045958027299699
--43, -.932515086137661705612185627428
--42, -.900404044297839945120477203883
--41, -.869286737816226662200095638705
--40, -.839099631177280011763127298122
--39, -.809784033195007148036991374238
--38, -.781285626506717397062949971961
--37, -.753554050102794157073956448623
--36, -.726542528005360885895466757481
--35, -.700207538209709779458522719443
--34, -.674508516842426632142460861996
--33, -.649407593197510576982062911310
--32, -.624869351909327509780510827950
--31, -.600860619027560414878664426354
--30, -.577350269189625764509148780503
--29, -.554309051452768917820763092337
--28, -.531709431661478748075915871842
--27, -.509525449494428810513706911251
--26, -.487732588565861422773111126616
--25, -.466307658154998592830006194801
--24, -.445228685308536163922367030644
--23, -.424474816209604742023532062943
--22, -.404026225835156811322348143579
--21, -.383864035035415795971448408105
--20, -.363970234266202361351047882776
--19, -.344327613289665241957265839384
--18, -.324919696232906326155871412215
--17, -.305730681458660355734541958996
--16, -.286745385758807940042758062732
--15, -.267949192431122706472553658494
--14, -.249328002843180691624039937805
--13, -.230868191125563111748145613474
--12, -.212556561670022125259591660570
--11, -.194380309137718484243194224977
--10, -.176326980708464973471090386869
--9, -.158384440324536293838883092694
--8, -.140540834702391446838117693433
--7, -.122784560902904591134231136053
--6, -.105104235265676462511502380140
--5, -0.874886635259240052220186694350e-1
--4, -0.699268119435104136669210603231e-1
--3, -0.524077792830412040388058244741e-1
--2, -0.349207694917477305004026257737e-1
--1, -0.174550649282175857651288952197e-1
-0, 0.
-1, 0.174550649282175857651288952197e-1
-2, 0.349207694917477305004026257737e-1
-3, 0.524077792830412040388058244741e-1
-4, 0.699268119435104136669210603231e-1
-5, 0.874886635259240052220186694350e-1
-6, .105104235265676462511502380140
-7, .122784560902904591134231136053
-8, .140540834702391446838117693433
-9, .158384440324536293838883092694
-10, .176326980708464973471090386869
-11, .194380309137718484243194224977
-12, .212556561670022125259591660570
-13, .230868191125563111748145613474
-14, .249328002843180691624039937805
-15, .267949192431122706472553658494
-16, .286745385758807940042758062732
-17, .305730681458660355734541958996
-18, .324919696232906326155871412215
-19, .344327613289665241957265839384
-20, .363970234266202361351047882776
-21, .383864035035415795971448408105
-22, .404026225835156811322348143579
-23, .424474816209604742023532062943
-24, .445228685308536163922367030644
-25, .466307658154998592830006194801
-26, .487732588565861422773111126616
-27, .509525449494428810513706911251
-28, .531709431661478748075915871842
-29, .554309051452768917820763092337
-30, .577350269189625764509148780503
-31, .600860619027560414878664426354
-32, .624869351909327509780510827950
-33, .649407593197510576982062911310
-34, .674508516842426632142460861996
-35, .700207538209709779458522719443
-36, .726542528005360885895466757481
-37, .753554050102794157073956448623
-38, .781285626506717397062949971961
-39, .809784033195007148036991374238
-40, .839099631177280011763127298122
-41, .869286737816226662200095638705
-42, .900404044297839945120477203883
-43, .932515086137661705612185627428
-44, .965688774807074045958027299699
-45, 1.
-46, 1.03553031379056950695883255125
-47, 1.07236871002468253294602774807
-48, 1.11061251482919287014348196417
-49, 1.15036840722100955587633102557
-50, 1.19175359259420995870530807186
-51, 1.23489715653505139855617469537
-52, 1.27994163219307878031102984757
-53, 1.32704482162041003715947257408
-54, 1.37638192047117353820720958191
-55, 1.42814800674211450216061848500
-56, 1.48256096851274025478715714915
-57, 1.53986496381458290482679697261
-58, 1.60033452904105035532673308117
-59, 1.66427948235051791103049617004
-60, 1.73205080756887729352744634151
-61, 1.80404775527142393738178474825
-62, 1.88072646534633201236083759582
-63, 1.96261050550515058230464042622
-64, 2.05030384157929621689901107053
-65, 2.14450692050955861635626079106
-66, 2.24603677390421605416332143840
-67, 2.35585236582375283393958666236
-68, 2.47508685341629582524001324606
-69, 2.60508906469380153625841233646
-70, 2.74747741945462227876166402648
-71, 2.90421087767582280257932553456
-72, 3.07768353717525340257029057602
-73, 3.27085261848414086530885625734
-74, 3.48741444384090865069622422508
-75, 3.73205080756887729352744634156
-76, 4.01078093353584471634571512944
-77, 4.33147587428415554554616775463
-78, 4.70463010947845423358623453738
-79, 5.14455401597031013472322071724
-80, 5.67128181961770953099441843983
-81, 6.31375151467504309897946424494
-82, 7.11536972238420874823056614360
-83, 8.14434642797459402382566139528
-84, 9.51436445422258492968397145491
-85, 11.4300523027613430672108555485
-86, 14.3006662567119279101280533475
-87, 19.0811366877282110634067487325
-88, 28.6362532829156035507565093210
-89, 57.2899616307594246872781475211
-91, -57.2899616307594246872781475211
-92, -28.6362532829156035507565093210
-93, -19.0811366877282110634067487325
-94, -14.3006662567119279101280533475
-95, -11.4300523027613430672108555485
-96, -9.51436445422258492968397145491
-97, -8.14434642797459402382566139528
-98, -7.11536972238420874823056614360
-99, -6.31375151467504309897946424494
-100, -5.67128181961770953099441843983
-101, -5.14455401597031013472322071724
-102, -4.70463010947845423358623453738
-103, -4.33147587428415554554616775463
-104, -4.01078093353584471634571512944
-105, -3.73205080756887729352744634156
-106, -3.48741444384090865069622422508
-107, -3.27085261848414086530885625734
-108, -3.07768353717525340257029057602
-109, -2.90421087767582280257932553456
-110, -2.74747741945462227876166402648
-111, -2.60508906469380153625841233646
-112, -2.47508685341629582524001324606
-113, -2.35585236582375283393958666236
-114, -2.24603677390421605416332143840
-115, -2.14450692050955861635626079106
-116, -2.05030384157929621689901107053
-117, -1.96261050550515058230464042622
-118, -1.88072646534633201236083759582
-119, -1.80404775527142393738178474825
-120, -1.73205080756887729352744634151
-121, -1.66427948235051791103049617004
-122, -1.60033452904105035532673308117
-123, -1.53986496381458290482679697261
-124, -1.48256096851274025478715714915
-125, -1.42814800674211450216061848500
-126, -1.37638192047117353820720958191
-127, -1.32704482162041003715947257408
-128, -1.27994163219307878031102984757
-129, -1.23489715653505139855617469537
-130, -1.19175359259420995870530807186
-131, -1.15036840722100955587633102557
-132, -1.11061251482919287014348196417
-133, -1.07236871002468253294602774807
-134, -1.03553031379056950695883255125
-135, -1.
-136, -.965688774807074045958027299699
-137, -.932515086137661705612185627428
-138, -.900404044297839945120477203883
-139, -.869286737816226662200095638705
-140, -.839099631177280011763127298122
-141, -.809784033195007148036991374238
-142, -.781285626506717397062949971961
-143, -.753554050102794157073956448623
-144, -.726542528005360885895466757481
-145, -.700207538209709779458522719443
-146, -.674508516842426632142460861996
-147, -.649407593197510576982062911310
-148, -.624869351909327509780510827950
-149, -.600860619027560414878664426354
-150, -.577350269189625764509148780503
-151, -.554309051452768917820763092337
-152, -.531709431661478748075915871842
-153, -.509525449494428810513706911251
-154, -.487732588565861422773111126616
-155, -.466307658154998592830006194801
-156, -.445228685308536163922367030644
-157, -.424474816209604742023532062943
-158, -.404026225835156811322348143579
-159, -.383864035035415795971448408105
-160, -.363970234266202361351047882776
-161, -.344327613289665241957265839384
-162, -.324919696232906326155871412215
-163, -.305730681458660355734541958996
-164, -.286745385758807940042758062732
-165, -.267949192431122706472553658494
-166, -.249328002843180691624039937805
-167, -.230868191125563111748145613474
-168, -.212556561670022125259591660570
-169, -.194380309137718484243194224977
-170, -.176326980708464973471090386869
-171, -.158384440324536293838883092694
-172, -.140540834702391446838117693433
-173, -.122784560902904591134231136053
-174, -.105104235265676462511502380140
-175, -0.874886635259240052220186694350e-1
-176, -0.699268119435104136669210603231e-1
-177, -0.524077792830412040388058244741e-1
-178, -0.349207694917477305004026257737e-1
-179, -0.174550649282175857651288952197e-1
-180, 0.
+e=[
+0.
+0.174550649282175857651288952197e-1
+0.349207694917477305004026257737e-1
+0.524077792830412040388058244741e-1
+0.699268119435104136669210603231e-1
+0.874886635259240052220186694350e-1
+.105104235265676462511502380140
+.122784560902904591134231136053
+.140540834702391446838117693433
+.158384440324536293838883092694
+.176326980708464973471090386869
+.194380309137718484243194224977
+.212556561670022125259591660570
+.230868191125563111748145613474
+.249328002843180691624039937805
+.267949192431122706472553658494
+.286745385758807940042758062732
+.305730681458660355734541958996
+.324919696232906326155871412215
+.344327613289665241957265839384
+.363970234266202361351047882776
+.383864035035415795971448408105
+.404026225835156811322348143579
+.424474816209604742023532062943
+.445228685308536163922367030644
+.466307658154998592830006194801
+.487732588565861422773111126616
+.509525449494428810513706911251
+.531709431661478748075915871842
+.554309051452768917820763092337
+.577350269189625764509148780503
+.600860619027560414878664426354
+.624869351909327509780510827950
+.649407593197510576982062911310
+.674508516842426632142460861996
+.700207538209709779458522719443
+.726542528005360885895466757481
+.753554050102794157073956448623
+.781285626506717397062949971961
+.809784033195007148036991374238
+.839099631177280011763127298122
+.869286737816226662200095638705
+.900404044297839945120477203883
+.932515086137661705612185627428
+.965688774807074045958027299699
+1.
+1.03553031379056950695883255125
+1.07236871002468253294602774807
+1.11061251482919287014348196417
+1.15036840722100955587633102557
+1.19175359259420995870530807186
+1.23489715653505139855617469537
+1.27994163219307878031102984757
+1.32704482162041003715947257408
+1.37638192047117353820720958191
+1.42814800674211450216061848500
+1.48256096851274025478715714915
+1.53986496381458290482679697261
+1.60033452904105035532673308117
+1.66427948235051791103049617004
+1.73205080756887729352744634151
+1.80404775527142393738178474825
+1.88072646534633201236083759582
+1.96261050550515058230464042622
+2.05030384157929621689901107053
+2.14450692050955861635626079106
+2.24603677390421605416332143840
+2.35585236582375283393958666236
+2.47508685341629582524001324606
+2.60508906469380153625841233646
+2.74747741945462227876166402648
+2.90421087767582280257932553456
+3.07768353717525340257029057602
+3.27085261848414086530885625734
+3.48741444384090865069622422508
+3.73205080756887729352744634156
+4.01078093353584471634571512944
+4.33147587428415554554616775463
+4.70463010947845423358623453738
+5.14455401597031013472322071724
+5.67128181961770953099441843983
+6.31375151467504309897946424494
+7.11536972238420874823056614360
+8.14434642797459402382566139528
+9.51436445422258492968397145491
+11.4300523027613430672108555485
+14.3006662567119279101280533475
+19.0811366877282110634067487325
+28.6362532829156035507565093210
+57.2899616307594246872781475211
+-57.2899616307594246872781475211
+-28.6362532829156035507565093210
+-19.0811366877282110634067487325
+-14.3006662567119279101280533475
+-11.4300523027613430672108555485
+-9.51436445422258492968397145491
+-8.14434642797459402382566139528
+-7.11536972238420874823056614360
+-6.31375151467504309897946424494
+-5.67128181961770953099441843983
+-5.14455401597031013472322071724
+-4.70463010947845423358623453738
+-4.33147587428415554554616775463
+-4.01078093353584471634571512944
+-3.73205080756887729352744634156
+-3.48741444384090865069622422508
+-3.27085261848414086530885625734
+-3.07768353717525340257029057602
+-2.90421087767582280257932553456
+-2.74747741945462227876166402648
+-2.60508906469380153625841233646
+-2.47508685341629582524001324606
+-2.35585236582375283393958666236
+-2.24603677390421605416332143840
+-2.14450692050955861635626079106
+-2.05030384157929621689901107053
+-1.96261050550515058230464042622
+-1.88072646534633201236083759582
+-1.80404775527142393738178474825
+-1.73205080756887729352744634151
+-1.66427948235051791103049617004
+-1.60033452904105035532673308117
+-1.53986496381458290482679697261
+-1.48256096851274025478715714915
+-1.42814800674211450216061848500
+-1.37638192047117353820720958191
+-1.32704482162041003715947257408
+-1.27994163219307878031102984757
+-1.23489715653505139855617469537
+-1.19175359259420995870530807186
+-1.15036840722100955587633102557
+-1.11061251482919287014348196417
+-1.07236871002468253294602774807
+-1.03553031379056950695883255125
+-1.
+-.965688774807074045958027299699
+-.932515086137661705612185627428
+-.900404044297839945120477203883
+-.869286737816226662200095638705
+-.839099631177280011763127298122
+-.809784033195007148036991374238
+-.781285626506717397062949971961
+-.753554050102794157073956448623
+-.726542528005360885895466757481
+-.700207538209709779458522719443
+-.674508516842426632142460861996
+-.649407593197510576982062911310
+-.624869351909327509780510827950
+-.600860619027560414878664426354
+-.577350269189625764509148780503
+-.554309051452768917820763092337
+-.531709431661478748075915871842
+-.509525449494428810513706911251
+-.487732588565861422773111126616
+-.466307658154998592830006194801
+-.445228685308536163922367030644
+-.424474816209604742023532062943
+-.404026225835156811322348143579
+-.383864035035415795971448408105
+-.363970234266202361351047882776
+-.344327613289665241957265839384
+-.324919696232906326155871412215
+-.305730681458660355734541958996
+-.286745385758807940042758062732
+-.267949192431122706472553658494
+-.249328002843180691624039937805
+-.230868191125563111748145613474
+-.212556561670022125259591660570
+-.194380309137718484243194224977
+-.176326980708464973471090386869
+-.158384440324536293838883092694
+-.140540834702391446838117693433
+-.122784560902904591134231136053
+-.105104235265676462511502380140
+-0.874886635259240052220186694350e-1
+-0.699268119435104136669210603231e-1
+-0.524077792830412040388058244741e-1
+-0.349207694917477305004026257737e-1
+-0.174550649282175857651288952197e-1
+0.
+0.174550649282175857651288952197e-1
+0.349207694917477305004026257737e-1
+0.524077792830412040388058244741e-1
+0.699268119435104136669210603231e-1
+0.874886635259240052220186694350e-1
+.105104235265676462511502380140
+.122784560902904591134231136053
+.140540834702391446838117693433
+.158384440324536293838883092694
+.176326980708464973471090386869
+.194380309137718484243194224977
+.212556561670022125259591660570
+.230868191125563111748145613474
+.249328002843180691624039937805
+.267949192431122706472553658494
+.286745385758807940042758062732
+.305730681458660355734541958996
+.324919696232906326155871412215
+.344327613289665241957265839384
+.363970234266202361351047882776
+.383864035035415795971448408105
+.404026225835156811322348143579
+.424474816209604742023532062943
+.445228685308536163922367030644
+.466307658154998592830006194801
+.487732588565861422773111126616
+.509525449494428810513706911251
+.531709431661478748075915871842
+.554309051452768917820763092337
+.577350269189625764509148780503
+.600860619027560414878664426354
+.624869351909327509780510827950
+.649407593197510576982062911310
+.674508516842426632142460861996
+.700207538209709779458522719443
+.726542528005360885895466757481
+.753554050102794157073956448623
+.781285626506717397062949971961
+.809784033195007148036991374238
+.839099631177280011763127298122
+.869286737816226662200095638705
+.900404044297839945120477203883
+.932515086137661705612185627428
+.965688774807074045958027299699
+1.
+1.03553031379056950695883255125
+1.07236871002468253294602774807
+1.11061251482919287014348196417
+1.15036840722100955587633102557
+1.19175359259420995870530807186
+1.23489715653505139855617469537
+1.27994163219307878031102984757
+1.32704482162041003715947257408
+1.37638192047117353820720958191
+1.42814800674211450216061848500
+1.48256096851274025478715714915
+1.53986496381458290482679697261
+1.60033452904105035532673308117
+1.66427948235051791103049617004
+1.73205080756887729352744634151
+1.80404775527142393738178474825
+1.88072646534633201236083759582
+1.96261050550515058230464042622
+2.05030384157929621689901107053
+2.14450692050955861635626079106
+2.24603677390421605416332143840
+2.35585236582375283393958666236
+2.47508685341629582524001324606
+2.60508906469380153625841233646
+2.74747741945462227876166402648
+2.90421087767582280257932553456
+3.07768353717525340257029057602
+3.27085261848414086530885625734
+3.48741444384090865069622422508
+3.73205080756887729352744634156
+4.01078093353584471634571512944
+4.33147587428415554554616775463
+4.70463010947845423358623453738
+5.14455401597031013472322071724
+5.67128181961770953099441843983
+6.31375151467504309897946424494
+7.11536972238420874823056614360
+8.14434642797459402382566139528
+9.51436445422258492968397145491
+11.4300523027613430672108555485
+14.3006662567119279101280533475
+19.0811366877282110634067487325
+28.6362532829156035507565093210
+57.2899616307594246872781475211
+-57.2899616307594246872781475211
+-28.6362532829156035507565093210
+-19.0811366877282110634067487325
+-14.3006662567119279101280533475
+-11.4300523027613430672108555485
+-9.51436445422258492968397145491
+-8.14434642797459402382566139528
+-7.11536972238420874823056614360
+-6.31375151467504309897946424494
+-5.67128181961770953099441843983
+-5.14455401597031013472322071724
+-4.70463010947845423358623453738
+-4.33147587428415554554616775463
+-4.01078093353584471634571512944
+-3.73205080756887729352744634156
+-3.48741444384090865069622422508
+-3.27085261848414086530885625734
+-3.07768353717525340257029057602
+-2.90421087767582280257932553456
+-2.74747741945462227876166402648
+-2.60508906469380153625841233646
+-2.47508685341629582524001324606
+-2.35585236582375283393958666236
+-2.24603677390421605416332143840
+-2.14450692050955861635626079106
+-2.05030384157929621689901107053
+-1.96261050550515058230464042622
+-1.88072646534633201236083759582
+-1.80404775527142393738178474825
+-1.73205080756887729352744634151
+-1.66427948235051791103049617004
+-1.60033452904105035532673308117
+-1.53986496381458290482679697261
+-1.48256096851274025478715714915
+-1.42814800674211450216061848500
+-1.37638192047117353820720958191
+-1.32704482162041003715947257408
+-1.27994163219307878031102984757
+-1.23489715653505139855617469537
+-1.19175359259420995870530807186
+-1.15036840722100955587633102557
+-1.11061251482919287014348196417
+-1.07236871002468253294602774807
+-1.03553031379056950695883255125
+-1.
+-.965688774807074045958027299699
+-.932515086137661705612185627428
+-.900404044297839945120477203883
+-.869286737816226662200095638705
+-.839099631177280011763127298122
+-.809784033195007148036991374238
+-.781285626506717397062949971961
+-.753554050102794157073956448623
+-.726542528005360885895466757481
+-.700207538209709779458522719443
+-.674508516842426632142460861996
+-.649407593197510576982062911310
+-.624869351909327509780510827950
+-.600860619027560414878664426354
+-.577350269189625764509148780503
+-.554309051452768917820763092337
+-.531709431661478748075915871842
+-.509525449494428810513706911251
+-.487732588565861422773111126616
+-.466307658154998592830006194801
+-.445228685308536163922367030644
+-.424474816209604742023532062943
+-.404026225835156811322348143579
+-.383864035035415795971448408105
+-.363970234266202361351047882776
+-.344327613289665241957265839384
+-.324919696232906326155871412215
+-.305730681458660355734541958996
+-.286745385758807940042758062732
+-.267949192431122706472553658494
+-.249328002843180691624039937805
+-.230868191125563111748145613474
+-.212556561670022125259591660570
+-.194380309137718484243194224977
+-.176326980708464973471090386869
+-.158384440324536293838883092694
+-.140540834702391446838117693433
+-.122784560902904591134231136053
+-.105104235265676462511502380140
+-0.874886635259240052220186694350e-1
+-0.699268119435104136669210603231e-1
+-0.524077792830412040388058244741e-1
+-0.349207694917477305004026257737e-1
+-0.174550649282175857651288952197e-1
+0.
 ];
+c = tand(x);
+assert_close ( c , e , 40 * %eps );
+
+// Turn a lot around the circle
+x1 = x + 2^6*360; 
+c = tand(x1);
+assert_close ( c , e , 40 * %eps );
+// Turn a lot around the circle, the other side
+x2 = x - 2^6*360; 
+c = tand(x2);
+assert_close ( c , e , 40 * %eps );
+
+assert_equal ( tand(0) , 0 );
+assert_equal ( tand(360) , 0 );
+assert_equal ( tand(-360) , 0 );
+
+assert_equal ( tand(180) , 0 );
+assert_equal ( tand(-180) , 0 );
+
+assert_close ( tand(30) , 1/sqrt(3) , %eps );
+assert_close ( tand(45) , 1         , 2 * %eps );
+assert_close ( tand(60) , sqrt(3)   , 2*%eps );
+
+assert_equal ( isnan(tand(90))  , %t );
+assert_equal ( isnan(tand(-90)) , %t );
+assert_equal ( isnan(tand(270)) , %t );
+assert_equal ( isnan(tand(-270)) , %t );
 
-x=ref(:,1);e=max(abs((ref(:,2)-tand(x))));
-if e>40*eps then pause,end
-x=ref(:,1)+2^6*360; e=max(abs((ref(:,2)-tand(x))));
-if e>40*eps then pause,end
+assert_equal ( isnan(tand(-%inf)) , %t );
+assert_equal ( isnan(tand(%inf))  , %t );
+assert_equal ( isnan(tand(%nan))  , %t );
 
-x=ref(:,1)+2^10*360; e=max(abs((ref(:,2)-tand(x))));
-if e>40*eps then pause,end
+assert_equal ( tand([])  , [] );
 
-if tand(0)<>0 then pause,end
-if tand(360)<>0 then pause,end
-if tand(-360)<>0 then pause,end
-if tand(90)<>%inf then pause,end
-if tand(-90)<>-%inf then pause,end
-if tand(180)<>0 then pause,end
-if tand(-180)<>0 then pause,end
-if tand(270)<>%inf then pause,end
-if tand(-270)<>-%inf then pause,end
-if or(abs(tand([30 45 60])-[1/sqrt(3) 1 sqrt(3) ])>2*%eps) then pause,end
+ieee(0)
+assert_equal ( tand(0) , 0 );
+assert_close ( tand(30) , 1/sqrt(3) , %eps );
+assert_close ( tand(45) , 1         , 2 * %eps );
+assert_close ( tand(60) , sqrt(3)   , 2*%eps );
 
-if ~isnan(tand(-Inf)) then pause,end
-if ~isnan(tand(Inf)) then pause,end
-if ~isnan(tand(NaN)) then pause,end
 
-if tand([])<>[] then pause,end
diff --git a/scilab/modules/fftw/Makefile.in b/scilab/modules/fftw/Makefile.in
index 8a10f5b..232bda6 100644
--- a/scilab/modules/fftw/Makefile.in
+++ b/scilab/modules/fftw/Makefile.in
@@ -261,6 +261,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/fileio/Makefile.in b/scilab/modules/fileio/Makefile.in
index 350fb23..22ccc9f 100644
--- a/scilab/modules/fileio/Makefile.in
+++ b/scilab/modules/fileio/Makefile.in
@@ -291,6 +291,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/functions/Makefile.in b/scilab/modules/functions/Makefile.in
index 7291e50..c2f90e6 100644
--- a/scilab/modules/functions/Makefile.in
+++ b/scilab/modules/functions/Makefile.in
@@ -253,6 +253,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/genetic_algorithms/Makefile.in b/scilab/modules/genetic_algorithms/Makefile.in
index b260fb2..df93152 100644
--- a/scilab/modules/genetic_algorithms/Makefile.in
+++ b/scilab/modules/genetic_algorithms/Makefile.in
@@ -204,6 +204,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/graphic_export/Makefile.in b/scilab/modules/graphic_export/Makefile.in
index f34ed68..14798e2 100644
--- a/scilab/modules/graphic_export/Makefile.in
+++ b/scilab/modules/graphic_export/Makefile.in
@@ -278,6 +278,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/graphics/Makefile.in b/scilab/modules/graphics/Makefile.in
index 2474334..ca2e8ec 100644
--- a/scilab/modules/graphics/Makefile.in
+++ b/scilab/modules/graphics/Makefile.in
@@ -613,6 +613,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/gui/Makefile.in b/scilab/modules/gui/Makefile.in
index ab72ed9..841338b 100644
--- a/scilab/modules/gui/Makefile.in
+++ b/scilab/modules/gui/Makefile.in
@@ -366,6 +366,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/hdf5/Makefile.in b/scilab/modules/hdf5/Makefile.in
index babbf34..6e4cfc0 100644
--- a/scilab/modules/hdf5/Makefile.in
+++ b/scilab/modules/hdf5/Makefile.in
@@ -292,6 +292,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/helptools/Makefile.in b/scilab/modules/helptools/Makefile.in
index dfda34d..2e80b76 100644
--- a/scilab/modules/helptools/Makefile.in
+++ b/scilab/modules/helptools/Makefile.in
@@ -266,6 +266,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/history_manager/Makefile.in b/scilab/modules/history_manager/Makefile.in
index 97856f4..b581876 100644
--- a/scilab/modules/history_manager/Makefile.in
+++ b/scilab/modules/history_manager/Makefile.in
@@ -289,6 +289,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/integer/Makefile.in b/scilab/modules/integer/Makefile.in
index 21e59bd..d05cb05 100644
--- a/scilab/modules/integer/Makefile.in
+++ b/scilab/modules/integer/Makefile.in
@@ -277,6 +277,7 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
diff --git a/scilab/modules/interpolation/Makefile.in b/scilab/modules/interpolation/Makefile.in
index b2113fb..4f8aadf 100644
--- a/scilab/modules/interpolation/Makefile.in
+++ b/scilab/modules/interpolation/Makefile.in
@@ -259,6 +259,7 @@ LD = @LD@