Update.

2000-01-28  Ulrich Drepper  <drepper@cygnus.com>

	* locale/C-monetary.c: Add initializers for new fields.
	* locale/C-numeric.c: Likewise.
	* locale/Makefile (distribute): Add indigits.h, indigitswc.h,
	outdigits.h, and outdigitswc.h.
	* locale/langinfo.h: Add _NL_MONETARY_DECIMAL_POINT_WC,
	_NL_MONETARY_THOUSANDS_SEP_WC, _NL_NUMERIC_DECIMAL_POINT_WC,
	and _NL_NUMERIC_THOUSANDS_SEP_WC.
	* locale/indigits.h: New file.
	* locale/indigitswc.h: New file.
	* locale/outdigits.h: New file.
	* locale/outdigitswc.h: New file.
	* locale/programs/ld-monetary.c: Write out decimal point and
	thousands separator info in wide character form.
	* locale/programs/ld-numeric.c: Likewise.
	* stdio-common/Makefile (routines): Add _i18n_itoa and _i18n_itowa.
	(distribute): Add _i18n_itoa.h and _i18n_itowa.h.
	* stdio-common/_i18n_itoa.c: New file.
	* stdio-common/_i18n_itoa.h: New file.
	* stdio-common/_i18n_itowa.c: New file.
	* stdio-common/_i18n_itowa.h: New file.
	* stdio-common/printf-parse.h: Parse 'I' flag.
	* stdio-common/printf.h (struct printf_info): Add i18n field.
	* stdio-common/vfprintf.c: Implement 'I' flag to print using locales'
	outdigits.

1 files changed, 88 insertions, 0 deletions

diff --git a/locale/indigitswc.h b/locale/indigitswc.h
new file mode 100644
index 0000000..8afbb7e
--- /dev/null
+++ b/locale/indigitswc.h
@@ -0,0 +1,88 @@
+/* Copyright (C) 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@gnu.org>, 2000.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <assert.h>
+#include <langinfo.h>
+
+/* Look up the value of the next multibyte character and return its numerical
+   value if it is one of the digits known in the locale.  If *DECIDED is
+   -1 this means it is not yet decided which form it is and we have to
+   search through all available digits.  Otherwise we know which script
+   the digits are from.  */
+static inline int
+indigitwc_value (wchar_t wc, int *decided)
+{
+  int from_level;
+  int to_level;
+  const wchar_t *wcdigits[10];
+  int n;
+
+  if (*decided != -1)
+    from_level = to_level = *decided;
+  else
+    {
+      from_level = 0;
+      to_level = _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_INDIGITS_WC_LEN) - 1;
+      assert (from_level <= to_level);
+    }
+
+  /* In this round we get the pointer to the digit strings and also perform
+     the first round of comparisons.  */
+  for (n = 0; n < 10; ++n)
+    {
+      /* Get the string for the digits with value N.  */
+      wcdigits[n] = _NL_CURRENT (LC_CTYPE, _NL_CTYPE_INDIGITS0_WC + n);
+
+      if (wc == wcdigits[n])
+	{
+	  /* Found it.  */
+	  if (*decided == -1)
+	    *decided = 0;
+	  return n;
+	}
+
+      /* Advance the pointer to the next string.  */
+      ++wcdigits[n];
+    }
+
+  /* Now perform the remaining tests.  */
+  while (++from_level <= to_level)
+    {
+      /* Search all ten digits of this level.  */
+      for (n = 0; n < 10; ++n)
+	{
+	  if (wc == wcdigits[n])
+	    {
+	      /* Found it.  */
+	      if (*decided == -1)
+		*decided = from_level;
+	      return n;
+	    }
+
+	  /* Advance the pointer to the next string.  */
+	  ++wcdigits[n];
+	}
+
+      /* Next level.  */
+      ++from_level;
+    }
+
+  /* If we reach this point no matching digit was found.  */
+  return -1;
+}