Checked in the following released items:

xkeyboard-config-1.4.tar.gz
ttf-bitstream-vera-1.10.tar.gz
font-alias-1.0.1.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sony-misc-1.0.0.tar.gz
font-schumacher-misc-1.0.0.tar.gz
font-mutt-misc-1.0.0.tar.gz
font-misc-misc-1.0.0.tar.gz
font-misc-meltho-1.0.0.tar.gz
font-micro-misc-1.0.0.tar.gz
font-jis-misc-1.0.0.tar.gz
font-isas-misc-1.0.0.tar.gz
font-dec-misc-1.0.0.tar.gz
font-daewoo-misc-1.0.0.tar.gz
font-cursor-misc-1.0.0.tar.gz
font-arabic-misc-1.0.0.tar.gz
font-winitzki-cyrillic-1.0.0.tar.gz
font-misc-cyrillic-1.0.0.tar.gz
font-cronyx-cyrillic-1.0.0.tar.gz
font-screen-cyrillic-1.0.1.tar.gz
font-xfree86-type1-1.0.1.tar.gz
font-adobe-utopia-type1-1.0.1.tar.gz
font-ibm-type1-1.0.0.tar.gz
font-bitstream-type1-1.0.0.tar.gz
font-bitstream-speedo-1.0.0.tar.gz
font-bh-ttf-1.0.0.tar.gz
font-bh-type1-1.0.0.tar.gz
font-bitstream-100dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz
font-bh-100dpi-1.0.0.tar.gz
font-adobe-utopia-100dpi-1.0.1.tar.gz
font-adobe-100dpi-1.0.0.tar.gz
font-util-1.0.1.tar.gz
font-bitstream-75dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz
font-adobe-utopia-75dpi-1.0.1.tar.gz
font-bh-75dpi-1.0.0.tar.gz
bdftopcf-1.0.1.tar.gz
font-adobe-75dpi-1.0.0.tar.gz
mkfontscale-1.0.6.tar.gz
openssl-0.9.8k.tar.gz
bigreqsproto-1.0.2.tar.gz
xtrans-1.2.2.tar.gz
resourceproto-1.0.2.tar.gz
inputproto-1.4.4.tar.gz
compositeproto-0.4.tar.gz
damageproto-1.1.0.tar.gz
zlib-1.2.3.tar.gz
xkbcomp-1.0.5.tar.gz
freetype-2.3.9.tar.gz
pthreads-w32-2-8-0-release.tar.gz
pixman-0.12.0.tar.gz
kbproto-1.0.3.tar.gz
evieext-1.0.2.tar.gz
fixesproto-4.0.tar.gz
recordproto-1.13.2.tar.gz
randrproto-1.2.2.tar.gz
scrnsaverproto-1.1.0.tar.gz
renderproto-0.9.3.tar.gz
xcmiscproto-1.1.2.tar.gz
fontsproto-2.0.2.tar.gz
xextproto-7.0.3.tar.gz
xproto-7.0.14.tar.gz
libXdmcp-1.0.2.tar.gz
libxkbfile-1.0.5.tar.gz
libfontenc-1.0.4.tar.gz
libXfont-1.3.4.tar.gz
libX11-1.1.5.tar.gz
libXau-1.0.4.tar.gz
libxcb-1.1.tar.gz
xorg-server-1.5.3.tar.gz

16 files changed, 11011 insertions, 0 deletions

diff --git a/libX11/modules/lc/Makefile.am b/libX11/modules/lc/Makefile.am
new file mode 100644
index 000000000..3cad2d61c
--- /dev/null
+++ b/libX11/modules/lc/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS=Utf8 def gen xlocale
diff --git a/libX11/modules/lc/Makefile.in b/libX11/modules/lc/Makefile.in
new file mode 100644
index 000000000..ea655c0dd
--- /dev/null
+++ b/libX11/modules/lc/Makefile.in
@@ -0,0 +1,535 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = modules/lc
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/config.h \
+	$(top_builddir)/include/X11/XlibConf.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
+BIGFONT_LIBS = @BIGFONT_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GREP = @GREP@
+I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINT = @LINT@
+LINTLIB = @LINTLIB@
+LINT_FLAGS = @LINT_FLAGS@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+RANLIB = @RANLIB@
+RAWCPP = @RAWCPP@
+RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+WCHAR32 = @WCHAR32@
+X11_CFLAGS = @X11_CFLAGS@
+X11_DATADIR = @X11_DATADIR@
+X11_EXTRA_DEPS = @X11_EXTRA_DEPS@
+X11_LIBDIR = @X11_LIBDIR@
+X11_LIBS = @X11_LIBS@
+X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
+X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
+XDMCP_CFLAGS = @XDMCP_CFLAGS@
+XDMCP_LIBS = @XDMCP_LIBS@
+XERRORDB = @XERRORDB@
+XKBPROTO_CFLAGS = @XKBPROTO_CFLAGS@
+XKBPROTO_LIBS = @XKBPROTO_LIBS@
+XKBPROTO_REQUIRES = @XKBPROTO_REQUIRES@
+XKEYSYMDB = @XKEYSYMDB@
+XLOCALEDATADIR = @XLOCALEDATADIR@
+XLOCALEDIR = @XLOCALEDIR@
+XLOCALELIBDIR = @XLOCALELIBDIR@
+XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
+XPROTO_CFLAGS = @XPROTO_CFLAGS@
+XPROTO_LIBS = @XPROTO_LIBS@
+XTHREADLIB = @XTHREADLIB@
+XTHREADS = @XTHREADS@
+XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
+XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
+XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = Utf8 def gen xlocale
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  modules/lc/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  modules/lc/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-info: install-info-recursive
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	ctags ctags-recursive distclean distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/libX11/modules/lc/Utf8/Makefile.am b/libX11/modules/lc/Utf8/Makefile.am
new file mode 100644
index 000000000..d7b096b5c
--- /dev/null
+++ b/libX11/modules/lc/Utf8/Makefile.am
@@ -0,0 +1,32 @@
+AM_CFLAGS= \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/include/X11 \
+	-I$(top_builddir)/include \
+	-I$(top_builddir)/include/X11 \
+	-I$(top_srcdir)/src/xcms \
+	-I$(top_srcdir)/src/xkb \
+	-I$(top_srcdir)/src/xlibi18n \
+	$(X11_CFLAGS) \
+	$(BIGFONT_CFLAGS) \
+	$(XDMCP_CFLAGS) \
+	-D_BSD_SOURCE \
+	$(MALLOC_ZERO_CFLAGS)
+
+if XLIB_LOADABLE_I18N
+
+commonlibdir = $(X11_LOCALELIBDIR)/common
+commonlib_LTLIBRARIES=xlcUTF8Load.la
+xlcUTF8Load_la_LDFLAGS = -module -version-number 2:0:0
+xlcUTF8Load_la_LIBADD = $(I18N_MODULE_LIBS)
+
+else
+
+noinst_LTLIBRARIES = libxlcUTF8Load.la
+
+endif
+
+
+xlcUTF8Load_la_SOURCES = \
+	lcUTF8Load.c
+
+libxlcUTF8Load_la_SOURCES = $(xlcUTF8Load_la_SOURCES)
diff --git a/libX11/modules/lc/Utf8/Makefile.in b/libX11/modules/lc/Utf8/Makefile.in
new file mode 100644
index 000000000..1a1948310
--- /dev/null
+++ b/libX11/modules/lc/Utf8/Makefile.in
@@ -0,0 +1,561 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = modules/lc/Utf8
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/config.h \
+	$(top_builddir)/include/X11/XlibConf.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(commonlibdir)"
+commonlibLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(commonlib_LTLIBRARIES) $(noinst_LTLIBRARIES)
+libxlcUTF8Load_la_LIBADD =
+am__objects_1 = lcUTF8Load.lo
+am_libxlcUTF8Load_la_OBJECTS = $(am__objects_1)
+libxlcUTF8Load_la_OBJECTS = $(am_libxlcUTF8Load_la_OBJECTS)
+@XLIB_LOADABLE_I18N_FALSE@am_libxlcUTF8Load_la_rpath =
+am__DEPENDENCIES_1 =
+@XLIB_LOADABLE_I18N_TRUE@xlcUTF8Load_la_DEPENDENCIES =  \
+@XLIB_LOADABLE_I18N_TRUE@	$(am__DEPENDENCIES_1)
+am_xlcUTF8Load_la_OBJECTS = lcUTF8Load.lo
+xlcUTF8Load_la_OBJECTS = $(am_xlcUTF8Load_la_OBJECTS)
+xlcUTF8Load_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(xlcUTF8Load_la_LDFLAGS) $(LDFLAGS) -o $@
+@XLIB_LOADABLE_I18N_TRUE@am_xlcUTF8Load_la_rpath = -rpath \
+@XLIB_LOADABLE_I18N_TRUE@	$(commonlibdir)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libxlcUTF8Load_la_SOURCES) $(xlcUTF8Load_la_SOURCES)
+DIST_SOURCES = $(libxlcUTF8Load_la_SOURCES) $(xlcUTF8Load_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
+BIGFONT_LIBS = @BIGFONT_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GREP = @GREP@
+I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINT = @LINT@
+LINTLIB = @LINTLIB@
+LINT_FLAGS = @LINT_FLAGS@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+RANLIB = @RANLIB@
+RAWCPP = @RAWCPP@
+RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+WCHAR32 = @WCHAR32@
+X11_CFLAGS = @X11_CFLAGS@
+X11_DATADIR = @X11_DATADIR@
+X11_EXTRA_DEPS = @X11_EXTRA_DEPS@
+X11_LIBDIR = @X11_LIBDIR@
+X11_LIBS = @X11_LIBS@
+X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
+X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
+XDMCP_CFLAGS = @XDMCP_CFLAGS@
+XDMCP_LIBS = @XDMCP_LIBS@
+XERRORDB = @XERRORDB@
+XKBPROTO_CFLAGS = @XKBPROTO_CFLAGS@
+XKBPROTO_LIBS = @XKBPROTO_LIBS@
+XKBPROTO_REQUIRES = @XKBPROTO_REQUIRES@
+XKEYSYMDB = @XKEYSYMDB@
+XLOCALEDATADIR = @XLOCALEDATADIR@
+XLOCALEDIR = @XLOCALEDIR@
+XLOCALELIBDIR = @XLOCALELIBDIR@
+XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
+XPROTO_CFLAGS = @XPROTO_CFLAGS@
+XPROTO_LIBS = @XPROTO_LIBS@
+XTHREADLIB = @XTHREADLIB@
+XTHREADS = @XTHREADS@
+XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
+XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
+XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CFLAGS = \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/include/X11 \
+	-I$(top_builddir)/include \
+	-I$(top_builddir)/include/X11 \
+	-I$(top_srcdir)/src/xcms \
+	-I$(top_srcdir)/src/xkb \
+	-I$(top_srcdir)/src/xlibi18n \
+	$(X11_CFLAGS) \
+	$(BIGFONT_CFLAGS) \
+	$(XDMCP_CFLAGS) \
+	-D_BSD_SOURCE \
+	$(MALLOC_ZERO_CFLAGS)
+
+@XLIB_LOADABLE_I18N_TRUE@commonlibdir = $(X11_LOCALELIBDIR)/common
+@XLIB_LOADABLE_I18N_TRUE@commonlib_LTLIBRARIES = xlcUTF8Load.la
+@XLIB_LOADABLE_I18N_TRUE@xlcUTF8Load_la_LDFLAGS = -module -version-number 2:0:0
+@XLIB_LOADABLE_I18N_TRUE@xlcUTF8Load_la_LIBADD = $(I18N_MODULE_LIBS)
+@XLIB_LOADABLE_I18N_FALSE@noinst_LTLIBRARIES = libxlcUTF8Load.la
+xlcUTF8Load_la_SOURCES = \
+	lcUTF8Load.c
+
+libxlcUTF8Load_la_SOURCES = $(xlcUTF8Load_la_SOURCES)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  modules/lc/Utf8/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  modules/lc/Utf8/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-commonlibLTLIBRARIES: $(commonlib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(commonlibdir)" || $(MKDIR_P) "$(DESTDIR)$(commonlibdir)"
+	@list='$(commonlib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(commonlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(commonlibdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(commonlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(commonlibdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-commonlibLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(commonlib_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(commonlibdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(commonlibdir)/$$p"; \
+	done
+
+clean-commonlibLTLIBRARIES:
+	-test -z "$(commonlib_LTLIBRARIES)" || rm -f $(commonlib_LTLIBRARIES)
+	@list='$(commonlib_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libxlcUTF8Load.la: $(libxlcUTF8Load_la_OBJECTS) $(libxlcUTF8Load_la_DEPENDENCIES) 
+	$(LINK) $(am_libxlcUTF8Load_la_rpath) $(libxlcUTF8Load_la_OBJECTS) $(libxlcUTF8Load_la_LIBADD) $(LIBS)
+xlcUTF8Load.la: $(xlcUTF8Load_la_OBJECTS) $(xlcUTF8Load_la_DEPENDENCIES) 
+	$(xlcUTF8Load_la_LINK) $(am_xlcUTF8Load_la_rpath) $(xlcUTF8Load_la_OBJECTS) $(xlcUTF8Load_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcUTF8Load.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	for dir in "$(DESTDIR)$(commonlibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-commonlibLTLIBRARIES clean-generic clean-libtool \
+	clean-noinstLTLIBRARIES mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-commonlibLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-commonlibLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean \
+	clean-commonlibLTLIBRARIES clean-generic clean-libtool \
+	clean-noinstLTLIBRARIES ctags distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-commonlibLTLIBRARIES install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-commonlibLTLIBRARIES
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/libX11/modules/lc/Utf8/lcUTF8Load.c b/libX11/modules/lc/Utf8/lcUTF8Load.c
new file mode 100644
index 000000000..f4bff2880
--- /dev/null
+++ b/libX11/modules/lc/Utf8/lcUTF8Load.c
@@ -0,0 +1,64 @@
+/* $TOG:  $ */
+/******************************************************************
+
+              Copyright 1993 by SunSoft, Inc.
+              Copyright 1999-2000 by Bruno Haible
+
+Permission to use, copy, modify, distribute, and sell this software
+and its documentation for any purpose is hereby granted without fee,
+provided that the above copyright notice appear in all copies and
+that both that copyright notice and this permission notice appear
+in supporting documentation, and that the names of SunSoft, Inc. and
+Bruno Haible not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.  SunSoft, Inc. and Bruno Haible make no representations
+about the suitability of this software for any purpose.  It is
+provided "as is" without express or implied warranty.
+
+SunSoft Inc. AND Bruno Haible DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL SunSoft, Inc. OR Bruno Haible BE LIABLE
+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+******************************************************************/
+/* $XFree86: xc/lib/X11/lcUTF8.c,v 1.12 2001/02/09 00:02:53 dawes Exp $ */
+
+/*
+ * This file contains the UTF-8 locale loader.
+ *     Supports: all locales with codeset UTF-8.
+ *     Platforms: all systems.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <stdio.h>
+#include "Xlibint.h"
+#include "XlcPubI.h"
+#include "XlcGeneric.h"
+
+XLCd
+_XlcUtf8Loader(
+    const char *name)
+{
+    XLCd lcd;
+
+    lcd = _XlcCreateLC(name, _XlcGenericMethods);
+    if (lcd == (XLCd) NULL)
+	return lcd;
+
+    /* The official IANA name for UTF-8 is "UTF-8" in upper case with a dash. */
+    if (!XLC_PUBLIC_PART(lcd)->codeset ||
+	(_XlcCompareISOLatin1(XLC_PUBLIC_PART(lcd)->codeset, "UTF-8"))) {
+	_XlcDestroyLC(lcd);
+	return (XLCd) NULL;
+    }
+
+    _XlcAddUtf8LocaleConverters(lcd);
+    _XlcAddUtf8Converters(lcd);
+
+    return lcd;
+}
diff --git a/libX11/modules/lc/def/Makefile.am b/libX11/modules/lc/def/Makefile.am
new file mode 100644
index 000000000..9e9a1a680
--- /dev/null
+++ b/libX11/modules/lc/def/Makefile.am
@@ -0,0 +1,30 @@
+AM_CFLAGS= \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/include/X11 \
+	-I$(top_builddir)/include \
+	-I$(top_builddir)/include/X11 \
+	-I$(top_srcdir)/src/xcms \
+	-I$(top_srcdir)/src/xkb \
+	-I$(top_srcdir)/src/xlibi18n \
+	$(X11_CFLAGS) \
+	$(BIGFONT_CFLAGS) \
+	$(XDMCP_CFLAGS) \
+	-D_BSD_SOURCE
+
+if XLIB_LOADABLE_I18N
+
+commonlibdir = $(X11_LOCALELIBDIR)/common
+commonlib_LTLIBRARIES=xlcDef.la
+xlcDef_la_LDFLAGS = -module -version-number 2:0:0
+xlcDef_la_LIBADD = $(I18N_MODULE_LIBS)
+
+else
+
+noinst_LTLIBRARIES = libxlcDef.la
+
+endif
+
+xlcDef_la_SOURCES = \
+	lcDefConv.c
+
+libxlcDef_la_SOURCES = $(xlcDef_la_SOURCES)
diff --git a/libX11/modules/lc/def/Makefile.in b/libX11/modules/lc/def/Makefile.in
new file mode 100644
index 000000000..ca708530f
--- /dev/null
+++ b/libX11/modules/lc/def/Makefile.in
@@ -0,0 +1,559 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = modules/lc/def
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/config.h \
+	$(top_builddir)/include/X11/XlibConf.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(commonlibdir)"
+commonlibLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(commonlib_LTLIBRARIES) $(noinst_LTLIBRARIES)
+libxlcDef_la_LIBADD =
+am__objects_1 = lcDefConv.lo
+am_libxlcDef_la_OBJECTS = $(am__objects_1)
+libxlcDef_la_OBJECTS = $(am_libxlcDef_la_OBJECTS)
+@XLIB_LOADABLE_I18N_FALSE@am_libxlcDef_la_rpath =
+am__DEPENDENCIES_1 =
+@XLIB_LOADABLE_I18N_TRUE@xlcDef_la_DEPENDENCIES =  \
+@XLIB_LOADABLE_I18N_TRUE@	$(am__DEPENDENCIES_1)
+am_xlcDef_la_OBJECTS = lcDefConv.lo
+xlcDef_la_OBJECTS = $(am_xlcDef_la_OBJECTS)
+xlcDef_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(xlcDef_la_LDFLAGS) $(LDFLAGS) -o $@
+@XLIB_LOADABLE_I18N_TRUE@am_xlcDef_la_rpath = -rpath $(commonlibdir)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libxlcDef_la_SOURCES) $(xlcDef_la_SOURCES)
+DIST_SOURCES = $(libxlcDef_la_SOURCES) $(xlcDef_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
+BIGFONT_LIBS = @BIGFONT_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GREP = @GREP@
+I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINT = @LINT@
+LINTLIB = @LINTLIB@
+LINT_FLAGS = @LINT_FLAGS@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+RANLIB = @RANLIB@
+RAWCPP = @RAWCPP@
+RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+WCHAR32 = @WCHAR32@
+X11_CFLAGS = @X11_CFLAGS@
+X11_DATADIR = @X11_DATADIR@
+X11_EXTRA_DEPS = @X11_EXTRA_DEPS@
+X11_LIBDIR = @X11_LIBDIR@
+X11_LIBS = @X11_LIBS@
+X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
+X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
+XDMCP_CFLAGS = @XDMCP_CFLAGS@
+XDMCP_LIBS = @XDMCP_LIBS@
+XERRORDB = @XERRORDB@
+XKBPROTO_CFLAGS = @XKBPROTO_CFLAGS@
+XKBPROTO_LIBS = @XKBPROTO_LIBS@
+XKBPROTO_REQUIRES = @XKBPROTO_REQUIRES@
+XKEYSYMDB = @XKEYSYMDB@
+XLOCALEDATADIR = @XLOCALEDATADIR@
+XLOCALEDIR = @XLOCALEDIR@
+XLOCALELIBDIR = @XLOCALELIBDIR@
+XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
+XPROTO_CFLAGS = @XPROTO_CFLAGS@
+XPROTO_LIBS = @XPROTO_LIBS@
+XTHREADLIB = @XTHREADLIB@
+XTHREADS = @XTHREADS@
+XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
+XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
+XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CFLAGS = \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/include/X11 \
+	-I$(top_builddir)/include \
+	-I$(top_builddir)/include/X11 \
+	-I$(top_srcdir)/src/xcms \
+	-I$(top_srcdir)/src/xkb \
+	-I$(top_srcdir)/src/xlibi18n \
+	$(X11_CFLAGS) \
+	$(BIGFONT_CFLAGS) \
+	$(XDMCP_CFLAGS) \
+	-D_BSD_SOURCE
+
+@XLIB_LOADABLE_I18N_TRUE@commonlibdir = $(X11_LOCALELIBDIR)/common
+@XLIB_LOADABLE_I18N_TRUE@commonlib_LTLIBRARIES = xlcDef.la
+@XLIB_LOADABLE_I18N_TRUE@xlcDef_la_LDFLAGS = -module -version-number 2:0:0
+@XLIB_LOADABLE_I18N_TRUE@xlcDef_la_LIBADD = $(I18N_MODULE_LIBS)
+@XLIB_LOADABLE_I18N_FALSE@noinst_LTLIBRARIES = libxlcDef.la
+xlcDef_la_SOURCES = \
+	lcDefConv.c
+
+libxlcDef_la_SOURCES = $(xlcDef_la_SOURCES)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  modules/lc/def/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  modules/lc/def/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-commonlibLTLIBRARIES: $(commonlib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(commonlibdir)" || $(MKDIR_P) "$(DESTDIR)$(commonlibdir)"
+	@list='$(commonlib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(commonlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(commonlibdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(commonlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(commonlibdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-commonlibLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(commonlib_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(commonlibdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(commonlibdir)/$$p"; \
+	done
+
+clean-commonlibLTLIBRARIES:
+	-test -z "$(commonlib_LTLIBRARIES)" || rm -f $(commonlib_LTLIBRARIES)
+	@list='$(commonlib_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libxlcDef.la: $(libxlcDef_la_OBJECTS) $(libxlcDef_la_DEPENDENCIES) 
+	$(LINK) $(am_libxlcDef_la_rpath) $(libxlcDef_la_OBJECTS) $(libxlcDef_la_LIBADD) $(LIBS)
+xlcDef.la: $(xlcDef_la_OBJECTS) $(xlcDef_la_DEPENDENCIES) 
+	$(xlcDef_la_LINK) $(am_xlcDef_la_rpath) $(xlcDef_la_OBJECTS) $(xlcDef_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcDefConv.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	for dir in "$(DESTDIR)$(commonlibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-commonlibLTLIBRARIES clean-generic clean-libtool \
+	clean-noinstLTLIBRARIES mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-commonlibLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-commonlibLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean \
+	clean-commonlibLTLIBRARIES clean-generic clean-libtool \
+	clean-noinstLTLIBRARIES ctags distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-commonlibLTLIBRARIES install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-commonlibLTLIBRARIES
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/libX11/modules/lc/def/lcDefConv.c b/libX11/modules/lc/def/lcDefConv.c
new file mode 100644
index 000000000..fb504d11d
--- /dev/null
+++ b/libX11/modules/lc/def/lcDefConv.c
@@ -0,0 +1,793 @@
+/* $Xorg: lcDefConv.c,v 1.3 2000/08/17 19:45:17 cpqbld Exp $ */
+/*
+ * Copyright 1992, 1993 by TOSHIBA Corp.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of TOSHIBA not be used in advertising
+ * or publicity pertaining to distribution of the software without specific,
+ * written prior permission. TOSHIBA make no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ *
+ * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+ * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ *
+ * Author: Katsuhisa Yano	TOSHIBA Corp.
+ *			   	mopi@osa.ilab.toshiba.co.jp
+ */
+/*
+ * 2000
+ * Modifier: Ivan Pascal        The XFree86 Project
+ */
+/* $XFree86: xc/lib/X11/lcDefConv.c,v 1.6 2001/01/17 19:41:53 dawes Exp $ */
+
+/*
+ * The default locale loader.
+ * Supports: one byte per char (iso8859 like) locales.
+ * How: converts bytes to wide characters in a 1:1 manner.
+ * Platforms: all systems.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "Xlibint.h"
+#include "XlcGeneric.h"
+
+#ifndef MB_LEN_MAX
+#define MB_LEN_MAX 6
+#endif
+
+#if !defined(macII) && !defined(Lynx_22) && !defined(X_LOCALE)
+#define STDCVT
+#endif
+
+#define GR	0x80
+#define GL	0x7f
+
+typedef struct _StateRec *State;
+typedef struct _StateRec {
+    CodeSet     GL_codeset;
+    CodeSet     GR_codeset;
+    wchar_t     wc_mask;
+    wchar_t     wc_encode_mask;
+    Bool        (*MBtoWC) (State state, const char *ch, wchar_t *wc);
+    Bool        (*WCtoMB) (State state, wchar_t wc, char *ch);
+} StateRec;
+
+static
+Bool MBtoWCdef(
+    State    state,
+    const char *ch,
+    wchar_t  *wc)
+{
+    wchar_t wc_encoding;
+    CodeSet codeset = (*ch & GR) ? state->GR_codeset : state->GL_codeset;
+    if (!codeset)
+	return False;
+    wc_encoding = codeset->wc_encoding;
+    *wc = ((wchar_t) *ch & state->wc_mask) | wc_encoding;
+    return True;
+}
+
+#ifdef STDCVT
+static
+Bool MBtoWCstd(
+    State   state,
+    const char *ch,
+    wchar_t *wc)
+{
+    return (mbtowc(wc, ch, 1) == 1);
+}
+#endif
+
+static
+Bool WCtoMBdef(
+    State   state,
+    wchar_t wc,
+    char    *ch)
+{
+    wchar_t wc_encoding = wc & state->wc_encode_mask;
+    CodeSet codeset;
+
+    codeset = state->GL_codeset;
+    if (codeset && (wc_encoding == codeset->wc_encoding)) {
+	*ch = wc & state->wc_mask;
+	return True;
+    }
+    codeset = state->GR_codeset;
+    if (codeset && (wc_encoding == codeset->wc_encoding)) {
+	*ch = (wc & state->wc_mask) | GR;
+	return True;
+    }
+    return False;
+}
+
+#ifdef STDCVT
+static
+Bool WCtoMBstd(
+    State   state,
+    wchar_t wc,
+    char    *ch)
+{
+    return (wctomb(ch, wc) == 1);
+}
+#endif
+
+static
+XlcCharSet get_charset(
+    State  state,
+    char   side)
+{
+    CodeSet codeset = side ? state->GR_codeset : state->GL_codeset;
+    if (codeset) {
+	int i;
+	XlcCharSet charset;
+	for (i = 0; i < codeset->num_charsets; i++) {
+	    charset = codeset->charset_list[i];
+	    if (*charset->ct_sequence != '\0')
+		return charset;
+	}
+	return *(codeset->charset_list);
+    }
+    return (XlcCharSet) NULL;
+}
+
+static int
+def_mbstowcs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    const char *src = (const char *) *from;
+    wchar_t *dst = (wchar_t *) * to;
+    State state = (State) conv->state;
+    int unconv = 0;
+
+    if (from == NULL || *from == NULL)
+	return 0;
+
+    while (*from_left && *to_left) {
+	(*from_left)--;
+	if (state->MBtoWC (state, src++, dst)) {
+	    dst++;
+	    (*to_left)--;
+	} else {
+	    unconv++;
+	}
+    }
+    *from = (XPointer) src;
+    *to = (XPointer) dst;
+    return unconv;
+}
+
+static int
+def_wcstombs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    const wchar_t *src = (const wchar_t *) * from;
+    char  *dst = (char *) *to;
+    State state = (State) conv->state;
+    char ch[MB_LEN_MAX];
+    int unconv = 0;
+
+    if (from == NULL || *from == NULL)
+	return 0;
+
+    while (*from_left && *to_left) {
+	(*from_left)--;
+	if (state->WCtoMB (state, *src++, ch)) {
+	    *dst++ = *ch;
+	    (*to_left)--;
+	} else {
+	    unconv++;
+	}
+    }
+    *from = (XPointer) src;
+    *to = (XPointer) dst;
+    return unconv;
+}
+
+static int
+mbstostr(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    const char *src = (const char *) *from;
+    char *dst = (char *) *to;
+    CodeSet codeset;
+    State state = (State) conv->state;
+    char ch;
+    int unconv = 0;
+
+    if (from == NULL || *from == NULL)
+	return 0;
+
+    while (*from_left && *to_left) {
+	ch = *src++;
+	(*from_left)--;
+
+	codeset = (ch & GR) ? state->GR_codeset : state->GL_codeset;
+	if (codeset && codeset->string_encoding) {
+	    *dst++ = ch;
+	    (*to_left)--;
+	} else {
+	    unconv++;
+	}
+    }
+    *from = (XPointer) src;
+    *to = (XPointer) dst;
+    return unconv;
+}
+
+static int
+wcstostr(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    const wchar_t *src = (const wchar_t *) *from;
+    char *dst = (char *) *to;
+    CodeSet codeset;
+    State state = (State) conv->state;
+    char ch[MB_LEN_MAX];
+    int unconv = 0;
+
+    if (from == NULL || *from == NULL)
+	return 0;
+
+    while (*from_left && *to_left) {
+	(*from_left)--;
+	if (state->WCtoMB (state, *src++, ch)) {
+	    codeset = (*ch & GR) ? state->GR_codeset : state->GL_codeset;
+	    if (codeset && codeset->string_encoding) {
+		*dst++ = *ch;
+		(*to_left)--;
+	    } else {
+		unconv++;
+	    }
+	} else {
+	    unconv++;
+	}
+    }
+    *from = (XPointer) src;
+    *to = (XPointer) dst;
+    return unconv;
+}
+
+static int
+mbstocs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    const char *src = (const char *) *from;
+    char *dst = (char *) *to;
+    int length;
+    State state = (State) conv->state;
+    char cur_side;
+    int unconv = 0;
+
+    if (from == NULL || *from == NULL)
+	return 0;
+
+    length = min(*from_left, *to_left);
+
+    cur_side = *src & GR;
+    while (length) {
+	if ((char) (*src & GR) != cur_side)
+	    break;
+	*dst++ = *src++;
+	length--;
+    }
+
+    if (num_args > 0) {
+	XlcCharSet      charset = get_charset(state, cur_side);
+	if (charset) {
+	    *((XlcCharSet *) args[0]) = charset;
+	} else {
+	    dst = *to;
+	    unconv = -1;
+	}
+    }
+    *from_left -= src - (char *) *from;
+    *to_left -= dst - (char *) *to;
+    *from = (XPointer) src;
+    *to = (XPointer) dst;
+    return unconv;
+}
+
+static int
+wcstocs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    const wchar_t *src = (const wchar_t *) * from;
+    char *dst = (char *) *to;
+    State state = (State) conv->state;
+    char cur_side = 0, ch[MB_LEN_MAX];
+    int unconv = 0;
+    Bool found = False;
+
+    if (from == NULL || *from == NULL)
+	return 0;
+
+    while (*from_left) {
+	if ((found = state->WCtoMB (state, *src, ch)))
+	    break;
+	unconv++;
+	src++;
+	(*from_left)--;
+    }
+
+    if (found) {
+	cur_side = *ch & GR;
+	while (*from_left && *to_left) {
+	    (*from_left)--;
+	    if (state->WCtoMB (state, *src++, ch)) {
+		if ((char) (*ch & GR) != cur_side) {
+		    src--;
+		    (*from_left)++;
+		    break;
+		} else {
+		    *dst++ = *ch;
+		    (*to_left)--;
+		}
+	    } else {
+		unconv++;
+	    }
+	}
+    } else {
+	unconv++;
+    }
+
+    if (num_args > 0) {
+	XlcCharSet charset = get_charset(state, cur_side);
+	if (charset) {
+	    *((XlcCharSet *) args[0]) = charset;
+	} else {
+	    unconv = -1;
+	}
+    }
+    *from = (XPointer) src;
+    *to = (XPointer) dst;
+    return unconv;
+}
+
+static int
+cstombs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    const char *src = (const char *) *from;
+    char *dst = (char *) *to;
+    CodeSet codeset;
+    XlcCharSet charset;
+    State state = (State) conv->state;
+    unsigned char cur_side = 0;
+    int i;
+    Bool found = False;
+
+    if (from == NULL || *from == NULL)
+	return 0;
+
+    if (num_args > 0) {
+	charset = (XlcCharSet) args[0];
+	if (charset == NULL)
+	    return -1;
+    } else {
+	return -1;
+    }
+
+    if ((charset->side == XlcGL) || (charset->side == XlcGLGR)) {
+	codeset = state->GL_codeset;
+	if (codeset) {
+	    for (i = 0; i < codeset->num_charsets; i++)
+		if (charset == codeset->charset_list[i]) {
+		    found = True;
+		    cur_side = 0;
+		    break;
+		}
+	}
+    }
+    if (!found && ((charset->side == XlcGR) || (charset->side == XlcGLGR))) {
+	codeset = state->GR_codeset;
+	if (codeset) {
+	    for (i = 0; i < codeset->num_charsets; i++)
+		if (charset == codeset->charset_list[i]) {
+		    found = True;
+		    cur_side = GR;
+		    break;
+		}
+	}
+    }
+    if (found) {
+	int length = min(*from_left, *to_left);
+	while (length) {
+	    *dst++ = *src++ | cur_side;
+	    length--;
+	}
+    } else {
+	return -1;
+    }
+
+    *from_left -= src - (char *) *from;
+    *to_left -= dst - (char *) *to;
+    *from = (XPointer) src;
+    *to = (XPointer) dst;
+    return 0;
+}
+
+static int
+cstowcs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    const char *src = (const char *) *from;
+    wchar_t *dst = (wchar_t *) * to;
+    CodeSet codeset;
+    XlcCharSet charset;
+    State state = (State) conv->state;
+    Bool found = False;
+    int i, unconv = 0;
+    unsigned char cur_side = 0;
+
+    if (from == NULL || *from == NULL)
+	return 0;
+
+    if (num_args > 0) {
+	charset = (XlcCharSet) args[0];
+	if (charset == NULL)
+	    return -1;
+    } else {
+	return -1;
+    }
+
+    if ((charset->side == XlcGL) || (charset->side == XlcGLGR)) {
+	codeset = state->GL_codeset;
+	if (codeset) {
+	    for (i = 0; i < codeset->num_charsets; i++)
+		if (charset == codeset->charset_list[i]) {
+		    found = True;
+		    cur_side = 0;
+		    break;
+		}
+	}
+    }
+    if (!found && ((charset->side == XlcGR) || (charset->side == XlcGLGR))) {
+	codeset = state->GR_codeset;
+	if (codeset) {
+	    for (i = 0; i < codeset->num_charsets; i++)
+		if (charset == codeset->charset_list[i]) {
+		    found = True;
+		    cur_side = GR;
+		    break;
+		}
+	}
+    }
+    if (found) {
+	char ch;
+	while (*from_left && *to_left) {
+	    ch = *src++ | cur_side;
+	    (*from_left)--;
+	    if (state->MBtoWC (state, &ch, dst)) {
+		dst++;
+		(*to_left)--;
+	    } else {
+		unconv++;
+	    }
+	}
+    } else {
+	return -1;
+    }
+    *from = (XPointer) src;
+    *to = (XPointer) dst;
+    return unconv;
+}
+
+static int
+strtombs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    const char *src = (const char *) *from;
+    char *dst = (char *) *to;
+    int length;
+
+    if (from == NULL || *from == NULL)
+	return 0;
+
+    length = min(*from_left, *to_left);
+    while (length) {
+	*dst++ = *src++;
+	length--;
+    }
+
+    *from_left -= src - (char *) *from;
+    *to_left -= dst - (char *) *to;
+    *from = (XPointer) src;
+    *to = (XPointer) dst;
+    return 0;
+}
+
+static void
+close_converter(
+    XlcConv conv)
+{
+    if (conv->state)
+	Xfree((char *) conv->state);
+
+    Xfree((char *) conv);
+}
+
+static XlcConv
+create_conv(
+    XLCd lcd,
+    XlcConvMethods methods)
+{
+    XlcConv conv;
+    State state;
+
+    conv = (XlcConv) Xmalloc(sizeof(XlcConvRec));
+    if (conv == NULL)
+	return (XlcConv) NULL;
+
+    state = (State) Xmalloc(sizeof(StateRec));
+    if (state == NULL) {
+	close_converter(conv);
+	return (XlcConv) NULL;
+    }
+    state->GL_codeset = XLC_GENERIC(lcd, initial_state_GL);
+    state->GR_codeset = XLC_GENERIC(lcd, initial_state_GR);
+    state->wc_mask = (1 << XLC_GENERIC(lcd, wc_shift_bits)) - 1;
+    state->wc_encode_mask = XLC_GENERIC(lcd, wc_encode_mask);
+
+#ifdef STDCVT
+    if (XLC_GENERIC(lcd, use_stdc_env) == True)
+	state->MBtoWC = &MBtoWCstd;
+    else
+#endif
+	state->MBtoWC = &MBtoWCdef;
+
+#ifdef STDCVT
+    if (XLC_GENERIC(lcd, use_stdc_env) == True)
+	state->WCtoMB = &WCtoMBstd;
+    else
+#endif
+	state->WCtoMB = &WCtoMBdef;
+
+    conv->methods = methods;
+    conv->state = (XPointer) state;
+
+    return conv;
+}
+
+static XlcConvMethodsRec mbstowcs_methods = {
+    close_converter,
+    def_mbstowcs,
+    NULL
+};
+
+static XlcConv
+open_mbstowcs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &mbstowcs_methods);
+}
+
+static XlcConvMethodsRec mbstostr_methods = {
+    close_converter,
+    mbstostr,
+    NULL
+};
+
+static XlcConv
+open_mbstostr(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &mbstostr_methods);
+}
+
+static XlcConvMethodsRec mbstocs_methods = {
+    close_converter,
+    mbstocs,
+    NULL
+};
+
+static XlcConv
+open_mbstocs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &mbstocs_methods);
+}
+
+static XlcConvMethodsRec wcstombs_methods = {
+    close_converter,
+    def_wcstombs,
+    NULL
+};
+
+static XlcConv
+open_wcstombs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &wcstombs_methods);
+}
+
+static XlcConvMethodsRec wcstostr_methods = {
+    close_converter,
+    wcstostr,
+    NULL
+};
+
+static XlcConv
+open_wcstostr(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &wcstostr_methods);
+}
+
+static XlcConvMethodsRec wcstocs_methods = {
+    close_converter,
+    wcstocs,
+    NULL
+};
+
+static XlcConv
+open_wcstocs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &wcstocs_methods);
+}
+
+static XlcConvMethodsRec strtombs_methods = {
+    close_converter,
+    strtombs,
+    NULL
+};
+
+static XlcConv
+open_strtombs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &strtombs_methods);
+}
+
+static XlcConvMethodsRec cstombs_methods = {
+    close_converter,
+    cstombs,
+    NULL
+};
+
+static XlcConv
+open_cstombs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &cstombs_methods);
+}
+
+static XlcConvMethodsRec cstowcs_methods = {
+    close_converter,
+    cstowcs,
+    NULL
+};
+
+static XlcConv
+open_cstowcs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &cstowcs_methods);
+}
+
+XLCd
+_XlcDefaultLoader(
+    const char *name)
+{
+    XLCd lcd;
+
+    lcd = _XlcCreateLC(name, _XlcGenericMethods);
+    if (lcd == NULL)
+	return lcd;
+
+    if (XLC_PUBLIC(lcd, mb_cur_max) != 1){
+        _XlcDestroyLC(lcd);
+        return (XLCd) NULL;
+    }
+
+    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNWideChar, open_mbstowcs);
+    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNString, open_mbstostr);
+    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNCharSet, open_mbstocs);
+    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNChar, open_mbstocs);
+
+    _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNMultiByte, open_wcstombs);
+    _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNString, open_wcstostr);
+    _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNCharSet, open_wcstocs);
+
+    _XlcSetConverter(lcd, XlcNString, lcd, XlcNMultiByte, open_strtombs);
+    _XlcSetConverter(lcd, XlcNString, lcd, XlcNWideChar, open_mbstowcs);
+
+    _XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNMultiByte, open_cstombs);
+    _XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNWideChar, open_cstowcs);
+
+    _XlcAddUtf8Converters(lcd);
+
+    return lcd;
+}
diff --git a/libX11/modules/lc/gen/Makefile.am b/libX11/modules/lc/gen/Makefile.am
new file mode 100644
index 000000000..2937cb19d
--- /dev/null
+++ b/libX11/modules/lc/gen/Makefile.am
@@ -0,0 +1,30 @@
+AM_CFLAGS= \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/include/X11 \
+	-I$(top_builddir)/include \
+	-I$(top_builddir)/include/X11 \
+	-I$(top_srcdir)/src/xcms \
+	-I$(top_srcdir)/src/xkb \
+	-I$(top_srcdir)/src/xlibi18n \
+	$(X11_CFLAGS) \
+	$(BIGFONT_CFLAGS) \
+	$(XDMCP_CFLAGS) \
+	-D_BSD_SOURCE
+
+if XLIB_LOADABLE_I18N
+
+commonlibdir = $(X11_LOCALELIBDIR)/common
+commonlib_LTLIBRARIES=xlibi18n.la
+xlibi18n_la_LDFLAGS = -module -version-number 2:0:0
+xlibi18n_la_LIBADD = $(I18N_MODULE_LIBS)
+
+else
+
+noinst_LTLIBRARIES = libxlibi18n.la
+
+endif
+
+xlibi18n_la_SOURCES = \
+	lcGenConv.c
+
+libxlibi18n_la_SOURCES = $(xlibi18n_la_SOURCES)
diff --git a/libX11/modules/lc/gen/Makefile.in b/libX11/modules/lc/gen/Makefile.in
new file mode 100644
index 000000000..3f5f209d5
--- /dev/null
+++ b/libX11/modules/lc/gen/Makefile.in
@@ -0,0 +1,559 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = modules/lc/gen
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/config.h \
+	$(top_builddir)/include/X11/XlibConf.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(commonlibdir)"
+commonlibLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(commonlib_LTLIBRARIES) $(noinst_LTLIBRARIES)
+libxlibi18n_la_LIBADD =
+am__objects_1 = lcGenConv.lo
+am_libxlibi18n_la_OBJECTS = $(am__objects_1)
+libxlibi18n_la_OBJECTS = $(am_libxlibi18n_la_OBJECTS)
+@XLIB_LOADABLE_I18N_FALSE@am_libxlibi18n_la_rpath =
+am__DEPENDENCIES_1 =
+@XLIB_LOADABLE_I18N_TRUE@xlibi18n_la_DEPENDENCIES =  \
+@XLIB_LOADABLE_I18N_TRUE@	$(am__DEPENDENCIES_1)
+am_xlibi18n_la_OBJECTS = lcGenConv.lo
+xlibi18n_la_OBJECTS = $(am_xlibi18n_la_OBJECTS)
+xlibi18n_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(xlibi18n_la_LDFLAGS) $(LDFLAGS) -o $@
+@XLIB_LOADABLE_I18N_TRUE@am_xlibi18n_la_rpath = -rpath $(commonlibdir)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libxlibi18n_la_SOURCES) $(xlibi18n_la_SOURCES)
+DIST_SOURCES = $(libxlibi18n_la_SOURCES) $(xlibi18n_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
+BIGFONT_LIBS = @BIGFONT_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GREP = @GREP@
+I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINT = @LINT@
+LINTLIB = @LINTLIB@
+LINT_FLAGS = @LINT_FLAGS@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+RANLIB = @RANLIB@
+RAWCPP = @RAWCPP@
+RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+WCHAR32 = @WCHAR32@
+X11_CFLAGS = @X11_CFLAGS@
+X11_DATADIR = @X11_DATADIR@
+X11_EXTRA_DEPS = @X11_EXTRA_DEPS@
+X11_LIBDIR = @X11_LIBDIR@
+X11_LIBS = @X11_LIBS@
+X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
+X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
+XDMCP_CFLAGS = @XDMCP_CFLAGS@
+XDMCP_LIBS = @XDMCP_LIBS@
+XERRORDB = @XERRORDB@
+XKBPROTO_CFLAGS = @XKBPROTO_CFLAGS@
+XKBPROTO_LIBS = @XKBPROTO_LIBS@
+XKBPROTO_REQUIRES = @XKBPROTO_REQUIRES@
+XKEYSYMDB = @XKEYSYMDB@
+XLOCALEDATADIR = @XLOCALEDATADIR@
+XLOCALEDIR = @XLOCALEDIR@
+XLOCALELIBDIR = @XLOCALELIBDIR@
+XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
+XPROTO_CFLAGS = @XPROTO_CFLAGS@
+XPROTO_LIBS = @XPROTO_LIBS@
+XTHREADLIB = @XTHREADLIB@
+XTHREADS = @XTHREADS@
+XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
+XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
+XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CFLAGS = \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/include/X11 \
+	-I$(top_builddir)/include \
+	-I$(top_builddir)/include/X11 \
+	-I$(top_srcdir)/src/xcms \
+	-I$(top_srcdir)/src/xkb \
+	-I$(top_srcdir)/src/xlibi18n \
+	$(X11_CFLAGS) \
+	$(BIGFONT_CFLAGS) \
+	$(XDMCP_CFLAGS) \
+	-D_BSD_SOURCE
+
+@XLIB_LOADABLE_I18N_TRUE@commonlibdir = $(X11_LOCALELIBDIR)/common
+@XLIB_LOADABLE_I18N_TRUE@commonlib_LTLIBRARIES = xlibi18n.la
+@XLIB_LOADABLE_I18N_TRUE@xlibi18n_la_LDFLAGS = -module -version-number 2:0:0
+@XLIB_LOADABLE_I18N_TRUE@xlibi18n_la_LIBADD = $(I18N_MODULE_LIBS)
+@XLIB_LOADABLE_I18N_FALSE@noinst_LTLIBRARIES = libxlibi18n.la
+xlibi18n_la_SOURCES = \
+	lcGenConv.c
+
+libxlibi18n_la_SOURCES = $(xlibi18n_la_SOURCES)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  modules/lc/gen/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  modules/lc/gen/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-commonlibLTLIBRARIES: $(commonlib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(commonlibdir)" || $(MKDIR_P) "$(DESTDIR)$(commonlibdir)"
+	@list='$(commonlib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(commonlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(commonlibdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(commonlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(commonlibdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-commonlibLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(commonlib_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(commonlibdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(commonlibdir)/$$p"; \
+	done
+
+clean-commonlibLTLIBRARIES:
+	-test -z "$(commonlib_LTLIBRARIES)" || rm -f $(commonlib_LTLIBRARIES)
+	@list='$(commonlib_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libxlibi18n.la: $(libxlibi18n_la_OBJECTS) $(libxlibi18n_la_DEPENDENCIES) 
+	$(LINK) $(am_libxlibi18n_la_rpath) $(libxlibi18n_la_OBJECTS) $(libxlibi18n_la_LIBADD) $(LIBS)
+xlibi18n.la: $(xlibi18n_la_OBJECTS) $(xlibi18n_la_DEPENDENCIES) 
+	$(xlibi18n_la_LINK) $(am_xlibi18n_la_rpath) $(xlibi18n_la_OBJECTS) $(xlibi18n_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcGenConv.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	for dir in "$(DESTDIR)$(commonlibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-commonlibLTLIBRARIES clean-generic clean-libtool \
+	clean-noinstLTLIBRARIES mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-commonlibLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-commonlibLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean \
+	clean-commonlibLTLIBRARIES clean-generic clean-libtool \
+	clean-noinstLTLIBRARIES ctags distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-commonlibLTLIBRARIES install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-commonlibLTLIBRARIES
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/libX11/modules/lc/gen/lcGenConv.c b/libX11/modules/lc/gen/lcGenConv.c
new file mode 100644
index 000000000..96b17b834
--- /dev/null
+++ b/libX11/modules/lc/gen/lcGenConv.c
@@ -0,0 +1,3151 @@
+/* $Xorg: lcGenConv.c,v 1.5 2000/08/17 19:45:17 cpqbld Exp $ */
+/*
+ * Copyright 1992, 1993 by TOSHIBA Corp.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of TOSHIBA not be used in advertising
+ * or publicity pertaining to distribution of the software without specific,
+ * written prior permission. TOSHIBA make no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ *
+ * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+ * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ *
+ * Author: Katsuhisa Yano	TOSHIBA Corp.
+ *			   	mopi@osa.ilab.toshiba.co.jp
+ */
+/*
+ *  (c) Copyright 1995 FUJITSU LIMITED
+ *  This is source code modified by FUJITSU LIMITED under the Joint
+ *  Development Agreement for the CDE/Motif PST.
+ *
+ *   Modifier: Masayoshi Shimamura      FUJITSU LIMITED
+ *
+ */
+/*
+ *  2000  
+ *  Modifier: Ivan Pascal      The XFree86 Project
+ */
+/* $XFree86: xc/lib/X11/lcGenConv.c,v 3.27tsi Exp $ */
+
+/*
+ * A generic locale loader for all kinds of ISO-2022 based codesets.
+ * Supports: all locales.
+ * How: Provides generic converters for ISO-2022 based codesets. Extensible as
+ *      far as ISO-2022 is extensible: codesets can be given by name in the
+ *      stream. Overall distinction between GL (0x00..0x7f) and GR (0x80..0xff).
+ *      In every chunk between escape sequences, the number of bytes per
+ *      character (char_size) is constant.
+ * Platforms: all systems.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "Xlibint.h"
+#include "XlcGeneric.h"
+#include <stdio.h>
+
+#if !defined(macII) && !defined(Lynx_22) && !defined(X_LOCALE)
+#define STDCVT
+#endif
+
+typedef struct _CTDataRec {
+    const char *name;
+    const char *encoding; /* Compound Text encoding */
+} CTDataRec, *CTData;
+
+static CTDataRec directionality_data[] =
+{
+    { "BEGIN_LEFT-TO-RIGHT_TEXT", "\2331]" },
+    { "BEGIN_RIGHT-TO-LEFT_TEXT", "\2332]" },
+    { "END_OF_STRING", "\233]" },
+};
+
+typedef struct _StateRec {
+    XLCd lcd;
+    /* CT state */
+    XlcCharSet charset;		/* charset of current state */
+    XlcCharSet GL_charset;	/* charset of initial state in GL */
+    XlcCharSet GR_charset;	/* charset of initial state in GR */
+    /* MB shift state */
+    CodeSet  GL_codeset;
+    CodeSet  GR_codeset;
+} StateRec, *State;
+
+#define GR      0x80    /* begins right-side (non-ascii) region */
+#define GL      0x7f    /* ends left-side (ascii) region        */
+#define ESC	0x1b
+#define CSI	0x9b
+#define STX	0x02
+
+#define isrightside(c)   ((c) & GR)
+#define isleftside(c)  (!isrightside(c))
+
+/* Forward declarations for local routines. */
+static int mbstocts (XlcConv conv, XPointer *from, int *from_left,
+		     XPointer *to, int *to_left, XPointer *args, int num_args);
+static int ctstombs (XlcConv conv, XPointer *from, int *from_left,
+		     XPointer *to, int *to_left, XPointer *args, int num_args);
+static int cstombs (XlcConv conv, XPointer *from, int *from_left,
+		    XPointer *to, int *to_left, XPointer *args, int num_args);
+
+/* ------------------------------------------------------------------------- */
+/*				Misc                                         */
+/* ------------------------------------------------------------------------- */
+
+static int
+compare(
+    const char *src,
+    const char *encoding,
+    int length)
+{
+    const char *start = src;
+
+    while (length-- > 0) {
+	if (*src++ != *encoding++)
+	    return 0;
+	if (*encoding == '\0')
+	    return src - start;
+    }
+
+    return 0;
+}
+
+static unsigned long
+conv_to_dest(
+    Conversion conv,
+    unsigned long code)
+{
+    int i;
+    int conv_num = conv->conv_num;
+    FontScope convlist = conv->convlist;
+
+    for (i = 0; i < conv_num; i++) {
+  	if (convlist[i].start <= code && code <= convlist[i].end) {
+	    switch (convlist[i].shift_direction) {
+	    case '+':
+	        return(code + convlist[i].shift);
+	    case '-':
+		return(code - convlist[i].shift);
+            default:
+		return(code);
+	    }
+	}
+    }
+
+    return(code);
+}
+
+static unsigned long
+conv_to_source(
+    Conversion conv,
+    unsigned long code)
+{
+    int i;
+    int conv_num;
+    FontScope convlist;
+    unsigned long start_p;
+    unsigned long start_m;
+    unsigned long end_p;
+    unsigned long end_m;
+
+    if (!conv)
+	return(code);
+
+    conv_num = conv->conv_num;
+    convlist = conv->convlist;
+
+    for (i = 0; i < conv_num; i++) {
+        switch (convlist[i].shift_direction) {
+	case '+':
+            start_p = convlist[i].start + convlist[i].shift;
+            end_p = convlist[i].end + convlist[i].shift;
+	    if (start_p <= code && code <= end_p)
+		return(code - convlist[i].shift);
+            break;
+	case '-':
+            start_m = convlist[i].start - convlist[i].shift;
+            end_m = convlist[i].end - convlist[i].shift;
+	    if (start_m <= code && code <= end_m)
+		return(code + convlist[i].shift);
+            break;
+        default:
+	    continue;
+	}
+    }
+
+    return(code);
+}
+
+static unsigned long
+mb_to_gi(
+    unsigned long mb,
+    CodeSet codeset)
+{
+    int i;
+    unsigned long mb_tmp, mask = 0;
+
+    if (codeset->mbconv) {
+	mb_tmp = conv_to_dest(codeset->mbconv, mb);
+	if (mb_tmp != mb)
+	    return(mb_tmp);
+    }
+
+    if (codeset->side == XlcC0 || codeset->side == XlcGL || 
+	codeset->side == XlcC1 || codeset->side == XlcGR) {
+
+        for (i = 0; i < codeset->length; i++)
+	    mask = (mask << 8) | GL;
+	mb = mb & mask;
+    }
+
+    return(mb);
+}
+
+static unsigned long
+gi_to_mb(
+    unsigned long glyph_index,
+    CodeSet codeset)
+{
+    int i;
+    unsigned long mask = 0;
+
+    if (codeset->side == XlcC1 || codeset->side == XlcGR) {
+        for (i = 0; i < codeset->length; i++)
+	    mask = (mask << 8) | GR;
+	glyph_index = glyph_index | mask;
+    }
+
+    if (codeset->mbconv)
+        return( conv_to_source(codeset->mbconv, glyph_index) );
+
+    return(glyph_index);
+}
+
+static Bool
+gi_to_wc(
+    XLCd lcd,
+    unsigned long glyph_index,
+    CodeSet codeset,
+    wchar_t *wc)
+{
+    unsigned char mask = 0;
+    unsigned long wc_encoding = codeset->wc_encoding;
+    int length = codeset->length;
+    unsigned long wc_shift_bits = XLC_GENERIC(lcd, wc_shift_bits);
+
+    mask = (1 << wc_shift_bits) - 1 ;
+
+    for (*wc = 0, length--; length >= 0; length--)
+	*wc = (*wc << wc_shift_bits) | ((glyph_index >> (length * 8 )) & mask);
+
+    *wc = *wc | wc_encoding;
+
+    return(True);
+}
+
+static Bool
+wc_to_gi(
+    XLCd lcd,
+    wchar_t wc,
+    unsigned long *glyph_index,
+    CodeSet *codeset)
+{
+    int i;
+    unsigned char mask = 0;
+    unsigned long wc_encoding;
+    unsigned long wc_encode_mask = XLC_GENERIC(lcd, wc_encode_mask);
+    unsigned long wc_shift_bits = XLC_GENERIC(lcd, wc_shift_bits);
+    int codeset_num = XLC_GENERIC(lcd, codeset_num);
+    CodeSet *codeset_list = XLC_GENERIC(lcd, codeset_list);
+
+    wc_encoding = wc & wc_encode_mask;
+    for (*codeset = NULL, i = 0; i < codeset_num; i++) {
+	if (wc_encoding == codeset_list[i]->wc_encoding) {
+	    *codeset = codeset_list[i];
+	    break;
+        }
+    }
+    if (*codeset == NULL)
+	return(False);
+
+    mask = (1 << wc_shift_bits) - 1 ;
+
+    wc = wc & ~wc_encode_mask;
+    for (*glyph_index = 0, i = (*codeset)->length - 1; i >= 0; i--)
+	*glyph_index = (*glyph_index << 8) | 
+		      ( ((unsigned long)wc >> (i * wc_shift_bits)) & mask );
+
+    return(True);
+}
+
+static CodeSet
+mb_parse_codeset(
+    State state,
+    int num,
+    const char **inbufptr,
+    int *from_left)
+{
+    int len;
+    int from_len = (*from_left) + 1;
+    const char *src = (*inbufptr) - 1;
+    ParseInfo *mb_parse_list = XLC_GENERIC(state->lcd, mb_parse_list);
+    ParseInfo parse_info;
+    CodeSet codeset;
+    
+    for (--num ; (parse_info = mb_parse_list[num]) != NULL; num++) {
+       len = compare(src, parse_info->encoding, from_len);
+       if (len > 0) {
+           codeset = parse_info->codeset;
+           if (parse_info->type == E_LSL)
+               state->GL_codeset = codeset;
+           else if (parse_info->type == E_LSR)
+               state->GR_codeset = codeset;
+           --len;
+           *inbufptr += len;
+           *from_left -= len;
+           return codeset;
+       }
+    }
+    return (CodeSet) NULL;
+}
+
+static CodeSet
+byteM_parse_codeset(
+    XLCd lcd,
+    const char *inbufptr)
+{
+    unsigned char ch;
+    CodeSet codeset;
+    ByteInfoList byteM;
+    ByteInfoListRec byteM_rec;
+    ByteInfo byteinfo;
+    ByteInfoRec byteinfo_rec;
+    Bool hit = False;
+    int i, j, k;
+
+    int codeset_num               = XLC_GENERIC(lcd, codeset_num);
+    CodeSet *codeset_list         = XLC_GENERIC(lcd, codeset_list);
+
+    for (i = 0; i < codeset_num; i++) {
+        codeset = codeset_list[i];
+        byteM = codeset->byteM;
+        if (codeset->side != XlcNONE || byteM == NULL)
+	    continue;
+
+        for (j = 0; j < codeset->length; j++) {
+	    ch = *((unsigned char *)(inbufptr + j)); 
+	    byteM_rec = byteM[j];
+	    byteinfo = byteM_rec.byteinfo;
+
+	    for (hit = False, k = 0; k < byteM_rec.byteinfo_num; k++) {
+	        byteinfo_rec = byteinfo[k];
+	        if (byteinfo_rec.start <= ch && ch <= byteinfo_rec.end) {
+	            hit = True;
+		    break;
+                }
+            }
+
+            if (!hit)
+		break;
+        }
+
+        if (hit)
+	    return(codeset);
+    }
+
+    return(NULL);
+}                
+
+#define GLGR_parse_codeset(ch) \
+     (isrightside(ch) ? (state->GR_codeset) : \
+                        (state->GL_codeset) )
+
+static XlcCharSet
+gi_parse_charset(
+    unsigned long glyph_index,
+    CodeSet codeset)
+{
+    int i;
+    XlcCharSet *charset_list = codeset->charset_list;
+    int num_charsets = codeset->num_charsets;
+    ExtdSegment ctextseg = codeset->ctextseg;
+    XlcCharSet charset = NULL;
+    int area_num;
+    FontScope area;
+
+    /* lockup ct sequence */
+    for (i = 0; i < num_charsets; i++) {
+	charset = charset_list[i];
+        if (*charset->ct_sequence != '\0')
+	    break;
+    }
+    if (i >= num_charsets)
+	return(NULL);
+
+    if (charset->source != CSsrcStd)
+        return (charset);
+
+    if (!ctextseg)
+        return(charset);
+
+    area = ctextseg->area;
+    area_num = ctextseg->area_num;
+
+    for (i = 0; i < area_num; i++) {
+
+        if (area[i].start <= glyph_index && glyph_index <= area[i].end) {
+
+	    charset = ctextseg->charset;
+
+            if (*charset->ct_sequence == '\0')
+                return(NULL);
+
+	    break;
+	}
+    }
+
+    return(charset);
+}
+
+static Bool
+ct_parse_csi(
+    const char *inbufptr,
+    int *ctr_seq_len)
+{
+    int i;
+    int num = sizeof(directionality_data) / sizeof(directionality_data[0]);
+
+    for (i = 0; i < num; i++) {
+	if ( !(*ctr_seq_len = strlen(directionality_data[i].encoding)) )
+	    continue;
+
+	if ( strncmp(inbufptr, directionality_data[i].encoding, 
+						*ctr_seq_len) == 0)
+            return(True);
+    }
+
+    return(False);
+}
+
+static int
+cmp_esc_sequence(
+    const char *inbufptr,
+    XlcCharSet charset)
+{
+    int seq_len, name_len, total_len;
+    unsigned char byte_m, byte_l;
+    const char *ct_sequence =  charset->ct_sequence;
+    const char *encoding_name = charset->encoding_name;
+
+    /* check esc sequence */
+    if ( !(seq_len = strlen(ct_sequence) ) )
+	return(0);
+    if ( strncmp(inbufptr, ct_sequence, seq_len) != 0)
+	return(0);
+
+    /* Standard Character Set Encoding ? */
+    if (charset->source == CSsrcStd)
+        return(seq_len);
+
+    /*
+     *   Non-Standard Character Set Encoding
+     *
+     * +--- ---+-----+-----+-----+----   ----+-----+-----+-------   ------+
+     * | ctseq |  M  |  L  |     encoding name     | STX |     contents   |
+     * +--- ---+-----+-----+-----+----   ----+-----+-----+-------   ------+
+     *  4bytes  1byte 1byte     variable length     1byte  variable length
+     * 	                   |                                              |
+     * 	                   +----------------------------------------------+
+     * 	                     rest length  = ((M - 128) * 128) + (L - 128)
+     */
+
+    /* get length of encoding name */
+    inbufptr += seq_len;
+    byte_m = *inbufptr++;
+    byte_l = *inbufptr++;
+    name_len = strlen(encoding_name);
+
+    if (((byte_m - 128) * 128 + (byte_l - 128) - 1) < name_len)
+	return(0);
+
+    if ( _XlcNCompareISOLatin1(inbufptr, encoding_name, name_len) != 0 )
+	return(0);
+
+    /* check STX (Start of Text) */
+    inbufptr = inbufptr + name_len;
+    if ( *inbufptr != STX )
+	return(0);
+
+    total_len = seq_len + name_len + 3;
+    return(total_len);
+}
+
+static Bool
+ct_parse_charset(
+    XLCd lcd,
+    const char *inbufptr,
+    XlcCharSet *charset,
+    int *ctr_seq_len)
+{
+    int i, j;
+    ExtdSegment ctextseg;
+    int num_charsets;
+    XlcCharSet *charset_list;
+    CodeSet codeset;
+    int codeset_num       = XLC_GENERIC(lcd, codeset_num);
+    CodeSet *codeset_list = XLC_GENERIC(lcd, codeset_list);
+    int segment_conv_num  = XLC_GENERIC(lcd, segment_conv_num);
+    SegConv segment_conv  = XLC_GENERIC(lcd, segment_conv);
+
+    /* get charset from XLC_XLOCALE by escape sequence */
+
+    for (i = 0; i < codeset_num; i++) {
+	codeset = codeset_list[i];
+
+	num_charsets = codeset->num_charsets;
+	charset_list = codeset->charset_list;
+	ctextseg     = codeset->ctextseg;
+
+	for (j = 0; j < num_charsets; j++) {
+	    *charset = charset_list[j];
+            if ((*ctr_seq_len = cmp_esc_sequence(inbufptr, *charset)))
+		return(True);
+	}
+
+	if (ctextseg) {
+	    *charset = ctextseg->charset;
+            if ((*ctr_seq_len = cmp_esc_sequence(inbufptr, *charset)))
+		return(True);
+	}
+    }
+
+    /* get charset from XLC_SEGMENTCONVERSION by escape sequence */
+
+    if (!segment_conv)
+	return(False);
+
+    for (i = 0; i < segment_conv_num; i++) {
+	*charset = segment_conv[i].source;
+        if ((*ctr_seq_len = cmp_esc_sequence(inbufptr, *charset)))
+	    return(True);
+	*charset = segment_conv[i].dest;
+        if ((*ctr_seq_len = cmp_esc_sequence(inbufptr, *charset)))
+	    return(True);
+    }
+
+    return(False);
+}
+
+static Bool
+segment_conversion(
+    XLCd lcd,
+    XlcCharSet *charset,
+    unsigned long *glyph_index)
+{
+    int i;
+    int segment_conv_num = XLC_GENERIC(lcd, segment_conv_num);
+    SegConv segment_conv = XLC_GENERIC(lcd, segment_conv);
+    FontScopeRec range;
+    ConversionRec conv_rec;
+
+    if (!segment_conv)
+	return(True);
+
+    for (i = 0; i < segment_conv_num; i++) {
+	if (segment_conv[i].source == *charset)
+	    break;
+    }
+
+    if (i >= segment_conv_num)
+	return(True);
+
+    range = segment_conv[i].range;
+    if (*glyph_index < range.start || range.end < *glyph_index)
+	return(True);
+    
+    *charset = segment_conv[i].dest;
+    conv_rec.conv_num = segment_conv[i].conv_num;
+    conv_rec.convlist = segment_conv[i].conv;
+    *glyph_index = conv_to_dest(&conv_rec, *glyph_index);
+
+    return(True);
+}
+
+static CodeSet
+_XlcGetCodeSetFromName(
+    XLCd lcd,
+    const char *name)
+{
+    int i, j;
+    XlcCharSet charset;
+    int num_charsets;
+    XlcCharSet *charset_list;
+    CodeSet codeset;
+
+    int codeset_num       = XLC_GENERIC(lcd, codeset_num);
+    CodeSet *codeset_list = XLC_GENERIC(lcd, codeset_list);
+
+    for (i = 0; i < codeset_num; i++) {
+        codeset = codeset_list[i];
+
+        num_charsets = codeset->num_charsets;
+        charset_list = codeset->charset_list;
+
+        for (j = 0; j < num_charsets; j++) {
+            charset = charset_list[j];
+
+            if (!strlen(charset->name))
+                continue;
+            if ( strcmp(charset->name, name) == 0)
+                return(codeset);
+        }
+    }
+
+    return(NULL);
+}
+
+static Bool
+_XlcGetCodeSetFromCharSet(
+    XLCd lcd,
+    XlcCharSet charset,
+    CodeSet *codeset,
+    unsigned long *glyph_index)
+{
+    int j, num;
+    CodeSet *codeset_list = XLC_GENERIC(lcd, codeset_list);
+    XlcCharSet *charset_list;
+    int codeset_num, num_charsets;
+    Conversion ctconv;
+    unsigned long glyph_index_tmp = 0;
+    ExtdSegment ctextseg;
+
+    codeset_num = XLC_GENERIC(lcd, codeset_num);
+
+    for (num = 0 ; num < codeset_num; num++) {
+        *codeset = codeset_list[num];
+        ctconv = (*codeset)->ctconv;
+	ctextseg = (*codeset)->ctextseg;
+
+        num_charsets = (*codeset)->num_charsets;
+        charset_list = (*codeset)->charset_list;
+
+        glyph_index_tmp = conv_to_source(ctconv, *glyph_index);
+
+        if (charset->source == CSsrcStd) {
+
+            /* Standard Character Set Encoding */
+	    if (glyph_index_tmp == *glyph_index) {
+                for (j = 0; j < num_charsets; j++) {
+                    if (charset_list[j] == charset) {
+                        goto end_loop;
+                    }
+                }
+            }
+
+	} else {
+
+            /* Non-Standard Character Set Encoding */
+            for (j = 0; j < num_charsets; j++) {
+                if (charset_list[j] == charset) {
+                    goto end_loop;
+                }
+            }
+
+            if (glyph_index_tmp != *glyph_index) {
+		if (ctextseg && ctextseg->charset == charset) {
+		    goto end_loop;
+                }
+            }
+
+	}
+
+    }
+
+end_loop:
+    if (num < codeset_num) {
+	*glyph_index = glyph_index_tmp;
+	return(True);
+    }
+
+    return(False);
+}
+
+#define check_string_encoding(codeset)	(codeset->string_encoding)
+
+static void
+output_ulong_value(
+    char *outbufptr,
+    unsigned long code,
+    int length,
+    XlcSide side)
+{
+    int i;
+
+    for (i = (length - 1) * 8; i >= 0; i -= 8) {
+	*outbufptr = ( code >> i) & 0xff;
+
+	if (side == XlcC0 || side == XlcGL) {
+	    *outbufptr = *outbufptr & GL;
+	} else if (side == XlcC1 || side == XlcGR) {
+	    *outbufptr = *outbufptr | GR;
+	}
+
+	outbufptr++;
+    }
+}
+
+/* -------------------------------------------------------------------------- */
+/*				Init                                          */
+/* -------------------------------------------------------------------------- */
+
+static XlcCharSet default_GL_charset = 0;
+static XlcCharSet default_GR_charset = 0;
+
+static void
+init_state(
+    XlcConv conv)
+{
+    State state = (State) conv->state;
+
+    /* for CT */
+    state->charset = NULL;
+    state->GL_charset = default_GL_charset;
+    state->GR_charset = default_GR_charset;
+
+    /* for MB shift state */
+    state->GL_codeset = XLC_GENERIC(state->lcd, initial_state_GL);
+    state->GR_codeset = XLC_GENERIC(state->lcd, initial_state_GR);
+}
+
+/* -------------------------------------------------------------------------- */
+/*				Convert                                       */
+/* -------------------------------------------------------------------------- */
+
+static int
+mbstowcs_org(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    State state = (State) conv->state;
+    XLCd lcd = state->lcd;
+
+    unsigned char ch;
+    unsigned long mb = 0;
+    wchar_t wc;
+
+    int length = 0, len_left = 0;
+    int unconv_num = 0;
+    int num;
+
+    CodeSet codeset = NULL;
+
+    const char *inbufptr = *from;
+    wchar_t *outbufptr = (wchar_t *) *to;
+    int from_size = *from_left;
+
+    unsigned char *mb_parse_table = XLC_GENERIC(lcd, mb_parse_table);
+
+    if (from == NULL || *from == NULL) {
+	_XlcResetConverter(conv);
+        return( 0 );
+    }
+
+    if (*from_left > *to_left)
+        *from_left = *to_left;
+
+    while (*from_left && *to_left) {
+
+	ch = *inbufptr++;
+	(*from_left)--;
+
+	/* null ? */
+	if (!ch) {
+            if (outbufptr) {*outbufptr++ = L'\0';}
+	    (*to_left)--;
+
+	    /* error check */
+            if (len_left) {
+	        unconv_num += (length - len_left);
+		len_left = 0;
+            }
+
+	    continue;
+	}
+
+	/* same mb char data */
+        if (len_left)
+	    goto output_one_wc;
+
+        /* next mb char data for single shift ? */
+	if (mb_parse_table && (num = mb_parse_table[ch]) ) {
+	    codeset = mb_parse_codeset(state, num, &inbufptr, from_left);
+            if (codeset != NULL) {
+		length = len_left = codeset->length;
+		mb = 0;
+		continue;
+	    }
+        }
+    
+	/* next mb char data for byteM ? */
+	if ((codeset = byteM_parse_codeset(lcd, (inbufptr - 1))))
+	    goto next_mb_char;
+
+	/* next mb char data for GL or GR side ? */
+	if ((codeset = GLGR_parse_codeset(ch)))
+	    goto next_mb_char;
+	    
+        /* can't find codeset for the ch */
+        unconv_num++;
+        continue;
+
+next_mb_char:
+        length = len_left = codeset->length;
+	mb = 0;
+
+output_one_wc:
+	mb = (mb << 8) | ch;  /* 1 byte left shift */
+	len_left--;
+
+        /* last of one mb char data */
+        if (!len_left) {
+            gi_to_wc(lcd, mb_to_gi(mb, codeset), codeset, &wc);
+            if (outbufptr) {*outbufptr++ = wc;}
+	    (*to_left)--;
+        }
+
+    } /* end of while */
+
+    /* error check on last char */
+    if (len_left) {
+	inbufptr -= (length - len_left);
+	(*from_left) += (length - len_left);
+	unconv_num += (length - len_left);
+    }
+
+    *from = (XPointer) ((const char *) *from + from_size);
+    *from_left = 0;
+    *to = (XPointer) outbufptr;
+
+    return unconv_num;
+}
+
+static int
+stdc_mbstowcs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    const char *src = *((const char **) from);
+    wchar_t *dst = *((wchar_t **) to);
+    int src_left = *from_left;
+    int dst_left = *to_left;
+    int length, unconv_num = 0;
+
+    while (src_left > 0 && dst_left > 0) {
+	length = mbtowc(dst, src, src_left);
+
+	if (length > 0) {
+	    src += length;
+	    src_left -= length;
+	    if (dst)
+	        dst++;
+	    dst_left--;
+	} else if (length < 0) {
+	    src++;
+	    src_left--;
+	    unconv_num++;
+        } else {
+            /* null ? */
+            src++;
+            src_left--;
+            if (dst) 
+                *dst++ = L'\0';
+            dst_left--;
+        }
+    }
+
+    *from = (XPointer) src;
+    if (dst)
+	*to = (XPointer) dst;
+    *from_left = src_left;
+    *to_left = dst_left;
+
+    return unconv_num;
+}
+
+static int
+wcstombs_org(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    State state = (State) conv->state;
+    XLCd lcd = state->lcd;
+
+    char *encoding;
+    unsigned long mb, glyph_index;
+    wchar_t wc;
+
+    int length;
+    int unconv_num = 0;
+
+    CodeSet codeset;
+
+    const wchar_t *inbufptr = (const wchar_t *) *from;
+    char *outbufptr = *to;
+    int from_size = *from_left;
+    
+    const char *default_string = XLC_PUBLIC(lcd, default_string);
+    int defstr_len = strlen(default_string);
+
+
+    if (*from_left > *to_left)
+        *from_left = *to_left;
+
+    while (*from_left && *to_left) {
+
+        wc = *inbufptr++;
+        (*from_left)--;
+
+        /* null ? */
+        if (!wc) {
+            if (outbufptr) {*outbufptr++ = '\0';}
+            (*to_left)--;
+
+            continue;
+        }
+
+        /* convert */
+	if ( !wc_to_gi(lcd, wc, &glyph_index, &codeset) ) {
+
+	    /* output default_string of XDefaultString() */
+            if (*to_left < defstr_len)
+		break;
+	    if (outbufptr) {
+                strncpy((char *)outbufptr, default_string, defstr_len);
+                outbufptr += defstr_len;
+            }
+	    (*to_left) -= defstr_len;
+
+            unconv_num++;
+
+        } else {
+            mb = gi_to_mb(glyph_index, codeset);
+	    if (codeset->parse_info) {
+                Bool need_shift = False;
+                switch (codeset->parse_info->type) {
+                    case E_LSL :
+                        if (codeset != state->GL_codeset) {
+                            need_shift = True;
+                            state->GL_codeset = codeset;
+                        }
+                        break;
+                    case E_LSR :
+                        if (codeset != state->GR_codeset) {
+                            need_shift = True;
+                            state->GR_codeset = codeset;
+                        }
+                        break;
+                    /* case E_SS */
+                    default:
+                        need_shift = True;
+                }
+
+		/* output shift sequence */
+                if (need_shift) {
+		    encoding = codeset->parse_info->encoding;
+                    length = strlen(encoding);
+                    if (*to_left < length)
+		        break;
+	            if (outbufptr) {
+                        strncpy((char *)outbufptr, encoding, length);
+	                outbufptr += length;
+                    }
+	            (*to_left) -= length;
+                }
+            }
+
+            /* output characters */
+	    length = codeset->length;
+            if (*to_left < length)
+		break;
+
+	    if (outbufptr) {
+		output_ulong_value(outbufptr, mb, length, XlcNONE);
+	        outbufptr += length;
+	    }
+
+	    (*to_left) -= length;
+        }
+
+    } /* end of while */
+
+    *from = (XPointer) ((const wchar_t *) *from + from_size);
+    *from_left = 0;
+    *to = (XPointer) outbufptr;
+
+    return unconv_num;
+}
+
+static int
+stdc_wcstombs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    const wchar_t *src = *((const wchar_t **) from);
+    char *dst = *((char **) to);
+    int src_left = *from_left;
+    int dst_left = *to_left;
+    int length, unconv_num = 0;
+
+    while (src_left > 0 && dst_left >= MB_CUR_MAX) {
+	length = wctomb(dst, *src);		/* XXX */
+
+        if (length > 0) {
+	    src++;
+	    src_left--;
+	    if (dst) 
+		dst += length;
+	    dst_left -= length;
+	} else if (length < 0) {
+	    src++;
+	    src_left--;
+	    unconv_num++;
+	} 
+    }
+
+    *from = (XPointer) src;
+    if (dst)
+      *to = (XPointer) dst;
+    *from_left = src_left;
+    *to_left = dst_left;
+
+    return unconv_num;
+}
+
+static int
+wcstocts(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    State state = (State) conv->state;
+    XLCd lcd = state->lcd;
+
+    unsigned long glyph_index;
+    wchar_t wc;
+
+    int total_len, seq_len, name_len;
+    int unconv_num = 0;
+    Bool first_flag = True, standard_flag;
+    XlcSide side;
+
+    CodeSet codeset;
+    XlcCharSet charset, old_charset = NULL;
+    const char *ct_sequence;
+
+    const wchar_t *inbufptr = (const wchar_t *) *from;
+    char *outbufptr = *to;
+    int from_size = *from_left;
+    char *ext_seg_len = NULL;
+
+    if (*from_left > *to_left)
+        *from_left = *to_left;
+
+    while (*from_left && *to_left) {
+
+        wc = *inbufptr++;
+        (*from_left)--;
+
+        /* null ? */
+        if (!wc) {
+            if (outbufptr) {*outbufptr++ = '\0';}
+            (*to_left)--;
+
+            continue;
+        }
+
+        /* convert */
+	if ( !wc_to_gi(lcd, wc, &glyph_index, &codeset) ) {
+            unconv_num++;
+	    continue;
+        }
+
+        /* parse charset */
+        if ( !(charset = gi_parse_charset(glyph_index, codeset)) ) {
+            unconv_num++;
+	    continue;
+        }
+
+        /* Standard Character Set Encoding ? */
+	standard_flag = charset->source == CSsrcStd ? True : False;
+
+        /*
+         *   Non-Standard Character Set Encoding
+         *
+         * +-----+-----+-----+-----+-----+-----+-----+----   ----+-----+-----+
+         * |     esc sequence      |  M  |  L  |     encoding name     | STX |
+         * +-----+-----+-----+-----+-----+-----+-----+----   ----+-----+-----+
+         *           4bytes         1byte 1byte     variable length     1byte 
+         * 	                   |                                         |
+         * 	                   +-----------------------------------------+
+         * 	                     name length  = ((M - 128) * 128) + (L - 128)
+         */
+
+        /* make encoding data */
+	ct_sequence = charset->ct_sequence;
+	side = charset->side;
+        seq_len = strlen(ct_sequence);
+	if (standard_flag) {
+            name_len = 0;
+	    total_len = seq_len;
+	} else {
+            name_len = strlen(charset->encoding_name) + 1;
+	    total_len = seq_len + name_len + 2;
+	}
+
+        /* output escape sequence of CT */
+	if ( (charset != old_charset) &&
+	    !(first_flag && charset->string_encoding) ){
+
+            if ( (ext_seg_len != NULL) && outbufptr) {
+                int i = (outbufptr - ext_seg_len) - 2;
+                *ext_seg_len++ = i / 128 + 128;
+                *ext_seg_len   = i % 128 + 128;
+                ext_seg_len = NULL;
+            }
+	    
+	    if (*to_left < total_len + 1) {
+                unconv_num++;
+	        break;
+	    }
+
+	    if (outbufptr) {
+	        strcpy((char *)outbufptr, ct_sequence);
+		outbufptr += seq_len;
+
+                if (!standard_flag) {
+                    const char *i = charset->encoding_name;
+                    ext_seg_len = outbufptr;
+                    outbufptr += 2;
+	            for (; *i ; i++)
+                        *outbufptr++ = ((*i >= 'A') && (*i <= 'Z')) ?
+                                       *i - 'A' + 'a' : *i;
+		    *outbufptr++ = STX;
+                }
+	    }
+
+	    (*to_left) -= total_len;
+
+	    first_flag = False;
+	    old_charset = charset;
+	}
+
+        /* output glyph index */
+	if (codeset->ctconv)
+            glyph_index = conv_to_dest(codeset->ctconv, glyph_index);
+        if (*to_left < charset->char_size) {
+            unconv_num++;
+	    break;
+        }
+
+	if (outbufptr) {
+	   output_ulong_value(outbufptr, glyph_index, charset->char_size, side);
+	   outbufptr += charset->char_size;
+	}
+
+	(*to_left) -= charset->char_size;
+
+    } /* end of while */
+
+    if ( (ext_seg_len != NULL) && outbufptr) {
+        int i = (outbufptr - ext_seg_len) - 2;
+        *ext_seg_len++ = i / 128 + 128;
+        *ext_seg_len   = i % 128 + 128;
+    }
+
+    *from = (XPointer) ((const wchar_t *) *from + from_size);
+    *from_left = 0;
+    *to = (XPointer) outbufptr;
+
+    return unconv_num;
+}
+
+static int
+stdc_wcstocts(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    XPointer buf = Xmalloc((*from_left) * MB_CUR_MAX);
+    char *buf_ptr1 = buf;
+    int buf_left1 = (*from_left) * MB_CUR_MAX;
+    char *buf_ptr2 = buf_ptr1;
+    int buf_left2;
+    int unconv_num1 = 0, unconv_num2 = 0;
+
+    unconv_num1 = stdc_wcstombs(conv, 
+		from, from_left, &buf_ptr1, &buf_left1, args, num_args);
+    if (unconv_num1 < 0)
+        goto ret;
+
+    buf_left2 = buf_ptr1 - buf_ptr2;
+
+    unconv_num2 = mbstocts(conv, 
+		&buf_ptr2, &buf_left2, to, to_left, args, num_args);
+    if (unconv_num2 < 0)
+        goto ret;
+
+ret:
+    if (buf)
+	Xfree((char *)buf);
+
+    return (unconv_num1 + unconv_num2);
+}
+
+static int
+ctstowcs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    State state = (State) conv->state;
+    XLCd lcd = state->lcd;
+
+    unsigned char ch;
+    unsigned long glyph_index = 0;
+    wchar_t wc;
+
+    int ctr_seq_len = 0, gi_len_left = 0, gi_len = 0;
+    int unconv_num = 0;
+
+    CodeSet codeset = NULL;
+    XlcCharSet charset_tmp;
+
+    const char *inbufptr = *from;
+    wchar_t *outbufptr = (wchar_t *) *to;
+    int from_size = *from_left;
+
+    _XlcResetConverter(conv); /* ??? */
+
+    if (from == NULL || *from == NULL) {
+	_XlcResetConverter(conv);
+        return( 0 );
+    }
+
+    if (*from_left > *to_left)
+        *from_left = *to_left;
+
+    while (*from_left && *to_left) {
+
+	ch = *inbufptr++;
+	(*from_left)--;
+
+	/* null ? */
+	if (!ch) {
+            if (outbufptr) {*outbufptr++ = L'\0';}
+	    (*to_left)--;
+
+	    /* error check */
+            if (gi_len_left) {
+	        unconv_num += (gi_len - gi_len_left);
+		gi_len_left = 0;
+            }
+
+	    continue;
+	}
+
+	/* same glyph_index data */
+        if (gi_len_left)
+	    goto output_one_wc;
+
+        /* control sequence ? */
+        if (ch == CSI) {
+            if ( !ct_parse_csi(inbufptr - 1, &ctr_seq_len) )
+	        goto skip_the_seg;
+
+	    if (*from_left + 1 < ctr_seq_len) {
+		inbufptr--;
+		(*from_left)++;
+		unconv_num += *from_left;
+		break;
+	    }
+
+            /* skip the control sequence */
+	    inbufptr += (ctr_seq_len - 1);
+	    *from_left -= (ctr_seq_len - 1);
+
+            continue;
+	}
+
+        /* escape sequence ? */
+        if (ch == ESC) {
+	    if ( !ct_parse_charset(lcd, 
+			inbufptr - 1, &state->charset, &ctr_seq_len) )
+		goto skip_the_seg;
+
+	    if (state->charset->side == XlcC0 || 
+		state->charset->side == XlcGL)
+	      {
+		state->GL_charset = state->charset;
+	      }
+	    else if (state->charset->side == XlcC1 || 
+		     state->charset->side == XlcGR)
+	      {
+		state->GR_charset = state->charset;
+	      }	
+	    else if (state->charset->side == XlcGLGR)
+	      {
+		state->GL_charset = state->charset;
+		state->GR_charset = state->charset;
+	      }	
+
+	    if (*from_left + 1 < ctr_seq_len) {
+		inbufptr--;
+		(*from_left)++;
+		unconv_num += *from_left;
+		break;
+	    }
+
+            /* skip the escape sequence */
+	    inbufptr += (ctr_seq_len - 1);
+	    *from_left -= (ctr_seq_len - 1);
+
+            continue;
+        } 
+
+ 	/* check current state */
+	if (isleftside(ch))
+	  state->charset = state->GL_charset;
+	else
+	  state->charset = state->GR_charset;
+
+	gi_len = gi_len_left = state->charset->char_size;
+	glyph_index = 0;
+
+output_one_wc:
+        if (state->charset->side == XlcC1 || state->charset->side == XlcGR)
+            glyph_index = (glyph_index << 8) | (ch & GL);
+        else
+            glyph_index = (glyph_index << 8) | ch;
+
+	gi_len_left--;
+
+        /* last of one glyph_index data */
+        if (!gi_len_left) {
+
+	    /* segment conversion */
+	    charset_tmp = state->charset;
+	    segment_conversion(lcd, &charset_tmp, &glyph_index);
+
+            /* get codeset */
+            if ( !_XlcGetCodeSetFromCharSet(lcd, charset_tmp, 
+						&codeset, &glyph_index) ) {
+		unconv_num += gi_len;
+		continue;
+            }
+
+            /* convert glyph index to wicd char */
+            gi_to_wc(lcd, glyph_index, codeset, &wc);
+            if (outbufptr) {*outbufptr++ = wc;}
+	    (*to_left)--;
+        }
+
+        continue;
+
+skip_the_seg:
+	/* skip until next escape or control sequence */
+        while ( *from_left ) {
+	    ch = *inbufptr++;
+	    (*from_left)--;
+	    unconv_num++;
+
+            if (ch == ESC || ch == CSI) {
+		inbufptr--;
+		(*from_left)++;
+		unconv_num--;
+		break;
+	    }
+        }
+
+        if ( !(*from_left) )
+	    break;
+
+    } /* end of while */
+
+    /* error check on last char */
+    if (gi_len_left) {
+	inbufptr -= (gi_len - gi_len_left);
+	(*from_left) += (gi_len - gi_len_left);
+	unconv_num += (gi_len - gi_len_left);
+    }
+
+    *from = (XPointer) ((const char *) *from + from_size);
+    *from_left = 0;
+    *to = (XPointer) outbufptr;
+
+    return unconv_num;
+}
+
+static int
+cstowcs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    State state = (State) conv->state;
+    XLCd lcd = state->lcd;
+
+    unsigned char ch;
+    unsigned long glyph_index = 0;
+    wchar_t wc;
+    int gi_len_left = 0, gi_len = 0;
+
+    int unconv_num = 0;
+
+    CodeSet codeset = NULL;
+    XlcCharSet charset, charset_tmp;
+
+    const char *inbufptr = *from;
+    wchar_t *outbufptr = (wchar_t *) *to;
+    int from_size = *from_left;
+
+    if (from == NULL || *from == NULL) {
+        return( 0 );
+    }
+
+    charset = (XlcCharSet) args[0];
+
+    while (*from_left && *to_left) {
+
+        if (!gi_len_left) {
+            gi_len_left = gi_len = charset->char_size;
+            glyph_index = 0;
+        }
+
+	ch = *inbufptr++;
+	(*from_left)--;
+
+	/* null ? */
+	if (!ch) {
+            if (outbufptr) {*outbufptr++ = L'\0';}
+	    (*to_left)--;
+
+	    /* error check */
+            if (gi_len_left) {
+	        unconv_num += (gi_len - gi_len_left);
+		gi_len_left = 0;
+            }
+	    continue;
+	}
+
+        if (charset->side == XlcC1 || charset->side == XlcGR)
+            glyph_index = (glyph_index << 8) | (ch & GL);
+        else
+            glyph_index = (glyph_index << 8) | ch;
+
+	gi_len_left--;
+
+        /* last of one glyph_index data */
+        if (!gi_len_left) {
+
+	    /* segment conversion */
+	    charset_tmp = charset;
+	    segment_conversion(lcd, &charset_tmp, &glyph_index);
+
+            /* get codeset */
+            if ( !_XlcGetCodeSetFromCharSet(lcd, charset_tmp, 
+						&codeset, &glyph_index) ) {
+		unconv_num += gi_len;
+		continue;
+            }
+
+            /* convert glyph index to wicd char */
+            gi_to_wc(lcd, glyph_index, codeset, &wc);
+            if (outbufptr) {*outbufptr++ = wc;}
+	    (*to_left)--;
+        }
+
+    } /* end of while */
+
+    /* error check on last char */
+    if (gi_len_left) {
+	inbufptr -= (gi_len - gi_len_left);
+	(*from_left) += (gi_len - gi_len_left);
+	unconv_num += (gi_len - gi_len_left);
+    }
+
+    *from = (XPointer) ((const char *) *from + from_size);
+    *from_left = 0;
+    *to = (XPointer) outbufptr;
+
+    return unconv_num;
+}
+
+static int
+stdc_ctstowcs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    XPointer buf = Xmalloc((*from_left) * MB_CUR_MAX);
+    char *buf_ptr1 = buf;
+    int buf_left1 = (*from_left) * MB_CUR_MAX;
+    char *buf_ptr2 = buf_ptr1;
+    int buf_left2;
+    int unconv_num1 = 0, unconv_num2 = 0;
+
+    unconv_num1 = ctstombs(conv, 
+		from, from_left, &buf_ptr1, &buf_left1, args, num_args);
+    if (unconv_num1 < 0)
+        goto ret;
+
+    buf_left2 = buf_ptr1 - buf_ptr2;
+
+    unconv_num2 = stdc_mbstowcs(conv, 
+		&buf_ptr2, &buf_left2, to, to_left, args, num_args);
+    if (unconv_num2 < 0)
+        goto ret;
+
+ret:
+    if (buf)
+	Xfree((char *)buf);
+
+    return (unconv_num1 + unconv_num2);
+}
+
+static int
+stdc_cstowcs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    XPointer buf = Xmalloc((*from_left) * MB_CUR_MAX);
+    char *buf_ptr1 = buf;
+    int buf_left1 = (*from_left) * MB_CUR_MAX;
+    char *buf_ptr2 = buf_ptr1;
+    int buf_left2;
+    int unconv_num1 = 0, unconv_num2 = 0;
+
+    unconv_num1 = cstombs(conv, 
+		from, from_left, &buf_ptr1, &buf_left1, args, num_args);
+    if (unconv_num1 < 0)
+        goto ret;
+
+    buf_left2 = buf_ptr1 - buf_ptr2;
+
+    unconv_num2 = stdc_mbstowcs(conv, 
+		&buf_ptr2, &buf_left2, to, to_left, args, num_args);
+    if (unconv_num2 < 0)
+        goto ret;
+
+ret:
+    if (buf)
+	Xfree((char *)buf);
+
+    return (unconv_num1 + unconv_num2);
+}
+
+static int
+mbstocts(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    XPointer buf = Xmalloc((*from_left) * sizeof(wchar_t));
+    char *buf_ptr1 = buf;
+    int buf_left1 = (*from_left);
+    char *buf_ptr2 = buf_ptr1;
+    int buf_left2;
+    int unconv_num1 = 0, unconv_num2 = 0;
+
+    unconv_num1 = mbstowcs_org(conv, 
+		from, from_left, &buf_ptr1, &buf_left1, args, num_args);
+    if (unconv_num1 < 0)
+        goto ret;
+
+    buf_left2 = (buf_ptr1 - buf_ptr2) / sizeof(wchar_t);
+
+    unconv_num2 += wcstocts(conv, 
+		&buf_ptr2, &buf_left2, to, to_left, args, num_args);
+    if (unconv_num2 < 0)
+        goto ret;
+
+ret:
+    if (buf)
+	Xfree((char *)buf);
+
+    return (unconv_num1 + unconv_num2);
+}
+
+static int
+mbstostr(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    State state = (State) conv->state;
+    XLCd lcd = state->lcd;
+
+    unsigned char ch;
+    unsigned long mb = 0;
+
+    int length = 0, len_left = 0;
+    int unconv_num = 0;
+    int num;
+
+    CodeSet codeset = NULL;
+
+    const char *inbufptr = *from;
+    char *outbufptr = *to;
+    int from_size = *from_left;
+
+    unsigned char *mb_parse_table = XLC_GENERIC(lcd, mb_parse_table);
+
+    if (from == NULL || *from == NULL) {
+	_XlcResetConverter(conv);
+        return( 0 );
+    }
+
+    if (*from_left > *to_left)
+        *from_left = *to_left;
+
+    while (*from_left && *to_left) {
+
+	ch = *inbufptr++;
+	(*from_left)--;
+
+	/* null ? */
+	if (!ch) {
+            if (outbufptr) {*outbufptr++ = '\0';}
+	    (*to_left)--;
+
+            /* error check */
+            if (len_left) {
+                unconv_num += (length - len_left);
+                len_left = 0;
+            }
+
+	    continue;
+	}
+
+        /* same mb char data */
+        if (len_left)
+            goto output_one_mb;
+
+        /* next mb char data for single shift ? */
+	if (mb_parse_table && (num = mb_parse_table[ch]) ) {
+	    codeset = mb_parse_codeset(state, num, &inbufptr, from_left);
+            if (codeset != NULL) {
+		length = len_left = codeset->length;
+		mb = 0;
+		continue;
+	    }
+        }
+
+	/* next char data : byteM ? */
+	if ((codeset = byteM_parse_codeset(lcd, (inbufptr - 1))))
+	    goto next_mb_char;
+
+	/* next char data : GL or GR side ? */
+	if ((codeset = GLGR_parse_codeset(ch)))
+	    goto next_mb_char;
+	    
+        /* can't find codeset for the ch */
+        unconv_num++;
+        continue;
+
+next_mb_char:
+        length = len_left = codeset->length;
+        mb = 0;
+
+output_one_mb:
+        mb = (mb << 8) | ch;  /* 1 byte left shift */
+        len_left--;
+
+        /* last of one mb char data */
+        if (!len_left) {
+            if (check_string_encoding(codeset)) {
+                if (outbufptr) {*outbufptr++ = mb & 0xff;}
+		(*to_left)--;
+            } else {
+	        unconv_num++;
+            }
+        }
+
+    } /* end of while */
+
+    /* error check on last char */
+    if (len_left) {
+        inbufptr -= (length - len_left);
+        (*from_left) += (length - len_left);
+        unconv_num += (length - len_left);
+    }
+
+    *from = (XPointer) ((const char *) *from + from_size);
+    *from_left = 0;
+    *to = (XPointer) outbufptr;
+
+    return unconv_num;
+}
+
+static int
+mbtocs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    State state = (State) conv->state;
+    XLCd lcd = state->lcd;
+
+    unsigned char ch;
+    unsigned long mb = 0;
+    unsigned long glyph_index;
+
+    int length = 0, len_left = 0, char_len;
+    int unconv_num = 0;
+    int num;
+    XlcSide side;
+
+    CodeSet codeset = NULL;
+    XlcCharSet charset = NULL;
+
+    const char *inbufptr = *from;
+    char *outbufptr = *to;
+    int from_size = *from_left;
+
+    unsigned char *mb_parse_table = XLC_GENERIC(lcd, mb_parse_table);
+
+    if (from == NULL || *from == NULL) {
+	_XlcResetConverter(conv);
+        return( 0 );
+    }
+
+    if (*from_left > *to_left)
+        *from_left = *to_left;
+
+    while (*from_left && *to_left) {
+
+	ch = *inbufptr++;
+	(*from_left)--;
+
+	/* null ? */
+	if (!ch) {
+            unconv_num = 1;
+            if (len_left)
+	        unconv_num += (length - len_left);
+	    break;
+	}
+
+	/* same mb char data */
+        if (len_left)
+	    goto output;
+
+        /* next mb char data for single shift ? */
+	if (mb_parse_table && (num = mb_parse_table[ch]) ) {
+	    codeset = mb_parse_codeset(state, num, &inbufptr, from_left);
+            if (codeset != NULL) {
+		length = len_left = codeset->length;
+		mb = 0;
+		continue;
+	    }
+        }
+
+	/* next mb char data for byteM ? */
+	if ((codeset = byteM_parse_codeset(lcd, (inbufptr - 1))))
+	    goto next_mb_char;
+
+	/* next mb char data for GL or GR side ? */
+	if ((codeset = GLGR_parse_codeset(ch)))
+	    goto next_mb_char;
+	    
+        /* can't find codeset for the ch */
+        unconv_num = 1;
+        break;
+
+next_mb_char:
+        length = len_left = codeset->length;
+	mb = 0;
+
+output:
+	mb = (mb << 8) | ch;  /* 1 byte left shift */
+	len_left--;
+
+        /* last of one mb char data */
+        if (!len_left) {
+            glyph_index = mb_to_gi(mb, codeset);
+            if (!(charset = gi_parse_charset(glyph_index, codeset))) {
+                unconv_num = length;
+                break;
+            }
+            char_len = charset->char_size;
+	    side = charset->side;
+
+            /* output glyph index */
+            if (codeset->ctconv)
+                glyph_index = conv_to_dest(codeset->ctconv, glyph_index);
+            if (*to_left < char_len) {
+                unconv_num = length;
+                break;
+            }
+
+	    if (outbufptr) {
+	        output_ulong_value(outbufptr, glyph_index, char_len, side);
+	        outbufptr += char_len;
+	    }
+
+            (*to_left) -= char_len;
+
+            break;
+        }
+
+    } /* end of while */
+
+    /* error end */
+    if (unconv_num) {
+        *from = (XPointer) ((const char *) *from + from_size);
+        *from_left = 0;
+        *to = (XPointer) outbufptr;
+	return -1;
+    }
+
+    /* nomal end */
+    *from = (XPointer) inbufptr;
+    *to = (XPointer) outbufptr;
+
+    if (num_args > 0)
+        *((XlcCharSet *) args[0]) = charset;
+
+    return 0;
+}
+
+static int
+mbstocs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    int ret;
+    XlcCharSet charset_old, charset = NULL;
+    XPointer tmp_args[1];
+
+    const char *inbufptr;
+    int	in_left;
+    char *outbufptr;
+    int	out_left;
+    tmp_args[0] = (XPointer) &charset;
+
+    ret = mbtocs(conv, from, from_left, to, to_left, tmp_args, 1);
+    charset_old = charset;
+  
+    while ( ret == 0 && *from_left && *to_left) {
+	inbufptr = *from;
+	in_left = *from_left;
+	outbufptr = *to;
+	out_left = *to_left;
+        ret = mbtocs(conv, from, from_left, to, to_left, tmp_args, 1);
+        if (charset_old != charset) {
+           *from = (XPointer) inbufptr;
+           *from_left = in_left;
+           *to = (XPointer) outbufptr;
+           *to_left = out_left;
+           break;
+        }
+    }
+
+    if (num_args > 0)
+        *((XlcCharSet *) args[0]) = charset_old;
+
+    /* error end */
+    if (ret != 0)
+	return( -1 );
+
+    return(0);
+}
+
+static int
+wcstostr(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    State state = (State) conv->state;
+    XLCd lcd = state->lcd;
+
+    char *encoding;
+    unsigned long mb, glyph_index;
+    wchar_t wc;
+
+    int length;
+    int unconv_num = 0;
+
+    CodeSet codeset;
+
+    const wchar_t *inbufptr = (const wchar_t *) *from;
+    char *outbufptr = *to;
+    int from_size = *from_left;
+    
+    const char *default_string = XLC_PUBLIC(lcd, default_string);
+    int defstr_len = strlen(default_string);
+
+
+    if (*from_left > *to_left)
+        *from_left = *to_left;
+
+    while (*from_left && *to_left) {
+
+        wc = *inbufptr++;
+        (*from_left)--;
+
+        /* null ? */
+        if (!wc) {
+            if (outbufptr) {*outbufptr++ = '\0';}
+            (*to_left)--;
+
+            continue;
+        }
+
+        /* convert */
+	if ( !wc_to_gi(lcd, wc, &glyph_index, &codeset) ) {
+
+	    /* output default_string of XDefaultString() */
+            if (*to_left < defstr_len)
+		break;
+	    if (outbufptr) {
+                strncpy((char *)outbufptr, default_string, defstr_len);
+	        outbufptr += defstr_len;
+            }
+	    (*to_left) -= defstr_len;
+
+            unconv_num++;
+
+        } else {
+            mb = gi_to_mb(glyph_index, codeset);
+
+	    if (check_string_encoding(codeset)) {
+	        if (codeset->parse_info) {
+                    Bool need_shift = False;
+                    switch (codeset->parse_info->type) {
+                        case E_LSL :
+                            if (codeset != state->GL_codeset) {
+                                need_shift = True;
+                                state->GL_codeset = codeset;
+                            }
+                            break;
+                        case E_LSR :
+                            if (codeset != state->GR_codeset) {
+                                need_shift = True;
+                                state->GR_codeset = codeset;
+                            }
+                            break;
+                        /* case E_SS */
+                        default:
+                            need_shift = True;
+                    }
+
+		    /* output shift sequence */
+                    if (need_shift) {
+		        encoding = codeset->parse_info->encoding;
+                        length = strlen(encoding);
+                        if (*to_left < length)
+		            break;
+
+	                if (outbufptr) {
+                            strncpy((char *)outbufptr, encoding, length);
+	                    outbufptr += length;
+                        }
+	                (*to_left) -= length;
+                    }
+                }
+
+                /* output characters */
+	        length = codeset->length;
+                if (*to_left < length)
+		    break;
+
+	        if (outbufptr) {
+	            output_ulong_value(outbufptr, mb, length, XlcNONE);
+	            outbufptr += length;
+	        }
+
+	        (*to_left) -= length;
+            } else {
+		unconv_num++;
+            }
+        }
+
+    } /* end of while */
+
+    *from = (XPointer) ((const wchar_t *) *from + from_size);
+    *from_left = 0;
+    *to = (XPointer) outbufptr;
+
+    return unconv_num;
+}
+
+static int
+stdc_wcstostr(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    XPointer buf = Xmalloc((*from_left) * MB_CUR_MAX);
+    char *buf_ptr1 = buf;
+    int buf_left1 = (*from_left) * MB_CUR_MAX;
+    char *buf_ptr2 = buf_ptr1;
+    int buf_left2;
+    int unconv_num1 = 0, unconv_num2 = 0;
+
+    unconv_num1 = stdc_wcstombs(conv, 
+		from, from_left, &buf_ptr1, &buf_left1, args, num_args);
+    if (unconv_num1 < 0)
+        goto ret;
+
+    buf_left2 = buf_ptr1 - buf_ptr2;
+
+    unconv_num2 = mbstostr(conv, 
+		&buf_ptr2, &buf_left2, to, to_left, args, num_args);
+    if (unconv_num2 < 0)
+        goto ret;
+
+ret:
+    if (buf)
+	Xfree((char *)buf);
+
+    return (unconv_num1 + unconv_num2);
+}
+
+static int
+wctocs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    State state = (State) conv->state;
+    XLCd lcd = state->lcd;
+
+    wchar_t wc;
+    unsigned long glyph_index;
+
+    int char_len;
+    int unconv_num = 0;
+    XlcSide side;
+
+    CodeSet codeset;
+    XlcCharSet charset = NULL;
+
+    const wchar_t *inbufptr = (const wchar_t *) *from;
+    char *outbufptr = *to;
+    int from_size = *from_left;
+
+    if (*from_left > *to_left)
+        *from_left = *to_left;
+
+    if (*from_left && *to_left) {
+
+        wc = *inbufptr++;
+        (*from_left)--;
+
+        /* null ? */
+        if (!wc) {
+            unconv_num = 1;
+            goto end;
+        }
+
+        /* convert */
+	if ( !wc_to_gi(lcd, wc, &glyph_index, &codeset) ) {
+            unconv_num = 1;
+	    goto end;
+        }
+
+        if ( !(charset = gi_parse_charset(glyph_index, codeset)) ) {
+            unconv_num = 1;
+	    goto end;
+        }
+	char_len = charset->char_size;
+	side = charset->side;
+
+        /* output glyph index */
+	if (codeset->ctconv)
+            glyph_index = conv_to_dest(codeset->ctconv, glyph_index);
+        if (*to_left < char_len) {
+            unconv_num++;
+	    goto end;
+        }
+
+        if (outbufptr) {
+            output_ulong_value(outbufptr, glyph_index, char_len, side);
+            outbufptr += char_len;
+        }
+
+	(*to_left) -= char_len;
+
+    }
+
+end:
+
+     /* error end */
+    if (unconv_num) {
+        *from = (XPointer) ((const wchar_t *) *from + from_size);
+        *from_left = 0;
+        *to = (XPointer) outbufptr;
+        return -1;
+    }
+
+    /* nomal end */
+    *from = (XPointer) inbufptr;
+    *to = (XPointer) outbufptr;
+
+    if (num_args > 0)
+        *((XlcCharSet *) args[0]) = charset;
+
+    return 0;
+}
+
+static int
+stdc_wctocs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    const wchar_t *src = *((const wchar_t **) from);
+    wchar_t wch;
+    XPointer tmp_from, save_from = *from;
+    char tmp[32];
+    int length, ret, src_left = *from_left;
+    int from_size = *from_left;
+
+    if (src_left > 0 && *to_left > 0) {
+	if ((wch = *src)) {
+	    length = wctomb(tmp, wch);
+	} else {
+	    goto end;
+	}
+		
+	if (length < 0)
+	    goto end;
+
+	tmp_from = (XPointer) tmp;
+	ret = mbtocs(conv, &tmp_from, &length, to, to_left, args, num_args);
+	if (ret < 0)
+	    goto end;
+
+	src++;
+	src_left--;
+    }
+
+end:
+     /* error end */
+    if (save_from == (XPointer) src) {
+        *from = (XPointer) ((const wchar_t *) *from + from_size);
+        *from_left = 0;
+	return -1;
+    }
+
+    /* nomal end */
+    *from = (XPointer) src;
+    *from_left = src_left;
+
+    return 0;
+}
+
+static int
+wcstocs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    int ret;
+    XlcCharSet charset_old, charset = NULL;
+    XPointer tmp_args[1];
+
+    const wchar_t *inbufptr;
+    int	in_left;
+    XPointer outbufptr;
+    int	out_left;
+    tmp_args[0] = (XPointer) &charset;
+
+    ret = wctocs(conv, from, from_left, to, to_left, tmp_args, 1);
+    charset_old = charset;
+
+    while ( ret == 0 && *from_left && *to_left) {
+	inbufptr = (const wchar_t *) *from;
+	in_left = *from_left;
+	outbufptr = *to;
+	out_left = *to_left;
+        ret = wctocs(conv, from, from_left, to, to_left, tmp_args, 1);
+        if (charset_old != charset) {
+           *from = (XPointer) inbufptr;
+           *from_left = in_left;
+           *to = (XPointer) outbufptr;
+           *to_left = out_left;
+           break;
+        }
+    }
+
+    if (num_args > 0)
+        *((XlcCharSet *) args[0]) = charset_old;
+
+    /* error end */
+    if (ret != 0)
+	return( -1 );
+
+    return(0);
+}
+
+#ifdef STDCVT
+
+static int
+stdc_wcstocs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    int ret;
+    XlcCharSet charset_old, charset = NULL;
+    XPointer tmp_args[1];
+
+    const wchar_t *inbufptr;
+    int	in_left;
+    XPointer outbufptr;
+    int	out_left;
+    tmp_args[0] = (XPointer) &charset;
+
+    ret = stdc_wctocs(conv, from, from_left, to, to_left, tmp_args, 1);
+    charset_old = charset;
+
+    while ( ret == 0 && *from_left && *to_left ) {
+	inbufptr = (const wchar_t *) *from;
+	in_left = *from_left;
+	outbufptr = *to;
+	out_left = *to_left;
+        ret = stdc_wctocs(conv, from, from_left, to, to_left, tmp_args, 1);
+        if (charset_old != charset) {
+           *from = (XPointer) inbufptr;
+           *from_left = in_left;
+           *to = (XPointer) outbufptr;
+           *to_left = out_left;
+           break;
+        }
+    }
+
+    if (num_args > 0)
+        *((XlcCharSet *) args[0]) = charset_old;
+
+    /* error end */
+    if (ret != 0)
+	return( -1 );
+
+    return(0);
+}
+
+#endif
+
+static int
+ctstombs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    XPointer buf = Xmalloc((*from_left) * sizeof(wchar_t));
+    char *buf_ptr1 = buf;
+    int buf_left1 = (*from_left);
+    char *buf_ptr2 = buf_ptr1;
+    int buf_left2;
+    int unconv_num1 = 0, unconv_num2 = 0;
+
+    unconv_num1 = ctstowcs(conv, 
+		from, from_left, &buf_ptr1, &buf_left1, args, num_args);
+    if (unconv_num1 < 0)
+        goto ret;
+
+    buf_left2 = (buf_ptr1 - buf_ptr2) / sizeof(wchar_t);
+
+    unconv_num2 += wcstombs_org(conv, 
+		&buf_ptr2, &buf_left2, to, to_left, args, num_args);
+    if (unconv_num2 < 0)
+        goto ret;
+
+ret:
+    if (buf)
+	Xfree((char *)buf);
+
+    return (unconv_num1 + unconv_num2);
+}
+
+static int
+cstombs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    XPointer buf = Xmalloc((*from_left) * sizeof(wchar_t));
+    char *buf_ptr1 = buf;
+    int buf_left1 = (*from_left);
+    char *buf_ptr2 = buf_ptr1;
+    int buf_left2;
+    int unconv_num1 = 0, unconv_num2 = 0;
+
+    unconv_num1 = cstowcs(conv, 
+		from, from_left, &buf_ptr1, &buf_left1, args, num_args);
+    if (unconv_num1 < 0)
+        goto ret;
+
+    buf_left2 = (buf_ptr1 - buf_ptr2) / sizeof(wchar_t);
+
+    unconv_num2 += wcstombs_org(conv, 
+		&buf_ptr2, &buf_left2, to, to_left, args, num_args);
+    if (unconv_num2 < 0)
+        goto ret;
+
+ret:
+    if (buf)
+	Xfree((char *)buf);
+
+    return (unconv_num1 + unconv_num2);
+}
+
+static int
+strtombs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    State state = (State) conv->state;
+    XLCd lcd = state->lcd;
+
+    char *encoding;
+    unsigned long mb, glyph_index;
+    unsigned char ch;
+
+    int length;
+    int unconv_num = 0;
+
+    CodeSet codeset;
+
+    const char *inbufptr = *from;
+    char *outbufptr = *to;
+    int from_size = *from_left;
+
+    if (*from_left > *to_left)
+        *from_left = *to_left;
+
+    while (*from_left && *to_left) {
+
+        ch = *inbufptr++;
+        (*from_left)--;
+
+        /* null ? */
+        if (!ch) {
+            if (outbufptr) {*outbufptr++ = '\0';}
+            (*to_left)--;
+
+            continue;
+        }
+
+        /* convert */
+        if (isleftside(ch)) {
+	    glyph_index = ch;
+	    codeset = _XlcGetCodeSetFromName(lcd, "ISO8859-1:GL");
+	} else {
+	    glyph_index = ch & GL;
+	    codeset = _XlcGetCodeSetFromName(lcd, "ISO8859-1:GR");
+	}
+
+        if (!codeset) {
+	    unconv_num++;
+	    continue;
+        }
+
+        mb = gi_to_mb(glyph_index, codeset);
+	if (codeset->parse_info) {
+            Bool need_shift = False;
+            switch (codeset->parse_info->type) {
+                case E_LSL :
+                    if (codeset != state->GL_codeset) {
+                        need_shift = True;
+                        state->GL_codeset = codeset;
+                    }
+                    break;
+                case E_LSR :
+                    if (codeset != state->GR_codeset) {
+                        need_shift = True;
+                        state->GR_codeset = codeset;
+                    }
+                    break;
+                /* case E_SS */
+                default:
+                    need_shift = True;
+            }
+
+	    /* output shift sequence */
+            if (need_shift) {
+                encoding = codeset->parse_info->encoding;
+                length = strlen(encoding);
+                if (*to_left < length)
+		    break;
+	        if (outbufptr) {
+                    strncpy((char *)outbufptr, encoding, length);
+	            outbufptr += length;
+                }
+	        (*to_left) -= length;
+	    }
+        }
+
+        /* output characters */
+	length = codeset->length;
+        if (*to_left < length)
+	    break;
+
+        if (outbufptr) {
+            output_ulong_value(outbufptr, mb, length, XlcNONE);
+            outbufptr += length;
+        }
+
+	(*to_left) -= length;
+
+    } /* end of while */
+
+    *from = (XPointer) ((const char *) *from + from_size);
+    *from_left = 0;
+    *to = (XPointer) outbufptr;
+
+    return unconv_num;
+}
+
+static int
+strtowcs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    State state = (State) conv->state;
+    XLCd lcd = state->lcd;
+
+    unsigned char ch;
+    unsigned long glyph_index;
+    wchar_t wc;
+
+    int unconv_num = 0;
+    CodeSet codeset;
+
+    const char *inbufptr = *from;
+    wchar_t *outbufptr = (wchar_t *)*to;
+    int from_size = *from_left;
+
+    if (*from_left > *to_left)
+        *from_left = *to_left;
+
+    while (*from_left && *to_left) {
+
+        ch = *inbufptr++;
+        (*from_left)--;
+
+        /* null ? */
+        if (!ch) {
+            if (outbufptr) {*outbufptr++ = L'\0';}
+            (*to_left)--;
+
+            continue;
+        }
+
+        /* convert */
+        if (isleftside(ch)) {
+	    glyph_index = ch;
+	    codeset = _XlcGetCodeSetFromName(lcd, "ISO8859-1:GL");
+	} else {
+	    glyph_index = ch & GL;
+	    codeset = _XlcGetCodeSetFromName(lcd, "ISO8859-1:GR");
+	}
+
+        if (!codeset) {
+	    unconv_num++;
+	    continue;
+        }
+
+        gi_to_wc(lcd, glyph_index, codeset, &wc);
+	if (outbufptr) {*outbufptr++ = wc;}
+	(*to_left)--;
+
+    } /* end of while */
+
+    *from = (XPointer) ((const char *) *from + from_size);
+    *from_left = 0;
+    *to = (XPointer) outbufptr;
+
+    return unconv_num;
+}
+
+static int
+stdc_strtowcs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    XPointer buf = Xmalloc((*from_left) * MB_CUR_MAX);
+    char *buf_ptr1 = buf;
+    int buf_left1 = (*from_left) * MB_CUR_MAX;
+    char *buf_ptr2 = buf_ptr1;
+    int buf_left2;
+    int unconv_num1 = 0, unconv_num2 = 0;
+
+    unconv_num1 = strtombs(conv, 
+		from, from_left, &buf_ptr1, &buf_left1, args, num_args);
+    if (unconv_num1 < 0)
+        goto ret;
+
+    buf_left2 = buf_ptr1 - buf_ptr2;
+
+    unconv_num2 = stdc_mbstowcs(conv, 
+		&buf_ptr2, &buf_left2, to, to_left, args, num_args);
+    if (unconv_num2 < 0)
+        goto ret;
+
+ret:
+    if (buf)
+	Xfree((char *)buf);
+
+    return (unconv_num1 + unconv_num2);
+}
+
+/* -------------------------------------------------------------------------- */
+/*				Close                                         */
+/* -------------------------------------------------------------------------- */
+
+static void
+close_converter(
+    XlcConv conv)
+{
+    if (conv->state) {
+	Xfree((char *) conv->state);
+    }
+
+    if (conv->methods) {
+	Xfree((char *) conv->methods);
+    }
+
+    Xfree((char *) conv);
+}
+
+/* -------------------------------------------------------------------------- */
+/*				Open                                          */
+/* -------------------------------------------------------------------------- */
+
+static XlcConv
+create_conv(
+    XLCd lcd,
+    XlcConvMethods methods)
+{
+    XlcConv conv;
+    State state;
+
+    conv = (XlcConv) Xmalloc(sizeof(XlcConvRec));
+    if (conv == NULL)
+	return (XlcConv) NULL;
+    
+    conv->methods = (XlcConvMethods) Xmalloc(sizeof(XlcConvMethodsRec));
+    if (conv->methods == NULL)
+	goto err;
+    *conv->methods = *methods;
+    conv->methods->reset = init_state; 
+
+    conv->state = (XPointer) Xmalloc(sizeof(StateRec));
+    if (conv->state == NULL)
+	goto err;
+    bzero((char *) conv->state, sizeof(StateRec));
+    
+    state = (State) conv->state;
+    state->lcd = lcd;
+    
+    _XlcResetConverter(conv);
+    
+    return conv;
+
+err:
+    close_converter(conv);
+
+    return (XlcConv) NULL;
+}
+
+static XlcConvMethodsRec mbstocts_methods = {
+    close_converter,
+    mbstocts,
+    NULL
+};
+
+static XlcConv
+open_mbstocts(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &mbstocts_methods);
+}
+
+static XlcConvMethodsRec mbstostr_methods = {
+    close_converter,
+    mbstostr,
+    NULL
+};
+
+static XlcConv
+open_mbstostr(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &mbstostr_methods);
+}
+
+static XlcConvMethodsRec mbstocs_methods = {
+    close_converter,
+    mbstocs,
+    NULL
+};
+
+static XlcConv
+open_mbstocs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &mbstocs_methods);
+}
+
+static XlcConvMethodsRec mbtocs_methods = {
+    close_converter,
+    mbtocs,
+    NULL
+};
+
+static XlcConv
+open_mbtocs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &mbtocs_methods);
+}
+
+static XlcConvMethodsRec ctstombs_methods = {
+    close_converter,
+    ctstombs,
+    NULL
+};
+
+static XlcConv
+open_ctstombs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &ctstombs_methods);
+}
+
+static XlcConvMethodsRec cstombs_methods = {
+    close_converter,
+    cstombs,
+    NULL
+};
+
+static XlcConv
+open_cstombs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &cstombs_methods);
+}
+
+static XlcConvMethodsRec strtombs_methods = {
+    close_converter,
+    strtombs,
+    NULL
+};
+
+static XlcConv
+open_strtombs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &strtombs_methods);
+}
+
+#ifdef STDCVT
+
+static XlcConvMethodsRec stdc_mbstowcs_methods = {
+    close_converter,
+    stdc_mbstowcs,
+    NULL
+};
+
+static XlcConv
+open_stdc_mbstowcs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &stdc_mbstowcs_methods);
+}
+
+static XlcConvMethodsRec stdc_wcstombs_methods = {
+    close_converter,
+    stdc_wcstombs,
+    NULL
+};
+
+static XlcConv
+open_stdc_wcstombs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &stdc_wcstombs_methods);
+}
+
+static XlcConvMethodsRec stdc_wcstocts_methods = {
+    close_converter,
+    stdc_wcstocts,
+    NULL
+};
+
+static XlcConv
+open_stdc_wcstocts(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &stdc_wcstocts_methods);
+}
+
+static XlcConvMethodsRec stdc_wcstostr_methods = {
+    close_converter,
+    stdc_wcstostr,
+    NULL
+};
+
+static XlcConv
+open_stdc_wcstostr(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &stdc_wcstostr_methods);
+}
+
+static XlcConvMethodsRec stdc_wcstocs_methods = {
+    close_converter,
+    stdc_wcstocs,
+    NULL
+};
+
+static XlcConv
+open_stdc_wcstocs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &stdc_wcstocs_methods);
+}
+
+static XlcConvMethodsRec stdc_wctocs_methods = {
+    close_converter,
+    stdc_wctocs,
+    NULL
+};
+
+static XlcConv
+open_stdc_wctocs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &stdc_wctocs_methods);
+}
+
+static XlcConvMethodsRec stdc_ctstowcs_methods = {
+    close_converter,
+    stdc_ctstowcs,
+    NULL
+};
+
+static XlcConv
+open_stdc_ctstowcs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &stdc_ctstowcs_methods);
+}
+
+static XlcConvMethodsRec stdc_cstowcs_methods = {
+    close_converter,
+    stdc_cstowcs,
+    NULL
+};
+
+static XlcConv
+open_stdc_cstowcs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &stdc_cstowcs_methods);
+}
+
+static XlcConvMethodsRec stdc_strtowcs_methods = {
+    close_converter,
+    stdc_strtowcs,
+    NULL
+};
+
+static XlcConv
+open_stdc_strtowcs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &stdc_strtowcs_methods);
+}
+
+#endif /* STDCVT */
+
+static XlcConvMethodsRec mbstowcs_methods = {
+    close_converter,
+    mbstowcs_org,
+    NULL
+};
+
+static XlcConv
+open_mbstowcs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &mbstowcs_methods);
+}
+
+static XlcConvMethodsRec wcstombs_methods = {
+    close_converter,
+    wcstombs_org,
+    NULL
+};
+
+static XlcConv
+open_wcstombs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &wcstombs_methods);
+}
+
+static XlcConvMethodsRec wcstocts_methods = {
+    close_converter,
+    wcstocts,
+    NULL
+};
+
+static XlcConv
+open_wcstocts(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &wcstocts_methods);
+}
+
+static XlcConvMethodsRec wcstostr_methods = {
+    close_converter,
+    wcstostr,
+    NULL
+};
+
+static XlcConv
+open_wcstostr(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &wcstostr_methods);
+}
+
+static XlcConvMethodsRec wcstocs_methods = {
+    close_converter,
+    wcstocs,
+    NULL
+};
+
+static XlcConv
+open_wcstocs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &wcstocs_methods);
+}
+
+static XlcConvMethodsRec wctocs_methods = {
+    close_converter,
+    wctocs,
+    NULL
+};
+
+static XlcConv
+open_wctocs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &wctocs_methods);
+}
+
+static XlcConvMethodsRec ctstowcs_methods = {
+    close_converter,
+    ctstowcs,
+    NULL
+};
+
+static XlcConv
+open_ctstowcs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &ctstowcs_methods);
+}
+
+static XlcConvMethodsRec cstowcs_methods = {
+    close_converter,
+    cstowcs,
+    NULL
+};
+
+static XlcConv
+open_cstowcs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &cstowcs_methods);
+}
+
+static XlcConvMethodsRec strtowcs_methods = {
+    close_converter,
+    strtowcs,
+    NULL
+};
+
+static XlcConv
+open_strtowcs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &strtowcs_methods);
+}
+
+/* -------------------------------------------------------------------------- */
+/*				Loader                                        */
+/* -------------------------------------------------------------------------- */
+
+XLCd
+_XlcGenericLoader(
+    const char *name)
+{
+    XLCd lcd;
+#ifdef STDCVT
+    XLCdGenericPart *gen;
+#endif
+
+    lcd = _XlcCreateLC(name, _XlcGenericMethods);
+
+    if (lcd == NULL)
+	return lcd;
+
+    default_GL_charset = _XlcGetCharSet("ISO8859-1:GL");
+    default_GR_charset = _XlcGetCharSet("ISO8859-1:GR");
+
+    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNCompoundText, open_mbstocts);
+    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNString,       open_mbstostr);
+    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNCharSet,      open_mbstocs);
+    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNChar,         open_mbtocs);
+    _XlcSetConverter(lcd, XlcNCompoundText, lcd, XlcNMultiByte, open_ctstombs);
+    _XlcSetConverter(lcd, XlcNString,    lcd, XlcNMultiByte,    open_strtombs);
+    _XlcSetConverter(lcd, XlcNCharSet,   lcd, XlcNMultiByte,    open_cstombs);
+    
+#ifdef STDCVT
+     gen = XLC_GENERIC_PART(lcd);
+
+     if (gen->use_stdc_env != True) {
+#endif
+        _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNWideChar,     open_mbstowcs);
+        _XlcSetConverter(lcd, XlcNWideChar,  lcd, XlcNMultiByte,    open_wcstombs);
+        _XlcSetConverter(lcd, XlcNWideChar,  lcd, XlcNCompoundText, open_wcstocts);
+        _XlcSetConverter(lcd, XlcNWideChar,  lcd, XlcNString,       open_wcstostr);
+        _XlcSetConverter(lcd, XlcNWideChar,  lcd, XlcNCharSet,      open_wcstocs);
+        _XlcSetConverter(lcd, XlcNWideChar,  lcd, XlcNChar,         open_wctocs);
+        _XlcSetConverter(lcd, XlcNCompoundText, lcd, XlcNWideChar,  open_ctstowcs);
+        _XlcSetConverter(lcd, XlcNString,    lcd, XlcNWideChar,     open_strtowcs);
+        _XlcSetConverter(lcd, XlcNCharSet,   lcd, XlcNWideChar,     open_cstowcs);
+#ifdef STDCVT
+    }
+#endif
+
+#ifdef STDCVT
+    if (gen->use_stdc_env == True) {
+        _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNWideChar,     open_stdc_mbstowcs);
+        _XlcSetConverter(lcd, XlcNWideChar,  lcd, XlcNMultiByte,    open_stdc_wcstombs);
+        _XlcSetConverter(lcd, XlcNWideChar,  lcd, XlcNCompoundText, open_stdc_wcstocts);
+        _XlcSetConverter(lcd, XlcNWideChar,  lcd, XlcNString,       open_stdc_wcstostr);
+        _XlcSetConverter(lcd, XlcNWideChar,  lcd, XlcNCharSet,      open_stdc_wcstocs);
+        _XlcSetConverter(lcd, XlcNWideChar,  lcd, XlcNChar,         open_stdc_wctocs);
+        _XlcSetConverter(lcd, XlcNCompoundText, lcd, XlcNWideChar,  open_stdc_ctstowcs);
+        _XlcSetConverter(lcd, XlcNString,    lcd, XlcNWideChar,     open_stdc_strtowcs);
+        _XlcSetConverter(lcd, XlcNCharSet,   lcd, XlcNWideChar,     open_stdc_cstowcs);
+    }
+#endif
+
+    _XlcAddUtf8Converters(lcd);
+
+    return lcd;
+}
diff --git a/libX11/modules/lc/xlocale/Makefile.am b/libX11/modules/lc/xlocale/Makefile.am
new file mode 100644
index 000000000..be8dd41c1
--- /dev/null
+++ b/libX11/modules/lc/xlocale/Makefile.am
@@ -0,0 +1,33 @@
+AM_CFLAGS= \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/include/X11 \
+	-I$(top_builddir)/include \
+	-I$(top_builddir)/include/X11 \
+	-I$(top_srcdir)/src/xcms \
+	-I$(top_srcdir)/src/xkb \
+	-I$(top_srcdir)/src/xlibi18n \
+	$(X11_CFLAGS) \
+	$(BIGFONT_CFLAGS) \
+	$(XDMCP_CFLAGS) \
+	-D_BSD_SOURCE
+
+if XLIB_LOADABLE_I18N
+
+commonlibdir = $(X11_LOCALELIBDIR)/common
+commonlib_LTLIBRARIES=xlocale.la
+xlocale_la_LDFLAGS = -module -version-number 2:0:0
+xlocale_la_LIBADD = $(I18N_MODULE_LIBS)
+
+else
+
+noinst_LTLIBRARIES = libxlocale.la
+
+endif
+
+
+xlocale_la_SOURCES = \
+	lcEuc.c \
+	lcJis.c \
+	lcSjis.c
+	
+libxlocale_la_SOURCES = $(xlocale_la_SOURCES)
diff --git a/libX11/modules/lc/xlocale/Makefile.in b/libX11/modules/lc/xlocale/Makefile.in
new file mode 100644
index 000000000..c0bba3ee1
--- /dev/null
+++ b/libX11/modules/lc/xlocale/Makefile.in
@@ -0,0 +1,563 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = modules/lc/xlocale
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/config.h \
+	$(top_builddir)/include/X11/XlibConf.h
+CONFIG_CLEAN_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(commonlibdir)"
+commonlibLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(commonlib_LTLIBRARIES) $(noinst_LTLIBRARIES)
+libxlocale_la_LIBADD =
+am__objects_1 = lcEuc.lo lcJis.lo lcSjis.lo
+am_libxlocale_la_OBJECTS = $(am__objects_1)
+libxlocale_la_OBJECTS = $(am_libxlocale_la_OBJECTS)
+@XLIB_LOADABLE_I18N_FALSE@am_libxlocale_la_rpath =
+am__DEPENDENCIES_1 =
+@XLIB_LOADABLE_I18N_TRUE@xlocale_la_DEPENDENCIES =  \
+@XLIB_LOADABLE_I18N_TRUE@	$(am__DEPENDENCIES_1)
+am_xlocale_la_OBJECTS = lcEuc.lo lcJis.lo lcSjis.lo
+xlocale_la_OBJECTS = $(am_xlocale_la_OBJECTS)
+xlocale_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(xlocale_la_LDFLAGS) $(LDFLAGS) -o $@
+@XLIB_LOADABLE_I18N_TRUE@am_xlocale_la_rpath = -rpath $(commonlibdir)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libxlocale_la_SOURCES) $(xlocale_la_SOURCES)
+DIST_SOURCES = $(libxlocale_la_SOURCES) $(xlocale_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
+BIGFONT_LIBS = @BIGFONT_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GREP = @GREP@
+I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINT = @LINT@
+LINTLIB = @LINTLIB@
+LINT_FLAGS = @LINT_FLAGS@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+RANLIB = @RANLIB@
+RAWCPP = @RAWCPP@
+RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+WCHAR32 = @WCHAR32@
+X11_CFLAGS = @X11_CFLAGS@
+X11_DATADIR = @X11_DATADIR@
+X11_EXTRA_DEPS = @X11_EXTRA_DEPS@
+X11_LIBDIR = @X11_LIBDIR@
+X11_LIBS = @X11_LIBS@
+X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
+X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
+XDMCP_CFLAGS = @XDMCP_CFLAGS@
+XDMCP_LIBS = @XDMCP_LIBS@
+XERRORDB = @XERRORDB@
+XKBPROTO_CFLAGS = @XKBPROTO_CFLAGS@
+XKBPROTO_LIBS = @XKBPROTO_LIBS@
+XKBPROTO_REQUIRES = @XKBPROTO_REQUIRES@
+XKEYSYMDB = @XKEYSYMDB@
+XLOCALEDATADIR = @XLOCALEDATADIR@
+XLOCALEDIR = @XLOCALEDIR@
+XLOCALELIBDIR = @XLOCALELIBDIR@
+XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
+XPROTO_CFLAGS = @XPROTO_CFLAGS@
+XPROTO_LIBS = @XPROTO_LIBS@
+XTHREADLIB = @XTHREADLIB@
+XTHREADS = @XTHREADS@
+XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
+XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
+XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CFLAGS = \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/include/X11 \
+	-I$(top_builddir)/include \
+	-I$(top_builddir)/include/X11 \
+	-I$(top_srcdir)/src/xcms \
+	-I$(top_srcdir)/src/xkb \
+	-I$(top_srcdir)/src/xlibi18n \
+	$(X11_CFLAGS) \
+	$(BIGFONT_CFLAGS) \
+	$(XDMCP_CFLAGS) \
+	-D_BSD_SOURCE
+
+@XLIB_LOADABLE_I18N_TRUE@commonlibdir = $(X11_LOCALELIBDIR)/common
+@XLIB_LOADABLE_I18N_TRUE@commonlib_LTLIBRARIES = xlocale.la
+@XLIB_LOADABLE_I18N_TRUE@xlocale_la_LDFLAGS = -module -version-number 2:0:0
+@XLIB_LOADABLE_I18N_TRUE@xlocale_la_LIBADD = $(I18N_MODULE_LIBS)
+@XLIB_LOADABLE_I18N_FALSE@noinst_LTLIBRARIES = libxlocale.la
+xlocale_la_SOURCES = \
+	lcEuc.c \
+	lcJis.c \
+	lcSjis.c
+
+libxlocale_la_SOURCES = $(xlocale_la_SOURCES)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  modules/lc/xlocale/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  modules/lc/xlocale/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-commonlibLTLIBRARIES: $(commonlib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(commonlibdir)" || $(MKDIR_P) "$(DESTDIR)$(commonlibdir)"
+	@list='$(commonlib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(commonlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(commonlibdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(commonlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(commonlibdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-commonlibLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(commonlib_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(commonlibdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(commonlibdir)/$$p"; \
+	done
+
+clean-commonlibLTLIBRARIES:
+	-test -z "$(commonlib_LTLIBRARIES)" || rm -f $(commonlib_LTLIBRARIES)
+	@list='$(commonlib_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libxlocale.la: $(libxlocale_la_OBJECTS) $(libxlocale_la_DEPENDENCIES) 
+	$(LINK) $(am_libxlocale_la_rpath) $(libxlocale_la_OBJECTS) $(libxlocale_la_LIBADD) $(LIBS)
+xlocale.la: $(xlocale_la_OBJECTS) $(xlocale_la_DEPENDENCIES) 
+	$(xlocale_la_LINK) $(am_xlocale_la_rpath) $(xlocale_la_OBJECTS) $(xlocale_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcEuc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcJis.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcSjis.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	for dir in "$(DESTDIR)$(commonlibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-commonlibLTLIBRARIES clean-generic clean-libtool \
+	clean-noinstLTLIBRARIES mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-commonlibLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-commonlibLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean \
+	clean-commonlibLTLIBRARIES clean-generic clean-libtool \
+	clean-noinstLTLIBRARIES ctags distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-commonlibLTLIBRARIES install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-commonlibLTLIBRARIES
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/libX11/modules/lc/xlocale/lcEuc.c b/libX11/modules/lc/xlocale/lcEuc.c
new file mode 100644
index 000000000..1b54508be
--- /dev/null
+++ b/libX11/modules/lc/xlocale/lcEuc.c
@@ -0,0 +1,1539 @@
+/* $Xorg: lcEuc.c,v 1.3 2000/08/17 19:45:17 cpqbld Exp $ */
+/******************************************************************
+
+        Copyright 1992, 1993 by FUJITSU LIMITED
+        Copyright 1993 by Fujitsu Open Systems Solutions, Inc.
+
+Permission to use, copy, modify, distribute and sell this software
+and its documentation for any purpose is hereby granted without fee,
+provided that the above copyright notice appear in all copies and
+that both that copyright notice and this permission notice appear
+in supporting documentation, and that the name of FUJITSU LIMITED and
+Fujitsu Open Systems Solutions, Inc. not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.
+FUJITSU LIMITED and Fujitsu Open Systems Solutions, Inc. makes no
+representations about the suitability of this software for any purpose.
+It is provided "as is" without express or implied warranty.
+
+FUJITSU LIMITED AND FUJITSU OPEN SYSTEMS SOLUTIONS, INC. DISCLAIMS ALL
+WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL FUJITSU OPEN SYSTEMS
+SOLUTIONS, INC. AND FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT
+OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
+
+    Authors: Shigeru Yamada 		(yamada@ossi.com)
+             Jeffrey Bloomfield		(jeffb@ossi.com)
+             Yoshiyuki Segawa		(segawa@ossi.com)
+
+*****************************************************************/
+/* $XFree86: xc/lib/X11/lcEuc.c,v 3.12 2003/01/20 04:05:30 dawes Exp $ */
+
+/*
+ * An EUC locale.
+ * Supports: all locales with codeset eucJP, eucKR, eucCN, eucTW.
+ * How: Provides converters for euc*.
+ * Platforms: Only those defining X_LOCALE (only Lynx, Linux-libc5, OS/2).
+ */
+
+#ifdef X_LOCALE
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "Xlibint.h"
+#include "XlcGeneric.h"
+
+#include <ctype.h>
+#ifdef WIN32
+#define isascii __isascii
+#endif
+
+#define CS0     codesets[0]             /* Codeset 0 - 7-bit ASCII      */
+#define CS1     codesets[1]             /* Codeset 1 - Kanji            */
+#define CS2     codesets[2]             /* Codeset 2 - Half-Kana        */
+#define CS3     codesets[3]             /* Codeset 3 - User defined     */
+
+#define SS2	0x8e	/* Single-shift char: CS2 */
+#define SS3	0x8f    /* Single-shift char: CS3 */
+
+#define ASCII_CODESET   0
+#define KANJI_CODESET   1
+#define KANA_CODESET    2
+#define USERDEF_CODESET 3
+#define MAX_CODESETS  
+
+#define GR	0x80	/* begins right-side (non-ascii) region */
+#define GL	0x7f    /* ends left-side (ascii) region        */
+
+#define isleftside(c)	(((c) & GR) ? 0 : 1)
+#define isrightside(c)	(!isleftside(c))
+
+#define BIT8OFF(c)	((c) & GL)
+#define BIT8ON(c)	((c) | GR)
+
+typedef unsigned char   Uchar;
+typedef unsigned long   Ulong;
+typedef unsigned int	Uint;
+
+static CodeSet GetCodeSetFromCharSet (XLCd lcd, XlcCharSet charset);
+static CodeSet wc_codeset (XLCd lcd, wchar_t wch);
+
+#define BADCHAR(min_ch, c)  (BIT8OFF(c) < (char)min_ch && BIT8OFF(c) != 0x0 && \
+			     BIT8OFF(c) != '\t' && BIT8OFF(c) != '\n' && \
+			     BIT8OFF(c) != 0x1b)
+
+/*
+ * Notes:
+ * 1. Defining FORCE_INDIRECT_CONVERTER (see _XlcEucLoader())
+ *    forces indirect (charset) conversions (e.g. wcstocs()<->cstombs()).
+ * 2. Using direct converters (e.g. mbstowcs()) decreases conversion
+ *    times by 20-40% (depends on specific converter used).
+ */
+
+static int
+euc_mbstowcs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    XLCd lcd = (XLCd)conv->state;
+
+    Uchar ch;
+    int chr_len = 0;
+    int sshift =  False;
+    int shift_mult = 0;
+    Uint chrcode;
+
+    Uint wc_encode = 0;
+    Uint wc_tmp = 0;
+
+    int cs0flg = False;
+    int cs1flg = False;
+    int length = 0;
+    int unconv_num = 0;
+
+    Bool new_char;
+
+    const char *inbufptr = *from;
+    wchar_t *outbufptr = (wchar_t *) *to;
+
+    CodeSet *codesets = XLC_GENERIC(lcd, codeset_list); 
+    int codeset_num = XLC_GENERIC(lcd, codeset_num);
+    Ulong wc_shift = XLC_GENERIC(lcd, wc_shift_bits);
+
+    for (new_char = True; *from_left > 0 && *to_left > 0;) {
+
+	ch = *inbufptr++;
+
+	if (isleftside(ch)) {				/* CS0 */
+            if (ASCII_CODESET >= codeset_num) {
+		unconv_num++;
+		(*from_left)--;
+		continue;
+	    }
+	    if( cs0flg == True) {
+		new_char = True;
+		cs0flg = False;
+	    }
+	    length = CS0->length;
+	    *outbufptr++ = (wchar_t)ch;
+	    (*from_left)--;
+	    (*to_left)--;
+	    continue;
+	}
+	else if (ch == SS2) {				/* CS2 */
+	    if (KANA_CODESET >= codeset_num) {
+		unconv_num++;
+		(*from_left)--;
+		continue;
+	    }
+	    if (sshift == True || cs1flg == True) {
+		cs1flg = False;
+		unconv_num++;
+		continue;
+	    }
+	    length = CS2->length;
+	    wc_encode = CS2->wc_encoding;
+	    chrcode = 0;
+	    sshift = True;
+	    cs0flg = True;
+	    (*from_left)--;
+	    continue;
+	}
+	else if (ch == SS3) {				/* CS3 */
+	    if (USERDEF_CODESET >= codeset_num) {
+		unconv_num++;
+		(*from_left)--;
+		continue;
+	    }
+	    if (sshift == True || cs1flg == True) {
+		cs1flg = False;
+		unconv_num++;
+		continue;
+	    }
+	    length = CS3->length;
+	    if (*from_left < 1 )
+		unconv_num++;
+	    wc_encode = CS3->wc_encoding;
+	    chrcode = 0;
+	    sshift = True;
+	    cs0flg = True;
+	    (*from_left)--;
+	    continue;
+
+	} else {					/* CS1 */
+	    if (KANJI_CODESET >= codeset_num) {
+		unconv_num++;
+		(*from_left)--;
+		continue;
+	    }
+	    if (sshift == False) {
+		length = CS1->length;
+		if (*from_left < 1)
+		    unconv_num++;
+		wc_encode = CS1->wc_encoding;
+	    }
+	    chrcode = BIT8OFF(ch);
+	    cs0flg = True;
+	    cs1flg = True;
+	    (*from_left)--;
+	}
+
+	if (new_char) {				/* begin new character */
+	    chr_len = length;
+	    shift_mult = length - 1;
+	    new_char = False;
+	}
+
+	chrcode <<= (wc_shift * shift_mult);
+	shift_mult--;
+	wc_tmp |= chrcode; 
+
+	if (--chr_len == 0) {
+	    wc_tmp |= wc_encode;
+	    *outbufptr++ = wc_tmp;
+	    (*to_left)--;
+
+	    new_char = True;
+	    sshift = False;
+	    cs0flg = False;
+	    cs1flg = False;
+	    wc_tmp  = (Uint)0;
+	}
+
+    }	/* end for */
+
+    *to = (XPointer)outbufptr;
+
+    if (cs0flg == True || cs1flg == True)	/* error check on last char */
+	unconv_num++;
+
+    return unconv_num;
+}
+
+
+static int
+euc_wcstombs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    const wchar_t *inbufptr = (const wchar_t *) *from;
+    XPointer outbufptr = *to;
+    wchar_t  wch;
+    int length;
+    Uchar tmp;
+    int unconv_num = 0;
+
+    XLCd lcd = (XLCd)conv->state;
+    CodeSet codeset;
+    Ulong wc_shift = XLC_GENERIC(lcd, wc_shift_bits);
+
+    for (; *from_left > 0 && *to_left > 0; (*from_left)-- ) {
+
+	wch = *inbufptr++;
+
+	if (!(codeset = wc_codeset(lcd, wch))) {
+	    unconv_num++;
+	    (*from_left)--;
+	    continue;
+	}
+
+	length = codeset->length;
+	wch ^= (wchar_t)codeset->wc_encoding;
+
+	if (codeset->parse_info) {	/* put out SS2 or SS3 */
+	    if (*to_left < length + 1) {
+	        unconv_num++;
+		break;
+	    }
+	    *outbufptr++ = *codeset->parse_info->encoding;
+	    (*to_left)--;
+        } else {
+	    if (*to_left < length) {
+		unconv_num++;
+		break;
+	    }
+	}
+
+	do {
+	    length--;
+	    tmp = (wch>>(wchar_t)(length * wc_shift));
+
+	    if (codeset->side == XlcGR)
+		tmp = BIT8ON(tmp);
+
+	    *outbufptr++ = (Uchar)tmp;
+	    (*to_left)--;
+	} while (length);
+    }
+
+    *to = (XPointer)outbufptr;
+
+    return unconv_num;
+}
+
+
+static int
+euc_mbtocs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    XLCd lcd = (XLCd)conv->state;
+    XlcCharSet charset;
+    CodeSet *codesets = XLC_GENERIC(lcd, codeset_list);
+    int codeset_num = XLC_GENERIC(lcd, codeset_num);
+    int length;
+    int unconv_num = 0;
+    int min_ch = 0;
+    const char *src = *from;
+    char *dst = *to;
+
+    if (isleftside(*src)) { 			/* 7-bit (CS0) */
+	if (ASCII_CODESET >= codeset_num)
+	    return -1;
+	charset = *CS0->charset_list;
+    }
+    else if ((Uchar)*src == SS2) {		/* half-kana (CS2) */
+	if (KANA_CODESET >= codeset_num)
+	    return -1;
+	charset = *CS2->charset_list;
+	src++;
+	(*from_left)--;
+    }
+    else if ((Uchar)*src == SS3) {		/* user-def */
+	if (USERDEF_CODESET >= codeset_num)
+	    return -1;
+	charset = *CS3->charset_list;
+	src++;
+	(*from_left)--;
+    }
+    else  { 					/* Kanji (CS1) */
+	if (KANJI_CODESET >= codeset_num)
+	    return -1;
+	charset = *CS1->charset_list;
+    }
+
+    if(*from_left < charset->char_size || *to_left < charset->char_size)
+	return -1;
+
+    min_ch = 0x20;
+    if (charset->set_size == 94)
+	if (charset->char_size > 1 || charset->side == XlcGR)
+	    min_ch = 0x21;
+
+    length = charset->char_size;
+    do {
+	if(BADCHAR(min_ch, *src)) {
+	    unconv_num++;
+	    src++;
+	    break;
+	}
+	switch (charset->side) {
+	    case XlcGL:
+		*dst++ = BIT8OFF(*src++);
+		break;
+	    case XlcGR:
+		*dst++ = BIT8ON(*src++);
+		break;
+	    default:
+		*dst++ = *src++;
+		break;
+	    }
+    } while (--length);
+
+    *to = dst;
+    *from = (XPointer) src;
+    *from_left -= charset->char_size;
+    *to_left -= charset->char_size - length;
+
+    if (num_args > 0)
+	*((XlcCharSet *) args[0]) = charset;
+
+    return unconv_num;
+}
+
+
+static int
+euc_mbstocs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    const char *tmp_from;
+    char *tmp_to;
+    int tmp_from_left, tmp_to_left;
+    XlcCharSet charset, tmp_charset;
+    XPointer tmp_args[1];
+    int unconv_num = 0, ret;
+
+/* Determine the charset of the segment and convert one characater: */
+
+    tmp_args[0] = (XPointer) &charset; /* charset from euc_mbtocs() */
+    while
+      ((ret = euc_mbtocs(conv, from, from_left, to, to_left, tmp_args, 1)) > 0)
+	unconv_num += ret;
+    if ( ret < 0 )
+	return ret;
+
+    tmp_from = *from;
+    tmp_from_left = *from_left;
+    tmp_to_left = *to_left;
+    tmp_to = *to;
+
+/* Convert remainder of the segment: */
+
+    tmp_args[0] = (XPointer) &tmp_charset;
+    while( (ret = euc_mbtocs(conv, (XPointer *) &tmp_from, &tmp_from_left,
+		     (XPointer *) &tmp_to, &tmp_to_left, tmp_args, 1)) >= 0 ) {
+
+	if (ret > 0) {
+	    unconv_num += ret;
+	    continue;
+	}
+
+	if (tmp_charset != charset)  /* quit on end of segment */
+	    break;
+
+	*from = (XPointer) tmp_from;
+	*from_left = tmp_from_left;
+	*to = (XPointer) tmp_to;
+	*to_left = tmp_to_left;
+    } 
+
+    if (num_args > 0)
+	*((XlcCharSet *) args[0]) = charset;
+    
+    return unconv_num;
+}
+
+
+static int
+euc_wcstocs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    XLCd lcd = (XLCd)conv->state;
+    const wchar_t *wcptr = (const wchar_t *) *from;
+    char *bufptr = (char *) *to;
+    wchar_t wch;
+    char *tmpptr;
+    int length;
+    CodeSet codeset;
+    Ulong wc_encoding;
+    int wcstr_len = *from_left, buf_len = *to_left;
+
+    if (!(codeset = wc_codeset(lcd, *wcptr)))
+	return -1;
+
+    wc_encoding = codeset->wc_encoding;
+
+    if (wcstr_len < buf_len / codeset->length)
+	buf_len = wcstr_len * codeset->length;
+
+    for ( ; wcstr_len > 0 && buf_len > 0; wcptr++, wcstr_len--) {
+	wch = *wcptr;
+
+	if ((wch & XLC_GENERIC(lcd, wc_encode_mask)) != wc_encoding)
+	    break;
+
+	length = codeset->length;
+
+	buf_len -= length;
+	bufptr += length;
+	tmpptr = bufptr - 1;
+
+	while (length--) {
+	    *tmpptr-- = codeset->length == 1 && codeset->side == XlcGR ?
+	      BIT8ON(wch) : BIT8OFF(wch);
+	    wch >>= (wchar_t)XLC_GENERIC(lcd, wc_shift_bits);
+	}
+    }
+
+    if (num_args > 0)
+	*((XlcCharSet *) args[0]) = *codeset->charset_list;
+
+    *from_left -= wcptr - (wchar_t *) *from;
+    *from = (XPointer) wcptr;
+
+    *to_left -= bufptr - *to;
+    *to = bufptr;
+
+    return 0;
+}
+
+
+static int
+euc_cstombs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    XLCd lcd = (XLCd)conv->state;
+    const char *csptr = *from;
+    char *bufptr = *to;
+    int csstr_len = *from_left;
+    int buf_len = *to_left;
+    int length;
+    CodeSet codeset;
+    int cvt_length;
+
+    if (num_args < 1)
+	return -1;
+    
+    if (!(codeset = GetCodeSetFromCharSet(lcd, (XlcCharSet) args[0])))
+	return -1;
+
+    cvt_length = 0;
+    csstr_len /= codeset->length;
+    buf_len /= codeset->length;
+
+    if (codeset->parse_info)
+	csstr_len *= 2;
+
+    if (csstr_len < buf_len)
+	buf_len = csstr_len;
+
+    cvt_length += buf_len * codeset->length;
+
+    if (bufptr) {
+	while (buf_len--) {
+	    if (codeset->parse_info)	/* put out SS2 or SS3 */
+		*bufptr++ = *codeset->parse_info->encoding;
+
+	    length = codeset->length;
+	    while (length--)
+		*bufptr++ = codeset->side == XlcGR ?
+		  BIT8ON(*csptr++) : BIT8OFF(*csptr++);
+	}
+    }
+
+    *from_left -= csptr - *from;
+    *from = (XPointer) csptr;
+    if (bufptr)
+	*to += cvt_length;
+    *to_left -= cvt_length;
+
+    return 0;
+}
+
+
+static int
+euc_cstowcs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    XLCd lcd = (XLCd)conv->state;
+    const char *csptr = *from;
+    wchar_t *bufptr = (wchar_t *) *to;
+    wchar_t *toptr = (wchar_t *) *to;
+    int csstr_len = *from_left;
+    int buf_len = *to_left;
+    wchar_t wch;
+    int length;
+    Ulong wc_shift_bits = XLC_GENERIC(lcd, wc_shift_bits);
+    CodeSet codeset;
+    
+    if (num_args < 1)
+	return -1;
+    
+    if (!(codeset = GetCodeSetFromCharSet(lcd, (XlcCharSet) args[0])))
+        return -1;
+
+    csstr_len /= codeset->length;
+    if (csstr_len < buf_len)
+	buf_len = csstr_len;
+    *to_left -= buf_len;
+
+    if (bufptr) {
+
+	toptr += buf_len;
+	*to = (XPointer) toptr;
+	
+        while (buf_len--) {
+
+            wch = (wchar_t) BIT8OFF(*csptr);
+            csptr++;
+
+            length = codeset->length - 1;
+            while (length--) {
+                wch = (wch << wc_shift_bits) | BIT8OFF(*csptr);
+                csptr++;
+            }
+            *bufptr++ = wch | codeset->wc_encoding;
+        }
+    }
+    *from_left -= csptr - *from;
+    *from = (XPointer) csptr;
+
+    return 0;
+}
+
+
+static CodeSet
+wc_codeset(
+    XLCd lcd,
+    wchar_t wch)
+{
+    CodeSet *codesets = XLC_GENERIC(lcd, codeset_list);
+    int end = XLC_GENERIC(lcd, codeset_num);
+    Ulong widech = (Ulong)(wch & XLC_GENERIC(lcd, wc_encode_mask));
+
+    for (; --end >= 0; codesets++)
+	if ( widech == (*codesets)->wc_encoding )
+	    return *codesets;
+
+    return NULL;
+}
+
+
+static CodeSet
+GetCodeSetFromCharSet(
+    XLCd lcd,
+    XlcCharSet charset)
+{
+    CodeSet *codeset = XLC_GENERIC(lcd, codeset_list);
+    XlcCharSet *charset_list;
+    int codeset_num, num_charsets;
+
+    codeset_num = XLC_GENERIC(lcd, codeset_num);
+
+    for ( ; codeset_num-- > 0; codeset++) {
+	num_charsets = (*codeset)->num_charsets;
+	charset_list = (*codeset)->charset_list;
+
+	for ( ; num_charsets-- > 0; charset_list++)
+	    if (*charset_list == charset)
+		return *codeset;
+    }
+
+    return (CodeSet) NULL;
+}
+
+
+static XlcConv
+create_conv(
+    XLCd lcd,
+    XlcConvMethods methods)
+{
+    XlcConv conv;
+
+    conv = (XlcConv) Xmalloc(sizeof(XlcConvRec));
+    if (conv == NULL)
+	return (XlcConv) NULL;
+    
+    conv->methods = methods;
+    conv->state = (XPointer) lcd;
+    return conv;
+}
+
+
+/*
+ *    Stripped down Direct CT converters for EUC
+ *
+ */
+
+typedef struct _CTDataRec {
+    int side;
+    int length;
+    char *name;
+    Ulong wc_encoding;
+    char sshift;
+    char *ct_encoding;
+    int ct_encoding_len;
+    int set_size;
+    Uchar min_ch;
+    Uchar ct_type;
+} CTDataRec, *CTData;
+
+typedef struct _StateRec {
+    CTData GL_charset;
+    CTData GR_charset;
+    CTData charset;
+} StateRec, *State;
+
+#define CT_STD  0
+#define CT_NSTD 1
+#define CT_DIR  2
+#define CT_EXT0 3
+#define CT_EXT1 4
+#define CT_EXT2 5
+#define CT_VER  6
+
+static CTDataRec ctdata[] =
+{
+  { XlcGL,      1, "ISO8859-1:GL",       0, 0, "\033(B"   ,  3, 0, 0, CT_STD  },
+  { XlcGR,      1, "ISO8859-1:GR",       0, 0, "\033-A"   ,  3, 0, 0, CT_STD  },
+  { XlcGL,      1, "JISX0201.1976-0:GL", 0, 0, "\033(J"   ,  3, 0, 0, CT_STD  },
+  { XlcGR,      1, "JISX0201.1976-0:GR", 0, 0, "\033)I"   ,  3, 0, 0, CT_STD  },
+  { XlcGL,      2, "JISX0208.1983-0:GL", 0, 0, "\033$(B"  ,  4, 0, 0, CT_STD  },
+  { XlcGR,      2, "JISX0208.1983-0:GR", 0, 0, "\033$)B"  ,  4, 0, 0, CT_STD  },
+  { XlcGL,      2, "JISX0212.1990-0:GL", 0, 0, "\033$(D"  ,  4, 0, 0, CT_STD  },
+  { XlcGR,      2, "JISX0212.1990-0:GR", 0, 0, "\033$)D"  ,  4, 0, 0, CT_STD  },
+  { XlcUnknown, 0, "Ignore-Ext-Status?", 0, 0, "\033#"    ,  2, 0, 0, CT_VER  },
+  { XlcUnknown, 0, "NonStd-?-OctetChar", 0, 0, "\033%/0"  ,  4, 0, 0, CT_NSTD },
+  { XlcUnknown, 1, "NonStd-1-OctetChar", 0, 0, "\033%/1"  ,  4, 0, 0, CT_NSTD },
+  { XlcUnknown, 2, "NonStd-2-OctetChar", 0, 0, "\033%/2"  ,  4, 0, 0, CT_NSTD },
+  { XlcUnknown, 3, "NonStd-3-OctetChar", 0, 0, "\033%/3"  ,  4, 0, 0, CT_NSTD },
+  { XlcUnknown, 4, "NonStd-4-OctetChar", 0, 0, "\033%/4"  ,  4, 0, 0, CT_NSTD },
+  { XlcUnknown, 0, "Extension-2"       , 0, 0, "\033%/"   ,  3, 0, 0, CT_EXT2 },
+  { XlcUnknown, 0, "Extension-0"       , 0, 0, "\033"     ,  1, 0, 0, CT_EXT0 },
+  { XlcUnknown, 0, "Begin-L-to-R-Text",  0, 0, "\2331]"   ,  3, 0, 0, CT_DIR  },
+  { XlcUnknown, 0, "Begin-R-to-L-Text",  0, 0, "\2332]"   ,  3, 0, 0, CT_DIR  },
+  { XlcUnknown, 0, "End-Of-String",      0, 0, "\233]"    ,  2, 0, 0, CT_DIR  },
+  { XlcUnknown, 0, "Extension-1"       , 0, 0, "\233"     ,  1, 0, 0, CT_EXT1 },
+};
+
+/* Note on above table:  euc_ctstombs() and euc_ctstowcs() parser depends on
+ * certain table entries occuring in decreasing string length--
+ *   1.  CT_EXT2 and CT_EXT0 entries must occur after CT_NSTD entries.
+ *   2.  CT_DIR and CT_EXT1 entries must occur after CT_DIR entries.
+ */
+
+static CTData ctd_endp = ctdata + ((sizeof(ctdata) / sizeof(CTDataRec))) - 1;
+static CTData ctdptr[sizeof(ctdata) / sizeof(CTDataRec)];
+
+#define Ascii   0
+#define Kanji   1
+#define Kana    2
+#define Userdef 3
+
+/*
+ * initCTptr(): Set ctdptr[] to point at ctdata[], indexed by codeset_num.
+ */
+static void
+initCTptr(
+    XLCd lcd)
+{
+    int num_codesets = XLC_GENERIC(lcd, codeset_num);
+    int num_charsets;
+    int i, j;
+    CodeSet *codesets = XLC_GENERIC(lcd, codeset_list);
+    CodeSet codeset;
+    XlcCharSet charset;
+    CTData ctdp = ctdata;
+
+    ctdptr[Ascii] = &ctdata[0];		/* failsafe */
+
+    for (i = 0; i < num_codesets; i++) {
+
+	codeset = codesets[i];
+	num_charsets = codeset->num_charsets;
+
+	for (j = 0; j < num_charsets; j++) {
+
+	    charset = codeset->charset_list[j];
+
+	    for (ctdp = ctdata; ctdp <= ctd_endp; ctdp++)
+
+		if (! strcmp(ctdp->name, charset->name)) {
+
+		    ctdptr[codeset->cs_num] = ctdp;
+
+		    ctdptr[codeset->cs_num]->wc_encoding = codeset->wc_encoding;
+
+		    ctdptr[codeset->cs_num]->set_size =
+		      charset->set_size;
+
+		    ctdptr[codeset->cs_num]->min_ch =
+		      charset->set_size == 94 &&
+		      (ctdptr[codeset->cs_num]->length > 1 ||
+		      ctdptr[codeset->cs_num]->side == XlcGR) ? 0x21 : 0x20;
+
+		    if (codeset->parse_info) {
+			ctdptr[codeset->cs_num]->sshift =
+			  *codeset->parse_info->encoding;
+		    }
+
+		    break;
+		}
+	}
+    }
+}
+
+
+#define SKIP_I(str)     while (*(str) >= 0x20 && *(str) <=  0x2f) (str)++;
+#define SKIP_P(str)     while (*(str) >= 0x30 && *(str) <=  0x3f) (str)++;
+
+static int
+euc_ctstowcs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    XLCd lcd = (XLCd)conv->state;
+    Ulong wc_shift_bits = XLC_GENERIC(lcd, wc_shift_bits);
+    const char *inbufptr = *from;
+    const char *inbuf_base;
+    wchar_t *outbufptr = (wchar_t *) *to;
+    wchar_t *outbuf_base = outbufptr;
+    int clen, length;
+    int unconv_num = 0;
+    unsigned int ct_seglen = 0;
+    Uchar ct_type = 0;
+    int shift_mult;
+    wchar_t wc_tmp;
+    wchar_t wch;
+    Ulong wc_encoding;
+    CTData ctdp = ctdata;
+    CTData GL_ctdp = ctdp;	/* GL ctdp save */
+    CTData GR_ctdp = ctdp;	/* GR ctdp save */
+    Bool save_outbuf = True;
+    /* If outbufptr is NULL, doen't save output, but just counts
+       a length to hold the output */
+    if (outbufptr == NULL) save_outbuf = False;
+
+    for (length = ctdata[Ascii].length; *from_left > 0; (*from_left) -= length)
+    {
+	ct_type = CT_STD;
+	/* change GL/GR charset */
+	if(ctdp->side == XlcGR && isleftside(*inbufptr)){
+	    /* select GL side */
+	    ctdp = GL_ctdp;
+	    length = ctdp->length;
+	    ct_type = ctdp->ct_type;
+	}else if(ctdp->side == XlcGL && isrightside(*inbufptr)){
+	    /* select GR side */
+	    ctdp = GR_ctdp;
+	    length = ctdp->length;
+	    ct_type = ctdp->ct_type;
+	}
+	if (*inbufptr == '\033' || *inbufptr == (char)'\233') {
+	    for (ctdp = ctdata; ctdp <= ctd_endp ; ctdp++) {
+
+		if(!strncmp(inbufptr, ctdp->ct_encoding, ctdp->ct_encoding_len))
+		{
+		    inbufptr += ctdp->ct_encoding_len;
+		    (*from_left) -= ctdp->ct_encoding_len;
+		    if (ctdp->length) {
+			length = ctdp->length;
+			if( *from_left < length ) {
+			    *to = (XPointer)outbufptr;
+			    *to_left -= outbufptr - outbuf_base;
+			    return( unconv_num + *from_left );
+			}
+		    }
+		    ct_type = ctdp->ct_type;
+		    if(ctdp->side == XlcGL){
+			GL_ctdp = ctdp; /* save GL ctdp */
+		    }else{
+			GR_ctdp = ctdp; /* save GR ctdp */
+		    }
+		    break;
+		}
+	    }
+	    if (ctdp > ctd_endp) 	/* failed to match CT sequence */
+		unconv_num++;
+	}
+
+/* The following code insures that non-standard encodings, direction, extension,
+ * and version strings are ignored; subject to change in future.
+ */
+	switch (ct_type) {
+	case CT_STD:
+	    break;
+	case CT_EXT2:
+	    inbufptr++;
+	    (*from_left)--;
+	case CT_NSTD:
+	    ct_seglen = (BIT8OFF(*inbufptr) << 7) + BIT8OFF(*(inbufptr+1)) + 2;
+	    inbufptr += ct_seglen;
+	    (*from_left) -= ct_seglen;
+	    continue;
+	case CT_EXT0:
+	    inbuf_base = inbufptr;
+	    SKIP_I(inbufptr);
+	    inbufptr++;
+	    ct_seglen = (unsigned)(inbufptr - inbuf_base);
+	    *(from_left) -= ct_seglen;
+	    continue;
+	case CT_EXT1:
+	    inbuf_base = inbufptr;
+	    SKIP_P(inbufptr);
+	    SKIP_I(inbufptr);
+	    inbufptr++;
+	    ct_seglen = (unsigned)(inbufptr - inbuf_base);
+	    *(from_left) -= ct_seglen;
+	    continue;
+	case CT_DIR:
+	    continue;
+	case CT_VER:
+	    inbufptr += 2;
+	    *(from_left) -= 2;
+	    continue;
+	}
+
+	wc_encoding = (ctdp == ctdptr[Kana] && isleftside(*inbufptr)) ?
+	    ctdptr[Ascii]->wc_encoding: ctdp->wc_encoding;
+
+	shift_mult = length - 1;
+	wch = (wchar_t)0;
+	clen = length;
+
+	do {
+	    wc_tmp = BIT8OFF(*inbufptr++) << (wc_shift_bits * shift_mult);
+	    wch |= wc_tmp;
+	    shift_mult--;
+	} while (--clen);
+
+	if (save_outbuf == True)
+	    *outbufptr++ = wch | wc_encoding;
+	if (--*to_left == 0 && *from_left != length) {
+	    *to = (XPointer)outbufptr;
+	    unconv_num = *from_left;
+	    return unconv_num;
+	}
+    }
+
+    *to = (XPointer)outbufptr;
+
+    return unconv_num;
+
+}
+
+
+#define byte1			(length == codeset->length - 1)
+#define byte2			(byte1 == 0)
+#define kanji			(codeset->cs_num == 1)
+#define kana			(codeset->cs_num == 2)
+#define userdef			(codeset->cs_num == 3)
+
+static int
+euc_wcstocts(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    int ct_len = *to_left;
+    const wchar_t *inbufptr = (const wchar_t *) *from;
+    char *ctptr = *to;
+    XPointer ct_base = ctptr;
+    wchar_t  wch;
+    int length;
+    int unconv_num = 0;
+    Uchar tmp;
+    Uchar t1 = 0;
+    int num_conv;
+
+    StateRec ct_state;
+    XLCd lcd = (XLCd)conv->state;
+    CTData charset;
+    CodeSet codeset;
+    Ulong wc_shift = XLC_GENERIC(lcd, wc_shift_bits);
+
+/* Initial State: */
+    ct_state.GL_charset = ctdptr[0]; /* Codeset 0 */
+    ct_state.GR_charset = NULL;
+
+    if (*from_left > *to_left)
+	*from_left = *to_left;
+
+    for (; *from_left > 0 ; (*from_left)-- ) {
+
+	wch = *inbufptr++;
+
+	if (!(codeset = wc_codeset(lcd, wch))) {
+	    unconv_num++;
+	    (*from_left)--;
+	    continue;
+	}
+
+	charset = ctdptr[codeset->cs_num];
+
+	length = codeset->length;
+	wch ^= (wchar_t)codeset->wc_encoding;
+
+	if ( (charset->side == XlcGR && charset != ct_state.GR_charset) ||
+	     (charset->side == XlcGL && charset != ct_state.GL_charset) ) {
+
+	    ct_len -= ctdptr[codeset->cs_num]->ct_encoding_len;
+
+	    if (ct_len < 0) {
+		unconv_num++;
+		break;
+	    }
+
+	    if (ctptr) {
+		strcpy(ctptr, ctdptr[codeset->cs_num]->ct_encoding);
+		ctptr += ctdptr[codeset->cs_num]->ct_encoding_len;
+	    }
+	}
+
+	if (charset->side == XlcGR) {
+	    ct_state.GR_charset = charset;
+	    ct_state.GL_charset = NULL;
+	} else if (charset->side == XlcGL) {
+	    ct_state.GL_charset = charset;
+	    ct_state.GR_charset = NULL;
+	}
+
+	do {
+
+	    length--;
+	    tmp = wch>>(wchar_t)( (Ulong)length * wc_shift);
+
+	    if (kana) {
+		if (BADCHAR(charset->min_ch, (char)tmp)) {
+		    unconv_num++;
+		    break;
+		}
+		*ctptr++ = (char)BIT8ON(tmp);
+	    }
+
+	    else if (byte1 && (kanji || userdef))
+		t1 = tmp;
+
+	    else if (byte2 && (kanji || userdef)) {
+		if (BADCHAR(charset->min_ch, (char)t1) ||
+		  BADCHAR(charset->min_ch, (char)tmp)) {
+		    unconv_num++;
+		    break;
+		}
+		if (charset->side == XlcGR) {
+		    *ctptr++ = (char)BIT8ON(t1);
+		    *ctptr++ = (char)BIT8ON(tmp);
+		} else {
+		    *ctptr++ = (char)BIT8OFF(t1);
+		    *ctptr++ = (char)BIT8OFF(tmp);
+		}
+	    }
+
+	    else {
+		if (BADCHAR(charset->min_ch, (char)tmp)) {
+		    unconv_num++;
+		    break;
+		}
+		*ctptr++ = (char)tmp;
+	    }
+
+
+	} while (length); 
+
+    }	/* end for */
+
+    *to = (XPointer)ctptr;
+
+    if ((num_conv = (int)(ctptr - ct_base)) > 0)
+	(*to_left) -= num_conv;
+
+    return unconv_num;
+}
+#undef byte1
+#undef byte2
+#undef kana
+#undef kanji
+#undef userdef
+
+
+#define byte1	(ctdp->length == clen)
+#define kana    (ctdp == ctdptr[Kana] && isrightside(*inbufptr))
+/* #define kanji   (ctdp == ctdptr[Kanji]) */
+#define kanji   (strstr(ctdp->name, "JISX0208"))
+#define userdef (ctdp == ctdptr[Userdef])
+
+static int
+euc_ctstombs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    char *inbufptr = *from;
+    XPointer outbufptr = *to;
+    const char *inbuf_base;
+    XPointer outbuf_base = outbufptr;
+    int clen, length;
+    int unconv_num = 0;
+    unsigned int ct_seglen = 0;
+    Uchar ct_type = 0;
+    CTData ctdp = &ctdata[0];	/* default */
+    CTData GL_ctdp = ctdp;	/* GL ctdp save */
+    CTData GR_ctdp = ctdp;	/* GR ctdp save */
+    Bool save_outbuf = True;
+    /* If outbufptr is NULL, doen't save output, but just counts
+       a length to hold the output */
+    if (outbufptr == NULL) save_outbuf = False;
+
+    for (length = ctdata[Ascii].length; *from_left > 0; (*from_left) -= length)
+    {
+	ct_type = CT_STD;
+	/* change GL/GR charset */
+	if(ctdp->side == XlcGR && isleftside(*inbufptr)){
+	    /* select GL side */
+	    ctdp = GL_ctdp;
+	    length = ctdp->length;
+	    ct_type = ctdp->ct_type;
+	}else if(ctdp->side == XlcGL && isrightside(*inbufptr)){
+	    /* select GR side */
+	    ctdp = GR_ctdp;
+	    length = ctdp->length;
+	    ct_type = ctdp->ct_type;
+	}
+	if (*inbufptr == '\033' || *inbufptr == (char)'\233') {
+
+	    for (ctdp = ctdata; ctdp <= ctd_endp ; ctdp++) {
+
+		if(!strncmp(inbufptr, ctdp->ct_encoding, ctdp->ct_encoding_len))
+		{
+		    inbufptr += ctdp->ct_encoding_len;
+		    (*from_left) -= ctdp->ct_encoding_len;
+		    if (ctdp->length) {
+			length = ctdp->length;
+			if( *from_left < length ) {
+			    *to = (XPointer)outbufptr;
+			    *to_left -= outbufptr - outbuf_base;
+			    return( unconv_num + *from_left );
+			}
+		    }
+		    ct_type = ctdp->ct_type;
+		    if(ctdp->side == XlcGL){
+			GL_ctdp = ctdp; /* save GL ctdp */
+		    }else{
+			GR_ctdp = ctdp; /* save GR ctdp */
+		    }
+		    break;
+		}
+	    }
+	    if (ctdp > ctd_endp) 	/* failed to match CT sequence */
+		unconv_num++;
+	}
+
+/* The following code insures that non-standard encodings, direction, extension,
+ * and version strings are ignored; subject to change in future.
+ */
+	switch (ct_type) {
+	case CT_STD:
+	    break;
+	case CT_EXT2:
+	    inbufptr++;
+	    (*from_left)--;
+	case CT_NSTD:
+	    ct_seglen = (BIT8OFF(*inbufptr) << 7) + BIT8OFF(*(inbufptr+1)) + 2;
+	    inbufptr += ct_seglen;
+	    (*from_left) -= ct_seglen;
+	    continue;
+	case CT_EXT0:
+	    inbuf_base = inbufptr;
+	    SKIP_I(inbufptr);
+	    inbufptr++;
+	    ct_seglen = (unsigned)(inbufptr - inbuf_base);
+	    *(from_left) -= ct_seglen;
+	    continue;
+	case CT_EXT1:
+	    inbuf_base = inbufptr;
+	    SKIP_P(inbufptr);
+	    SKIP_I(inbufptr);
+	    inbufptr++;
+	    ct_seglen = (unsigned)(inbufptr - inbuf_base);
+	    *(from_left) -= ct_seglen;
+	    continue;
+	case CT_DIR:
+	    continue;
+	case CT_VER:
+	    inbufptr += 2;
+	    *(from_left) -= 2;
+	    continue;
+	}
+
+	clen = length;
+	do {
+
+	    if (byte1) {
+		if (kanji) {
+		    /* FIXME: assignment of read-only location */
+		    *inbufptr = BIT8ON(*inbufptr);
+		    *(inbufptr+1) = BIT8ON(*(inbufptr+1));
+		}
+		else if (kana || userdef) {
+		    if (save_outbuf == True) {
+			*outbufptr++ = ctdp->sshift;
+		    }
+		    (*to_left)--;
+		}
+	    }
+	    if (save_outbuf == True) {
+		*outbufptr++ = *inbufptr;
+	    }
+	    (*to_left)--;
+	    inbufptr++;
+
+	    if (*to_left == 0 && *from_left != length) {
+		*to = (XPointer)outbufptr;
+		unconv_num = *from_left;
+		return unconv_num;
+	    }
+	} while (--clen);
+    }
+
+    *to = outbufptr;
+
+    return unconv_num;
+
+}
+#undef byte1
+#undef kana
+#undef kanji
+#undef userdef
+
+
+static int
+euc_mbstocts(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    int ct_len = *to_left;
+    int cs_num;
+    int clen, length = 0;
+    int unconv_num = 0;
+    int num_conv;
+    const char *inbufptr = *from;
+    char *ctptr = *to;
+    XPointer ct_base = ctptr;
+
+    StateRec ct_state;
+    CTData charset;
+    XLCd lcd = (XLCd) conv->state;
+    int codeset_num = XLC_GENERIC(lcd, codeset_num);
+
+/* Initial State: */
+    ct_state.GL_charset = NULL;
+    ct_state.GR_charset = NULL;
+
+    if (*from_left > *to_left)
+        *from_left = *to_left;
+
+    for (;*from_left > 0; (*from_left) -= length) {
+
+	if (isleftside(*inbufptr)) {		/* 7-bit (CS0) */
+	    if (ASCII_CODESET >= codeset_num) {
+	      	unconv_num++;
+		(*from_left)--;
+		continue;
+	    }
+	    cs_num = Ascii;
+	    charset = ctdptr[Ascii];
+	}
+	else if ((Uchar)*inbufptr == SS2) {	/* Kana */
+	    if (KANA_CODESET >= codeset_num) {
+	      	unconv_num++;
+		(*from_left)--;
+		continue;
+	    }
+	    cs_num = Kana;
+	    charset = ctdptr[Kana];
+	    inbufptr++;
+	    (*from_left)--;
+	}
+	else if ((Uchar)*inbufptr == SS3) {	/* Userdef */
+	    if (USERDEF_CODESET >= codeset_num) {
+	      	unconv_num++;
+		(*from_left)--;
+		continue;
+	    }
+	    cs_num = Userdef;
+	    charset = ctdptr[Userdef];
+	    inbufptr++;
+	    (*from_left)--;
+	}
+	else {
+	    if (KANJI_CODESET >= codeset_num) {
+	      	unconv_num++;
+		(*from_left)--;
+		continue;
+	    }
+	    cs_num = Kanji;
+	    charset = ctdptr[Kanji];
+	}
+
+	length = charset->length;
+
+	if (BADCHAR(charset->min_ch, *inbufptr))
+            continue;
+
+	if ( (charset->side == XlcGR && charset != ct_state.GR_charset) ||
+	     (charset->side == XlcGL && charset != ct_state.GL_charset) ) {
+
+	    ct_len -= ctdptr[cs_num]->ct_encoding_len;
+	    if (ct_len < 0) {
+		unconv_num++;
+		break;
+	    }
+	
+	    if (ctptr) {
+		strcpy(ctptr, ctdptr[cs_num]->ct_encoding);
+		ctptr += ctdptr[cs_num]->ct_encoding_len;
+	    }
+	}
+
+	if (charset->side == XlcGR) {
+	    ct_state.GR_charset = charset;
+	    ct_state.GL_charset = NULL;
+	} else if (charset->side == XlcGL) {
+	    ct_state.GL_charset = charset;
+	    ct_state.GR_charset = NULL;
+	}
+
+	clen = length;
+
+	do {
+	    *ctptr++ = charset == ct_state.GR_charset ?
+		BIT8ON(*inbufptr++) : BIT8OFF(*inbufptr++);
+	} while (--clen); 
+    }
+
+    *to = (XPointer)ctptr;
+
+    if ((num_conv = (int)(ctptr - ct_base)) > 0)
+	(*to_left) -= num_conv;
+    return unconv_num;
+
+}
+
+
+static void
+close_converter(
+    XlcConv conv)
+{
+	Xfree((char *) conv);
+}
+
+enum { MBSTOCS, WCSTOCS, MBTOCS, CSTOMBS, CSTOWCS, MBSTOWCS, WCSTOMBS,
+       CTSTOWCS, CTSTOMBS, WCSTOCTS, MBSTOCTS };
+
+static XlcConvMethodsRec conv_methods[] = {
+    {close_converter, euc_mbstocs,  NULL },
+    {close_converter, euc_wcstocs,  NULL },
+    {close_converter, euc_mbtocs,   NULL },
+    {close_converter, euc_cstombs,  NULL },
+    {close_converter, euc_cstowcs,  NULL },
+    {close_converter, euc_mbstowcs, NULL },
+    {close_converter, euc_wcstombs, NULL },
+    {close_converter, euc_ctstowcs, NULL },
+    {close_converter, euc_ctstombs, NULL },
+    {close_converter, euc_wcstocts, NULL },
+    {close_converter, euc_mbstocts, NULL },
+};
+
+
+static XlcConv
+open_mbstocs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &conv_methods[MBSTOCS]);
+}
+
+static XlcConv
+open_wcstocs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &conv_methods[WCSTOCS]);
+}
+
+static XlcConv
+open_mbtocs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &conv_methods[MBTOCS]);
+}
+
+static XlcConv
+open_cstombs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &conv_methods[CSTOMBS]);
+}
+
+static XlcConv
+open_cstowcs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &conv_methods[CSTOWCS]);
+}
+
+static XlcConv
+open_mbstowcs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &conv_methods[MBSTOWCS]);
+}
+
+static XlcConv
+open_wcstombs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &conv_methods[WCSTOMBS]);
+}
+
+static XlcConv
+open_ctstowcs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &conv_methods[CTSTOWCS]);
+}
+
+static XlcConv
+open_ctstombs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &conv_methods[CTSTOMBS]);
+}
+
+static XlcConv
+open_wcstocts(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &conv_methods[WCSTOCTS]);
+}
+
+static XlcConv
+open_mbstocts(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &conv_methods[MBSTOCTS]);
+}
+
+XLCd
+_XlcEucLoader(
+    const char *name)
+{
+    XLCd lcd;
+
+    lcd = _XlcCreateLC(name, _XlcGenericMethods);
+    if (lcd == NULL)
+	return lcd;
+
+    if (!XLC_PUBLIC_PART(lcd)->codeset ||
+	(_XlcNCompareISOLatin1(XLC_PUBLIC_PART(lcd)->codeset, "euc", 3))) {
+	_XlcDestroyLC(lcd);
+	return (XLCd) NULL;
+    }
+
+    initCTptr(lcd);
+
+    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNCharSet, open_mbstocs);
+    _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNCharSet, open_wcstocs);
+    _XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNMultiByte, open_cstombs);
+    _XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNWideChar, open_cstowcs);
+    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNChar, open_mbtocs);
+
+#ifndef FORCE_INDIRECT_CONVERTER
+    _XlcSetConverter(lcd, XlcNCompoundText, lcd, XlcNMultiByte, open_ctstombs);
+    _XlcSetConverter(lcd, XlcNCompoundText, lcd, XlcNWideChar, open_ctstowcs);
+    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNCompoundText, open_mbstocts);
+    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNWideChar, open_mbstowcs);
+    _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNCompoundText, open_wcstocts);
+    _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNMultiByte, open_wcstombs);
+#endif
+
+    _XlcAddUtf8Converters(lcd);
+
+    return lcd;
+}
+
+#else
+typedef int dummy;
+#endif /* X_LOCALE */
diff --git a/libX11/modules/lc/xlocale/lcJis.c b/libX11/modules/lc/xlocale/lcJis.c
new file mode 100644
index 000000000..bdd46e36e
--- /dev/null
+++ b/libX11/modules/lc/xlocale/lcJis.c
@@ -0,0 +1,947 @@
+/* $Xorg: lcJis.c,v 1.3 2000/08/17 19:45:18 cpqbld Exp $ */
+/*
+ * Copyright 1992, 1993 by TOSHIBA Corp.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of TOSHIBA not be used in advertising
+ * or publicity pertaining to distribution of the software without specific,
+ * written prior permission. TOSHIBA make no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ *
+ * TOSHIBA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+ * TOSHIBA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ *
+ * Author: Katsuhisa Yano	TOSHIBA Corp.
+ *			   	mopi@osa.ilab.toshiba.co.jp
+ */
+/* $XFree86: xc/lib/X11/lcJis.c,v 1.9 2002/04/10 16:20:06 tsi Exp $ */
+
+/*
+ * A Japanese JIS locale.
+ * Supports: all locales with codeset JIS7.
+ * How: Provides converters for JIS.
+ * Platforms: Only those defining X_LOCALE (only Lynx, Linux-libc5, OS/2).
+ */
+
+#ifdef X_LOCALE
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "Xlibint.h"
+#include "XlcGeneric.h"
+#include <stdio.h>
+
+#if !defined(macII) && !defined(X_LOCALE)
+#define STDCVT
+#endif
+
+typedef struct _StateRec {
+    XLCd lcd;
+    XlcCharSet charset;
+    XlcCharSet GL_charset;
+    XlcCharSet GR_charset;
+} StateRec, *State;
+
+static void
+init_state(
+    XlcConv conv)
+{
+    State state = (State) conv->state;
+    XLCdGenericPart *gen = XLC_GENERIC_PART(state->lcd);
+    CodeSet codeset;
+
+    codeset = gen->initial_state_GL;
+    if (codeset && codeset->charset_list)
+	state->GL_charset = *codeset->charset_list;
+    codeset = gen->initial_state_GR;
+    if (codeset && codeset->charset_list)
+	state->GR_charset = *codeset->charset_list;
+
+    if (state->GL_charset == NULL)
+	if ((codeset = *gen->codeset_list) != NULL)
+	    state->GL_charset = *codeset->charset_list;
+}
+
+static int
+compare(
+    const char *src,
+    const char *encoding,
+    int length)
+{
+    const char *start = src;
+
+    while (length-- > 0) {
+	if (*src++ != *encoding++)
+	    return 0;
+	if (*encoding == '\0')
+	    return src - start;
+    }
+
+    return 0;
+}
+
+static int
+mbtocs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    State state = (State) conv->state;
+    XLCd lcd = state->lcd;
+    const char *src;
+    char *dst;
+    unsigned char *mb_parse_table;
+    ParseInfo *parse_list, parse_info;
+    XlcCharSet charset;
+    int length, number, encoding_len = 0;
+    int i;
+
+    src = *((const char **) from);
+    dst = *((char **) to);
+
+    mb_parse_table = XLC_GENERIC(lcd, mb_parse_table);
+    if (mb_parse_table != NULL) {
+	number = mb_parse_table[(unsigned char) *src];
+	if (number > 0) {
+	    parse_list = XLC_GENERIC(lcd, mb_parse_list) + number - 1;
+	    for ( ; (parse_info = *parse_list) != NULL; parse_list++) {
+		encoding_len = compare(src, parse_info->encoding, *from_left);
+		if (encoding_len > 0) {
+		    switch (parse_info->type) {
+			case E_SS:
+			    src += encoding_len;
+			    charset = *parse_info->codeset->charset_list;
+			    goto found;
+			case E_LSL:
+			case E_LSR:
+			    src += encoding_len;
+			    charset = *parse_info->codeset->charset_list;
+			    if (parse_info->type == E_LSL)
+			    	state->GL_charset = charset;
+			    else
+			    	state->GR_charset = charset;
+			    length = 0;
+			    goto end;
+			case E_GL:
+			    charset = state->GL_charset;
+			    goto found;
+			case E_GR:
+			    charset = state->GR_charset;
+			    goto found;
+			default:
+			    break;
+		    }
+		}
+	    }
+	}
+    }
+
+    if ((*src & 0x80) && state->GR_charset)
+	charset = state->GR_charset;
+    else
+	charset = state->GL_charset;
+
+found:
+    if (charset == NULL ||
+	(num_args == 2 && (XlcCharSet) args[1] != charset))
+	return -1;
+
+    length = charset->char_size;
+    if (length > *from_left - encoding_len)
+	return -1;
+
+    if (dst) {
+	if (length > *to_left)
+	    return -1;
+	if (charset->side == XlcGL) {
+	    for (i = 0; i < length; i++)
+		*dst++ = *src++ & 0x7f;
+	} else if (charset->side == XlcGR) {
+	    for (i = 0; i < length; i++)
+		*dst++ = *src++ | 0x80;
+	} else {
+	    for (i = 0; i < length; i++)
+		*dst++ = *src++;
+	}
+	*to = (XPointer) dst;
+	*to_left -= length;
+    }
+end:
+    *from = (XPointer) src;
+    *from_left -= encoding_len + length;
+    state->charset = charset;
+    if (num_args == 1)
+	*((XlcCharSet *) args[0]) = charset;
+
+    return 0;
+}
+
+static int
+mbstocs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    XlcCharSet charset = NULL;
+    XPointer tmp_args[2], save_from = *from;
+    int ret, unconv_num = 0, tmp_num = 1;
+
+    tmp_args[0] = (XPointer) &charset;
+
+    while (*from_left > 0 && *to_left > 0) {
+	ret = mbtocs(conv, from, from_left, to, to_left, tmp_args, tmp_num);
+	if (ret < 0)
+	    break;
+	unconv_num += ret;
+	if (tmp_num == 1 && charset) {
+	    tmp_args[1] = (XPointer) charset;
+	    tmp_num = 2;
+	}
+    }
+
+    if (save_from == *from)
+	return -1;
+
+    if (num_args > 0)
+	*((XlcCharSet *) args[0]) = charset;
+    
+    return unconv_num;
+}
+
+static CodeSet
+wc_parse_codeset(
+    XLCd lcd,
+    const wchar_t *wcstr)
+{
+    CodeSet *codeset;
+    unsigned long wc_encoding;
+    int num;
+
+    wc_encoding = *wcstr & XLC_GENERIC(lcd, wc_encode_mask);
+    num = XLC_GENERIC(lcd, codeset_num);
+    codeset = XLC_GENERIC(lcd, codeset_list);
+    while (num-- > 0) {
+	if (wc_encoding == (*codeset)->wc_encoding)
+	    return *codeset;
+	codeset++;
+    }
+
+    return NULL;
+}
+
+static int
+wcstocs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    State state = (State) conv->state;
+    XLCd lcd = state->lcd;
+    const wchar_t *wcptr;
+    char *bufptr;
+    wchar_t wch;
+    char *tmpptr;
+    int length;
+    CodeSet codeset;
+    unsigned long wc_encoding;
+    int wcstr_len, buf_len;
+
+    if (from == NULL || *from == NULL)
+	return 0;
+
+    wcptr = *((const wchar_t **) from);
+    bufptr = *((char **) to);
+    wcstr_len = *from_left;
+    buf_len = *to_left;
+
+    codeset = wc_parse_codeset(lcd, wcptr);
+    if (codeset == NULL)
+	return -1;
+    wc_encoding = codeset->wc_encoding;
+
+    if (wcstr_len < buf_len / codeset->length)
+	buf_len = wcstr_len * codeset->length;
+
+    for ( ; wcstr_len > 0 && buf_len > 0; wcptr++, wcstr_len--) {
+	wch = *wcptr;
+	if ((wch & XLC_GENERIC(lcd, wc_encode_mask)) != wc_encoding)
+	    break;
+	length = codeset->length;
+	buf_len -= length;
+	bufptr += length;
+
+	tmpptr = bufptr - 1;
+	if ((*codeset->charset_list)->side == XlcGL) {
+	    while (length--) {
+		*tmpptr-- = (unsigned char) (wch & 0x7f);
+		wch >>= (wchar_t)XLC_GENERIC(lcd, wc_shift_bits);
+	    }
+	} else if ((*codeset->charset_list)->side == XlcGR) {
+	    while (length--) {
+		*tmpptr-- = (unsigned char) (wch | 0x80);
+		wch >>= (wchar_t)XLC_GENERIC(lcd, wc_shift_bits);
+	    }
+	} else {
+	    while (length--) {
+		*tmpptr-- = (unsigned char) wch;
+		wch >>= (wchar_t)XLC_GENERIC(lcd, wc_shift_bits);
+	    }
+	}
+    }
+
+    if (num_args > 0)
+	*((XlcCharSet *) args[0]) = *codeset->charset_list;
+
+    *from_left -= wcptr - *((wchar_t **) from);
+    *from = (XPointer) wcptr;
+
+    *to_left -= bufptr - *((char **) to);
+    *to = bufptr;
+
+    return 0;
+}
+
+static CodeSet
+GetCodeSetFromCharSet(
+    XLCd lcd,
+    XlcCharSet charset)
+{
+    CodeSet *codeset = XLC_GENERIC(lcd, codeset_list);
+    XlcCharSet *charset_list;
+    int codeset_num, num_charsets;
+
+    codeset_num = XLC_GENERIC(lcd, codeset_num);
+
+    for ( ; codeset_num-- > 0; codeset++) {
+	num_charsets = (*codeset)->num_charsets;
+	charset_list = (*codeset)->charset_list;
+
+	for ( ; num_charsets-- > 0; charset_list++)
+	    if (*charset_list == charset)
+		return *codeset;
+    }
+
+    return (CodeSet) NULL;
+}
+
+static int
+cstombs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    State state = (State) conv->state;
+    const char *csptr;
+    char *bufptr;
+    int csstr_len;
+    int buf_len;
+    int num, encoding_len = 0;
+    CodeSet codeset;
+    XlcCharSet charset;
+    EncodingType type;
+    int cvt_length;
+
+    csptr = *((const char **) from);
+    bufptr = *((char **) to);
+    csstr_len = *from_left;
+    buf_len = *to_left;
+
+    if (num_args < 1)
+	return -1;
+    
+    charset = (XlcCharSet) args[0];
+
+    codeset = GetCodeSetFromCharSet(state->lcd, charset);
+    if (codeset == NULL)
+	return -1;
+
+    cvt_length = 0;
+    if (codeset->parse_info) {
+	switch (type = codeset->parse_info->type) {
+	    case E_SS:
+		encoding_len = strlen(codeset->parse_info->encoding);
+		break;
+	    case E_LSL:
+	    case E_LSR:
+		if (type == E_LSL) {
+		    if (charset == state->GL_charset)
+			break;
+		} else {
+		    if (charset == state->GR_charset)
+			break;
+		}
+		encoding_len = strlen(codeset->parse_info->encoding);
+		if (encoding_len > buf_len)
+		    return -1;
+		cvt_length += encoding_len;
+		if (bufptr) {
+		    strcpy(bufptr, codeset->parse_info->encoding);
+		    bufptr += encoding_len;
+		}
+		buf_len -= encoding_len;
+		encoding_len = 0;
+		if (type == E_LSL)
+		    state->GL_charset = charset;
+		else
+		    state->GR_charset = charset;
+		break;
+	    default:
+		break;
+	}
+    }
+
+    csstr_len /= codeset->length;
+    buf_len /= codeset->length + encoding_len;
+    if (csstr_len < buf_len)
+	buf_len = csstr_len;
+    
+    cvt_length += buf_len * (encoding_len + codeset->length);
+    if (bufptr) {
+	while (buf_len--) {
+	    if (encoding_len) {
+		strcpy(bufptr, codeset->parse_info->encoding);
+		bufptr += encoding_len;
+	    }
+	    num = codeset->length;
+	    if (codeset->side == XlcGL) {
+		while (num--)
+		    *bufptr++ = *csptr++ & 0x7f;
+	    } else if (codeset->side == XlcGR) {
+		while (num--)
+		    *bufptr++ = *csptr++ | 0x80;
+	    } else {
+		while (num--)
+		    *bufptr++ = *csptr++;
+	    }
+    	}
+    }
+
+    *from_left -= csptr - *((char **) from);
+    *from = (XPointer) csptr;
+
+    if (bufptr)
+	*to = (XPointer) bufptr;
+    *to_left -= cvt_length;
+
+    return 0;
+}
+
+static int
+cstowcs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    State state = (State) conv->state;
+    XLCd lcd = state->lcd;
+    const char *csptr;
+    wchar_t *bufptr;
+    int csstr_len;
+    int buf_len;
+    wchar_t wch;
+    unsigned long code_mask, wc_encoding;
+    int num, length, wc_shift_bits;
+    CodeSet codeset;
+
+    csptr = *((const char **) from);
+    bufptr = *((wchar_t **) to);
+    csstr_len = *from_left;
+    buf_len = *to_left;
+
+    if (num_args < 1)
+	return -1;
+    
+    codeset = GetCodeSetFromCharSet(lcd, (XlcCharSet) args[0]);
+    if (codeset == NULL)
+	return -1;
+
+    length = codeset->length;
+    csstr_len /= length;
+    if (csstr_len < buf_len)
+	buf_len = csstr_len;
+    
+    code_mask = ~XLC_GENERIC(lcd, wc_encode_mask);
+    wc_encoding = codeset->wc_encoding;
+    wc_shift_bits = XLC_GENERIC(lcd, wc_shift_bits);
+
+    *to_left -= buf_len;
+
+    if (bufptr) {
+	while (buf_len--) {
+	    wch = (wchar_t) (*csptr++ & 0x7f);
+	    num = length - 1;
+	    while (num--)
+		wch = (wch << wc_shift_bits) | (*csptr++ & 0x7f);
+
+	    *bufptr++ = (wch & code_mask) | wc_encoding;
+	}
+    }
+
+    *from_left -= csptr - *((char **) from);
+    *from = (XPointer) csptr;
+
+    if (bufptr)
+	*to = (XPointer) bufptr;
+
+    return 0;
+}
+
+
+static void
+close_converter(
+    XlcConv conv)
+{
+    if (conv->state) {
+	Xfree((char *) conv->state);
+    }
+
+    Xfree((char *) conv);
+}
+
+static XlcConv
+create_conv(
+    XLCd lcd,
+    XlcConvMethods methods)
+{
+    XlcConv conv;
+    State state;
+
+    conv = (XlcConv) Xmalloc(sizeof(XlcConvRec));
+    if (conv == NULL)
+	return (XlcConv) NULL;
+    
+    conv->methods = (XlcConvMethods) Xmalloc(sizeof(XlcConvMethodsRec));
+    if (conv->methods == NULL)
+	goto err;
+    *conv->methods = *methods;
+    if (XLC_PUBLIC(lcd, is_state_depend))
+	conv->methods->reset = init_state;
+
+    conv->state = (XPointer) Xmalloc(sizeof(StateRec));
+    if (conv->state == NULL)
+	goto err;
+    bzero((char *) conv->state, sizeof(StateRec));
+    
+    state = (State) conv->state;
+    state->lcd = lcd;
+    init_state(conv);
+    
+    return conv;
+
+err:
+    close_converter(conv);
+
+    return (XlcConv) NULL;
+}
+
+static XlcConvMethodsRec mbstocs_methods = {
+    close_converter,
+    mbstocs,
+    NULL
+};
+
+static XlcConv
+open_mbstocs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &mbstocs_methods);
+}
+
+static XlcConvMethodsRec wcstocs_methods = {
+    close_converter,
+    wcstocs,
+    NULL
+};
+
+static XlcConv
+open_wcstocs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &wcstocs_methods);
+}
+
+static XlcConvMethodsRec mbtocs_methods = {
+    close_converter,
+    mbtocs,
+    NULL
+};
+
+static XlcConv
+open_mbtocs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &mbtocs_methods);
+}
+
+static XlcConvMethodsRec cstombs_methods = {
+    close_converter,
+    cstombs,
+    NULL
+};
+
+static XlcConv
+open_cstombs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &cstombs_methods);
+}
+
+static XlcConvMethodsRec cstowcs_methods = {
+    close_converter,
+    cstowcs,
+    NULL
+};
+
+static XlcConv
+open_cstowcs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &cstowcs_methods);
+}
+
+#ifdef STDCVT
+static int
+stdc_mbstowcs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    const char *src = *((const char **) from);
+    wchar_t *dst = *((wchar_t **) to);
+    int src_left = *from_left;
+    int dst_left = *to_left;
+    int length;
+
+    while (src_left > 0 && dst_left > 0) {
+	length = mbtowc(dst, src, src_left);
+	if (length < 0)
+	    break;
+
+	src += length;
+	src_left -= length;
+	if (dst)
+	    dst++;
+	dst_left--;
+
+	if (length == 0) {
+	    src++;
+	    src_left--;
+	    break;
+	}
+    }
+
+    if (*from_left == src_left)
+	return -1;
+
+    *from = (XPointer) src;
+    if (dst)
+	*to = (XPointer) dst;
+    *from_left = src_left;
+    *to_left = dst_left;
+
+    return 0;
+}
+
+static int
+stdc_wcstombs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    const wchar_t *src = *((const wchar_t **) from);
+    char *dst = *((char **) to);
+    int src_left = *from_left;
+    int dst_left = *to_left;
+    int length;
+
+    while (src_left > 0 && dst_left > 0) {
+	length = wctomb(dst, *src);		/* XXX */
+	if (length < 0 || dst_left < length)
+	    break;
+
+	src++;
+	src_left--;
+	dst += length;
+	dst_left -= length;
+
+	if (length == 0) {
+	    dst++;
+	    dst_left--;
+	    break;
+	}
+    }
+
+    if (*from_left == src_left)
+	return -1;
+
+    *from = (XPointer) src;
+    *to = (XPointer) dst;
+    *from_left = src_left;
+    *to_left = dst_left;
+
+    return 0;
+}
+
+static int
+stdc_wcstocs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    const wchar_t *src = *((const wchar_t **) from);
+    wchar_t wch;
+    XlcCharSet charset = NULL;
+    XPointer tmp_args[2], tmp_from, save_from = *from;
+    char tmp[32];
+    int length, ret, src_left = *from_left;
+    int unconv_num = 0, tmp_num = 1;
+
+    tmp_args[0] = (XPointer) &charset;
+
+    while (src_left > 0 && *to_left > 0) {
+	if (wch = *src) {
+	    length = wctomb(tmp, wch);
+	} else {
+	    length = 1;
+	    *tmp = '\0';
+	}
+		
+	if (length < 0)
+	    break;
+
+	tmp_from = (XPointer) tmp;
+	ret = mbtocs(conv, &tmp_from, &length, to, to_left, tmp_args, tmp_num);
+	if (ret < 0)
+	    break;
+	unconv_num += ret;
+	if (tmp_num == 1 && charset) {
+	    tmp_args[1] = (XPointer) charset;
+	    tmp_num = 2;
+	}
+
+	src++;
+	src_left--;
+    }
+
+    if (save_from == (XPointer) src)
+	return -1;
+
+    *from = (XPointer) src;
+    *from_left = src_left;
+
+    if (num_args > 0)
+	*((XlcCharSet *) args[0]) = charset;
+    
+    return unconv_num;
+}
+
+#define DefineLocalBuf		char local_buf[BUFSIZ]
+#define AllocLocalBuf(length)	(length > BUFSIZ ? (char*) Xmalloc(length) : local_buf)
+#define FreeLocalBuf(ptr)	if (ptr != local_buf) Xfree(ptr)
+
+static int
+stdc_cstowcs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    XLCd lcd = ((State) conv->state)->lcd;
+    DefineLocalBuf;
+    XPointer buf, save_buf;
+    int length, left, ret;
+    
+    left = length = *to_left * XLC_PUBLIC(lcd, mb_cur_max);
+    buf = save_buf = (XPointer) AllocLocalBuf(length);
+    if (buf == NULL)
+	return -1;
+
+    ret = cstombs(conv, from, from_left, &buf, &left, args, num_args);
+    if (ret < 0)
+	goto err;
+    
+    buf = save_buf;
+    length -= left;
+    if (stdc_mbstowcs(conv, &buf, &length, to, to_left, args, num_args) < 0)
+	ret = -1;
+
+err:
+    FreeLocalBuf(save_buf);
+
+    return ret;
+}
+
+static XlcConvMethodsRec stdc_mbstowcs_methods = {
+    close_converter,
+    stdc_mbstowcs,
+    NULL
+};
+
+static XlcConv
+open_stdc_mbstowcs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &stdc_mbstowcs_methods);
+}
+
+static XlcConvMethodsRec stdc_wcstombs_methods = {
+    close_converter,
+    stdc_wcstombs,
+    NULL
+};
+
+static XlcConv
+open_stdc_wcstombs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &stdc_wcstombs_methods);
+}
+
+static XlcConvMethodsRec stdc_wcstocs_methods = {
+    close_converter,
+    stdc_wcstocs,
+    NULL
+};
+
+static XlcConv
+open_stdc_wcstocs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &stdc_wcstocs_methods);
+}
+
+static XlcConvMethodsRec stdc_cstowcs_methods = {
+    close_converter,
+    stdc_cstowcs,
+    NULL
+};
+
+static XlcConv
+open_stdc_cstowcs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &stdc_cstowcs_methods);
+}
+#endif /* STDCVT */
+
+XLCd
+_XlcJisLoader(
+    const char *name)
+{
+    XLCd lcd;
+#ifdef STDCVT
+    XLCdGenericPart *gen;
+#endif
+
+    lcd = _XlcCreateLC(name, _XlcGenericMethods);
+    if (lcd == NULL)
+	return lcd;
+
+    if (!XLC_PUBLIC_PART(lcd)->codeset ||
+	(_XlcCompareISOLatin1(XLC_PUBLIC_PART(lcd)->codeset, "JIS7"))) {
+        _XlcDestroyLC(lcd);
+        return (XLCd) NULL;
+    }
+
+    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNChar, open_mbtocs);
+    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNCharSet, open_mbstocs);
+    _XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNMultiByte, open_cstombs);
+
+#ifdef STDCVT
+    gen = XLC_GENERIC_PART(lcd);
+
+    if (gen->use_stdc_env == True) {
+	_XlcSetConverter(lcd,XlcNMultiByte,lcd,XlcNWideChar,open_stdc_mbstowcs);
+	_XlcSetConverter(lcd,XlcNWideChar,lcd,XlcNMultiByte,open_stdc_wcstombs);
+    }
+    if (gen->force_convert_to_mb == True) {
+	_XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNCharSet,open_stdc_wcstocs);
+	_XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNWideChar,open_stdc_cstowcs);
+    } else {
+#endif
+    _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNCharSet, open_wcstocs);
+    _XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNWideChar, open_cstowcs);
+#ifdef STDCVT
+    }
+#endif
+
+    _XlcAddUtf8Converters(lcd);
+
+    return lcd;
+}
+
+#else
+typedef int dummy;
+#endif /* X_LOCALE */
diff --git a/libX11/modules/lc/xlocale/lcSjis.c b/libX11/modules/lc/xlocale/lcSjis.c
new file mode 100644
index 000000000..6adb2945d
--- /dev/null
+++ b/libX11/modules/lc/xlocale/lcSjis.c
@@ -0,0 +1,1614 @@
+/* $Xorg: lcSjis.c,v 1.3 2000/08/17 19:45:19 cpqbld Exp $ */
+/****************************************************************
+
+        Copyright 1992, 1993 by FUJITSU LIMITED
+        Copyright 1993 by Fujitsu Open Systems Solutions, Inc.
+	Copyright 1994 by Sony Corporation
+
+Permission to use, copy, modify, distribute and sell this software
+and its documentation for any purpose is hereby granted without fee,
+provided that the above copyright notice appear in all copies and
+that both that copyright notice and this permission notice appear
+in supporting documentation, and that the name of FUJITSU LIMITED,
+Fujitsu Open Systems Solutions, Inc. and Sony Corporation  not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+FUJITSU LIMITED, Fujitsu Open Systems Solutions, Inc. and
+Sony Corporation make no representations about the suitability of
+this software for any purpose.  It is provided "as is" without
+express or implied warranty.
+
+FUJITSU LIMITED, FUJITSU OPEN SYSTEMS SOLUTIONS, INC. AND SONY
+CORPORATION DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
+IN NO EVENT SHALL FUJITSU OPEN SYSTEMS SOLUTIONS, INC., FUJITSU LIMITED
+AND SONY CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
+OR PERFORMANCE OF THIS SOFTWARE.
+
+    Authors: Jeffrey Bloomfield		(jeffb@ossi.com)
+	     Shigeru Yamada		(yamada@ossi.com)
+             Yoshiyuki Segawa		(segawa@ossi.com)
+    Modifier:Makoto Wakamatsu   Sony Corporation
+				makoto@sm.sony.co.jp
+
+*****************************************************************/
+/* $XFree86: xc/lib/X11/lcSjis.c,v 3.9 2002/04/10 16:20:06 tsi Exp $ */
+
+/*
+ * A Japanese SJIS locale.
+ * Supports: all locales with codeset SJIS.
+ * How: Provides converters for SJIS.
+ * Platforms: Only those defining X_LOCALE (only Lynx, Linux-libc5, OS/2).
+ */
+
+#ifdef X_LOCALE
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "Xlibint.h"
+#include "XlcGeneric.h"
+
+#include <ctype.h>
+#ifdef WIN32
+#define isascii __isascii
+#endif
+
+#define CS0	codesets[0]		/* Codeset 0 - 7-bit ASCII	*/
+#define CS1	codesets[1]		/* Codeset 1 - Kanji		*/
+#define CS2	codesets[2]		/* Codeset 2 - Half-Kana	*/
+#define CS3	codesets[3]		/* Codeset 3 - User defined	*/
+
+#define ascii		(codeset->cs_num == 0)
+#define kanji		(codeset->cs_num == 1)
+#define kana		(codeset->cs_num == 2)
+#define userdef		(codeset->cs_num == 3)
+
+#define	ASCII_CODESET	0
+#define KANJI_CODESET	1
+#define KANA_CODESET	2
+#define USERDEF_CODESET	3
+#define MAX_CODESETS	4
+
+#define GR	0x80	/* begins right-side (non-ascii) region */
+#define GL	0x7f    /* ends left-side (ascii) region        */
+
+#define isleftside(c)	(((c) & GR) ? 0 : 1)
+#define isrightside(c)	(!isleftside(c))
+
+typedef unsigned char   Uchar;
+typedef unsigned long	Ulong;
+typedef unsigned int	Uint;
+
+/* Acceptable range for 2nd byte of SJIS multibyte char */
+#define VALID_MULTIBYTE(c) \
+			((0x40<=((Uchar)c) && ((Uchar)c)<=0x7e) \
+			|| (0x80<=((Uchar)c) && ((Uchar)c)<=0xfc))
+
+#ifndef iskanji
+#define iskanji(c)	((0x81<=((Uchar)c) && ((Uchar)c)<=0x9f) \
+			|| (0xe0<=((Uchar)c) && ((Uchar)c)<=0xef))
+#endif /* !iskanji */
+
+#ifndef iskana
+#define iskana(c)	(0xa1<=((Uchar)c) && ((Uchar)c)<=0xdf)
+#endif /* !iskana */
+
+#define	isuserdef(c)	(0xf0<=((Uchar)c) && ((Uchar)c)<=0xfc)
+
+#define BIT8OFF(c)	((c) & GL)
+#define BIT8ON(c)	((c) | GR)
+
+
+static void jis_to_sjis (Uchar *p1, Uchar *p2);
+static void sjis_to_jis (Uchar *p1, Uchar *p2);
+static CodeSet wc_codeset (XLCd lcd, wchar_t wch);
+
+
+/*
+ * Notes:
+ * 1.  16-bit widechar format is limited to 14 data bits.  Since the 2nd byte
+ *     of SJIS multibyte chars are in the ranges of 0x40 - 7E and 0x80 - 0xFC,
+ *     SJIS cannot map directly into 16 bit widechar format within the confines
+ *     of a single codeset.  Therefore, for SJIS widechar conversion, SJIS Kanji
+ *     is mapped into the JIS codeset.  (The algorithms used in jis_to_sjis()
+ *     and sjis_to_jis() are from Ken Lunde (lunde@mv.us.adobe.com) and are in
+ *     the public domain.)
+ * 2.  Defining FORCE_INDIRECT_CONVERTER (see _XlcEucLoader())
+ *     forces indirect (charset) conversions (e.g. wcstocs()<->cstombs()).
+ * 3.  Using direct converters (e.g. mbstowcs()) decreases conversion
+ *     times by 20-40% (depends on specific converter used).
+ */
+
+
+static int
+sjis_mbstowcs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+
+    XLCd lcd = (XLCd)conv->state;
+
+    int chr_len = 0;
+    int shift_mult = 0;
+    Uint chrcode = 0;
+
+    Uchar ch, ch2;
+    Uint wc_encode = 0;
+    Uint wc_tmp = 0;
+
+    Bool new_char;
+
+    int firstbyte;
+    int length = 0;
+    int num_conv;
+    int unconv_num = 0;
+
+    const char *inbufptr = *from;
+    wchar_t *outbufptr = (wchar_t *) *to;
+    wchar_t *outbuf_base = outbufptr;
+
+    CodeSet *codesets = XLC_GENERIC(lcd, codeset_list); 
+    int codeset_num = XLC_GENERIC(lcd, codeset_num);
+    Ulong wc_shift = XLC_GENERIC(lcd, wc_shift_bits);
+
+    if (*from_left > *to_left)
+	*from_left = *to_left;
+
+     for (new_char = True, firstbyte = True; *from_left > 0; (*from_left)--) {
+
+	ch = *inbufptr++;
+
+	if (firstbyte) {
+	    if (ASCII_CODESET >= codeset_num) {
+		unconv_num++;
+		(*from_left)--;
+		continue;
+	    }
+	    if (isascii(ch)) {
+		length = CS0->length;
+		*outbufptr++ = (wchar_t)ch;
+		continue;
+	    }
+	    else if (iskanji(ch)) {
+		if (KANJI_CODESET >= codeset_num) {
+		    unconv_num++;
+		    (*from_left)--;
+		    continue;
+		}
+		firstbyte = False;
+		length = CS1->length;
+		if (*from_left < length || *to_left < length)
+		    return -1;
+		wc_encode = CS1->wc_encoding;
+		ch2 = *inbufptr;
+		sjis_to_jis(&ch, &ch2);
+		chrcode = ch;
+	    }
+	    else if (iskana(ch)) {
+		if (KANA_CODESET >= codeset_num) {
+		    unconv_num++;
+		    (*from_left)--;
+		    continue;
+		}
+		length = CS2->length;
+		wc_encode = CS2->wc_encoding;
+		chrcode = BIT8OFF(ch);
+	    }
+	    else if (isuserdef(ch)) {
+		if (USERDEF_CODESET >= codeset_num) {
+		    unconv_num++;
+		    (*from_left)--;
+		    continue;
+		}
+		firstbyte = False;
+		length = CS3->length;
+		if (*from_left < length || *to_left < length)
+		    return -1;
+		wc_encode = CS3->wc_encoding;
+		ch2 = *inbufptr;
+		sjis_to_jis(&ch, &ch2);
+		chrcode = ch;
+	    }
+	    else /* unknown */ {
+		unconv_num++;
+		(*from_left)--;
+		continue;
+	    }
+	} else {	     		/* 2nd byte of multibyte char */
+	    if (!VALID_MULTIBYTE((Uchar) *(inbufptr-1))) {
+		unconv_num++;
+		firstbyte = True;
+	    }
+	    chrcode = ch2;
+	}
+
+	if (new_char) {
+	    chr_len = length;
+	    shift_mult = length - 1;
+	    new_char = False;
+	}
+
+	chrcode <<= (wc_shift * shift_mult);
+	shift_mult--;
+	wc_tmp |= chrcode;
+	if (--chr_len == 0) {
+	    wc_tmp |= wc_encode;
+	    *outbufptr++ = wc_tmp;
+
+	    firstbyte = True;
+	    new_char = True;
+	    wc_tmp = (Uint)0;
+	}
+
+    } /* end for */
+
+    *to = (XPointer)outbufptr;
+
+    if ((num_conv = outbufptr - outbuf_base) > 0)
+	(*to_left) -= num_conv;
+
+    return unconv_num;
+}
+
+
+#define byte1		(length == codeset->length - 1)
+#define byte2		(byte1 == 0)
+
+static int
+sjis_wcstombs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    const wchar_t *inbufptr = (const wchar_t *) *from;
+    XPointer outbufptr = *to;
+    XPointer outbuf_base = outbufptr;
+    wchar_t  wch;
+    int length;
+    Uchar tmp;
+    Uchar t1, t2;
+    int num_conv;
+    int unconv_num = 0;
+
+    XLCd lcd = (XLCd)conv->state;
+    CodeSet codeset;
+    Ulong wc_shift = XLC_GENERIC(lcd, wc_shift_bits);
+
+    if (*from_left > *to_left)
+	*from_left = *to_left;
+
+    for (; *from_left > 0 ; (*from_left)-- ) {
+
+	wch = *inbufptr++;
+
+	if (!(codeset = wc_codeset(lcd, wch))) {
+	    unconv_num++;
+	    (*from_left)--;
+	    continue;
+	}
+
+	length = codeset->length;
+	wch ^= (wchar_t)codeset->wc_encoding;
+
+	do {
+	    length--;
+	    tmp = wch>>(wchar_t)( (Ulong)length * wc_shift);
+
+	    if (kana)
+		tmp = BIT8ON(tmp);
+
+	    else if (byte1 && (kanji || userdef)) {
+		t1 = BIT8OFF(tmp);
+		continue;
+	    }
+
+	    else if (byte2 && (kanji || userdef)) {
+		t2 = BIT8OFF(tmp);
+		jis_to_sjis(&t1, &t2);
+		*outbufptr++ = (char)t1;
+		tmp = t2;
+	    }
+
+	    *outbufptr++ = (char)tmp;
+	} while (length); 
+
+    }	/* end for */
+
+    *to = (XPointer)outbufptr;
+
+    if ((num_conv = (int)(outbufptr - outbuf_base)) > 0)
+	(*to_left) -= num_conv;
+
+    return unconv_num;
+}
+#undef byte1
+#undef byte2
+
+/*
+ * sjis<->jis conversion for widechar kanji (See Note at top of file)
+ */
+static void
+sjis_to_jis(
+    Uchar *p1,
+    Uchar *p2)
+{
+  Uchar c1 = *p1;
+  Uchar c2 = *p2;
+  Uchar adjust = c2 < 0x9f;
+  Uchar rowOffset = c1 < 0xa0 ? 0x70 : 0xb0;
+  Uchar cellOffset = adjust ? (0x1f + (c2 > 0x7f)) : 0x7e;
+
+  *p1 = ((c1 - rowOffset) << 1) - adjust;
+  *p2 -= cellOffset;
+}
+
+static void
+jis_to_sjis(
+    Uchar *p1,
+    Uchar *p2)
+{
+  Uchar c1 = *p1;
+  Uchar c2 = *p2;
+  Uchar rowOffset = c1 < 0x5f ? 0x70 : 0xb0;
+  Uchar cellOffset = c1 % 2 ? 0x1f + (c2 > 0x5f) : 0x7e;
+
+  *p1 = ((Uchar)(c1 + 1) >> 1) + rowOffset;
+  *p2 = c2 + cellOffset;
+}
+
+static CodeSet
+wc_codeset(
+    XLCd lcd,
+    wchar_t wch)
+{
+    CodeSet *codesets = XLC_GENERIC(lcd, codeset_list);
+#if !defined(__sony_news)  ||  defined(SVR4)
+    int end = XLC_GENERIC(lcd, codeset_num);
+    Ulong widech = (Ulong)(wch & XLC_GENERIC(lcd, wc_encode_mask));
+
+    for (; --end >= 0; codesets++)
+	if ( widech == (*codesets)->wc_encoding )
+	    return *codesets;
+
+    return NULL;
+#else
+    if( iskanji(wch >> 8) )
+	return( codesets[1] );
+    if( iskana(wch & 0xff) )
+	return( codesets[2] );
+    return( codesets[0] );
+#endif
+}
+    
+
+static int
+sjis_mbtocs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    XLCd lcd = (XLCd)conv->state;
+    XlcCharSet charset = NULL;
+    int char_size = 0;
+    int unconv_num = 0;
+    const char *src = *from;
+    char *dst = *to;
+    CodeSet *codesets = XLC_GENERIC(lcd, codeset_list);
+    int codeset_num = XLC_GENERIC(lcd, codeset_num);
+
+    if (iskanji(*src)) {
+	if (KANJI_CODESET >= codeset_num)
+	    return -1;
+	charset = *CS1->charset_list;
+	char_size = charset->char_size;
+
+	if (*from_left >= char_size && *to_left >= char_size) {
+	    *dst++ = *src++;
+	    *dst++ = *src++; 
+	    if (!VALID_MULTIBYTE((Uchar) *(src-1))) /* check 2nd byte */
+		unconv_num++;
+	    sjis_to_jis((Uchar *)(dst-2), (Uchar *)(dst-1));
+	} else
+	    return -1;
+    }
+    else if (isuserdef(*src)) {
+	if (USERDEF_CODESET >= codeset_num)
+	    return -1;
+	charset = *CS3->charset_list;
+	char_size = charset->char_size;
+	
+	if (*from_left >= char_size && *to_left >= char_size) {
+	    *dst++ = *src++;
+	    *dst++ = *src++; 
+	    if (!VALID_MULTIBYTE((Uchar) *(src-1))) /* check 2nd byte */
+		unconv_num++;
+	    sjis_to_jis((Uchar *)(dst-2), (Uchar *)(dst-1));
+	} else
+	    return -1;
+    }
+    else if (isascii(*src)) {
+	if (ASCII_CODESET >= codeset_num)
+	    return -1;
+	charset = *CS0->charset_list;
+	char_size = charset->char_size;
+
+	if (*from_left >= char_size && *to_left >= char_size)
+	    *dst++ = *src++;
+	else
+	    return -1;
+    }
+    else if (iskana(*src)) {
+	if (KANA_CODESET >= codeset_num)
+	    return  -1;
+	charset = *CS2->charset_list;
+	char_size = charset->char_size;
+
+	if (*from_left >= char_size && *to_left >= char_size)
+	    *dst++ = *src++;
+	else
+	   return -1;
+    }
+    else 	/* unknown */
+	return -1;
+
+    *from_left -= char_size;
+    *to_left -= char_size;
+
+    *to = (XPointer) dst;
+    *from = (XPointer) src;
+
+    if (num_args > 0)
+	*((XlcCharSet *) args[0]) = charset;
+
+    return unconv_num;
+}
+
+
+static int
+sjis_mbstocs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    const char *tmp_from;
+    char *tmp_to;
+    int tmp_from_left, tmp_to_left;
+    XlcCharSet charset, tmp_charset;
+    XPointer tmp_args[1];
+    int unconv_num = 0, ret;
+
+/* Determine the charset of the segment and convert one character: */
+
+    tmp_args[0] = (XPointer) &charset; /* charset from sjis_mbtocs() */
+    while
+      ((ret = sjis_mbtocs(conv, from, from_left, to, to_left, tmp_args, 1)) > 0)
+	unconv_num += ret;
+    if ( ret < 0 )
+	return ret;
+
+    tmp_from = *from;
+    tmp_from_left = *from_left;
+    tmp_to_left = *to_left;
+    tmp_to = *to;
+
+/* Convert remainder of the segment: */
+
+    tmp_args[0] = (XPointer) &tmp_charset;
+    while( (ret = sjis_mbtocs(conv, (XPointer *) &tmp_from, &tmp_from_left,
+		     (XPointer *) &tmp_to, &tmp_to_left, tmp_args, 1)) >= 0 ) {
+
+	if (ret > 0) {
+	    unconv_num += ret;
+	    continue;
+	}
+
+	if (tmp_charset != charset)  /* quit on end of segment */
+	    break;
+
+	*from = (XPointer) tmp_from;
+	*from_left = tmp_from_left;
+	*to = (XPointer) tmp_to;
+	*to_left = tmp_to_left;
+    } 
+
+    if (num_args > 0)
+	*((XlcCharSet *) args[0]) = charset;
+    
+    return unconv_num;
+}
+
+static int
+sjis_wcstocs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    XLCd lcd = (XLCd) conv->state;
+    const wchar_t *wcptr = *((const wchar_t **)from);
+    char *bufptr = *((char **) to);
+    wchar_t wch;
+    char *tmpptr;
+    int length;
+    CodeSet codeset;
+    Ulong wc_encoding;
+    int buf_len = *to_left;
+    int wcstr_len = *from_left;
+
+    if (!(codeset = wc_codeset(lcd, *wcptr)))
+	return -1;
+
+    if (wcstr_len < buf_len / codeset->length)
+	buf_len = wcstr_len * codeset->length;
+
+#if !defined(__sony_news)  ||  defined(SVR4)
+    wc_encoding = codeset->wc_encoding;
+
+    for ( ; wcstr_len > 0 && buf_len > 0; wcptr++, wcstr_len--) {
+	wch = *wcptr;
+
+	if ((wch & XLC_GENERIC(lcd, wc_encode_mask)) != wc_encoding)
+	    break;
+
+	length = codeset->length;
+
+	buf_len -= length;
+	bufptr += length;
+	tmpptr = bufptr - 1;
+
+	while (length--) {
+	    *tmpptr-- = kana ? BIT8ON(wch) : BIT8OFF(wch);
+	    wch >>= (wchar_t)XLC_GENERIC(lcd, wc_shift_bits);
+	}
+    }
+#else
+    length = codeset->length;
+    for( ; wcstr_len > 0  &&  buf_len > 0; wcptr++, wcstr_len-- ) {
+	wch = *wcptr;
+	if( codeset != wc_codeset( lcd, wch ) )
+	    break;
+
+	buf_len -= length;
+	if( length == 2 ) {
+	    unsigned short	code;
+
+	    code = sjis2jis( wch & 0xffff );
+	    *bufptr++ = code >> 8;
+	    *bufptr++ = code & 0xff;
+	}
+	else
+	    *bufptr++ = wch & 0xff;
+    }
+#endif
+
+    if (num_args > 0)
+	*((XlcCharSet *) args[0]) = *codeset->charset_list;
+
+    *from_left -= wcptr - (wchar_t *) *from;
+    *from = (XPointer) wcptr;
+
+    *to_left -= bufptr - *to;
+    *to = bufptr;
+
+    return 0;
+}
+
+static CodeSet
+GetCodeSetFromCharSet(
+    XLCd lcd,
+    XlcCharSet charset)
+{
+    CodeSet *codeset = XLC_GENERIC(lcd, codeset_list);
+    XlcCharSet *charset_list;
+    int codeset_num, num_charsets;
+
+    codeset_num = XLC_GENERIC(lcd, codeset_num);
+
+    for ( ; codeset_num-- > 0; codeset++) {
+	num_charsets = (*codeset)->num_charsets;
+	charset_list = (*codeset)->charset_list;
+
+	for ( ; num_charsets-- > 0; charset_list++)
+	    if (*charset_list == charset)
+		return *codeset;
+    }
+
+    return (CodeSet) NULL;
+}
+
+
+static int
+sjis_cstombs(
+    XlcConv conv,
+    char **from,
+    int *from_left,
+    char **to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    XLCd lcd = (XLCd) conv->state;
+    const char *csptr = *from;
+    char *bufptr = *to;
+    int csstr_len = *from_left;
+    int buf_len = *to_left;
+    int length;
+    CodeSet codeset;
+    int cvt_length = 0;
+
+    if (num_args < 1)
+	return -1;
+    
+    if (!(codeset = GetCodeSetFromCharSet(lcd, (XlcCharSet) args[0])))
+	return -1;
+
+    csstr_len /= codeset->length;
+    buf_len /= codeset->length;
+    if (csstr_len < buf_len)
+	buf_len = csstr_len;
+    
+    cvt_length += buf_len * codeset->length;
+
+    if (bufptr) {
+	while (buf_len--) {
+	    length = codeset->length;
+	    while (length--)
+		*bufptr++ = codeset->length == 1 && codeset->side == XlcGR ?
+		  BIT8ON(*csptr++) : BIT8OFF(*csptr++);
+
+	    if (codeset->length == 2)
+		jis_to_sjis((Uchar *)(bufptr-2), (Uchar *)(bufptr-1));
+	}
+    }
+
+    *from_left -= csptr - *from;
+    *from = (XPointer) csptr;
+
+    if (bufptr)
+	*to += cvt_length;
+    *to_left -= cvt_length;
+
+
+    return 0;
+}
+
+static int
+sjis_cstowcs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    XLCd lcd = (XLCd) conv->state;
+    const char *csptr = (const char *) *from;
+    wchar_t *bufptr = (wchar_t *) *to;
+    wchar_t *toptr = (wchar_t *) *to;
+    int csstr_len = *from_left;
+    int buf_len = *to_left;
+    wchar_t wch;
+    int length;
+    Ulong wc_shift_bits = (int)XLC_GENERIC(lcd, wc_shift_bits);
+    CodeSet codeset;
+
+    if (num_args < 1)
+	return -1;
+
+    if (!(codeset = GetCodeSetFromCharSet(lcd, (XlcCharSet) args[0])))
+	return -1;
+
+    csstr_len /= codeset->length;
+    if (csstr_len < buf_len)
+	buf_len = csstr_len;
+
+    *to_left -= buf_len;
+
+    if (bufptr) {
+
+	toptr += buf_len;
+	*to = (XPointer) toptr;
+
+	while (buf_len--) {
+	    wch = (wchar_t) BIT8OFF(*csptr);
+	    csptr++;
+
+	    length = codeset->length - 1;
+	    while (length--) {
+		wch = (wch << wc_shift_bits) | BIT8OFF(*csptr);
+		csptr++;
+	    }
+	    *bufptr++ = wch | codeset->wc_encoding;
+	}
+    }
+
+    *from_left -= csptr - *from;
+    *from = (XPointer) csptr;
+
+    return 0;
+}
+
+
+/*
+ *    Stripped down Direct CT converters for SJIS
+ *
+ */
+
+#define BADCHAR(min_ch, c)  (BIT8OFF(c) < (char)min_ch && BIT8OFF(c) != 0x0 && \
+			     BIT8OFF(c) != '\t' && BIT8OFF(c) != '\n' && \
+			     BIT8OFF(c) != 0x1b)
+
+typedef struct _CTDataRec {
+    int side;
+    int length;
+    char *name;
+    Ulong wc_encoding;
+    char *ct_encoding;
+    int ct_encoding_len;
+    int set_size;
+    Uchar min_ch;
+    Uchar ct_type;
+} CTDataRec, *CTData;
+
+typedef struct _StateRec {
+    CTData GL_charset;
+    CTData GR_charset;
+    CTData charset;
+} StateRec, *State;
+
+#define CT_STD  0
+#define CT_NSTD 1
+#define CT_DIR  2
+#define CT_EXT0 3
+#define CT_EXT1 4
+#define CT_EXT2 5
+#define CT_VER  6
+
+static CTDataRec ctdata[] =
+{
+    { XlcGL,      1, "ISO8859-1:GL",       0, "\033(B"   ,  3, 0, 0, CT_STD  },
+    { XlcGR,      1, "ISO8859-1:GR",       0, "\033-A"   ,  3, 0, 0, CT_STD  },
+    { XlcGL,      1, "JISX0201.1976-0:GL", 0, "\033(J"   ,  3, 0, 0, CT_STD  },
+    { XlcGR,      1, "JISX0201.1976-0:GR", 0, "\033)I"   ,  3, 0, 0, CT_STD  },
+    { XlcGL,      2, "JISX0208.1983-0:GL", 0, "\033$(B"  ,  4, 0, 0, CT_STD  },
+    { XlcGR,      2, "JISX0208.1983-0:GR", 0, "\033$)B"  ,  4, 0, 0, CT_STD  },
+    { XlcGL,      2, "JISX0212.1990-0:GL", 0, "\033$(D"  ,  4, 0, 0, CT_STD  },
+    { XlcGR,      2, "JISX0212.1990-0:GR", 0, "\033$)D"  ,  4, 0, 0, CT_STD  },
+    { XlcUnknown, 0, "Ignore-Ext-Status?", 0, "\033#"    ,  2, 0, 0, CT_VER  },
+    { XlcUnknown, 0, "NonStd-?-OctetChar", 0, "\033%/0"  ,  4, 0, 0, CT_NSTD },
+    { XlcUnknown, 1, "NonStd-1-OctetChar", 0, "\033%/1"  ,  4, 0, 0, CT_NSTD },
+    { XlcUnknown, 2, "NonStd-2-OctetChar", 0, "\033%/2"  ,  4, 0, 0, CT_NSTD },
+    { XlcUnknown, 3, "NonStd-3-OctetChar", 0, "\033%/3"  ,  4, 0, 0, CT_NSTD },
+    { XlcUnknown, 4, "NonStd-4-OctetChar", 0, "\033%/4"  ,  4, 0, 0, CT_NSTD },
+    { XlcUnknown, 0, "Extension-2"       , 0, "\033%/"   ,  3, 0, 0, CT_EXT2 },
+    { XlcUnknown, 0, "Extension-0"       , 0, "\033"     ,  1, 0, 0, CT_EXT0 },
+    { XlcUnknown, 0, "Begin-L-to-R-Text",  0, "\2331]"   ,  3, 0, 0, CT_DIR  },
+    { XlcUnknown, 0, "Begin-R-to-L-Text",  0, "\2332]"   ,  3, 0, 0, CT_DIR  },
+    { XlcUnknown, 0, "End-Of-String",      0, "\233]"    ,  2, 0, 0, CT_DIR  },
+    { XlcUnknown, 0, "Extension-1"       , 0, "\233"     ,  1, 0, 0, CT_EXT1 },
+};
+
+/* Note on above table:  sjis_ctstombs() and sjis_ctstowcs() parser depends on
+ * certain table entries occuring in decreasing string length--
+ *   1.  CT_EXT2 and CT_EXT0 entries must occur after CT_NSTD entries.
+ *   2.  CT_DIR and CT_EXT1 entries must occur after CT_DIR entries.
+ */
+
+static CTData ctdptr[sizeof(ctdata) / sizeof(CTDataRec)];
+static CTData ctd_endp = ctdata + ((sizeof(ctdata) / sizeof(CTDataRec))) - 1;
+
+#define Ascii   0
+#define Kanji   1
+#define Kana    2
+#define Userdef 3
+
+/*
+ * initCTptr(): Set ctptr[] to point at ctdata[], indexed by codeset_num.
+ */
+static void
+initCTptr(
+    XLCd lcd)
+{
+    int num_codesets = XLC_GENERIC(lcd, codeset_num);
+    int num_charsets;
+    int i, j;
+    CodeSet *codesets = XLC_GENERIC(lcd, codeset_list);
+    CodeSet codeset;
+    XlcCharSet charset;
+    CTData ctdp = ctdata;
+
+    ctdptr[Ascii] = &ctdata[0];         /* failsafe */
+
+    for (i = 0; i < num_codesets; i++) {
+
+	codeset = codesets[i];
+	num_charsets = codeset->num_charsets;
+
+	for (j = 0; j < num_charsets; j++) {
+
+	    charset = codeset->charset_list[j];
+
+	    for (ctdp = ctdata; ctdp <= ctd_endp; ctdp++)
+
+		if (! strcmp(ctdp->name, charset->name)) {
+
+		    ctdptr[codeset->cs_num] = ctdp;
+
+		    ctdptr[codeset->cs_num]->wc_encoding = codeset->wc_encoding;
+
+		    ctdptr[codeset->cs_num]->set_size =
+		      charset->set_size;
+
+		    ctdptr[codeset->cs_num]->min_ch =
+		      charset->set_size == 94 &&
+		      (ctdptr[codeset->cs_num]->length > 1 ||
+		      ctdptr[codeset->cs_num]->side == XlcGR) ? 0x21 : 0x20;
+
+		    break;
+		}
+	}
+    }
+}
+
+
+static int
+sjis_mbstocts(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    int ct_len = *to_left;
+    int cs_num;
+    int clen;
+    int unconv_num = 0;
+    int num_conv;
+    const char *inbufptr = *from;
+    char *ctptr = *to;
+    XPointer ct_base = ctptr;
+
+    StateRec ct_state;
+    CTData charset = NULL;
+    XLCd lcd = (XLCd) conv->state;
+    int codeset_num = XLC_GENERIC(lcd, codeset_num);
+
+/* Initial State: */
+
+    ct_state.GL_charset = ctdptr[Ascii];
+    ct_state.GR_charset = NULL;
+
+    if (*from_left > *to_left)
+        *from_left = *to_left;
+
+    for (;*from_left > 0; (*from_left) -= charset->length) {
+
+	if (iskanji(*inbufptr)) {
+	    if (KANJI_CODESET >= codeset_num) {
+		unconv_num++;
+		(*from_left)--;
+		continue;
+	    }
+	    cs_num = Kanji;
+	    charset = ctdptr[Kanji];
+	    if (!VALID_MULTIBYTE((Uchar) *(inbufptr+1)))
+		unconv_num++;
+	}
+	else if (isuserdef(*inbufptr)) {
+	    if (USERDEF_CODESET >= codeset_num) {
+		unconv_num++;
+		(*from_left)--;
+		continue;
+	    }
+	    cs_num = Userdef;
+	    charset = ctdptr[Userdef];
+	    if (!VALID_MULTIBYTE((Uchar) *(inbufptr+1)))
+		unconv_num++;
+	}
+	else if (isascii(*inbufptr)) {
+	    if (ASCII_CODESET >= codeset_num) {
+		unconv_num++;
+		(*from_left)--;
+		continue;
+	    }
+	    cs_num = Ascii;
+	    charset = ctdptr[Ascii];
+	}
+	else if (iskana(*inbufptr)) {
+	    if (KANA_CODESET >= codeset_num) {
+		unconv_num++;
+		(*from_left)--;
+		continue;
+	    }
+	    cs_num = Kana;
+	    charset = ctdptr[Kana];
+	}
+	else { 		 /* unknown */
+	    unconv_num++;
+	    (*from_left)--;
+	    continue;
+	}
+
+	if ( (charset->side == XlcGR && charset != ct_state.GR_charset) ||
+	     (charset->side == XlcGL && charset != ct_state.GL_charset) ) {
+
+	    ct_len -= ctdptr[cs_num]->ct_encoding_len;
+	    if (ct_len < 0) {
+		unconv_num++;
+		break;
+	    }
+	
+	    if (ctptr) {
+		strcpy(ctptr, ctdptr[cs_num]->ct_encoding);
+		ctptr += ctdptr[cs_num]->ct_encoding_len;
+	    }
+	}
+
+	clen = charset->length;
+	do {
+	    *ctptr++ = *inbufptr++;
+	} while (--clen); 
+
+	if (charset->length >= 2) {
+	    sjis_to_jis((Uchar *)(ctptr-2), (Uchar *)(ctptr-1));
+	    if (BADCHAR(charset->min_ch, *(ctptr-2)) ||
+		  BADCHAR(charset->min_ch, *(ctptr-1))) {
+		unconv_num++;
+		continue;
+	    }
+	}
+	else
+	    if (BADCHAR(charset->min_ch, *(ctptr-1))) {
+		unconv_num++;
+		continue;
+	    }
+
+	if (charset->side == XlcGR)
+	    ct_state.GR_charset = charset;
+	else if (charset->side == XlcGL)
+	    ct_state.GL_charset = charset;
+
+	if (charset->side == XlcGR) {
+	  clen = charset->length;
+	  do {
+	    (*(Uchar *)(ctptr-clen)) = BIT8ON(*(Uchar *)(ctptr-clen));
+	  } while (--clen);
+	}
+    }
+
+    *to = (XPointer)ctptr;
+
+    if ((num_conv = (int)(ctptr - ct_base)) > 0)
+	(*to_left) -= num_conv;
+
+    return unconv_num;
+
+}
+
+
+#define byte1		(length == codeset->length - 1)
+#define byte2		(byte1 == 0)
+
+static int
+sjis_wcstocts(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    int ct_len = *to_left;
+    const wchar_t *inbufptr = (const wchar_t *) *from;
+    char *ctptr = *to;
+    XPointer ct_base = ctptr;
+    wchar_t  wch;
+    int length;
+    Uchar tmp;
+    Uchar t1 = 0;
+    int num_conv;
+
+    StateRec ct_state;
+    XLCd lcd = (XLCd)conv->state;
+    CTData charset;
+    CodeSet codeset;
+    int unconv_num = 0;
+    Ulong wc_shift = XLC_GENERIC(lcd, wc_shift_bits);
+
+/* Initial State: */
+    ct_state.GL_charset = ctdptr[0]; /* Codeset 0 */
+    ct_state.GR_charset = NULL;
+
+    if (*from_left > *to_left)
+	*from_left = *to_left;
+
+    for (; *from_left > 0 ; (*from_left)-- ) {
+
+	wch = *inbufptr++;
+
+        if (!(codeset = wc_codeset(lcd, wch))) {
+            unconv_num++;
+            (*from_left)--;
+            continue;
+        }
+
+	charset = ctdptr[codeset->cs_num];
+
+	length = codeset->length;
+	wch ^= (wchar_t)codeset->wc_encoding;
+
+	if ( (charset->side == XlcGR && charset != ct_state.GR_charset) ||
+	     (charset->side == XlcGL && charset != ct_state.GL_charset) ) {
+
+	    ct_len -= ctdptr[codeset->cs_num]->ct_encoding_len;
+	    if (ct_len < 0) {
+		unconv_num++;
+		break;
+	    }
+
+	    if (ctptr) {
+		strcpy(ctptr, ctdptr[codeset->cs_num]->ct_encoding);
+		ctptr += ctdptr[codeset->cs_num]->ct_encoding_len;
+	    }
+
+	}
+
+	if (charset->side == XlcGR)
+	    ct_state.GR_charset = charset;
+	else if (charset->side == XlcGL)
+	    ct_state.GL_charset = charset;
+
+	do {
+	    length--;
+	    tmp = wch>>(wchar_t)( (Ulong)length * wc_shift);
+
+	    if (kana) {
+		if (BADCHAR(charset->min_ch, (char)tmp)) {
+		    unconv_num++;
+		    break;
+		}
+		*ctptr++ = (char)BIT8ON(tmp);
+	    }
+
+	    else if (byte1 && (kanji || userdef)) {
+		t1 = tmp;
+	    }
+
+	    else if (byte2 && (kanji || userdef)) {
+		if (BADCHAR(charset->min_ch, (char)t1) ||
+		  BADCHAR(charset->min_ch, (char)tmp)) {
+		    unconv_num++;
+		    break;
+		}
+
+		*ctptr++ = (char)BIT8OFF(t1);
+		*ctptr++ = (char)BIT8OFF(tmp);
+	    }
+
+	    else {
+		if (BADCHAR(charset->min_ch, (char)tmp)) {
+		    unconv_num++;
+		    break;
+		}
+		*ctptr++ = (char)tmp;
+	    }
+	} while (length); 
+
+    }	/* end for */
+
+    *to = (XPointer)ctptr;
+
+    if ((num_conv = (int)(ctptr - ct_base)) > 0)
+	(*to_left) -= num_conv;
+
+    return unconv_num;
+}
+#undef byte1
+#undef byte2
+
+#define SKIP_I(str)	while (*(str) >= 0x20 && *(str) <=  0x2f) (str)++;
+#define SKIP_P(str)	while (*(str) >= 0x30 && *(str) <=  0x3f) (str)++;
+
+static int
+sjis_ctstombs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    const char *inbufptr =  *from;
+    XPointer outbufptr =  *to;
+    const char *inbuf_base;
+    XPointer outbuf_base = outbufptr;
+    int clen, length;
+    int unconv_num = 0;
+    int num_conv;
+    unsigned int ct_seglen = 0;
+    Uchar ct_type;
+    CTData ctdp = ctdata;	/* default */
+    CTData GL_ctdp = ctdp;	/* GL ctdp save */
+    CTData GR_ctdp = ctdp;	/* GR ctdp save */
+
+    if (*from_left > *to_left)
+	*from_left = *to_left;
+
+    for (length = ctdata[Ascii].length; *from_left > 0 ; (*from_left) -= length)
+    {
+	ct_type = CT_STD;
+	/* change GL/GR charset */
+	if(ctdp->side == XlcGR && isleftside(*inbufptr)){
+	    /* select GL side */
+	    ctdp = GL_ctdp;
+	    length = ctdp->length;
+	    ct_type = ctdp->ct_type;
+	}else if(ctdp->side == XlcGL && isrightside(*inbufptr)){
+	    /* select GR side */
+	    ctdp = GR_ctdp;
+	    length = ctdp->length;
+	    ct_type = ctdp->ct_type;
+	}
+	if (*inbufptr == '\033' || *inbufptr == (char)'\233') {
+
+	    for (ctdp = ctdata; ctdp <= ctd_endp ; ctdp++) {
+
+		if(!strncmp(inbufptr, ctdp->ct_encoding, ctdp->ct_encoding_len))
+		{
+		    inbufptr += ctdp->ct_encoding_len;
+		    (*from_left) -= ctdp->ct_encoding_len;
+		    if( ctdp->length ) {
+			length = ctdp->length;
+			if( *from_left < length ) {
+			    *to = (XPointer)outbufptr;
+			    *to_left -= outbufptr - outbuf_base;
+			    return( unconv_num + *from_left );
+			}
+		    }
+		    ct_type = ctdp->ct_type;
+		    if(ctdp->side == XlcGL){
+			GL_ctdp = ctdp; /* save GL ctdp */
+		    }else{
+			GR_ctdp = ctdp; /* save GR ctdp */
+		    }
+		    break;
+		}
+	    }
+	    if (ctdp > ctd_endp)  	/* failed to match CT sequence */
+		unconv_num++;
+	}
+
+/* The following code insures that non-standard encodings, direction, extension,
+ * and version strings are ignored; subject to change in future.
+ */
+	switch (ct_type) {
+	  case CT_STD:
+	    break;
+	  case CT_EXT2:
+	    inbufptr++;
+	    (*from_left)--;
+	  case CT_NSTD:
+	    ct_seglen = (BIT8OFF(*inbufptr) << 7) + BIT8OFF(*(inbufptr+1)) + 2;
+	    inbufptr += ct_seglen;
+	    (*from_left) -= ct_seglen;
+	    continue;
+	  case CT_EXT0:
+	    inbuf_base = inbufptr;
+	    SKIP_I(inbufptr);
+	    inbufptr++;
+	    ct_seglen = (unsigned)(inbufptr - inbuf_base);
+	    (*from_left) -= ct_seglen;
+	    continue;
+	  case CT_EXT1:
+	    inbuf_base = inbufptr;
+	    SKIP_P(inbufptr);
+	    SKIP_I(inbufptr);
+	    inbufptr++;
+	    ct_seglen = (unsigned)(inbufptr - inbuf_base);
+	    (*from_left) -= ct_seglen;
+	    continue;
+	  case CT_DIR:
+	    continue;
+	  case CT_VER:
+	    inbufptr += 2;
+	    (*from_left) -= 2;
+	    continue;
+	}
+
+	if (ctdp->side == XlcGL || isrightside (*inbufptr)) {
+	    clen = length;
+	} else {
+	    clen = 1;
+	    *from_left += length - clen;
+	}
+	do {
+	    Uchar mask = (length == 2) ? GL : -1;
+	    *outbufptr++ = *inbufptr++ & mask;
+	} while (--clen);
+
+	if (length >= 2)
+	    jis_to_sjis((Uchar *)(outbufptr-2), (Uchar *)(outbufptr-1));
+    }
+
+    *to = (XPointer)outbufptr;
+
+    if ((num_conv = (int)(outbufptr - outbuf_base)) > 0)
+	(*to_left) -= num_conv;
+
+    return unconv_num;
+}
+
+
+static int
+sjis_ctstowcs(
+    XlcConv conv,
+    XPointer *from,
+    int *from_left,
+    XPointer *to,
+    int *to_left,
+    XPointer *args,
+    int num_args)
+{
+    XLCd lcd = (XLCd)conv->state;
+    Ulong wc_shift_bits = XLC_GENERIC(lcd, wc_shift_bits);
+    const char *inbufptr = *from;
+    const char *inbuf_base;
+    wchar_t *outbufptr = (wchar_t *) *to;
+    wchar_t *outbuf_base = outbufptr;
+    int clen, length;
+    int num_conv;
+    int unconv_num = 0;
+    unsigned int ct_seglen = 0;
+    Uchar ct_type = 0;
+    int shift_mult;
+    wchar_t wc_tmp;
+    wchar_t wch;
+    Ulong wc_encoding;
+    CTData ctdp = ctdata;
+    CTData GL_ctdp = ctdp;	/* GL ctdp save */
+    CTData GR_ctdp = ctdp;	/* GR ctdp save */
+
+    if (*from_left > *to_left)
+	*from_left = *to_left;
+  
+    for (length = ctdata[Ascii].length; *from_left > 0; (*from_left) -= length )
+    {
+	ct_type = CT_STD;
+	/* change GL/GR charset */
+	if(ctdp->side == XlcGR && isleftside(*inbufptr)){
+	    /* select GL side */
+	    ctdp = GL_ctdp;
+	    length = ctdp->length;
+	    ct_type = ctdp->ct_type;
+	}else if(ctdp->side == XlcGL && isrightside(*inbufptr)){
+	    /* select GR side */
+	    ctdp = GR_ctdp;
+	    length = ctdp->length;
+	    ct_type = ctdp->ct_type;
+	}
+	if (*inbufptr == '\033' || *inbufptr == (char)'\233') {
+	    for (ctdp = ctdata; ctdp <= ctd_endp ; ctdp++) {
+
+		if(!strncmp(inbufptr, ctdp->ct_encoding, ctdp->ct_encoding_len))
+		{
+		    inbufptr += ctdp->ct_encoding_len;
+		    (*from_left) -= ctdp->ct_encoding_len;
+		    if( ctdp->length ) {
+			length = ctdp->length;
+			if( *from_left < length ) {
+			    *to = (XPointer)outbufptr;
+			    *to_left -= outbufptr - outbuf_base;
+			    return( unconv_num + *from_left );
+			}
+		    }
+		    ct_type = ctdp->ct_type;
+		    if(ctdp->side == XlcGL){
+			GL_ctdp = ctdp; /* save GL ctdp */
+		    }else{
+			GR_ctdp = ctdp; /* save GR ctdp */
+		    }
+		    break;
+		}
+	    }
+	    if (ctdp > ctd_endp)    	/* failed to match CT sequence */
+		unconv_num++;
+	}
+
+/* The following block of code insures that non-standard encodings, direction,
+ * extension, and version strings are ignored; subject to change in future.
+ */
+	switch (ct_type) {
+	  case CT_STD:
+	    break;
+	  case CT_EXT2:
+	    inbufptr++;
+	    (*from_left)--;
+	  case CT_NSTD:
+	    ct_seglen = (BIT8OFF(*inbufptr) << 7) + BIT8OFF(*(inbufptr+1)) + 2;
+	    inbufptr += ct_seglen;
+	    (*from_left) -= ct_seglen;
+	    continue;
+	  case CT_EXT0:
+	    inbuf_base = inbufptr;
+	    SKIP_I(inbufptr);
+	    inbufptr++;
+	    ct_seglen = (unsigned)(inbufptr - inbuf_base);
+	    (*from_left) -= ct_seglen;
+	    continue;
+	  case CT_EXT1:
+	    inbuf_base = inbufptr;
+	    SKIP_P(inbufptr);
+	    SKIP_I(inbufptr);
+	    inbufptr++;
+	    ct_seglen = (unsigned)(inbufptr - inbuf_base);
+	    (*from_left) -= ct_seglen;
+	    continue;
+	  case CT_DIR:
+	    continue;
+	  case CT_VER:
+	    inbufptr += 2;
+	    (*from_left) -= 2;
+	    continue;
+	}
+#if !defined(__sony_news)  ||  defined(SVR4)
+	if (ctdp->side == XlcGL || isrightside (*inbufptr)) {
+	    clen = length;
+	    wc_encoding = ctdp->wc_encoding;
+	} else {
+	    clen = 1;
+	    *from_left += length - clen;
+	    wc_encoding = ctdptr[Ascii]->wc_encoding;
+	}
+	shift_mult = clen - 1;
+	wch = (wchar_t)0;
+
+	do {
+	    wc_tmp = BIT8OFF(*inbufptr++) << (wc_shift_bits * shift_mult);
+	    wch |= wc_tmp;
+	    shift_mult--;
+	} while (--clen);
+	*outbufptr++ = wch | wc_encoding;
+#else
+	if( length == 1 )
+	    *outbufptr++ = (unsigned char)*inbufptr++;
+	else if( length == 2 ) {
+	    unsigned short	code;
+	    code = (*inbufptr << 8) | *(inbufptr+1);
+	    *outbufptr++ = jis2sjis( code );
+	    inbufptr += 2;
+	}
+#endif
+    }
+    *to = (XPointer)outbufptr;
+
+    if ((num_conv = (int)(outbufptr - outbuf_base)) > 0)
+	(*to_left) -= num_conv ;
+
+    return unconv_num;
+
+}
+#undef BADCHAR
+
+static void
+close_converter(
+    XlcConv conv)
+{
+	Xfree((char *) conv);
+}
+
+
+static XlcConv
+create_conv(
+    XLCd lcd,
+    XlcConvMethods methods)
+{
+    XlcConv conv;
+
+    conv = (XlcConv) Xmalloc(sizeof(XlcConvRec));
+    if (conv == NULL)
+	return (XlcConv) NULL;
+    
+    conv->methods = methods;
+    conv->state = (XPointer) lcd;
+    return conv;
+}
+
+
+enum { MBSTOCS, WCSTOCS, MBTOCS, CSTOMBS, CSTOWCS, MBSTOWCS, WCSTOMBS,
+       WCSTOCTS, MBSTOCTS, CTSTOMBS, CTSTOWCS };
+
+static XlcConvMethodsRec conv_methods[] = {
+    {close_converter, sjis_mbstocs,  NULL },
+    {close_converter, sjis_wcstocs,  NULL },
+    {close_converter, sjis_mbtocs,   NULL },
+    {close_converter, sjis_cstombs,  NULL },
+    {close_converter, sjis_cstowcs,  NULL },
+    {close_converter, sjis_mbstowcs, NULL },
+    {close_converter, sjis_wcstombs, NULL },
+    {close_converter, sjis_wcstocts, NULL },
+    {close_converter, sjis_mbstocts, NULL },
+    {close_converter, sjis_ctstombs, NULL },
+    {close_converter, sjis_ctstowcs, NULL },
+};
+
+
+static XlcConv
+open_mbstocs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &conv_methods[MBSTOCS]);
+}
+
+static XlcConv
+open_wcstocs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &conv_methods[WCSTOCS]);
+}
+
+static XlcConv
+open_mbtocs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &conv_methods[MBTOCS]);
+}
+
+static XlcConv
+open_cstombs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &conv_methods[CSTOMBS]);
+}
+
+static XlcConv
+open_cstowcs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &conv_methods[CSTOWCS]);
+}
+
+static XlcConv
+open_mbstowcs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &conv_methods[MBSTOWCS]);
+}
+
+static XlcConv
+open_wcstombs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &conv_methods[WCSTOMBS]);
+}
+
+static XlcConv
+open_wcstocts(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &conv_methods[WCSTOCTS]);
+}
+
+static XlcConv
+open_mbstocts(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &conv_methods[MBSTOCTS]);
+}
+
+static XlcConv
+open_ctstombs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &conv_methods[CTSTOMBS]);
+}
+
+static XlcConv
+open_ctstowcs(
+    XLCd from_lcd,
+    const char *from_type,
+    XLCd to_lcd,
+    const char *to_type)
+{
+    return create_conv(from_lcd, &conv_methods[CTSTOWCS]);
+}
+
+XLCd
+_XlcSjisLoader(
+    const char *name)
+{
+    XLCd lcd;
+
+    lcd = _XlcCreateLC(name, _XlcGenericMethods);
+    if (lcd == NULL)
+	return lcd;
+
+    if (!XLC_PUBLIC_PART(lcd)->codeset ||
+	(_XlcCompareISOLatin1(XLC_PUBLIC_PART(lcd)->codeset, "SJIS"))) {
+	_XlcDestroyLC(lcd);
+	return (XLCd) NULL;
+    }
+
+    initCTptr(lcd);
+
+    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNCharSet, open_mbstocs);
+    _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNCharSet, open_wcstocs);
+    _XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNMultiByte, open_cstombs);
+    _XlcSetConverter(lcd, XlcNCharSet, lcd, XlcNWideChar, open_cstowcs);
+    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNChar, open_mbtocs);
+
+#ifndef FORCE_INDIRECT_CONVERTER
+    _XlcSetConverter(lcd, XlcNCompoundText, lcd, XlcNMultiByte, open_ctstombs);
+    _XlcSetConverter(lcd, XlcNCompoundText, lcd, XlcNWideChar, open_ctstowcs);
+    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNCompoundText, open_mbstocts);
+    _XlcSetConverter(lcd, XlcNMultiByte, lcd, XlcNWideChar, open_mbstowcs);
+    _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNCompoundText, open_wcstocts);
+    _XlcSetConverter(lcd, XlcNWideChar, lcd, XlcNMultiByte, open_wcstombs);
+#endif
+
+    _XlcAddUtf8Converters(lcd);
+
+    return lcd;
+}
+
+#else
+typedef int dummy;
+#endif /* X_LOCALE */