More updates

Author: ddeclerck

NEWS

@@ -74,7 +74,7 @@ NEWS - user visible changes				-*- outline -*-
    to a file (see "Dependencies options" in the GnuCOBOL manual)
 
 ** New option --gentable to build EBCDIC/ASCII translation tables,
-   for use with the --febcdic-table option
+   for use with -febcdic-table
 
 * More notable changes
 

cobc/cobc.c

@@ -2751,6 +2751,12 @@ cobc_print_info (void)
 	cobc_var_print (_("native EBCDIC"),	_("no"), 0);
 #endif
 
+#ifdef HAVE_ICONV
+	cobc_var_print (_("iconv support"),	_("yes"), 0);
+#else
+	cobc_var_print (_("iconv support"),	_("no"), 0);
+#endif
+
 	cobc_var_print (_("extended screen I/O"),	_(WITH_CURSES), 0);
 
 	snprintf (buff, sizeof(buff), "%d", WITH_VARSEQ);

cobc/gentable.c

@@ -87,8 +87,8 @@ gentable (FILE *stream, const char *code_ebcdic, const char *code_ascii, char re
 					--ascii_size;
 					++nb_irreversible;
 				} else {
-					cb_error (_("an error occurred after converting %ld characters"),
-							(ebcdic_ptr - ebcdic));
+					cb_error (_("an error occurred after converting %ld characters (%d)"),
+							(ebcdic_ptr - ebcdic), errno);
 					iconv_close (ic);
 					return -1;
 				}
@@ -128,11 +128,11 @@ gentable (FILE *stream, const char *code_ebcdic, const char *code_ascii, char re
 				}
 			}
 			cb_note (COB_WARNOPT_NONE, 0,
-				_("%d non-reversible conversions were arbitrarily made reversible, you might want to review the generated table"),
+				_("%d non-reversible conversions have been arbitrarily made reversible, you may want to check the generated table"),
 				nb_irreversible);
 		} else {
 			cb_note (COB_WARNOPT_NONE, 0,
-				_("%d non-reversible conversions were performed, you might want to review the generated table"),
+				_("%d non-reversible conversions have been performed, you may want to check the generated table"),
 				nb_irreversible);
 		}
 	}
@@ -144,7 +144,7 @@ gentable (FILE *stream, const char *code_ebcdic, const char *code_ascii, char re
 
 	fprintf (stream, "\n# %s to %s translation table\n\n", code_ascii, code_ebcdic);
 	if ((nb_irreversible == 0) || (reversible != 0)) {
-		fprintf (stream, "# This translation being symmetric, the table is built from the previous one.\n\n");
+		fprintf (stream, "# As this translation is symmetrical, the table is built from the previous one.\n\n");
 	} else {
 		output_table (stream, ebcdic);
 		fprintf (stream, "\n");

cobc/help.c

@@ -150,7 +150,8 @@ cobc_print_usage_common_options (void)
 	puts (_("  -MD                   output dependencies in .d files while compiling"));
 	puts (_("  -ext <extension>      add file extension for resolving COPY"));
 	puts (_("  -fcopybook-deps       output copybook names as dependencies"));
-	puts (_("  --gentable=<ebcdic-enc>,<ascii-enc>[+]\toutput to stdout an EBCDIC/ASCII translation table between the given encodings and exit (append + to make the translation reversible)"));
+	puts (_("  --gentable=<ebcdic-enc>,<ascii-enc>[+]\toutput a translation table between the\n"
+		"                        given encodings to stdout and exit"));
 	putchar ('\n');
 }
 

config/alternate.ttbl

@@ -39,4 +39,4 @@ F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE FF
 
 # "alternate" ASCII to (?) EBCDIC conversion table
 #
-# This translation being symmetric, the table is built from the previous one.
+# As this translation is symmetrical, the table is built from the previous one.

config/default.ttbl

@@ -76,4 +76,4 @@ E6 7E 73 74 75 76 77 78 79 7A AD A8 D4 5B D6 D7
 
 # "default" 8-bit ASCII to EBCDIC 1047 conversion table (likely MF)
 #
-# This translation being symmetric, the table is built from the previous one.
+# As this translation is symmetrical, the table is built from the previous one.

config/ebcdic500_ascii8bit.ttbl

@@ -48,4 +48,4 @@ D8 D9 DA DB DC DD DE DF E0 E1 E2 E3 E4 E5 E6 E7
 
 # 8-bit ASCII to EBCDIC 500 conversion table (GCOS7)
 #
-# This translation being symmetric, the table is built from the previous one.
+# As this translation is symmetrical, the table is built from the previous one.

config/ebcdic500_latin1.ttbl

@@ -41,4 +41,4 @@ A2 A3 A5 B7 A9 A7 B6 BC BD BE AC 7C AF A8 B4 D7
 
 # Latin-1 to EBCDIC 500 translation table
 #
-# This translation being symmetric, the table is built from the previous one.
+# As this translation is symmetrical, the table is built from the previous one.

configure.ac

@@ -1058,6 +1058,28 @@ if test "x$LTLIBINTL" != x; then
   LIBCOB_LIBS="$LIBCOB_LIBS $LTLIBINTL"
 fi
 
+# Checks for internationalization stuff
+AM_LANGINFO_CODESET
+
+AC_ARG_WITH([iconv],
+  [AS_HELP_STRING([--with-iconv],
+    [(GnuCOBOL) Use iconv for character set conversion (default: check)])],
+  [],
+  [with_iconv=check])
+
+if test "$with_iconv" = yes -o "$with_iconv" = check; then
+  AM_ICONV
+  if test "$with_iconv" = yes && test "$am_cv_func_iconv" != yes; then
+    AC_MSG_ERROR([iconv library requested but not found])
+  fi
+  if test "$am_cv_func_iconv" = yes -a "x$LIBICONV" != x; then
+    PROGRAMS_LIBS="$PROGRAMS_LIBS $LIBICONV"
+    LIBCOB_LIBS="$LIBCOB_LIBS $LIBICONV"
+  fi
+  with_iconv="$am_cv_func_iconv"
+fi
+
+
 dnl
 dnl Configure options part II (needing compilation)
 dnl
@@ -2608,6 +2630,12 @@ if test "x$lt_cv_dlopen_self" != xyes; then
 	AC_DEFINE([COB_NO_SELFOPEN], [1])
 fi
 
+if test "$with_iconv" = yes; then
+	COB_HAS_ICONV=yes
+else
+	COB_HAS_ICONV=no
+fi
+
 if test "$with_cisam" = yes; then
 	COB_HAS_ISAM=cisam
 elif test "$with_disam" = yes; then
@@ -2729,6 +2757,7 @@ AC_SUBST([COB_BIGENDIAN])
 dnl unused: AC_SUBST([COB_FIX_LIB])
 AC_SUBST([COB_FIX_LIBTOOL])
 
+AC_SUBST([COB_HAS_ICONV])
 AC_SUBST([COB_HAS_ISAM])
 AC_SUBST([COB_HAS_CURSES])
 AC_SUBST([COB_HAS_XML2])

doc/gnucobol.texi

@@ -1053,7 +1053,7 @@ Do automatic initialization of the COBOL runtime system.
 
 @item --gentable=@var{ebcdic-enc},@var{ascii-enc}[+]
 Build an EBCDIC/ASCII translation table between @var{ebcdic-enc} and @var{ascii-enc}, and exit.
-The translation might not be reversible: append + to arbitrarily make it reversible.
+The translation might not be reversible: characters with no equivalent in the other encoding are mapped to the substitution character, thus leaving unused characters in both encodings. Append + to make the translation reversible, by arbitrarily mapping together these unused characters.
 
 @end table