--- rpl/src/transliteration.c	2014/07/17 08:07:27	1.76
+++ rpl/src/transliteration.c	2015/04/16 19:39:10	1.82
@@ -1,7 +1,7 @@
 /*
 ================================================================================
-  RPL/2 (R) version 4.1.19
-  Copyright (C) 1989-2014 Dr. BERTRAND Joël
+  RPL/2 (R) version 4.1.21
+  Copyright (C) 1989-2015 Dr. BERTRAND Joël
 
   This file is part of RPL/2.
 
@@ -690,7 +690,7 @@ transliterated_fprintf(struct_processus
 	unsigned long		i;
 #	endif
 
-	if (valsprintf(&tampon, format, arguments) < 0)
+	if (valsprintf(s_etat_processus, &tampon, format, arguments) < 0)
 	{
 		va_end(arguments);
 
@@ -706,6 +706,7 @@ transliterated_fprintf(struct_processus
 
 	if (s_etat_processus != NULL)
 	{
+uprintf("%s->%s\n", d_locale, (*s_etat_processus).localisation);
 		if ((tampon2 = transliteration(s_etat_processus, tampon,
 				d_locale, (*s_etat_processus).localisation)) == NULL)
 		{
@@ -789,6 +790,22 @@ transliterated_fprintf(struct_processus
 
 
 int
+std_fprintf(file *flux, const char *format, ...)
+{
+	int				ios;
+
+	va_list			arguments;
+
+	va_start(arguments, format);
+	ios = vfprintf(flux, format, arguments);
+	va_end(arguments);
+
+	// Pas de parenthèses pour ne pas appeler la macro.
+	return ios;
+}
+
+
+int
 tex_fprintf(struct_processus *s_etat_processus,
 		file *flux, const char *format, ...)
 {
@@ -801,7 +818,7 @@ tex_fprintf(struct_processus *s_etat_pro
 
 	va_start(arguments, format);
 
-	if (valsprintf(&tampon, format, arguments) < 0)
+	if (valsprintf(s_etat_processus, &tampon, format, arguments) < 0)
 	{
 		va_end(arguments);
 
@@ -844,14 +861,35 @@ tex_fprintf(struct_processus *s_etat_pro
 #undef readline
 
 unsigned char *
-readline_wrapper(unsigned char *invite)
+readline_wrapper(struct_processus *s_etat_processus, unsigned char *invite)
 {
-	unsigned char		*chaine;
+	unsigned char		*rpl_chaine;
+	unsigned char		*sys_chaine;
+
+	association_etat_processus_readline(s_etat_processus);
+	sys_chaine = readline(invite);
 
-	chaine = readline(invite);
+#	ifdef OS2
 	printf("\r");
+#	endif
+
+	if (sys_chaine == NULL)
+	{
+		return(NULL);
+	}
+
+	if ((rpl_chaine = rpl_malloc(s_etat_processus, (strlen(sys_chaine) + 1) *
+			sizeof(unsigned char *))) == NULL)
+	{
+		sys_free(sys_chaine);
+		(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
+		return(NULL);
+	}
+
+	strcpy(rpl_chaine, sys_chaine);
+	sys_free(sys_chaine);
 
-	return(chaine);
+	return(rpl_chaine);
 }