--- rpl/src/interface_gnuplot.c	2010/02/10 10:14:25	1.3
+++ rpl/src/interface_gnuplot.c	2017/01/18 15:44:23	1.60
@@ -1,7 +1,7 @@
 /*
 ================================================================================
-  RPL/2 (R) version 4.0.11
-  Copyright (C) 1989-2010 Dr. BERTRAND Joël
+  RPL/2 (R) version 4.1.26
+  Copyright (C) 1989-2017 Dr. BERTRAND Joël
 
   This file is part of RPL/2.
 
@@ -20,13 +20,8 @@
 */
 
 
-#include "rpl.conv.h"
-#include "gnuplot.conv.h"
-
-#ifdef DEBUG
-#	define fprintf(flux, ...) ({ printf(__VA_ARGS__); \
-		fprintf(flux, __VA_ARGS__); })
-#endif
+#include "rpl-conv.h"
+#include "gnuplot-conv.h"
 
 
 /*
@@ -41,6 +36,24 @@
 ================================================================================
 */
 
+#ifdef OS2
+static unsigned char *
+ajout_shell(unsigned char *commande)
+{
+	unsigned char		*tampon;
+
+	if ((tampon = malloc((strlen(BOURNE_SHELL) + 5 + strlen(commande) + 2) *
+			sizeof(unsigned char))) == NULL)
+	{
+		return(NULL);
+	}
+
+	sprintf(tampon, "%s -c \"%s\"", BOURNE_SHELL, commande);
+	free(commande);
+	return(tampon);
+}
+#endif
+
 void
 appel_gnuplot(struct_processus *s_etat_processus, unsigned char persistance)
 {
@@ -221,6 +234,8 @@ appel_gnuplot(struct_processus *s_etat_p
 							(*l_base_liste).type);
 					(*(*s_etat_processus).fichiers_graphiques).dimensions =
 							(*l_base_liste).dimensions;
+					(*(*s_etat_processus).fichiers_graphiques).systeme_axes =
+							(*l_base_liste).systeme_axes;
 				}
 				else
 				{
@@ -245,8 +260,10 @@ appel_gnuplot(struct_processus *s_etat_p
 					(*l_fichier_courant).legende = NULL;
 					(*l_fichier_courant).presence_axes = d_faux;
 					strcpy((*l_fichier_courant).type, (*l_base_liste).type);
-					(*(*s_etat_processus).fichiers_graphiques).dimensions =
+					(*l_fichier_courant).dimensions =
 							(*l_base_liste).dimensions;
+					(*l_fichier_courant).systeme_axes =
+							(*l_base_liste).systeme_axes;
 				}
 			}
 
@@ -267,16 +284,35 @@ appel_gnuplot(struct_processus *s_etat_p
 		if ((*s_etat_processus).entree_standard == NULL)
 		{
 #ifdef FORCE_GNUPLOT_PATH
-			if ((commande_gnuplot = malloc((strlen(d_exec_path) + 6 +
-					strlen(ds_gnuplot_commande)) * sizeof(unsigned char)))
-					== NULL)
+			if ((*s_etat_processus).rpl_home == NULL)
 			{
-				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
-				return;
+				if ((commande_gnuplot = malloc((strlen(d_exec_path) + 6 +
+						strlen(ds_gnuplot_commande)) * sizeof(unsigned char)))
+						== NULL)
+				{
+					(*s_etat_processus).erreur_systeme =
+							d_es_allocation_memoire;
+					return;
+				}
+
+				sprintf(commande_gnuplot, "%s/bin/%s", d_exec_path,
+						ds_gnuplot_commande);
 			}
+			else
+			{
+				if ((commande_gnuplot = malloc((strlen(
+						(*s_etat_processus).rpl_home) + 6 +
+						strlen(ds_gnuplot_commande)) * sizeof(unsigned char)))
+						== NULL)
+				{
+					(*s_etat_processus).erreur_systeme =
+							d_es_allocation_memoire;
+					return;
+				}
 
-			sprintf(commande_gnuplot, "%s/bin/%s", d_exec_path,
-					ds_gnuplot_commande);
+				sprintf(commande_gnuplot, "%s/bin/%s",
+						(*s_etat_processus).rpl_home, ds_gnuplot_commande);
+			}
 #else
 			if ((commande_gnuplot = malloc((1 +
 					strlen(ds_gnuplot_commande)) * sizeof(unsigned char)))
@@ -289,6 +325,14 @@ appel_gnuplot(struct_processus *s_etat_p
 			sprintf(commande_gnuplot, "%s", ds_gnuplot_commande);
 #endif
 
+#ifdef OS2
+			if ((commande_gnuplot = ajout_shell(commande_gnuplot)) == NULL)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+				return;
+			}
+#endif
+
 			if (((*s_etat_processus).entree_standard =
 					popen(commande_gnuplot, "w")) == NULL)
 			{
@@ -321,16 +365,33 @@ appel_gnuplot(struct_processus *s_etat_p
 		entree_standard = (*s_etat_processus).entree_standard;
 
 #if FORCE_GNUPLOT_PATH
-		if ((commande_gnuplot = malloc((strlen(d_exec_path) + 6 +
-				strlen(ds_gnuplot_commande_persistante)) *
-				sizeof(unsigned char))) == NULL)
+		if ((*s_etat_processus).rpl_home == NULL)
 		{
-			(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
-			return;
+			if ((commande_gnuplot = malloc((strlen(d_exec_path) + 6 +
+					strlen(ds_gnuplot_commande_persistante)) *
+					sizeof(unsigned char))) == NULL)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+				return;
+			}
+
+			sprintf(commande_gnuplot, "%s/bin/%s", d_exec_path,
+					ds_gnuplot_commande_persistante);
 		}
+		else
+		{
+			if ((commande_gnuplot = malloc((strlen(
+					(*s_etat_processus).rpl_home) + 6 +
+					strlen(ds_gnuplot_commande_persistante)) *
+					sizeof(unsigned char))) == NULL)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+				return;
+			}
 
-		sprintf(commande_gnuplot, "%s/bin/%s", d_exec_path,
-				ds_gnuplot_commande_persistante);
+			sprintf(commande_gnuplot, "%s/bin/%s", (*s_etat_processus).rpl_home,
+					ds_gnuplot_commande_persistante);
+		}
 #else
 		if ((commande_gnuplot = malloc((1 +
 				strlen(ds_gnuplot_commande_persistante)) *
@@ -343,6 +404,14 @@ appel_gnuplot(struct_processus *s_etat_p
 		sprintf(commande_gnuplot, "%s", ds_gnuplot_commande_persistante);
 #endif
 
+#ifdef OS2
+		if ((commande_gnuplot = ajout_shell(commande_gnuplot)) == NULL)
+		{
+			(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+			return;
+		}
+#endif
+
 		if (((*s_etat_processus).entree_standard =
 				popen(commande_gnuplot, "w")) == NULL)
 		{
@@ -374,16 +443,32 @@ appel_gnuplot(struct_processus *s_etat_p
 		entree_standard = (*s_etat_processus).entree_standard;
 
 #ifdef FORCE_GNUPLOT_PATH
-		if ((commande_gnuplot = malloc((strlen(d_exec_path) + 6 +
-				strlen(ds_gnuplot_commande)) * sizeof(unsigned char)))
-				== NULL)
+		if ((*s_etat_processus).rpl_home == NULL)
 		{
-			(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
-			return;
+			if ((commande_gnuplot = malloc((strlen(d_exec_path) + 6 +
+					strlen(ds_gnuplot_commande)) * sizeof(unsigned char)))
+					== NULL)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+				return;
+			}
+
+			sprintf(commande_gnuplot, "%s/bin/%s", d_exec_path,
+					ds_gnuplot_commande);
 		}
+		else
+		{
+			if ((commande_gnuplot = malloc((strlen((*s_etat_processus).rpl_home)
+					+ 6 + strlen(ds_gnuplot_commande)) * sizeof(unsigned char)))
+					== NULL)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+				return;
+			}
 
-		sprintf(commande_gnuplot, "%s/bin/%s", d_exec_path,
-				ds_gnuplot_commande);
+			sprintf(commande_gnuplot, "%s/bin/%s", (*s_etat_processus).rpl_home,
+					ds_gnuplot_commande);
+		}
 #else
 		if ((commande_gnuplot = malloc((1 +
 				strlen(ds_gnuplot_commande)) * sizeof(unsigned char)))
@@ -396,6 +481,14 @@ appel_gnuplot(struct_processus *s_etat_p
 		sprintf(commande_gnuplot, "%s", ds_gnuplot_commande);
 #endif
 
+#ifdef OS2
+		if ((commande_gnuplot = ajout_shell(commande_gnuplot)) == NULL)
+		{
+			(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+			return;
+		}
+#endif
+
 		if (((*s_etat_processus).entree_standard =
 				popen(commande_gnuplot, "w")) == NULL)
 		{
@@ -438,16 +531,32 @@ appel_gnuplot(struct_processus *s_etat_p
 		entree_standard = (*s_etat_processus).entree_standard;
 
 #ifdef FORCE_GNUPLOT_PATH
-		if ((commande_gnuplot = malloc((strlen(d_exec_path) + 6 +
-				strlen(ds_gnuplot_commande)) * sizeof(unsigned char)))
-				== NULL)
+		if ((*s_etat_processus).rpl_home == NULL)
 		{
-			(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
-			return;
+			if ((commande_gnuplot = malloc((strlen(d_exec_path) + 6 +
+					strlen(ds_gnuplot_commande)) * sizeof(unsigned char)))
+					== NULL)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+				return;
+			}
+
+			sprintf(commande_gnuplot, "%s/bin/%s", d_exec_path,
+					ds_gnuplot_commande);
 		}
+		else
+		{
+			if ((commande_gnuplot = malloc((strlen((*s_etat_processus).rpl_home)
+					+ 6 + strlen(ds_gnuplot_commande)) * sizeof(unsigned char)))
+					== NULL)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+				return;
+			}
 
-		sprintf(commande_gnuplot, "%s/bin/%s", d_exec_path,
-				ds_gnuplot_commande);
+			sprintf(commande_gnuplot, "%s/bin/%s", (*s_etat_processus).rpl_home,
+					ds_gnuplot_commande);
+		}
 #else
 		if ((commande_gnuplot = malloc((1 +
 				strlen(ds_gnuplot_commande)) * sizeof(unsigned char)))
@@ -460,6 +569,14 @@ appel_gnuplot(struct_processus *s_etat_p
 		sprintf(commande_gnuplot, "%s", ds_gnuplot_commande);
 #endif
 
+#ifdef OS2
+		if ((commande_gnuplot = ajout_shell(commande_gnuplot)) == NULL)
+		{
+			(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+			return;
+		}
+#endif
+
 		if (((*s_etat_processus).entree_standard =
 				popen(commande_gnuplot, "w")) == NULL)
 		{
@@ -1717,7 +1834,8 @@ appel_gnuplot(struct_processus *s_etat_p
 			return;
 		}
 
-		if (fprintf(fichier_impression, "\\begin{figure}[hp]\n") < 0)
+		if (tex_fprintf(s_etat_processus, fichier_impression,
+					"\\begin{figure}[hp]\n") < 0)
 		{
 			(*s_etat_processus).erreur_systeme = d_es_erreur_fichier;
 			return;
@@ -1732,18 +1850,24 @@ appel_gnuplot(struct_processus *s_etat_p
 			}
 		}
 
+		if (fclose(fichier_image) != 0)
+		{
+			(*s_etat_processus).erreur_systeme = d_es_erreur_fichier;
+			return;
+		}
 
 		if (strlen((*s_etat_processus).titre) > 0)
 		{
-			if (fprintf(fichier_impression, "\\caption{%s}\n",
-					(*s_etat_processus).titre) < 0)
+			if (tex_fprintf(s_etat_processus, fichier_impression,
+					"\\caption{%s}\n", (*s_etat_processus).titre) < 0)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_erreur_fichier;
 				return;
 			}
 		}
 
-		if (fprintf(fichier_impression, "\\end{figure}\n") < 0)
+		if (tex_fprintf(s_etat_processus, fichier_impression,
+					"\\end{figure}\n") < 0)
 		{
 			(*s_etat_processus).erreur_systeme = d_es_erreur_fichier;
 			return;