2985 files changed, 13299 insertions, 1787 deletions

diff --git a/Build/source/Makefile.am b/Build/source/Makefile.am
index a69c2de2d30..999731182c7 100644
--- a/Build/source/Makefile.am
+++ b/Build/source/Makefile.am
@@ -24,11 +24,11 @@ SUBDIRS += libs utils texk
 
 ## This is the default target for the Build script in TeX Live.
 world: install-strip
-#
-# run texlinks here since the binaries won't be there 
-# at install-data, and fmtutil.cnf won't be there at install-exec,
-# and there is no hook or -local for install.
+##
+## run texlinks here since the binaries won't be there 
+## at install-data, and fmtutil.cnf won't be there at install-exec,
+## and there is no hook or -local for install.
 	echo "top-level make $@: running texlinks ..."
-	cd texk/tetex && $(MAKE) run-texlinks
-#
+	cd texk/tetex && $(MAKE) $(AM_MAKEFLAGS) run-texlinks
+##
 	@echo "make $@ done."
diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in
index 97461249ca3..fc8d9545e27 100644
--- a/Build/source/Makefile.in
+++ b/Build/source/Makefile.in
@@ -66,7 +66,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-common.m4 \
 	$(top_srcdir)/texk/ac/withenable.ac \
 	$(top_srcdir)/texk/web2c/ac/withenable.ac \
 	$(top_srcdir)/texk/web2c/ac/web2c.ac \
-	$(top_srcdir)/texk/one/ac/withenable.ac \
 	$(top_srcdir)/texk/afm2pl/ac/withenable.ac \
 	$(top_srcdir)/texk/bibtex8/ac/withenable.ac \
 	$(top_srcdir)/texk/cjkutils/ac/withenable.ac \
@@ -102,6 +101,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-common.m4 \
 	$(top_srcdir)/texk/kpathsea/ac/withenable.ac \
 	$(top_srcdir)/texk/kpathsea/ac/web2c.ac \
 	$(top_srcdir)/libs/ac/withenable.ac \
+	$(top_srcdir)/libs/icu/ac/withenable.ac \
 	$(top_srcdir)/libs/teckit/ac/withenable.ac \
 	$(top_srcdir)/libs/graphite/ac/withenable.ac \
 	$(top_srcdir)/libs/xpdf/ac/withenable.ac \
@@ -724,13 +724,8 @@ dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
 world: install-strip
-#
-# run texlinks here since the binaries won't be there 
-# at install-data, and fmtutil.cnf won't be there at install-exec,
-# and there is no hook or -local for install.
 	echo "top-level make $@: running texlinks ..."
-	cd texk/tetex && $(MAKE) run-texlinks
-#
+	cd texk/tetex && $(MAKE) $(AM_MAKEFLAGS) run-texlinks
 	@echo "make $@ done."
 # 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.
diff --git a/Build/source/README.layout b/Build/source/README.layout
index 744b5495974..2ca916bda8f 100644
--- a/Build/source/README.layout
+++ b/Build/source/README.layout
@@ -1,3 +1,6 @@
+Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+You may freely use, modify and/or distribute this file.
+
 	Layout of the teTeX / TeX Live (TL) build system
 	================================================
 
@@ -17,8 +20,8 @@ integrating new modules into the TL build system.
 1.1. Overall layout
 -------------------
 
-libs/*/*		various libraries
 texk/kpathsea/*		the Kpathsea library
+libs/*/*		various other libraries
 
 texk/*/*		programs (mostly using Kpathsea)
 utils/*/*		utility programs (not using Kpathsea)
@@ -54,8 +57,8 @@ m4/kpse-Lib-flags.m4		defines Autoconf macros for configure options
 				  as well as KPSE_LIB_FLAGS, to be used in configure.ac
                                   files and defining Make variables
 
-Several libraries use an unmodified source tree supplemented by a proxy
-build system (bypassing that of the source tree), e.g.,
+Several libraries use an (almost) unmodified source tree supplemented by a
+proxy build system (bypassing that of the source tree), e.g.,
 
 libs/zlib/zlib-1.2.3/*		(almost) unmodified source tree
 libs/zlib/Makefile.am		proxy Makefile.am
@@ -66,8 +69,8 @@ libs/zlib/configure.ac		  and configure.ac
 
 texk/Prog/ac/withenable.ac	defines libraries required by Prog, provides the
 				  configure option --disable-Prog
-texk/Prog/ac/Prog.ac		defines Prog specific configure option that should
-				  be seen at the top-level
+texk/Prog/ac/Prog.ac		optionally defines Prog specific configure option
+				  that should be seen at the top-level
 
 1.4. A utility program `Util'
 -----------------------------
@@ -78,16 +81,16 @@ utils/Util/ac/withenable.ac	defines libraries required by Util, provides the
 2. Running `configure'
 ======================
 
-Running configure for the top-level directory will in addition configure the
-directories texk/kpathsea/, libs/, libs/dummy/, utils/, utils/dummy, texk/,
-and texk/dummy/.  This will determine the programs to be built (utils/Util/
-and texk/Prog) and libraries from the TL tree (texk/kpathsea/ and libs/Lib)
-required by these programs.
+Running 'configure' for the top-level directory will in addition configure
+the directories texk/kpathsea/, libs/, libs/dummy/, utils/, utils/dummy,
+texk/, and texk/dummy/.  This will determine the programs (utils/Util/ and
+texk/Prog) to be built and libraries from the TL tree (texk/kpathsea/ and
+libs/Lib) required by these programs.
 
 3. Running `make'
 =================
 
-Running make in the top-level directory will recurse into the directories
+Running 'make' in the top-level directory will recurse into the directories
 texk/kpathsea/, libs/, utils/, and texk/.
 
 3.1. Running `make' in libs/
@@ -95,7 +98,7 @@ texk/kpathsea/, libs/, utils/, and texk/.
 
 First, for each subdirectory libs/Lib not yet configured, this runs
 `configure' and if required `make all' in that directory.  Then this
-recurses into all required subdirectories for the selected make target:
+recurses into all required subdirectories for the selected Make target:
 `default' or `all' to (re-)build, `check' to run tests, `install' etc.
 
 3.2. Running `make' in utils/ and texk/
@@ -106,12 +109,138 @@ configured, this first runs `configure' and if required `make all' in that
 directory.  Subsequently, this recurses into all required subdirectories to
 (re-)build, run tests, install, etc.
 
-3.3 Comment
------------
+3.3 Parallel builds
+-------------------
+
+The TL build system allows for parallel builds ('make -j n' with n>1),
+carefully formulating Make rules when a tool (such as 'tangle' or 'convert')
+creates several output files.  This can considerably speed up a TL build on
+multi core systems.  I usually use 'make -j 4 -l 8.0'; please report any
+failures.
+
+3.4 Using a Configure Cache File
+--------------------------------
+
+Further speed up of a TL build can be achieved by using a configure cache
+file, e.g., running 'configure -C' at the top-level.  This should work after
+some initial problem have been fixed; please report any failures.
+
+3.5 Comments
+------------
+
+3.5.1 Comment 1
+---------------
+
+After successfully running 'make' from the top-level, as second 'make'
+should not have to rebuild anything.
+
+When configure scripts have been modified, it may take several iterations of
+'make' (only in in tekx/web2c/) until everything has stabilized.  This is a
+problem that still needs investigation, but I believe that after the first
+iteration everything is up to date, except for some bad timestamps.
+
+3.5.2 Comment 2
+---------------
+
+If running 'make' from the top-level fails in a subdirectory libs/*/,
+utils/*/, or /texk/*/ you can remove that directory from the build tree,
+fix the problem, and once again run 'make' from the top-level.
+
+3.5.3 Comment 3
+---------------
+
+The build system allows to successfully run 'make dist' and 'make distcheck'
+(at least on my {i686,x86_64}-linux-gnu systems), producing tarballs
+tex-live-2009-MM-DD.tar.{bz2,gz} from which everything can be (re-)built;
+please keep it that way!
+
+3.5.4 Comment 4
+---------------
 
 The process described above configures all directories, even for libraries
-or programs not to be built.  This is necessary for make targets such as
+and programs not to be built.  This is necessary for Make targets such as
 `dist' or `distcheck' that have to recurse into all subdirectories, whereas
-targets such as `all', `check', or `install' only recurse into the required
-subdirectories.
+normal targets such as `all', `check', or `install' only recurse into the
+required subdirectories.
+
+As a side effect, if building in utils/Util/ or texk/Prog/ has been
+disabled, the Makefile in that directory still contains all the rules to
+build everything.  Thus running 'make' and 'make install' in that
+subdirectory will build and install everything, unless some configure tests
+have failed because required libraries from the TL tree where missing when
+that subdirectory has been configured.
+
+Similarly, when, e.g., building e-TeX has been disabled (as by default), you
+can run 'make etex' (or 'make etex.exe') in the subdirectory texk/web2c/ to
+build e-TeX (although there is no simple way to have e-TeX installed).
+
+4. Extending the TL build system
+================================
+
+4.1 Adding a new program directory
+----------------------------------
+
+To add a new program directory utils/Util (not using Kpathsea) or texk/Prog
+(possibly using Kpathsea) you first have to add the directory Util to the M4
+list kpse_utils_pkgs or Prog to the M4 list kpse_texk_pkgs defined in
+m4/kpse-pkgs.m4.  In addition you must create a configure.ac fragment
+utils/Util/ac/witheanble.ac or texk/Prog/ac/witheanble.ac defining any
+required libraries from the TL tree and whether this new program is to be
+built by default (in the absence of the corresponding '--enable-Util/Prog'
+or '--disable-Util/Prog' configure options).  If a program texk/Prog
+requires specific configure options to be seen at the top-level, they should
+be defined in an additional configure.ac fragment texk/Prog/ac/Prog.ac
+included from texk/Prog/ac/withenable.ac and texk/Prog/configure.ac (as,
+e.g., for texk/web2c/ and texk/xdvik/).
+
+4.2 Adding a new library directory
+----------------------------------
+
+To add a new library directory libs/Lib you first have to add the directory
+Lib to the M4 list kpse_libs_pkgs defined in m4/kpse-pkgs.m4.  In addition
+you must create a configure.ac fragment libs/Lib/ac/witheanble.ac defining
+any required libraries from the TL tree and whether an installed (system)
+version of this library can be used.  If that is the case, another
+configure.ac fragment libs/Lib/ac/Lib.ac must define (AC_CHECK_FUNCS and
+AC_CHECK_HEADERS) tests for a system version to be acceptable.  Finally you
+must create a file m4/kpse-Lib-flags.m4 defining the M4 macro KPSE_LIB_FLAGS
+(where 'LIB' is a sanitized uppercase version of 'Lib') setting up the Make
+variables LIB_INCLUDES, LIB_LIBS, and LIB_DEPEND with the required values
+for CPPFLAGS, LDADD, and dependencies, as well as LIB_RULE with a
+(multiline) Make rule to rebuild that library when necessary.
+
+If a system version of the library can be used, another M4 macro
+KPSE_LIB_SYSTEM_FLAGS in m4/kpse-Lib-flags.m4 must define values for
+LIB_INCLUDES and LIB_LIBS, depending on values for the configure options
+'--with-Lib-includes' and/or '--with-Lib-libdir', and you must add the line
+'AC_REQUIRE([KPSE_LIB_SYSTEM_FLAGS])' to the definition of the M4 macro
+KPSE_ALL_SYSTEM_FLAGS in m4/kpse-pkgs.m4.
+
+5. Updating the TL build system
+===============================
+
+When anything in the TL build system (configure.ac and Makefile.am files
+with their fragments or M4 macros in m4/) has been modified you have to
+rebuild the coresponding configure, Makefile.in, and config.h or c-auto,h
+files.
+
+This is most easily done automatically using maintainer-mode.  Due to some
+dependencies known to Makefile but not recognized by Aclocal it may,
+however, happen that Aclocal is run again and agin, keeping the aclocal.m4
+files unmodified.  This can be fixed by
+	touch {,libs/texk/,utils/}aclocal.m4
+from the top-level.
+
+The files in the SVN repository are all up to date, but some of them may be
+rebuilt when using maintainer-mode due to their relative timestamps.  This
+will eventually be fixed, once everything has stabilized.
+
+Alternatively, you can run the 'reautoconf' script from the top-level (yet
+to be done).
+
+The 'config.guess', 'config.sub', etc. files for most packages are now kept
+centrally in build-aux/.  There are, however, independent copies in, e.g.,
+libs/freetype/freetype-1.5/, libs/freetype2/freetype-2.3.8/builds/unix/, and
+similar places that might need updating (not done automatically by the
+'reautoconf' script).
 
diff --git a/Build/source/configure b/Build/source/configure
index 1d7c9e8921f..26555875d46 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -949,7 +949,6 @@ enable_tektronixwin
 enable_unitermwin
 enable_mp
 enable_web_progs
-enable_one
 enable_afm2pl
 enable_bibtex8
 enable_cjkutils
@@ -1705,25 +1704,24 @@ Optional Features:
   --disable-dump-share      make fmt/base/mem files architecture-dependent
   --enable-fmtutil          use fmtutil for build dumps
   --enable-ipc              enable TeX's --ipc option, i.e., pipe to a program
-  --disable-tex               do not compile and install TeX
-  --enable-etex               compile and install e-TeX
-  --disable-aleph             do not compile and install Aleph
-  --disable-pdftex            do not compile and install pdfTeX
-  --disable-luatex            do not compile and install luaTeX
-  --enable-xetex              compile and install XeTeX
+  --disable-tex             do not compile and install TeX
+  --enable-etex             compile and install e-TeX
+  --disable-aleph           do not compile and install Aleph
+  --disable-pdftex          do not compile and install pdfTeX
+  --disable-luatex          do not compile and install luaTeX
+  --disable-xetex           do not compile and install XeTeX
   --disable-mf              do not build METAFONT
-  --enable-mf-nowin           build a separate non-windows-capable METAFONT
-  --enable-epsfwin            include EPSF pseudo window support
-  --enable-hp2627win          include HP 2627 window support
-  --enable-mftalkwin          include mftalk (generic server) window support
-  --enable-nextwin            include NeXT window support
-  --enable-regiswin           include Regis window support
-  --enable-suntoolswin        include old Suntools (not X) window support
-  --enable-tektronixwin       include Tektronix window support
-  --enable-unitermwin         include Uniterm window support
+  --enable-mf-nowin         build a separate non-windows-capable METAFONT
+  --enable-epsfwin          include EPSF pseudo window support
+  --enable-hp2627win        include HP 2627 window support
+  --enable-mftalkwin        include mftalk (generic server) window support
+  --enable-nextwin          include NeXT window support
+  --enable-regiswin         include Regis window support
+  --enable-suntoolswin      include old Suntools (not X) window support
+  --enable-tektronixwin     include Tektronix window support
+  --enable-unitermwin       include Uniterm window support
   --disable-mp              do not build METAPOST
   --disable-web-progs       do not build WEB programs bibtex ... weave
-  --enable-one            build the one (testing) package
   --disable-afm2pl        do not build the afm2pl package
   --disable-bibtex8       do not build the bibtex8 package
   --disable-cjkutils      do not build the cjkutils package
@@ -1770,13 +1768,14 @@ Optional Features:
   --disable-xdvipdfmx     do not build the xdvipdfmx package
   --disable-tetex         do not build the tetex (teTeX scripts) package
   --disable-texlive       do not build the texlive (TeX Live scripts) package
-  --disable-mktexmf-default   do not run mktexmf if MF source missing
-  --disable-mktexpk-default   do not run mktexpk if PK font missing
-  --disable-mktextfm-default  do not run mktextfm if TFM file missing
-  --disable-mkocp-default     do not run mkocp if OCP file missing
-  --disable-mkofm-default     do not run mkofm if OFM file missing
-  --enable-mktexfmt-default   run mktexfmt if format file missing
-  --enable-mktextex-default   run mktextex if TeX source missing
+  --disable-mktexmf-default do not run mktexmf if MF source missing
+  --disable-mktexpk-default do not run mktexpk if PK font missing
+  --disable-mktextfm-default
+                            do not run mktextfm if TFM file missing
+  --disable-mkocp-default   do not run mkocp if OCP file missing
+  --disable-mkofm-default   do not run mkofm if OFM file missing
+  --enable-mktexfmt-default run mktexfmt if format file missing
+  --enable-mktextex-default run mktextex if TeX source missing
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
   --enable-shared[=PKGS]  build shared libraries [default=yes]
@@ -2565,7 +2564,7 @@ esac
 
 ## texk/ac/withenable.ac
 
-## texk/web2c/ac/withenable.ac
+## texk/web2c/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
 ## configure options and TL libraries required for web2c
 # Check whether --enable-web2c was given.
 if test "${enable_web2c+set}" = set; then
@@ -2584,7 +2583,7 @@ test "x$enable_web2c" = xno || {
   need_zlib=yes
 }
 
-## texk/web2c/ac/web2c.ac
+## texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
 ## configure options for TeX and MF
 
 # Check whether --with-editor was given.
@@ -2641,7 +2640,7 @@ case $enable_pdftex in
   *) enable_pdftex=yes ;;
 esac
 
-test "x$enable_pdftex" = xno || {
+test "x$enable_web2c:$enable_pdftex" = xyes:yes && {
   need_xpdf=yes
   need_libpng=yes
   need_obsdcompat=yes
@@ -2655,7 +2654,7 @@ case $enable_luatex in
   *) enable_luatex=yes ;;
 esac
 
-test "x$enable_luatex" = xno || {
+test "x$enable_web2c:$enable_luatex" = xyes:yes && {
   need_xpdf=yes
   need_libpng=yes
   need_obsdcompat=yes
@@ -2666,13 +2665,16 @@ if test "${enable_xetex+set}" = set; then
 fi
 case $enable_xetex in
   yes|no) : ;;
-  *) enable_xetex=no ;;
+  *) enable_xetex=yes ;;
 esac
 
-test "x$enable_xetex" = xno || {
+test "x$enable_web2c:$enable_xetex" = xyes:yes && {
   need_xpdf=yes
   need_libpng=yes
   need_freetype2=yes
+  need_icu=yes
+  need_teckit=yes
+  need_graphite=yes
 }
 ## configure options for MF
 # Check whether --enable-mf was given.
@@ -2732,29 +2734,6 @@ if test "${enable_web_progs+set}" = set; then
 fi
 
 
-## texk/one/ac/withenable.ac
-## configure options and TL libraries required for one
-# Check whether --enable-one was given.
-if test "${enable_one+set}" = set; then
-  enableval=$enable_one;
-fi
-case $enable_one in #(
-  yes|no);; #(
-  *) enable_one=no
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-one=$enable_one'" >&5
-$as_echo "$as_me: Assuming \`--enable-one=$enable_one'" >&6;}
-     ac_configure_args="$ac_configure_args '--enable-one=$enable_one'";;
-esac
-
-test "x$enable_one" = xno || {
-  need_freetype2=yes
-  need_t1lib=yes
-  need_gd=yes
-  need_teckit=yes
-  need_graphite=yes
-}
-
-
 ## texk/afm2pl/ac/withenable.ac
 ## configure options and TL libraries required for afm2pl
 # Check whether --enable-afm2pl was given.
@@ -3389,7 +3368,7 @@ esac
 
 
 
-## texk/kpathsea/ac/withenable.ac
+## texk/kpathsea/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
 ## configure options and TL libraries required for kpathsea
 
 # Check whether --with-system-kpathsea was given.
@@ -3429,7 +3408,7 @@ $as_echo "$as_me: Using \`kpathsea' headers and library from TL tree" >&6;}
   fi
 fi
 
-## texk/kpathsea/ac/web2c.ac
+## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
 ## configure options for mktextmf-default & Co
 # Check whether --enable-mktexmf-default was given.
 if test "${enable_mktexmf_default+set}" = set; then
@@ -3491,6 +3470,10 @@ esac
 
 ## libs/ac/withenable.ac
 
+## libs/icu/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/icu/
+## configure options and TL libraries required for icu (modified for XeTeX)
+
+
 ## libs/teckit/ac/withenable.ac
 ## configure options and TL libraries required for teckit
 
@@ -5909,13 +5892,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5912: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5895: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5915: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5898: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5918: output\"" >&5)
+  (eval echo "\"\$as_me:5901: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7121,7 +7104,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7124 "configure"' > conftest.$ac_ext
+  echo '#line 7107 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9168,11 +9151,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9171: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9154: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9175: \$? = $ac_status" >&5
+   echo "$as_me:9158: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9507,11 +9490,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9510: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9493: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9514: \$? = $ac_status" >&5
+   echo "$as_me:9497: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9612,11 +9595,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9615: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9598: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9619: \$? = $ac_status" >&5
+   echo "$as_me:9602: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9667,11 +9650,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9670: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9653: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9674: \$? = $ac_status" >&5
+   echo "$as_me:9657: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12467,7 +12450,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12470 "configure"
+#line 12453 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12563,7 +12546,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12566 "configure"
+#line 12549 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18959,11 +18942,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18962: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18945: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18966: \$? = $ac_status" >&5
+   echo "$as_me:18949: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -19058,11 +19041,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19061: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19044: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19065: \$? = $ac_status" >&5
+   echo "$as_me:19048: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -19110,11 +19093,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19113: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19096: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19117: \$? = $ac_status" >&5
+   echo "$as_me:19100: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -22325,7 +22308,7 @@ done
 fi
 
 
-## texk/kpathsea/ac/kpathsea.ac
+## texk/kpathsea/ac/kpathsea.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
 ## define required functions and headers from system kpathsea
 if test "x$need_kpathsea:$with_system_kpathsea" = 'xyes:yes'; then
   { $as_echo "$as_me:$LINENO: checking requested system \`kpathsea' library..." >&5
diff --git a/Build/source/libs/Makefile.in b/Build/source/libs/Makefile.in
index e8a5e8ddf85..3cd374e123c 100644
--- a/Build/source/libs/Makefile.in
+++ b/Build/source/libs/Makefile.in
@@ -61,7 +61,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../texk/ac/withenable.ac \
 	$(top_srcdir)/../texk/web2c/ac/withenable.ac \
 	$(top_srcdir)/../texk/web2c/ac/web2c.ac \
-	$(top_srcdir)/../texk/one/ac/withenable.ac \
 	$(top_srcdir)/../texk/afm2pl/ac/withenable.ac \
 	$(top_srcdir)/../texk/bibtex8/ac/withenable.ac \
 	$(top_srcdir)/../texk/cjkutils/ac/withenable.ac \
@@ -97,6 +96,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../texk/kpathsea/ac/withenable.ac \
 	$(top_srcdir)/../texk/kpathsea/ac/web2c.ac \
 	$(top_srcdir)/../libs/ac/withenable.ac \
+	$(top_srcdir)/../libs/icu/ac/withenable.ac \
 	$(top_srcdir)/../libs/teckit/ac/withenable.ac \
 	$(top_srcdir)/../libs/graphite/ac/withenable.ac \
 	$(top_srcdir)/../libs/xpdf/ac/withenable.ac \
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 80e284a2f65..243aa4c8b5c 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -716,7 +716,6 @@ enable_tektronixwin
 enable_unitermwin
 enable_mp
 enable_web_progs
-enable_one
 enable_afm2pl
 enable_bibtex8
 enable_cjkutils
@@ -802,6 +801,7 @@ enable_maintainer_mode
 host_alias
 target_alias'
 ac_subdirs_all='dummy
+icu
 teckit
 graphite
 xpdf
@@ -1458,25 +1458,24 @@ Optional Features:
   --disable-dump-share      make fmt/base/mem files architecture-dependent
   --enable-fmtutil          use fmtutil for build dumps
   --enable-ipc              enable TeX's --ipc option, i.e., pipe to a program
-  --disable-tex               do not compile and install TeX
-  --enable-etex               compile and install e-TeX
-  --disable-aleph             do not compile and install Aleph
-  --disable-pdftex            do not compile and install pdfTeX
-  --disable-luatex            do not compile and install luaTeX
-  --enable-xetex              compile and install XeTeX
+  --disable-tex             do not compile and install TeX
+  --enable-etex             compile and install e-TeX
+  --disable-aleph           do not compile and install Aleph
+  --disable-pdftex          do not compile and install pdfTeX
+  --disable-luatex          do not compile and install luaTeX
+  --disable-xetex           do not compile and install XeTeX
   --disable-mf              do not build METAFONT
-  --enable-mf-nowin           build a separate non-windows-capable METAFONT
-  --enable-epsfwin            include EPSF pseudo window support
-  --enable-hp2627win          include HP 2627 window support
-  --enable-mftalkwin          include mftalk (generic server) window support
-  --enable-nextwin            include NeXT window support
-  --enable-regiswin           include Regis window support
-  --enable-suntoolswin        include old Suntools (not X) window support
-  --enable-tektronixwin       include Tektronix window support
-  --enable-unitermwin         include Uniterm window support
+  --enable-mf-nowin         build a separate non-windows-capable METAFONT
+  --enable-epsfwin          include EPSF pseudo window support
+  --enable-hp2627win        include HP 2627 window support
+  --enable-mftalkwin        include mftalk (generic server) window support
+  --enable-nextwin          include NeXT window support
+  --enable-regiswin         include Regis window support
+  --enable-suntoolswin      include old Suntools (not X) window support
+  --enable-tektronixwin     include Tektronix window support
+  --enable-unitermwin       include Uniterm window support
   --disable-mp              do not build METAPOST
   --disable-web-progs       do not build WEB programs bibtex ... weave
-  --enable-one            build the one (testing) package
   --disable-afm2pl        do not build the afm2pl package
   --disable-bibtex8       do not build the bibtex8 package
   --disable-cjkutils      do not build the cjkutils package
@@ -1523,13 +1522,14 @@ Optional Features:
   --disable-xdvipdfmx     do not build the xdvipdfmx package
   --disable-tetex         do not build the tetex (teTeX scripts) package
   --disable-texlive       do not build the texlive (TeX Live scripts) package
-  --disable-mktexmf-default   do not run mktexmf if MF source missing
-  --disable-mktexpk-default   do not run mktexpk if PK font missing
-  --disable-mktextfm-default  do not run mktextfm if TFM file missing
-  --disable-mkocp-default     do not run mkocp if OCP file missing
-  --disable-mkofm-default     do not run mkofm if OFM file missing
-  --enable-mktexfmt-default   run mktexfmt if format file missing
-  --enable-mktextex-default   run mktextex if TeX source missing
+  --disable-mktexmf-default do not run mktexmf if MF source missing
+  --disable-mktexpk-default do not run mktexpk if PK font missing
+  --disable-mktextfm-default
+                            do not run mktextfm if TFM file missing
+  --disable-mkocp-default   do not run mkocp if OCP file missing
+  --disable-mkofm-default   do not run mkofm if OFM file missing
+  --enable-mktexfmt-default run mktexfmt if format file missing
+  --enable-mktextex-default run mktextex if TeX source missing
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
 
@@ -2289,7 +2289,7 @@ esac
 
 ## texk/ac/withenable.ac
 
-## texk/web2c/ac/withenable.ac
+## texk/web2c/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
 ## configure options and TL libraries required for web2c
 # Check whether --enable-web2c was given.
 if test "${enable_web2c+set}" = set; then
@@ -2308,7 +2308,7 @@ test "x$enable_web2c" = xno || {
   need_zlib=yes
 }
 
-## texk/web2c/ac/web2c.ac
+## texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
 ## configure options for TeX and MF
 
 # Check whether --with-editor was given.
@@ -2365,7 +2365,7 @@ case $enable_pdftex in
   *) enable_pdftex=yes ;;
 esac
 
-test "x$enable_pdftex" = xno || {
+test "x$enable_web2c:$enable_pdftex" = xyes:yes && {
   need_xpdf=yes
   need_libpng=yes
   need_obsdcompat=yes
@@ -2379,7 +2379,7 @@ case $enable_luatex in
   *) enable_luatex=yes ;;
 esac
 
-test "x$enable_luatex" = xno || {
+test "x$enable_web2c:$enable_luatex" = xyes:yes && {
   need_xpdf=yes
   need_libpng=yes
   need_obsdcompat=yes
@@ -2390,13 +2390,16 @@ if test "${enable_xetex+set}" = set; then
 fi
 case $enable_xetex in
   yes|no) : ;;
-  *) enable_xetex=no ;;
+  *) enable_xetex=yes ;;
 esac
 
-test "x$enable_xetex" = xno || {
+test "x$enable_web2c:$enable_xetex" = xyes:yes && {
   need_xpdf=yes
   need_libpng=yes
   need_freetype2=yes
+  need_icu=yes
+  need_teckit=yes
+  need_graphite=yes
 }
 ## configure options for MF
 # Check whether --enable-mf was given.
@@ -2456,29 +2459,6 @@ if test "${enable_web_progs+set}" = set; then
 fi
 
 
-## texk/one/ac/withenable.ac
-## configure options and TL libraries required for one
-# Check whether --enable-one was given.
-if test "${enable_one+set}" = set; then
-  enableval=$enable_one;
-fi
-case $enable_one in #(
-  yes|no);; #(
-  *) enable_one=no
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-one=$enable_one'" >&5
-$as_echo "$as_me: Assuming \`--enable-one=$enable_one'" >&6;}
-     ac_configure_args="$ac_configure_args '--enable-one=$enable_one'";;
-esac
-
-test "x$enable_one" = xno || {
-  need_freetype2=yes
-  need_t1lib=yes
-  need_gd=yes
-  need_teckit=yes
-  need_graphite=yes
-}
-
-
 ## texk/afm2pl/ac/withenable.ac
 ## configure options and TL libraries required for afm2pl
 # Check whether --enable-afm2pl was given.
@@ -3113,7 +3093,7 @@ esac
 
 
 
-## texk/kpathsea/ac/withenable.ac
+## texk/kpathsea/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
 ## configure options and TL libraries required for kpathsea
 
 # Check whether --with-system-kpathsea was given.
@@ -3143,7 +3123,7 @@ $as_echo "$as_me: Assuming installed \`kpathsea' headers and library" >&6;}
   ac_configure_args="$ac_configure_args '--with-system-kpathsea=$with_system_kpathsea'"
 fi
 
-## texk/kpathsea/ac/web2c.ac
+## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
 ## configure options for mktextmf-default & Co
 # Check whether --enable-mktexmf-default was given.
 if test "${enable_mktexmf_default+set}" = set; then
@@ -3205,6 +3185,10 @@ esac
 
 ## libs/ac/withenable.ac
 
+## libs/icu/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/icu/
+## configure options and TL libraries required for icu (modified for XeTeX)
+
+
 ## libs/teckit/ac/withenable.ac
 ## configure options and TL libraries required for teckit
 
@@ -4063,6 +4047,19 @@ $as_echo_n "checking for libraries to build... " >&6; }
 SUBLIBS=
 DIST_SUBLIBS=
 
+if test -x $srcdir/icu/configure; then
+  if test "x$with_system_icu" != xyes && \
+     test "x$need_icu" = xyes; then
+    SUBLIBS="icu $SUBLIBS"
+  fi
+  DIST_SUBLIBS="icu $DIST_SUBLIBS"
+  if false; then
+    subdirs="$subdirs icu"
+
+  fi
+fi
+
+
 if test -x $srcdir/teckit/configure; then
   if test "x$with_system_teckit" != xyes && \
      test "x$need_teckit" = xyes; then
diff --git a/Build/source/libs/icu/Makefile.am b/Build/source/libs/icu/Makefile.am
new file mode 100644
index 00000000000..1798c7ba48d
--- /dev/null
+++ b/Build/source/libs/icu/Makefile.am
@@ -0,0 +1,53 @@
+## Proxy Makefile.am to build icu-xetex for TeX Live.
+##
+##   Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+##
+##   This file is free software; the copyright holder
+##   gives unlimited permission to copy and/or distribute it,
+##   with or without modifications, as long as this notice is preserved.
+##
+ACLOCAL_AMFLAGS = -I ../../m4
+
+SUBDIRS = dummy
+
+## We want to re-distribute the whole icu-xetex source tree.
+EXTRA_DIST = icu-xetex
+
+## in case of an SVN repository
+dist-hook:
+	rm -rf `find $(distdir)/icu-xetex -name .svn`
+
+ICUSUB_AUX = icusubdir-configure icusubdir-conf.args
+noinst_DATA = $(ICUSUB_AUX)
+
+DISTCLEANFILES = $(noinst_DATA)
+
+if build
+all-local: icubuild
+else !build
+all-local: icu-build/Makefile
+endif !build
+
+icu-build/Makefile: $(noinst_DATA)
+	$(mkdir_p) icu-build
+	@cmd=`cat $(ICUSUB_AUX)`; \
+	cmd="$$cmd --enable-static --disable-shared --disable-extras --disable-samples --disable-tests"; \
+	(cd icu-build && echo "=== configuring in icu-build (`pwd`)" && \
+	  echo "make: running $(SHELL) $$cmd" && \
+	  eval $(SHELL) $$cmd)
+
+.PHONY: icubuild
+icubuild: icu-build/Makefile
+	cd icu-build && $(MAKE) $(AM_MAKEFLAGS) all
+
+distclean-local:
+	rm -rf icu-build
+
+icusubdir-configure:
+	@echo "make in ./dummy failed to create the file $@"
+	exit 1
+
+icusubdir-conf.args:
+	@echo "configure in ./dummy failed to create the file $@"
+	exit 1
+
diff --git a/Build/source/libs/icu/Makefile.in b/Build/source/libs/icu/Makefile.in
new file mode 100644
index 00000000000..bae16bceb23
--- /dev/null
+++ b/Build/source/libs/icu/Makefile.in
@@ -0,0 +1,611 @@
+# Makefile.in generated by automake 1.10.2 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 = :
+subdir = .
+DIST_COMMON = $(am__configure_deps) \
+	$(srcdir)/../../build-aux/install-sh \
+	$(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(top_srcdir)/configure \
+	../../build-aux/config.guess ../../build-aux/config.sub \
+	../../build-aux/depcomp ../../build-aux/install-sh \
+	../../build-aux/ltmain.sh ../../build-aux/missing \
+	../../build-aux/texinfo.tex ../../build-aux/ylwrap
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(install_sh) -d
+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
+DATA = $(noinst_DATA)
+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)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  { test ! -d $(distdir) \
+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr $(distdir); }; }
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+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@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+am__leading_dot = @am__leading_dot@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+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@
+subdirs = @subdirs@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+ACLOCAL_AMFLAGS = -I ../../m4
+SUBDIRS = dummy
+EXTRA_DIST = icu-xetex
+ICUSUB_AUX = icusubdir-configure icusubdir-conf.args
+noinst_DATA = $(ICUSUB_AUX)
+DISTCLEANFILES = $(noinst_DATA)
+all: all-recursive
+
+.SUFFIXES:
+am--refresh:
+	@:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
+	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+# 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; nonempty = 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)
+	$(am__remove_distdir)
+	test -d $(distdir) || mkdir $(distdir)
+	@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
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r $(distdir)
+dist-gzip: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
+
+dist-tarZ: distdir
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(am__remove_distdir)
+
+dist-shar: distdir
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__remove_distdir)
+
+dist dist-all: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	*.tar.bz2*) \
+	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+	*.shar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	esac
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	mkdir $(distdir)/_build
+	mkdir $(distdir)/_inst
+	chmod a-w $(distdir)
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && cd $(distdir)/_build \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+	  && rm -rf "$$dc_destdir" \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && rm -rf $(DIST_ARCHIVES) \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+	$(am__remove_distdir)
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+distuninstallcheck:
+	@cd $(distuninstallcheck_dir) \
+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	   || { echo "ERROR: files left after uninstall:" ; \
+	        if test -n "$(DESTDIR)"; then \
+	          echo "  (check DESTDIR support)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
+distcleancheck: distclean
+	@if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(DATA) all-local
+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)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+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 mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-local \
+	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 $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+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 all-local am--refresh check check-am clean \
+	clean-generic ctags ctags-recursive dist dist-all dist-bzip2 \
+	dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \
+	distcheck distclean distclean-generic distclean-local \
+	distclean-tags distcleancheck distdir distuninstallcheck 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 pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am
+
+
+dist-hook:
+	rm -rf `find $(distdir)/icu-xetex -name .svn`
+
+@build_TRUE@all-local: icubuild
+@build_FALSE@all-local: icu-build/Makefile
+
+icu-build/Makefile: $(noinst_DATA)
+	$(mkdir_p) icu-build
+	@cmd=`cat $(ICUSUB_AUX)`; \
+	cmd="$$cmd --enable-static --disable-shared --disable-extras --disable-samples --disable-tests"; \
+	(cd icu-build && echo "=== configuring in icu-build (`pwd`)" && \
+	  echo "make: running $(SHELL) $$cmd" && \
+	  eval $(SHELL) $$cmd)
+
+.PHONY: icubuild
+icubuild: icu-build/Makefile
+	cd icu-build && $(MAKE) $(AM_MAKEFLAGS) all
+
+distclean-local:
+	rm -rf icu-build
+
+icusubdir-configure:
+	@echo "make in ./dummy failed to create the file $@"
+	exit 1
+
+icusubdir-conf.args:
+	@echo "configure in ./dummy failed to create the file $@"
+	exit 1
+# 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/Build/source/libs/icu/ac/withenable.ac b/Build/source/libs/icu/ac/withenable.ac
new file mode 100644
index 00000000000..d8ef5cc75a4
--- /dev/null
+++ b/Build/source/libs/icu/ac/withenable.ac
@@ -0,0 +1,7 @@
+## libs/icu/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/icu/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
+## configure options and TL libraries required for icu (modified for XeTeX)
+KPSE_WITH_LIB([icu], , [tree])
diff --git a/Build/source/libs/icu/aclocal.m4 b/Build/source/libs/icu/aclocal.m4
new file mode 100644
index 00000000000..a249a8e6d87
--- /dev/null
+++ b/Build/source/libs/icu/aclocal.m4
@@ -0,0 +1,618 @@
+# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This file 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.
+
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
+[m4_warning([this file was generated for autoconf 2.63.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+#
+# This file 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.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.10'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.10.2], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.10.2])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file 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.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# AM_CONDITIONAL                                            -*- Autoconf -*-
+
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 8
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+# Do all the work for Automake.                             -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008 Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 13
+
+# This macro actually does too much.  Some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.60])dnl
+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_PROG_INSTALL_SH
+AM_PROG_INSTALL_STRIP
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+	      		     [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+                  [_AM_DEPENDENCIES(CC)],
+                  [define([AC_PROG_CC],
+                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+                  [_AM_DEPENDENCIES(CXX)],
+                  [define([AC_PROG_CXX],
+                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+                  [_AM_DEPENDENCIES(OBJC)],
+                  [define([AC_PROG_OBJC],
+                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+])
+])
+
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file 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.
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+AC_SUBST(install_sh)])
+
+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 2
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot.  For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
+# From Jim Meyering
+
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 4
+
+AC_DEFUN([AM_MAINTAINER_MODE],
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+  dnl maintainer-mode is disabled by default
+  AC_ARG_ENABLE(maintainer-mode,
+[  --enable-maintainer-mode  enable make rules and dependencies not useful
+			  (and sometimes confusing) to the casual installer],
+      USE_MAINTAINER_MODE=$enableval,
+      USE_MAINTAINER_MODE=no)
+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+  MAINT=$MAINTAINER_MODE_TRUE
+  AC_SUBST(MAINT)dnl
+]
+)
+
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 5
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  AC_MSG_WARN([`missing' script is too old or missing])
+fi
+])
+
+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+#
+# This file 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.
+
+# AM_PROG_MKDIR_P
+# ---------------
+# Check for `mkdir -p'.
+AC_DEFUN([AM_PROG_MKDIR_P],
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
+
+# Helper functions for option handling.                     -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 4
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# ------------------------------
+# Set option NAME.  Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ----------------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 4
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
+      # -L didn't work.
+      set X `ls -t $srcdir/configure conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT(yes)])
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file 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.
+
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Copyright (C) 2006  Free Software Foundation, Inc.
+#
+# This file 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.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# Check how to create a tarball.                            -*- Autoconf -*-
+
+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 2
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of `v7', `ustar', or `pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [m4_case([$1], [ustar],, [pax],,
+              [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      AM_RUN_LOG([$_am_tar --version]) && break
+    done
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x $1 -w "$$tardir"'
+    am__tar_='pax -L -x $1 -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+    am__untar='cpio -i -H $1 -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
+
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_$1}" && break
+
+  # tar/untar a dummy directory, and stop if the command works
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    AM_RUN_LOG([$am__untar <conftest.tar])
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
diff --git a/Build/source/libs/icu/configure b/Build/source/libs/icu/configure
new file mode 100755
index 00000000000..f3b87fcc68b
--- /dev/null
+++ b/Build/source/libs/icu/configure
@@ -0,0 +1,3614 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.63 for icu-xetex for TeX Live 3.8.1.
+#
+# Report bugs to <tex-k@tug.org>.
+#
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# CDPATH.
+$as_unset CDPATH
+
+
+if test "x$CONFIG_SHELL" = x; then
+  if (eval ":") 2>/dev/null; then
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+
+  if test $as_have_required = yes &&	 (eval ":
+(as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=\$LINENO
+  as_lineno_2=\$LINENO
+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+") 2> /dev/null; then
+  :
+else
+  as_candidate_shells=
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  case $as_dir in
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	   done;;
+       esac
+done
+IFS=$as_save_IFS
+
+
+      for as_shell in $as_candidate_shells $SHELL; do
+	 # Try only shells that exist, to save several forks.
+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+_ASEOF
+}; then
+  CONFIG_SHELL=$as_shell
+	       as_have_required=yes
+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+(as_func_return () {
+  (exit $1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test $exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+
+_ASEOF
+}; then
+  break
+fi
+
+fi
+
+      done
+
+      if test "x$CONFIG_SHELL" != x; then
+  for as_var in BASH_ENV ENV
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+
+    if test $as_have_required = no; then
+  echo This script requires a shell more modern than all the
+      echo shells that I found on your system.  Please install a
+      echo modern shell, or manually run the script under such a
+      echo shell if you do have one.
+      { (exit 1); exit 1; }
+fi
+
+
+fi
+
+fi
+
+
+
+(eval "as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0") || {
+  echo No shell found that supports shell functions.
+  echo Please tell bug-autoconf@gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
+}
+
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+  case `echo 'x\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  *)   ECHO_C='\c';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=:
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+
+exec 7<&0 </dev/null 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIBOBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# Identity of this package.
+PACKAGE_NAME='icu-xetex for TeX Live'
+PACKAGE_TARNAME='icu-xetex-for-tex-live'
+PACKAGE_VERSION='3.8.1'
+PACKAGE_STRING='icu-xetex for TeX Live 3.8.1'
+PACKAGE_BUGREPORT='tex-k@tug.org'
+
+ac_unique_file="icu-xetex/common/unicode/utypes.h"
+enable_option_checking=no
+ac_subst_vars='LTLIBOBJS
+LIBOBJS
+subdirs
+build_FALSE
+build_TRUE
+MAINT
+MAINTAINER_MODE_FALSE
+MAINTAINER_MODE_TRUE
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_maintainer_mode
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias'
+ac_subdirs_all='dummy'
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval $ac_prev=\$ac_option
+    ac_prev=
+    continue
+  fi
+
+  case $ac_option in
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
+  -enable-* | --enable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst | --locals)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
+
+  -without-* | --without-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries=$ac_optarg ;;
+
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; }
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+   { (exit 1); exit 1; }; }
+    eval $ac_envvar=\$ac_optarg
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; }
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  { $as_echo "$as_me: error: working directory cannot be determined" >&2
+   { (exit 1); exit 1; }; }
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
+   { (exit 1); exit 1; }; }
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r "$srcdir/$ac_unique_file"; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+   { (exit 1); exit 1; }; }
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
+   { (exit 1); exit 1; }; }
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<_ACEOF
+\`configure' configures icu-xetex for TeX Live 3.8.1 to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root
+                          [DATAROOTDIR/doc/icu-xetex-for-tex-live]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+_ACEOF
+
+  cat <<\_ACEOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of icu-xetex for TeX Live 3.8.1:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-maintainer-mode  enable make rules and dependencies not useful
+			  (and sometimes confusing) to the casual installer
+
+Report bugs to <tex-k@tug.org>.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
+    else
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
+  done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+  cat <<\_ACEOF
+icu-xetex for TeX Live configure 3.8.1
+generated by GNU Autoconf 2.63
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+  exit
+fi
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by icu-xetex for TeX Live $as_me 3.8.1, which was
+generated by GNU Autoconf 2.63.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  $as_echo "PATH: $as_dir"
+done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    2)
+      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+	ac_must_keep_next=false # Got value, back to normal.
+      else
+	case $ac_arg in
+	  *=* | --config-cache | -C | -disable-* | --disable-* \
+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+	  | -with-* | --with-* | -without-* | --without-* | --x)
+	    case "$ac_configure_args0 " in
+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+	    esac
+	    ;;
+	  -* ) ac_must_keep_next=true ;;
+	esac
+      fi
+      ac_configure_args="$ac_configure_args '$ac_arg'"
+      ;;
+    esac
+  done
+done
+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    cat <<\_ASBOX
+## ---------------- ##
+## Cache variables. ##
+## ---------------- ##
+_ASBOX
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) $as_unset $ac_var ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
+
+    cat <<\_ASBOX
+## ----------------- ##
+## Output variables. ##
+## ----------------- ##
+_ASBOX
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      cat <<\_ASBOX
+## ------------------- ##
+## File substitutions. ##
+## ------------------- ##
+_ASBOX
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	$as_echo "$ac_var='\''$ac_val'\''"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      cat <<\_ASBOX
+## ----------- ##
+## confdefs.h. ##
+## ----------- ##
+_ASBOX
+      echo
+      cat confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  ac_site_file1=$CONFIG_SITE
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test -r "$ac_site_file"; then
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file"
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special
+  # files actually), so we avoid doing that.
+  if test -f "$cache_file"; then
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
+  fi
+else
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+ac_aux_dir=
+for ac_dir in ../../build-aux "$srcdir"/../../build-aux; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ../../build-aux \"$srcdir\"/../../build-aux" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in ../../build-aux \"$srcdir\"/../../build-aux" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
+
+
+am__api_version='1.10'
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+  ./ | .// | /cC/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+
+done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   if test "$*" = "X"; then
+      # -L didn't work.
+      set X `ls -t $srcdir/configure conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$*" != "X $srcdir/configure conftest.file" \
+      && test "$*" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" >&5
+$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" >&2;}
+   { (exit 1); exit 1; }; }
+   fi
+
+   test "$2" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+Check your system clock" >&5
+$as_echo "$as_me: error: newly created file is older than distributed files!
+Check your system clock" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+test "$program_prefix" != NONE &&
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
+# By default was `s,x,x', remove it if useless.
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+done
+IFS=$as_save_IFS
+
+fi
+
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    test -d ./--version && rmdir ./--version
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AWK+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+
+
+# Define the identity of the package.
+ PACKAGE='icu-xetex-for-tex-live'
+ VERSION='3.8.1'
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+# Always define AMTAR for backward compatibility.
+
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+    # Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then
+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+else
+  USE_MAINTAINER_MODE=no
+fi
+
+  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
+   if test $USE_MAINTAINER_MODE = yes; then
+  MAINTAINER_MODE_TRUE=
+  MAINTAINER_MODE_FALSE='#'
+else
+  MAINTAINER_MODE_TRUE='#'
+  MAINTAINER_MODE_FALSE=
+fi
+
+  MAINT=$MAINTAINER_MODE_TRUE
+
+
+
+ if test "x$enable_build" != xno; then
+  build_TRUE=
+  build_FALSE='#'
+else
+  build_TRUE='#'
+  build_FALSE=
+fi
+
+
+
+
+subdirs="$subdirs dummy"
+
+
+ac_config_files="$ac_config_files Makefile"
+
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) $as_unset $ac_var ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    test "x$cache_file" != "x/dev/null" &&
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+    cat confcache >$cache_file
+  else
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+# Transform confdefs.h into DEFS.
+# Protect against shell expansion while executing Makefile rules.
+# Protect against Makefile macro expansion.
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then branch to the quote section.  Otherwise,
+# look for a macro that doesn't take arguments.
+ac_script='
+:mline
+/\\$/{
+ N
+ s,\\\n,,
+ b mline
+}
+t clear
+:clear
+s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
+t quote
+s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)/-D\1=\2/g
+t quote
+b any
+:quote
+s/[	 `~#$^&*(){}\\|;'\''"<>?]/\\&/g
+s/\[/\\&/g
+s/\]/\\&/g
+s/\$/$$/g
+H
+:any
+${
+	g
+	s/^\n//
+	s/\n/ /g
+	p
+}
+'
+DEFS=`sed -n "$ac_script" confdefs.h`
+
+
+ac_libobjs=
+ac_ltlibobjs=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${build_TRUE}" && test -z "${build_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"build\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"build\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+: ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# CDPATH.
+$as_unset CDPATH
+
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+  case `echo 'x\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  *)   ECHO_C='\c';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=:
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+
+# Save the log message, to keep $[0] and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by icu-xetex for TeX Live $as_me 3.8.1, which was
+generated by GNU Autoconf 2.63.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files from templates according to the
+current configuration.
+
+Usage: $0 [OPTION]... [FILE]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+
+Configuration files:
+$config_files
+
+Report bugs to <bug-autoconf@gnu.org>."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_version="\\
+icu-xetex for TeX Live config.status 3.8.1
+configured by $0, generated by GNU Autoconf 2.63,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+
+Copyright (C) 2008 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h |  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; } ;;
+
+  *) ac_config_targets="$ac_config_targets $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp=
+  trap 'exit_status=$?
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+' 0
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} ||
+{
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
+   { (exit 1); exit 1; }
+}
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr='
'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
+s/:*$//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+
+eval set X "  :F $CONFIG_FILES      "
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
+   { (exit 1); exit 1; }; };;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+   { (exit 1); exit 1; }; };;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  { as_dir="$ac_dir"
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+    s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&2;}
+
+  rm -f "$tmp/stdin"
+  case $ac_file in
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+ ;;
+
+
+
+  esac
+
+done # for ac_tag
+
+
+{ (exit 0); exit 0; }
+_ACEOF
+chmod +x $CONFIG_STATUS
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || { (exit 1); exit 1; }
+fi
+
+#
+# CONFIG_SUBDIRS section.
+#
+if test "$no_recursion" != yes; then
+
+  # Remove --cache-file, --srcdir, and --disable-option-checking arguments
+  # so they do not pile up.
+  ac_sub_configure_args=
+  ac_prev=
+  eval "set x $ac_configure_args"
+  shift
+  for ac_arg
+  do
+    if test -n "$ac_prev"; then
+      ac_prev=
+      continue
+    fi
+    case $ac_arg in
+    -cache-file | --cache-file | --cache-fil | --cache-fi \
+    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+      ac_prev=cache_file ;;
+    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
+    | --c=*)
+      ;;
+    --config-cache | -C)
+      ;;
+    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+      ac_prev=srcdir ;;
+    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+      ;;
+    -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+      ac_prev=prefix ;;
+    -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+      ;;
+    --disable-option-checking)
+      ;;
+    *)
+      case $ac_arg in
+      *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      esac
+      ac_sub_configure_args="$ac_sub_configure_args '$ac_arg'" ;;
+    esac
+  done
+
+  # Always prepend --prefix to ensure using the same prefix
+  # in subdir configurations.
+  ac_arg="--prefix=$prefix"
+  case $ac_arg in
+  *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  esac
+  ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
+
+  # Pass --silent
+  if test "$silent" = yes; then
+    ac_sub_configure_args="--silent $ac_sub_configure_args"
+  fi
+
+  # Always prepend --disable-option-checking to silence warnings, since
+  # different subdirs can have different --enable and --with options.
+  ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args"
+
+  ac_popdir=`pwd`
+  for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
+
+    # Do not complain, so a configure script can configure whichever
+    # parts of a large source tree are present.
+    test -d "$srcdir/$ac_dir" || continue
+
+    ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
+    $as_echo "$as_me:$LINENO: $ac_msg" >&5
+    $as_echo "$ac_msg" >&6
+    { as_dir="$ac_dir"
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+    cd "$ac_dir"
+
+    # Check for guested configure; otherwise get Cygnus style configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      ac_sub_configure=$ac_srcdir/configure.gnu
+    elif test -f "$ac_srcdir/configure"; then
+      ac_sub_configure=$ac_srcdir/configure
+    elif test -f "$ac_srcdir/configure.in"; then
+      # This should be Cygnus configure.
+      ac_sub_configure=$ac_aux_dir/configure
+    else
+      { $as_echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
+$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
+      ac_sub_configure=
+    fi
+
+    # The recursion is here.
+    if test -n "$ac_sub_configure"; then
+      # Make the cache file name correct relative to the subdirectory.
+      case $cache_file in
+      [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
+      *) # Relative name.
+	ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
+      esac
+
+      { $as_echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
+$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
+      # The eval makes quoting arguments work.
+      eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
+	   --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
+	{ { $as_echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
+$as_echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+
+    cd "$ac_popdir"
+  done
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
diff --git a/Build/source/libs/icu/configure.ac b/Build/source/libs/icu/configure.ac
new file mode 100644
index 00000000000..59d73ed7f9b
--- /dev/null
+++ b/Build/source/libs/icu/configure.ac
@@ -0,0 +1,24 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl   Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl
+dnl   This file is free software; the copyright holder
+dnl   gives unlimited permission to copy and/or distribute it,
+dnl   with or without modifications, as long as this notice is preserved.
+dnl
+AC_INIT([icu-xetex for TeX Live], [3.8.1], [tex-k@tug.org])
+AC_PREREQ([2.63])
+AC_CONFIG_SRCDIR([icu-xetex/common/unicode/utypes.h])
+AC_CONFIG_AUX_DIR([../../build-aux])
+AC_CONFIG_MACRO_DIR([../../m4])
+
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
+
+AM_CONDITIONAL([build], [test "x$enable_build" != xno])
+
+AC_CONFIG_SUBDIRS([dummy])
+
+AC_CONFIG_FILES([Makefile])
+
+AC_OUTPUT
diff --git a/Build/source/libs/icu/dummy/Makefile.am b/Build/source/libs/icu/dummy/Makefile.am
new file mode 100644
index 00000000000..d7298a04afe
--- /dev/null
+++ b/Build/source/libs/icu/dummy/Makefile.am
@@ -0,0 +1,14 @@
+## Makefile.am for the TeX Live subdirectory libs/icu/dummy/
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+##
+noinst_DATA = ../icusubdir-configure
+
+DISTCLEANFILES = $(noinst_DATA)
+
+all-local: $(noinst_DATA)
+
+../icusubdir-configure:
+	echo "${srcdir}/configure" | sed 's,icu/dummy/,icu/icu-xetex/,' >$@
+
diff --git a/Build/source/libs/icu/dummy/Makefile.in b/Build/source/libs/icu/dummy/Makefile.in
new file mode 100644
index 00000000000..1c111bbe8cf
--- /dev/null
+++ b/Build/source/libs/icu/dummy/Makefile.in
@@ -0,0 +1,420 @@
+# Makefile.in generated by automake 1.10.2 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 = :
+subdir = .
+DIST_COMMON = README $(am__configure_deps) \
+	$(srcdir)/../../../build-aux/install-sh \
+	$(srcdir)/../../../build-aux/missing $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(top_srcdir)/configure \
+	../../../build-aux/config.guess ../../../build-aux/config.sub \
+	../../../build-aux/depcomp ../../../build-aux/install-sh \
+	../../../build-aux/ltmain.sh ../../../build-aux/missing \
+	../../../build-aux/texinfo.tex ../../../build-aux/ylwrap
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+DATA = $(noinst_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  { test ! -d $(distdir) \
+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr $(distdir); }; }
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+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@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+am__leading_dot = @am__leading_dot@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+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_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+noinst_DATA = ../icusubdir-configure
+DISTCLEANFILES = $(noinst_DATA)
+all: all-am
+
+.SUFFIXES:
+am--refresh:
+	@:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
+	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	$(am__remove_distdir)
+	test -d $(distdir) || mkdir $(distdir)
+	@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
+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r $(distdir)
+dist-gzip: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
+
+dist-tarZ: distdir
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(am__remove_distdir)
+
+dist-shar: distdir
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__remove_distdir)
+
+dist dist-all: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	*.tar.bz2*) \
+	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+	*.shar.gz*) \
+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	esac
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	mkdir $(distdir)/_build
+	mkdir $(distdir)/_inst
+	chmod a-w $(distdir)
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && cd $(distdir)/_build \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+	  && rm -rf "$$dc_destdir" \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && rm -rf $(DIST_ARCHIVES) \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+	$(am__remove_distdir)
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+distuninstallcheck:
+	@cd $(distuninstallcheck_dir) \
+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	   || { echo "ERROR: files left after uninstall:" ; \
+	        if test -n "$(DESTDIR)"; then \
+	          echo "  (check DESTDIR support)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
+distcleancheck: distclean
+	@if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA) all-local
+installdirs:
+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)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+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-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+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 -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am all-local am--refresh check check-am clean \
+	clean-generic dist dist-all dist-bzip2 dist-gzip dist-lzma \
+	dist-shar dist-tarZ dist-zip distcheck distclean \
+	distclean-generic distcleancheck distdir distuninstallcheck \
+	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 maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am
+
+
+all-local: $(noinst_DATA)
+
+../icusubdir-configure:
+	echo "${srcdir}/configure" | sed 's,icu/dummy/,icu/icu-xetex/,' >$@
+# 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/Build/source/libs/icu/dummy/README b/Build/source/libs/icu/dummy/README
new file mode 100644
index 00000000000..ce8a8905466
--- /dev/null
+++ b/Build/source/libs/icu/dummy/README
@@ -0,0 +1,9 @@
+Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+You may freely use, modify and/or distribute this file.
+
+This directory libs/icu/dummy does not build or install anything.  Its
+purpose is to record the command line used to invoke
+libs/icu/dummy/configure from libs/icu/configure.  This information is then
+used by libs/icu/Makefile to invoke libs/icu/icu-xetex/configure from the
+subdirectory libs/icu/icu-build without the need to adjust any absolute or
+relative paths.
diff --git a/Build/source/libs/icu/dummy/aclocal.m4 b/Build/source/libs/icu/dummy/aclocal.m4
new file mode 100644
index 00000000000..a249a8e6d87
--- /dev/null
+++ b/Build/source/libs/icu/dummy/aclocal.m4
@@ -0,0 +1,618 @@
+# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This file 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.
+
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
+[m4_warning([this file was generated for autoconf 2.63.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+#
+# This file 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.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.10'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.10.2], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.10.2])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file 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.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# AM_CONDITIONAL                                            -*- Autoconf -*-
+
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 8
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+# Do all the work for Automake.                             -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008 Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 13
+
+# This macro actually does too much.  Some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.60])dnl
+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_PROG_INSTALL_SH
+AM_PROG_INSTALL_STRIP
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+	      		     [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+                  [_AM_DEPENDENCIES(CC)],
+                  [define([AC_PROG_CC],
+                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+                  [_AM_DEPENDENCIES(CXX)],
+                  [define([AC_PROG_CXX],
+                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+                  [_AM_DEPENDENCIES(OBJC)],
+                  [define([AC_PROG_OBJC],
+                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+])
+])
+
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file 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.
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+AC_SUBST(install_sh)])
+
+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 2
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot.  For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
+# From Jim Meyering
+
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 4
+
+AC_DEFUN([AM_MAINTAINER_MODE],
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+  dnl maintainer-mode is disabled by default
+  AC_ARG_ENABLE(maintainer-mode,
+[  --enable-maintainer-mode  enable make rules and dependencies not useful
+			  (and sometimes confusing) to the casual installer],
+      USE_MAINTAINER_MODE=$enableval,
+      USE_MAINTAINER_MODE=no)
+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+  MAINT=$MAINTAINER_MODE_TRUE
+  AC_SUBST(MAINT)dnl
+]
+)
+
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 5
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  AC_MSG_WARN([`missing' script is too old or missing])
+fi
+])
+
+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+#
+# This file 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.
+
+# AM_PROG_MKDIR_P
+# ---------------
+# Check for `mkdir -p'.
+AC_DEFUN([AM_PROG_MKDIR_P],
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
+
+# Helper functions for option handling.                     -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 4
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# ------------------------------
+# Set option NAME.  Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ----------------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 4
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
+      # -L didn't work.
+      set X `ls -t $srcdir/configure conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT(yes)])
+
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file 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.
+
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Copyright (C) 2006  Free Software Foundation, Inc.
+#
+# This file 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.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# Check how to create a tarball.                            -*- Autoconf -*-
+
+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 2
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of `v7', `ustar', or `pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [m4_case([$1], [ustar],, [pax],,
+              [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      AM_RUN_LOG([$_am_tar --version]) && break
+    done
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x $1 -w "$$tardir"'
+    am__tar_='pax -L -x $1 -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+    am__untar='cpio -i -H $1 -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
+
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_$1}" && break
+
+  # tar/untar a dummy directory, and stop if the command works
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    AM_RUN_LOG([$am__untar <conftest.tar])
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
diff --git a/Build/source/libs/icu/dummy/configure b/Build/source/libs/icu/dummy/configure
new file mode 100755
index 00000000000..cfc15d574b4
--- /dev/null
+++ b/Build/source/libs/icu/dummy/configure
@@ -0,0 +1,3403 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.63 for TeX Live libs icu dummy 2009.
+#
+# Report bugs to <tex-k@tug.org>.
+#
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# CDPATH.
+$as_unset CDPATH
+
+
+if test "x$CONFIG_SHELL" = x; then
+  if (eval ":") 2>/dev/null; then
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+
+  if test $as_have_required = yes &&	 (eval ":
+(as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=\$LINENO
+  as_lineno_2=\$LINENO
+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+") 2> /dev/null; then
+  :
+else
+  as_candidate_shells=
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  case $as_dir in
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	   done;;
+       esac
+done
+IFS=$as_save_IFS
+
+
+      for as_shell in $as_candidate_shells $SHELL; do
+	 # Try only shells that exist, to save several forks.
+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+_ASEOF
+}; then
+  CONFIG_SHELL=$as_shell
+	       as_have_required=yes
+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+(as_func_return () {
+  (exit $1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test $exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+
+_ASEOF
+}; then
+  break
+fi
+
+fi
+
+      done
+
+      if test "x$CONFIG_SHELL" != x; then
+  for as_var in BASH_ENV ENV
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+
+    if test $as_have_required = no; then
+  echo This script requires a shell more modern than all the
+      echo shells that I found on your system.  Please install a
+      echo modern shell, or manually run the script under such a
+      echo shell if you do have one.
+      { (exit 1); exit 1; }
+fi
+
+
+fi
+
+fi
+
+
+
+(eval "as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0") || {
+  echo No shell found that supports shell functions.
+  echo Please tell bug-autoconf@gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
+}
+
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+  case `echo 'x\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  *)   ECHO_C='\c';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=:
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+
+exec 7<&0 </dev/null 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIBOBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# Identity of this package.
+PACKAGE_NAME='TeX Live libs icu dummy'
+PACKAGE_TARNAME='tex-live-libs-icu-dummy'
+PACKAGE_VERSION='2009'
+PACKAGE_STRING='TeX Live libs icu dummy 2009'
+PACKAGE_BUGREPORT='tex-k@tug.org'
+
+ac_unique_file="../../../build-aux/missing"
+ac_subst_vars='LTLIBOBJS
+LIBOBJS
+MAINT
+MAINTAINER_MODE_FALSE
+MAINTAINER_MODE_TRUE
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_maintainer_mode
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval $ac_prev=\$ac_option
+    ac_prev=
+    continue
+  fi
+
+  case $ac_option in
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
+  -enable-* | --enable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst | --locals)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
+
+  -without-* | --without-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries=$ac_optarg ;;
+
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; }
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+   { (exit 1); exit 1; }; }
+    eval $ac_envvar=\$ac_optarg
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; }
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  { $as_echo "$as_me: error: working directory cannot be determined" >&2
+   { (exit 1); exit 1; }; }
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
+   { (exit 1); exit 1; }; }
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r "$srcdir/$ac_unique_file"; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+   { (exit 1); exit 1; }; }
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
+   { (exit 1); exit 1; }; }
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<_ACEOF
+\`configure' configures TeX Live libs icu dummy 2009 to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root
+                          [DATAROOTDIR/doc/tex-live-libs-icu-dummy]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+_ACEOF
+
+  cat <<\_ACEOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of TeX Live libs icu dummy 2009:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-maintainer-mode  enable make rules and dependencies not useful
+			  (and sometimes confusing) to the casual installer
+
+Report bugs to <tex-k@tug.org>.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
+    else
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
+  done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+  cat <<\_ACEOF
+TeX Live libs icu dummy configure 2009
+generated by GNU Autoconf 2.63
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+  exit
+fi
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by TeX Live libs icu dummy $as_me 2009, which was
+generated by GNU Autoconf 2.63.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  $as_echo "PATH: $as_dir"
+done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    2)
+      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+	ac_must_keep_next=false # Got value, back to normal.
+      else
+	case $ac_arg in
+	  *=* | --config-cache | -C | -disable-* | --disable-* \
+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+	  | -with-* | --with-* | -without-* | --without-* | --x)
+	    case "$ac_configure_args0 " in
+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+	    esac
+	    ;;
+	  -* ) ac_must_keep_next=true ;;
+	esac
+      fi
+      ac_configure_args="$ac_configure_args '$ac_arg'"
+      ;;
+    esac
+  done
+done
+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    cat <<\_ASBOX
+## ---------------- ##
+## Cache variables. ##
+## ---------------- ##
+_ASBOX
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) $as_unset $ac_var ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
+
+    cat <<\_ASBOX
+## ----------------- ##
+## Output variables. ##
+## ----------------- ##
+_ASBOX
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      cat <<\_ASBOX
+## ------------------- ##
+## File substitutions. ##
+## ------------------- ##
+_ASBOX
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	$as_echo "$ac_var='\''$ac_val'\''"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      cat <<\_ASBOX
+## ----------- ##
+## confdefs.h. ##
+## ----------- ##
+_ASBOX
+      echo
+      cat confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  ac_site_file1=$CONFIG_SITE
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test -r "$ac_site_file"; then
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file"
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special
+  # files actually), so we avoid doing that.
+  if test -f "$cache_file"; then
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
+  fi
+else
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+ac_aux_dir=
+for ac_dir in ../../../build-aux "$srcdir"/../../../build-aux; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ../../../build-aux \"$srcdir\"/../../../build-aux" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in ../../../build-aux \"$srcdir\"/../../../build-aux" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
+
+am__api_version='1.10'
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+  ./ | .// | /cC/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+
+done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   if test "$*" = "X"; then
+      # -L didn't work.
+      set X `ls -t $srcdir/configure conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$*" != "X $srcdir/configure conftest.file" \
+      && test "$*" != "X conftest.file $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" >&5
+$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" >&2;}
+   { (exit 1); exit 1; }; }
+   fi
+
+   test "$2" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+Check your system clock" >&5
+$as_echo "$as_me: error: newly created file is older than distributed files!
+Check your system clock" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+test "$program_prefix" != NONE &&
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
+# By default was `s,x,x', remove it if useless.
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+done
+IFS=$as_save_IFS
+
+fi
+
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    test -d ./--version && rmdir ./--version
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AWK+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+
+
+# Define the identity of the package.
+ PACKAGE='tex-live-libs-icu-dummy'
+ VERSION='2009'
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+# Always define AMTAR for backward compatibility.
+
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+    # Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then
+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+else
+  USE_MAINTAINER_MODE=no
+fi
+
+  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
+   if test $USE_MAINTAINER_MODE = yes; then
+  MAINTAINER_MODE_TRUE=
+  MAINTAINER_MODE_FALSE='#'
+else
+  MAINTAINER_MODE_TRUE='#'
+  MAINTAINER_MODE_FALSE=
+fi
+
+  MAINT=$MAINTAINER_MODE_TRUE
+
+
+
+echo "$ac_configure_args" | sed 's,/icu/dummy,/icu/icu-xetex,g' >../icusubdir-conf.args
+
+ac_config_files="$ac_config_files Makefile"
+
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) $as_unset $ac_var ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    test "x$cache_file" != "x/dev/null" &&
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+    cat confcache >$cache_file
+  else
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+# Transform confdefs.h into DEFS.
+# Protect against shell expansion while executing Makefile rules.
+# Protect against Makefile macro expansion.
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then branch to the quote section.  Otherwise,
+# look for a macro that doesn't take arguments.
+ac_script='
+:mline
+/\\$/{
+ N
+ s,\\\n,,
+ b mline
+}
+t clear
+:clear
+s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
+t quote
+s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)/-D\1=\2/g
+t quote
+b any
+:quote
+s/[	 `~#$^&*(){}\\|;'\''"<>?]/\\&/g
+s/\[/\\&/g
+s/\]/\\&/g
+s/\$/$$/g
+H
+:any
+${
+	g
+	s/^\n//
+	s/\n/ /g
+	p
+}
+'
+DEFS=`sed -n "$ac_script" confdefs.h`
+
+
+ac_libobjs=
+ac_ltlibobjs=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+: ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# CDPATH.
+$as_unset CDPATH
+
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+  case `echo 'x\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  *)   ECHO_C='\c';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=:
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+
+# Save the log message, to keep $[0] and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by TeX Live libs icu dummy $as_me 2009, which was
+generated by GNU Autoconf 2.63.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files from templates according to the
+current configuration.
+
+Usage: $0 [OPTION]... [FILE]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+
+Configuration files:
+$config_files
+
+Report bugs to <bug-autoconf@gnu.org>."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_version="\\
+TeX Live libs icu dummy config.status 2009
+configured by $0, generated by GNU Autoconf 2.63,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+
+Copyright (C) 2008 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h |  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; } ;;
+
+  *) ac_config_targets="$ac_config_targets $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp=
+  trap 'exit_status=$?
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+' 0
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} ||
+{
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
+   { (exit 1); exit 1; }
+}
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr='
'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
+s/:*$//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+
+eval set X "  :F $CONFIG_FILES      "
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
+   { (exit 1); exit 1; }; };;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+   { (exit 1); exit 1; }; };;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  { as_dir="$ac_dir"
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+    s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&2;}
+
+  rm -f "$tmp/stdin"
+  case $ac_file in
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+ ;;
+
+
+
+  esac
+
+done # for ac_tag
+
+
+{ (exit 0); exit 0; }
+_ACEOF
+chmod +x $CONFIG_STATUS
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || { (exit 1); exit 1; }
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
diff --git a/Build/source/libs/icu/dummy/configure.ac b/Build/source/libs/icu/dummy/configure.ac
new file mode 100644
index 00000000000..9d40def203c
--- /dev/null
+++ b/Build/source/libs/icu/dummy/configure.ac
@@ -0,0 +1,21 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl   Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl
+dnl   This file is free software; the copyright holder
+dnl   gives unlimited permission to copy and/or distribute it,
+dnl   with or without modifications, as long as this notice is preserved.
+dnl
+AC_INIT([TeX Live libs icu dummy], [2009], [tex-k@tug.org])
+AC_PREREQ([2.63])
+AC_CONFIG_SRCDIR([../../../build-aux/missing])
+AC_CONFIG_AUX_DIR([../../../build-aux])
+
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
+
+echo "$ac_configure_args" | sed 's,/icu/dummy,/icu/icu-xetex,g' >../icusubdir-conf.args
+
+AC_CONFIG_FILES([Makefile])
+
+AC_OUTPUT
diff --git a/Build/source/libs/icu-xetex/Doxyfile.in b/Build/source/libs/icu/icu-xetex/Doxyfile.in
index d1acc94912e..d1acc94912e 100644
--- a/Build/source/libs/icu-xetex/Doxyfile.in
+++ b/Build/source/libs/icu/icu-xetex/Doxyfile.in
diff --git a/Build/source/libs/icu-xetex/Makefile.in b/Build/source/libs/icu/icu-xetex/Makefile.in
index 0619cf61fbe..0619cf61fbe 100644
--- a/Build/source/libs/icu-xetex/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/Makefile.in
diff --git a/Build/source/libs/icu-xetex/README b/Build/source/libs/icu/icu-xetex/README
index a9701ac52a9..a9701ac52a9 100644
--- a/Build/source/libs/icu-xetex/README
+++ b/Build/source/libs/icu/icu-xetex/README
diff --git a/Build/source/libs/icu-xetex/aclocal.m4 b/Build/source/libs/icu/icu-xetex/aclocal.m4
index 87ba3677354..87ba3677354 100644
--- a/Build/source/libs/icu-xetex/aclocal.m4
+++ b/Build/source/libs/icu/icu-xetex/aclocal.m4
diff --git a/Build/source/libs/icu-xetex/allinone/allinone.sln b/Build/source/libs/icu/icu-xetex/allinone/allinone.sln
index 5ac771a892a..5ac771a892a 100644
--- a/Build/source/libs/icu-xetex/allinone/allinone.sln
+++ b/Build/source/libs/icu/icu-xetex/allinone/allinone.sln
diff --git a/Build/source/libs/icu-xetex/common/Makefile.in b/Build/source/libs/icu/icu-xetex/common/Makefile.in
index 6efb25907d9..6efb25907d9 100644
--- a/Build/source/libs/icu-xetex/common/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/common/Makefile.in
diff --git a/Build/source/libs/icu-xetex/common/bmpset.cpp b/Build/source/libs/icu/icu-xetex/common/bmpset.cpp
index 24b3545f2dd..24b3545f2dd 100644
--- a/Build/source/libs/icu-xetex/common/bmpset.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/bmpset.cpp
diff --git a/Build/source/libs/icu-xetex/common/bmpset.h b/Build/source/libs/icu/icu-xetex/common/bmpset.h
index d9e08eaa66f..d9e08eaa66f 100644
--- a/Build/source/libs/icu-xetex/common/bmpset.h
+++ b/Build/source/libs/icu/icu-xetex/common/bmpset.h
diff --git a/Build/source/libs/icu-xetex/common/brkeng.cpp b/Build/source/libs/icu/icu-xetex/common/brkeng.cpp
index 2419be5f6c5..2419be5f6c5 100644
--- a/Build/source/libs/icu-xetex/common/brkeng.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/brkeng.cpp
diff --git a/Build/source/libs/icu-xetex/common/brkeng.h b/Build/source/libs/icu/icu-xetex/common/brkeng.h
index 618b2aeea5f..618b2aeea5f 100644
--- a/Build/source/libs/icu-xetex/common/brkeng.h
+++ b/Build/source/libs/icu/icu-xetex/common/brkeng.h
diff --git a/Build/source/libs/icu-xetex/common/brkiter.cpp b/Build/source/libs/icu/icu-xetex/common/brkiter.cpp
index 3bfc13adee2..3bfc13adee2 100644
--- a/Build/source/libs/icu-xetex/common/brkiter.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/brkiter.cpp
diff --git a/Build/source/libs/icu-xetex/common/caniter.cpp b/Build/source/libs/icu/icu-xetex/common/caniter.cpp
index 04d48ba8fce..04d48ba8fce 100644
--- a/Build/source/libs/icu-xetex/common/caniter.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/caniter.cpp
diff --git a/Build/source/libs/icu-xetex/common/chariter.cpp b/Build/source/libs/icu/icu-xetex/common/chariter.cpp
index a598bd65888..a598bd65888 100644
--- a/Build/source/libs/icu-xetex/common/chariter.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/chariter.cpp
diff --git a/Build/source/libs/icu-xetex/common/charstr.h b/Build/source/libs/icu/icu-xetex/common/charstr.h
index 3bb11cbad35..3bb11cbad35 100644
--- a/Build/source/libs/icu-xetex/common/charstr.h
+++ b/Build/source/libs/icu/icu-xetex/common/charstr.h
diff --git a/Build/source/libs/icu-xetex/common/cmemory.c b/Build/source/libs/icu/icu-xetex/common/cmemory.c
index 0f93f36a63d..0f93f36a63d 100644
--- a/Build/source/libs/icu-xetex/common/cmemory.c
+++ b/Build/source/libs/icu/icu-xetex/common/cmemory.c
diff --git a/Build/source/libs/icu-xetex/common/cmemory.h b/Build/source/libs/icu/icu-xetex/common/cmemory.h
index da65d7cebf4..da65d7cebf4 100644
--- a/Build/source/libs/icu-xetex/common/cmemory.h
+++ b/Build/source/libs/icu/icu-xetex/common/cmemory.h
diff --git a/Build/source/libs/icu-xetex/common/common.rc b/Build/source/libs/icu/icu-xetex/common/common.rc
index 331e5423dcc..331e5423dcc 100644
--- a/Build/source/libs/icu-xetex/common/common.rc
+++ b/Build/source/libs/icu/icu-xetex/common/common.rc
diff --git a/Build/source/libs/icu-xetex/common/common.vcproj b/Build/source/libs/icu/icu-xetex/common/common.vcproj
index d8d6510e581..d8d6510e581 100644
--- a/Build/source/libs/icu-xetex/common/common.vcproj
+++ b/Build/source/libs/icu/icu-xetex/common/common.vcproj
diff --git a/Build/source/libs/icu-xetex/common/cpputils.h b/Build/source/libs/icu/icu-xetex/common/cpputils.h
index c1b439c7ff8..c1b439c7ff8 100644
--- a/Build/source/libs/icu-xetex/common/cpputils.h
+++ b/Build/source/libs/icu/icu-xetex/common/cpputils.h
diff --git a/Build/source/libs/icu-xetex/common/cstring.c b/Build/source/libs/icu/icu-xetex/common/cstring.c
index a5b2c6bbccd..a5b2c6bbccd 100644
--- a/Build/source/libs/icu-xetex/common/cstring.c
+++ b/Build/source/libs/icu/icu-xetex/common/cstring.c
diff --git a/Build/source/libs/icu-xetex/common/cstring.h b/Build/source/libs/icu/icu-xetex/common/cstring.h
index 6d2fd0e8159..6d2fd0e8159 100644
--- a/Build/source/libs/icu-xetex/common/cstring.h
+++ b/Build/source/libs/icu/icu-xetex/common/cstring.h
diff --git a/Build/source/libs/icu-xetex/common/cwchar.c b/Build/source/libs/icu/icu-xetex/common/cwchar.c
index 78bb8c59dbb..78bb8c59dbb 100644
--- a/Build/source/libs/icu-xetex/common/cwchar.c
+++ b/Build/source/libs/icu/icu-xetex/common/cwchar.c
diff --git a/Build/source/libs/icu-xetex/common/cwchar.h b/Build/source/libs/icu/icu-xetex/common/cwchar.h
index 2ab36c032e0..2ab36c032e0 100644
--- a/Build/source/libs/icu-xetex/common/cwchar.h
+++ b/Build/source/libs/icu/icu-xetex/common/cwchar.h
diff --git a/Build/source/libs/icu-xetex/common/dictbe.cpp b/Build/source/libs/icu/icu-xetex/common/dictbe.cpp
index a779727ff47..a779727ff47 100644
--- a/Build/source/libs/icu-xetex/common/dictbe.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/dictbe.cpp
diff --git a/Build/source/libs/icu-xetex/common/dictbe.h b/Build/source/libs/icu/icu-xetex/common/dictbe.h
index d6f8b1462d2..d6f8b1462d2 100644
--- a/Build/source/libs/icu-xetex/common/dictbe.h
+++ b/Build/source/libs/icu/icu-xetex/common/dictbe.h
diff --git a/Build/source/libs/icu-xetex/common/hash.h b/Build/source/libs/icu/icu-xetex/common/hash.h
index 375499bf1b8..375499bf1b8 100644
--- a/Build/source/libs/icu-xetex/common/hash.h
+++ b/Build/source/libs/icu/icu-xetex/common/hash.h
diff --git a/Build/source/libs/icu-xetex/common/icucfg.h.in b/Build/source/libs/icu/icu-xetex/common/icucfg.h.in
index 98fc0ff9373..98fc0ff9373 100644
--- a/Build/source/libs/icu-xetex/common/icucfg.h.in
+++ b/Build/source/libs/icu/icu-xetex/common/icucfg.h.in
diff --git a/Build/source/libs/icu-xetex/common/localsvc.h b/Build/source/libs/icu/icu-xetex/common/localsvc.h
index 67e5a8455ae..67e5a8455ae 100644
--- a/Build/source/libs/icu-xetex/common/localsvc.h
+++ b/Build/source/libs/icu/icu-xetex/common/localsvc.h
diff --git a/Build/source/libs/icu-xetex/common/locbased.cpp b/Build/source/libs/icu/icu-xetex/common/locbased.cpp
index e96b9f79f3d..e96b9f79f3d 100644
--- a/Build/source/libs/icu-xetex/common/locbased.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/locbased.cpp
diff --git a/Build/source/libs/icu-xetex/common/locbased.h b/Build/source/libs/icu/icu-xetex/common/locbased.h
index 366b15109e8..366b15109e8 100644
--- a/Build/source/libs/icu-xetex/common/locbased.h
+++ b/Build/source/libs/icu/icu-xetex/common/locbased.h
diff --git a/Build/source/libs/icu-xetex/common/locid.cpp b/Build/source/libs/icu/icu-xetex/common/locid.cpp
index 848a1d7430a..848a1d7430a 100644
--- a/Build/source/libs/icu-xetex/common/locid.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/locid.cpp
diff --git a/Build/source/libs/icu-xetex/common/locmap.c b/Build/source/libs/icu/icu-xetex/common/locmap.c
index 802c6c38c17..802c6c38c17 100644
--- a/Build/source/libs/icu-xetex/common/locmap.c
+++ b/Build/source/libs/icu/icu-xetex/common/locmap.c
diff --git a/Build/source/libs/icu-xetex/common/locmap.h b/Build/source/libs/icu/icu-xetex/common/locmap.h
index 7db06070ec3..7db06070ec3 100644
--- a/Build/source/libs/icu-xetex/common/locmap.h
+++ b/Build/source/libs/icu/icu-xetex/common/locmap.h
diff --git a/Build/source/libs/icu-xetex/common/locutil.cpp b/Build/source/libs/icu/icu-xetex/common/locutil.cpp
index e70b61628cf..e70b61628cf 100644
--- a/Build/source/libs/icu-xetex/common/locutil.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/locutil.cpp
diff --git a/Build/source/libs/icu-xetex/common/locutil.h b/Build/source/libs/icu/icu-xetex/common/locutil.h
index cf64e343d06..cf64e343d06 100644
--- a/Build/source/libs/icu-xetex/common/locutil.h
+++ b/Build/source/libs/icu/icu-xetex/common/locutil.h
diff --git a/Build/source/libs/icu-xetex/common/msvcres.h b/Build/source/libs/icu/icu-xetex/common/msvcres.h
index cad2fe66c41..cad2fe66c41 100644
--- a/Build/source/libs/icu-xetex/common/msvcres.h
+++ b/Build/source/libs/icu/icu-xetex/common/msvcres.h
diff --git a/Build/source/libs/icu-xetex/common/mutex.h b/Build/source/libs/icu/icu-xetex/common/mutex.h
index 26aefbf86b5..26aefbf86b5 100644
--- a/Build/source/libs/icu-xetex/common/mutex.h
+++ b/Build/source/libs/icu/icu-xetex/common/mutex.h
diff --git a/Build/source/libs/icu-xetex/common/normlzr.cpp b/Build/source/libs/icu/icu-xetex/common/normlzr.cpp
index 909bd30b27c..909bd30b27c 100644
--- a/Build/source/libs/icu-xetex/common/normlzr.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/normlzr.cpp
diff --git a/Build/source/libs/icu-xetex/common/parsepos.cpp b/Build/source/libs/icu/icu-xetex/common/parsepos.cpp
index 26f88205129..26f88205129 100644
--- a/Build/source/libs/icu-xetex/common/parsepos.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/parsepos.cpp
diff --git a/Build/source/libs/icu-xetex/common/propname.cpp b/Build/source/libs/icu/icu-xetex/common/propname.cpp
index 55e354044f3..55e354044f3 100644
--- a/Build/source/libs/icu-xetex/common/propname.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/propname.cpp
diff --git a/Build/source/libs/icu-xetex/common/propname.h b/Build/source/libs/icu/icu-xetex/common/propname.h
index a3a77181a2b..a3a77181a2b 100644
--- a/Build/source/libs/icu-xetex/common/propname.h
+++ b/Build/source/libs/icu/icu-xetex/common/propname.h
diff --git a/Build/source/libs/icu-xetex/common/punycode.c b/Build/source/libs/icu/icu-xetex/common/punycode.c
index 5376625e71d..5376625e71d 100644
--- a/Build/source/libs/icu-xetex/common/punycode.c
+++ b/Build/source/libs/icu/icu-xetex/common/punycode.c
diff --git a/Build/source/libs/icu-xetex/common/punycode.h b/Build/source/libs/icu/icu-xetex/common/punycode.h
index 21ae91dc7b3..21ae91dc7b3 100644
--- a/Build/source/libs/icu-xetex/common/punycode.h
+++ b/Build/source/libs/icu/icu-xetex/common/punycode.h
diff --git a/Build/source/libs/icu-xetex/common/putil.c b/Build/source/libs/icu/icu-xetex/common/putil.c
index 825aa575e55..825aa575e55 100644
--- a/Build/source/libs/icu-xetex/common/putil.c
+++ b/Build/source/libs/icu/icu-xetex/common/putil.c
diff --git a/Build/source/libs/icu-xetex/common/putilimp.h b/Build/source/libs/icu/icu-xetex/common/putilimp.h
index c516821e84b..c516821e84b 100644
--- a/Build/source/libs/icu-xetex/common/putilimp.h
+++ b/Build/source/libs/icu/icu-xetex/common/putilimp.h
diff --git a/Build/source/libs/icu-xetex/common/rbbi.cpp b/Build/source/libs/icu/icu-xetex/common/rbbi.cpp
index 41d242fff9c..41d242fff9c 100644
--- a/Build/source/libs/icu-xetex/common/rbbi.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/rbbi.cpp
diff --git a/Build/source/libs/icu-xetex/common/rbbicst.pl b/Build/source/libs/icu/icu-xetex/common/rbbicst.pl
index 98b06cbc27d..98b06cbc27d 100755
--- a/Build/source/libs/icu-xetex/common/rbbicst.pl
+++ b/Build/source/libs/icu/icu-xetex/common/rbbicst.pl
diff --git a/Build/source/libs/icu-xetex/common/rbbidata.cpp b/Build/source/libs/icu/icu-xetex/common/rbbidata.cpp
index 7897b44e7b9..7897b44e7b9 100644
--- a/Build/source/libs/icu-xetex/common/rbbidata.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/rbbidata.cpp
diff --git a/Build/source/libs/icu-xetex/common/rbbidata.h b/Build/source/libs/icu/icu-xetex/common/rbbidata.h
index 7ba1db05d65..7ba1db05d65 100644
--- a/Build/source/libs/icu-xetex/common/rbbidata.h
+++ b/Build/source/libs/icu/icu-xetex/common/rbbidata.h
diff --git a/Build/source/libs/icu-xetex/common/rbbinode.cpp b/Build/source/libs/icu/icu-xetex/common/rbbinode.cpp
index af467b6d064..af467b6d064 100644
--- a/Build/source/libs/icu-xetex/common/rbbinode.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/rbbinode.cpp
diff --git a/Build/source/libs/icu-xetex/common/rbbinode.h b/Build/source/libs/icu/icu-xetex/common/rbbinode.h
index 0cbf6a71abe..0cbf6a71abe 100644
--- a/Build/source/libs/icu-xetex/common/rbbinode.h
+++ b/Build/source/libs/icu/icu-xetex/common/rbbinode.h
diff --git a/Build/source/libs/icu-xetex/common/rbbirb.cpp b/Build/source/libs/icu/icu-xetex/common/rbbirb.cpp
index a3d32c396ff..a3d32c396ff 100644
--- a/Build/source/libs/icu-xetex/common/rbbirb.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/rbbirb.cpp
diff --git a/Build/source/libs/icu-xetex/common/rbbirb.h b/Build/source/libs/icu/icu-xetex/common/rbbirb.h
index d7a5383606c..d7a5383606c 100644
--- a/Build/source/libs/icu-xetex/common/rbbirb.h
+++ b/Build/source/libs/icu/icu-xetex/common/rbbirb.h
diff --git a/Build/source/libs/icu-xetex/common/rbbirpt.h b/Build/source/libs/icu/icu-xetex/common/rbbirpt.h
index deea57b7add..deea57b7add 100644
--- a/Build/source/libs/icu-xetex/common/rbbirpt.h
+++ b/Build/source/libs/icu/icu-xetex/common/rbbirpt.h
diff --git a/Build/source/libs/icu-xetex/common/rbbirpt.txt b/Build/source/libs/icu/icu-xetex/common/rbbirpt.txt
index 8e932a6037a..8e932a6037a 100644
--- a/Build/source/libs/icu-xetex/common/rbbirpt.txt
+++ b/Build/source/libs/icu/icu-xetex/common/rbbirpt.txt
diff --git a/Build/source/libs/icu-xetex/common/rbbiscan.cpp b/Build/source/libs/icu/icu-xetex/common/rbbiscan.cpp
index 2d5c5ec1f02..2d5c5ec1f02 100644
--- a/Build/source/libs/icu-xetex/common/rbbiscan.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/rbbiscan.cpp
diff --git a/Build/source/libs/icu-xetex/common/rbbiscan.h b/Build/source/libs/icu/icu-xetex/common/rbbiscan.h
index cd0bf94a4fb..cd0bf94a4fb 100644
--- a/Build/source/libs/icu-xetex/common/rbbiscan.h
+++ b/Build/source/libs/icu/icu-xetex/common/rbbiscan.h
diff --git a/Build/source/libs/icu-xetex/common/rbbisetb.cpp b/Build/source/libs/icu/icu-xetex/common/rbbisetb.cpp
index 0bbe8e920ee..0bbe8e920ee 100644
--- a/Build/source/libs/icu-xetex/common/rbbisetb.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/rbbisetb.cpp
diff --git a/Build/source/libs/icu-xetex/common/rbbisetb.h b/Build/source/libs/icu/icu-xetex/common/rbbisetb.h
index c8bc1df7786..c8bc1df7786 100644
--- a/Build/source/libs/icu-xetex/common/rbbisetb.h
+++ b/Build/source/libs/icu/icu-xetex/common/rbbisetb.h
diff --git a/Build/source/libs/icu-xetex/common/rbbistbl.cpp b/Build/source/libs/icu/icu-xetex/common/rbbistbl.cpp
index cbcd3815509..cbcd3815509 100644
--- a/Build/source/libs/icu-xetex/common/rbbistbl.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/rbbistbl.cpp
diff --git a/Build/source/libs/icu-xetex/common/rbbitblb.cpp b/Build/source/libs/icu/icu-xetex/common/rbbitblb.cpp
index 78fd1c51d9c..78fd1c51d9c 100644
--- a/Build/source/libs/icu-xetex/common/rbbitblb.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/rbbitblb.cpp
diff --git a/Build/source/libs/icu-xetex/common/rbbitblb.h b/Build/source/libs/icu/icu-xetex/common/rbbitblb.h
index 3805b6752a3..3805b6752a3 100644
--- a/Build/source/libs/icu-xetex/common/rbbitblb.h
+++ b/Build/source/libs/icu/icu-xetex/common/rbbitblb.h
diff --git a/Build/source/libs/icu-xetex/common/resbund.cpp b/Build/source/libs/icu/icu-xetex/common/resbund.cpp
index c4b853293ea..c4b853293ea 100644
--- a/Build/source/libs/icu-xetex/common/resbund.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/resbund.cpp
diff --git a/Build/source/libs/icu-xetex/common/resbund_cnv.cpp b/Build/source/libs/icu/icu-xetex/common/resbund_cnv.cpp
index a18e57e3106..a18e57e3106 100644
--- a/Build/source/libs/icu-xetex/common/resbund_cnv.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/resbund_cnv.cpp
diff --git a/Build/source/libs/icu-xetex/common/ruleiter.cpp b/Build/source/libs/icu/icu-xetex/common/ruleiter.cpp
index b99a831513d..b99a831513d 100644
--- a/Build/source/libs/icu-xetex/common/ruleiter.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/ruleiter.cpp
diff --git a/Build/source/libs/icu-xetex/common/ruleiter.h b/Build/source/libs/icu/icu-xetex/common/ruleiter.h
index cc4e8475fd2..cc4e8475fd2 100644
--- a/Build/source/libs/icu-xetex/common/ruleiter.h
+++ b/Build/source/libs/icu/icu-xetex/common/ruleiter.h
diff --git a/Build/source/libs/icu-xetex/common/schriter.cpp b/Build/source/libs/icu/icu-xetex/common/schriter.cpp
index 29f15f9749e..29f15f9749e 100644
--- a/Build/source/libs/icu-xetex/common/schriter.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/schriter.cpp
diff --git a/Build/source/libs/icu-xetex/common/serv.cpp b/Build/source/libs/icu/icu-xetex/common/serv.cpp
index 8dc15b2c0fa..8dc15b2c0fa 100644
--- a/Build/source/libs/icu-xetex/common/serv.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/serv.cpp
diff --git a/Build/source/libs/icu-xetex/common/serv.h b/Build/source/libs/icu/icu-xetex/common/serv.h
index 2e498fb4a05..2e498fb4a05 100644
--- a/Build/source/libs/icu-xetex/common/serv.h
+++ b/Build/source/libs/icu/icu-xetex/common/serv.h
diff --git a/Build/source/libs/icu-xetex/common/servlk.cpp b/Build/source/libs/icu/icu-xetex/common/servlk.cpp
index b6204148458..b6204148458 100644
--- a/Build/source/libs/icu-xetex/common/servlk.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/servlk.cpp
diff --git a/Build/source/libs/icu-xetex/common/servlkf.cpp b/Build/source/libs/icu/icu-xetex/common/servlkf.cpp
index c455080fdd9..c455080fdd9 100644
--- a/Build/source/libs/icu-xetex/common/servlkf.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/servlkf.cpp
diff --git a/Build/source/libs/icu-xetex/common/servloc.h b/Build/source/libs/icu/icu-xetex/common/servloc.h
index d08b09e36ea..d08b09e36ea 100644
--- a/Build/source/libs/icu-xetex/common/servloc.h
+++ b/Build/source/libs/icu/icu-xetex/common/servloc.h
diff --git a/Build/source/libs/icu-xetex/common/servls.cpp b/Build/source/libs/icu/icu-xetex/common/servls.cpp
index b39e72ed62b..b39e72ed62b 100644
--- a/Build/source/libs/icu-xetex/common/servls.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/servls.cpp
diff --git a/Build/source/libs/icu-xetex/common/servnotf.cpp b/Build/source/libs/icu/icu-xetex/common/servnotf.cpp
index 6adf52ece2e..6adf52ece2e 100644
--- a/Build/source/libs/icu-xetex/common/servnotf.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/servnotf.cpp
diff --git a/Build/source/libs/icu-xetex/common/servnotf.h b/Build/source/libs/icu/icu-xetex/common/servnotf.h
index 19c2d6908ee..19c2d6908ee 100644
--- a/Build/source/libs/icu-xetex/common/servnotf.h
+++ b/Build/source/libs/icu/icu-xetex/common/servnotf.h
diff --git a/Build/source/libs/icu-xetex/common/servrbf.cpp b/Build/source/libs/icu/icu-xetex/common/servrbf.cpp
index 3a0227f76af..3a0227f76af 100644
--- a/Build/source/libs/icu-xetex/common/servrbf.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/servrbf.cpp
diff --git a/Build/source/libs/icu-xetex/common/servslkf.cpp b/Build/source/libs/icu/icu-xetex/common/servslkf.cpp
index b8afaaadc1b..b8afaaadc1b 100644
--- a/Build/source/libs/icu-xetex/common/servslkf.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/servslkf.cpp
diff --git a/Build/source/libs/icu-xetex/common/sprpimpl.h b/Build/source/libs/icu/icu-xetex/common/sprpimpl.h
index 1422cc3acd5..1422cc3acd5 100644
--- a/Build/source/libs/icu-xetex/common/sprpimpl.h
+++ b/Build/source/libs/icu/icu-xetex/common/sprpimpl.h
diff --git a/Build/source/libs/icu-xetex/common/triedict.cpp b/Build/source/libs/icu/icu-xetex/common/triedict.cpp
index bb771f12913..bb771f12913 100644
--- a/Build/source/libs/icu-xetex/common/triedict.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/triedict.cpp
diff --git a/Build/source/libs/icu-xetex/common/triedict.h b/Build/source/libs/icu/icu-xetex/common/triedict.h
index b8796617690..b8796617690 100644
--- a/Build/source/libs/icu-xetex/common/triedict.h
+++ b/Build/source/libs/icu/icu-xetex/common/triedict.h
diff --git a/Build/source/libs/icu-xetex/common/uarrsort.c b/Build/source/libs/icu/icu-xetex/common/uarrsort.c
index 8bc967ce161..8bc967ce161 100644
--- a/Build/source/libs/icu-xetex/common/uarrsort.c
+++ b/Build/source/libs/icu/icu-xetex/common/uarrsort.c
diff --git a/Build/source/libs/icu-xetex/common/uarrsort.h b/Build/source/libs/icu/icu-xetex/common/uarrsort.h
index b9a580c7e22..b9a580c7e22 100644
--- a/Build/source/libs/icu-xetex/common/uarrsort.h
+++ b/Build/source/libs/icu/icu-xetex/common/uarrsort.h
diff --git a/Build/source/libs/icu-xetex/common/uassert.h b/Build/source/libs/icu/icu-xetex/common/uassert.h
index 9b1a14168fb..9b1a14168fb 100644
--- a/Build/source/libs/icu-xetex/common/uassert.h
+++ b/Build/source/libs/icu/icu-xetex/common/uassert.h
diff --git a/Build/source/libs/icu-xetex/common/ubidi.c b/Build/source/libs/icu/icu-xetex/common/ubidi.c
index edd693a0443..edd693a0443 100644
--- a/Build/source/libs/icu-xetex/common/ubidi.c
+++ b/Build/source/libs/icu/icu-xetex/common/ubidi.c
diff --git a/Build/source/libs/icu-xetex/common/ubidi_props.c b/Build/source/libs/icu/icu-xetex/common/ubidi_props.c
index 010a3db05d4..010a3db05d4 100644
--- a/Build/source/libs/icu-xetex/common/ubidi_props.c
+++ b/Build/source/libs/icu/icu-xetex/common/ubidi_props.c
diff --git a/Build/source/libs/icu-xetex/common/ubidi_props.h b/Build/source/libs/icu/icu-xetex/common/ubidi_props.h
index d6da311f9e5..d6da311f9e5 100644
--- a/Build/source/libs/icu-xetex/common/ubidi_props.h
+++ b/Build/source/libs/icu/icu-xetex/common/ubidi_props.h
diff --git a/Build/source/libs/icu-xetex/common/ubidi_props_data.c b/Build/source/libs/icu/icu-xetex/common/ubidi_props_data.c
index ea30b7e0cde..ea30b7e0cde 100644
--- a/Build/source/libs/icu-xetex/common/ubidi_props_data.c
+++ b/Build/source/libs/icu/icu-xetex/common/ubidi_props_data.c
diff --git a/Build/source/libs/icu-xetex/common/ubidiimp.h b/Build/source/libs/icu/icu-xetex/common/ubidiimp.h
index 1f1dcaa04f7..1f1dcaa04f7 100644
--- a/Build/source/libs/icu-xetex/common/ubidiimp.h
+++ b/Build/source/libs/icu/icu-xetex/common/ubidiimp.h
diff --git a/Build/source/libs/icu-xetex/common/ubidiln.c b/Build/source/libs/icu/icu-xetex/common/ubidiln.c
index 8cb079c2c3c..8cb079c2c3c 100644
--- a/Build/source/libs/icu-xetex/common/ubidiln.c
+++ b/Build/source/libs/icu/icu-xetex/common/ubidiln.c
diff --git a/Build/source/libs/icu-xetex/common/ubidiwrt.c b/Build/source/libs/icu/icu-xetex/common/ubidiwrt.c
index 34b13711d2c..34b13711d2c 100644
--- a/Build/source/libs/icu-xetex/common/ubidiwrt.c
+++ b/Build/source/libs/icu/icu-xetex/common/ubidiwrt.c
diff --git a/Build/source/libs/icu-xetex/common/ubrk.cpp b/Build/source/libs/icu/icu-xetex/common/ubrk.cpp
index 89028100283..89028100283 100644
--- a/Build/source/libs/icu-xetex/common/ubrk.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/ubrk.cpp
diff --git a/Build/source/libs/icu-xetex/common/ubrkimpl.h b/Build/source/libs/icu/icu-xetex/common/ubrkimpl.h
index e4909712566..e4909712566 100644
--- a/Build/source/libs/icu-xetex/common/ubrkimpl.h
+++ b/Build/source/libs/icu/icu-xetex/common/ubrkimpl.h
diff --git a/Build/source/libs/icu-xetex/common/ucase.c b/Build/source/libs/icu/icu-xetex/common/ucase.c
index 2352176be15..2352176be15 100644
--- a/Build/source/libs/icu-xetex/common/ucase.c
+++ b/Build/source/libs/icu/icu-xetex/common/ucase.c
diff --git a/Build/source/libs/icu-xetex/common/ucase.h b/Build/source/libs/icu/icu-xetex/common/ucase.h
index 1c29482d8fc..1c29482d8fc 100644
--- a/Build/source/libs/icu-xetex/common/ucase.h
+++ b/Build/source/libs/icu/icu-xetex/common/ucase.h
diff --git a/Build/source/libs/icu-xetex/common/ucase_props_data.c b/Build/source/libs/icu/icu-xetex/common/ucase_props_data.c
index 854e67c3bae..854e67c3bae 100644
--- a/Build/source/libs/icu-xetex/common/ucase_props_data.c
+++ b/Build/source/libs/icu/icu-xetex/common/ucase_props_data.c
diff --git a/Build/source/libs/icu-xetex/common/ucasemap.c b/Build/source/libs/icu/icu-xetex/common/ucasemap.c
index ac20ba313da..ac20ba313da 100644
--- a/Build/source/libs/icu-xetex/common/ucasemap.c
+++ b/Build/source/libs/icu/icu-xetex/common/ucasemap.c
diff --git a/Build/source/libs/icu-xetex/common/ucat.c b/Build/source/libs/icu/icu-xetex/common/ucat.c
index 5f6feb9d1be..5f6feb9d1be 100644
--- a/Build/source/libs/icu-xetex/common/ucat.c
+++ b/Build/source/libs/icu/icu-xetex/common/ucat.c
diff --git a/Build/source/libs/icu-xetex/common/uchar.c b/Build/source/libs/icu/icu-xetex/common/uchar.c
index e71d864bf2a..e71d864bf2a 100644
--- a/Build/source/libs/icu-xetex/common/uchar.c
+++ b/Build/source/libs/icu/icu-xetex/common/uchar.c
diff --git a/Build/source/libs/icu-xetex/common/uchar_props_data.c b/Build/source/libs/icu/icu-xetex/common/uchar_props_data.c
index aedc01dbdca..aedc01dbdca 100644
--- a/Build/source/libs/icu-xetex/common/uchar_props_data.c
+++ b/Build/source/libs/icu/icu-xetex/common/uchar_props_data.c
diff --git a/Build/source/libs/icu-xetex/common/uchriter.cpp b/Build/source/libs/icu/icu-xetex/common/uchriter.cpp
index ae73695a810..ae73695a810 100644
--- a/Build/source/libs/icu-xetex/common/uchriter.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/uchriter.cpp
diff --git a/Build/source/libs/icu-xetex/common/ucln.h b/Build/source/libs/icu/icu-xetex/common/ucln.h
index a4573e93bb2..a4573e93bb2 100644
--- a/Build/source/libs/icu-xetex/common/ucln.h
+++ b/Build/source/libs/icu/icu-xetex/common/ucln.h
diff --git a/Build/source/libs/icu-xetex/common/ucln_cmn.c b/Build/source/libs/icu/icu-xetex/common/ucln_cmn.c
index 452e628bb38..452e628bb38 100644
--- a/Build/source/libs/icu-xetex/common/ucln_cmn.c
+++ b/Build/source/libs/icu/icu-xetex/common/ucln_cmn.c
diff --git a/Build/source/libs/icu-xetex/common/ucln_cmn.h b/Build/source/libs/icu/icu-xetex/common/ucln_cmn.h
index b6f069959cd..b6f069959cd 100644
--- a/Build/source/libs/icu-xetex/common/ucln_cmn.h
+++ b/Build/source/libs/icu/icu-xetex/common/ucln_cmn.h
diff --git a/Build/source/libs/icu-xetex/common/ucmndata.c b/Build/source/libs/icu/icu-xetex/common/ucmndata.c
index 1b12ffbdc94..1b12ffbdc94 100644
--- a/Build/source/libs/icu-xetex/common/ucmndata.c
+++ b/Build/source/libs/icu/icu-xetex/common/ucmndata.c
diff --git a/Build/source/libs/icu-xetex/common/ucmndata.h b/Build/source/libs/icu/icu-xetex/common/ucmndata.h
index 9634ed840f6..9634ed840f6 100644
--- a/Build/source/libs/icu-xetex/common/ucmndata.h
+++ b/Build/source/libs/icu/icu-xetex/common/ucmndata.h
diff --git a/Build/source/libs/icu-xetex/common/ucnv.c b/Build/source/libs/icu/icu-xetex/common/ucnv.c
index 9ef346fb612..9ef346fb612 100644
--- a/Build/source/libs/icu-xetex/common/ucnv.c
+++ b/Build/source/libs/icu/icu-xetex/common/ucnv.c
diff --git a/Build/source/libs/icu-xetex/common/ucnv2022.c b/Build/source/libs/icu/icu-xetex/common/ucnv2022.c
index dff4ba8340d..dff4ba8340d 100644
--- a/Build/source/libs/icu-xetex/common/ucnv2022.c
+++ b/Build/source/libs/icu/icu-xetex/common/ucnv2022.c
diff --git a/Build/source/libs/icu-xetex/common/ucnv_bld.c b/Build/source/libs/icu/icu-xetex/common/ucnv_bld.c
index f627d6b8239..f627d6b8239 100644
--- a/Build/source/libs/icu-xetex/common/ucnv_bld.c
+++ b/Build/source/libs/icu/icu-xetex/common/ucnv_bld.c
diff --git a/Build/source/libs/icu-xetex/common/ucnv_bld.h b/Build/source/libs/icu/icu-xetex/common/ucnv_bld.h
index 75aa4d183ab..75aa4d183ab 100644
--- a/Build/source/libs/icu-xetex/common/ucnv_bld.h
+++ b/Build/source/libs/icu/icu-xetex/common/ucnv_bld.h
diff --git a/Build/source/libs/icu-xetex/common/ucnv_cb.c b/Build/source/libs/icu/icu-xetex/common/ucnv_cb.c
index fa34b658327..fa34b658327 100644
--- a/Build/source/libs/icu-xetex/common/ucnv_cb.c
+++ b/Build/source/libs/icu/icu-xetex/common/ucnv_cb.c
diff --git a/Build/source/libs/icu-xetex/common/ucnv_cnv.c b/Build/source/libs/icu/icu-xetex/common/ucnv_cnv.c
index f8e2f830f91..f8e2f830f91 100644
--- a/Build/source/libs/icu-xetex/common/ucnv_cnv.c
+++ b/Build/source/libs/icu/icu-xetex/common/ucnv_cnv.c
diff --git a/Build/source/libs/icu-xetex/common/ucnv_cnv.h b/Build/source/libs/icu/icu-xetex/common/ucnv_cnv.h
index cf612a754da..cf612a754da 100644
--- a/Build/source/libs/icu-xetex/common/ucnv_cnv.h
+++ b/Build/source/libs/icu/icu-xetex/common/ucnv_cnv.h
diff --git a/Build/source/libs/icu-xetex/common/ucnv_err.c b/Build/source/libs/icu/icu-xetex/common/ucnv_err.c
index 9b2c2852acd..9b2c2852acd 100644
--- a/Build/source/libs/icu-xetex/common/ucnv_err.c
+++ b/Build/source/libs/icu/icu-xetex/common/ucnv_err.c
diff --git a/Build/source/libs/icu-xetex/common/ucnv_ext.c b/Build/source/libs/icu/icu-xetex/common/ucnv_ext.c
index d60127fc89a..d60127fc89a 100644
--- a/Build/source/libs/icu-xetex/common/ucnv_ext.c
+++ b/Build/source/libs/icu/icu-xetex/common/ucnv_ext.c
diff --git a/Build/source/libs/icu-xetex/common/ucnv_ext.h b/Build/source/libs/icu/icu-xetex/common/ucnv_ext.h
index c90fcf6ab8a..c90fcf6ab8a 100644
--- a/Build/source/libs/icu-xetex/common/ucnv_ext.h
+++ b/Build/source/libs/icu/icu-xetex/common/ucnv_ext.h
diff --git a/Build/source/libs/icu-xetex/common/ucnv_imp.h b/Build/source/libs/icu/icu-xetex/common/ucnv_imp.h
index c1f48c0e186..c1f48c0e186 100644
--- a/Build/source/libs/icu-xetex/common/ucnv_imp.h
+++ b/Build/source/libs/icu/icu-xetex/common/ucnv_imp.h
diff --git a/Build/source/libs/icu-xetex/common/ucnv_io.c b/Build/source/libs/icu/icu-xetex/common/ucnv_io.c
index 29876a6714f..29876a6714f 100644
--- a/Build/source/libs/icu-xetex/common/ucnv_io.c
+++ b/Build/source/libs/icu/icu-xetex/common/ucnv_io.c
diff --git a/Build/source/libs/icu-xetex/common/ucnv_io.h b/Build/source/libs/icu/icu-xetex/common/ucnv_io.h
index 060ffd05953..060ffd05953 100644
--- a/Build/source/libs/icu-xetex/common/ucnv_io.h
+++ b/Build/source/libs/icu/icu-xetex/common/ucnv_io.h
diff --git a/Build/source/libs/icu-xetex/common/ucnv_lmb.c b/Build/source/libs/icu/icu-xetex/common/ucnv_lmb.c
index 79606af2894..79606af2894 100644
--- a/Build/source/libs/icu-xetex/common/ucnv_lmb.c
+++ b/Build/source/libs/icu/icu-xetex/common/ucnv_lmb.c
diff --git a/Build/source/libs/icu-xetex/common/ucnv_set.c b/Build/source/libs/icu/icu-xetex/common/ucnv_set.c
index 772e7ed8176..772e7ed8176 100644
--- a/Build/source/libs/icu-xetex/common/ucnv_set.c
+++ b/Build/source/libs/icu/icu-xetex/common/ucnv_set.c
diff --git a/Build/source/libs/icu-xetex/common/ucnv_u16.c b/Build/source/libs/icu/icu-xetex/common/ucnv_u16.c
index 6fc9e2a4493..6fc9e2a4493 100644
--- a/Build/source/libs/icu-xetex/common/ucnv_u16.c
+++ b/Build/source/libs/icu/icu-xetex/common/ucnv_u16.c
diff --git a/Build/source/libs/icu-xetex/common/ucnv_u32.c b/Build/source/libs/icu/icu-xetex/common/ucnv_u32.c
index 034bf9bbcb9..034bf9bbcb9 100644
--- a/Build/source/libs/icu-xetex/common/ucnv_u32.c
+++ b/Build/source/libs/icu/icu-xetex/common/ucnv_u32.c
diff --git a/Build/source/libs/icu-xetex/common/ucnv_u7.c b/Build/source/libs/icu/icu-xetex/common/ucnv_u7.c
index 62e2792922c..62e2792922c 100644
--- a/Build/source/libs/icu-xetex/common/ucnv_u7.c
+++ b/Build/source/libs/icu/icu-xetex/common/ucnv_u7.c
diff --git a/Build/source/libs/icu-xetex/common/ucnv_u8.c b/Build/source/libs/icu/icu-xetex/common/ucnv_u8.c
index 75f554c427b..75f554c427b 100644
--- a/Build/source/libs/icu-xetex/common/ucnv_u8.c
+++ b/Build/source/libs/icu/icu-xetex/common/ucnv_u8.c
diff --git a/Build/source/libs/icu-xetex/common/ucnvbocu.c b/Build/source/libs/icu/icu-xetex/common/ucnvbocu.c
index 8623b114208..8623b114208 100644
--- a/Build/source/libs/icu-xetex/common/ucnvbocu.c
+++ b/Build/source/libs/icu/icu-xetex/common/ucnvbocu.c
diff --git a/Build/source/libs/icu-xetex/common/ucnvdisp.c b/Build/source/libs/icu/icu-xetex/common/ucnvdisp.c
index 4075be66da7..4075be66da7 100644
--- a/Build/source/libs/icu-xetex/common/ucnvdisp.c
+++ b/Build/source/libs/icu/icu-xetex/common/ucnvdisp.c
diff --git a/Build/source/libs/icu-xetex/common/ucnvhz.c b/Build/source/libs/icu/icu-xetex/common/ucnvhz.c
index b94811b8122..b94811b8122 100644
--- a/Build/source/libs/icu-xetex/common/ucnvhz.c
+++ b/Build/source/libs/icu/icu-xetex/common/ucnvhz.c
diff --git a/Build/source/libs/icu-xetex/common/ucnvisci.c b/Build/source/libs/icu/icu-xetex/common/ucnvisci.c
index 34f82c0b0fb..34f82c0b0fb 100644
--- a/Build/source/libs/icu-xetex/common/ucnvisci.c
+++ b/Build/source/libs/icu/icu-xetex/common/ucnvisci.c
diff --git a/Build/source/libs/icu-xetex/common/ucnvlat1.c b/Build/source/libs/icu/icu-xetex/common/ucnvlat1.c
index 4e682dfd1c3..4e682dfd1c3 100644
--- a/Build/source/libs/icu-xetex/common/ucnvlat1.c
+++ b/Build/source/libs/icu/icu-xetex/common/ucnvlat1.c
diff --git a/Build/source/libs/icu-xetex/common/ucnvmbcs.c b/Build/source/libs/icu/icu-xetex/common/ucnvmbcs.c
index 37a7d4b5c50..37a7d4b5c50 100644
--- a/Build/source/libs/icu-xetex/common/ucnvmbcs.c
+++ b/Build/source/libs/icu/icu-xetex/common/ucnvmbcs.c
diff --git a/Build/source/libs/icu-xetex/common/ucnvmbcs.h b/Build/source/libs/icu/icu-xetex/common/ucnvmbcs.h
index 32439cbbebe..32439cbbebe 100644
--- a/Build/source/libs/icu-xetex/common/ucnvmbcs.h
+++ b/Build/source/libs/icu/icu-xetex/common/ucnvmbcs.h
diff --git a/Build/source/libs/icu-xetex/common/ucnvscsu.c b/Build/source/libs/icu/icu-xetex/common/ucnvscsu.c
index 910a4920225..910a4920225 100644
--- a/Build/source/libs/icu-xetex/common/ucnvscsu.c
+++ b/Build/source/libs/icu/icu-xetex/common/ucnvscsu.c
diff --git a/Build/source/libs/icu-xetex/common/ucol_swp.c b/Build/source/libs/icu/icu-xetex/common/ucol_swp.c
index 3b8ac14c30f..3b8ac14c30f 100644
--- a/Build/source/libs/icu-xetex/common/ucol_swp.c
+++ b/Build/source/libs/icu/icu-xetex/common/ucol_swp.c
diff --git a/Build/source/libs/icu-xetex/common/ucol_swp.h b/Build/source/libs/icu/icu-xetex/common/ucol_swp.h
index e0cd6e479bf..e0cd6e479bf 100644
--- a/Build/source/libs/icu-xetex/common/ucol_swp.h
+++ b/Build/source/libs/icu/icu-xetex/common/ucol_swp.h
diff --git a/Build/source/libs/icu-xetex/common/udata.c b/Build/source/libs/icu/icu-xetex/common/udata.c
index d87a23e9dd3..d87a23e9dd3 100644
--- a/Build/source/libs/icu-xetex/common/udata.c
+++ b/Build/source/libs/icu/icu-xetex/common/udata.c
diff --git a/Build/source/libs/icu-xetex/common/udatamem.c b/Build/source/libs/icu/icu-xetex/common/udatamem.c
index b0778a63807..b0778a63807 100644
--- a/Build/source/libs/icu-xetex/common/udatamem.c
+++ b/Build/source/libs/icu/icu-xetex/common/udatamem.c
diff --git a/Build/source/libs/icu-xetex/common/udatamem.h b/Build/source/libs/icu/icu-xetex/common/udatamem.h
index 504883d6aa1..504883d6aa1 100644
--- a/Build/source/libs/icu-xetex/common/udatamem.h
+++ b/Build/source/libs/icu/icu-xetex/common/udatamem.h
diff --git a/Build/source/libs/icu-xetex/common/udataswp.c b/Build/source/libs/icu/icu-xetex/common/udataswp.c
index cacf716610e..cacf716610e 100644
--- a/Build/source/libs/icu-xetex/common/udataswp.c
+++ b/Build/source/libs/icu/icu-xetex/common/udataswp.c
diff --git a/Build/source/libs/icu-xetex/common/udataswp.h b/Build/source/libs/icu/icu-xetex/common/udataswp.h
index 52b99aaa3cf..52b99aaa3cf 100644
--- a/Build/source/libs/icu-xetex/common/udataswp.h
+++ b/Build/source/libs/icu/icu-xetex/common/udataswp.h
diff --git a/Build/source/libs/icu-xetex/common/uenum.c b/Build/source/libs/icu/icu-xetex/common/uenum.c
index 549769c449d..549769c449d 100644
--- a/Build/source/libs/icu-xetex/common/uenum.c
+++ b/Build/source/libs/icu/icu-xetex/common/uenum.c
diff --git a/Build/source/libs/icu-xetex/common/uenumimp.h b/Build/source/libs/icu/icu-xetex/common/uenumimp.h
index 664bc686644..664bc686644 100644
--- a/Build/source/libs/icu-xetex/common/uenumimp.h
+++ b/Build/source/libs/icu/icu-xetex/common/uenumimp.h
diff --git a/Build/source/libs/icu-xetex/common/uhash.c b/Build/source/libs/icu/icu-xetex/common/uhash.c
index fd1a6bfa968..fd1a6bfa968 100644
--- a/Build/source/libs/icu-xetex/common/uhash.c
+++ b/Build/source/libs/icu/icu-xetex/common/uhash.c
diff --git a/Build/source/libs/icu-xetex/common/uhash.h b/Build/source/libs/icu/icu-xetex/common/uhash.h
index b5f3a67db3f..b5f3a67db3f 100644
--- a/Build/source/libs/icu-xetex/common/uhash.h
+++ b/Build/source/libs/icu/icu-xetex/common/uhash.h
diff --git a/Build/source/libs/icu-xetex/common/uhash_us.cpp b/Build/source/libs/icu/icu-xetex/common/uhash_us.cpp
index 0c6a3178904..0c6a3178904 100644
--- a/Build/source/libs/icu-xetex/common/uhash_us.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/uhash_us.cpp
diff --git a/Build/source/libs/icu-xetex/common/uidna.cpp b/Build/source/libs/icu/icu-xetex/common/uidna.cpp
index b86ed26b673..b86ed26b673 100644
--- a/Build/source/libs/icu-xetex/common/uidna.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/uidna.cpp
diff --git a/Build/source/libs/icu-xetex/common/uinit.c b/Build/source/libs/icu/icu-xetex/common/uinit.c
index 1f2c6d6b8f8..1f2c6d6b8f8 100644
--- a/Build/source/libs/icu-xetex/common/uinit.c
+++ b/Build/source/libs/icu/icu-xetex/common/uinit.c
diff --git a/Build/source/libs/icu-xetex/common/uinvchar.c b/Build/source/libs/icu/icu-xetex/common/uinvchar.c
index 325a09d1d1f..325a09d1d1f 100644
--- a/Build/source/libs/icu-xetex/common/uinvchar.c
+++ b/Build/source/libs/icu/icu-xetex/common/uinvchar.c
diff --git a/Build/source/libs/icu-xetex/common/uinvchar.h b/Build/source/libs/icu/icu-xetex/common/uinvchar.h
index 2a333b81ee4..2a333b81ee4 100644
--- a/Build/source/libs/icu-xetex/common/uinvchar.h
+++ b/Build/source/libs/icu/icu-xetex/common/uinvchar.h
diff --git a/Build/source/libs/icu-xetex/common/uiter.cpp b/Build/source/libs/icu/icu-xetex/common/uiter.cpp
index bec7190c635..bec7190c635 100644
--- a/Build/source/libs/icu-xetex/common/uiter.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/uiter.cpp
diff --git a/Build/source/libs/icu-xetex/common/uloc.c b/Build/source/libs/icu/icu-xetex/common/uloc.c
index 309e2d0ea7c..309e2d0ea7c 100644
--- a/Build/source/libs/icu-xetex/common/uloc.c
+++ b/Build/source/libs/icu/icu-xetex/common/uloc.c
diff --git a/Build/source/libs/icu-xetex/common/ulocimp.h b/Build/source/libs/icu/icu-xetex/common/ulocimp.h
index a0ea6aa5fcc..a0ea6aa5fcc 100644
--- a/Build/source/libs/icu-xetex/common/ulocimp.h
+++ b/Build/source/libs/icu/icu-xetex/common/ulocimp.h
diff --git a/Build/source/libs/icu-xetex/common/umapfile.c b/Build/source/libs/icu/icu-xetex/common/umapfile.c
index 3b92bf9dba3..3b92bf9dba3 100644
--- a/Build/source/libs/icu-xetex/common/umapfile.c
+++ b/Build/source/libs/icu/icu-xetex/common/umapfile.c
diff --git a/Build/source/libs/icu-xetex/common/umapfile.h b/Build/source/libs/icu/icu-xetex/common/umapfile.h
index c8c3de9332b..c8c3de9332b 100644
--- a/Build/source/libs/icu-xetex/common/umapfile.h
+++ b/Build/source/libs/icu/icu-xetex/common/umapfile.h
diff --git a/Build/source/libs/icu-xetex/common/umath.c b/Build/source/libs/icu/icu-xetex/common/umath.c
index 4a571143168..4a571143168 100644
--- a/Build/source/libs/icu-xetex/common/umath.c
+++ b/Build/source/libs/icu/icu-xetex/common/umath.c
diff --git a/Build/source/libs/icu-xetex/common/umutex.c b/Build/source/libs/icu/icu-xetex/common/umutex.c
index 22396f5e1d9..22396f5e1d9 100644
--- a/Build/source/libs/icu-xetex/common/umutex.c
+++ b/Build/source/libs/icu/icu-xetex/common/umutex.c
diff --git a/Build/source/libs/icu-xetex/common/umutex.h b/Build/source/libs/icu/icu-xetex/common/umutex.h
index e02ae3363c3..e02ae3363c3 100644
--- a/Build/source/libs/icu-xetex/common/umutex.h
+++ b/Build/source/libs/icu/icu-xetex/common/umutex.h
diff --git a/Build/source/libs/icu-xetex/common/unames.c b/Build/source/libs/icu/icu-xetex/common/unames.c
index c12033fa47d..c12033fa47d 100644
--- a/Build/source/libs/icu-xetex/common/unames.c
+++ b/Build/source/libs/icu/icu-xetex/common/unames.c
diff --git a/Build/source/libs/icu-xetex/common/unicode/brkiter.h b/Build/source/libs/icu/icu-xetex/common/unicode/brkiter.h
index 7df5f140838..7df5f140838 100644
--- a/Build/source/libs/icu-xetex/common/unicode/brkiter.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/brkiter.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/caniter.h b/Build/source/libs/icu/icu-xetex/common/unicode/caniter.h
index 84a65958d16..84a65958d16 100644
--- a/Build/source/libs/icu-xetex/common/unicode/caniter.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/caniter.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/chariter.h b/Build/source/libs/icu/icu-xetex/common/unicode/chariter.h
index 12fc9248a23..12fc9248a23 100644
--- a/Build/source/libs/icu-xetex/common/unicode/chariter.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/chariter.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/dbbi.h b/Build/source/libs/icu/icu-xetex/common/unicode/dbbi.h
index c7984ef862f..c7984ef862f 100644
--- a/Build/source/libs/icu-xetex/common/unicode/dbbi.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/dbbi.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/docmain.h b/Build/source/libs/icu/icu-xetex/common/unicode/docmain.h
index 973ebea7a4a..973ebea7a4a 100644
--- a/Build/source/libs/icu-xetex/common/unicode/docmain.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/docmain.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/locid.h b/Build/source/libs/icu/icu-xetex/common/unicode/locid.h
index a3cc23b31fa..a3cc23b31fa 100644
--- a/Build/source/libs/icu-xetex/common/unicode/locid.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/locid.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/normlzr.h b/Build/source/libs/icu/icu-xetex/common/unicode/normlzr.h
index 7974f1ac4dd..7974f1ac4dd 100644
--- a/Build/source/libs/icu-xetex/common/unicode/normlzr.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/normlzr.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/parseerr.h b/Build/source/libs/icu/icu-xetex/common/unicode/parseerr.h
index 44ff00811de..44ff00811de 100644
--- a/Build/source/libs/icu-xetex/common/unicode/parseerr.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/parseerr.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/parsepos.h b/Build/source/libs/icu/icu-xetex/common/unicode/parsepos.h
index cdf49e04ec2..cdf49e04ec2 100644
--- a/Build/source/libs/icu-xetex/common/unicode/parsepos.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/parsepos.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/platform.h.in b/Build/source/libs/icu/icu-xetex/common/unicode/platform.h.in
index 7abd7ca5e62..7abd7ca5e62 100644
--- a/Build/source/libs/icu-xetex/common/unicode/platform.h.in
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/platform.h.in
diff --git a/Build/source/libs/icu-xetex/common/unicode/ppalmos.h b/Build/source/libs/icu/icu-xetex/common/unicode/ppalmos.h
index c15b2ceae32..c15b2ceae32 100644
--- a/Build/source/libs/icu-xetex/common/unicode/ppalmos.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/ppalmos.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/putil.h b/Build/source/libs/icu/icu-xetex/common/unicode/putil.h
index bdb385c7f2f..bdb385c7f2f 100644
--- a/Build/source/libs/icu-xetex/common/unicode/putil.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/putil.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/pwin32.h b/Build/source/libs/icu/icu-xetex/common/unicode/pwin32.h
index 9aad3530f0a..9aad3530f0a 100644
--- a/Build/source/libs/icu-xetex/common/unicode/pwin32.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/pwin32.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/rbbi.h b/Build/source/libs/icu/icu-xetex/common/unicode/rbbi.h
index 747ea44ce1c..747ea44ce1c 100644
--- a/Build/source/libs/icu-xetex/common/unicode/rbbi.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/rbbi.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/rep.h b/Build/source/libs/icu/icu-xetex/common/unicode/rep.h
index 3fab6fa1272..3fab6fa1272 100644
--- a/Build/source/libs/icu-xetex/common/unicode/rep.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/rep.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/resbund.h b/Build/source/libs/icu/icu-xetex/common/unicode/resbund.h
index 6d6b991361b..6d6b991361b 100644
--- a/Build/source/libs/icu-xetex/common/unicode/resbund.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/resbund.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/schriter.h b/Build/source/libs/icu/icu-xetex/common/unicode/schriter.h
index d0b5e22503c..d0b5e22503c 100644
--- a/Build/source/libs/icu-xetex/common/unicode/schriter.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/schriter.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/strenum.h b/Build/source/libs/icu/icu-xetex/common/unicode/strenum.h
index ce42195a4f2..ce42195a4f2 100644
--- a/Build/source/libs/icu-xetex/common/unicode/strenum.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/strenum.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/symtable.h b/Build/source/libs/icu/icu-xetex/common/unicode/symtable.h
index 428f8bff23e..428f8bff23e 100644
--- a/Build/source/libs/icu-xetex/common/unicode/symtable.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/symtable.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/ubidi.h b/Build/source/libs/icu/icu-xetex/common/unicode/ubidi.h
index 2a487e0c262..2a487e0c262 100644
--- a/Build/source/libs/icu-xetex/common/unicode/ubidi.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/ubidi.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/ubrk.h b/Build/source/libs/icu/icu-xetex/common/unicode/ubrk.h
index d57ba37a1a2..d57ba37a1a2 100644
--- a/Build/source/libs/icu-xetex/common/unicode/ubrk.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/ubrk.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/ucasemap.h b/Build/source/libs/icu/icu-xetex/common/unicode/ucasemap.h
index 9f5880cd6a7..9f5880cd6a7 100644
--- a/Build/source/libs/icu-xetex/common/unicode/ucasemap.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/ucasemap.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/ucat.h b/Build/source/libs/icu/icu-xetex/common/unicode/ucat.h
index ad9f0373a30..ad9f0373a30 100644
--- a/Build/source/libs/icu-xetex/common/unicode/ucat.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/ucat.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/uchar.h b/Build/source/libs/icu/icu-xetex/common/unicode/uchar.h
index b702ec636c2..b702ec636c2 100644
--- a/Build/source/libs/icu-xetex/common/unicode/uchar.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/uchar.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/uchriter.h b/Build/source/libs/icu/icu-xetex/common/unicode/uchriter.h
index 6d5a990f7b7..6d5a990f7b7 100644
--- a/Build/source/libs/icu-xetex/common/unicode/uchriter.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/uchriter.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/uclean.h b/Build/source/libs/icu/icu-xetex/common/unicode/uclean.h
index a13924a0c3f..a13924a0c3f 100644
--- a/Build/source/libs/icu-xetex/common/unicode/uclean.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/uclean.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/ucnv.h b/Build/source/libs/icu/icu-xetex/common/unicode/ucnv.h
index 5e49a83e323..5e49a83e323 100644
--- a/Build/source/libs/icu-xetex/common/unicode/ucnv.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/ucnv.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/ucnv_cb.h b/Build/source/libs/icu/icu-xetex/common/unicode/ucnv_cb.h
index f0e67ba11e0..f0e67ba11e0 100644
--- a/Build/source/libs/icu-xetex/common/unicode/ucnv_cb.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/ucnv_cb.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/ucnv_err.h b/Build/source/libs/icu/icu-xetex/common/unicode/ucnv_err.h
index b0db7bc17c8..b0db7bc17c8 100644
--- a/Build/source/libs/icu-xetex/common/unicode/ucnv_err.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/ucnv_err.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/uconfig.h b/Build/source/libs/icu/icu-xetex/common/unicode/uconfig.h
index 24cfe4518e7..24cfe4518e7 100644
--- a/Build/source/libs/icu-xetex/common/unicode/uconfig.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/uconfig.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/udata.h b/Build/source/libs/icu/icu-xetex/common/unicode/udata.h
index 95348fb954d..95348fb954d 100644
--- a/Build/source/libs/icu-xetex/common/unicode/udata.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/udata.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/udeprctd.h b/Build/source/libs/icu/icu-xetex/common/unicode/udeprctd.h
index 158967efe25..158967efe25 100644
--- a/Build/source/libs/icu-xetex/common/unicode/udeprctd.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/udeprctd.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/udraft.h b/Build/source/libs/icu/icu-xetex/common/unicode/udraft.h
index f869b240eec..f869b240eec 100644
--- a/Build/source/libs/icu-xetex/common/unicode/udraft.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/udraft.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/uenum.h b/Build/source/libs/icu/icu-xetex/common/unicode/uenum.h
index ff9b29997e9..ff9b29997e9 100644
--- a/Build/source/libs/icu-xetex/common/unicode/uenum.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/uenum.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/uidna.h b/Build/source/libs/icu/icu-xetex/common/unicode/uidna.h
index 52aa6e9104e..52aa6e9104e 100644
--- a/Build/source/libs/icu-xetex/common/unicode/uidna.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/uidna.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/uintrnal.h b/Build/source/libs/icu/icu-xetex/common/unicode/uintrnal.h
index dedae51050c..dedae51050c 100644
--- a/Build/source/libs/icu-xetex/common/unicode/uintrnal.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/uintrnal.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/uiter.h b/Build/source/libs/icu/icu-xetex/common/unicode/uiter.h
index 9409f01ee9a..9409f01ee9a 100644
--- a/Build/source/libs/icu-xetex/common/unicode/uiter.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/uiter.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/uloc.h b/Build/source/libs/icu/icu-xetex/common/unicode/uloc.h
index 0d5d3b3b390..0d5d3b3b390 100644
--- a/Build/source/libs/icu-xetex/common/unicode/uloc.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/uloc.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/umachine.h b/Build/source/libs/icu/icu-xetex/common/unicode/umachine.h
index 083f9cf014c..083f9cf014c 100644
--- a/Build/source/libs/icu-xetex/common/unicode/umachine.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/umachine.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/umisc.h b/Build/source/libs/icu/icu-xetex/common/unicode/umisc.h
index d85451fc767..d85451fc767 100644
--- a/Build/source/libs/icu-xetex/common/unicode/umisc.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/umisc.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/unifilt.h b/Build/source/libs/icu/icu-xetex/common/unicode/unifilt.h
index 5bf1ba4e4fd..5bf1ba4e4fd 100644
--- a/Build/source/libs/icu-xetex/common/unicode/unifilt.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/unifilt.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/unifunct.h b/Build/source/libs/icu/icu-xetex/common/unicode/unifunct.h
index 3aa7b0358c0..3aa7b0358c0 100644
--- a/Build/source/libs/icu-xetex/common/unicode/unifunct.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/unifunct.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/unimatch.h b/Build/source/libs/icu/icu-xetex/common/unicode/unimatch.h
index 0dbb14efc20..0dbb14efc20 100644
--- a/Build/source/libs/icu-xetex/common/unicode/unimatch.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/unimatch.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/uniset.h b/Build/source/libs/icu/icu-xetex/common/unicode/uniset.h
index 2d49410c56b..2d49410c56b 100644
--- a/Build/source/libs/icu-xetex/common/unicode/uniset.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/uniset.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/unistr.h b/Build/source/libs/icu/icu-xetex/common/unicode/unistr.h
index 575998e4ed4..575998e4ed4 100644
--- a/Build/source/libs/icu-xetex/common/unicode/unistr.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/unistr.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/unorm.h b/Build/source/libs/icu/icu-xetex/common/unicode/unorm.h
index c22b808aa57..c22b808aa57 100644
--- a/Build/source/libs/icu-xetex/common/unicode/unorm.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/unorm.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/uobject.h b/Build/source/libs/icu/icu-xetex/common/unicode/uobject.h
index 3d8b96ebec2..3d8b96ebec2 100644
--- a/Build/source/libs/icu-xetex/common/unicode/uobject.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/uobject.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/uobslete.h b/Build/source/libs/icu/icu-xetex/common/unicode/uobslete.h
index 489753311cd..489753311cd 100644
--- a/Build/source/libs/icu-xetex/common/unicode/uobslete.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/uobslete.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/urename.h b/Build/source/libs/icu/icu-xetex/common/unicode/urename.h
index 8a2b5c344c8..8a2b5c344c8 100644
--- a/Build/source/libs/icu-xetex/common/unicode/urename.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/urename.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/urep.h b/Build/source/libs/icu/icu-xetex/common/unicode/urep.h
index 57b547c8783..57b547c8783 100644
--- a/Build/source/libs/icu-xetex/common/unicode/urep.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/urep.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/ures.h b/Build/source/libs/icu/icu-xetex/common/unicode/ures.h
index 9cc2e89cf68..9cc2e89cf68 100644
--- a/Build/source/libs/icu-xetex/common/unicode/ures.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/ures.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/uscript.h b/Build/source/libs/icu/icu-xetex/common/unicode/uscript.h
index 6aebc68b3ca..6aebc68b3ca 100644
--- a/Build/source/libs/icu-xetex/common/unicode/uscript.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/uscript.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/uset.h b/Build/source/libs/icu/icu-xetex/common/unicode/uset.h
index 8232ff9f3ec..8232ff9f3ec 100644
--- a/Build/source/libs/icu-xetex/common/unicode/uset.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/uset.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/usetiter.h b/Build/source/libs/icu/icu-xetex/common/unicode/usetiter.h
index defa75cd7ed..defa75cd7ed 100644
--- a/Build/source/libs/icu-xetex/common/unicode/usetiter.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/usetiter.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/ushape.h b/Build/source/libs/icu/icu-xetex/common/unicode/ushape.h
index f165e140310..f165e140310 100644
--- a/Build/source/libs/icu-xetex/common/unicode/ushape.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/ushape.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/usprep.h b/Build/source/libs/icu/icu-xetex/common/unicode/usprep.h
index c7e75a53fab..c7e75a53fab 100644
--- a/Build/source/libs/icu-xetex/common/unicode/usprep.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/usprep.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/ustring.h b/Build/source/libs/icu/icu-xetex/common/unicode/ustring.h
index f6a79478b60..f6a79478b60 100644
--- a/Build/source/libs/icu-xetex/common/unicode/ustring.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/ustring.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/usystem.h b/Build/source/libs/icu/icu-xetex/common/unicode/usystem.h
index 72357b679bd..72357b679bd 100644
--- a/Build/source/libs/icu-xetex/common/unicode/usystem.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/usystem.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/utext.h b/Build/source/libs/icu/icu-xetex/common/unicode/utext.h
index c5e8dd617be..c5e8dd617be 100644
--- a/Build/source/libs/icu-xetex/common/unicode/utext.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/utext.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/utf.h b/Build/source/libs/icu/icu-xetex/common/unicode/utf.h
index 1682283cc6d..1682283cc6d 100644
--- a/Build/source/libs/icu-xetex/common/unicode/utf.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/utf.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/utf16.h b/Build/source/libs/icu/icu-xetex/common/unicode/utf16.h
index 719bc043bb2..719bc043bb2 100644
--- a/Build/source/libs/icu-xetex/common/unicode/utf16.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/utf16.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/utf32.h b/Build/source/libs/icu/icu-xetex/common/unicode/utf32.h
index bf63e69dba0..bf63e69dba0 100644
--- a/Build/source/libs/icu-xetex/common/unicode/utf32.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/utf32.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/utf8.h b/Build/source/libs/icu/icu-xetex/common/unicode/utf8.h
index 1142c44df5f..1142c44df5f 100644
--- a/Build/source/libs/icu-xetex/common/unicode/utf8.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/utf8.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/utf_old.h b/Build/source/libs/icu/icu-xetex/common/unicode/utf_old.h
index 2397889960e..2397889960e 100644
--- a/Build/source/libs/icu-xetex/common/unicode/utf_old.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/utf_old.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/utrace.h b/Build/source/libs/icu/icu-xetex/common/unicode/utrace.h
index 3c8be9f7c34..3c8be9f7c34 100644
--- a/Build/source/libs/icu-xetex/common/unicode/utrace.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/utrace.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/utypes.h b/Build/source/libs/icu/icu-xetex/common/unicode/utypes.h
index 902db881338..902db881338 100644
--- a/Build/source/libs/icu-xetex/common/unicode/utypes.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/utypes.h
diff --git a/Build/source/libs/icu-xetex/common/unicode/uversion.h b/Build/source/libs/icu/icu-xetex/common/unicode/uversion.h
index f026aed8ac6..f026aed8ac6 100644
--- a/Build/source/libs/icu-xetex/common/unicode/uversion.h
+++ b/Build/source/libs/icu/icu-xetex/common/unicode/uversion.h
diff --git a/Build/source/libs/icu-xetex/common/unifilt.cpp b/Build/source/libs/icu/icu-xetex/common/unifilt.cpp
index 69ac3070c79..69ac3070c79 100644
--- a/Build/source/libs/icu-xetex/common/unifilt.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/unifilt.cpp
diff --git a/Build/source/libs/icu-xetex/common/unifunct.cpp b/Build/source/libs/icu/icu-xetex/common/unifunct.cpp
index b834eeed535..b834eeed535 100644
--- a/Build/source/libs/icu-xetex/common/unifunct.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/unifunct.cpp
diff --git a/Build/source/libs/icu-xetex/common/uniset.cpp b/Build/source/libs/icu/icu-xetex/common/uniset.cpp
index 82dcce6cf5c..82dcce6cf5c 100644
--- a/Build/source/libs/icu-xetex/common/uniset.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/uniset.cpp
diff --git a/Build/source/libs/icu-xetex/common/uniset_props.cpp b/Build/source/libs/icu/icu-xetex/common/uniset_props.cpp
index 71dfce9c18a..71dfce9c18a 100644
--- a/Build/source/libs/icu-xetex/common/uniset_props.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/uniset_props.cpp
diff --git a/Build/source/libs/icu-xetex/common/unisetspan.cpp b/Build/source/libs/icu/icu-xetex/common/unisetspan.cpp
index 0e43dfc3f75..0e43dfc3f75 100644
--- a/Build/source/libs/icu-xetex/common/unisetspan.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/unisetspan.cpp
diff --git a/Build/source/libs/icu-xetex/common/unisetspan.h b/Build/source/libs/icu/icu-xetex/common/unisetspan.h
index 2fe0fc30d9f..2fe0fc30d9f 100644
--- a/Build/source/libs/icu-xetex/common/unisetspan.h
+++ b/Build/source/libs/icu/icu-xetex/common/unisetspan.h
diff --git a/Build/source/libs/icu-xetex/common/unistr.cpp b/Build/source/libs/icu/icu-xetex/common/unistr.cpp
index d8bea383267..d8bea383267 100644
--- a/Build/source/libs/icu-xetex/common/unistr.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/unistr.cpp
diff --git a/Build/source/libs/icu-xetex/common/unistr_case.cpp b/Build/source/libs/icu/icu-xetex/common/unistr_case.cpp
index e557b4da7bd..e557b4da7bd 100644
--- a/Build/source/libs/icu-xetex/common/unistr_case.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/unistr_case.cpp
diff --git a/Build/source/libs/icu-xetex/common/unistr_cnv.cpp b/Build/source/libs/icu/icu-xetex/common/unistr_cnv.cpp
index a5166e09d8b..a5166e09d8b 100644
--- a/Build/source/libs/icu-xetex/common/unistr_cnv.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/unistr_cnv.cpp
diff --git a/Build/source/libs/icu-xetex/common/unistr_props.cpp b/Build/source/libs/icu/icu-xetex/common/unistr_props.cpp
index a82408a558a..a82408a558a 100644
--- a/Build/source/libs/icu-xetex/common/unistr_props.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/unistr_props.cpp
diff --git a/Build/source/libs/icu-xetex/common/unorm.cpp b/Build/source/libs/icu/icu-xetex/common/unorm.cpp
index 00ee9ec3e7d..00ee9ec3e7d 100644
--- a/Build/source/libs/icu-xetex/common/unorm.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/unorm.cpp
diff --git a/Build/source/libs/icu-xetex/common/unorm_it.c b/Build/source/libs/icu/icu-xetex/common/unorm_it.c
index cb18cf19af5..cb18cf19af5 100644
--- a/Build/source/libs/icu-xetex/common/unorm_it.c
+++ b/Build/source/libs/icu/icu-xetex/common/unorm_it.c
diff --git a/Build/source/libs/icu-xetex/common/unorm_it.h b/Build/source/libs/icu/icu-xetex/common/unorm_it.h
index 384b7d4469e..384b7d4469e 100644
--- a/Build/source/libs/icu-xetex/common/unorm_it.h
+++ b/Build/source/libs/icu/icu-xetex/common/unorm_it.h
diff --git a/Build/source/libs/icu-xetex/common/unorm_props_data.c b/Build/source/libs/icu/icu-xetex/common/unorm_props_data.c
index 16047b75bdc..16047b75bdc 100644
--- a/Build/source/libs/icu-xetex/common/unorm_props_data.c
+++ b/Build/source/libs/icu/icu-xetex/common/unorm_props_data.c
diff --git a/Build/source/libs/icu-xetex/common/unormcmp.cpp b/Build/source/libs/icu/icu-xetex/common/unormcmp.cpp
index 7b3903d898c..7b3903d898c 100644
--- a/Build/source/libs/icu-xetex/common/unormcmp.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/unormcmp.cpp
diff --git a/Build/source/libs/icu-xetex/common/unormimp.h b/Build/source/libs/icu/icu-xetex/common/unormimp.h
index 498bf0a8b5d..498bf0a8b5d 100644
--- a/Build/source/libs/icu-xetex/common/unormimp.h
+++ b/Build/source/libs/icu/icu-xetex/common/unormimp.h
diff --git a/Build/source/libs/icu-xetex/common/uobject.cpp b/Build/source/libs/icu/icu-xetex/common/uobject.cpp
index 5fc5423880e..5fc5423880e 100644
--- a/Build/source/libs/icu-xetex/common/uobject.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/uobject.cpp
diff --git a/Build/source/libs/icu-xetex/common/uprops.c b/Build/source/libs/icu/icu-xetex/common/uprops.c
index 2fb4e603f88..2fb4e603f88 100644
--- a/Build/source/libs/icu-xetex/common/uprops.c
+++ b/Build/source/libs/icu/icu-xetex/common/uprops.c
diff --git a/Build/source/libs/icu-xetex/common/uprops.h b/Build/source/libs/icu/icu-xetex/common/uprops.h
index c2ecf8d4a96..c2ecf8d4a96 100644
--- a/Build/source/libs/icu-xetex/common/uprops.h
+++ b/Build/source/libs/icu/icu-xetex/common/uprops.h
diff --git a/Build/source/libs/icu-xetex/common/ures_cnv.c b/Build/source/libs/icu/icu-xetex/common/ures_cnv.c
index c9729019df6..c9729019df6 100644
--- a/Build/source/libs/icu-xetex/common/ures_cnv.c
+++ b/Build/source/libs/icu/icu-xetex/common/ures_cnv.c
diff --git a/Build/source/libs/icu-xetex/common/uresbund.c b/Build/source/libs/icu/icu-xetex/common/uresbund.c
index df66876269a..df66876269a 100644
--- a/Build/source/libs/icu-xetex/common/uresbund.c
+++ b/Build/source/libs/icu/icu-xetex/common/uresbund.c
diff --git a/Build/source/libs/icu-xetex/common/uresdata.c b/Build/source/libs/icu/icu-xetex/common/uresdata.c
index 4d947f5ba77..4d947f5ba77 100644
--- a/Build/source/libs/icu-xetex/common/uresdata.c
+++ b/Build/source/libs/icu/icu-xetex/common/uresdata.c
diff --git a/Build/source/libs/icu-xetex/common/uresdata.h b/Build/source/libs/icu/icu-xetex/common/uresdata.h
index 6b8aa8aaede..6b8aa8aaede 100644
--- a/Build/source/libs/icu-xetex/common/uresdata.h
+++ b/Build/source/libs/icu/icu-xetex/common/uresdata.h
diff --git a/Build/source/libs/icu-xetex/common/uresimp.h b/Build/source/libs/icu/icu-xetex/common/uresimp.h
index 31ad6434d97..31ad6434d97 100644
--- a/Build/source/libs/icu-xetex/common/uresimp.h
+++ b/Build/source/libs/icu/icu-xetex/common/uresimp.h
diff --git a/Build/source/libs/icu-xetex/common/usc_impl.c b/Build/source/libs/icu/icu-xetex/common/usc_impl.c
index 1807e1bda48..1807e1bda48 100644
--- a/Build/source/libs/icu-xetex/common/usc_impl.c
+++ b/Build/source/libs/icu/icu-xetex/common/usc_impl.c
diff --git a/Build/source/libs/icu-xetex/common/usc_impl.h b/Build/source/libs/icu/icu-xetex/common/usc_impl.h
index 790a709145b..790a709145b 100644
--- a/Build/source/libs/icu-xetex/common/usc_impl.h
+++ b/Build/source/libs/icu/icu-xetex/common/usc_impl.h
diff --git a/Build/source/libs/icu-xetex/common/uscript.c b/Build/source/libs/icu/icu-xetex/common/uscript.c
index 47ae56daf00..47ae56daf00 100644
--- a/Build/source/libs/icu-xetex/common/uscript.c
+++ b/Build/source/libs/icu/icu-xetex/common/uscript.c
diff --git a/Build/source/libs/icu-xetex/common/uset.cpp b/Build/source/libs/icu/icu-xetex/common/uset.cpp
index add0ee0f6a8..add0ee0f6a8 100644
--- a/Build/source/libs/icu-xetex/common/uset.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/uset.cpp
diff --git a/Build/source/libs/icu-xetex/common/uset_imp.h b/Build/source/libs/icu/icu-xetex/common/uset_imp.h
index d9916f40351..d9916f40351 100644
--- a/Build/source/libs/icu-xetex/common/uset_imp.h
+++ b/Build/source/libs/icu/icu-xetex/common/uset_imp.h
diff --git a/Build/source/libs/icu-xetex/common/uset_props.cpp b/Build/source/libs/icu/icu-xetex/common/uset_props.cpp
index fb607390a2d..fb607390a2d 100644
--- a/Build/source/libs/icu-xetex/common/uset_props.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/uset_props.cpp
diff --git a/Build/source/libs/icu-xetex/common/usetiter.cpp b/Build/source/libs/icu/icu-xetex/common/usetiter.cpp
index 44858ed46bd..44858ed46bd 100644
--- a/Build/source/libs/icu-xetex/common/usetiter.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/usetiter.cpp
diff --git a/Build/source/libs/icu-xetex/common/ushape.c b/Build/source/libs/icu/icu-xetex/common/ushape.c
index 04d0823ce95..04d0823ce95 100644
--- a/Build/source/libs/icu-xetex/common/ushape.c
+++ b/Build/source/libs/icu/icu-xetex/common/ushape.c
diff --git a/Build/source/libs/icu-xetex/common/usprep.cpp b/Build/source/libs/icu/icu-xetex/common/usprep.cpp
index 12d51be3caa..12d51be3caa 100644
--- a/Build/source/libs/icu-xetex/common/usprep.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/usprep.cpp
diff --git a/Build/source/libs/icu-xetex/common/ustack.cpp b/Build/source/libs/icu/icu-xetex/common/ustack.cpp
index 76118bce99a..76118bce99a 100644
--- a/Build/source/libs/icu-xetex/common/ustack.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/ustack.cpp
diff --git a/Build/source/libs/icu-xetex/common/ustr_cnv.c b/Build/source/libs/icu/icu-xetex/common/ustr_cnv.c
index 05d10258658..05d10258658 100644
--- a/Build/source/libs/icu-xetex/common/ustr_cnv.c
+++ b/Build/source/libs/icu/icu-xetex/common/ustr_cnv.c
diff --git a/Build/source/libs/icu-xetex/common/ustr_cnv.h b/Build/source/libs/icu/icu-xetex/common/ustr_cnv.h
index 942b4c64179..942b4c64179 100644
--- a/Build/source/libs/icu-xetex/common/ustr_cnv.h
+++ b/Build/source/libs/icu/icu-xetex/common/ustr_cnv.h
diff --git a/Build/source/libs/icu-xetex/common/ustr_imp.h b/Build/source/libs/icu/icu-xetex/common/ustr_imp.h
index 7c6681682cc..7c6681682cc 100644
--- a/Build/source/libs/icu-xetex/common/ustr_imp.h
+++ b/Build/source/libs/icu/icu-xetex/common/ustr_imp.h
diff --git a/Build/source/libs/icu-xetex/common/ustr_wcs.c b/Build/source/libs/icu/icu-xetex/common/ustr_wcs.c
index 3b0e4b08452..3b0e4b08452 100644
--- a/Build/source/libs/icu-xetex/common/ustr_wcs.c
+++ b/Build/source/libs/icu/icu-xetex/common/ustr_wcs.c
diff --git a/Build/source/libs/icu-xetex/common/ustrcase.c b/Build/source/libs/icu/icu-xetex/common/ustrcase.c
index 402201d8dc0..402201d8dc0 100644
--- a/Build/source/libs/icu-xetex/common/ustrcase.c
+++ b/Build/source/libs/icu/icu-xetex/common/ustrcase.c
diff --git a/Build/source/libs/icu-xetex/common/ustrenum.cpp b/Build/source/libs/icu/icu-xetex/common/ustrenum.cpp
index 0625d31d686..0625d31d686 100644
--- a/Build/source/libs/icu-xetex/common/ustrenum.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/ustrenum.cpp
diff --git a/Build/source/libs/icu-xetex/common/ustrenum.h b/Build/source/libs/icu/icu-xetex/common/ustrenum.h
index 6580ceaca70..6580ceaca70 100644
--- a/Build/source/libs/icu-xetex/common/ustrenum.h
+++ b/Build/source/libs/icu/icu-xetex/common/ustrenum.h
diff --git a/Build/source/libs/icu-xetex/common/ustrfmt.c b/Build/source/libs/icu/icu-xetex/common/ustrfmt.c
index 5e9fb924f8d..5e9fb924f8d 100644
--- a/Build/source/libs/icu-xetex/common/ustrfmt.c
+++ b/Build/source/libs/icu/icu-xetex/common/ustrfmt.c
diff --git a/Build/source/libs/icu-xetex/common/ustrfmt.h b/Build/source/libs/icu/icu-xetex/common/ustrfmt.h
index f1891bdabf5..f1891bdabf5 100644
--- a/Build/source/libs/icu-xetex/common/ustrfmt.h
+++ b/Build/source/libs/icu/icu-xetex/common/ustrfmt.h
diff --git a/Build/source/libs/icu-xetex/common/ustring.c b/Build/source/libs/icu/icu-xetex/common/ustring.c
index 4ccd7a00591..4ccd7a00591 100644
--- a/Build/source/libs/icu-xetex/common/ustring.c
+++ b/Build/source/libs/icu/icu-xetex/common/ustring.c
diff --git a/Build/source/libs/icu-xetex/common/ustrtrns.c b/Build/source/libs/icu/icu-xetex/common/ustrtrns.c
index 5f013c10063..5f013c10063 100644
--- a/Build/source/libs/icu-xetex/common/ustrtrns.c
+++ b/Build/source/libs/icu/icu-xetex/common/ustrtrns.c
diff --git a/Build/source/libs/icu-xetex/common/utext.cpp b/Build/source/libs/icu/icu-xetex/common/utext.cpp
index 2c317200372..2c317200372 100644
--- a/Build/source/libs/icu-xetex/common/utext.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/utext.cpp
diff --git a/Build/source/libs/icu-xetex/common/utf_impl.c b/Build/source/libs/icu/icu-xetex/common/utf_impl.c
index 8f45546bb76..8f45546bb76 100644
--- a/Build/source/libs/icu-xetex/common/utf_impl.c
+++ b/Build/source/libs/icu/icu-xetex/common/utf_impl.c
diff --git a/Build/source/libs/icu-xetex/common/util.cpp b/Build/source/libs/icu/icu-xetex/common/util.cpp
index 6b74ffe5b16..6b74ffe5b16 100644
--- a/Build/source/libs/icu-xetex/common/util.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/util.cpp
diff --git a/Build/source/libs/icu-xetex/common/util.h b/Build/source/libs/icu/icu-xetex/common/util.h
index 37fb56868e4..37fb56868e4 100644
--- a/Build/source/libs/icu-xetex/common/util.h
+++ b/Build/source/libs/icu/icu-xetex/common/util.h
diff --git a/Build/source/libs/icu-xetex/common/util_props.cpp b/Build/source/libs/icu/icu-xetex/common/util_props.cpp
index f91666b4f23..f91666b4f23 100644
--- a/Build/source/libs/icu-xetex/common/util_props.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/util_props.cpp
diff --git a/Build/source/libs/icu-xetex/common/utrace.c b/Build/source/libs/icu/icu-xetex/common/utrace.c
index b2526bb2ca7..b2526bb2ca7 100644
--- a/Build/source/libs/icu-xetex/common/utrace.c
+++ b/Build/source/libs/icu/icu-xetex/common/utrace.c
diff --git a/Build/source/libs/icu-xetex/common/utracimp.h b/Build/source/libs/icu/icu-xetex/common/utracimp.h
index 130bcf34eb8..130bcf34eb8 100644
--- a/Build/source/libs/icu-xetex/common/utracimp.h
+++ b/Build/source/libs/icu/icu-xetex/common/utracimp.h
diff --git a/Build/source/libs/icu-xetex/common/utrie.c b/Build/source/libs/icu/icu-xetex/common/utrie.c
index 812c89db567..812c89db567 100644
--- a/Build/source/libs/icu-xetex/common/utrie.c
+++ b/Build/source/libs/icu/icu-xetex/common/utrie.c
diff --git a/Build/source/libs/icu-xetex/common/utrie.h b/Build/source/libs/icu/icu-xetex/common/utrie.h
index d8d77ac4cbb..d8d77ac4cbb 100644
--- a/Build/source/libs/icu-xetex/common/utrie.h
+++ b/Build/source/libs/icu/icu-xetex/common/utrie.h
diff --git a/Build/source/libs/icu-xetex/common/utypes.c b/Build/source/libs/icu/icu-xetex/common/utypes.c
index 8d180cc0384..8d180cc0384 100644
--- a/Build/source/libs/icu-xetex/common/utypes.c
+++ b/Build/source/libs/icu/icu-xetex/common/utypes.c
diff --git a/Build/source/libs/icu-xetex/common/uvector.cpp b/Build/source/libs/icu/icu-xetex/common/uvector.cpp
index 028ef39f3b4..028ef39f3b4 100644
--- a/Build/source/libs/icu-xetex/common/uvector.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/uvector.cpp
diff --git a/Build/source/libs/icu-xetex/common/uvector.h b/Build/source/libs/icu/icu-xetex/common/uvector.h
index 80a33a19156..80a33a19156 100644
--- a/Build/source/libs/icu-xetex/common/uvector.h
+++ b/Build/source/libs/icu/icu-xetex/common/uvector.h
diff --git a/Build/source/libs/icu-xetex/common/uvectr32.cpp b/Build/source/libs/icu/icu-xetex/common/uvectr32.cpp
index e0dd4cbb325..e0dd4cbb325 100644
--- a/Build/source/libs/icu-xetex/common/uvectr32.cpp
+++ b/Build/source/libs/icu/icu-xetex/common/uvectr32.cpp
diff --git a/Build/source/libs/icu-xetex/common/uvectr32.h b/Build/source/libs/icu/icu-xetex/common/uvectr32.h
index 68a3ee2e2fe..68a3ee2e2fe 100644
--- a/Build/source/libs/icu-xetex/common/uvectr32.h
+++ b/Build/source/libs/icu/icu-xetex/common/uvectr32.h
diff --git a/Build/source/libs/icu-xetex/common/wintz.c b/Build/source/libs/icu/icu-xetex/common/wintz.c
index f64a4ad09ce..f64a4ad09ce 100644
--- a/Build/source/libs/icu-xetex/common/wintz.c
+++ b/Build/source/libs/icu/icu-xetex/common/wintz.c
diff --git a/Build/source/libs/icu-xetex/common/wintz.h b/Build/source/libs/icu/icu-xetex/common/wintz.h
index 0704953f46e..0704953f46e 100644
--- a/Build/source/libs/icu-xetex/common/wintz.h
+++ b/Build/source/libs/icu/icu-xetex/common/wintz.h
diff --git a/Build/source/libs/icu-xetex/config.guess b/Build/source/libs/icu/icu-xetex/config.guess
index 3eda297e705..3eda297e705 100644
--- a/Build/source/libs/icu-xetex/config.guess
+++ b/Build/source/libs/icu/icu-xetex/config.guess
diff --git a/Build/source/libs/icu-xetex/config.sub b/Build/source/libs/icu/icu-xetex/config.sub
index a39437d0158..a39437d0158 100644
--- a/Build/source/libs/icu-xetex/config.sub
+++ b/Build/source/libs/icu/icu-xetex/config.sub
diff --git a/Build/source/libs/icu-xetex/config/Makefile.inc.in b/Build/source/libs/icu/icu-xetex/config/Makefile.inc.in
index 02d22052807..02d22052807 100644
--- a/Build/source/libs/icu-xetex/config/Makefile.inc.in
+++ b/Build/source/libs/icu/icu-xetex/config/Makefile.inc.in
diff --git a/Build/source/libs/icu-xetex/config/icu-config-bottom b/Build/source/libs/icu/icu-xetex/config/icu-config-bottom
index 5c866c5ef81..5c866c5ef81 100644
--- a/Build/source/libs/icu-xetex/config/icu-config-bottom
+++ b/Build/source/libs/icu/icu-xetex/config/icu-config-bottom
diff --git a/Build/source/libs/icu-xetex/config/icu-config-top b/Build/source/libs/icu/icu-xetex/config/icu-config-top
index 874a3ab8976..874a3ab8976 100644
--- a/Build/source/libs/icu-xetex/config/icu-config-top
+++ b/Build/source/libs/icu/icu-xetex/config/icu-config-top
diff --git a/Build/source/libs/icu-xetex/config/icu-config.1.in b/Build/source/libs/icu/icu-xetex/config/icu-config.1.in
index 3492b2879f1..3492b2879f1 100644
--- a/Build/source/libs/icu-xetex/config/icu-config.1.in
+++ b/Build/source/libs/icu/icu-xetex/config/icu-config.1.in
diff --git a/Build/source/libs/icu-xetex/config/make2sh.sed b/Build/source/libs/icu/icu-xetex/config/make2sh.sed
index b9cd370b257..b9cd370b257 100644
--- a/Build/source/libs/icu-xetex/config/make2sh.sed
+++ b/Build/source/libs/icu/icu-xetex/config/make2sh.sed
diff --git a/Build/source/libs/icu-xetex/config/mh-aix-gcc b/Build/source/libs/icu/icu-xetex/config/mh-aix-gcc
index 3f4a0ce1c2c..3f4a0ce1c2c 100644
--- a/Build/source/libs/icu-xetex/config/mh-aix-gcc
+++ b/Build/source/libs/icu/icu-xetex/config/mh-aix-gcc
diff --git a/Build/source/libs/icu-xetex/config/mh-aix-va b/Build/source/libs/icu/icu-xetex/config/mh-aix-va
index 39faf459a0b..39faf459a0b 100644
--- a/Build/source/libs/icu-xetex/config/mh-aix-va
+++ b/Build/source/libs/icu/icu-xetex/config/mh-aix-va
diff --git a/Build/source/libs/icu-xetex/config/mh-alpha-linux-cc b/Build/source/libs/icu/icu-xetex/config/mh-alpha-linux-cc
index f05632edbbd..f05632edbbd 100644
--- a/Build/source/libs/icu-xetex/config/mh-alpha-linux-cc
+++ b/Build/source/libs/icu/icu-xetex/config/mh-alpha-linux-cc
diff --git a/Build/source/libs/icu-xetex/config/mh-alpha-linux-gcc b/Build/source/libs/icu/icu-xetex/config/mh-alpha-linux-gcc
index ee5f9094c04..ee5f9094c04 100644
--- a/Build/source/libs/icu-xetex/config/mh-alpha-linux-gcc
+++ b/Build/source/libs/icu/icu-xetex/config/mh-alpha-linux-gcc
diff --git a/Build/source/libs/icu-xetex/config/mh-alpha-osf b/Build/source/libs/icu/icu-xetex/config/mh-alpha-osf
index bf63259130f..bf63259130f 100644
--- a/Build/source/libs/icu-xetex/config/mh-alpha-osf
+++ b/Build/source/libs/icu/icu-xetex/config/mh-alpha-osf
diff --git a/Build/source/libs/icu-xetex/config/mh-beos b/Build/source/libs/icu/icu-xetex/config/mh-beos
index 0e5691be15e..0e5691be15e 100644
--- a/Build/source/libs/icu-xetex/config/mh-beos
+++ b/Build/source/libs/icu/icu-xetex/config/mh-beos
diff --git a/Build/source/libs/icu-xetex/config/mh-bsd-gcc b/Build/source/libs/icu/icu-xetex/config/mh-bsd-gcc
index 8745b115389..8745b115389 100644
--- a/Build/source/libs/icu-xetex/config/mh-bsd-gcc
+++ b/Build/source/libs/icu/icu-xetex/config/mh-bsd-gcc
diff --git a/Build/source/libs/icu-xetex/config/mh-cygwin b/Build/source/libs/icu/icu-xetex/config/mh-cygwin
index aa58e0e9611..aa58e0e9611 100644
--- a/Build/source/libs/icu-xetex/config/mh-cygwin
+++ b/Build/source/libs/icu/icu-xetex/config/mh-cygwin
diff --git a/Build/source/libs/icu-xetex/config/mh-cygwin-msvc b/Build/source/libs/icu/icu-xetex/config/mh-cygwin-msvc
index 8fc47e12e0f..8fc47e12e0f 100644
--- a/Build/source/libs/icu-xetex/config/mh-cygwin-msvc
+++ b/Build/source/libs/icu/icu-xetex/config/mh-cygwin-msvc
diff --git a/Build/source/libs/icu-xetex/config/mh-darwin b/Build/source/libs/icu/icu-xetex/config/mh-darwin
index 4c095a46aff..4c095a46aff 100644
--- a/Build/source/libs/icu-xetex/config/mh-darwin
+++ b/Build/source/libs/icu/icu-xetex/config/mh-darwin
diff --git a/Build/source/libs/icu-xetex/config/mh-hpux-acc b/Build/source/libs/icu/icu-xetex/config/mh-hpux-acc
index fd5438b1807..fd5438b1807 100644
--- a/Build/source/libs/icu-xetex/config/mh-hpux-acc
+++ b/Build/source/libs/icu/icu-xetex/config/mh-hpux-acc
diff --git a/Build/source/libs/icu-xetex/config/mh-hpux-gcc b/Build/source/libs/icu/icu-xetex/config/mh-hpux-gcc
index a0cebec161e..a0cebec161e 100644
--- a/Build/source/libs/icu-xetex/config/mh-hpux-gcc
+++ b/Build/source/libs/icu/icu-xetex/config/mh-hpux-gcc
diff --git a/Build/source/libs/icu-xetex/config/mh-irix b/Build/source/libs/icu/icu-xetex/config/mh-irix
index 59d4aaf680e..59d4aaf680e 100644
--- a/Build/source/libs/icu-xetex/config/mh-irix
+++ b/Build/source/libs/icu/icu-xetex/config/mh-irix
diff --git a/Build/source/libs/icu-xetex/config/mh-linux b/Build/source/libs/icu/icu-xetex/config/mh-linux
index 056789eb235..056789eb235 100644
--- a/Build/source/libs/icu-xetex/config/mh-linux
+++ b/Build/source/libs/icu/icu-xetex/config/mh-linux
diff --git a/Build/source/libs/icu-xetex/config/mh-linux-va b/Build/source/libs/icu/icu-xetex/config/mh-linux-va
index 5d0730cbfc6..5d0730cbfc6 100644
--- a/Build/source/libs/icu-xetex/config/mh-linux-va
+++ b/Build/source/libs/icu/icu-xetex/config/mh-linux-va
diff --git a/Build/source/libs/icu-xetex/config/mh-mingw b/Build/source/libs/icu/icu-xetex/config/mh-mingw
index c6b3324acc0..c6b3324acc0 100644
--- a/Build/source/libs/icu-xetex/config/mh-mingw
+++ b/Build/source/libs/icu/icu-xetex/config/mh-mingw
diff --git a/Build/source/libs/icu-xetex/config/mh-mpras b/Build/source/libs/icu/icu-xetex/config/mh-mpras
index 175aff3c422..175aff3c422 100644
--- a/Build/source/libs/icu-xetex/config/mh-mpras
+++ b/Build/source/libs/icu/icu-xetex/config/mh-mpras
diff --git a/Build/source/libs/icu-xetex/config/mh-os390 b/Build/source/libs/icu/icu-xetex/config/mh-os390
index b327092ad6b..b327092ad6b 100644
--- a/Build/source/libs/icu-xetex/config/mh-os390
+++ b/Build/source/libs/icu/icu-xetex/config/mh-os390
diff --git a/Build/source/libs/icu-xetex/config/mh-os400 b/Build/source/libs/icu/icu-xetex/config/mh-os400
index b4a8e092e4b..b4a8e092e4b 100644
--- a/Build/source/libs/icu-xetex/config/mh-os400
+++ b/Build/source/libs/icu/icu-xetex/config/mh-os400
diff --git a/Build/source/libs/icu-xetex/config/mh-qnx b/Build/source/libs/icu/icu-xetex/config/mh-qnx
index 3d2b350d8ef..3d2b350d8ef 100644
--- a/Build/source/libs/icu-xetex/config/mh-qnx
+++ b/Build/source/libs/icu/icu-xetex/config/mh-qnx
diff --git a/Build/source/libs/icu-xetex/config/mh-solaris b/Build/source/libs/icu/icu-xetex/config/mh-solaris
index 25bd8214327..25bd8214327 100644
--- a/Build/source/libs/icu-xetex/config/mh-solaris
+++ b/Build/source/libs/icu/icu-xetex/config/mh-solaris
diff --git a/Build/source/libs/icu-xetex/config/mh-solaris-gcc b/Build/source/libs/icu/icu-xetex/config/mh-solaris-gcc
index e59e5c58be7..e59e5c58be7 100644
--- a/Build/source/libs/icu-xetex/config/mh-solaris-gcc
+++ b/Build/source/libs/icu/icu-xetex/config/mh-solaris-gcc
diff --git a/Build/source/libs/icu-xetex/config/mh-unknown b/Build/source/libs/icu/icu-xetex/config/mh-unknown
index e9219be606e..e9219be606e 100644
--- a/Build/source/libs/icu-xetex/config/mh-unknown
+++ b/Build/source/libs/icu/icu-xetex/config/mh-unknown
diff --git a/Build/source/libs/icu-xetex/config/test-icu-config.sh b/Build/source/libs/icu/icu-xetex/config/test-icu-config.sh
index 20dfcc2dbc8..20dfcc2dbc8 100755
--- a/Build/source/libs/icu-xetex/config/test-icu-config.sh
+++ b/Build/source/libs/icu/icu-xetex/config/test-icu-config.sh
diff --git a/Build/source/libs/icu-xetex/configure b/Build/source/libs/icu/icu-xetex/configure
index fcc39b942a3..fcc39b942a3 100755
--- a/Build/source/libs/icu-xetex/configure
+++ b/Build/source/libs/icu/icu-xetex/configure
diff --git a/Build/source/libs/icu-xetex/configure.in b/Build/source/libs/icu/icu-xetex/configure.in
index 30f773ecd8e..30f773ecd8e 100644
--- a/Build/source/libs/icu-xetex/configure.in
+++ b/Build/source/libs/icu/icu-xetex/configure.in
diff --git a/Build/source/libs/icu-xetex/data/Makefile.in b/Build/source/libs/icu/icu-xetex/data/Makefile.in
index a939eda8514..a939eda8514 100644
--- a/Build/source/libs/icu-xetex/data/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/data/Makefile.in
diff --git a/Build/source/libs/icu-xetex/data/brkitr/brkfiles.mk b/Build/source/libs/icu/icu-xetex/data/brkitr/brkfiles.mk
index feee39fa9dd..feee39fa9dd 100644
--- a/Build/source/libs/icu-xetex/data/brkitr/brkfiles.mk
+++ b/Build/source/libs/icu/icu-xetex/data/brkitr/brkfiles.mk
diff --git a/Build/source/libs/icu-xetex/data/brkitr/char.txt b/Build/source/libs/icu/icu-xetex/data/brkitr/char.txt
index 58170ddf698..58170ddf698 100644
--- a/Build/source/libs/icu-xetex/data/brkitr/char.txt
+++ b/Build/source/libs/icu/icu-xetex/data/brkitr/char.txt
diff --git a/Build/source/libs/icu-xetex/data/brkitr/en.txt b/Build/source/libs/icu/icu-xetex/data/brkitr/en.txt
index 959f0190852..959f0190852 100644
--- a/Build/source/libs/icu-xetex/data/brkitr/en.txt
+++ b/Build/source/libs/icu/icu-xetex/data/brkitr/en.txt
diff --git a/Build/source/libs/icu-xetex/data/brkitr/en_US.txt b/Build/source/libs/icu/icu-xetex/data/brkitr/en_US.txt
index ada3f6048ae..ada3f6048ae 100644
--- a/Build/source/libs/icu-xetex/data/brkitr/en_US.txt
+++ b/Build/source/libs/icu/icu-xetex/data/brkitr/en_US.txt
diff --git a/Build/source/libs/icu-xetex/data/brkitr/en_US_POSIX.txt b/Build/source/libs/icu/icu-xetex/data/brkitr/en_US_POSIX.txt
index 80d4affc0f7..80d4affc0f7 100644
--- a/Build/source/libs/icu-xetex/data/brkitr/en_US_POSIX.txt
+++ b/Build/source/libs/icu/icu-xetex/data/brkitr/en_US_POSIX.txt
diff --git a/Build/source/libs/icu-xetex/data/brkitr/ja.txt b/Build/source/libs/icu/icu-xetex/data/brkitr/ja.txt
index b2f69daf326..b2f69daf326 100644
--- a/Build/source/libs/icu-xetex/data/brkitr/ja.txt
+++ b/Build/source/libs/icu/icu-xetex/data/brkitr/ja.txt
diff --git a/Build/source/libs/icu-xetex/data/brkitr/line.txt b/Build/source/libs/icu/icu-xetex/data/brkitr/line.txt
index 31344ceb1b6..31344ceb1b6 100644
--- a/Build/source/libs/icu-xetex/data/brkitr/line.txt
+++ b/Build/source/libs/icu/icu-xetex/data/brkitr/line.txt
diff --git a/Build/source/libs/icu-xetex/data/brkitr/root.txt b/Build/source/libs/icu/icu-xetex/data/brkitr/root.txt
index d3caf9681d3..d3caf9681d3 100644
--- a/Build/source/libs/icu-xetex/data/brkitr/root.txt
+++ b/Build/source/libs/icu/icu-xetex/data/brkitr/root.txt
diff --git a/Build/source/libs/icu-xetex/data/brkitr/sent.txt b/Build/source/libs/icu/icu-xetex/data/brkitr/sent.txt
index 0680525efd1..0680525efd1 100644
--- a/Build/source/libs/icu-xetex/data/brkitr/sent.txt
+++ b/Build/source/libs/icu/icu-xetex/data/brkitr/sent.txt
diff --git a/Build/source/libs/icu-xetex/data/brkitr/thaidict.txt b/Build/source/libs/icu/icu-xetex/data/brkitr/thaidict.txt
index a53125f04a9..a53125f04a9 100644
--- a/Build/source/libs/icu-xetex/data/brkitr/thaidict.txt
+++ b/Build/source/libs/icu/icu-xetex/data/brkitr/thaidict.txt
diff --git a/Build/source/libs/icu-xetex/data/brkitr/title.txt b/Build/source/libs/icu/icu-xetex/data/brkitr/title.txt
index e3f6566c901..e3f6566c901 100644
--- a/Build/source/libs/icu-xetex/data/brkitr/title.txt
+++ b/Build/source/libs/icu/icu-xetex/data/brkitr/title.txt
diff --git a/Build/source/libs/icu-xetex/data/brkitr/word.txt b/Build/source/libs/icu/icu-xetex/data/brkitr/word.txt
index 7257f94a99f..7257f94a99f 100644
--- a/Build/source/libs/icu-xetex/data/brkitr/word.txt
+++ b/Build/source/libs/icu/icu-xetex/data/brkitr/word.txt
diff --git a/Build/source/libs/icu-xetex/data/brkitr/word_POSIX.txt b/Build/source/libs/icu/icu-xetex/data/brkitr/word_POSIX.txt
index c62ce5c975a..c62ce5c975a 100644
--- a/Build/source/libs/icu-xetex/data/brkitr/word_POSIX.txt
+++ b/Build/source/libs/icu/icu-xetex/data/brkitr/word_POSIX.txt
diff --git a/Build/source/libs/icu-xetex/data/brkitr/word_ja.txt b/Build/source/libs/icu/icu-xetex/data/brkitr/word_ja.txt
index a8bafa35ce0..a8bafa35ce0 100644
--- a/Build/source/libs/icu-xetex/data/brkitr/word_ja.txt
+++ b/Build/source/libs/icu/icu-xetex/data/brkitr/word_ja.txt
diff --git a/Build/source/libs/icu-xetex/data/build.xml b/Build/source/libs/icu/icu-xetex/data/build.xml
index 6c6d0c587af..6c6d0c587af 100644
--- a/Build/source/libs/icu-xetex/data/build.xml
+++ b/Build/source/libs/icu/icu-xetex/data/build.xml
diff --git a/Build/source/libs/icu-xetex/data/cldr-icu-readme.txt b/Build/source/libs/icu/icu-xetex/data/cldr-icu-readme.txt
index f80107f29be..f80107f29be 100644
--- a/Build/source/libs/icu-xetex/data/cldr-icu-readme.txt
+++ b/Build/source/libs/icu/icu-xetex/data/cldr-icu-readme.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ar.txt b/Build/source/libs/icu/icu-xetex/data/coll/ar.txt
index 272a615df47..272a615df47 100644
--- a/Build/source/libs/icu-xetex/data/coll/ar.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ar.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ar_AE.txt b/Build/source/libs/icu/icu-xetex/data/coll/ar_AE.txt
index a5143cc0524..a5143cc0524 100644
--- a/Build/source/libs/icu-xetex/data/coll/ar_AE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ar_AE.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ar_BH.txt b/Build/source/libs/icu/icu-xetex/data/coll/ar_BH.txt
index 4b529cde3bf..4b529cde3bf 100644
--- a/Build/source/libs/icu-xetex/data/coll/ar_BH.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ar_BH.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ar_DZ.txt b/Build/source/libs/icu/icu-xetex/data/coll/ar_DZ.txt
index e441d805e26..e441d805e26 100644
--- a/Build/source/libs/icu-xetex/data/coll/ar_DZ.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ar_DZ.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ar_EG.txt b/Build/source/libs/icu/icu-xetex/data/coll/ar_EG.txt
index 90432ada0dd..90432ada0dd 100644
--- a/Build/source/libs/icu-xetex/data/coll/ar_EG.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ar_EG.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ar_IQ.txt b/Build/source/libs/icu/icu-xetex/data/coll/ar_IQ.txt
index a428002e2da..a428002e2da 100644
--- a/Build/source/libs/icu-xetex/data/coll/ar_IQ.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ar_IQ.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ar_JO.txt b/Build/source/libs/icu/icu-xetex/data/coll/ar_JO.txt
index 39c73b45ead..39c73b45ead 100644
--- a/Build/source/libs/icu-xetex/data/coll/ar_JO.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ar_JO.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ar_KW.txt b/Build/source/libs/icu/icu-xetex/data/coll/ar_KW.txt
index fd69c5b7c10..fd69c5b7c10 100644
--- a/Build/source/libs/icu-xetex/data/coll/ar_KW.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ar_KW.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ar_LB.txt b/Build/source/libs/icu/icu-xetex/data/coll/ar_LB.txt
index b194658a7a8..b194658a7a8 100644
--- a/Build/source/libs/icu-xetex/data/coll/ar_LB.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ar_LB.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ar_LY.txt b/Build/source/libs/icu/icu-xetex/data/coll/ar_LY.txt
index 9bf20c3d431..9bf20c3d431 100644
--- a/Build/source/libs/icu-xetex/data/coll/ar_LY.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ar_LY.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ar_MA.txt b/Build/source/libs/icu/icu-xetex/data/coll/ar_MA.txt
index 2ae88329466..2ae88329466 100644
--- a/Build/source/libs/icu-xetex/data/coll/ar_MA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ar_MA.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ar_OM.txt b/Build/source/libs/icu/icu-xetex/data/coll/ar_OM.txt
index 5c33315dacf..5c33315dacf 100644
--- a/Build/source/libs/icu-xetex/data/coll/ar_OM.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ar_OM.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ar_QA.txt b/Build/source/libs/icu/icu-xetex/data/coll/ar_QA.txt
index e063c110e99..e063c110e99 100644
--- a/Build/source/libs/icu-xetex/data/coll/ar_QA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ar_QA.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ar_SA.txt b/Build/source/libs/icu/icu-xetex/data/coll/ar_SA.txt
index 9b3fbaba869..9b3fbaba869 100644
--- a/Build/source/libs/icu-xetex/data/coll/ar_SA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ar_SA.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ar_SD.txt b/Build/source/libs/icu/icu-xetex/data/coll/ar_SD.txt
index 76746ba6fa3..76746ba6fa3 100644
--- a/Build/source/libs/icu-xetex/data/coll/ar_SD.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ar_SD.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ar_SY.txt b/Build/source/libs/icu/icu-xetex/data/coll/ar_SY.txt
index 7f0562f5337..7f0562f5337 100644
--- a/Build/source/libs/icu-xetex/data/coll/ar_SY.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ar_SY.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ar_TN.txt b/Build/source/libs/icu/icu-xetex/data/coll/ar_TN.txt
index 76e4603f39a..76e4603f39a 100644
--- a/Build/source/libs/icu-xetex/data/coll/ar_TN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ar_TN.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ar_YE.txt b/Build/source/libs/icu/icu-xetex/data/coll/ar_YE.txt
index 0ca7be4192e..0ca7be4192e 100644
--- a/Build/source/libs/icu-xetex/data/coll/ar_YE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ar_YE.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/as.txt b/Build/source/libs/icu/icu-xetex/data/coll/as.txt
index da6e21533c8..da6e21533c8 100644
--- a/Build/source/libs/icu-xetex/data/coll/as.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/as.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/as_IN.txt b/Build/source/libs/icu/icu-xetex/data/coll/as_IN.txt
index 48f099dafa7..48f099dafa7 100644
--- a/Build/source/libs/icu-xetex/data/coll/as_IN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/as_IN.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/be.txt b/Build/source/libs/icu/icu-xetex/data/coll/be.txt
index dcaceae1bfc..dcaceae1bfc 100644
--- a/Build/source/libs/icu-xetex/data/coll/be.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/be.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/be_BY.txt b/Build/source/libs/icu/icu-xetex/data/coll/be_BY.txt
index 54233cc0708..54233cc0708 100644
--- a/Build/source/libs/icu-xetex/data/coll/be_BY.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/be_BY.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/bg.txt b/Build/source/libs/icu/icu-xetex/data/coll/bg.txt
index 8c4b7d4f31b..8c4b7d4f31b 100644
--- a/Build/source/libs/icu-xetex/data/coll/bg.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/bg.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/bg_BG.txt b/Build/source/libs/icu/icu-xetex/data/coll/bg_BG.txt
index 0f435702ce8..0f435702ce8 100644
--- a/Build/source/libs/icu-xetex/data/coll/bg_BG.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/bg_BG.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/bn.txt b/Build/source/libs/icu/icu-xetex/data/coll/bn.txt
index 6e2a9a48c7b..6e2a9a48c7b 100644
--- a/Build/source/libs/icu-xetex/data/coll/bn.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/bn.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ca.txt b/Build/source/libs/icu/icu-xetex/data/coll/ca.txt
index f6fd1462693..f6fd1462693 100644
--- a/Build/source/libs/icu-xetex/data/coll/ca.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ca.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ca_ES.txt b/Build/source/libs/icu/icu-xetex/data/coll/ca_ES.txt
index f9c0d4fde1c..f9c0d4fde1c 100644
--- a/Build/source/libs/icu-xetex/data/coll/ca_ES.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ca_ES.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/colfiles.mk b/Build/source/libs/icu/icu-xetex/data/coll/colfiles.mk
index f9d50d33061..f9d50d33061 100644
--- a/Build/source/libs/icu-xetex/data/coll/colfiles.mk
+++ b/Build/source/libs/icu/icu-xetex/data/coll/colfiles.mk
diff --git a/Build/source/libs/icu-xetex/data/coll/collocal.mk b/Build/source/libs/icu/icu-xetex/data/coll/collocal.mk
index a616641f75a..a616641f75a 100644
--- a/Build/source/libs/icu-xetex/data/coll/collocal.mk
+++ b/Build/source/libs/icu/icu-xetex/data/coll/collocal.mk
diff --git a/Build/source/libs/icu-xetex/data/coll/cs.txt b/Build/source/libs/icu/icu-xetex/data/coll/cs.txt
index 3d9358e575e..3d9358e575e 100644
--- a/Build/source/libs/icu-xetex/data/coll/cs.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/cs.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/cs_CZ.txt b/Build/source/libs/icu/icu-xetex/data/coll/cs_CZ.txt
index 83816a900d2..83816a900d2 100644
--- a/Build/source/libs/icu-xetex/data/coll/cs_CZ.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/cs_CZ.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/cy.txt b/Build/source/libs/icu/icu-xetex/data/coll/cy.txt
index 442c2b4bd1e..442c2b4bd1e 100644
--- a/Build/source/libs/icu-xetex/data/coll/cy.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/cy.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/da.txt b/Build/source/libs/icu/icu-xetex/data/coll/da.txt
index 4969b28d30c..4969b28d30c 100644
--- a/Build/source/libs/icu-xetex/data/coll/da.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/da.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/da_DK.txt b/Build/source/libs/icu/icu-xetex/data/coll/da_DK.txt
index 48ba8e78c6e..48ba8e78c6e 100644
--- a/Build/source/libs/icu-xetex/data/coll/da_DK.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/da_DK.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/de.txt b/Build/source/libs/icu/icu-xetex/data/coll/de.txt
index 9e75a32ea8e..9e75a32ea8e 100644
--- a/Build/source/libs/icu-xetex/data/coll/de.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/de.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/de_.txt b/Build/source/libs/icu/icu-xetex/data/coll/de_.txt
index ff87777f020..ff87777f020 100644
--- a/Build/source/libs/icu-xetex/data/coll/de_.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/de_.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/de_AT.txt b/Build/source/libs/icu/icu-xetex/data/coll/de_AT.txt
index 71e368ef101..71e368ef101 100644
--- a/Build/source/libs/icu-xetex/data/coll/de_AT.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/de_AT.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/de_BE.txt b/Build/source/libs/icu/icu-xetex/data/coll/de_BE.txt
index 92a60382eb3..92a60382eb3 100644
--- a/Build/source/libs/icu-xetex/data/coll/de_BE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/de_BE.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/de_CH.txt b/Build/source/libs/icu/icu-xetex/data/coll/de_CH.txt
index ad053885d6d..ad053885d6d 100644
--- a/Build/source/libs/icu-xetex/data/coll/de_CH.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/de_CH.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/de_DE.txt b/Build/source/libs/icu/icu-xetex/data/coll/de_DE.txt
index 666fab6a86a..666fab6a86a 100644
--- a/Build/source/libs/icu-xetex/data/coll/de_DE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/de_DE.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/de_LU.txt b/Build/source/libs/icu/icu-xetex/data/coll/de_LU.txt
index ce749b36926..ce749b36926 100644
--- a/Build/source/libs/icu-xetex/data/coll/de_LU.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/de_LU.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/de__PHONEBOOK.txt b/Build/source/libs/icu/icu-xetex/data/coll/de__PHONEBOOK.txt
index 680f46eb4b4..680f46eb4b4 100644
--- a/Build/source/libs/icu-xetex/data/coll/de__PHONEBOOK.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/de__PHONEBOOK.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/el.txt b/Build/source/libs/icu/icu-xetex/data/coll/el.txt
index 5ed99940176..5ed99940176 100644
--- a/Build/source/libs/icu-xetex/data/coll/el.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/el.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/el_GR.txt b/Build/source/libs/icu/icu-xetex/data/coll/el_GR.txt
index ddd8fa2a6cc..ddd8fa2a6cc 100644
--- a/Build/source/libs/icu-xetex/data/coll/el_GR.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/el_GR.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/en.txt b/Build/source/libs/icu/icu-xetex/data/coll/en.txt
index 75b53452ddf..75b53452ddf 100644
--- a/Build/source/libs/icu-xetex/data/coll/en.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/en.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/en_AU.txt b/Build/source/libs/icu/icu-xetex/data/coll/en_AU.txt
index a92e6aaae06..a92e6aaae06 100644
--- a/Build/source/libs/icu-xetex/data/coll/en_AU.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/en_AU.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/en_BE.txt b/Build/source/libs/icu/icu-xetex/data/coll/en_BE.txt
index 3ed5c46695b..3ed5c46695b 100644
--- a/Build/source/libs/icu-xetex/data/coll/en_BE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/en_BE.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/en_BW.txt b/Build/source/libs/icu/icu-xetex/data/coll/en_BW.txt
index 323fe77b8f7..323fe77b8f7 100644
--- a/Build/source/libs/icu-xetex/data/coll/en_BW.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/en_BW.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/en_CA.txt b/Build/source/libs/icu/icu-xetex/data/coll/en_CA.txt
index df8f1622a07..df8f1622a07 100644
--- a/Build/source/libs/icu-xetex/data/coll/en_CA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/en_CA.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/en_GB.txt b/Build/source/libs/icu/icu-xetex/data/coll/en_GB.txt
index b5c5e5e6ea3..b5c5e5e6ea3 100644
--- a/Build/source/libs/icu-xetex/data/coll/en_GB.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/en_GB.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/en_HK.txt b/Build/source/libs/icu/icu-xetex/data/coll/en_HK.txt
index ca86f64a1bc..ca86f64a1bc 100644
--- a/Build/source/libs/icu-xetex/data/coll/en_HK.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/en_HK.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/en_IE.txt b/Build/source/libs/icu/icu-xetex/data/coll/en_IE.txt
index 8636976666f..8636976666f 100644
--- a/Build/source/libs/icu-xetex/data/coll/en_IE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/en_IE.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/en_IN.txt b/Build/source/libs/icu/icu-xetex/data/coll/en_IN.txt
index d9edfbdd6f0..d9edfbdd6f0 100644
--- a/Build/source/libs/icu-xetex/data/coll/en_IN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/en_IN.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/en_MT.txt b/Build/source/libs/icu/icu-xetex/data/coll/en_MT.txt
index b25883fb2ee..b25883fb2ee 100644
--- a/Build/source/libs/icu-xetex/data/coll/en_MT.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/en_MT.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/en_NZ.txt b/Build/source/libs/icu/icu-xetex/data/coll/en_NZ.txt
index 0ba30d91e3e..0ba30d91e3e 100644
--- a/Build/source/libs/icu-xetex/data/coll/en_NZ.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/en_NZ.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/en_PH.txt b/Build/source/libs/icu/icu-xetex/data/coll/en_PH.txt
index 5096b1f921a..5096b1f921a 100644
--- a/Build/source/libs/icu-xetex/data/coll/en_PH.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/en_PH.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/en_SG.txt b/Build/source/libs/icu/icu-xetex/data/coll/en_SG.txt
index 15e8ba472ab..15e8ba472ab 100644
--- a/Build/source/libs/icu-xetex/data/coll/en_SG.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/en_SG.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/en_US.txt b/Build/source/libs/icu/icu-xetex/data/coll/en_US.txt
index 431fb5a7795..431fb5a7795 100644
--- a/Build/source/libs/icu-xetex/data/coll/en_US.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/en_US.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/en_US_POSIX.txt b/Build/source/libs/icu/icu-xetex/data/coll/en_US_POSIX.txt
index 1d1b2e1676d..1d1b2e1676d 100644
--- a/Build/source/libs/icu-xetex/data/coll/en_US_POSIX.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/en_US_POSIX.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/en_VI.txt b/Build/source/libs/icu/icu-xetex/data/coll/en_VI.txt
index c1598b1a145..c1598b1a145 100644
--- a/Build/source/libs/icu-xetex/data/coll/en_VI.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/en_VI.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/en_ZA.txt b/Build/source/libs/icu/icu-xetex/data/coll/en_ZA.txt
index 20d26a3a46e..20d26a3a46e 100644
--- a/Build/source/libs/icu-xetex/data/coll/en_ZA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/en_ZA.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/en_ZW.txt b/Build/source/libs/icu/icu-xetex/data/coll/en_ZW.txt
index 4a77a024836..4a77a024836 100644
--- a/Build/source/libs/icu-xetex/data/coll/en_ZW.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/en_ZW.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/eo.txt b/Build/source/libs/icu/icu-xetex/data/coll/eo.txt
index 1e42932147b..1e42932147b 100644
--- a/Build/source/libs/icu-xetex/data/coll/eo.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/eo.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/es.txt b/Build/source/libs/icu/icu-xetex/data/coll/es.txt
index 47add4e7401..47add4e7401 100644
--- a/Build/source/libs/icu-xetex/data/coll/es.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/es.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/es_.txt b/Build/source/libs/icu/icu-xetex/data/coll/es_.txt
index d8c02b95dfc..d8c02b95dfc 100644
--- a/Build/source/libs/icu-xetex/data/coll/es_.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/es_.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/es_AR.txt b/Build/source/libs/icu/icu-xetex/data/coll/es_AR.txt
index 01a2525b8ee..01a2525b8ee 100644
--- a/Build/source/libs/icu-xetex/data/coll/es_AR.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/es_AR.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/es_BO.txt b/Build/source/libs/icu/icu-xetex/data/coll/es_BO.txt
index 7de0ce94f3a..7de0ce94f3a 100644
--- a/Build/source/libs/icu-xetex/data/coll/es_BO.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/es_BO.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/es_CL.txt b/Build/source/libs/icu/icu-xetex/data/coll/es_CL.txt
index 88ed89f76a4..88ed89f76a4 100644
--- a/Build/source/libs/icu-xetex/data/coll/es_CL.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/es_CL.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/es_CO.txt b/Build/source/libs/icu/icu-xetex/data/coll/es_CO.txt
index 766192c29ba..766192c29ba 100644
--- a/Build/source/libs/icu-xetex/data/coll/es_CO.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/es_CO.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/es_CR.txt b/Build/source/libs/icu/icu-xetex/data/coll/es_CR.txt
index 7f6180f298f..7f6180f298f 100644
--- a/Build/source/libs/icu-xetex/data/coll/es_CR.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/es_CR.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/es_DO.txt b/Build/source/libs/icu/icu-xetex/data/coll/es_DO.txt
index e603e334166..e603e334166 100644
--- a/Build/source/libs/icu-xetex/data/coll/es_DO.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/es_DO.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/es_EC.txt b/Build/source/libs/icu/icu-xetex/data/coll/es_EC.txt
index 705d2a3afe9..705d2a3afe9 100644
--- a/Build/source/libs/icu-xetex/data/coll/es_EC.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/es_EC.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/es_ES.txt b/Build/source/libs/icu/icu-xetex/data/coll/es_ES.txt
index 9e9beab5c1b..9e9beab5c1b 100644
--- a/Build/source/libs/icu-xetex/data/coll/es_ES.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/es_ES.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/es_GT.txt b/Build/source/libs/icu/icu-xetex/data/coll/es_GT.txt
index d7dd51f8730..d7dd51f8730 100644
--- a/Build/source/libs/icu-xetex/data/coll/es_GT.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/es_GT.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/es_HN.txt b/Build/source/libs/icu/icu-xetex/data/coll/es_HN.txt
index baf05855a07..baf05855a07 100644
--- a/Build/source/libs/icu-xetex/data/coll/es_HN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/es_HN.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/es_MX.txt b/Build/source/libs/icu/icu-xetex/data/coll/es_MX.txt
index ffb8963e804..ffb8963e804 100644
--- a/Build/source/libs/icu-xetex/data/coll/es_MX.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/es_MX.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/es_NI.txt b/Build/source/libs/icu/icu-xetex/data/coll/es_NI.txt
index b5f395de572..b5f395de572 100644
--- a/Build/source/libs/icu-xetex/data/coll/es_NI.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/es_NI.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/es_PA.txt b/Build/source/libs/icu/icu-xetex/data/coll/es_PA.txt
index 76bc3fd0ef1..76bc3fd0ef1 100644
--- a/Build/source/libs/icu-xetex/data/coll/es_PA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/es_PA.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/es_PE.txt b/Build/source/libs/icu/icu-xetex/data/coll/es_PE.txt
index 5543a3b5593..5543a3b5593 100644
--- a/Build/source/libs/icu-xetex/data/coll/es_PE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/es_PE.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/es_PR.txt b/Build/source/libs/icu/icu-xetex/data/coll/es_PR.txt
index 6d04d9fb816..6d04d9fb816 100644
--- a/Build/source/libs/icu-xetex/data/coll/es_PR.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/es_PR.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/es_PY.txt b/Build/source/libs/icu/icu-xetex/data/coll/es_PY.txt
index 8fa920dd7e1..8fa920dd7e1 100644
--- a/Build/source/libs/icu-xetex/data/coll/es_PY.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/es_PY.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/es_SV.txt b/Build/source/libs/icu/icu-xetex/data/coll/es_SV.txt
index 26325762a34..26325762a34 100644
--- a/Build/source/libs/icu-xetex/data/coll/es_SV.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/es_SV.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/es_US.txt b/Build/source/libs/icu/icu-xetex/data/coll/es_US.txt
index 5abeb1ef57d..5abeb1ef57d 100644
--- a/Build/source/libs/icu-xetex/data/coll/es_US.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/es_US.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/es_UY.txt b/Build/source/libs/icu/icu-xetex/data/coll/es_UY.txt
index 9ccfb5d6eda..9ccfb5d6eda 100644
--- a/Build/source/libs/icu-xetex/data/coll/es_UY.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/es_UY.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/es_VE.txt b/Build/source/libs/icu/icu-xetex/data/coll/es_VE.txt
index d7616d4632d..d7616d4632d 100644
--- a/Build/source/libs/icu-xetex/data/coll/es_VE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/es_VE.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/es__TRADITIONAL.txt b/Build/source/libs/icu/icu-xetex/data/coll/es__TRADITIONAL.txt
index 4b2cb68c3a6..4b2cb68c3a6 100644
--- a/Build/source/libs/icu-xetex/data/coll/es__TRADITIONAL.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/es__TRADITIONAL.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/et.txt b/Build/source/libs/icu/icu-xetex/data/coll/et.txt
index ec26b75a08a..ec26b75a08a 100644
--- a/Build/source/libs/icu-xetex/data/coll/et.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/et.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/et_EE.txt b/Build/source/libs/icu/icu-xetex/data/coll/et_EE.txt
index f2caae64be4..f2caae64be4 100644
--- a/Build/source/libs/icu-xetex/data/coll/et_EE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/et_EE.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/fa.txt b/Build/source/libs/icu/icu-xetex/data/coll/fa.txt
index 5bb58d76bec..5bb58d76bec 100644
--- a/Build/source/libs/icu-xetex/data/coll/fa.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/fa.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/fa_AF.txt b/Build/source/libs/icu/icu-xetex/data/coll/fa_AF.txt
index 60b367b1e5c..60b367b1e5c 100644
--- a/Build/source/libs/icu-xetex/data/coll/fa_AF.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/fa_AF.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/fa_IR.txt b/Build/source/libs/icu/icu-xetex/data/coll/fa_IR.txt
index 8ed56b5d4db..8ed56b5d4db 100644
--- a/Build/source/libs/icu-xetex/data/coll/fa_IR.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/fa_IR.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/fi.txt b/Build/source/libs/icu/icu-xetex/data/coll/fi.txt
index 2dbacd30c11..2dbacd30c11 100644
--- a/Build/source/libs/icu-xetex/data/coll/fi.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/fi.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/fi_FI.txt b/Build/source/libs/icu/icu-xetex/data/coll/fi_FI.txt
index b04d2347a25..b04d2347a25 100644
--- a/Build/source/libs/icu-xetex/data/coll/fi_FI.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/fi_FI.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/fo.txt b/Build/source/libs/icu/icu-xetex/data/coll/fo.txt
index 53f12209cd8..53f12209cd8 100644
--- a/Build/source/libs/icu-xetex/data/coll/fo.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/fo.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/fo_FO.txt b/Build/source/libs/icu/icu-xetex/data/coll/fo_FO.txt
index 43f4e25f0f6..43f4e25f0f6 100644
--- a/Build/source/libs/icu-xetex/data/coll/fo_FO.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/fo_FO.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/fr.txt b/Build/source/libs/icu/icu-xetex/data/coll/fr.txt
index fdf94b6c15d..fdf94b6c15d 100644
--- a/Build/source/libs/icu-xetex/data/coll/fr.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/fr.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/fr_BE.txt b/Build/source/libs/icu/icu-xetex/data/coll/fr_BE.txt
index c6b94dc349f..c6b94dc349f 100644
--- a/Build/source/libs/icu-xetex/data/coll/fr_BE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/fr_BE.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/fr_CA.txt b/Build/source/libs/icu/icu-xetex/data/coll/fr_CA.txt
index 738d9857f20..738d9857f20 100644
--- a/Build/source/libs/icu-xetex/data/coll/fr_CA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/fr_CA.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/fr_CH.txt b/Build/source/libs/icu/icu-xetex/data/coll/fr_CH.txt
index afe9b5d5976..afe9b5d5976 100644
--- a/Build/source/libs/icu-xetex/data/coll/fr_CH.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/fr_CH.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/fr_FR.txt b/Build/source/libs/icu/icu-xetex/data/coll/fr_FR.txt
index 8c646082038..8c646082038 100644
--- a/Build/source/libs/icu-xetex/data/coll/fr_FR.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/fr_FR.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/fr_LU.txt b/Build/source/libs/icu/icu-xetex/data/coll/fr_LU.txt
index 3ba946b84d7..3ba946b84d7 100644
--- a/Build/source/libs/icu-xetex/data/coll/fr_LU.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/fr_LU.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ga.txt b/Build/source/libs/icu/icu-xetex/data/coll/ga.txt
index 29f2fe168fd..29f2fe168fd 100644
--- a/Build/source/libs/icu-xetex/data/coll/ga.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ga.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ga_IE.txt b/Build/source/libs/icu/icu-xetex/data/coll/ga_IE.txt
index e7b2fadcbd8..e7b2fadcbd8 100644
--- a/Build/source/libs/icu-xetex/data/coll/ga_IE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ga_IE.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/gu.txt b/Build/source/libs/icu/icu-xetex/data/coll/gu.txt
index ac68566bdfd..ac68566bdfd 100644
--- a/Build/source/libs/icu-xetex/data/coll/gu.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/gu.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/gu_IN.txt b/Build/source/libs/icu/icu-xetex/data/coll/gu_IN.txt
index bfa28a1ea2e..bfa28a1ea2e 100644
--- a/Build/source/libs/icu-xetex/data/coll/gu_IN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/gu_IN.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/haw.txt b/Build/source/libs/icu/icu-xetex/data/coll/haw.txt
index d4c2ca9a886..d4c2ca9a886 100644
--- a/Build/source/libs/icu-xetex/data/coll/haw.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/haw.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/he.txt b/Build/source/libs/icu/icu-xetex/data/coll/he.txt
index 2f1fb571645..2f1fb571645 100644
--- a/Build/source/libs/icu-xetex/data/coll/he.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/he.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/he_IL.txt b/Build/source/libs/icu/icu-xetex/data/coll/he_IL.txt
index 4058bd2e30d..4058bd2e30d 100644
--- a/Build/source/libs/icu-xetex/data/coll/he_IL.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/he_IL.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/hi.txt b/Build/source/libs/icu/icu-xetex/data/coll/hi.txt
index 75d27c0a38d..75d27c0a38d 100644
--- a/Build/source/libs/icu-xetex/data/coll/hi.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/hi.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/hi_.txt b/Build/source/libs/icu/icu-xetex/data/coll/hi_.txt
index f27f6febdbe..f27f6febdbe 100644
--- a/Build/source/libs/icu-xetex/data/coll/hi_.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/hi_.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/hi_IN.txt b/Build/source/libs/icu/icu-xetex/data/coll/hi_IN.txt
index 3249e45558c..3249e45558c 100644
--- a/Build/source/libs/icu-xetex/data/coll/hi_IN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/hi_IN.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/hi__DIRECT.txt b/Build/source/libs/icu/icu-xetex/data/coll/hi__DIRECT.txt
index 70759b22832..70759b22832 100644
--- a/Build/source/libs/icu-xetex/data/coll/hi__DIRECT.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/hi__DIRECT.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/hr.txt b/Build/source/libs/icu/icu-xetex/data/coll/hr.txt
index 096af93f9d3..096af93f9d3 100644
--- a/Build/source/libs/icu-xetex/data/coll/hr.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/hr.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/hr_HR.txt b/Build/source/libs/icu/icu-xetex/data/coll/hr_HR.txt
index 07e232e46bf..07e232e46bf 100644
--- a/Build/source/libs/icu-xetex/data/coll/hr_HR.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/hr_HR.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/hu.txt b/Build/source/libs/icu/icu-xetex/data/coll/hu.txt
index 3660cd9a60c..3660cd9a60c 100644
--- a/Build/source/libs/icu-xetex/data/coll/hu.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/hu.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/hu_HU.txt b/Build/source/libs/icu/icu-xetex/data/coll/hu_HU.txt
index f09f89f028c..f09f89f028c 100644
--- a/Build/source/libs/icu-xetex/data/coll/hu_HU.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/hu_HU.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/id.txt b/Build/source/libs/icu/icu-xetex/data/coll/id.txt
index eeb9c03e5b4..eeb9c03e5b4 100644
--- a/Build/source/libs/icu-xetex/data/coll/id.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/id.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/id_ID.txt b/Build/source/libs/icu/icu-xetex/data/coll/id_ID.txt
index 4b12450922a..4b12450922a 100644
--- a/Build/source/libs/icu-xetex/data/coll/id_ID.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/id_ID.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/in.txt b/Build/source/libs/icu/icu-xetex/data/coll/in.txt
index 9ae97996ced..9ae97996ced 100644
--- a/Build/source/libs/icu-xetex/data/coll/in.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/in.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/in_ID.txt b/Build/source/libs/icu/icu-xetex/data/coll/in_ID.txt
index dbd3b2dfceb..dbd3b2dfceb 100644
--- a/Build/source/libs/icu-xetex/data/coll/in_ID.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/in_ID.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/is.txt b/Build/source/libs/icu/icu-xetex/data/coll/is.txt
index 624ed1cad8c..624ed1cad8c 100644
--- a/Build/source/libs/icu-xetex/data/coll/is.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/is.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/is_IS.txt b/Build/source/libs/icu/icu-xetex/data/coll/is_IS.txt
index 7c1b6e7e68b..7c1b6e7e68b 100644
--- a/Build/source/libs/icu-xetex/data/coll/is_IS.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/is_IS.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/it.txt b/Build/source/libs/icu/icu-xetex/data/coll/it.txt
index ac96c36bc04..ac96c36bc04 100644
--- a/Build/source/libs/icu-xetex/data/coll/it.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/it.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/it_CH.txt b/Build/source/libs/icu/icu-xetex/data/coll/it_CH.txt
index 0ae80424f3d..0ae80424f3d 100644
--- a/Build/source/libs/icu-xetex/data/coll/it_CH.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/it_CH.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/it_IT.txt b/Build/source/libs/icu/icu-xetex/data/coll/it_IT.txt
index 9849b7eb381..9849b7eb381 100644
--- a/Build/source/libs/icu-xetex/data/coll/it_IT.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/it_IT.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/iw.txt b/Build/source/libs/icu/icu-xetex/data/coll/iw.txt
index b5d8273a2a3..b5d8273a2a3 100644
--- a/Build/source/libs/icu-xetex/data/coll/iw.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/iw.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/iw_IL.txt b/Build/source/libs/icu/icu-xetex/data/coll/iw_IL.txt
index 1fcb06a71c7..1fcb06a71c7 100644
--- a/Build/source/libs/icu-xetex/data/coll/iw_IL.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/iw_IL.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ja.txt b/Build/source/libs/icu/icu-xetex/data/coll/ja.txt
index 2cef9801b06..2cef9801b06 100644
--- a/Build/source/libs/icu-xetex/data/coll/ja.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ja.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ja_JP.txt b/Build/source/libs/icu/icu-xetex/data/coll/ja_JP.txt
index 0bd2c88d503..0bd2c88d503 100644
--- a/Build/source/libs/icu-xetex/data/coll/ja_JP.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ja_JP.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/kk.txt b/Build/source/libs/icu/icu-xetex/data/coll/kk.txt
index 760b73bde5e..760b73bde5e 100644
--- a/Build/source/libs/icu-xetex/data/coll/kk.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/kk.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/kk_KZ.txt b/Build/source/libs/icu/icu-xetex/data/coll/kk_KZ.txt
index 96af3dd6719..96af3dd6719 100644
--- a/Build/source/libs/icu-xetex/data/coll/kk_KZ.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/kk_KZ.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/kl.txt b/Build/source/libs/icu/icu-xetex/data/coll/kl.txt
index 6f1e259611a..6f1e259611a 100644
--- a/Build/source/libs/icu-xetex/data/coll/kl.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/kl.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/kl_GL.txt b/Build/source/libs/icu/icu-xetex/data/coll/kl_GL.txt
index 928e4740866..928e4740866 100644
--- a/Build/source/libs/icu-xetex/data/coll/kl_GL.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/kl_GL.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/km.txt b/Build/source/libs/icu/icu-xetex/data/coll/km.txt
index 4f1ff6dd816..4f1ff6dd816 100644
--- a/Build/source/libs/icu-xetex/data/coll/km.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/km.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/kn.txt b/Build/source/libs/icu/icu-xetex/data/coll/kn.txt
index d3ba58315ed..d3ba58315ed 100644
--- a/Build/source/libs/icu-xetex/data/coll/kn.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/kn.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/kn_IN.txt b/Build/source/libs/icu/icu-xetex/data/coll/kn_IN.txt
index a285dbdb401..a285dbdb401 100644
--- a/Build/source/libs/icu-xetex/data/coll/kn_IN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/kn_IN.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ko.txt b/Build/source/libs/icu/icu-xetex/data/coll/ko.txt
index a0e541f9574..a0e541f9574 100644
--- a/Build/source/libs/icu-xetex/data/coll/ko.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ko.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ko_KR.txt b/Build/source/libs/icu/icu-xetex/data/coll/ko_KR.txt
index c296b11b1b8..c296b11b1b8 100644
--- a/Build/source/libs/icu-xetex/data/coll/ko_KR.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ko_KR.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/kok.txt b/Build/source/libs/icu/icu-xetex/data/coll/kok.txt
index dd6d2b4abb1..dd6d2b4abb1 100644
--- a/Build/source/libs/icu-xetex/data/coll/kok.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/kok.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/lt.txt b/Build/source/libs/icu/icu-xetex/data/coll/lt.txt
index e91ecfc513e..e91ecfc513e 100644
--- a/Build/source/libs/icu-xetex/data/coll/lt.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/lt.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/lt_LT.txt b/Build/source/libs/icu/icu-xetex/data/coll/lt_LT.txt
index d8aeb039980..d8aeb039980 100644
--- a/Build/source/libs/icu-xetex/data/coll/lt_LT.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/lt_LT.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/lv.txt b/Build/source/libs/icu/icu-xetex/data/coll/lv.txt
index 2d4fb50b907..2d4fb50b907 100644
--- a/Build/source/libs/icu-xetex/data/coll/lv.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/lv.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/lv_LV.txt b/Build/source/libs/icu/icu-xetex/data/coll/lv_LV.txt
index fdf7fee44de..fdf7fee44de 100644
--- a/Build/source/libs/icu-xetex/data/coll/lv_LV.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/lv_LV.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/mk.txt b/Build/source/libs/icu/icu-xetex/data/coll/mk.txt
index d14cd196494..d14cd196494 100644
--- a/Build/source/libs/icu-xetex/data/coll/mk.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/mk.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/mk_MK.txt b/Build/source/libs/icu/icu-xetex/data/coll/mk_MK.txt
index 3bba7dd0c85..3bba7dd0c85 100644
--- a/Build/source/libs/icu-xetex/data/coll/mk_MK.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/mk_MK.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ml.txt b/Build/source/libs/icu/icu-xetex/data/coll/ml.txt
index 71edb6b0614..71edb6b0614 100644
--- a/Build/source/libs/icu-xetex/data/coll/ml.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ml.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/mr.txt b/Build/source/libs/icu/icu-xetex/data/coll/mr.txt
index a762447d9d8..a762447d9d8 100644
--- a/Build/source/libs/icu-xetex/data/coll/mr.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/mr.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/mr_IN.txt b/Build/source/libs/icu/icu-xetex/data/coll/mr_IN.txt
index 3fb2969fdee..3fb2969fdee 100644
--- a/Build/source/libs/icu-xetex/data/coll/mr_IN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/mr_IN.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ms.txt b/Build/source/libs/icu/icu-xetex/data/coll/ms.txt
index 4000e615dcc..4000e615dcc 100644
--- a/Build/source/libs/icu-xetex/data/coll/ms.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ms.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ms_BN.txt b/Build/source/libs/icu/icu-xetex/data/coll/ms_BN.txt
index f138b011ddb..f138b011ddb 100644
--- a/Build/source/libs/icu-xetex/data/coll/ms_BN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ms_BN.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ms_MY.txt b/Build/source/libs/icu/icu-xetex/data/coll/ms_MY.txt
index e48edfd7e32..e48edfd7e32 100644
--- a/Build/source/libs/icu-xetex/data/coll/ms_MY.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ms_MY.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/mt.txt b/Build/source/libs/icu/icu-xetex/data/coll/mt.txt
index a590540834a..a590540834a 100644
--- a/Build/source/libs/icu-xetex/data/coll/mt.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/mt.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/mt_MT.txt b/Build/source/libs/icu/icu-xetex/data/coll/mt_MT.txt
index 73dac70da3f..73dac70da3f 100644
--- a/Build/source/libs/icu-xetex/data/coll/mt_MT.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/mt_MT.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/nb.txt b/Build/source/libs/icu/icu-xetex/data/coll/nb.txt
index 1fa287b329d..1fa287b329d 100644
--- a/Build/source/libs/icu-xetex/data/coll/nb.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/nb.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/nb_NO.txt b/Build/source/libs/icu/icu-xetex/data/coll/nb_NO.txt
index a86cdee25db..a86cdee25db 100644
--- a/Build/source/libs/icu-xetex/data/coll/nb_NO.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/nb_NO.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/nl.txt b/Build/source/libs/icu/icu-xetex/data/coll/nl.txt
index 47f930fbf40..47f930fbf40 100644
--- a/Build/source/libs/icu-xetex/data/coll/nl.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/nl.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/nl_BE.txt b/Build/source/libs/icu/icu-xetex/data/coll/nl_BE.txt
index eb00b8695bc..eb00b8695bc 100644
--- a/Build/source/libs/icu-xetex/data/coll/nl_BE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/nl_BE.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/nl_NL.txt b/Build/source/libs/icu/icu-xetex/data/coll/nl_NL.txt
index 75a632c3faf..75a632c3faf 100644
--- a/Build/source/libs/icu-xetex/data/coll/nl_NL.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/nl_NL.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/nn.txt b/Build/source/libs/icu/icu-xetex/data/coll/nn.txt
index 38042068739..38042068739 100644
--- a/Build/source/libs/icu-xetex/data/coll/nn.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/nn.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/nn_NO.txt b/Build/source/libs/icu/icu-xetex/data/coll/nn_NO.txt
index 15fdd1043f5..15fdd1043f5 100644
--- a/Build/source/libs/icu-xetex/data/coll/nn_NO.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/nn_NO.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/no.txt b/Build/source/libs/icu/icu-xetex/data/coll/no.txt
index 5b404eb6c59..5b404eb6c59 100644
--- a/Build/source/libs/icu-xetex/data/coll/no.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/no.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/no_NO.txt b/Build/source/libs/icu/icu-xetex/data/coll/no_NO.txt
index 08a5ad5d40d..08a5ad5d40d 100644
--- a/Build/source/libs/icu-xetex/data/coll/no_NO.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/no_NO.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/om.txt b/Build/source/libs/icu/icu-xetex/data/coll/om.txt
index 5e39b265bcf..5e39b265bcf 100644
--- a/Build/source/libs/icu-xetex/data/coll/om.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/om.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/om_ET.txt b/Build/source/libs/icu/icu-xetex/data/coll/om_ET.txt
index a1e0170b2f6..a1e0170b2f6 100644
--- a/Build/source/libs/icu-xetex/data/coll/om_ET.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/om_ET.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/om_KE.txt b/Build/source/libs/icu/icu-xetex/data/coll/om_KE.txt
index c3cee393fee..c3cee393fee 100644
--- a/Build/source/libs/icu-xetex/data/coll/om_KE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/om_KE.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/or.txt b/Build/source/libs/icu/icu-xetex/data/coll/or.txt
index 69cb22c559b..69cb22c559b 100644
--- a/Build/source/libs/icu-xetex/data/coll/or.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/or.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/pa.txt b/Build/source/libs/icu/icu-xetex/data/coll/pa.txt
index 5de61211a7f..5de61211a7f 100644
--- a/Build/source/libs/icu-xetex/data/coll/pa.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/pa.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/pa_IN.txt b/Build/source/libs/icu/icu-xetex/data/coll/pa_IN.txt
index 952ad6e6c2c..952ad6e6c2c 100644
--- a/Build/source/libs/icu-xetex/data/coll/pa_IN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/pa_IN.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/pl.txt b/Build/source/libs/icu/icu-xetex/data/coll/pl.txt
index 32d8549e442..32d8549e442 100644
--- a/Build/source/libs/icu-xetex/data/coll/pl.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/pl.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/pl_PL.txt b/Build/source/libs/icu/icu-xetex/data/coll/pl_PL.txt
index c244a7d0a63..c244a7d0a63 100644
--- a/Build/source/libs/icu-xetex/data/coll/pl_PL.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/pl_PL.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ps.txt b/Build/source/libs/icu/icu-xetex/data/coll/ps.txt
index a9715f511a3..a9715f511a3 100644
--- a/Build/source/libs/icu-xetex/data/coll/ps.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ps.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ps_AF.txt b/Build/source/libs/icu/icu-xetex/data/coll/ps_AF.txt
index c44295ea976..c44295ea976 100644
--- a/Build/source/libs/icu-xetex/data/coll/ps_AF.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ps_AF.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/pt.txt b/Build/source/libs/icu/icu-xetex/data/coll/pt.txt
index b1569459ff3..b1569459ff3 100644
--- a/Build/source/libs/icu-xetex/data/coll/pt.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/pt.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/pt_BR.txt b/Build/source/libs/icu/icu-xetex/data/coll/pt_BR.txt
index 16e01dd3706..16e01dd3706 100644
--- a/Build/source/libs/icu-xetex/data/coll/pt_BR.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/pt_BR.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/pt_PT.txt b/Build/source/libs/icu/icu-xetex/data/coll/pt_PT.txt
index 58426fd8ac3..58426fd8ac3 100644
--- a/Build/source/libs/icu-xetex/data/coll/pt_PT.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/pt_PT.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ro.txt b/Build/source/libs/icu/icu-xetex/data/coll/ro.txt
index 5ff349b860d..5ff349b860d 100644
--- a/Build/source/libs/icu-xetex/data/coll/ro.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ro.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ro_RO.txt b/Build/source/libs/icu/icu-xetex/data/coll/ro_RO.txt
index 964967bf067..964967bf067 100644
--- a/Build/source/libs/icu-xetex/data/coll/ro_RO.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ro_RO.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/root.txt b/Build/source/libs/icu/icu-xetex/data/coll/root.txt
index 12d8efb1c79..12d8efb1c79 100644
--- a/Build/source/libs/icu-xetex/data/coll/root.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/root.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ru.txt b/Build/source/libs/icu/icu-xetex/data/coll/ru.txt
index b8459a0cb8e..b8459a0cb8e 100644
--- a/Build/source/libs/icu-xetex/data/coll/ru.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ru.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ru_RU.txt b/Build/source/libs/icu/icu-xetex/data/coll/ru_RU.txt
index 587c8b5323c..587c8b5323c 100644
--- a/Build/source/libs/icu-xetex/data/coll/ru_RU.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ru_RU.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ru_UA.txt b/Build/source/libs/icu/icu-xetex/data/coll/ru_UA.txt
index 122799e9b0e..122799e9b0e 100644
--- a/Build/source/libs/icu-xetex/data/coll/ru_UA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ru_UA.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/sh.txt b/Build/source/libs/icu/icu-xetex/data/coll/sh.txt
index d93b91eeb57..d93b91eeb57 100644
--- a/Build/source/libs/icu-xetex/data/coll/sh.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/sh.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/sh_BA.txt b/Build/source/libs/icu/icu-xetex/data/coll/sh_BA.txt
index ebb5e7fba37..ebb5e7fba37 100644
--- a/Build/source/libs/icu-xetex/data/coll/sh_BA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/sh_BA.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/sh_YU.txt b/Build/source/libs/icu/icu-xetex/data/coll/sh_YU.txt
index cb6c6268d6a..cb6c6268d6a 100644
--- a/Build/source/libs/icu-xetex/data/coll/sh_YU.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/sh_YU.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/sk.txt b/Build/source/libs/icu/icu-xetex/data/coll/sk.txt
index 58954a8bd4a..58954a8bd4a 100644
--- a/Build/source/libs/icu-xetex/data/coll/sk.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/sk.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/sk_SK.txt b/Build/source/libs/icu/icu-xetex/data/coll/sk_SK.txt
index 32df7a565cf..32df7a565cf 100644
--- a/Build/source/libs/icu-xetex/data/coll/sk_SK.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/sk_SK.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/sl.txt b/Build/source/libs/icu/icu-xetex/data/coll/sl.txt
index 0d30e4c66ce..0d30e4c66ce 100644
--- a/Build/source/libs/icu-xetex/data/coll/sl.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/sl.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/sl_SI.txt b/Build/source/libs/icu/icu-xetex/data/coll/sl_SI.txt
index 1e8f73ab099..1e8f73ab099 100644
--- a/Build/source/libs/icu-xetex/data/coll/sl_SI.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/sl_SI.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/sq.txt b/Build/source/libs/icu/icu-xetex/data/coll/sq.txt
index 0540574048a..0540574048a 100644
--- a/Build/source/libs/icu-xetex/data/coll/sq.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/sq.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/sq_AL.txt b/Build/source/libs/icu/icu-xetex/data/coll/sq_AL.txt
index 2f459a40272..2f459a40272 100644
--- a/Build/source/libs/icu-xetex/data/coll/sq_AL.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/sq_AL.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/sr.txt b/Build/source/libs/icu/icu-xetex/data/coll/sr.txt
index d0f4f1ba403..d0f4f1ba403 100644
--- a/Build/source/libs/icu-xetex/data/coll/sr.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/sr.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/sr_BA.txt b/Build/source/libs/icu/icu-xetex/data/coll/sr_BA.txt
index 99f737e0420..99f737e0420 100644
--- a/Build/source/libs/icu-xetex/data/coll/sr_BA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/sr_BA.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/sr_Cyrl.txt b/Build/source/libs/icu/icu-xetex/data/coll/sr_Cyrl.txt
index f0f48b42895..f0f48b42895 100644
--- a/Build/source/libs/icu-xetex/data/coll/sr_Cyrl.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/sr_Cyrl.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/sr_Cyrl_BA.txt b/Build/source/libs/icu/icu-xetex/data/coll/sr_Cyrl_BA.txt
index 0b101b5b419..0b101b5b419 100644
--- a/Build/source/libs/icu-xetex/data/coll/sr_Cyrl_BA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/sr_Cyrl_BA.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/sr_Cyrl_ME.txt b/Build/source/libs/icu/icu-xetex/data/coll/sr_Cyrl_ME.txt
index 6d4bf833162..6d4bf833162 100644
--- a/Build/source/libs/icu-xetex/data/coll/sr_Cyrl_ME.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/sr_Cyrl_ME.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/sr_Cyrl_RS.txt b/Build/source/libs/icu/icu-xetex/data/coll/sr_Cyrl_RS.txt
index b664eb37689..b664eb37689 100644
--- a/Build/source/libs/icu-xetex/data/coll/sr_Cyrl_RS.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/sr_Cyrl_RS.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/sr_Latn.txt b/Build/source/libs/icu/icu-xetex/data/coll/sr_Latn.txt
index 9c62f47ee28..9c62f47ee28 100644
--- a/Build/source/libs/icu-xetex/data/coll/sr_Latn.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/sr_Latn.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/sr_Latn_BA.txt b/Build/source/libs/icu/icu-xetex/data/coll/sr_Latn_BA.txt
index fe6653db797..fe6653db797 100644
--- a/Build/source/libs/icu-xetex/data/coll/sr_Latn_BA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/sr_Latn_BA.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/sr_Latn_ME.txt b/Build/source/libs/icu/icu-xetex/data/coll/sr_Latn_ME.txt
index cbaf967978a..cbaf967978a 100644
--- a/Build/source/libs/icu-xetex/data/coll/sr_Latn_ME.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/sr_Latn_ME.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/sr_Latn_RS.txt b/Build/source/libs/icu/icu-xetex/data/coll/sr_Latn_RS.txt
index 3d64b0a9c36..3d64b0a9c36 100644
--- a/Build/source/libs/icu-xetex/data/coll/sr_Latn_RS.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/sr_Latn_RS.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/sr_ME.txt b/Build/source/libs/icu/icu-xetex/data/coll/sr_ME.txt
index 22d7a086141..22d7a086141 100644
--- a/Build/source/libs/icu-xetex/data/coll/sr_ME.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/sr_ME.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/sr_RS.txt b/Build/source/libs/icu/icu-xetex/data/coll/sr_RS.txt
index ad78f9c7e44..ad78f9c7e44 100644
--- a/Build/source/libs/icu-xetex/data/coll/sr_RS.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/sr_RS.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/sv.txt b/Build/source/libs/icu/icu-xetex/data/coll/sv.txt
index 848d4f4620d..848d4f4620d 100644
--- a/Build/source/libs/icu-xetex/data/coll/sv.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/sv.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/sv_FI.txt b/Build/source/libs/icu/icu-xetex/data/coll/sv_FI.txt
index db843c9bf86..db843c9bf86 100644
--- a/Build/source/libs/icu-xetex/data/coll/sv_FI.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/sv_FI.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/sv_SE.txt b/Build/source/libs/icu/icu-xetex/data/coll/sv_SE.txt
index 57b5dccfaaf..57b5dccfaaf 100644
--- a/Build/source/libs/icu-xetex/data/coll/sv_SE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/sv_SE.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ta.txt b/Build/source/libs/icu/icu-xetex/data/coll/ta.txt
index ae977077073..ae977077073 100644
--- a/Build/source/libs/icu-xetex/data/coll/ta.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ta.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/ta_IN.txt b/Build/source/libs/icu/icu-xetex/data/coll/ta_IN.txt
index 470548e8929..470548e8929 100644
--- a/Build/source/libs/icu-xetex/data/coll/ta_IN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/ta_IN.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/te.txt b/Build/source/libs/icu/icu-xetex/data/coll/te.txt
index ee4d3e47468..ee4d3e47468 100644
--- a/Build/source/libs/icu-xetex/data/coll/te.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/te.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/te_IN.txt b/Build/source/libs/icu/icu-xetex/data/coll/te_IN.txt
index 1e222d3444d..1e222d3444d 100644
--- a/Build/source/libs/icu-xetex/data/coll/te_IN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/te_IN.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/th.txt b/Build/source/libs/icu/icu-xetex/data/coll/th.txt
index 947fcf86971..947fcf86971 100644
--- a/Build/source/libs/icu-xetex/data/coll/th.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/th.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/th_TH.txt b/Build/source/libs/icu/icu-xetex/data/coll/th_TH.txt
index 5e14d449f95..5e14d449f95 100644
--- a/Build/source/libs/icu-xetex/data/coll/th_TH.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/th_TH.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/tr.txt b/Build/source/libs/icu/icu-xetex/data/coll/tr.txt
index 4931bb88c61..4931bb88c61 100644
--- a/Build/source/libs/icu-xetex/data/coll/tr.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/tr.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/tr_TR.txt b/Build/source/libs/icu/icu-xetex/data/coll/tr_TR.txt
index 029b4e36373..029b4e36373 100644
--- a/Build/source/libs/icu-xetex/data/coll/tr_TR.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/tr_TR.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/uk.txt b/Build/source/libs/icu/icu-xetex/data/coll/uk.txt
index 3fb750a5cb7..3fb750a5cb7 100644
--- a/Build/source/libs/icu-xetex/data/coll/uk.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/uk.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/uk_UA.txt b/Build/source/libs/icu/icu-xetex/data/coll/uk_UA.txt
index cf4124b34a3..cf4124b34a3 100644
--- a/Build/source/libs/icu-xetex/data/coll/uk_UA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/uk_UA.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/vi.txt b/Build/source/libs/icu/icu-xetex/data/coll/vi.txt
index c0950b4ae04..c0950b4ae04 100644
--- a/Build/source/libs/icu-xetex/data/coll/vi.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/vi.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/vi_VN.txt b/Build/source/libs/icu/icu-xetex/data/coll/vi_VN.txt
index 5385dabad61..5385dabad61 100644
--- a/Build/source/libs/icu-xetex/data/coll/vi_VN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/vi_VN.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/zh.txt b/Build/source/libs/icu/icu-xetex/data/coll/zh.txt
index 99e2f97529e..99e2f97529e 100644
--- a/Build/source/libs/icu-xetex/data/coll/zh.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/zh.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/zh_.txt b/Build/source/libs/icu/icu-xetex/data/coll/zh_.txt
index 2eacdd97822..2eacdd97822 100644
--- a/Build/source/libs/icu-xetex/data/coll/zh_.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/zh_.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/zh_CN.txt b/Build/source/libs/icu/icu-xetex/data/coll/zh_CN.txt
index 8e09a2067f5..8e09a2067f5 100644
--- a/Build/source/libs/icu-xetex/data/coll/zh_CN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/zh_CN.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/zh_HK.txt b/Build/source/libs/icu/icu-xetex/data/coll/zh_HK.txt
index 4fb6d0f4c16..4fb6d0f4c16 100644
--- a/Build/source/libs/icu-xetex/data/coll/zh_HK.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/zh_HK.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/zh_Hans.txt b/Build/source/libs/icu/icu-xetex/data/coll/zh_Hans.txt
index da47651ed37..da47651ed37 100644
--- a/Build/source/libs/icu-xetex/data/coll/zh_Hans.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/zh_Hans.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/zh_Hans_CN.txt b/Build/source/libs/icu/icu-xetex/data/coll/zh_Hans_CN.txt
index 37e605f227a..37e605f227a 100644
--- a/Build/source/libs/icu-xetex/data/coll/zh_Hans_CN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/zh_Hans_CN.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/zh_Hans_SG.txt b/Build/source/libs/icu/icu-xetex/data/coll/zh_Hans_SG.txt
index deb22670cee..deb22670cee 100644
--- a/Build/source/libs/icu-xetex/data/coll/zh_Hans_SG.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/zh_Hans_SG.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/zh_Hant.txt b/Build/source/libs/icu/icu-xetex/data/coll/zh_Hant.txt
index 96c8da4c557..96c8da4c557 100644
--- a/Build/source/libs/icu-xetex/data/coll/zh_Hant.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/zh_Hant.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/zh_Hant_HK.txt b/Build/source/libs/icu/icu-xetex/data/coll/zh_Hant_HK.txt
index 570fa93e28a..570fa93e28a 100644
--- a/Build/source/libs/icu-xetex/data/coll/zh_Hant_HK.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/zh_Hant_HK.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/zh_Hant_MO.txt b/Build/source/libs/icu/icu-xetex/data/coll/zh_Hant_MO.txt
index 483de874f09..483de874f09 100644
--- a/Build/source/libs/icu-xetex/data/coll/zh_Hant_MO.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/zh_Hant_MO.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/zh_Hant_TW.txt b/Build/source/libs/icu/icu-xetex/data/coll/zh_Hant_TW.txt
index a013f77fb45..a013f77fb45 100644
--- a/Build/source/libs/icu-xetex/data/coll/zh_Hant_TW.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/zh_Hant_TW.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/zh_MO.txt b/Build/source/libs/icu/icu-xetex/data/coll/zh_MO.txt
index da6394cb65d..da6394cb65d 100644
--- a/Build/source/libs/icu-xetex/data/coll/zh_MO.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/zh_MO.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/zh_SG.txt b/Build/source/libs/icu/icu-xetex/data/coll/zh_SG.txt
index ca57fcb5eac..ca57fcb5eac 100644
--- a/Build/source/libs/icu-xetex/data/coll/zh_SG.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/zh_SG.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/zh_TW.txt b/Build/source/libs/icu/icu-xetex/data/coll/zh_TW.txt
index 883defe83f9..883defe83f9 100644
--- a/Build/source/libs/icu-xetex/data/coll/zh_TW.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/zh_TW.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/zh_TW_STROKE.txt b/Build/source/libs/icu/icu-xetex/data/coll/zh_TW_STROKE.txt
index e0a5252ebb3..e0a5252ebb3 100644
--- a/Build/source/libs/icu-xetex/data/coll/zh_TW_STROKE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/zh_TW_STROKE.txt
diff --git a/Build/source/libs/icu-xetex/data/coll/zh__PINYIN.txt b/Build/source/libs/icu/icu-xetex/data/coll/zh__PINYIN.txt
index 8ed75778dab..8ed75778dab 100644
--- a/Build/source/libs/icu-xetex/data/coll/zh__PINYIN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/coll/zh__PINYIN.txt
diff --git a/Build/source/libs/icu-xetex/data/icu-config.xml b/Build/source/libs/icu/icu-xetex/data/icu-config.xml
index c32546d5993..c32546d5993 100644
--- a/Build/source/libs/icu-xetex/data/icu-config.xml
+++ b/Build/source/libs/icu/icu-xetex/data/icu-config.xml
diff --git a/Build/source/libs/icu-xetex/data/icupkg.inc.in b/Build/source/libs/icu/icu-xetex/data/icupkg.inc.in
index c76790afa95..c76790afa95 100644
--- a/Build/source/libs/icu-xetex/data/icupkg.inc.in
+++ b/Build/source/libs/icu/icu-xetex/data/icupkg.inc.in
diff --git a/Build/source/libs/icu-xetex/data/locales/af.txt b/Build/source/libs/icu/icu-xetex/data/locales/af.txt
index d26fdc2002a..d26fdc2002a 100644
--- a/Build/source/libs/icu-xetex/data/locales/af.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/af.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/af_NA.txt b/Build/source/libs/icu/icu-xetex/data/locales/af_NA.txt
index 5ce16f0948e..5ce16f0948e 100644
--- a/Build/source/libs/icu-xetex/data/locales/af_NA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/af_NA.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/af_ZA.txt b/Build/source/libs/icu/icu-xetex/data/locales/af_ZA.txt
index 1048501aa1a..1048501aa1a 100644
--- a/Build/source/libs/icu-xetex/data/locales/af_ZA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/af_ZA.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/am.txt b/Build/source/libs/icu/icu-xetex/data/locales/am.txt
index c0084df3391..c0084df3391 100644
--- a/Build/source/libs/icu-xetex/data/locales/am.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/am.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/am_ET.txt b/Build/source/libs/icu/icu-xetex/data/locales/am_ET.txt
index 202b3b8c5c4..202b3b8c5c4 100644
--- a/Build/source/libs/icu-xetex/data/locales/am_ET.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/am_ET.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ar.txt b/Build/source/libs/icu/icu-xetex/data/locales/ar.txt
index e75184b33fa..e75184b33fa 100644
--- a/Build/source/libs/icu-xetex/data/locales/ar.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ar.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ar_AE.txt b/Build/source/libs/icu/icu-xetex/data/locales/ar_AE.txt
index e4940e4bb9d..e4940e4bb9d 100644
--- a/Build/source/libs/icu-xetex/data/locales/ar_AE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ar_AE.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ar_BH.txt b/Build/source/libs/icu/icu-xetex/data/locales/ar_BH.txt
index 804fbae65d2..804fbae65d2 100644
--- a/Build/source/libs/icu-xetex/data/locales/ar_BH.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ar_BH.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ar_DZ.txt b/Build/source/libs/icu/icu-xetex/data/locales/ar_DZ.txt
index bf1408baa89..bf1408baa89 100644
--- a/Build/source/libs/icu-xetex/data/locales/ar_DZ.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ar_DZ.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ar_EG.txt b/Build/source/libs/icu/icu-xetex/data/locales/ar_EG.txt
index 28caa456baa..28caa456baa 100644
--- a/Build/source/libs/icu-xetex/data/locales/ar_EG.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ar_EG.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ar_IQ.txt b/Build/source/libs/icu/icu-xetex/data/locales/ar_IQ.txt
index 07b4b9f00c5..07b4b9f00c5 100644
--- a/Build/source/libs/icu-xetex/data/locales/ar_IQ.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ar_IQ.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ar_JO.txt b/Build/source/libs/icu/icu-xetex/data/locales/ar_JO.txt
index 21750efb274..21750efb274 100644
--- a/Build/source/libs/icu-xetex/data/locales/ar_JO.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ar_JO.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ar_KW.txt b/Build/source/libs/icu/icu-xetex/data/locales/ar_KW.txt
index 3fc95794048..3fc95794048 100644
--- a/Build/source/libs/icu-xetex/data/locales/ar_KW.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ar_KW.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ar_LB.txt b/Build/source/libs/icu/icu-xetex/data/locales/ar_LB.txt
index 395742c0239..395742c0239 100644
--- a/Build/source/libs/icu-xetex/data/locales/ar_LB.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ar_LB.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ar_LY.txt b/Build/source/libs/icu/icu-xetex/data/locales/ar_LY.txt
index 37a32462b71..37a32462b71 100644
--- a/Build/source/libs/icu-xetex/data/locales/ar_LY.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ar_LY.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ar_MA.txt b/Build/source/libs/icu/icu-xetex/data/locales/ar_MA.txt
index e38da4daecd..e38da4daecd 100644
--- a/Build/source/libs/icu-xetex/data/locales/ar_MA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ar_MA.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ar_OM.txt b/Build/source/libs/icu/icu-xetex/data/locales/ar_OM.txt
index 7c9668088cc..7c9668088cc 100644
--- a/Build/source/libs/icu-xetex/data/locales/ar_OM.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ar_OM.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ar_QA.txt b/Build/source/libs/icu/icu-xetex/data/locales/ar_QA.txt
index 4d5c1df5a6a..4d5c1df5a6a 100644
--- a/Build/source/libs/icu-xetex/data/locales/ar_QA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ar_QA.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ar_SA.txt b/Build/source/libs/icu/icu-xetex/data/locales/ar_SA.txt
index 5910faab492..5910faab492 100644
--- a/Build/source/libs/icu-xetex/data/locales/ar_SA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ar_SA.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ar_SD.txt b/Build/source/libs/icu/icu-xetex/data/locales/ar_SD.txt
index bbdd6ecb1a0..bbdd6ecb1a0 100644
--- a/Build/source/libs/icu-xetex/data/locales/ar_SD.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ar_SD.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ar_SY.txt b/Build/source/libs/icu/icu-xetex/data/locales/ar_SY.txt
index c0d74fd78dc..c0d74fd78dc 100644
--- a/Build/source/libs/icu-xetex/data/locales/ar_SY.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ar_SY.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ar_TN.txt b/Build/source/libs/icu/icu-xetex/data/locales/ar_TN.txt
index b3ada6e32f9..b3ada6e32f9 100644
--- a/Build/source/libs/icu-xetex/data/locales/ar_TN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ar_TN.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ar_YE.txt b/Build/source/libs/icu/icu-xetex/data/locales/ar_YE.txt
index 89aaa75189a..89aaa75189a 100644
--- a/Build/source/libs/icu-xetex/data/locales/ar_YE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ar_YE.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/as.txt b/Build/source/libs/icu/icu-xetex/data/locales/as.txt
index bf0ac166197..bf0ac166197 100644
--- a/Build/source/libs/icu-xetex/data/locales/as.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/as.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/as_IN.txt b/Build/source/libs/icu/icu-xetex/data/locales/as_IN.txt
index e590f922408..e590f922408 100644
--- a/Build/source/libs/icu-xetex/data/locales/as_IN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/as_IN.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/az.txt b/Build/source/libs/icu/icu-xetex/data/locales/az.txt
index c1b5402161f..c1b5402161f 100644
--- a/Build/source/libs/icu-xetex/data/locales/az.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/az.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/az_AZ.txt b/Build/source/libs/icu/icu-xetex/data/locales/az_AZ.txt
index dc143a5dd5b..dc143a5dd5b 100644
--- a/Build/source/libs/icu-xetex/data/locales/az_AZ.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/az_AZ.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/az_Cyrl.txt b/Build/source/libs/icu/icu-xetex/data/locales/az_Cyrl.txt
index fb85171e96a..fb85171e96a 100644
--- a/Build/source/libs/icu-xetex/data/locales/az_Cyrl.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/az_Cyrl.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/az_Cyrl_AZ.txt b/Build/source/libs/icu/icu-xetex/data/locales/az_Cyrl_AZ.txt
index ceb1c76cb1c..ceb1c76cb1c 100644
--- a/Build/source/libs/icu-xetex/data/locales/az_Cyrl_AZ.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/az_Cyrl_AZ.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/az_Latn.txt b/Build/source/libs/icu/icu-xetex/data/locales/az_Latn.txt
index ad35b49dcfb..ad35b49dcfb 100644
--- a/Build/source/libs/icu-xetex/data/locales/az_Latn.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/az_Latn.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/az_Latn_AZ.txt b/Build/source/libs/icu/icu-xetex/data/locales/az_Latn_AZ.txt
index caa9e5a1870..caa9e5a1870 100644
--- a/Build/source/libs/icu-xetex/data/locales/az_Latn_AZ.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/az_Latn_AZ.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/be.txt b/Build/source/libs/icu/icu-xetex/data/locales/be.txt
index dba5035d0b9..dba5035d0b9 100644
--- a/Build/source/libs/icu-xetex/data/locales/be.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/be.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/be_BY.txt b/Build/source/libs/icu/icu-xetex/data/locales/be_BY.txt
index 5d3fe10ab14..5d3fe10ab14 100644
--- a/Build/source/libs/icu-xetex/data/locales/be_BY.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/be_BY.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/bg.txt b/Build/source/libs/icu/icu-xetex/data/locales/bg.txt
index 3f7b6b25a82..3f7b6b25a82 100644
--- a/Build/source/libs/icu-xetex/data/locales/bg.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/bg.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/bg_BG.txt b/Build/source/libs/icu/icu-xetex/data/locales/bg_BG.txt
index 4a3a57139b3..4a3a57139b3 100644
--- a/Build/source/libs/icu-xetex/data/locales/bg_BG.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/bg_BG.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/bn.txt b/Build/source/libs/icu/icu-xetex/data/locales/bn.txt
index d6ec7fe1a3f..d6ec7fe1a3f 100644
--- a/Build/source/libs/icu-xetex/data/locales/bn.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/bn.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/bn_BD.txt b/Build/source/libs/icu/icu-xetex/data/locales/bn_BD.txt
index a043548772e..a043548772e 100644
--- a/Build/source/libs/icu-xetex/data/locales/bn_BD.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/bn_BD.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/bn_IN.txt b/Build/source/libs/icu/icu-xetex/data/locales/bn_IN.txt
index 436df80dd33..436df80dd33 100644
--- a/Build/source/libs/icu-xetex/data/locales/bn_IN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/bn_IN.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ca.txt b/Build/source/libs/icu/icu-xetex/data/locales/ca.txt
index c36a4c60121..c36a4c60121 100644
--- a/Build/source/libs/icu-xetex/data/locales/ca.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ca.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ca_ES.txt b/Build/source/libs/icu/icu-xetex/data/locales/ca_ES.txt
index 78518fbd7e5..78518fbd7e5 100644
--- a/Build/source/libs/icu-xetex/data/locales/ca_ES.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ca_ES.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/cs.txt b/Build/source/libs/icu/icu-xetex/data/locales/cs.txt
index 7b5e0911086..7b5e0911086 100644
--- a/Build/source/libs/icu-xetex/data/locales/cs.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/cs.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/cs_CZ.txt b/Build/source/libs/icu/icu-xetex/data/locales/cs_CZ.txt
index e58e1cc2f33..e58e1cc2f33 100644
--- a/Build/source/libs/icu-xetex/data/locales/cs_CZ.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/cs_CZ.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/cy.txt b/Build/source/libs/icu/icu-xetex/data/locales/cy.txt
index 7942aca91fd..7942aca91fd 100644
--- a/Build/source/libs/icu-xetex/data/locales/cy.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/cy.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/cy_GB.txt b/Build/source/libs/icu/icu-xetex/data/locales/cy_GB.txt
index a1aad687cab..a1aad687cab 100644
--- a/Build/source/libs/icu-xetex/data/locales/cy_GB.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/cy_GB.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/da.txt b/Build/source/libs/icu/icu-xetex/data/locales/da.txt
index 2434aa7663e..2434aa7663e 100644
--- a/Build/source/libs/icu-xetex/data/locales/da.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/da.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/da_DK.txt b/Build/source/libs/icu/icu-xetex/data/locales/da_DK.txt
index 369bf45b05e..369bf45b05e 100644
--- a/Build/source/libs/icu-xetex/data/locales/da_DK.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/da_DK.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/de.txt b/Build/source/libs/icu/icu-xetex/data/locales/de.txt
index 5117745c169..5117745c169 100644
--- a/Build/source/libs/icu-xetex/data/locales/de.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/de.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/de_AT.txt b/Build/source/libs/icu/icu-xetex/data/locales/de_AT.txt
index 21a76e56545..21a76e56545 100644
--- a/Build/source/libs/icu-xetex/data/locales/de_AT.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/de_AT.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/de_BE.txt b/Build/source/libs/icu/icu-xetex/data/locales/de_BE.txt
index 0d5c832e35e..0d5c832e35e 100644
--- a/Build/source/libs/icu-xetex/data/locales/de_BE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/de_BE.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/de_CH.txt b/Build/source/libs/icu/icu-xetex/data/locales/de_CH.txt
index aba01732047..aba01732047 100644
--- a/Build/source/libs/icu-xetex/data/locales/de_CH.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/de_CH.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/de_DE.txt b/Build/source/libs/icu/icu-xetex/data/locales/de_DE.txt
index 7ad179244d7..7ad179244d7 100644
--- a/Build/source/libs/icu-xetex/data/locales/de_DE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/de_DE.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/de_LI.txt b/Build/source/libs/icu/icu-xetex/data/locales/de_LI.txt
index f95a6156749..f95a6156749 100644
--- a/Build/source/libs/icu-xetex/data/locales/de_LI.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/de_LI.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/de_LU.txt b/Build/source/libs/icu/icu-xetex/data/locales/de_LU.txt
index 41f7f769c0b..41f7f769c0b 100644
--- a/Build/source/libs/icu-xetex/data/locales/de_LU.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/de_LU.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/el.txt b/Build/source/libs/icu/icu-xetex/data/locales/el.txt
index b905e9ee9a8..b905e9ee9a8 100644
--- a/Build/source/libs/icu-xetex/data/locales/el.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/el.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/el_CY.txt b/Build/source/libs/icu/icu-xetex/data/locales/el_CY.txt
index 64626ba656c..64626ba656c 100644
--- a/Build/source/libs/icu-xetex/data/locales/el_CY.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/el_CY.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/el_GR.txt b/Build/source/libs/icu/icu-xetex/data/locales/el_GR.txt
index d05d0f0c1b2..d05d0f0c1b2 100644
--- a/Build/source/libs/icu-xetex/data/locales/el_GR.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/el_GR.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/en.txt b/Build/source/libs/icu/icu-xetex/data/locales/en.txt
index 3c549357c77..3c549357c77 100644
--- a/Build/source/libs/icu-xetex/data/locales/en.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/en.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/en_AU.txt b/Build/source/libs/icu/icu-xetex/data/locales/en_AU.txt
index 1f276ae3a37..1f276ae3a37 100644
--- a/Build/source/libs/icu-xetex/data/locales/en_AU.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/en_AU.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/en_BE.txt b/Build/source/libs/icu/icu-xetex/data/locales/en_BE.txt
index 408d3a59683..408d3a59683 100644
--- a/Build/source/libs/icu-xetex/data/locales/en_BE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/en_BE.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/en_BW.txt b/Build/source/libs/icu/icu-xetex/data/locales/en_BW.txt
index 3b83c52ac29..3b83c52ac29 100644
--- a/Build/source/libs/icu-xetex/data/locales/en_BW.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/en_BW.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/en_BZ.txt b/Build/source/libs/icu/icu-xetex/data/locales/en_BZ.txt
index a6f01444d80..a6f01444d80 100644
--- a/Build/source/libs/icu-xetex/data/locales/en_BZ.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/en_BZ.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/en_CA.txt b/Build/source/libs/icu/icu-xetex/data/locales/en_CA.txt
index 0a67cc52a11..0a67cc52a11 100644
--- a/Build/source/libs/icu-xetex/data/locales/en_CA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/en_CA.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/en_GB.txt b/Build/source/libs/icu/icu-xetex/data/locales/en_GB.txt
index d8d579e536e..d8d579e536e 100644
--- a/Build/source/libs/icu-xetex/data/locales/en_GB.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/en_GB.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/en_HK.txt b/Build/source/libs/icu/icu-xetex/data/locales/en_HK.txt
index 8cdb5e49a50..8cdb5e49a50 100644
--- a/Build/source/libs/icu-xetex/data/locales/en_HK.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/en_HK.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/en_IE.txt b/Build/source/libs/icu/icu-xetex/data/locales/en_IE.txt
index f921c549a58..f921c549a58 100644
--- a/Build/source/libs/icu-xetex/data/locales/en_IE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/en_IE.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/en_IN.txt b/Build/source/libs/icu/icu-xetex/data/locales/en_IN.txt
index 61774e1d743..61774e1d743 100644
--- a/Build/source/libs/icu-xetex/data/locales/en_IN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/en_IN.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/en_JM.txt b/Build/source/libs/icu/icu-xetex/data/locales/en_JM.txt
index 47d152c3cbe..47d152c3cbe 100644
--- a/Build/source/libs/icu-xetex/data/locales/en_JM.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/en_JM.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/en_MH.txt b/Build/source/libs/icu/icu-xetex/data/locales/en_MH.txt
index 005caf3b416..005caf3b416 100644
--- a/Build/source/libs/icu-xetex/data/locales/en_MH.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/en_MH.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/en_MT.txt b/Build/source/libs/icu/icu-xetex/data/locales/en_MT.txt
index 11c81b576cf..11c81b576cf 100644
--- a/Build/source/libs/icu-xetex/data/locales/en_MT.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/en_MT.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/en_NA.txt b/Build/source/libs/icu/icu-xetex/data/locales/en_NA.txt
index 4eb66b8bdcc..4eb66b8bdcc 100644
--- a/Build/source/libs/icu-xetex/data/locales/en_NA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/en_NA.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/en_NZ.txt b/Build/source/libs/icu/icu-xetex/data/locales/en_NZ.txt
index d021390e628..d021390e628 100644
--- a/Build/source/libs/icu-xetex/data/locales/en_NZ.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/en_NZ.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/en_PH.txt b/Build/source/libs/icu/icu-xetex/data/locales/en_PH.txt
index a1b83f2e493..a1b83f2e493 100644
--- a/Build/source/libs/icu-xetex/data/locales/en_PH.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/en_PH.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/en_PK.txt b/Build/source/libs/icu/icu-xetex/data/locales/en_PK.txt
index 948d3cd4369..948d3cd4369 100644
--- a/Build/source/libs/icu-xetex/data/locales/en_PK.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/en_PK.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/en_RH.txt b/Build/source/libs/icu/icu-xetex/data/locales/en_RH.txt
index 739b0937a45..739b0937a45 100644
--- a/Build/source/libs/icu-xetex/data/locales/en_RH.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/en_RH.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/en_SG.txt b/Build/source/libs/icu/icu-xetex/data/locales/en_SG.txt
index 8de8269b9dc..8de8269b9dc 100644
--- a/Build/source/libs/icu-xetex/data/locales/en_SG.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/en_SG.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/en_TT.txt b/Build/source/libs/icu/icu-xetex/data/locales/en_TT.txt
index a6904b8b6f2..a6904b8b6f2 100644
--- a/Build/source/libs/icu-xetex/data/locales/en_TT.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/en_TT.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/en_US.txt b/Build/source/libs/icu/icu-xetex/data/locales/en_US.txt
index 6edd919ea4d..6edd919ea4d 100644
--- a/Build/source/libs/icu-xetex/data/locales/en_US.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/en_US.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/en_US_POSIX.txt b/Build/source/libs/icu/icu-xetex/data/locales/en_US_POSIX.txt
index c272039de7d..c272039de7d 100644
--- a/Build/source/libs/icu-xetex/data/locales/en_US_POSIX.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/en_US_POSIX.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/en_VI.txt b/Build/source/libs/icu/icu-xetex/data/locales/en_VI.txt
index 33eb32c8329..33eb32c8329 100644
--- a/Build/source/libs/icu-xetex/data/locales/en_VI.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/en_VI.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/en_ZA.txt b/Build/source/libs/icu/icu-xetex/data/locales/en_ZA.txt
index 830d4a135e3..830d4a135e3 100644
--- a/Build/source/libs/icu-xetex/data/locales/en_ZA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/en_ZA.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/en_ZW.txt b/Build/source/libs/icu/icu-xetex/data/locales/en_ZW.txt
index 8cfc108c6e5..8cfc108c6e5 100644
--- a/Build/source/libs/icu-xetex/data/locales/en_ZW.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/en_ZW.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/eo.txt b/Build/source/libs/icu/icu-xetex/data/locales/eo.txt
index ee1744ad4d6..ee1744ad4d6 100644
--- a/Build/source/libs/icu-xetex/data/locales/eo.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/eo.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/es.txt b/Build/source/libs/icu/icu-xetex/data/locales/es.txt
index 671a34d2c23..671a34d2c23 100644
--- a/Build/source/libs/icu-xetex/data/locales/es.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/es.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/es_AR.txt b/Build/source/libs/icu/icu-xetex/data/locales/es_AR.txt
index 1214f412440..1214f412440 100644
--- a/Build/source/libs/icu-xetex/data/locales/es_AR.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/es_AR.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/es_BO.txt b/Build/source/libs/icu/icu-xetex/data/locales/es_BO.txt
index 2e8c7a353e8..2e8c7a353e8 100644
--- a/Build/source/libs/icu-xetex/data/locales/es_BO.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/es_BO.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/es_CL.txt b/Build/source/libs/icu/icu-xetex/data/locales/es_CL.txt
index 2ea3eb61626..2ea3eb61626 100644
--- a/Build/source/libs/icu-xetex/data/locales/es_CL.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/es_CL.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/es_CO.txt b/Build/source/libs/icu/icu-xetex/data/locales/es_CO.txt
index 85229e522c5..85229e522c5 100644
--- a/Build/source/libs/icu-xetex/data/locales/es_CO.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/es_CO.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/es_CR.txt b/Build/source/libs/icu/icu-xetex/data/locales/es_CR.txt
index 0191878db61..0191878db61 100644
--- a/Build/source/libs/icu-xetex/data/locales/es_CR.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/es_CR.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/es_DO.txt b/Build/source/libs/icu/icu-xetex/data/locales/es_DO.txt
index f8c47e61894..f8c47e61894 100644
--- a/Build/source/libs/icu-xetex/data/locales/es_DO.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/es_DO.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/es_EC.txt b/Build/source/libs/icu/icu-xetex/data/locales/es_EC.txt
index ebff21340d8..ebff21340d8 100644
--- a/Build/source/libs/icu-xetex/data/locales/es_EC.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/es_EC.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/es_ES.txt b/Build/source/libs/icu/icu-xetex/data/locales/es_ES.txt
index 067c18dd6c1..067c18dd6c1 100644
--- a/Build/source/libs/icu-xetex/data/locales/es_ES.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/es_ES.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/es_GT.txt b/Build/source/libs/icu/icu-xetex/data/locales/es_GT.txt
index 09897063baf..09897063baf 100644
--- a/Build/source/libs/icu-xetex/data/locales/es_GT.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/es_GT.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/es_HN.txt b/Build/source/libs/icu/icu-xetex/data/locales/es_HN.txt
index a18209d6412..a18209d6412 100644
--- a/Build/source/libs/icu-xetex/data/locales/es_HN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/es_HN.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/es_MX.txt b/Build/source/libs/icu/icu-xetex/data/locales/es_MX.txt
index 89a8671c99c..89a8671c99c 100644
--- a/Build/source/libs/icu-xetex/data/locales/es_MX.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/es_MX.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/es_NI.txt b/Build/source/libs/icu/icu-xetex/data/locales/es_NI.txt
index 21230416773..21230416773 100644
--- a/Build/source/libs/icu-xetex/data/locales/es_NI.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/es_NI.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/es_PA.txt b/Build/source/libs/icu/icu-xetex/data/locales/es_PA.txt
index e22fc30fa95..e22fc30fa95 100644
--- a/Build/source/libs/icu-xetex/data/locales/es_PA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/es_PA.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/es_PE.txt b/Build/source/libs/icu/icu-xetex/data/locales/es_PE.txt
index dbd527720e6..dbd527720e6 100644
--- a/Build/source/libs/icu-xetex/data/locales/es_PE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/es_PE.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/es_PR.txt b/Build/source/libs/icu/icu-xetex/data/locales/es_PR.txt
index 7373a62a289..7373a62a289 100644
--- a/Build/source/libs/icu-xetex/data/locales/es_PR.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/es_PR.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/es_PY.txt b/Build/source/libs/icu/icu-xetex/data/locales/es_PY.txt
index b8220179890..b8220179890 100644
--- a/Build/source/libs/icu-xetex/data/locales/es_PY.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/es_PY.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/es_SV.txt b/Build/source/libs/icu/icu-xetex/data/locales/es_SV.txt
index 8f38468b26c..8f38468b26c 100644
--- a/Build/source/libs/icu-xetex/data/locales/es_SV.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/es_SV.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/es_US.txt b/Build/source/libs/icu/icu-xetex/data/locales/es_US.txt
index ebfbee3f7b1..ebfbee3f7b1 100644
--- a/Build/source/libs/icu-xetex/data/locales/es_US.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/es_US.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/es_UY.txt b/Build/source/libs/icu/icu-xetex/data/locales/es_UY.txt
index 83f02c17ab0..83f02c17ab0 100644
--- a/Build/source/libs/icu-xetex/data/locales/es_UY.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/es_UY.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/es_VE.txt b/Build/source/libs/icu/icu-xetex/data/locales/es_VE.txt
index 133e201d8c7..133e201d8c7 100644
--- a/Build/source/libs/icu-xetex/data/locales/es_VE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/es_VE.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/et.txt b/Build/source/libs/icu/icu-xetex/data/locales/et.txt
index 53783971e05..53783971e05 100644
--- a/Build/source/libs/icu-xetex/data/locales/et.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/et.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/et_EE.txt b/Build/source/libs/icu/icu-xetex/data/locales/et_EE.txt
index b6483e1fa32..b6483e1fa32 100644
--- a/Build/source/libs/icu-xetex/data/locales/et_EE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/et_EE.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/eu.txt b/Build/source/libs/icu/icu-xetex/data/locales/eu.txt
index 27ea3d5e6bd..27ea3d5e6bd 100644
--- a/Build/source/libs/icu-xetex/data/locales/eu.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/eu.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/eu_ES.txt b/Build/source/libs/icu/icu-xetex/data/locales/eu_ES.txt
index fd63eccd37c..fd63eccd37c 100644
--- a/Build/source/libs/icu-xetex/data/locales/eu_ES.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/eu_ES.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/fa.txt b/Build/source/libs/icu/icu-xetex/data/locales/fa.txt
index 550b99e0583..550b99e0583 100644
--- a/Build/source/libs/icu-xetex/data/locales/fa.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/fa.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/fa_AF.txt b/Build/source/libs/icu/icu-xetex/data/locales/fa_AF.txt
index 86c2495ea98..86c2495ea98 100644
--- a/Build/source/libs/icu-xetex/data/locales/fa_AF.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/fa_AF.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/fa_IR.txt b/Build/source/libs/icu/icu-xetex/data/locales/fa_IR.txt
index a6c2bfc77c4..a6c2bfc77c4 100644
--- a/Build/source/libs/icu-xetex/data/locales/fa_IR.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/fa_IR.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/fi.txt b/Build/source/libs/icu/icu-xetex/data/locales/fi.txt
index 9062d411cce..9062d411cce 100644
--- a/Build/source/libs/icu-xetex/data/locales/fi.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/fi.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/fi_FI.txt b/Build/source/libs/icu/icu-xetex/data/locales/fi_FI.txt
index b6bed8ae49e..b6bed8ae49e 100644
--- a/Build/source/libs/icu-xetex/data/locales/fi_FI.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/fi_FI.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/fo.txt b/Build/source/libs/icu/icu-xetex/data/locales/fo.txt
index 7fff1fead1f..7fff1fead1f 100644
--- a/Build/source/libs/icu-xetex/data/locales/fo.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/fo.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/fo_FO.txt b/Build/source/libs/icu/icu-xetex/data/locales/fo_FO.txt
index 031cade55a3..031cade55a3 100644
--- a/Build/source/libs/icu-xetex/data/locales/fo_FO.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/fo_FO.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/fr.txt b/Build/source/libs/icu/icu-xetex/data/locales/fr.txt
index b160e8d8e5b..b160e8d8e5b 100644
--- a/Build/source/libs/icu-xetex/data/locales/fr.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/fr.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/fr_BE.txt b/Build/source/libs/icu/icu-xetex/data/locales/fr_BE.txt
index fe63415024a..fe63415024a 100644
--- a/Build/source/libs/icu-xetex/data/locales/fr_BE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/fr_BE.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/fr_CA.txt b/Build/source/libs/icu/icu-xetex/data/locales/fr_CA.txt
index 5dc68ab78c9..5dc68ab78c9 100644
--- a/Build/source/libs/icu-xetex/data/locales/fr_CA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/fr_CA.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/fr_CH.txt b/Build/source/libs/icu/icu-xetex/data/locales/fr_CH.txt
index c5cba4635e2..c5cba4635e2 100644
--- a/Build/source/libs/icu-xetex/data/locales/fr_CH.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/fr_CH.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/fr_FR.txt b/Build/source/libs/icu/icu-xetex/data/locales/fr_FR.txt
index 8756717d3dd..8756717d3dd 100644
--- a/Build/source/libs/icu-xetex/data/locales/fr_FR.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/fr_FR.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/fr_LU.txt b/Build/source/libs/icu/icu-xetex/data/locales/fr_LU.txt
index d046b380c09..d046b380c09 100644
--- a/Build/source/libs/icu-xetex/data/locales/fr_LU.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/fr_LU.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/fr_MC.txt b/Build/source/libs/icu/icu-xetex/data/locales/fr_MC.txt
index 587a5a68268..587a5a68268 100644
--- a/Build/source/libs/icu-xetex/data/locales/fr_MC.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/fr_MC.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ga.txt b/Build/source/libs/icu/icu-xetex/data/locales/ga.txt
index 79778c65e56..79778c65e56 100644
--- a/Build/source/libs/icu-xetex/data/locales/ga.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ga.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ga_IE.txt b/Build/source/libs/icu/icu-xetex/data/locales/ga_IE.txt
index f21f4d9dbca..f21f4d9dbca 100644
--- a/Build/source/libs/icu-xetex/data/locales/ga_IE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ga_IE.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/gl.txt b/Build/source/libs/icu/icu-xetex/data/locales/gl.txt
index b4af5deaa3c..b4af5deaa3c 100644
--- a/Build/source/libs/icu-xetex/data/locales/gl.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/gl.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/gl_ES.txt b/Build/source/libs/icu/icu-xetex/data/locales/gl_ES.txt
index fa27a0d9191..fa27a0d9191 100644
--- a/Build/source/libs/icu-xetex/data/locales/gl_ES.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/gl_ES.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/gu.txt b/Build/source/libs/icu/icu-xetex/data/locales/gu.txt
index d161235c1e7..d161235c1e7 100644
--- a/Build/source/libs/icu-xetex/data/locales/gu.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/gu.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/gu_IN.txt b/Build/source/libs/icu/icu-xetex/data/locales/gu_IN.txt
index 1fff111afd7..1fff111afd7 100644
--- a/Build/source/libs/icu-xetex/data/locales/gu_IN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/gu_IN.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/gv.txt b/Build/source/libs/icu/icu-xetex/data/locales/gv.txt
index beaab3d1629..beaab3d1629 100644
--- a/Build/source/libs/icu-xetex/data/locales/gv.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/gv.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/gv_GB.txt b/Build/source/libs/icu/icu-xetex/data/locales/gv_GB.txt
index c9e7dc7576b..c9e7dc7576b 100644
--- a/Build/source/libs/icu-xetex/data/locales/gv_GB.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/gv_GB.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/haw.txt b/Build/source/libs/icu/icu-xetex/data/locales/haw.txt
index 2d1c62009b6..2d1c62009b6 100644
--- a/Build/source/libs/icu-xetex/data/locales/haw.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/haw.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/haw_US.txt b/Build/source/libs/icu/icu-xetex/data/locales/haw_US.txt
index 50a555d229b..50a555d229b 100644
--- a/Build/source/libs/icu-xetex/data/locales/haw_US.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/haw_US.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/he.txt b/Build/source/libs/icu/icu-xetex/data/locales/he.txt
index 8c817fb7e88..8c817fb7e88 100644
--- a/Build/source/libs/icu-xetex/data/locales/he.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/he.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/he_IL.txt b/Build/source/libs/icu/icu-xetex/data/locales/he_IL.txt
index 2647b73178a..2647b73178a 100644
--- a/Build/source/libs/icu-xetex/data/locales/he_IL.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/he_IL.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/hi.txt b/Build/source/libs/icu/icu-xetex/data/locales/hi.txt
index 10e771a46a6..10e771a46a6 100644
--- a/Build/source/libs/icu-xetex/data/locales/hi.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/hi.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/hi_IN.txt b/Build/source/libs/icu/icu-xetex/data/locales/hi_IN.txt
index 8b67dc9227e..8b67dc9227e 100644
--- a/Build/source/libs/icu-xetex/data/locales/hi_IN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/hi_IN.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/hr.txt b/Build/source/libs/icu/icu-xetex/data/locales/hr.txt
index ba663c45963..ba663c45963 100644
--- a/Build/source/libs/icu-xetex/data/locales/hr.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/hr.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/hr_HR.txt b/Build/source/libs/icu/icu-xetex/data/locales/hr_HR.txt
index 6967aad73f9..6967aad73f9 100644
--- a/Build/source/libs/icu-xetex/data/locales/hr_HR.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/hr_HR.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/hu.txt b/Build/source/libs/icu/icu-xetex/data/locales/hu.txt
index 7711795e4c8..7711795e4c8 100644
--- a/Build/source/libs/icu-xetex/data/locales/hu.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/hu.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/hu_HU.txt b/Build/source/libs/icu/icu-xetex/data/locales/hu_HU.txt
index 283f10dc732..283f10dc732 100644
--- a/Build/source/libs/icu-xetex/data/locales/hu_HU.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/hu_HU.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/hy.txt b/Build/source/libs/icu/icu-xetex/data/locales/hy.txt
index 2a2ccdfbabc..2a2ccdfbabc 100644
--- a/Build/source/libs/icu-xetex/data/locales/hy.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/hy.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/hy_AM.txt b/Build/source/libs/icu/icu-xetex/data/locales/hy_AM.txt
index 06c4dcf5483..06c4dcf5483 100644
--- a/Build/source/libs/icu-xetex/data/locales/hy_AM.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/hy_AM.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/hy_AM_REVISED.txt b/Build/source/libs/icu/icu-xetex/data/locales/hy_AM_REVISED.txt
index 5677df0ee55..5677df0ee55 100644
--- a/Build/source/libs/icu-xetex/data/locales/hy_AM_REVISED.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/hy_AM_REVISED.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/id.txt b/Build/source/libs/icu/icu-xetex/data/locales/id.txt
index 0518d69ea21..0518d69ea21 100644
--- a/Build/source/libs/icu-xetex/data/locales/id.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/id.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/id_ID.txt b/Build/source/libs/icu/icu-xetex/data/locales/id_ID.txt
index 2d72a554b77..2d72a554b77 100644
--- a/Build/source/libs/icu-xetex/data/locales/id_ID.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/id_ID.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/in.txt b/Build/source/libs/icu/icu-xetex/data/locales/in.txt
index 9ae97996ced..9ae97996ced 100644
--- a/Build/source/libs/icu-xetex/data/locales/in.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/in.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/in_ID.txt b/Build/source/libs/icu/icu-xetex/data/locales/in_ID.txt
index dbd3b2dfceb..dbd3b2dfceb 100644
--- a/Build/source/libs/icu-xetex/data/locales/in_ID.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/in_ID.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/is.txt b/Build/source/libs/icu/icu-xetex/data/locales/is.txt
index 91ee093dd9b..91ee093dd9b 100644
--- a/Build/source/libs/icu-xetex/data/locales/is.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/is.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/is_IS.txt b/Build/source/libs/icu/icu-xetex/data/locales/is_IS.txt
index 0b479a80df2..0b479a80df2 100644
--- a/Build/source/libs/icu-xetex/data/locales/is_IS.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/is_IS.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/it.txt b/Build/source/libs/icu/icu-xetex/data/locales/it.txt
index c57ed6acc9b..c57ed6acc9b 100644
--- a/Build/source/libs/icu-xetex/data/locales/it.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/it.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/it_CH.txt b/Build/source/libs/icu/icu-xetex/data/locales/it_CH.txt
index a702ab0391a..a702ab0391a 100644
--- a/Build/source/libs/icu-xetex/data/locales/it_CH.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/it_CH.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/it_IT.txt b/Build/source/libs/icu/icu-xetex/data/locales/it_IT.txt
index d837db377d0..d837db377d0 100644
--- a/Build/source/libs/icu-xetex/data/locales/it_IT.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/it_IT.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/iw.txt b/Build/source/libs/icu/icu-xetex/data/locales/iw.txt
index b5d8273a2a3..b5d8273a2a3 100644
--- a/Build/source/libs/icu-xetex/data/locales/iw.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/iw.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/iw_IL.txt b/Build/source/libs/icu/icu-xetex/data/locales/iw_IL.txt
index 1fcb06a71c7..1fcb06a71c7 100644
--- a/Build/source/libs/icu-xetex/data/locales/iw_IL.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/iw_IL.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ja.txt b/Build/source/libs/icu/icu-xetex/data/locales/ja.txt
index f2833908d17..f2833908d17 100644
--- a/Build/source/libs/icu-xetex/data/locales/ja.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ja.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ja_JP.txt b/Build/source/libs/icu/icu-xetex/data/locales/ja_JP.txt
index 352ab92025a..352ab92025a 100644
--- a/Build/source/libs/icu-xetex/data/locales/ja_JP.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ja_JP.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ja_JP_TRADITIONAL.txt b/Build/source/libs/icu/icu-xetex/data/locales/ja_JP_TRADITIONAL.txt
index e63b6bad0af..e63b6bad0af 100644
--- a/Build/source/libs/icu-xetex/data/locales/ja_JP_TRADITIONAL.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ja_JP_TRADITIONAL.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ka.txt b/Build/source/libs/icu/icu-xetex/data/locales/ka.txt
index c3ffb865205..c3ffb865205 100644
--- a/Build/source/libs/icu-xetex/data/locales/ka.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ka.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ka_GE.txt b/Build/source/libs/icu/icu-xetex/data/locales/ka_GE.txt
index c653921c537..c653921c537 100644
--- a/Build/source/libs/icu-xetex/data/locales/ka_GE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ka_GE.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/kk.txt b/Build/source/libs/icu/icu-xetex/data/locales/kk.txt
index 8f01600e3df..8f01600e3df 100644
--- a/Build/source/libs/icu-xetex/data/locales/kk.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/kk.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/kk_KZ.txt b/Build/source/libs/icu/icu-xetex/data/locales/kk_KZ.txt
index 7a7b4fbaacb..7a7b4fbaacb 100644
--- a/Build/source/libs/icu-xetex/data/locales/kk_KZ.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/kk_KZ.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/kl.txt b/Build/source/libs/icu/icu-xetex/data/locales/kl.txt
index a807d2e562c..a807d2e562c 100644
--- a/Build/source/libs/icu-xetex/data/locales/kl.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/kl.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/kl_GL.txt b/Build/source/libs/icu/icu-xetex/data/locales/kl_GL.txt
index 424b6cd1c91..424b6cd1c91 100644
--- a/Build/source/libs/icu-xetex/data/locales/kl_GL.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/kl_GL.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/km.txt b/Build/source/libs/icu/icu-xetex/data/locales/km.txt
index cc31645ab40..cc31645ab40 100644
--- a/Build/source/libs/icu-xetex/data/locales/km.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/km.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/km_KH.txt b/Build/source/libs/icu/icu-xetex/data/locales/km_KH.txt
index 7c93caaba43..7c93caaba43 100644
--- a/Build/source/libs/icu-xetex/data/locales/km_KH.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/km_KH.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/kn.txt b/Build/source/libs/icu/icu-xetex/data/locales/kn.txt
index 331544fba23..331544fba23 100644
--- a/Build/source/libs/icu-xetex/data/locales/kn.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/kn.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/kn_IN.txt b/Build/source/libs/icu/icu-xetex/data/locales/kn_IN.txt
index 3f6cf36da5e..3f6cf36da5e 100644
--- a/Build/source/libs/icu-xetex/data/locales/kn_IN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/kn_IN.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ko.txt b/Build/source/libs/icu/icu-xetex/data/locales/ko.txt
index 1d2032f3f32..1d2032f3f32 100644
--- a/Build/source/libs/icu-xetex/data/locales/ko.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ko.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ko_KR.txt b/Build/source/libs/icu/icu-xetex/data/locales/ko_KR.txt
index ab65e815044..ab65e815044 100644
--- a/Build/source/libs/icu-xetex/data/locales/ko_KR.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ko_KR.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/kok.txt b/Build/source/libs/icu/icu-xetex/data/locales/kok.txt
index bd2aef1d65c..bd2aef1d65c 100644
--- a/Build/source/libs/icu-xetex/data/locales/kok.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/kok.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/kok_IN.txt b/Build/source/libs/icu/icu-xetex/data/locales/kok_IN.txt
index 2f2097a8e50..2f2097a8e50 100644
--- a/Build/source/libs/icu-xetex/data/locales/kok_IN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/kok_IN.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/kw.txt b/Build/source/libs/icu/icu-xetex/data/locales/kw.txt
index 0a17b7eb313..0a17b7eb313 100644
--- a/Build/source/libs/icu-xetex/data/locales/kw.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/kw.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/kw_GB.txt b/Build/source/libs/icu/icu-xetex/data/locales/kw_GB.txt
index 3fafdbb1d39..3fafdbb1d39 100644
--- a/Build/source/libs/icu-xetex/data/locales/kw_GB.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/kw_GB.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/lt.txt b/Build/source/libs/icu/icu-xetex/data/locales/lt.txt
index 8700d3a430d..8700d3a430d 100644
--- a/Build/source/libs/icu-xetex/data/locales/lt.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/lt.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/lt_LT.txt b/Build/source/libs/icu/icu-xetex/data/locales/lt_LT.txt
index 3e023afe2dc..3e023afe2dc 100644
--- a/Build/source/libs/icu-xetex/data/locales/lt_LT.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/lt_LT.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/lv.txt b/Build/source/libs/icu/icu-xetex/data/locales/lv.txt
index 1327ed9b5a2..1327ed9b5a2 100644
--- a/Build/source/libs/icu-xetex/data/locales/lv.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/lv.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/lv_LV.txt b/Build/source/libs/icu/icu-xetex/data/locales/lv_LV.txt
index e8f76302b13..e8f76302b13 100644
--- a/Build/source/libs/icu-xetex/data/locales/lv_LV.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/lv_LV.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/mk.txt b/Build/source/libs/icu/icu-xetex/data/locales/mk.txt
index bde78971ed6..bde78971ed6 100644
--- a/Build/source/libs/icu-xetex/data/locales/mk.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/mk.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/mk_MK.txt b/Build/source/libs/icu/icu-xetex/data/locales/mk_MK.txt
index 7c47b481f0c..7c47b481f0c 100644
--- a/Build/source/libs/icu-xetex/data/locales/mk_MK.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/mk_MK.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ml.txt b/Build/source/libs/icu/icu-xetex/data/locales/ml.txt
index 193ad1ed472..193ad1ed472 100644
--- a/Build/source/libs/icu-xetex/data/locales/ml.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ml.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ml_IN.txt b/Build/source/libs/icu/icu-xetex/data/locales/ml_IN.txt
index 6a6544f8f98..6a6544f8f98 100644
--- a/Build/source/libs/icu-xetex/data/locales/ml_IN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ml_IN.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/mr.txt b/Build/source/libs/icu/icu-xetex/data/locales/mr.txt
index 48544a85575..48544a85575 100644
--- a/Build/source/libs/icu-xetex/data/locales/mr.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/mr.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/mr_IN.txt b/Build/source/libs/icu/icu-xetex/data/locales/mr_IN.txt
index 062614d265c..062614d265c 100644
--- a/Build/source/libs/icu-xetex/data/locales/mr_IN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/mr_IN.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ms.txt b/Build/source/libs/icu/icu-xetex/data/locales/ms.txt
index 6890d22833f..6890d22833f 100644
--- a/Build/source/libs/icu-xetex/data/locales/ms.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ms.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ms_BN.txt b/Build/source/libs/icu/icu-xetex/data/locales/ms_BN.txt
index 85b5f6c20f1..85b5f6c20f1 100644
--- a/Build/source/libs/icu-xetex/data/locales/ms_BN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ms_BN.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ms_MY.txt b/Build/source/libs/icu/icu-xetex/data/locales/ms_MY.txt
index 753ecc138c3..753ecc138c3 100644
--- a/Build/source/libs/icu-xetex/data/locales/ms_MY.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ms_MY.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/mt.txt b/Build/source/libs/icu/icu-xetex/data/locales/mt.txt
index 8dfe85c2f9b..8dfe85c2f9b 100644
--- a/Build/source/libs/icu-xetex/data/locales/mt.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/mt.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/mt_MT.txt b/Build/source/libs/icu/icu-xetex/data/locales/mt_MT.txt
index 4733393503f..4733393503f 100644
--- a/Build/source/libs/icu-xetex/data/locales/mt_MT.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/mt_MT.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/nb.txt b/Build/source/libs/icu/icu-xetex/data/locales/nb.txt
index ab9299292ef..ab9299292ef 100644
--- a/Build/source/libs/icu-xetex/data/locales/nb.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/nb.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/nb_NO.txt b/Build/source/libs/icu/icu-xetex/data/locales/nb_NO.txt
index 8ca5f63f17f..8ca5f63f17f 100644
--- a/Build/source/libs/icu-xetex/data/locales/nb_NO.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/nb_NO.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/nl.txt b/Build/source/libs/icu/icu-xetex/data/locales/nl.txt
index 96ff3b04e42..96ff3b04e42 100644
--- a/Build/source/libs/icu-xetex/data/locales/nl.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/nl.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/nl_BE.txt b/Build/source/libs/icu/icu-xetex/data/locales/nl_BE.txt
index 817d1eb7b2b..817d1eb7b2b 100644
--- a/Build/source/libs/icu-xetex/data/locales/nl_BE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/nl_BE.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/nl_NL.txt b/Build/source/libs/icu/icu-xetex/data/locales/nl_NL.txt
index 39a8290bd84..39a8290bd84 100644
--- a/Build/source/libs/icu-xetex/data/locales/nl_NL.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/nl_NL.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/nn.txt b/Build/source/libs/icu/icu-xetex/data/locales/nn.txt
index 1839cc7a9a4..1839cc7a9a4 100644
--- a/Build/source/libs/icu-xetex/data/locales/nn.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/nn.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/nn_NO.txt b/Build/source/libs/icu/icu-xetex/data/locales/nn_NO.txt
index a546b5266e9..a546b5266e9 100644
--- a/Build/source/libs/icu-xetex/data/locales/nn_NO.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/nn_NO.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/no.txt b/Build/source/libs/icu/icu-xetex/data/locales/no.txt
index 5b404eb6c59..5b404eb6c59 100644
--- a/Build/source/libs/icu-xetex/data/locales/no.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/no.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/no_NO.txt b/Build/source/libs/icu/icu-xetex/data/locales/no_NO.txt
index 08a5ad5d40d..08a5ad5d40d 100644
--- a/Build/source/libs/icu-xetex/data/locales/no_NO.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/no_NO.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/no_NO_NY.txt b/Build/source/libs/icu/icu-xetex/data/locales/no_NO_NY.txt
index cb48c0ff6ac..cb48c0ff6ac 100644
--- a/Build/source/libs/icu-xetex/data/locales/no_NO_NY.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/no_NO_NY.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/om.txt b/Build/source/libs/icu/icu-xetex/data/locales/om.txt
index f6466efd5d8..f6466efd5d8 100644
--- a/Build/source/libs/icu-xetex/data/locales/om.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/om.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/om_ET.txt b/Build/source/libs/icu/icu-xetex/data/locales/om_ET.txt
index 5a7d4f3b269..5a7d4f3b269 100644
--- a/Build/source/libs/icu-xetex/data/locales/om_ET.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/om_ET.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/om_KE.txt b/Build/source/libs/icu/icu-xetex/data/locales/om_KE.txt
index 170c4a9a031..170c4a9a031 100644
--- a/Build/source/libs/icu-xetex/data/locales/om_KE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/om_KE.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/or.txt b/Build/source/libs/icu/icu-xetex/data/locales/or.txt
index e77d254b2a2..e77d254b2a2 100644
--- a/Build/source/libs/icu-xetex/data/locales/or.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/or.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/or_IN.txt b/Build/source/libs/icu/icu-xetex/data/locales/or_IN.txt
index c68fcc16940..c68fcc16940 100644
--- a/Build/source/libs/icu-xetex/data/locales/or_IN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/or_IN.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/pa.txt b/Build/source/libs/icu/icu-xetex/data/locales/pa.txt
index 9795f14f4fd..9795f14f4fd 100644
--- a/Build/source/libs/icu-xetex/data/locales/pa.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/pa.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/pa_Guru.txt b/Build/source/libs/icu/icu-xetex/data/locales/pa_Guru.txt
index b09839f65d2..b09839f65d2 100644
--- a/Build/source/libs/icu-xetex/data/locales/pa_Guru.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/pa_Guru.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/pa_Guru_IN.txt b/Build/source/libs/icu/icu-xetex/data/locales/pa_Guru_IN.txt
index d45b166719f..d45b166719f 100644
--- a/Build/source/libs/icu-xetex/data/locales/pa_Guru_IN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/pa_Guru_IN.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/pa_IN.txt b/Build/source/libs/icu/icu-xetex/data/locales/pa_IN.txt
index 52347171a5f..52347171a5f 100644
--- a/Build/source/libs/icu-xetex/data/locales/pa_IN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/pa_IN.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/pl.txt b/Build/source/libs/icu/icu-xetex/data/locales/pl.txt
index 8f74d22e33e..8f74d22e33e 100644
--- a/Build/source/libs/icu-xetex/data/locales/pl.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/pl.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/pl_PL.txt b/Build/source/libs/icu/icu-xetex/data/locales/pl_PL.txt
index ff67aaa9d31..ff67aaa9d31 100644
--- a/Build/source/libs/icu-xetex/data/locales/pl_PL.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/pl_PL.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ps.txt b/Build/source/libs/icu/icu-xetex/data/locales/ps.txt
index a9ec9dcd14d..a9ec9dcd14d 100644
--- a/Build/source/libs/icu-xetex/data/locales/ps.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ps.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ps_AF.txt b/Build/source/libs/icu/icu-xetex/data/locales/ps_AF.txt
index d099a2ed692..d099a2ed692 100644
--- a/Build/source/libs/icu-xetex/data/locales/ps_AF.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ps_AF.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/pt.txt b/Build/source/libs/icu/icu-xetex/data/locales/pt.txt
index 3beb15d22e0..3beb15d22e0 100644
--- a/Build/source/libs/icu-xetex/data/locales/pt.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/pt.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/pt_BR.txt b/Build/source/libs/icu/icu-xetex/data/locales/pt_BR.txt
index d9899680699..d9899680699 100644
--- a/Build/source/libs/icu-xetex/data/locales/pt_BR.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/pt_BR.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/pt_PT.txt b/Build/source/libs/icu/icu-xetex/data/locales/pt_PT.txt
index b0dd24b8d04..b0dd24b8d04 100644
--- a/Build/source/libs/icu-xetex/data/locales/pt_PT.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/pt_PT.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/resfiles.mk b/Build/source/libs/icu/icu-xetex/data/locales/resfiles.mk
index 675f34bde2e..675f34bde2e 100644
--- a/Build/source/libs/icu-xetex/data/locales/resfiles.mk
+++ b/Build/source/libs/icu/icu-xetex/data/locales/resfiles.mk
diff --git a/Build/source/libs/icu-xetex/data/locales/reslocal.mk b/Build/source/libs/icu/icu-xetex/data/locales/reslocal.mk
index e21d4f9b4b0..e21d4f9b4b0 100644
--- a/Build/source/libs/icu-xetex/data/locales/reslocal.mk
+++ b/Build/source/libs/icu/icu-xetex/data/locales/reslocal.mk
diff --git a/Build/source/libs/icu-xetex/data/locales/ro.txt b/Build/source/libs/icu/icu-xetex/data/locales/ro.txt
index d04947f754e..d04947f754e 100644
--- a/Build/source/libs/icu-xetex/data/locales/ro.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ro.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ro_RO.txt b/Build/source/libs/icu/icu-xetex/data/locales/ro_RO.txt
index 31b753605f1..31b753605f1 100644
--- a/Build/source/libs/icu-xetex/data/locales/ro_RO.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ro_RO.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/root.txt b/Build/source/libs/icu/icu-xetex/data/locales/root.txt
index 2c9eb434a89..2c9eb434a89 100644
--- a/Build/source/libs/icu-xetex/data/locales/root.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/root.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ru.txt b/Build/source/libs/icu/icu-xetex/data/locales/ru.txt
index 6bf4d79fc6b..6bf4d79fc6b 100644
--- a/Build/source/libs/icu-xetex/data/locales/ru.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ru.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ru_RU.txt b/Build/source/libs/icu/icu-xetex/data/locales/ru_RU.txt
index 6c8f0c02299..6c8f0c02299 100644
--- a/Build/source/libs/icu-xetex/data/locales/ru_RU.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ru_RU.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ru_UA.txt b/Build/source/libs/icu/icu-xetex/data/locales/ru_UA.txt
index 7dc6b955abb..7dc6b955abb 100644
--- a/Build/source/libs/icu-xetex/data/locales/ru_UA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ru_UA.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sh.txt b/Build/source/libs/icu/icu-xetex/data/locales/sh.txt
index e836ec2904c..e836ec2904c 100644
--- a/Build/source/libs/icu-xetex/data/locales/sh.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sh.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sh_BA.txt b/Build/source/libs/icu/icu-xetex/data/locales/sh_BA.txt
index f099cd15f12..f099cd15f12 100644
--- a/Build/source/libs/icu-xetex/data/locales/sh_BA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sh_BA.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sh_CS.txt b/Build/source/libs/icu/icu-xetex/data/locales/sh_CS.txt
index 17963ea0b14..17963ea0b14 100644
--- a/Build/source/libs/icu-xetex/data/locales/sh_CS.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sh_CS.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sh_YU.txt b/Build/source/libs/icu/icu-xetex/data/locales/sh_YU.txt
index 7c808642be4..7c808642be4 100644
--- a/Build/source/libs/icu-xetex/data/locales/sh_YU.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sh_YU.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sk.txt b/Build/source/libs/icu/icu-xetex/data/locales/sk.txt
index 6ef2220b9ed..6ef2220b9ed 100644
--- a/Build/source/libs/icu-xetex/data/locales/sk.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sk.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sk_SK.txt b/Build/source/libs/icu/icu-xetex/data/locales/sk_SK.txt
index d9c16ce51da..d9c16ce51da 100644
--- a/Build/source/libs/icu-xetex/data/locales/sk_SK.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sk_SK.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sl.txt b/Build/source/libs/icu/icu-xetex/data/locales/sl.txt
index 8641fe38f50..8641fe38f50 100644
--- a/Build/source/libs/icu-xetex/data/locales/sl.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sl.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sl_SI.txt b/Build/source/libs/icu/icu-xetex/data/locales/sl_SI.txt
index d19fc9ab5e7..d19fc9ab5e7 100644
--- a/Build/source/libs/icu-xetex/data/locales/sl_SI.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sl_SI.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/so.txt b/Build/source/libs/icu/icu-xetex/data/locales/so.txt
index d32702a1c00..d32702a1c00 100644
--- a/Build/source/libs/icu-xetex/data/locales/so.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/so.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/so_DJ.txt b/Build/source/libs/icu/icu-xetex/data/locales/so_DJ.txt
index ebd70b0e0c8..ebd70b0e0c8 100644
--- a/Build/source/libs/icu-xetex/data/locales/so_DJ.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/so_DJ.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/so_ET.txt b/Build/source/libs/icu/icu-xetex/data/locales/so_ET.txt
index d82c5c13788..d82c5c13788 100644
--- a/Build/source/libs/icu-xetex/data/locales/so_ET.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/so_ET.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/so_KE.txt b/Build/source/libs/icu/icu-xetex/data/locales/so_KE.txt
index af42c698de8..af42c698de8 100644
--- a/Build/source/libs/icu-xetex/data/locales/so_KE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/so_KE.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/so_SO.txt b/Build/source/libs/icu/icu-xetex/data/locales/so_SO.txt
index da1d214f0f0..da1d214f0f0 100644
--- a/Build/source/libs/icu-xetex/data/locales/so_SO.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/so_SO.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sq.txt b/Build/source/libs/icu/icu-xetex/data/locales/sq.txt
index 48afbd10728..48afbd10728 100644
--- a/Build/source/libs/icu-xetex/data/locales/sq.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sq.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sq_AL.txt b/Build/source/libs/icu/icu-xetex/data/locales/sq_AL.txt
index bdb9eae447e..bdb9eae447e 100644
--- a/Build/source/libs/icu-xetex/data/locales/sq_AL.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sq_AL.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sr.txt b/Build/source/libs/icu/icu-xetex/data/locales/sr.txt
index 918f5dd4a5f..918f5dd4a5f 100644
--- a/Build/source/libs/icu-xetex/data/locales/sr.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sr.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sr_BA.txt b/Build/source/libs/icu/icu-xetex/data/locales/sr_BA.txt
index a383c607bdb..a383c607bdb 100644
--- a/Build/source/libs/icu-xetex/data/locales/sr_BA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sr_BA.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sr_CS.txt b/Build/source/libs/icu/icu-xetex/data/locales/sr_CS.txt
index f14d6eca600..f14d6eca600 100644
--- a/Build/source/libs/icu-xetex/data/locales/sr_CS.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sr_CS.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sr_Cyrl.txt b/Build/source/libs/icu/icu-xetex/data/locales/sr_Cyrl.txt
index 66b71cbe989..66b71cbe989 100644
--- a/Build/source/libs/icu-xetex/data/locales/sr_Cyrl.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sr_Cyrl.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sr_Cyrl_BA.txt b/Build/source/libs/icu/icu-xetex/data/locales/sr_Cyrl_BA.txt
index 752c99049d5..752c99049d5 100644
--- a/Build/source/libs/icu-xetex/data/locales/sr_Cyrl_BA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sr_Cyrl_BA.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sr_Cyrl_CS.txt b/Build/source/libs/icu/icu-xetex/data/locales/sr_Cyrl_CS.txt
index c56084a5608..c56084a5608 100644
--- a/Build/source/libs/icu-xetex/data/locales/sr_Cyrl_CS.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sr_Cyrl_CS.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sr_Cyrl_ME.txt b/Build/source/libs/icu/icu-xetex/data/locales/sr_Cyrl_ME.txt
index 05c9f886de8..05c9f886de8 100644
--- a/Build/source/libs/icu-xetex/data/locales/sr_Cyrl_ME.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sr_Cyrl_ME.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sr_Cyrl_RS.txt b/Build/source/libs/icu/icu-xetex/data/locales/sr_Cyrl_RS.txt
index f039d549c79..f039d549c79 100644
--- a/Build/source/libs/icu-xetex/data/locales/sr_Cyrl_RS.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sr_Cyrl_RS.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sr_Cyrl_YU.txt b/Build/source/libs/icu/icu-xetex/data/locales/sr_Cyrl_YU.txt
index ab39bcb60a8..ab39bcb60a8 100644
--- a/Build/source/libs/icu-xetex/data/locales/sr_Cyrl_YU.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sr_Cyrl_YU.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sr_Latn.txt b/Build/source/libs/icu/icu-xetex/data/locales/sr_Latn.txt
index 8e10d4c546b..8e10d4c546b 100644
--- a/Build/source/libs/icu-xetex/data/locales/sr_Latn.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sr_Latn.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sr_Latn_BA.txt b/Build/source/libs/icu/icu-xetex/data/locales/sr_Latn_BA.txt
index c8777828aab..c8777828aab 100644
--- a/Build/source/libs/icu-xetex/data/locales/sr_Latn_BA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sr_Latn_BA.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sr_Latn_CS.txt b/Build/source/libs/icu/icu-xetex/data/locales/sr_Latn_CS.txt
index 894912778d9..894912778d9 100644
--- a/Build/source/libs/icu-xetex/data/locales/sr_Latn_CS.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sr_Latn_CS.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sr_Latn_ME.txt b/Build/source/libs/icu/icu-xetex/data/locales/sr_Latn_ME.txt
index 91ae4859c45..91ae4859c45 100644
--- a/Build/source/libs/icu-xetex/data/locales/sr_Latn_ME.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sr_Latn_ME.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sr_Latn_RS.txt b/Build/source/libs/icu/icu-xetex/data/locales/sr_Latn_RS.txt
index 1f43d91c931..1f43d91c931 100644
--- a/Build/source/libs/icu-xetex/data/locales/sr_Latn_RS.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sr_Latn_RS.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sr_Latn_YU.txt b/Build/source/libs/icu/icu-xetex/data/locales/sr_Latn_YU.txt
index 5dadbc2068d..5dadbc2068d 100644
--- a/Build/source/libs/icu-xetex/data/locales/sr_Latn_YU.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sr_Latn_YU.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sr_ME.txt b/Build/source/libs/icu/icu-xetex/data/locales/sr_ME.txt
index 943fb535a19..943fb535a19 100644
--- a/Build/source/libs/icu-xetex/data/locales/sr_ME.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sr_ME.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sr_RS.txt b/Build/source/libs/icu/icu-xetex/data/locales/sr_RS.txt
index 9daba2ac403..9daba2ac403 100644
--- a/Build/source/libs/icu-xetex/data/locales/sr_RS.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sr_RS.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sr_YU.txt b/Build/source/libs/icu/icu-xetex/data/locales/sr_YU.txt
index 95fa6b1058c..95fa6b1058c 100644
--- a/Build/source/libs/icu-xetex/data/locales/sr_YU.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sr_YU.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sv.txt b/Build/source/libs/icu/icu-xetex/data/locales/sv.txt
index ab36b3c83e8..ab36b3c83e8 100644
--- a/Build/source/libs/icu-xetex/data/locales/sv.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sv.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sv_FI.txt b/Build/source/libs/icu/icu-xetex/data/locales/sv_FI.txt
index 4cda92c14ff..4cda92c14ff 100644
--- a/Build/source/libs/icu-xetex/data/locales/sv_FI.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sv_FI.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sv_SE.txt b/Build/source/libs/icu/icu-xetex/data/locales/sv_SE.txt
index d971a442213..d971a442213 100644
--- a/Build/source/libs/icu-xetex/data/locales/sv_SE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sv_SE.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sw.txt b/Build/source/libs/icu/icu-xetex/data/locales/sw.txt
index 01085363351..01085363351 100644
--- a/Build/source/libs/icu-xetex/data/locales/sw.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sw.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sw_KE.txt b/Build/source/libs/icu/icu-xetex/data/locales/sw_KE.txt
index 6d4aafc7588..6d4aafc7588 100644
--- a/Build/source/libs/icu-xetex/data/locales/sw_KE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sw_KE.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/sw_TZ.txt b/Build/source/libs/icu/icu-xetex/data/locales/sw_TZ.txt
index afedebec462..afedebec462 100644
--- a/Build/source/libs/icu-xetex/data/locales/sw_TZ.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/sw_TZ.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ta.txt b/Build/source/libs/icu/icu-xetex/data/locales/ta.txt
index 37385ac7cc7..37385ac7cc7 100644
--- a/Build/source/libs/icu-xetex/data/locales/ta.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ta.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ta_IN.txt b/Build/source/libs/icu/icu-xetex/data/locales/ta_IN.txt
index 85c106d88d3..85c106d88d3 100644
--- a/Build/source/libs/icu-xetex/data/locales/ta_IN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ta_IN.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/te.txt b/Build/source/libs/icu/icu-xetex/data/locales/te.txt
index f6252b1b503..f6252b1b503 100644
--- a/Build/source/libs/icu-xetex/data/locales/te.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/te.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/te_IN.txt b/Build/source/libs/icu/icu-xetex/data/locales/te_IN.txt
index 393029f0e8b..393029f0e8b 100644
--- a/Build/source/libs/icu-xetex/data/locales/te_IN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/te_IN.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/th.txt b/Build/source/libs/icu/icu-xetex/data/locales/th.txt
index 2d6df2426e1..2d6df2426e1 100644
--- a/Build/source/libs/icu-xetex/data/locales/th.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/th.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/th_TH.txt b/Build/source/libs/icu/icu-xetex/data/locales/th_TH.txt
index bad46c7141a..bad46c7141a 100644
--- a/Build/source/libs/icu-xetex/data/locales/th_TH.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/th_TH.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/th_TH_TRADITIONAL.txt b/Build/source/libs/icu/icu-xetex/data/locales/th_TH_TRADITIONAL.txt
index 93e888fc661..93e888fc661 100644
--- a/Build/source/libs/icu-xetex/data/locales/th_TH_TRADITIONAL.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/th_TH_TRADITIONAL.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ti.txt b/Build/source/libs/icu/icu-xetex/data/locales/ti.txt
index a0594eba40a..a0594eba40a 100644
--- a/Build/source/libs/icu-xetex/data/locales/ti.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ti.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ti_ER.txt b/Build/source/libs/icu/icu-xetex/data/locales/ti_ER.txt
index 15b8dad09e0..15b8dad09e0 100644
--- a/Build/source/libs/icu-xetex/data/locales/ti_ER.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ti_ER.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ti_ET.txt b/Build/source/libs/icu/icu-xetex/data/locales/ti_ET.txt
index bd6f17efe4e..bd6f17efe4e 100644
--- a/Build/source/libs/icu-xetex/data/locales/ti_ET.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ti_ET.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/tr.txt b/Build/source/libs/icu/icu-xetex/data/locales/tr.txt
index 3f5e9af7511..3f5e9af7511 100644
--- a/Build/source/libs/icu-xetex/data/locales/tr.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/tr.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/tr_TR.txt b/Build/source/libs/icu/icu-xetex/data/locales/tr_TR.txt
index 441936d5833..441936d5833 100644
--- a/Build/source/libs/icu-xetex/data/locales/tr_TR.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/tr_TR.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/uk.txt b/Build/source/libs/icu/icu-xetex/data/locales/uk.txt
index d1994f55a1a..d1994f55a1a 100644
--- a/Build/source/libs/icu-xetex/data/locales/uk.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/uk.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/uk_UA.txt b/Build/source/libs/icu/icu-xetex/data/locales/uk_UA.txt
index a24c70cd4aa..a24c70cd4aa 100644
--- a/Build/source/libs/icu-xetex/data/locales/uk_UA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/uk_UA.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ur.txt b/Build/source/libs/icu/icu-xetex/data/locales/ur.txt
index dae891885f1..dae891885f1 100644
--- a/Build/source/libs/icu-xetex/data/locales/ur.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ur.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ur_IN.txt b/Build/source/libs/icu/icu-xetex/data/locales/ur_IN.txt
index c2af5466807..c2af5466807 100644
--- a/Build/source/libs/icu-xetex/data/locales/ur_IN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ur_IN.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/ur_PK.txt b/Build/source/libs/icu/icu-xetex/data/locales/ur_PK.txt
index a58f85384d5..a58f85384d5 100644
--- a/Build/source/libs/icu-xetex/data/locales/ur_PK.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/ur_PK.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/uz.txt b/Build/source/libs/icu/icu-xetex/data/locales/uz.txt
index 49954225ccb..49954225ccb 100644
--- a/Build/source/libs/icu-xetex/data/locales/uz.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/uz.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/uz_AF.txt b/Build/source/libs/icu/icu-xetex/data/locales/uz_AF.txt
index 1376cb94000..1376cb94000 100644
--- a/Build/source/libs/icu-xetex/data/locales/uz_AF.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/uz_AF.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/uz_Arab.txt b/Build/source/libs/icu/icu-xetex/data/locales/uz_Arab.txt
index 49df1a84df8..49df1a84df8 100644
--- a/Build/source/libs/icu-xetex/data/locales/uz_Arab.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/uz_Arab.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/uz_Arab_AF.txt b/Build/source/libs/icu/icu-xetex/data/locales/uz_Arab_AF.txt
index 899004c7b3f..899004c7b3f 100644
--- a/Build/source/libs/icu-xetex/data/locales/uz_Arab_AF.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/uz_Arab_AF.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/uz_Cyrl.txt b/Build/source/libs/icu/icu-xetex/data/locales/uz_Cyrl.txt
index 46d84e4a4ae..46d84e4a4ae 100644
--- a/Build/source/libs/icu-xetex/data/locales/uz_Cyrl.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/uz_Cyrl.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/uz_Cyrl_UZ.txt b/Build/source/libs/icu/icu-xetex/data/locales/uz_Cyrl_UZ.txt
index 1c48726ea23..1c48726ea23 100644
--- a/Build/source/libs/icu-xetex/data/locales/uz_Cyrl_UZ.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/uz_Cyrl_UZ.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/uz_Latn.txt b/Build/source/libs/icu/icu-xetex/data/locales/uz_Latn.txt
index c3568432741..c3568432741 100644
--- a/Build/source/libs/icu-xetex/data/locales/uz_Latn.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/uz_Latn.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/uz_Latn_UZ.txt b/Build/source/libs/icu/icu-xetex/data/locales/uz_Latn_UZ.txt
index 797a2a593c4..797a2a593c4 100644
--- a/Build/source/libs/icu-xetex/data/locales/uz_Latn_UZ.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/uz_Latn_UZ.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/uz_UZ.txt b/Build/source/libs/icu/icu-xetex/data/locales/uz_UZ.txt
index a513a6eacc9..a513a6eacc9 100644
--- a/Build/source/libs/icu-xetex/data/locales/uz_UZ.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/uz_UZ.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/vi.txt b/Build/source/libs/icu/icu-xetex/data/locales/vi.txt
index 2658ff4ae7c..2658ff4ae7c 100644
--- a/Build/source/libs/icu-xetex/data/locales/vi.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/vi.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/vi_VN.txt b/Build/source/libs/icu/icu-xetex/data/locales/vi_VN.txt
index 834d01b4373..834d01b4373 100644
--- a/Build/source/libs/icu-xetex/data/locales/vi_VN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/vi_VN.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/zh.txt b/Build/source/libs/icu/icu-xetex/data/locales/zh.txt
index 16a4e2843a4..16a4e2843a4 100644
--- a/Build/source/libs/icu-xetex/data/locales/zh.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/zh.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/zh_CN.txt b/Build/source/libs/icu/icu-xetex/data/locales/zh_CN.txt
index 9b50c21d0f4..9b50c21d0f4 100644
--- a/Build/source/libs/icu-xetex/data/locales/zh_CN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/zh_CN.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/zh_HK.txt b/Build/source/libs/icu/icu-xetex/data/locales/zh_HK.txt
index e68f3dfddea..e68f3dfddea 100644
--- a/Build/source/libs/icu-xetex/data/locales/zh_HK.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/zh_HK.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/zh_Hans.txt b/Build/source/libs/icu/icu-xetex/data/locales/zh_Hans.txt
index e8310b32836..e8310b32836 100644
--- a/Build/source/libs/icu-xetex/data/locales/zh_Hans.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/zh_Hans.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/zh_Hans_CN.txt b/Build/source/libs/icu/icu-xetex/data/locales/zh_Hans_CN.txt
index f84680bf614..f84680bf614 100644
--- a/Build/source/libs/icu-xetex/data/locales/zh_Hans_CN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/zh_Hans_CN.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/zh_Hans_SG.txt b/Build/source/libs/icu/icu-xetex/data/locales/zh_Hans_SG.txt
index ca904bfed33..ca904bfed33 100644
--- a/Build/source/libs/icu-xetex/data/locales/zh_Hans_SG.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/zh_Hans_SG.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/zh_Hant.txt b/Build/source/libs/icu/icu-xetex/data/locales/zh_Hant.txt
index 9be60d80a16..9be60d80a16 100644
--- a/Build/source/libs/icu-xetex/data/locales/zh_Hant.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/zh_Hant.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/zh_Hant_HK.txt b/Build/source/libs/icu/icu-xetex/data/locales/zh_Hant_HK.txt
index 435c3d0ae54..435c3d0ae54 100644
--- a/Build/source/libs/icu-xetex/data/locales/zh_Hant_HK.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/zh_Hant_HK.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/zh_Hant_MO.txt b/Build/source/libs/icu/icu-xetex/data/locales/zh_Hant_MO.txt
index 4095bcfe6d6..4095bcfe6d6 100644
--- a/Build/source/libs/icu-xetex/data/locales/zh_Hant_MO.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/zh_Hant_MO.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/zh_Hant_TW.txt b/Build/source/libs/icu/icu-xetex/data/locales/zh_Hant_TW.txt
index c8598576329..c8598576329 100644
--- a/Build/source/libs/icu-xetex/data/locales/zh_Hant_TW.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/zh_Hant_TW.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/zh_MO.txt b/Build/source/libs/icu/icu-xetex/data/locales/zh_MO.txt
index 85eb48288d8..85eb48288d8 100644
--- a/Build/source/libs/icu-xetex/data/locales/zh_MO.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/zh_MO.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/zh_SG.txt b/Build/source/libs/icu/icu-xetex/data/locales/zh_SG.txt
index dbe075dfe56..dbe075dfe56 100644
--- a/Build/source/libs/icu-xetex/data/locales/zh_SG.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/zh_SG.txt
diff --git a/Build/source/libs/icu-xetex/data/locales/zh_TW.txt b/Build/source/libs/icu/icu-xetex/data/locales/zh_TW.txt
index 4f008b78587..4f008b78587 100644
--- a/Build/source/libs/icu-xetex/data/locales/zh_TW.txt
+++ b/Build/source/libs/icu/icu-xetex/data/locales/zh_TW.txt
diff --git a/Build/source/libs/icu-xetex/data/makedata.mak b/Build/source/libs/icu/icu-xetex/data/makedata.mak
index 2bcce4544ac..2bcce4544ac 100644
--- a/Build/source/libs/icu-xetex/data/makedata.mak
+++ b/Build/source/libs/icu/icu-xetex/data/makedata.mak
diff --git a/Build/source/libs/icu-xetex/data/makedata.vcproj b/Build/source/libs/icu/icu-xetex/data/makedata.vcproj
index 0bacc4a00ff..0bacc4a00ff 100644
--- a/Build/source/libs/icu-xetex/data/makedata.vcproj
+++ b/Build/source/libs/icu/icu-xetex/data/makedata.vcproj
diff --git a/Build/source/libs/icu-xetex/data/mappings/cns-11643-1992.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/cns-11643-1992.ucm
index f7049534f14..f7049534f14 100644
--- a/Build/source/libs/icu-xetex/data/mappings/cns-11643-1992.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/cns-11643-1992.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/convrtrs.txt b/Build/source/libs/icu/icu-xetex/data/mappings/convrtrs.txt
index 80a5cbef520..80a5cbef520 100644
--- a/Build/source/libs/icu-xetex/data/mappings/convrtrs.txt
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/convrtrs.txt
diff --git a/Build/source/libs/icu-xetex/data/mappings/ebcdic-xml-us.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ebcdic-xml-us.ucm
index 303b8a60beb..303b8a60beb 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ebcdic-xml-us.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ebcdic-xml-us.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/gb18030.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/gb18030.ucm
index b46166353f6..b46166353f6 100644
--- a/Build/source/libs/icu-xetex/data/mappings/gb18030.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/gb18030.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1006_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1006_P100-1995.ucm
index 3d222891fa9..3d222891fa9 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1006_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1006_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1025_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1025_P100-1995.ucm
index 28b5b1fbed2..28b5b1fbed2 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1025_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1025_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1026_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1026_P100-1995.ucm
index 7c092e1af42..7c092e1af42 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1026_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1026_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1047_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1047_P100-1995.ucm
index ac87a3cb2ce..ac87a3cb2ce 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1047_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1047_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1051_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1051_P100-1995.ucm
index 31c01c94fee..31c01c94fee 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1051_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1051_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1089_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1089_P100-1995.ucm
index e61e20d8e56..e61e20d8e56 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1089_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1089_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1097_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1097_P100-1995.ucm
index e289b7b3c0b..e289b7b3c0b 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1097_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1097_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1098_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1098_P100-1995.ucm
index 56c03b73149..56c03b73149 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1098_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1098_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1112_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1112_P100-1995.ucm
index ba0015500b4..ba0015500b4 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1112_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1112_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1122_P100-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1122_P100-1999.ucm
index e32c9521b3c..e32c9521b3c 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1122_P100-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1122_P100-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1123_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1123_P100-1995.ucm
index 659b983a75d..659b983a75d 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1123_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1123_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1124_P100-1996.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1124_P100-1996.ucm
index 793e40406c7..793e40406c7 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1124_P100-1996.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1124_P100-1996.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1125_P100-1997.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1125_P100-1997.ucm
index f91dfd93999..f91dfd93999 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1125_P100-1997.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1125_P100-1997.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1129_P100-1997.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1129_P100-1997.ucm
index b6d321d89cb..b6d321d89cb 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1129_P100-1997.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1129_P100-1997.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1130_P100-1997.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1130_P100-1997.ucm
index 1c9c4e171b2..1c9c4e171b2 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1130_P100-1997.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1130_P100-1997.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1131_P100-1997.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1131_P100-1997.ucm
index 4e887f7410e..4e887f7410e 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1131_P100-1997.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1131_P100-1997.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1132_P100-1998.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1132_P100-1998.ucm
index 4de3712ac59..4de3712ac59 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1132_P100-1998.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1132_P100-1998.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1133_P100-1997.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1133_P100-1997.ucm
index db771218f78..db771218f78 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1133_P100-1997.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1133_P100-1997.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1137_P100-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1137_P100-1999.ucm
index 68f965859b6..68f965859b6 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1137_P100-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1137_P100-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1140_P100-1997.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1140_P100-1997.ucm
index 45c0e65335d..45c0e65335d 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1140_P100-1997.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1140_P100-1997.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1141_P100-1997.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1141_P100-1997.ucm
index 5af386b92e7..5af386b92e7 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1141_P100-1997.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1141_P100-1997.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1142_P100-1997.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1142_P100-1997.ucm
index f42448ef37f..f42448ef37f 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1142_P100-1997.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1142_P100-1997.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1143_P100-1997.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1143_P100-1997.ucm
index 6db7726544e..6db7726544e 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1143_P100-1997.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1143_P100-1997.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1144_P100-1997.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1144_P100-1997.ucm
index 3468fce6957..3468fce6957 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1144_P100-1997.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1144_P100-1997.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1145_P100-1997.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1145_P100-1997.ucm
index 7f3f8e9c7bf..7f3f8e9c7bf 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1145_P100-1997.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1145_P100-1997.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1146_P100-1997.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1146_P100-1997.ucm
index d3b877fb339..d3b877fb339 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1146_P100-1997.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1146_P100-1997.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1147_P100-1997.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1147_P100-1997.ucm
index 4722ebb995a..4722ebb995a 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1147_P100-1997.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1147_P100-1997.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1148_P100-1997.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1148_P100-1997.ucm
index 8a791c6f705..8a791c6f705 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1148_P100-1997.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1148_P100-1997.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1149_P100-1997.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1149_P100-1997.ucm
index 201363f148a..201363f148a 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1149_P100-1997.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1149_P100-1997.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1153_P100-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1153_P100-1999.ucm
index 50dc9273caa..50dc9273caa 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1153_P100-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1153_P100-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1154_P100-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1154_P100-1999.ucm
index 342b865e7e0..342b865e7e0 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1154_P100-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1154_P100-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1155_P100-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1155_P100-1999.ucm
index e5ee3bdbd72..e5ee3bdbd72 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1155_P100-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1155_P100-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1156_P100-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1156_P100-1999.ucm
index 2fc3bb04ffa..2fc3bb04ffa 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1156_P100-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1156_P100-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1157_P100-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1157_P100-1999.ucm
index 5dd1e2647fc..5dd1e2647fc 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1157_P100-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1157_P100-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1158_P100-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1158_P100-1999.ucm
index e6c76b9e5cf..e6c76b9e5cf 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1158_P100-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1158_P100-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1160_P100-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1160_P100-1999.ucm
index ebe6f902644..ebe6f902644 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1160_P100-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1160_P100-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1162_P100-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1162_P100-1999.ucm
index 2e869a665b8..2e869a665b8 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1162_P100-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1162_P100-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1164_P100-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1164_P100-1999.ucm
index 37e52593e99..37e52593e99 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1164_P100-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1164_P100-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1168_P100-2002.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1168_P100-2002.ucm
index d7edc517f4a..d7edc517f4a 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1168_P100-2002.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1168_P100-2002.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1250_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1250_P100-1995.ucm
index 7dc144d0804..7dc144d0804 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1250_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1250_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1251_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1251_P100-1995.ucm
index fc8448025a1..fc8448025a1 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1251_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1251_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1252_P100-2000.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1252_P100-2000.ucm
index 3fbcc285dfb..3fbcc285dfb 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1252_P100-2000.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1252_P100-2000.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1253_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1253_P100-1995.ucm
index a5aec474b7a..a5aec474b7a 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1253_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1253_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1254_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1254_P100-1995.ucm
index f70fd4a23ea..f70fd4a23ea 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1254_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1254_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1255_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1255_P100-1995.ucm
index 7b33f5ec14c..7b33f5ec14c 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1255_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1255_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1256_P110-1997.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1256_P110-1997.ucm
index d2a17a0fd62..d2a17a0fd62 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1256_P110-1997.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1256_P110-1997.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1257_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1257_P100-1995.ucm
index 567bcc0dac2..567bcc0dac2 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1257_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1257_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1258_P100-1997.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1258_P100-1997.ucm
index bec4439250c..bec4439250c 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1258_P100-1997.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1258_P100-1997.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-12712_P100-1998.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-12712_P100-1998.ucm
index bdf795f81d4..bdf795f81d4 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-12712_P100-1998.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-12712_P100-1998.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1276_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1276_P100-1995.ucm
index dd9cacaac7e..dd9cacaac7e 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1276_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1276_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1363_P110-1997.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1363_P110-1997.ucm
index 0f55a2b3701..0f55a2b3701 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1363_P110-1997.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1363_P110-1997.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1363_P11B-1998.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1363_P11B-1998.ucm
index b70c466e103..b70c466e103 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1363_P11B-1998.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1363_P11B-1998.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1364_P110-2007.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1364_P110-2007.ucm
index 9fbc463c0ee..9fbc463c0ee 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1364_P110-2007.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1364_P110-2007.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1371_P100-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1371_P100-1999.ucm
index d625170b095..d625170b095 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1371_P100-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1371_P100-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1373_P100-2002.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1373_P100-2002.ucm
index 250fc215f2e..250fc215f2e 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1373_P100-2002.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1373_P100-2002.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1375_P100-2007.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1375_P100-2007.ucm
index 6bdd2281a3f..6bdd2281a3f 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1375_P100-2007.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1375_P100-2007.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1383_P110-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1383_P110-1999.ucm
index 1ef97a32f06..1ef97a32f06 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1383_P110-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1383_P110-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1386_P100-2001.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1386_P100-2001.ucm
index f2446d7c56b..f2446d7c56b 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1386_P100-2001.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1386_P100-2001.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1388_P103-2001.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1388_P103-2001.ucm
index fb6fcb33035..fb6fcb33035 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1388_P103-2001.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1388_P103-2001.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1390_P110-2003.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1390_P110-2003.ucm
index 533f4ee3284..533f4ee3284 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1390_P110-2003.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1390_P110-2003.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-1399_P110-2003.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1399_P110-2003.ucm
index 43ea0c0ab9e..43ea0c0ab9e 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-1399_P110-2003.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-1399_P110-2003.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-16684_P110-2003.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-16684_P110-2003.ucm
index 8b94cc6a99a..8b94cc6a99a 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-16684_P110-2003.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-16684_P110-2003.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-16804_X110-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-16804_X110-1999.ucm
index 4e7a2176d9d..4e7a2176d9d 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-16804_X110-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-16804_X110-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-273_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-273_P100-1995.ucm
index b2379bcf0b3..b2379bcf0b3 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-273_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-273_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-277_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-277_P100-1995.ucm
index 4ce6360f8c9..4ce6360f8c9 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-277_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-277_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-278_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-278_P100-1995.ucm
index 19d2d85f906..19d2d85f906 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-278_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-278_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-280_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-280_P100-1995.ucm
index 87f88e7472a..87f88e7472a 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-280_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-280_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-284_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-284_P100-1995.ucm
index 0922246abc7..0922246abc7 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-284_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-284_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-285_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-285_P100-1995.ucm
index 6fccf569adb..6fccf569adb 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-285_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-285_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-290_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-290_P100-1995.ucm
index eb2b0d24cef..eb2b0d24cef 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-290_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-290_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-297_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-297_P100-1995.ucm
index b6cebcc9703..b6cebcc9703 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-297_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-297_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-33722_P120-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-33722_P120-1999.ucm
index f0f455d714d..f0f455d714d 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-33722_P120-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-33722_P120-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-33722_P12A_P12A-2004_U2.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-33722_P12A_P12A-2004_U2.ucm
index 9dac0aeaec6..9dac0aeaec6 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-33722_P12A_P12A-2004_U2.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-33722_P12A_P12A-2004_U2.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-37_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-37_P100-1995.ucm
index 503cb7965f1..503cb7965f1 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-37_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-37_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-420_X120-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-420_X120-1999.ucm
index 746128df0dd..746128df0dd 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-420_X120-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-420_X120-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-424_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-424_P100-1995.ucm
index 6b4aa461e26..6b4aa461e26 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-424_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-424_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-437_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-437_P100-1995.ucm
index f58a681d1c0..f58a681d1c0 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-437_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-437_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-4517_P100-2005.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-4517_P100-2005.ucm
index c7a03c898c9..c7a03c898c9 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-4517_P100-2005.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-4517_P100-2005.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-4899_P100-1998.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-4899_P100-1998.ucm
index 3460613f481..3460613f481 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-4899_P100-1998.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-4899_P100-1998.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-4909_P100-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-4909_P100-1999.ucm
index f2c8b18f3d7..f2c8b18f3d7 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-4909_P100-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-4909_P100-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-4971_P100-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-4971_P100-1999.ucm
index 236c53269f6..236c53269f6 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-4971_P100-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-4971_P100-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-500_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-500_P100-1995.ucm
index 760e2445fb5..760e2445fb5 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-500_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-500_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-5012_P100-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-5012_P100-1999.ucm
index 646589e67df..646589e67df 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-5012_P100-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-5012_P100-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-5123_P100-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-5123_P100-1999.ucm
index 7acd3c90b3a..7acd3c90b3a 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-5123_P100-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-5123_P100-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-5346_P100-1998.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-5346_P100-1998.ucm
index cb8b45d4e3a..cb8b45d4e3a 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-5346_P100-1998.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-5346_P100-1998.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-5347_P100-1998.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-5347_P100-1998.ucm
index 3a8323c6722..3a8323c6722 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-5347_P100-1998.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-5347_P100-1998.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-5348_P100-1997.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-5348_P100-1997.ucm
index fd2a631ccd7..fd2a631ccd7 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-5348_P100-1997.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-5348_P100-1997.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-5349_P100-1998.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-5349_P100-1998.ucm
index fec0e65632e..fec0e65632e 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-5349_P100-1998.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-5349_P100-1998.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-5350_P100-1998.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-5350_P100-1998.ucm
index f056292ad36..f056292ad36 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-5350_P100-1998.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-5350_P100-1998.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-5351_P100-1998.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-5351_P100-1998.ucm
index 97d5d43fcb9..97d5d43fcb9 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-5351_P100-1998.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-5351_P100-1998.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-5352_P100-1998.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-5352_P100-1998.ucm
index 4385bb330c5..4385bb330c5 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-5352_P100-1998.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-5352_P100-1998.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-5353_P100-1998.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-5353_P100-1998.ucm
index eb9e54c417f..eb9e54c417f 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-5353_P100-1998.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-5353_P100-1998.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-5354_P100-1998.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-5354_P100-1998.ucm
index 3e75771dfd0..3e75771dfd0 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-5354_P100-1998.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-5354_P100-1998.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-5471_P100-2006.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-5471_P100-2006.ucm
index ff37fd91044..ff37fd91044 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-5471_P100-2006.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-5471_P100-2006.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-5478_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-5478_P100-1995.ucm
index 44111c881a3..44111c881a3 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-5478_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-5478_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-720_P100-1997.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-720_P100-1997.ucm
index fb8c4151798..fb8c4151798 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-720_P100-1997.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-720_P100-1997.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-737_P100-1997.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-737_P100-1997.ucm
index 60d5529b1c9..60d5529b1c9 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-737_P100-1997.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-737_P100-1997.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-775_P100-1996.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-775_P100-1996.ucm
index 08fe6a2d89c..08fe6a2d89c 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-775_P100-1996.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-775_P100-1996.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-803_P100-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-803_P100-1999.ucm
index cf0065762fe..cf0065762fe 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-803_P100-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-803_P100-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-813_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-813_P100-1995.ucm
index 69ed8cc15d2..69ed8cc15d2 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-813_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-813_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-838_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-838_P100-1995.ucm
index aef304779eb..aef304779eb 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-838_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-838_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-8482_P100-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-8482_P100-1999.ucm
index 1678f2cf448..1678f2cf448 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-8482_P100-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-8482_P100-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-850_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-850_P100-1995.ucm
index 648fa3553d5..648fa3553d5 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-850_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-850_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-851_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-851_P100-1995.ucm
index 965e3727a24..965e3727a24 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-851_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-851_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-852_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-852_P100-1995.ucm
index ff1d6fd272f..ff1d6fd272f 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-852_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-852_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-855_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-855_P100-1995.ucm
index ecfaf010f1f..ecfaf010f1f 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-855_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-855_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-856_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-856_P100-1995.ucm
index 8b891176993..8b891176993 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-856_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-856_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-857_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-857_P100-1995.ucm
index 0ba9ef3f5d3..0ba9ef3f5d3 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-857_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-857_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-858_P100-1997.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-858_P100-1997.ucm
index 0e9b08bcb83..0e9b08bcb83 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-858_P100-1997.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-858_P100-1997.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-860_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-860_P100-1995.ucm
index ef896604613..ef896604613 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-860_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-860_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-861_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-861_P100-1995.ucm
index e83ff6723c7..e83ff6723c7 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-861_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-861_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-862_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-862_P100-1995.ucm
index f40a9a941db..f40a9a941db 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-862_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-862_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-863_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-863_P100-1995.ucm
index 767a96c1f71..767a96c1f71 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-863_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-863_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-864_X110-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-864_X110-1999.ucm
index 7906f7e8885..7906f7e8885 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-864_X110-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-864_X110-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-865_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-865_P100-1995.ucm
index df2a1e8a4df..df2a1e8a4df 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-865_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-865_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-866_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-866_P100-1995.ucm
index caaa6145d7c..caaa6145d7c 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-866_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-866_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-867_P100-1998.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-867_P100-1998.ucm
index 335aea9df3e..335aea9df3e 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-867_P100-1998.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-867_P100-1998.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-868_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-868_P100-1995.ucm
index 007ce779cee..007ce779cee 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-868_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-868_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-869_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-869_P100-1995.ucm
index 24c885d9811..24c885d9811 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-869_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-869_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-870_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-870_P100-1995.ucm
index 4cc25f63540..4cc25f63540 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-870_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-870_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-871_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-871_P100-1995.ucm
index ef3d07d12ab..ef3d07d12ab 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-871_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-871_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-874_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-874_P100-1995.ucm
index def4187778b..def4187778b 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-874_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-874_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-875_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-875_P100-1995.ucm
index 43b8b720c1e..43b8b720c1e 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-875_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-875_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-878_P100-1996.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-878_P100-1996.ucm
index 18c6543dfce..18c6543dfce 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-878_P100-1996.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-878_P100-1996.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-897_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-897_P100-1995.ucm
index fd1ac6d7a97..fd1ac6d7a97 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-897_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-897_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-9005_X110-2007.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-9005_X110-2007.ucm
index 1bbe5d89ea7..1bbe5d89ea7 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-9005_X110-2007.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-9005_X110-2007.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-901_P100-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-901_P100-1999.ucm
index d19f6630d95..d19f6630d95 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-901_P100-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-901_P100-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-902_P100-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-902_P100-1999.ucm
index cc7f89a20af..cc7f89a20af 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-902_P100-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-902_P100-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-9067_X100-2005.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-9067_X100-2005.ucm
index e58eceec560..e58eceec560 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-9067_X100-2005.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-9067_X100-2005.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-912_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-912_P100-1995.ucm
index 0949cff4c6b..0949cff4c6b 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-912_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-912_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-913_P100-2000.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-913_P100-2000.ucm
index 12fbf5fc8c1..12fbf5fc8c1 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-913_P100-2000.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-913_P100-2000.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-914_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-914_P100-1995.ucm
index 40509ad3de6..40509ad3de6 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-914_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-914_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-915_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-915_P100-1995.ucm
index bb0bc193207..bb0bc193207 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-915_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-915_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-916_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-916_P100-1995.ucm
index 2ce222b41be..2ce222b41be 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-916_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-916_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-918_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-918_P100-1995.ucm
index 080cf437894..080cf437894 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-918_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-918_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-920_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-920_P100-1995.ucm
index e4407c77242..e4407c77242 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-920_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-920_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-921_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-921_P100-1995.ucm
index f35f886a0db..f35f886a0db 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-921_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-921_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-922_P100-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-922_P100-1999.ucm
index e0ef437fd64..e0ef437fd64 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-922_P100-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-922_P100-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-923_P100-1998.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-923_P100-1998.ucm
index b0d665437c1..b0d665437c1 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-923_P100-1998.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-923_P100-1998.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-930_P120-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-930_P120-1999.ucm
index 07c51660f6c..07c51660f6c 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-930_P120-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-930_P120-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-933_P110-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-933_P110-1995.ucm
index 4669799eedb..4669799eedb 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-933_P110-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-933_P110-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-935_P110-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-935_P110-1999.ucm
index 0b96071e8fd..0b96071e8fd 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-935_P110-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-935_P110-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-937_P110-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-937_P110-1999.ucm
index 75fc4b883cb..75fc4b883cb 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-937_P110-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-937_P110-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-939_P120-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-939_P120-1999.ucm
index 266fe0d5d40..266fe0d5d40 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-939_P120-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-939_P120-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-942_P12A-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-942_P12A-1999.ucm
index 601a2b7122f..601a2b7122f 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-942_P12A-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-942_P12A-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-943_P130-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-943_P130-1999.ucm
index 9d8801b252b..9d8801b252b 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-943_P130-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-943_P130-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-943_P15A-2003.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-943_P15A-2003.ucm
index 02f0f2dc86b..02f0f2dc86b 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-943_P15A-2003.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-943_P15A-2003.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-9447_P100-2002.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-9447_P100-2002.ucm
index 94476bb1e78..94476bb1e78 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-9447_P100-2002.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-9447_P100-2002.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-9448_X100-2005.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-9448_X100-2005.ucm
index 25d74cf2834..25d74cf2834 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-9448_X100-2005.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-9448_X100-2005.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-9449_P100-2002.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-9449_P100-2002.ucm
index 576b51f3a65..576b51f3a65 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-9449_P100-2002.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-9449_P100-2002.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-949_P110-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-949_P110-1999.ucm
index 76315a5df1b..76315a5df1b 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-949_P110-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-949_P110-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-949_P11A-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-949_P11A-1999.ucm
index 1e118027379..1e118027379 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-949_P11A-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-949_P11A-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-950_P110-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-950_P110-1999.ucm
index a804916630f..a804916630f 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-950_P110-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-950_P110-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-954_P101-2007.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-954_P101-2007.ucm
index 29903dc2e83..29903dc2e83 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-954_P101-2007.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-954_P101-2007.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-964_P110-1999.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-964_P110-1999.ucm
index 16476fd00b4..16476fd00b4 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-964_P110-1999.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-964_P110-1999.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-970_P110_P110-2006_U2.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-970_P110_P110-2006_U2.ucm
index b8bf9fd8a2f..b8bf9fd8a2f 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-970_P110_P110-2006_U2.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-970_P110_P110-2006_U2.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ibm-971_P100-1995.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-971_P100-1995.ucm
index 5c528ce7479..5c528ce7479 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ibm-971_P100-1995.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ibm-971_P100-1995.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/icu-internal-25546.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/icu-internal-25546.ucm
index a7a87c33f47..a7a87c33f47 100644
--- a/Build/source/libs/icu-xetex/data/mappings/icu-internal-25546.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/icu-internal-25546.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/iso-8859_10-1998.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/iso-8859_10-1998.ucm
index 4d4c3f81c52..4d4c3f81c52 100644
--- a/Build/source/libs/icu-xetex/data/mappings/iso-8859_10-1998.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/iso-8859_10-1998.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/iso-8859_11-2001.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/iso-8859_11-2001.ucm
index 2108f19c216..2108f19c216 100644
--- a/Build/source/libs/icu-xetex/data/mappings/iso-8859_11-2001.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/iso-8859_11-2001.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/iso-8859_14-1998.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/iso-8859_14-1998.ucm
index 5bb5ca4b1a4..5bb5ca4b1a4 100644
--- a/Build/source/libs/icu-xetex/data/mappings/iso-8859_14-1998.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/iso-8859_14-1998.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/iso-ir-165.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/iso-ir-165.ucm
index 8af25b07ec4..8af25b07ec4 100644
--- a/Build/source/libs/icu-xetex/data/mappings/iso-ir-165.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/iso-ir-165.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/jisx-208.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/jisx-208.ucm
index 5a6d99e5922..5a6d99e5922 100644
--- a/Build/source/libs/icu-xetex/data/mappings/jisx-208.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/jisx-208.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/jisx-212.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/jisx-212.ucm
index 4ea6dd38701..4ea6dd38701 100644
--- a/Build/source/libs/icu-xetex/data/mappings/jisx-212.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/jisx-212.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/lmb-excp.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/lmb-excp.ucm
index 01095d41567..01095d41567 100644
--- a/Build/source/libs/icu-xetex/data/mappings/lmb-excp.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/lmb-excp.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/macos-0_2-10.2.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/macos-0_2-10.2.ucm
index 2702df83356..2702df83356 100644
--- a/Build/source/libs/icu-xetex/data/mappings/macos-0_2-10.2.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/macos-0_2-10.2.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/macos-29-10.2.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/macos-29-10.2.ucm
index 3404ad6e972..3404ad6e972 100644
--- a/Build/source/libs/icu-xetex/data/mappings/macos-29-10.2.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/macos-29-10.2.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/macos-35-10.2.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/macos-35-10.2.ucm
index 5b246ecc341..5b246ecc341 100644
--- a/Build/source/libs/icu-xetex/data/mappings/macos-35-10.2.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/macos-35-10.2.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/macos-6_2-10.4.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/macos-6_2-10.4.ucm
index 7bce24917d8..7bce24917d8 100644
--- a/Build/source/libs/icu-xetex/data/mappings/macos-6_2-10.4.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/macos-6_2-10.4.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/macos-7_3-10.2.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/macos-7_3-10.2.ucm
index 8af97eee8f7..8af97eee8f7 100644
--- a/Build/source/libs/icu-xetex/data/mappings/macos-7_3-10.2.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/macos-7_3-10.2.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/ucmcore.mk b/Build/source/libs/icu/icu-xetex/data/mappings/ucmcore.mk
index fd186093e73..fd186093e73 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ucmcore.mk
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ucmcore.mk
diff --git a/Build/source/libs/icu-xetex/data/mappings/ucmebcdic.mk b/Build/source/libs/icu/icu-xetex/data/mappings/ucmebcdic.mk
index f4c0e04267c..f4c0e04267c 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ucmebcdic.mk
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ucmebcdic.mk
diff --git a/Build/source/libs/icu-xetex/data/mappings/ucmfiles.mk b/Build/source/libs/icu/icu-xetex/data/mappings/ucmfiles.mk
index 21b405528ae..21b405528ae 100644
--- a/Build/source/libs/icu-xetex/data/mappings/ucmfiles.mk
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/ucmfiles.mk
diff --git a/Build/source/libs/icu-xetex/data/mappings/windows-874-2000.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/windows-874-2000.ucm
index ace93e9f210..ace93e9f210 100644
--- a/Build/source/libs/icu-xetex/data/mappings/windows-874-2000.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/windows-874-2000.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/windows-936-2000.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/windows-936-2000.ucm
index 6cfafabd9dc..6cfafabd9dc 100644
--- a/Build/source/libs/icu-xetex/data/mappings/windows-936-2000.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/windows-936-2000.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/windows-949-2000.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/windows-949-2000.ucm
index 290080a426b..290080a426b 100644
--- a/Build/source/libs/icu-xetex/data/mappings/windows-949-2000.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/windows-949-2000.ucm
diff --git a/Build/source/libs/icu-xetex/data/mappings/windows-950-2000.ucm b/Build/source/libs/icu/icu-xetex/data/mappings/windows-950-2000.ucm
index 99df8798bf1..99df8798bf1 100644
--- a/Build/source/libs/icu-xetex/data/mappings/windows-950-2000.ucm
+++ b/Build/source/libs/icu/icu-xetex/data/mappings/windows-950-2000.ucm
diff --git a/Build/source/libs/icu-xetex/data/misc/NamePrepProfile.txt b/Build/source/libs/icu/icu-xetex/data/misc/NamePrepProfile.txt
index 46e90866683..46e90866683 100644
--- a/Build/source/libs/icu-xetex/data/misc/NamePrepProfile.txt
+++ b/Build/source/libs/icu/icu-xetex/data/misc/NamePrepProfile.txt
diff --git a/Build/source/libs/icu-xetex/data/misc/icudata.rc b/Build/source/libs/icu/icu-xetex/data/misc/icudata.rc
index 36ed3f8c96b..36ed3f8c96b 100644
--- a/Build/source/libs/icu-xetex/data/misc/icudata.rc
+++ b/Build/source/libs/icu/icu-xetex/data/misc/icudata.rc
diff --git a/Build/source/libs/icu-xetex/data/misc/metazoneInfo.txt b/Build/source/libs/icu/icu-xetex/data/misc/metazoneInfo.txt
index 8a6a641e876..8a6a641e876 100755
--- a/Build/source/libs/icu-xetex/data/misc/metazoneInfo.txt
+++ b/Build/source/libs/icu/icu-xetex/data/misc/metazoneInfo.txt
diff --git a/Build/source/libs/icu-xetex/data/misc/miscfiles.mk b/Build/source/libs/icu/icu-xetex/data/misc/miscfiles.mk
index e7b56ab2136..e7b56ab2136 100644
--- a/Build/source/libs/icu-xetex/data/misc/miscfiles.mk
+++ b/Build/source/libs/icu/icu-xetex/data/misc/miscfiles.mk
diff --git a/Build/source/libs/icu-xetex/data/misc/misclocal.mk b/Build/source/libs/icu/icu-xetex/data/misc/misclocal.mk
index 45cd1907f61..45cd1907f61 100644
--- a/Build/source/libs/icu-xetex/data/misc/misclocal.mk
+++ b/Build/source/libs/icu/icu-xetex/data/misc/misclocal.mk
diff --git a/Build/source/libs/icu-xetex/data/misc/supplementalData.txt b/Build/source/libs/icu/icu-xetex/data/misc/supplementalData.txt
index a85f102093a..a85f102093a 100644
--- a/Build/source/libs/icu-xetex/data/misc/supplementalData.txt
+++ b/Build/source/libs/icu/icu-xetex/data/misc/supplementalData.txt
diff --git a/Build/source/libs/icu-xetex/data/misc/zoneinfo.txt b/Build/source/libs/icu/icu-xetex/data/misc/zoneinfo.txt
index e9e655c88e1..e9e655c88e1 100644
--- a/Build/source/libs/icu-xetex/data/misc/zoneinfo.txt
+++ b/Build/source/libs/icu/icu-xetex/data/misc/zoneinfo.txt
diff --git a/Build/source/libs/icu-xetex/data/rbnf/da.txt b/Build/source/libs/icu/icu-xetex/data/rbnf/da.txt
index 5b1d300cc3e..5b1d300cc3e 100644
--- a/Build/source/libs/icu-xetex/data/rbnf/da.txt
+++ b/Build/source/libs/icu/icu-xetex/data/rbnf/da.txt
diff --git a/Build/source/libs/icu-xetex/data/rbnf/de.txt b/Build/source/libs/icu/icu-xetex/data/rbnf/de.txt
index 7eef7237f66..7eef7237f66 100644
--- a/Build/source/libs/icu-xetex/data/rbnf/de.txt
+++ b/Build/source/libs/icu/icu-xetex/data/rbnf/de.txt
diff --git a/Build/source/libs/icu-xetex/data/rbnf/el.txt b/Build/source/libs/icu/icu-xetex/data/rbnf/el.txt
index f54d3a5721f..f54d3a5721f 100644
--- a/Build/source/libs/icu-xetex/data/rbnf/el.txt
+++ b/Build/source/libs/icu/icu-xetex/data/rbnf/el.txt
diff --git a/Build/source/libs/icu-xetex/data/rbnf/en.txt b/Build/source/libs/icu/icu-xetex/data/rbnf/en.txt
index 3cbcecb2825..3cbcecb2825 100644
--- a/Build/source/libs/icu-xetex/data/rbnf/en.txt
+++ b/Build/source/libs/icu/icu-xetex/data/rbnf/en.txt
diff --git a/Build/source/libs/icu-xetex/data/rbnf/en_GB.txt b/Build/source/libs/icu/icu-xetex/data/rbnf/en_GB.txt
index 18a5fdfc4e7..18a5fdfc4e7 100644
--- a/Build/source/libs/icu-xetex/data/rbnf/en_GB.txt
+++ b/Build/source/libs/icu/icu-xetex/data/rbnf/en_GB.txt
diff --git a/Build/source/libs/icu-xetex/data/rbnf/eo.txt b/Build/source/libs/icu/icu-xetex/data/rbnf/eo.txt
index c15edc2b68a..c15edc2b68a 100644
--- a/Build/source/libs/icu-xetex/data/rbnf/eo.txt
+++ b/Build/source/libs/icu/icu-xetex/data/rbnf/eo.txt
diff --git a/Build/source/libs/icu-xetex/data/rbnf/es.txt b/Build/source/libs/icu/icu-xetex/data/rbnf/es.txt
index 41968911e5b..41968911e5b 100644
--- a/Build/source/libs/icu-xetex/data/rbnf/es.txt
+++ b/Build/source/libs/icu/icu-xetex/data/rbnf/es.txt
diff --git a/Build/source/libs/icu-xetex/data/rbnf/fa.txt b/Build/source/libs/icu/icu-xetex/data/rbnf/fa.txt
index 407e81df6ba..407e81df6ba 100644
--- a/Build/source/libs/icu-xetex/data/rbnf/fa.txt
+++ b/Build/source/libs/icu/icu-xetex/data/rbnf/fa.txt
diff --git a/Build/source/libs/icu-xetex/data/rbnf/fa_AF.txt b/Build/source/libs/icu/icu-xetex/data/rbnf/fa_AF.txt
index 2a4e9640b9c..2a4e9640b9c 100644
--- a/Build/source/libs/icu-xetex/data/rbnf/fa_AF.txt
+++ b/Build/source/libs/icu/icu-xetex/data/rbnf/fa_AF.txt
diff --git a/Build/source/libs/icu-xetex/data/rbnf/fr.txt b/Build/source/libs/icu/icu-xetex/data/rbnf/fr.txt
index 6d1fbd50686..6d1fbd50686 100644
--- a/Build/source/libs/icu-xetex/data/rbnf/fr.txt
+++ b/Build/source/libs/icu/icu-xetex/data/rbnf/fr.txt
diff --git a/Build/source/libs/icu-xetex/data/rbnf/fr_BE.txt b/Build/source/libs/icu/icu-xetex/data/rbnf/fr_BE.txt
index 280c20e1ca7..280c20e1ca7 100644
--- a/Build/source/libs/icu-xetex/data/rbnf/fr_BE.txt
+++ b/Build/source/libs/icu/icu-xetex/data/rbnf/fr_BE.txt
diff --git a/Build/source/libs/icu-xetex/data/rbnf/fr_CH.txt b/Build/source/libs/icu/icu-xetex/data/rbnf/fr_CH.txt
index 8164afde2f5..8164afde2f5 100644
--- a/Build/source/libs/icu-xetex/data/rbnf/fr_CH.txt
+++ b/Build/source/libs/icu/icu-xetex/data/rbnf/fr_CH.txt
diff --git a/Build/source/libs/icu-xetex/data/rbnf/ga.txt b/Build/source/libs/icu/icu-xetex/data/rbnf/ga.txt
index ad40a9cff92..ad40a9cff92 100644
--- a/Build/source/libs/icu-xetex/data/rbnf/ga.txt
+++ b/Build/source/libs/icu/icu-xetex/data/rbnf/ga.txt
diff --git a/Build/source/libs/icu-xetex/data/rbnf/he.txt b/Build/source/libs/icu/icu-xetex/data/rbnf/he.txt
index 5105b9bf418..5105b9bf418 100644
--- a/Build/source/libs/icu-xetex/data/rbnf/he.txt
+++ b/Build/source/libs/icu/icu-xetex/data/rbnf/he.txt
diff --git a/Build/source/libs/icu-xetex/data/rbnf/it.txt b/Build/source/libs/icu/icu-xetex/data/rbnf/it.txt
index 03724789ede..03724789ede 100644
--- a/Build/source/libs/icu-xetex/data/rbnf/it.txt
+++ b/Build/source/libs/icu/icu-xetex/data/rbnf/it.txt
diff --git a/Build/source/libs/icu-xetex/data/rbnf/ja.txt b/Build/source/libs/icu/icu-xetex/data/rbnf/ja.txt
index cc78975ac45..cc78975ac45 100644
--- a/Build/source/libs/icu-xetex/data/rbnf/ja.txt
+++ b/Build/source/libs/icu/icu-xetex/data/rbnf/ja.txt
diff --git a/Build/source/libs/icu-xetex/data/rbnf/mt.txt b/Build/source/libs/icu/icu-xetex/data/rbnf/mt.txt
index 2a56257fdaf..2a56257fdaf 100644
--- a/Build/source/libs/icu-xetex/data/rbnf/mt.txt
+++ b/Build/source/libs/icu/icu-xetex/data/rbnf/mt.txt
diff --git a/Build/source/libs/icu-xetex/data/rbnf/nl.txt b/Build/source/libs/icu/icu-xetex/data/rbnf/nl.txt
index 23afa37bf2f..23afa37bf2f 100644
--- a/Build/source/libs/icu-xetex/data/rbnf/nl.txt
+++ b/Build/source/libs/icu/icu-xetex/data/rbnf/nl.txt
diff --git a/Build/source/libs/icu-xetex/data/rbnf/pl.txt b/Build/source/libs/icu/icu-xetex/data/rbnf/pl.txt
index af8c755e29a..af8c755e29a 100644
--- a/Build/source/libs/icu-xetex/data/rbnf/pl.txt
+++ b/Build/source/libs/icu/icu-xetex/data/rbnf/pl.txt
diff --git a/Build/source/libs/icu-xetex/data/rbnf/pt.txt b/Build/source/libs/icu/icu-xetex/data/rbnf/pt.txt
index 804e846ff0c..804e846ff0c 100644
--- a/Build/source/libs/icu-xetex/data/rbnf/pt.txt
+++ b/Build/source/libs/icu/icu-xetex/data/rbnf/pt.txt
diff --git a/Build/source/libs/icu-xetex/data/rbnf/rbnffiles.mk b/Build/source/libs/icu/icu-xetex/data/rbnf/rbnffiles.mk
index 37d1b9f4143..37d1b9f4143 100644
--- a/Build/source/libs/icu-xetex/data/rbnf/rbnffiles.mk
+++ b/Build/source/libs/icu/icu-xetex/data/rbnf/rbnffiles.mk
diff --git a/Build/source/libs/icu-xetex/data/rbnf/rbnflocal.mk b/Build/source/libs/icu/icu-xetex/data/rbnf/rbnflocal.mk
index 7fea9e4184f..7fea9e4184f 100644
--- a/Build/source/libs/icu-xetex/data/rbnf/rbnflocal.mk
+++ b/Build/source/libs/icu/icu-xetex/data/rbnf/rbnflocal.mk
diff --git a/Build/source/libs/icu-xetex/data/rbnf/root.txt b/Build/source/libs/icu/icu-xetex/data/rbnf/root.txt
index fc99d237c8a..fc99d237c8a 100644
--- a/Build/source/libs/icu-xetex/data/rbnf/root.txt
+++ b/Build/source/libs/icu/icu-xetex/data/rbnf/root.txt
diff --git a/Build/source/libs/icu-xetex/data/rbnf/ru.txt b/Build/source/libs/icu/icu-xetex/data/rbnf/ru.txt
index fd4d2241164..fd4d2241164 100644
--- a/Build/source/libs/icu-xetex/data/rbnf/ru.txt
+++ b/Build/source/libs/icu/icu-xetex/data/rbnf/ru.txt
diff --git a/Build/source/libs/icu-xetex/data/rbnf/sv.txt b/Build/source/libs/icu/icu-xetex/data/rbnf/sv.txt
index 2a16566cb91..2a16566cb91 100644
--- a/Build/source/libs/icu-xetex/data/rbnf/sv.txt
+++ b/Build/source/libs/icu/icu-xetex/data/rbnf/sv.txt
diff --git a/Build/source/libs/icu-xetex/data/rbnf/th.txt b/Build/source/libs/icu/icu-xetex/data/rbnf/th.txt
index fff26cc59a9..fff26cc59a9 100644
--- a/Build/source/libs/icu-xetex/data/rbnf/th.txt
+++ b/Build/source/libs/icu/icu-xetex/data/rbnf/th.txt
diff --git a/Build/source/libs/icu-xetex/data/rbnf/uk.txt b/Build/source/libs/icu/icu-xetex/data/rbnf/uk.txt
index 23dc0e80014..23dc0e80014 100644
--- a/Build/source/libs/icu-xetex/data/rbnf/uk.txt
+++ b/Build/source/libs/icu/icu-xetex/data/rbnf/uk.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Any_Accents.txt b/Build/source/libs/icu/icu-xetex/data/translit/Any_Accents.txt
index 075811d87f9..075811d87f9 100644
--- a/Build/source/libs/icu-xetex/data/translit/Any_Accents.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Any_Accents.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Any_Publishing.txt b/Build/source/libs/icu/icu-xetex/data/translit/Any_Publishing.txt
index bc599e02e35..bc599e02e35 100644
--- a/Build/source/libs/icu-xetex/data/translit/Any_Publishing.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Any_Publishing.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Arabic_Latin.txt b/Build/source/libs/icu/icu-xetex/data/translit/Arabic_Latin.txt
index 8dce658d7ef..8dce658d7ef 100644
--- a/Build/source/libs/icu-xetex/data/translit/Arabic_Latin.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Arabic_Latin.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Bengali_Devanagari.txt b/Build/source/libs/icu/icu-xetex/data/translit/Bengali_Devanagari.txt
index ea2a7b13d0c..ea2a7b13d0c 100644
--- a/Build/source/libs/icu-xetex/data/translit/Bengali_Devanagari.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Bengali_Devanagari.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Bengali_Gujarati.txt b/Build/source/libs/icu/icu-xetex/data/translit/Bengali_Gujarati.txt
index 2fca0f270e1..2fca0f270e1 100644
--- a/Build/source/libs/icu-xetex/data/translit/Bengali_Gujarati.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Bengali_Gujarati.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Bengali_Gurmukhi.txt b/Build/source/libs/icu/icu-xetex/data/translit/Bengali_Gurmukhi.txt
index 5ad3b7d0261..5ad3b7d0261 100644
--- a/Build/source/libs/icu-xetex/data/translit/Bengali_Gurmukhi.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Bengali_Gurmukhi.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Bengali_InterIndic.txt b/Build/source/libs/icu/icu-xetex/data/translit/Bengali_InterIndic.txt
index 4178655e1b7..4178655e1b7 100644
--- a/Build/source/libs/icu-xetex/data/translit/Bengali_InterIndic.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Bengali_InterIndic.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Bengali_Kannada.txt b/Build/source/libs/icu/icu-xetex/data/translit/Bengali_Kannada.txt
index c369769ef04..c369769ef04 100644
--- a/Build/source/libs/icu-xetex/data/translit/Bengali_Kannada.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Bengali_Kannada.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Bengali_Latin.txt b/Build/source/libs/icu/icu-xetex/data/translit/Bengali_Latin.txt
index 2764d644ab1..2764d644ab1 100644
--- a/Build/source/libs/icu-xetex/data/translit/Bengali_Latin.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Bengali_Latin.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Bengali_Malayalam.txt b/Build/source/libs/icu/icu-xetex/data/translit/Bengali_Malayalam.txt
index 9939c49c278..9939c49c278 100644
--- a/Build/source/libs/icu-xetex/data/translit/Bengali_Malayalam.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Bengali_Malayalam.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Bengali_Oriya.txt b/Build/source/libs/icu/icu-xetex/data/translit/Bengali_Oriya.txt
index a1a4eba86e6..a1a4eba86e6 100644
--- a/Build/source/libs/icu-xetex/data/translit/Bengali_Oriya.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Bengali_Oriya.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Bengali_Tamil.txt b/Build/source/libs/icu/icu-xetex/data/translit/Bengali_Tamil.txt
index 90069ce2807..90069ce2807 100644
--- a/Build/source/libs/icu-xetex/data/translit/Bengali_Tamil.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Bengali_Tamil.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Bengali_Telugu.txt b/Build/source/libs/icu/icu-xetex/data/translit/Bengali_Telugu.txt
index 5556ac8b46a..5556ac8b46a 100644
--- a/Build/source/libs/icu-xetex/data/translit/Bengali_Telugu.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Bengali_Telugu.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Cyrillic_Latin.txt b/Build/source/libs/icu/icu-xetex/data/translit/Cyrillic_Latin.txt
index 64e4ff036a6..64e4ff036a6 100644
--- a/Build/source/libs/icu-xetex/data/translit/Cyrillic_Latin.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Cyrillic_Latin.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Devanagari_Bengali.txt b/Build/source/libs/icu/icu-xetex/data/translit/Devanagari_Bengali.txt
index 4b934d70f6d..4b934d70f6d 100644
--- a/Build/source/libs/icu-xetex/data/translit/Devanagari_Bengali.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Devanagari_Bengali.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Devanagari_Gujarati.txt b/Build/source/libs/icu/icu-xetex/data/translit/Devanagari_Gujarati.txt
index 056d48ccca2..056d48ccca2 100644
--- a/Build/source/libs/icu-xetex/data/translit/Devanagari_Gujarati.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Devanagari_Gujarati.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Devanagari_Gurmukhi.txt b/Build/source/libs/icu/icu-xetex/data/translit/Devanagari_Gurmukhi.txt
index 58a9776f151..58a9776f151 100644
--- a/Build/source/libs/icu-xetex/data/translit/Devanagari_Gurmukhi.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Devanagari_Gurmukhi.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Devanagari_InterIndic.txt b/Build/source/libs/icu/icu-xetex/data/translit/Devanagari_InterIndic.txt
index cbcd541e81a..cbcd541e81a 100644
--- a/Build/source/libs/icu-xetex/data/translit/Devanagari_InterIndic.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Devanagari_InterIndic.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Devanagari_Kannada.txt b/Build/source/libs/icu/icu-xetex/data/translit/Devanagari_Kannada.txt
index 83dae635368..83dae635368 100644
--- a/Build/source/libs/icu-xetex/data/translit/Devanagari_Kannada.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Devanagari_Kannada.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Devanagari_Latin.txt b/Build/source/libs/icu/icu-xetex/data/translit/Devanagari_Latin.txt
index ca27fa1e90a..ca27fa1e90a 100644
--- a/Build/source/libs/icu-xetex/data/translit/Devanagari_Latin.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Devanagari_Latin.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Devanagari_Malayalam.txt b/Build/source/libs/icu/icu-xetex/data/translit/Devanagari_Malayalam.txt
index 6c9c1b00b00..6c9c1b00b00 100644
--- a/Build/source/libs/icu-xetex/data/translit/Devanagari_Malayalam.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Devanagari_Malayalam.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Devanagari_Oriya.txt b/Build/source/libs/icu/icu-xetex/data/translit/Devanagari_Oriya.txt
index 5d456f8ff3d..5d456f8ff3d 100644
--- a/Build/source/libs/icu-xetex/data/translit/Devanagari_Oriya.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Devanagari_Oriya.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Devanagari_Tamil.txt b/Build/source/libs/icu/icu-xetex/data/translit/Devanagari_Tamil.txt
index b3d84a90aa8..b3d84a90aa8 100644
--- a/Build/source/libs/icu-xetex/data/translit/Devanagari_Tamil.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Devanagari_Tamil.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Devanagari_Telugu.txt b/Build/source/libs/icu/icu-xetex/data/translit/Devanagari_Telugu.txt
index b27e4e3cb38..b27e4e3cb38 100644
--- a/Build/source/libs/icu-xetex/data/translit/Devanagari_Telugu.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Devanagari_Telugu.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Fullwidth_Halfwidth.txt b/Build/source/libs/icu/icu-xetex/data/translit/Fullwidth_Halfwidth.txt
index 3a7e77233d5..3a7e77233d5 100644
--- a/Build/source/libs/icu-xetex/data/translit/Fullwidth_Halfwidth.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Fullwidth_Halfwidth.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Georgian_Latin.txt b/Build/source/libs/icu/icu-xetex/data/translit/Georgian_Latin.txt
index 89a44d1bf1c..89a44d1bf1c 100644
--- a/Build/source/libs/icu-xetex/data/translit/Georgian_Latin.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Georgian_Latin.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Greek_Latin.txt b/Build/source/libs/icu/icu-xetex/data/translit/Greek_Latin.txt
index 9a76cb86676..9a76cb86676 100644
--- a/Build/source/libs/icu-xetex/data/translit/Greek_Latin.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Greek_Latin.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Greek_Latin_UNGEGN.txt b/Build/source/libs/icu/icu-xetex/data/translit/Greek_Latin_UNGEGN.txt
index d3118971074..d3118971074 100644
--- a/Build/source/libs/icu-xetex/data/translit/Greek_Latin_UNGEGN.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Greek_Latin_UNGEGN.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Gujarati_Bengali.txt b/Build/source/libs/icu/icu-xetex/data/translit/Gujarati_Bengali.txt
index 65a469da02a..65a469da02a 100644
--- a/Build/source/libs/icu-xetex/data/translit/Gujarati_Bengali.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Gujarati_Bengali.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Gujarati_Devanagari.txt b/Build/source/libs/icu/icu-xetex/data/translit/Gujarati_Devanagari.txt
index f60233d7073..f60233d7073 100644
--- a/Build/source/libs/icu-xetex/data/translit/Gujarati_Devanagari.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Gujarati_Devanagari.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Gujarati_Gurmukhi.txt b/Build/source/libs/icu/icu-xetex/data/translit/Gujarati_Gurmukhi.txt
index 785b02e5c7f..785b02e5c7f 100644
--- a/Build/source/libs/icu-xetex/data/translit/Gujarati_Gurmukhi.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Gujarati_Gurmukhi.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Gujarati_InterIndic.txt b/Build/source/libs/icu/icu-xetex/data/translit/Gujarati_InterIndic.txt
index 4bf4944dd34..4bf4944dd34 100644
--- a/Build/source/libs/icu-xetex/data/translit/Gujarati_InterIndic.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Gujarati_InterIndic.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Gujarati_Kannada.txt b/Build/source/libs/icu/icu-xetex/data/translit/Gujarati_Kannada.txt
index 8804161c343..8804161c343 100644
--- a/Build/source/libs/icu-xetex/data/translit/Gujarati_Kannada.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Gujarati_Kannada.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Gujarati_Latin.txt b/Build/source/libs/icu/icu-xetex/data/translit/Gujarati_Latin.txt
index 2e3065e208c..2e3065e208c 100644
--- a/Build/source/libs/icu-xetex/data/translit/Gujarati_Latin.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Gujarati_Latin.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Gujarati_Malayalam.txt b/Build/source/libs/icu/icu-xetex/data/translit/Gujarati_Malayalam.txt
index a63ec677483..a63ec677483 100644
--- a/Build/source/libs/icu-xetex/data/translit/Gujarati_Malayalam.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Gujarati_Malayalam.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Gujarati_Oriya.txt b/Build/source/libs/icu/icu-xetex/data/translit/Gujarati_Oriya.txt
index 60627fcbaab..60627fcbaab 100644
--- a/Build/source/libs/icu-xetex/data/translit/Gujarati_Oriya.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Gujarati_Oriya.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Gujarati_Tamil.txt b/Build/source/libs/icu/icu-xetex/data/translit/Gujarati_Tamil.txt
index 391ce0b09fa..391ce0b09fa 100644
--- a/Build/source/libs/icu-xetex/data/translit/Gujarati_Tamil.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Gujarati_Tamil.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Gujarati_Telugu.txt b/Build/source/libs/icu/icu-xetex/data/translit/Gujarati_Telugu.txt
index d3b34e4ab26..d3b34e4ab26 100644
--- a/Build/source/libs/icu-xetex/data/translit/Gujarati_Telugu.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Gujarati_Telugu.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Gurmukhi_Bengali.txt b/Build/source/libs/icu/icu-xetex/data/translit/Gurmukhi_Bengali.txt
index 13f2d6889ed..13f2d6889ed 100644
--- a/Build/source/libs/icu-xetex/data/translit/Gurmukhi_Bengali.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Gurmukhi_Bengali.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Gurmukhi_Devanagari.txt b/Build/source/libs/icu/icu-xetex/data/translit/Gurmukhi_Devanagari.txt
index 6d6df7635b6..6d6df7635b6 100644
--- a/Build/source/libs/icu-xetex/data/translit/Gurmukhi_Devanagari.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Gurmukhi_Devanagari.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Gurmukhi_Gujarati.txt b/Build/source/libs/icu/icu-xetex/data/translit/Gurmukhi_Gujarati.txt
index 297f9b88fa7..297f9b88fa7 100644
--- a/Build/source/libs/icu-xetex/data/translit/Gurmukhi_Gujarati.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Gurmukhi_Gujarati.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Gurmukhi_InterIndic.txt b/Build/source/libs/icu/icu-xetex/data/translit/Gurmukhi_InterIndic.txt
index b6a95e8efe8..b6a95e8efe8 100644
--- a/Build/source/libs/icu-xetex/data/translit/Gurmukhi_InterIndic.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Gurmukhi_InterIndic.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Gurmukhi_Kannada.txt b/Build/source/libs/icu/icu-xetex/data/translit/Gurmukhi_Kannada.txt
index 57797306e35..57797306e35 100644
--- a/Build/source/libs/icu-xetex/data/translit/Gurmukhi_Kannada.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Gurmukhi_Kannada.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Gurmukhi_Latin.txt b/Build/source/libs/icu/icu-xetex/data/translit/Gurmukhi_Latin.txt
index 9c33b1ef185..9c33b1ef185 100644
--- a/Build/source/libs/icu-xetex/data/translit/Gurmukhi_Latin.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Gurmukhi_Latin.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Gurmukhi_Malayalam.txt b/Build/source/libs/icu/icu-xetex/data/translit/Gurmukhi_Malayalam.txt
index 05d224d72b3..05d224d72b3 100644
--- a/Build/source/libs/icu-xetex/data/translit/Gurmukhi_Malayalam.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Gurmukhi_Malayalam.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Gurmukhi_Oriya.txt b/Build/source/libs/icu/icu-xetex/data/translit/Gurmukhi_Oriya.txt
index 2b081aa4b48..2b081aa4b48 100644
--- a/Build/source/libs/icu-xetex/data/translit/Gurmukhi_Oriya.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Gurmukhi_Oriya.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Gurmukhi_Tamil.txt b/Build/source/libs/icu/icu-xetex/data/translit/Gurmukhi_Tamil.txt
index 2b369c71198..2b369c71198 100644
--- a/Build/source/libs/icu-xetex/data/translit/Gurmukhi_Tamil.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Gurmukhi_Tamil.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Gurmukhi_Telugu.txt b/Build/source/libs/icu/icu-xetex/data/translit/Gurmukhi_Telugu.txt
index 9968f0cc131..9968f0cc131 100644
--- a/Build/source/libs/icu-xetex/data/translit/Gurmukhi_Telugu.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Gurmukhi_Telugu.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Han_Latin.txt b/Build/source/libs/icu/icu-xetex/data/translit/Han_Latin.txt
index b2f0ae17a89..b2f0ae17a89 100644
--- a/Build/source/libs/icu-xetex/data/translit/Han_Latin.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Han_Latin.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Han_Spacedhan.txt b/Build/source/libs/icu/icu-xetex/data/translit/Han_Spacedhan.txt
index c8a22dfa7a4..c8a22dfa7a4 100644
--- a/Build/source/libs/icu-xetex/data/translit/Han_Spacedhan.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Han_Spacedhan.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Hangul_Latin.txt b/Build/source/libs/icu/icu-xetex/data/translit/Hangul_Latin.txt
index 14df4a7d30c..14df4a7d30c 100644
--- a/Build/source/libs/icu-xetex/data/translit/Hangul_Latin.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Hangul_Latin.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Hebrew_Latin.txt b/Build/source/libs/icu/icu-xetex/data/translit/Hebrew_Latin.txt
index eb1c2977420..eb1c2977420 100644
--- a/Build/source/libs/icu-xetex/data/translit/Hebrew_Latin.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Hebrew_Latin.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Hiragana_Katakana.txt b/Build/source/libs/icu/icu-xetex/data/translit/Hiragana_Katakana.txt
index 68d53596ee6..68d53596ee6 100644
--- a/Build/source/libs/icu-xetex/data/translit/Hiragana_Katakana.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Hiragana_Katakana.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Hiragana_Latin.txt b/Build/source/libs/icu/icu-xetex/data/translit/Hiragana_Latin.txt
index a4aa8130ee4..a4aa8130ee4 100644
--- a/Build/source/libs/icu-xetex/data/translit/Hiragana_Latin.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Hiragana_Latin.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/InterIndic_Bengali.txt b/Build/source/libs/icu/icu-xetex/data/translit/InterIndic_Bengali.txt
index 2480793362a..2480793362a 100644
--- a/Build/source/libs/icu-xetex/data/translit/InterIndic_Bengali.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/InterIndic_Bengali.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/InterIndic_Devanagari.txt b/Build/source/libs/icu/icu-xetex/data/translit/InterIndic_Devanagari.txt
index 699e2a47c80..699e2a47c80 100644
--- a/Build/source/libs/icu-xetex/data/translit/InterIndic_Devanagari.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/InterIndic_Devanagari.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/InterIndic_Gujarati.txt b/Build/source/libs/icu/icu-xetex/data/translit/InterIndic_Gujarati.txt
index 43448033f5e..43448033f5e 100644
--- a/Build/source/libs/icu-xetex/data/translit/InterIndic_Gujarati.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/InterIndic_Gujarati.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/InterIndic_Gurmukhi.txt b/Build/source/libs/icu/icu-xetex/data/translit/InterIndic_Gurmukhi.txt
index 41c874b432c..41c874b432c 100644
--- a/Build/source/libs/icu-xetex/data/translit/InterIndic_Gurmukhi.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/InterIndic_Gurmukhi.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/InterIndic_Kannada.txt b/Build/source/libs/icu/icu-xetex/data/translit/InterIndic_Kannada.txt
index e3f7de9ddb0..e3f7de9ddb0 100644
--- a/Build/source/libs/icu-xetex/data/translit/InterIndic_Kannada.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/InterIndic_Kannada.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/InterIndic_Latin.txt b/Build/source/libs/icu/icu-xetex/data/translit/InterIndic_Latin.txt
index 05d6e9c442c..05d6e9c442c 100644
--- a/Build/source/libs/icu-xetex/data/translit/InterIndic_Latin.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/InterIndic_Latin.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/InterIndic_Malayalam.txt b/Build/source/libs/icu/icu-xetex/data/translit/InterIndic_Malayalam.txt
index 617694f0a3d..617694f0a3d 100644
--- a/Build/source/libs/icu-xetex/data/translit/InterIndic_Malayalam.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/InterIndic_Malayalam.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/InterIndic_Oriya.txt b/Build/source/libs/icu/icu-xetex/data/translit/InterIndic_Oriya.txt
index 6a90c0e2917..6a90c0e2917 100644
--- a/Build/source/libs/icu-xetex/data/translit/InterIndic_Oriya.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/InterIndic_Oriya.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/InterIndic_Tamil.txt b/Build/source/libs/icu/icu-xetex/data/translit/InterIndic_Tamil.txt
index 72ed890ab8c..72ed890ab8c 100644
--- a/Build/source/libs/icu-xetex/data/translit/InterIndic_Tamil.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/InterIndic_Tamil.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/InterIndic_Telugu.txt b/Build/source/libs/icu/icu-xetex/data/translit/InterIndic_Telugu.txt
index 664852d9ff1..664852d9ff1 100644
--- a/Build/source/libs/icu-xetex/data/translit/InterIndic_Telugu.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/InterIndic_Telugu.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Jamo_Latin.txt b/Build/source/libs/icu/icu-xetex/data/translit/Jamo_Latin.txt
index ea7709645e2..ea7709645e2 100644
--- a/Build/source/libs/icu-xetex/data/translit/Jamo_Latin.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Jamo_Latin.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Kannada_Bengali.txt b/Build/source/libs/icu/icu-xetex/data/translit/Kannada_Bengali.txt
index 2f84d267d8a..2f84d267d8a 100644
--- a/Build/source/libs/icu-xetex/data/translit/Kannada_Bengali.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Kannada_Bengali.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Kannada_Devanagari.txt b/Build/source/libs/icu/icu-xetex/data/translit/Kannada_Devanagari.txt
index 50c770fa550..50c770fa550 100644
--- a/Build/source/libs/icu-xetex/data/translit/Kannada_Devanagari.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Kannada_Devanagari.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Kannada_Gujarati.txt b/Build/source/libs/icu/icu-xetex/data/translit/Kannada_Gujarati.txt
index a061fbd4797..a061fbd4797 100644
--- a/Build/source/libs/icu-xetex/data/translit/Kannada_Gujarati.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Kannada_Gujarati.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Kannada_Gurmukhi.txt b/Build/source/libs/icu/icu-xetex/data/translit/Kannada_Gurmukhi.txt
index ce1f494ec86..ce1f494ec86 100644
--- a/Build/source/libs/icu-xetex/data/translit/Kannada_Gurmukhi.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Kannada_Gurmukhi.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Kannada_InterIndic.txt b/Build/source/libs/icu/icu-xetex/data/translit/Kannada_InterIndic.txt
index 65c65e7523b..65c65e7523b 100644
--- a/Build/source/libs/icu-xetex/data/translit/Kannada_InterIndic.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Kannada_InterIndic.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Kannada_Latin.txt b/Build/source/libs/icu/icu-xetex/data/translit/Kannada_Latin.txt
index 30f2ef673ef..30f2ef673ef 100644
--- a/Build/source/libs/icu-xetex/data/translit/Kannada_Latin.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Kannada_Latin.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Kannada_Malayalam.txt b/Build/source/libs/icu/icu-xetex/data/translit/Kannada_Malayalam.txt
index 39818362fd4..39818362fd4 100644
--- a/Build/source/libs/icu-xetex/data/translit/Kannada_Malayalam.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Kannada_Malayalam.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Kannada_Oriya.txt b/Build/source/libs/icu/icu-xetex/data/translit/Kannada_Oriya.txt
index c4d00b481ea..c4d00b481ea 100644
--- a/Build/source/libs/icu-xetex/data/translit/Kannada_Oriya.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Kannada_Oriya.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Kannada_Tamil.txt b/Build/source/libs/icu/icu-xetex/data/translit/Kannada_Tamil.txt
index 0c988673bf2..0c988673bf2 100644
--- a/Build/source/libs/icu-xetex/data/translit/Kannada_Tamil.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Kannada_Tamil.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Kannada_Telugu.txt b/Build/source/libs/icu/icu-xetex/data/translit/Kannada_Telugu.txt
index d7ff20d0cfd..d7ff20d0cfd 100644
--- a/Build/source/libs/icu-xetex/data/translit/Kannada_Telugu.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Kannada_Telugu.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Latin_Armenian.txt b/Build/source/libs/icu/icu-xetex/data/translit/Latin_Armenian.txt
index 951cf232857..951cf232857 100644
--- a/Build/source/libs/icu-xetex/data/translit/Latin_Armenian.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Latin_Armenian.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Latin_Bengali.txt b/Build/source/libs/icu/icu-xetex/data/translit/Latin_Bengali.txt
index de84a52e0a4..de84a52e0a4 100644
--- a/Build/source/libs/icu-xetex/data/translit/Latin_Bengali.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Latin_Bengali.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Latin_ConjoiningJamo.txt b/Build/source/libs/icu/icu-xetex/data/translit/Latin_ConjoiningJamo.txt
index 26e29ee177c..26e29ee177c 100644
--- a/Build/source/libs/icu-xetex/data/translit/Latin_ConjoiningJamo.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Latin_ConjoiningJamo.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Latin_Devanagari.txt b/Build/source/libs/icu/icu-xetex/data/translit/Latin_Devanagari.txt
index 9f2f54bb6c7..9f2f54bb6c7 100644
--- a/Build/source/libs/icu-xetex/data/translit/Latin_Devanagari.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Latin_Devanagari.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Latin_Gujarati.txt b/Build/source/libs/icu/icu-xetex/data/translit/Latin_Gujarati.txt
index 7313e64adee..7313e64adee 100644
--- a/Build/source/libs/icu-xetex/data/translit/Latin_Gujarati.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Latin_Gujarati.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Latin_Gurmukhi.txt b/Build/source/libs/icu/icu-xetex/data/translit/Latin_Gurmukhi.txt
index 58a613b4056..58a613b4056 100644
--- a/Build/source/libs/icu-xetex/data/translit/Latin_Gurmukhi.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Latin_Gurmukhi.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Latin_Hangul.txt b/Build/source/libs/icu/icu-xetex/data/translit/Latin_Hangul.txt
index b35b0f9ea02..b35b0f9ea02 100644
--- a/Build/source/libs/icu-xetex/data/translit/Latin_Hangul.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Latin_Hangul.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Latin_InterIndic.txt b/Build/source/libs/icu/icu-xetex/data/translit/Latin_InterIndic.txt
index 34c2088f2ae..34c2088f2ae 100644
--- a/Build/source/libs/icu-xetex/data/translit/Latin_InterIndic.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Latin_InterIndic.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Latin_Jamo.txt b/Build/source/libs/icu/icu-xetex/data/translit/Latin_Jamo.txt
index e12a238284c..e12a238284c 100644
--- a/Build/source/libs/icu-xetex/data/translit/Latin_Jamo.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Latin_Jamo.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Latin_Kannada.txt b/Build/source/libs/icu/icu-xetex/data/translit/Latin_Kannada.txt
index 714a4d386ee..714a4d386ee 100644
--- a/Build/source/libs/icu-xetex/data/translit/Latin_Kannada.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Latin_Kannada.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Latin_Katakana.txt b/Build/source/libs/icu/icu-xetex/data/translit/Latin_Katakana.txt
index 71c7897e5e2..71c7897e5e2 100644
--- a/Build/source/libs/icu-xetex/data/translit/Latin_Katakana.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Latin_Katakana.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Latin_Malayalam.txt b/Build/source/libs/icu/icu-xetex/data/translit/Latin_Malayalam.txt
index 33650193005..33650193005 100644
--- a/Build/source/libs/icu-xetex/data/translit/Latin_Malayalam.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Latin_Malayalam.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Latin_NumericPinyin.txt b/Build/source/libs/icu/icu-xetex/data/translit/Latin_NumericPinyin.txt
index 18a8c2be4a6..18a8c2be4a6 100644
--- a/Build/source/libs/icu-xetex/data/translit/Latin_NumericPinyin.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Latin_NumericPinyin.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Latin_Oriya.txt b/Build/source/libs/icu/icu-xetex/data/translit/Latin_Oriya.txt
index fd1080bad3c..fd1080bad3c 100644
--- a/Build/source/libs/icu-xetex/data/translit/Latin_Oriya.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Latin_Oriya.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Latin_Tamil.txt b/Build/source/libs/icu/icu-xetex/data/translit/Latin_Tamil.txt
index 9a514af3c7c..9a514af3c7c 100644
--- a/Build/source/libs/icu-xetex/data/translit/Latin_Tamil.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Latin_Tamil.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Latin_Telugu.txt b/Build/source/libs/icu/icu-xetex/data/translit/Latin_Telugu.txt
index a6a5868a3ff..a6a5868a3ff 100644
--- a/Build/source/libs/icu-xetex/data/translit/Latin_Telugu.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Latin_Telugu.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Latin_Thai.txt b/Build/source/libs/icu/icu-xetex/data/translit/Latin_Thai.txt
index c23d9b8ede5..c23d9b8ede5 100644
--- a/Build/source/libs/icu-xetex/data/translit/Latin_Thai.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Latin_Thai.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Malayalam_Bengali.txt b/Build/source/libs/icu/icu-xetex/data/translit/Malayalam_Bengali.txt
index 3a3768bbba0..3a3768bbba0 100644
--- a/Build/source/libs/icu-xetex/data/translit/Malayalam_Bengali.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Malayalam_Bengali.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Malayalam_Devanagari.txt b/Build/source/libs/icu/icu-xetex/data/translit/Malayalam_Devanagari.txt
index 0422c4303d0..0422c4303d0 100644
--- a/Build/source/libs/icu-xetex/data/translit/Malayalam_Devanagari.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Malayalam_Devanagari.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Malayalam_Gujarati.txt b/Build/source/libs/icu/icu-xetex/data/translit/Malayalam_Gujarati.txt
index 852ffdcbe4d..852ffdcbe4d 100644
--- a/Build/source/libs/icu-xetex/data/translit/Malayalam_Gujarati.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Malayalam_Gujarati.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Malayalam_Gurmukhi.txt b/Build/source/libs/icu/icu-xetex/data/translit/Malayalam_Gurmukhi.txt
index f4bcd389bc0..f4bcd389bc0 100644
--- a/Build/source/libs/icu-xetex/data/translit/Malayalam_Gurmukhi.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Malayalam_Gurmukhi.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Malayalam_InterIndic.txt b/Build/source/libs/icu/icu-xetex/data/translit/Malayalam_InterIndic.txt
index 8919800a2e8..8919800a2e8 100644
--- a/Build/source/libs/icu-xetex/data/translit/Malayalam_InterIndic.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Malayalam_InterIndic.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Malayalam_Kannada.txt b/Build/source/libs/icu/icu-xetex/data/translit/Malayalam_Kannada.txt
index e9073bbbe75..e9073bbbe75 100644
--- a/Build/source/libs/icu-xetex/data/translit/Malayalam_Kannada.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Malayalam_Kannada.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Malayalam_Latin.txt b/Build/source/libs/icu/icu-xetex/data/translit/Malayalam_Latin.txt
index aa2f3959ee9..aa2f3959ee9 100644
--- a/Build/source/libs/icu-xetex/data/translit/Malayalam_Latin.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Malayalam_Latin.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Malayalam_Oriya.txt b/Build/source/libs/icu/icu-xetex/data/translit/Malayalam_Oriya.txt
index f7c34b9cfd5..f7c34b9cfd5 100644
--- a/Build/source/libs/icu-xetex/data/translit/Malayalam_Oriya.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Malayalam_Oriya.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Malayalam_Tamil.txt b/Build/source/libs/icu/icu-xetex/data/translit/Malayalam_Tamil.txt
index 990579fcddf..990579fcddf 100644
--- a/Build/source/libs/icu-xetex/data/translit/Malayalam_Tamil.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Malayalam_Tamil.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Malayalam_Telugu.txt b/Build/source/libs/icu/icu-xetex/data/translit/Malayalam_Telugu.txt
index 70d7feaac9e..70d7feaac9e 100644
--- a/Build/source/libs/icu-xetex/data/translit/Malayalam_Telugu.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Malayalam_Telugu.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Oriya_Bengali.txt b/Build/source/libs/icu/icu-xetex/data/translit/Oriya_Bengali.txt
index c6d935987dc..c6d935987dc 100644
--- a/Build/source/libs/icu-xetex/data/translit/Oriya_Bengali.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Oriya_Bengali.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Oriya_Devanagari.txt b/Build/source/libs/icu/icu-xetex/data/translit/Oriya_Devanagari.txt
index a5d21f60ce9..a5d21f60ce9 100644
--- a/Build/source/libs/icu-xetex/data/translit/Oriya_Devanagari.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Oriya_Devanagari.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Oriya_Gujarati.txt b/Build/source/libs/icu/icu-xetex/data/translit/Oriya_Gujarati.txt
index e5901b1a0df..e5901b1a0df 100644
--- a/Build/source/libs/icu-xetex/data/translit/Oriya_Gujarati.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Oriya_Gujarati.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Oriya_Gurmukhi.txt b/Build/source/libs/icu/icu-xetex/data/translit/Oriya_Gurmukhi.txt
index 1af0ee7a706..1af0ee7a706 100644
--- a/Build/source/libs/icu-xetex/data/translit/Oriya_Gurmukhi.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Oriya_Gurmukhi.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Oriya_InterIndic.txt b/Build/source/libs/icu/icu-xetex/data/translit/Oriya_InterIndic.txt
index e9b78d9292b..e9b78d9292b 100644
--- a/Build/source/libs/icu-xetex/data/translit/Oriya_InterIndic.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Oriya_InterIndic.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Oriya_Kannada.txt b/Build/source/libs/icu/icu-xetex/data/translit/Oriya_Kannada.txt
index d481a44286f..d481a44286f 100644
--- a/Build/source/libs/icu-xetex/data/translit/Oriya_Kannada.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Oriya_Kannada.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Oriya_Latin.txt b/Build/source/libs/icu/icu-xetex/data/translit/Oriya_Latin.txt
index 32f400a3159..32f400a3159 100644
--- a/Build/source/libs/icu-xetex/data/translit/Oriya_Latin.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Oriya_Latin.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Oriya_Malayalam.txt b/Build/source/libs/icu/icu-xetex/data/translit/Oriya_Malayalam.txt
index c7f60e1442c..c7f60e1442c 100644
--- a/Build/source/libs/icu-xetex/data/translit/Oriya_Malayalam.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Oriya_Malayalam.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Oriya_Tamil.txt b/Build/source/libs/icu/icu-xetex/data/translit/Oriya_Tamil.txt
index f01e81ee9fc..f01e81ee9fc 100644
--- a/Build/source/libs/icu-xetex/data/translit/Oriya_Tamil.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Oriya_Tamil.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Oriya_Telugu.txt b/Build/source/libs/icu/icu-xetex/data/translit/Oriya_Telugu.txt
index 1a4b908df61..1a4b908df61 100644
--- a/Build/source/libs/icu-xetex/data/translit/Oriya_Telugu.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Oriya_Telugu.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Pinyin_NumericPinyin.txt b/Build/source/libs/icu/icu-xetex/data/translit/Pinyin_NumericPinyin.txt
index b390aa91777..b390aa91777 100644
--- a/Build/source/libs/icu-xetex/data/translit/Pinyin_NumericPinyin.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Pinyin_NumericPinyin.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Simplified_Traditional.txt b/Build/source/libs/icu/icu-xetex/data/translit/Simplified_Traditional.txt
index 1c3b7310fec..1c3b7310fec 100644
--- a/Build/source/libs/icu-xetex/data/translit/Simplified_Traditional.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Simplified_Traditional.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Syriac_Latin.txt b/Build/source/libs/icu/icu-xetex/data/translit/Syriac_Latin.txt
index b65a9bb9032..b65a9bb9032 100644
--- a/Build/source/libs/icu-xetex/data/translit/Syriac_Latin.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Syriac_Latin.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Tamil_Bengali.txt b/Build/source/libs/icu/icu-xetex/data/translit/Tamil_Bengali.txt
index 696e529ac63..696e529ac63 100644
--- a/Build/source/libs/icu-xetex/data/translit/Tamil_Bengali.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Tamil_Bengali.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Tamil_Devanagari.txt b/Build/source/libs/icu/icu-xetex/data/translit/Tamil_Devanagari.txt
index b06d7e0b313..b06d7e0b313 100644
--- a/Build/source/libs/icu-xetex/data/translit/Tamil_Devanagari.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Tamil_Devanagari.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Tamil_Gujarati.txt b/Build/source/libs/icu/icu-xetex/data/translit/Tamil_Gujarati.txt
index 86683029b23..86683029b23 100644
--- a/Build/source/libs/icu-xetex/data/translit/Tamil_Gujarati.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Tamil_Gujarati.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Tamil_Gurmukhi.txt b/Build/source/libs/icu/icu-xetex/data/translit/Tamil_Gurmukhi.txt
index fcea3391427..fcea3391427 100644
--- a/Build/source/libs/icu-xetex/data/translit/Tamil_Gurmukhi.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Tamil_Gurmukhi.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Tamil_InterIndic.txt b/Build/source/libs/icu/icu-xetex/data/translit/Tamil_InterIndic.txt
index 5d07c3b1bbf..5d07c3b1bbf 100644
--- a/Build/source/libs/icu-xetex/data/translit/Tamil_InterIndic.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Tamil_InterIndic.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Tamil_Kannada.txt b/Build/source/libs/icu/icu-xetex/data/translit/Tamil_Kannada.txt
index 4ff2091e29e..4ff2091e29e 100644
--- a/Build/source/libs/icu-xetex/data/translit/Tamil_Kannada.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Tamil_Kannada.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Tamil_Latin.txt b/Build/source/libs/icu/icu-xetex/data/translit/Tamil_Latin.txt
index f4c01a57183..f4c01a57183 100644
--- a/Build/source/libs/icu-xetex/data/translit/Tamil_Latin.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Tamil_Latin.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Tamil_Malayalam.txt b/Build/source/libs/icu/icu-xetex/data/translit/Tamil_Malayalam.txt
index febf84075f5..febf84075f5 100644
--- a/Build/source/libs/icu-xetex/data/translit/Tamil_Malayalam.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Tamil_Malayalam.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Tamil_Oriya.txt b/Build/source/libs/icu/icu-xetex/data/translit/Tamil_Oriya.txt
index 45c8af96f7d..45c8af96f7d 100644
--- a/Build/source/libs/icu-xetex/data/translit/Tamil_Oriya.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Tamil_Oriya.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Tamil_Telugu.txt b/Build/source/libs/icu/icu-xetex/data/translit/Tamil_Telugu.txt
index 76d096c95b9..76d096c95b9 100644
--- a/Build/source/libs/icu-xetex/data/translit/Tamil_Telugu.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Tamil_Telugu.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Telugu_Bengali.txt b/Build/source/libs/icu/icu-xetex/data/translit/Telugu_Bengali.txt
index 1160abb5421..1160abb5421 100644
--- a/Build/source/libs/icu-xetex/data/translit/Telugu_Bengali.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Telugu_Bengali.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Telugu_Devanagari.txt b/Build/source/libs/icu/icu-xetex/data/translit/Telugu_Devanagari.txt
index b4e058cfe2a..b4e058cfe2a 100644
--- a/Build/source/libs/icu-xetex/data/translit/Telugu_Devanagari.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Telugu_Devanagari.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Telugu_Gujarati.txt b/Build/source/libs/icu/icu-xetex/data/translit/Telugu_Gujarati.txt
index 3bfb4380cc8..3bfb4380cc8 100644
--- a/Build/source/libs/icu-xetex/data/translit/Telugu_Gujarati.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Telugu_Gujarati.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Telugu_Gurmukhi.txt b/Build/source/libs/icu/icu-xetex/data/translit/Telugu_Gurmukhi.txt
index 74b19612a63..74b19612a63 100644
--- a/Build/source/libs/icu-xetex/data/translit/Telugu_Gurmukhi.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Telugu_Gurmukhi.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Telugu_InterIndic.txt b/Build/source/libs/icu/icu-xetex/data/translit/Telugu_InterIndic.txt
index 159929b76e0..159929b76e0 100644
--- a/Build/source/libs/icu-xetex/data/translit/Telugu_InterIndic.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Telugu_InterIndic.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Telugu_Kannada.txt b/Build/source/libs/icu/icu-xetex/data/translit/Telugu_Kannada.txt
index fcb97902165..fcb97902165 100644
--- a/Build/source/libs/icu-xetex/data/translit/Telugu_Kannada.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Telugu_Kannada.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Telugu_Latin.txt b/Build/source/libs/icu/icu-xetex/data/translit/Telugu_Latin.txt
index 5863f394797..5863f394797 100644
--- a/Build/source/libs/icu-xetex/data/translit/Telugu_Latin.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Telugu_Latin.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Telugu_Malayalam.txt b/Build/source/libs/icu/icu-xetex/data/translit/Telugu_Malayalam.txt
index 793766d2aaa..793766d2aaa 100644
--- a/Build/source/libs/icu-xetex/data/translit/Telugu_Malayalam.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Telugu_Malayalam.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Telugu_Oriya.txt b/Build/source/libs/icu/icu-xetex/data/translit/Telugu_Oriya.txt
index 5b6e7a9d9de..5b6e7a9d9de 100644
--- a/Build/source/libs/icu-xetex/data/translit/Telugu_Oriya.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Telugu_Oriya.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Telugu_Tamil.txt b/Build/source/libs/icu/icu-xetex/data/translit/Telugu_Tamil.txt
index a03f0546fd5..a03f0546fd5 100644
--- a/Build/source/libs/icu-xetex/data/translit/Telugu_Tamil.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Telugu_Tamil.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Thaana_Latin.txt b/Build/source/libs/icu/icu-xetex/data/translit/Thaana_Latin.txt
index d2502569d5d..d2502569d5d 100644
--- a/Build/source/libs/icu-xetex/data/translit/Thaana_Latin.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Thaana_Latin.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/ThaiLogical_Latin.txt b/Build/source/libs/icu/icu-xetex/data/translit/ThaiLogical_Latin.txt
index 2e5d500f0f6..2e5d500f0f6 100644
--- a/Build/source/libs/icu-xetex/data/translit/ThaiLogical_Latin.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/ThaiLogical_Latin.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Thai_Latin.txt b/Build/source/libs/icu/icu-xetex/data/translit/Thai_Latin.txt
index f97f6b3e501..f97f6b3e501 100644
--- a/Build/source/libs/icu-xetex/data/translit/Thai_Latin.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Thai_Latin.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Thai_ThaiLogical.txt b/Build/source/libs/icu/icu-xetex/data/translit/Thai_ThaiLogical.txt
index 884731d4ef9..884731d4ef9 100644
--- a/Build/source/libs/icu-xetex/data/translit/Thai_ThaiLogical.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Thai_ThaiLogical.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/Thai_ThaiSemi.txt b/Build/source/libs/icu/icu-xetex/data/translit/Thai_ThaiSemi.txt
index 2ff5a01876e..2ff5a01876e 100644
--- a/Build/source/libs/icu-xetex/data/translit/Thai_ThaiSemi.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/Thai_ThaiSemi.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/el.txt b/Build/source/libs/icu/icu-xetex/data/translit/el.txt
index 24416b35aed..24416b35aed 100644
--- a/Build/source/libs/icu-xetex/data/translit/el.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/el.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/en.txt b/Build/source/libs/icu/icu-xetex/data/translit/en.txt
index 0dc8feb512c..0dc8feb512c 100644
--- a/Build/source/libs/icu-xetex/data/translit/en.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/en.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/root.txt b/Build/source/libs/icu/icu-xetex/data/translit/root.txt
index 331a5c3f9a8..331a5c3f9a8 100644
--- a/Build/source/libs/icu-xetex/data/translit/root.txt
+++ b/Build/source/libs/icu/icu-xetex/data/translit/root.txt
diff --git a/Build/source/libs/icu-xetex/data/translit/trnsfiles.mk b/Build/source/libs/icu/icu-xetex/data/translit/trnsfiles.mk
index 81078b44ea3..81078b44ea3 100644
--- a/Build/source/libs/icu-xetex/data/translit/trnsfiles.mk
+++ b/Build/source/libs/icu/icu-xetex/data/translit/trnsfiles.mk
diff --git a/Build/source/libs/icu-xetex/data/translit/trnslocal.mk b/Build/source/libs/icu/icu-xetex/data/translit/trnslocal.mk
index c3d990fea6c..c3d990fea6c 100644
--- a/Build/source/libs/icu-xetex/data/translit/trnslocal.mk
+++ b/Build/source/libs/icu/icu-xetex/data/translit/trnslocal.mk
diff --git a/Build/source/libs/icu-xetex/data/unidata/BidiMirroring.txt b/Build/source/libs/icu/icu-xetex/data/unidata/BidiMirroring.txt
index 35fc4a5ff84..35fc4a5ff84 100644
--- a/Build/source/libs/icu-xetex/data/unidata/BidiMirroring.txt
+++ b/Build/source/libs/icu/icu-xetex/data/unidata/BidiMirroring.txt
diff --git a/Build/source/libs/icu-xetex/data/unidata/Blocks.txt b/Build/source/libs/icu/icu-xetex/data/unidata/Blocks.txt
index 9cc87547f26..9cc87547f26 100644
--- a/Build/source/libs/icu-xetex/data/unidata/Blocks.txt
+++ b/Build/source/libs/icu/icu-xetex/data/unidata/Blocks.txt
diff --git a/Build/source/libs/icu-xetex/data/unidata/CaseFolding.txt b/Build/source/libs/icu/icu-xetex/data/unidata/CaseFolding.txt
index 83a79b2fe21..83a79b2fe21 100644
--- a/Build/source/libs/icu-xetex/data/unidata/CaseFolding.txt
+++ b/Build/source/libs/icu/icu-xetex/data/unidata/CaseFolding.txt
diff --git a/Build/source/libs/icu-xetex/data/unidata/DerivedAge.txt b/Build/source/libs/icu/icu-xetex/data/unidata/DerivedAge.txt
index 00f5a51a781..00f5a51a781 100644
--- a/Build/source/libs/icu-xetex/data/unidata/DerivedAge.txt
+++ b/Build/source/libs/icu/icu-xetex/data/unidata/DerivedAge.txt
diff --git a/Build/source/libs/icu-xetex/data/unidata/DerivedBidiClass.txt b/Build/source/libs/icu/icu-xetex/data/unidata/DerivedBidiClass.txt
index d94a3f10c37..d94a3f10c37 100644
--- a/Build/source/libs/icu-xetex/data/unidata/DerivedBidiClass.txt
+++ b/Build/source/libs/icu/icu-xetex/data/unidata/DerivedBidiClass.txt
diff --git a/Build/source/libs/icu-xetex/data/unidata/DerivedCoreProperties.txt b/Build/source/libs/icu/icu-xetex/data/unidata/DerivedCoreProperties.txt
index c9505fae374..c9505fae374 100644
--- a/Build/source/libs/icu-xetex/data/unidata/DerivedCoreProperties.txt
+++ b/Build/source/libs/icu/icu-xetex/data/unidata/DerivedCoreProperties.txt
diff --git a/Build/source/libs/icu-xetex/data/unidata/DerivedJoiningGroup.txt b/Build/source/libs/icu/icu-xetex/data/unidata/DerivedJoiningGroup.txt
index 751581c0b0f..751581c0b0f 100644
--- a/Build/source/libs/icu-xetex/data/unidata/DerivedJoiningGroup.txt
+++ b/Build/source/libs/icu/icu-xetex/data/unidata/DerivedJoiningGroup.txt
diff --git a/Build/source/libs/icu-xetex/data/unidata/DerivedJoiningType.txt b/Build/source/libs/icu/icu-xetex/data/unidata/DerivedJoiningType.txt
index 232c47025b2..232c47025b2 100644
--- a/Build/source/libs/icu-xetex/data/unidata/DerivedJoiningType.txt
+++ b/Build/source/libs/icu/icu-xetex/data/unidata/DerivedJoiningType.txt
diff --git a/Build/source/libs/icu-xetex/data/unidata/DerivedNormalizationProps.txt b/Build/source/libs/icu/icu-xetex/data/unidata/DerivedNormalizationProps.txt
index 23f2901f49b..23f2901f49b 100644
--- a/Build/source/libs/icu-xetex/data/unidata/DerivedNormalizationProps.txt
+++ b/Build/source/libs/icu/icu-xetex/data/unidata/DerivedNormalizationProps.txt
diff --git a/Build/source/libs/icu-xetex/data/unidata/DerivedNumericValues.txt b/Build/source/libs/icu/icu-xetex/data/unidata/DerivedNumericValues.txt
index bec3d54c8eb..bec3d54c8eb 100644
--- a/Build/source/libs/icu-xetex/data/unidata/DerivedNumericValues.txt
+++ b/Build/source/libs/icu/icu-xetex/data/unidata/DerivedNumericValues.txt
diff --git a/Build/source/libs/icu-xetex/data/unidata/EastAsianWidth.txt b/Build/source/libs/icu/icu-xetex/data/unidata/EastAsianWidth.txt
index 13fe27ad479..13fe27ad479 100644
--- a/Build/source/libs/icu-xetex/data/unidata/EastAsianWidth.txt
+++ b/Build/source/libs/icu/icu-xetex/data/unidata/EastAsianWidth.txt
diff --git a/Build/source/libs/icu-xetex/data/unidata/FractionalUCA.txt b/Build/source/libs/icu/icu-xetex/data/unidata/FractionalUCA.txt
index a009f7d9099..a009f7d9099 100644
--- a/Build/source/libs/icu-xetex/data/unidata/FractionalUCA.txt
+++ b/Build/source/libs/icu/icu-xetex/data/unidata/FractionalUCA.txt
diff --git a/Build/source/libs/icu-xetex/data/unidata/GraphemeBreakProperty.txt b/Build/source/libs/icu/icu-xetex/data/unidata/GraphemeBreakProperty.txt
index 8805f362481..8805f362481 100644
--- a/Build/source/libs/icu-xetex/data/unidata/GraphemeBreakProperty.txt
+++ b/Build/source/libs/icu/icu-xetex/data/unidata/GraphemeBreakProperty.txt
diff --git a/Build/source/libs/icu-xetex/data/unidata/LineBreak.txt b/Build/source/libs/icu/icu-xetex/data/unidata/LineBreak.txt
index 13833b3bfa4..13833b3bfa4 100644
--- a/Build/source/libs/icu-xetex/data/unidata/LineBreak.txt
+++ b/Build/source/libs/icu/icu-xetex/data/unidata/LineBreak.txt
diff --git a/Build/source/libs/icu-xetex/data/unidata/NormalizationCorrections.txt b/Build/source/libs/icu/icu-xetex/data/unidata/NormalizationCorrections.txt
index 6952f41d5df..6952f41d5df 100644
--- a/Build/source/libs/icu-xetex/data/unidata/NormalizationCorrections.txt
+++ b/Build/source/libs/icu/icu-xetex/data/unidata/NormalizationCorrections.txt
diff --git a/Build/source/libs/icu-xetex/data/unidata/NormalizationTest.txt b/Build/source/libs/icu/icu-xetex/data/unidata/NormalizationTest.txt
index e8eaf17f94c..e8eaf17f94c 100644
--- a/Build/source/libs/icu-xetex/data/unidata/NormalizationTest.txt
+++ b/Build/source/libs/icu/icu-xetex/data/unidata/NormalizationTest.txt
diff --git a/Build/source/libs/icu-xetex/data/unidata/PropList.txt b/Build/source/libs/icu/icu-xetex/data/unidata/PropList.txt
index 14591c8ff6e..14591c8ff6e 100644
--- a/Build/source/libs/icu-xetex/data/unidata/PropList.txt
+++ b/Build/source/libs/icu/icu-xetex/data/unidata/PropList.txt
diff --git a/Build/source/libs/icu-xetex/data/unidata/PropertyAliases.txt b/Build/source/libs/icu/icu-xetex/data/unidata/PropertyAliases.txt
index f69c2ffbdfa..f69c2ffbdfa 100644
--- a/Build/source/libs/icu-xetex/data/unidata/PropertyAliases.txt
+++ b/Build/source/libs/icu/icu-xetex/data/unidata/PropertyAliases.txt
diff --git a/Build/source/libs/icu-xetex/data/unidata/PropertyValueAliases.txt b/Build/source/libs/icu/icu-xetex/data/unidata/PropertyValueAliases.txt
index 60546fb0b5c..60546fb0b5c 100644
--- a/Build/source/libs/icu-xetex/data/unidata/PropertyValueAliases.txt
+++ b/Build/source/libs/icu/icu-xetex/data/unidata/PropertyValueAliases.txt
diff --git a/Build/source/libs/icu-xetex/data/unidata/Scripts.txt b/Build/source/libs/icu/icu-xetex/data/unidata/Scripts.txt
index 14cb3efd90c..14cb3efd90c 100644
--- a/Build/source/libs/icu-xetex/data/unidata/Scripts.txt
+++ b/Build/source/libs/icu/icu-xetex/data/unidata/Scripts.txt
diff --git a/Build/source/libs/icu-xetex/data/unidata/SentenceBreakProperty.txt b/Build/source/libs/icu/icu-xetex/data/unidata/SentenceBreakProperty.txt
index fc58820b7f2..fc58820b7f2 100644
--- a/Build/source/libs/icu-xetex/data/unidata/SentenceBreakProperty.txt
+++ b/Build/source/libs/icu/icu-xetex/data/unidata/SentenceBreakProperty.txt
diff --git a/Build/source/libs/icu-xetex/data/unidata/SpecialCasing.txt b/Build/source/libs/icu/icu-xetex/data/unidata/SpecialCasing.txt
index 4bfe148b064..4bfe148b064 100644
--- a/Build/source/libs/icu-xetex/data/unidata/SpecialCasing.txt
+++ b/Build/source/libs/icu/icu-xetex/data/unidata/SpecialCasing.txt
diff --git a/Build/source/libs/icu-xetex/data/unidata/UCARules.txt b/Build/source/libs/icu/icu-xetex/data/unidata/UCARules.txt
index cdb5d62c929..cdb5d62c929 100644
--- a/Build/source/libs/icu-xetex/data/unidata/UCARules.txt
+++ b/Build/source/libs/icu/icu-xetex/data/unidata/UCARules.txt
diff --git a/Build/source/libs/icu-xetex/data/unidata/UnicodeData.txt b/Build/source/libs/icu/icu-xetex/data/unidata/UnicodeData.txt
index 15888520046..15888520046 100644
--- a/Build/source/libs/icu-xetex/data/unidata/UnicodeData.txt
+++ b/Build/source/libs/icu/icu-xetex/data/unidata/UnicodeData.txt
diff --git a/Build/source/libs/icu-xetex/data/unidata/WordBreakProperty.txt b/Build/source/libs/icu/icu-xetex/data/unidata/WordBreakProperty.txt
index 78c531c7495..78c531c7495 100644
--- a/Build/source/libs/icu-xetex/data/unidata/WordBreakProperty.txt
+++ b/Build/source/libs/icu/icu-xetex/data/unidata/WordBreakProperty.txt
diff --git a/Build/source/libs/icu-xetex/data/unidata/changes.txt b/Build/source/libs/icu/icu-xetex/data/unidata/changes.txt
index f1c4b0a5704..f1c4b0a5704 100644
--- a/Build/source/libs/icu-xetex/data/unidata/changes.txt
+++ b/Build/source/libs/icu/icu-xetex/data/unidata/changes.txt
diff --git a/Build/source/libs/icu-xetex/data/unidata/ucdterms.txt b/Build/source/libs/icu/icu-xetex/data/unidata/ucdterms.txt
index 7f1ddea37ed..7f1ddea37ed 100644
--- a/Build/source/libs/icu-xetex/data/unidata/ucdterms.txt
+++ b/Build/source/libs/icu/icu-xetex/data/unidata/ucdterms.txt
diff --git a/Build/source/libs/icu-xetex/data/xml/brkitr/en.xml b/Build/source/libs/icu/icu-xetex/data/xml/brkitr/en.xml
index d1b64eaac59..d1b64eaac59 100644
--- a/Build/source/libs/icu-xetex/data/xml/brkitr/en.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/brkitr/en.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/brkitr/en_US.xml b/Build/source/libs/icu/icu-xetex/data/xml/brkitr/en_US.xml
index a5820b5050e..a5820b5050e 100644
--- a/Build/source/libs/icu-xetex/data/xml/brkitr/en_US.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/brkitr/en_US.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/brkitr/en_US_POSIX.xml b/Build/source/libs/icu/icu-xetex/data/xml/brkitr/en_US_POSIX.xml
index ab6e3ccc91b..ab6e3ccc91b 100644
--- a/Build/source/libs/icu-xetex/data/xml/brkitr/en_US_POSIX.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/brkitr/en_US_POSIX.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/brkitr/ja.xml b/Build/source/libs/icu/icu-xetex/data/xml/brkitr/ja.xml
index 04e31fcb61d..04e31fcb61d 100644
--- a/Build/source/libs/icu-xetex/data/xml/brkitr/ja.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/brkitr/ja.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/brkitr/root.xml b/Build/source/libs/icu/icu-xetex/data/xml/brkitr/root.xml
index 056d5f52f23..056d5f52f23 100644
--- a/Build/source/libs/icu-xetex/data/xml/brkitr/root.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/brkitr/root.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/ar.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/ar.xml
index ed158a2a32b..ed158a2a32b 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/ar.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/ar.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/as.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/as.xml
index d0638673d18..d0638673d18 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/as.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/as.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/be.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/be.xml
index 95905fe8f0f..95905fe8f0f 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/be.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/be.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/bg.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/bg.xml
index 93fdc0c98ec..93fdc0c98ec 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/bg.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/bg.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/bn.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/bn.xml
index 7c9ccb73d1c..7c9ccb73d1c 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/bn.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/bn.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/ca.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/ca.xml
index 8c0872c8280..8c0872c8280 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/ca.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/ca.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/cs.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/cs.xml
index 287c0b6d839..287c0b6d839 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/cs.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/cs.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/cy.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/cy.xml
index 4d33f3e06dc..4d33f3e06dc 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/cy.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/cy.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/da.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/da.xml
index 1308e9f3aa9..1308e9f3aa9 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/da.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/da.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/de.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/de.xml
index a182ca6d8f4..a182ca6d8f4 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/de.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/de.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/dz.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/dz.xml
index 8beab6ba497..8beab6ba497 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/dz.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/dz.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/el.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/el.xml
index b7b1185f30a..b7b1185f30a 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/el.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/el.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/en.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/en.xml
index aaf4dafb713..aaf4dafb713 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/en.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/en.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/en_BE.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/en_BE.xml
index 344252e947c..344252e947c 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/en_BE.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/en_BE.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/eo.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/eo.xml
index 4abaa6a688f..4abaa6a688f 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/eo.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/eo.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/es.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/es.xml
index 286d6575207..286d6575207 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/es.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/es.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/et.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/et.xml
index 5d1199ff9d4..5d1199ff9d4 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/et.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/et.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/fa.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/fa.xml
index c1ee3229169..c1ee3229169 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/fa.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/fa.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/fa_AF.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/fa_AF.xml
index ed44e69fbbf..ed44e69fbbf 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/fa_AF.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/fa_AF.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/fi.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/fi.xml
index 881743b505e..881743b505e 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/fi.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/fi.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/fo.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/fo.xml
index 037f4880552..037f4880552 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/fo.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/fo.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/fr.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/fr.xml
index 25bfe5c7562..25bfe5c7562 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/fr.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/fr.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/gu.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/gu.xml
index cd1060bffa8..cd1060bffa8 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/gu.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/gu.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/haw.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/haw.xml
index b46f8197a91..b46f8197a91 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/haw.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/haw.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/he.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/he.xml
index e0c63b869be..e0c63b869be 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/he.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/he.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/hi.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/hi.xml
index ac1df1d1ef9..ac1df1d1ef9 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/hi.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/hi.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/hr.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/hr.xml
index eb82dbb9954..eb82dbb9954 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/hr.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/hr.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/hu.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/hu.xml
index 02393e96942..02393e96942 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/hu.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/hu.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/is.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/is.xml
index 679f1135cb1..679f1135cb1 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/is.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/is.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/it.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/it.xml
index 74247dad516..74247dad516 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/it.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/it.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/ja.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/ja.xml
index 0fb968529e8..0fb968529e8 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/ja.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/ja.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/kk.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/kk.xml
index 4811693b443..4811693b443 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/kk.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/kk.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/kl.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/kl.xml
index a97fc950833..a97fc950833 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/kl.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/kl.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/km.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/km.xml
index 78356da23e1..78356da23e1 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/km.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/km.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/kn.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/kn.xml
index d42bf6267cc..d42bf6267cc 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/kn.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/kn.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/ko.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/ko.xml
index 7523054cb3b..7523054cb3b 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/ko.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/ko.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/kok.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/kok.xml
index d618c44f12a..d618c44f12a 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/kok.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/kok.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/lt.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/lt.xml
index b5bc793b743..b5bc793b743 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/lt.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/lt.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/lv.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/lv.xml
index e83a22f8495..e83a22f8495 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/lv.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/lv.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/mk.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/mk.xml
index 81efd1ebf19..81efd1ebf19 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/mk.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/mk.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/ml.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/ml.xml
index bf3689eabc3..bf3689eabc3 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/ml.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/ml.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/mr.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/mr.xml
index dfeabce700a..dfeabce700a 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/mr.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/mr.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/mt.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/mt.xml
index 7ab2820309e..7ab2820309e 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/mt.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/mt.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/nb.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/nb.xml
index fbd77de0e5f..fbd77de0e5f 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/nb.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/nb.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/nn.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/nn.xml
index 56ce90500ca..56ce90500ca 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/nn.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/nn.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/om.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/om.xml
index 1e5fb9e2993..1e5fb9e2993 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/om.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/om.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/or.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/or.xml
index 2da486db247..2da486db247 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/or.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/or.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/pa.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/pa.xml
index 426debc4d48..426debc4d48 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/pa.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/pa.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/pl.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/pl.xml
index 44f6d45895a..44f6d45895a 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/pl.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/pl.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/ps.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/ps.xml
index 5438f9191c5..5438f9191c5 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/ps.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/ps.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/ro.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/ro.xml
index 63556956f45..63556956f45 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/ro.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/ro.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/root.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/root.xml
index 8bc9bf1751c..8bc9bf1751c 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/root.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/root.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/ru.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/ru.xml
index d7e3c621ea8..d7e3c621ea8 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/ru.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/ru.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/sk.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/sk.xml
index 08e162f0177..08e162f0177 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/sk.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/sk.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/sl.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/sl.xml
index 27e2c9b28c9..27e2c9b28c9 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/sl.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/sl.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/sq.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/sq.xml
index fd27a06c79a..fd27a06c79a 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/sq.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/sq.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/sr.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/sr.xml
index e84414aa160..e84414aa160 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/sr.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/sr.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/sr_Latn.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/sr_Latn.xml
index 58ba58e5854..58ba58e5854 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/sr_Latn.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/sr_Latn.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/sv.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/sv.xml
index 62cc3ef9c03..62cc3ef9c03 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/sv.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/sv.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/ta.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/ta.xml
index b712cda8965..b712cda8965 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/ta.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/ta.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/te.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/te.xml
index e692906b427..e692906b427 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/te.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/te.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/th.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/th.xml
index e67be5cba58..e67be5cba58 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/th.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/th.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/tr.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/tr.xml
index 7f786f18da8..7f786f18da8 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/tr.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/tr.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/uk.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/uk.xml
index e3d5a9fe5fc..e3d5a9fe5fc 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/uk.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/uk.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/vi.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/vi.xml
index 1726d8a4858..1726d8a4858 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/vi.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/vi.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/zh.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/zh.xml
index aae9f989b72..aae9f989b72 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/zh.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/zh.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/zh_HK.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/zh_HK.xml
index 487aa94ce3e..487aa94ce3e 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/zh_HK.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/zh_HK.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/zh_Hant.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/zh_Hant.xml
index 6d2587efb32..6d2587efb32 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/zh_Hant.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/zh_Hant.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/zh_MO.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/zh_MO.xml
index fa5e84f514c..fa5e84f514c 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/zh_MO.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/zh_MO.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/zh_TW.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/zh_TW.xml
index ec6480b7a2f..ec6480b7a2f 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/zh_TW.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/zh_TW.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/collation/zh_TW_STROKE.xml b/Build/source/libs/icu/icu-xetex/data/xml/collation/zh_TW_STROKE.xml
index 8ba27ee782a..8ba27ee782a 100644
--- a/Build/source/libs/icu-xetex/data/xml/collation/zh_TW_STROKE.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/collation/zh_TW_STROKE.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/aa.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/aa.xml
index b9ee8e4f7f6..b9ee8e4f7f6 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/aa.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/aa.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/af.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/af.xml
index ef039fcfd4c..ef039fcfd4c 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/af.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/af.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/am.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/am.xml
index b2b0ca0b1a6..b2b0ca0b1a6 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/am.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/am.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/ar.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/ar.xml
index e27183d81ac..e27183d81ac 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/ar.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/ar.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/as.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/as.xml
index 45d197f3b47..45d197f3b47 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/as.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/as.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/az.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/az.xml
index c48cc5f32f7..c48cc5f32f7 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/az.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/az.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/az_AZ.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/az_AZ.xml
index 694c50608be..694c50608be 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/az_AZ.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/az_AZ.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/az_Cyrl.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/az_Cyrl.xml
index 5c090e1ae06..5c090e1ae06 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/az_Cyrl.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/az_Cyrl.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/az_Latn.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/az_Latn.xml
index 49899bc65f2..49899bc65f2 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/az_Latn.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/az_Latn.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/be.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/be.xml
index 1c36f178dba..1c36f178dba 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/be.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/be.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/bg.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/bg.xml
index 8c0ef482008..8c0ef482008 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/bg.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/bg.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/bn.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/bn.xml
index bea12870b86..bea12870b86 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/bn.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/bn.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/ca.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/ca.xml
index fbac7689cda..fbac7689cda 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/ca.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/ca.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/cs.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/cs.xml
index b795d58663b..b795d58663b 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/cs.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/cs.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/cy.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/cy.xml
index 8ef9a03f9ea..8ef9a03f9ea 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/cy.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/cy.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/da.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/da.xml
index c07fc4cd2d9..c07fc4cd2d9 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/da.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/da.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/de.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/de.xml
index 7e7c567855b..7e7c567855b 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/de.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/de.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/el.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/el.xml
index cca411c37b7..cca411c37b7 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/el.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/el.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/en.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/en.xml
index ad21d4247ac..ad21d4247ac 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/en.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/en.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/en_US_POSIX.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/en_US_POSIX.xml
index 9186f936e9c..9186f936e9c 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/en_US_POSIX.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/en_US_POSIX.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/eo.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/eo.xml
index e040ea23292..e040ea23292 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/eo.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/eo.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/es.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/es.xml
index ec6eb2b2f3b..ec6eb2b2f3b 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/es.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/es.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/et.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/et.xml
index db089124c11..db089124c11 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/et.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/et.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/eu.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/eu.xml
index 90d0856d9e8..90d0856d9e8 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/eu.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/eu.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/fa.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/fa.xml
index 43154606641..43154606641 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/fa.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/fa.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/fi.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/fi.xml
index 90adc000d36..90adc000d36 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/fi.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/fi.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/fo.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/fo.xml
index 8f3af23884d..8f3af23884d 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/fo.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/fo.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/fr.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/fr.xml
index 72fe88aa94f..72fe88aa94f 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/fr.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/fr.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/ga.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/ga.xml
index 99edea5720d..99edea5720d 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/ga.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/ga.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/gl.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/gl.xml
index 60b308d3c5d..60b308d3c5d 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/gl.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/gl.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/gu.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/gu.xml
index 359eabbb431..359eabbb431 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/gu.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/gu.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/gv.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/gv.xml
index 7b757af08e8..7b757af08e8 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/gv.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/gv.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/haw.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/haw.xml
index 6af74650950..6af74650950 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/haw.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/haw.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/he.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/he.xml
index addeea5c84e..addeea5c84e 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/he.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/he.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/hi.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/hi.xml
index 0ff2fce04d7..0ff2fce04d7 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/hi.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/hi.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/hr.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/hr.xml
index 0451eff63f1..0451eff63f1 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/hr.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/hr.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/hu.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/hu.xml
index cc937052b09..cc937052b09 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/hu.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/hu.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/hy.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/hy.xml
index 4f0635a05e8..4f0635a05e8 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/hy.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/hy.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/id.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/id.xml
index fe6d0c5c239..fe6d0c5c239 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/id.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/id.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/ii.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/ii.xml
index 61e182c7ed3..61e182c7ed3 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/ii.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/ii.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/is.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/is.xml
index 6b1ed91ba8b..6b1ed91ba8b 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/is.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/is.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/it.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/it.xml
index e1a975ed801..e1a975ed801 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/it.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/it.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/iw.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/iw.xml
index d5a83b81d0b..d5a83b81d0b 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/iw.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/iw.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/ja.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/ja.xml
index 999c670b5fd..999c670b5fd 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/ja.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/ja.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/ka.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/ka.xml
index 8d2b0782307..8d2b0782307 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/ka.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/ka.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/kk.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/kk.xml
index 9b68e26a4e7..9b68e26a4e7 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/kk.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/kk.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/kl.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/kl.xml
index d1fe1b11a51..d1fe1b11a51 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/kl.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/kl.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/km.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/km.xml
index e5fc0842df0..e5fc0842df0 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/km.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/km.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/kn.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/kn.xml
index 379bd6c8011..379bd6c8011 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/kn.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/kn.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/ko.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/ko.xml
index 54afd040f20..54afd040f20 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/ko.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/ko.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/kok.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/kok.xml
index 870d13146da..870d13146da 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/kok.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/kok.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/kw.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/kw.xml
index 13aa2eae6d3..13aa2eae6d3 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/kw.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/kw.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/lt.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/lt.xml
index ee36966799e..ee36966799e 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/lt.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/lt.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/lv.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/lv.xml
index baec6e16007..baec6e16007 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/lv.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/lv.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/mk.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/mk.xml
index f4194cab83e..f4194cab83e 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/mk.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/mk.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/ml.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/ml.xml
index 161109e1f4f..161109e1f4f 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/ml.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/ml.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/mr.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/mr.xml
index 3a35e9cff41..3a35e9cff41 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/mr.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/mr.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/ms.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/ms.xml
index 2da94a24dd0..2da94a24dd0 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/ms.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/ms.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/mt.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/mt.xml
index 8193c6aae1e..8193c6aae1e 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/mt.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/mt.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/my.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/my.xml
index 62825339801..62825339801 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/my.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/my.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/nb.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/nb.xml
index 7e6ab3cbd6b..7e6ab3cbd6b 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/nb.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/nb.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/nl.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/nl.xml
index 6ced54dfb47..6ced54dfb47 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/nl.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/nl.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/nn.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/nn.xml
index 2a3a0342d53..2a3a0342d53 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/nn.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/nn.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/no.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/no.xml
index ce76364f424..ce76364f424 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/no.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/no.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/nr.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/nr.xml
index 7b49ce7ee5c..7b49ce7ee5c 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/nr.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/nr.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/om.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/om.xml
index 77e08933f50..77e08933f50 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/om.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/om.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/or.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/or.xml
index 4c3dc2996d6..4c3dc2996d6 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/or.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/or.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/pa.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/pa.xml
index e62c4d17a73..e62c4d17a73 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/pa.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/pa.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/pa_Guru.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/pa_Guru.xml
index 40083ea2d41..40083ea2d41 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/pa_Guru.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/pa_Guru.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/pl.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/pl.xml
index b2b410e9125..b2b410e9125 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/pl.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/pl.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/ps.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/ps.xml
index 1afb6a345df..1afb6a345df 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/ps.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/ps.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/pt.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/pt.xml
index 7e7e9e20753..7e7e9e20753 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/pt.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/pt.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/ro.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/ro.xml
index 7fcb9eb6fa1..7fcb9eb6fa1 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/ro.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/ro.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/root.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/root.xml
index ad4ab16cbf0..ad4ab16cbf0 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/root.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/root.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/ru.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/ru.xml
index 53d93781ba2..53d93781ba2 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/ru.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/ru.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/sh.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/sh.xml
index ae32600eaa5..ae32600eaa5 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/sh.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/sh.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/sk.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/sk.xml
index cb05df228e6..cb05df228e6 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/sk.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/sk.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/sl.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/sl.xml
index dddde085122..dddde085122 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/sl.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/sl.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/so.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/so.xml
index ff1531071a2..ff1531071a2 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/so.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/so.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/sq.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/sq.xml
index 45ba4a45845..45ba4a45845 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/sq.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/sq.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/sr.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/sr.xml
index 4d066e60c4b..4d066e60c4b 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/sr.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/sr.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/sr_Cyrl.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/sr_Cyrl.xml
index 9860ca12437..9860ca12437 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/sr_Cyrl.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/sr_Cyrl.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/sr_Latn.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/sr_Latn.xml
index 99c31383959..99c31383959 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/sr_Latn.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/sr_Latn.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/sv.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/sv.xml
index d4336119f86..d4336119f86 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/sv.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/sv.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/sw.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/sw.xml
index 4a57d1d2443..4a57d1d2443 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/sw.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/sw.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/ta.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/ta.xml
index b4110308eec..b4110308eec 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/ta.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/ta.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/te.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/te.xml
index fde79321cce..fde79321cce 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/te.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/te.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/th.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/th.xml
index 43571577249..43571577249 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/th.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/th.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/ti.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/ti.xml
index 70440a00eed..70440a00eed 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/ti.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/ti.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/tl.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/tl.xml
index caff8f40630..caff8f40630 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/tl.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/tl.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/to.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/to.xml
index 899415452a9..899415452a9 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/to.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/to.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/tr.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/tr.xml
index eab28883fc1..eab28883fc1 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/tr.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/tr.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/uk.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/uk.xml
index 2075b44f5eb..2075b44f5eb 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/uk.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/uk.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/ur.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/ur.xml
index 9cc0f121c2f..9cc0f121c2f 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/ur.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/ur.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/ur_IN.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/ur_IN.xml
index b79e0f2f79e..b79e0f2f79e 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/ur_IN.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/ur_IN.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/uz.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/uz.xml
index 7198816f4b7..7198816f4b7 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/uz.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/uz.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/uz_Arab.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/uz_Arab.xml
index 6bfaa5963f9..6bfaa5963f9 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/uz_Arab.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/uz_Arab.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/uz_Cyrl.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/uz_Cyrl.xml
index acecf2d43c9..acecf2d43c9 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/uz_Cyrl.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/uz_Cyrl.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/uz_Latn.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/uz_Latn.xml
index 24fd3f6ab69..24fd3f6ab69 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/uz_Latn.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/uz_Latn.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/uz_UZ.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/uz_UZ.xml
index 4cbcc2a02e4..4cbcc2a02e4 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/uz_UZ.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/uz_UZ.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/vi.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/vi.xml
index cd7fc866dd0..cd7fc866dd0 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/vi.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/vi.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/zh.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/zh.xml
index c5739296846..c5739296846 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/zh.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/zh.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/zh_Hans.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/zh_Hans.xml
index 99cc6d60f91..99cc6d60f91 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/zh_Hans.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/zh_Hans.xml
diff --git a/Build/source/libs/icu-xetex/data/xml/main/zh_Hant.xml b/Build/source/libs/icu/icu-xetex/data/xml/main/zh_Hant.xml
index 3afb5be29d7..3afb5be29d7 100644
--- a/Build/source/libs/icu-xetex/data/xml/main/zh_Hant.xml
+++ b/Build/source/libs/icu/icu-xetex/data/xml/main/zh_Hant.xml
diff --git a/Build/source/libs/icu-xetex/extra/Makefile.in b/Build/source/libs/icu/icu-xetex/extra/Makefile.in
index 937859ca552..937859ca552 100644
--- a/Build/source/libs/icu-xetex/extra/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/extra/Makefile.in
diff --git a/Build/source/libs/icu-xetex/extra/scrptrun/Makefile.in b/Build/source/libs/icu/icu-xetex/extra/scrptrun/Makefile.in
index c39b7254456..c39b7254456 100644
--- a/Build/source/libs/icu-xetex/extra/scrptrun/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/extra/scrptrun/Makefile.in
diff --git a/Build/source/libs/icu-xetex/extra/scrptrun/readme.html b/Build/source/libs/icu/icu-xetex/extra/scrptrun/readme.html
index b252b6d4a35..b252b6d4a35 100644
--- a/Build/source/libs/icu-xetex/extra/scrptrun/readme.html
+++ b/Build/source/libs/icu/icu-xetex/extra/scrptrun/readme.html
diff --git a/Build/source/libs/icu-xetex/extra/scrptrun/scrptrun.cpp b/Build/source/libs/icu/icu-xetex/extra/scrptrun/scrptrun.cpp
index 8d9865155af..8d9865155af 100644
--- a/Build/source/libs/icu-xetex/extra/scrptrun/scrptrun.cpp
+++ b/Build/source/libs/icu/icu-xetex/extra/scrptrun/scrptrun.cpp
diff --git a/Build/source/libs/icu-xetex/extra/scrptrun/scrptrun.h b/Build/source/libs/icu/icu-xetex/extra/scrptrun/scrptrun.h
index b5c63b116c6..b5c63b116c6 100644
--- a/Build/source/libs/icu-xetex/extra/scrptrun/scrptrun.h
+++ b/Build/source/libs/icu/icu-xetex/extra/scrptrun/scrptrun.h
diff --git a/Build/source/libs/icu-xetex/extra/scrptrun/srtest.cpp b/Build/source/libs/icu/icu-xetex/extra/scrptrun/srtest.cpp
index 8b6b550da31..8b6b550da31 100644
--- a/Build/source/libs/icu-xetex/extra/scrptrun/srtest.cpp
+++ b/Build/source/libs/icu/icu-xetex/extra/scrptrun/srtest.cpp
diff --git a/Build/source/libs/icu-xetex/extra/scrptrun/srtest.dsp b/Build/source/libs/icu/icu-xetex/extra/scrptrun/srtest.dsp
index 0f857ddacd5..0f857ddacd5 100644
--- a/Build/source/libs/icu-xetex/extra/scrptrun/srtest.dsp
+++ b/Build/source/libs/icu/icu-xetex/extra/scrptrun/srtest.dsp
diff --git a/Build/source/libs/icu-xetex/extra/scrptrun/srtest.dsw b/Build/source/libs/icu/icu-xetex/extra/scrptrun/srtest.dsw
index f559400b10b..f559400b10b 100644
--- a/Build/source/libs/icu-xetex/extra/scrptrun/srtest.dsw
+++ b/Build/source/libs/icu/icu-xetex/extra/scrptrun/srtest.dsw
diff --git a/Build/source/libs/icu-xetex/extra/uconv/Makefile.in b/Build/source/libs/icu/icu-xetex/extra/uconv/Makefile.in
index de6ed1832a4..de6ed1832a4 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/Makefile.in
diff --git a/Build/source/libs/icu-xetex/extra/uconv/README b/Build/source/libs/icu/icu-xetex/extra/uconv/README
index da91fc651c9..da91fc651c9 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/README
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/README
diff --git a/Build/source/libs/icu-xetex/extra/uconv/makedata.mak b/Build/source/libs/icu/icu-xetex/extra/uconv/makedata.mak
index 21d5bc377a0..21d5bc377a0 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/makedata.mak
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/makedata.mak
diff --git a/Build/source/libs/icu-xetex/extra/uconv/pkgdata.inc.in b/Build/source/libs/icu/icu-xetex/extra/uconv/pkgdata.inc.in
index 8ce5c21a305..8ce5c21a305 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/pkgdata.inc.in
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/pkgdata.inc.in
diff --git a/Build/source/libs/icu-xetex/extra/uconv/resfiles.mk b/Build/source/libs/icu/icu-xetex/extra/uconv/resfiles.mk
index 1e83ff6af4f..1e83ff6af4f 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/resfiles.mk
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/resfiles.mk
diff --git a/Build/source/libs/icu-xetex/extra/uconv/resources/fr.txt b/Build/source/libs/icu/icu-xetex/extra/uconv/resources/fr.txt
index 054c4ab7957..054c4ab7957 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/resources/fr.txt
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/resources/fr.txt
diff --git a/Build/source/libs/icu-xetex/extra/uconv/resources/root.txt b/Build/source/libs/icu/icu-xetex/extra/uconv/resources/root.txt
index 4683580b6c1..4683580b6c1 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/resources/root.txt
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/resources/root.txt
diff --git a/Build/source/libs/icu-xetex/extra/uconv/samples/ISO-8859-2.txt b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/ISO-8859-2.txt
index 61e8d712b2d..61e8d712b2d 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/samples/ISO-8859-2.txt
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/ISO-8859-2.txt
diff --git a/Build/source/libs/icu-xetex/extra/uconv/samples/ISO-8859-3.txt b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/ISO-8859-3.txt
index b6ba7937ff1..b6ba7937ff1 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/samples/ISO-8859-3.txt
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/ISO-8859-3.txt
diff --git a/Build/source/libs/icu-xetex/extra/uconv/samples/danish-ISO-8859-1.txt b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/danish-ISO-8859-1.txt
index 95e57d6c72d..95e57d6c72d 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/samples/danish-ISO-8859-1.txt
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/danish-ISO-8859-1.txt
diff --git a/Build/source/libs/icu-xetex/extra/uconv/samples/eucJP.txt b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/eucJP.txt
index 680efb1d1a7..680efb1d1a7 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/samples/eucJP.txt
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/eucJP.txt
diff --git a/Build/source/libs/icu-xetex/extra/uconv/samples/hangul-eucKR.txt b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/hangul-eucKR.txt
index 90a0393b77a..90a0393b77a 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/samples/hangul-eucKR.txt
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/hangul-eucKR.txt
diff --git a/Build/source/libs/icu-xetex/extra/uconv/samples/hania-eucKR.txt b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/hania-eucKR.txt
index 3197f751bc6..3197f751bc6 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/samples/hania-eucKR.txt
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/hania-eucKR.txt
diff --git a/Build/source/libs/icu-xetex/extra/uconv/samples/iso8859-1.txt b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/iso8859-1.txt
index 95e57d6c72d..95e57d6c72d 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/samples/iso8859-1.txt
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/iso8859-1.txt
diff --git a/Build/source/libs/icu-xetex/extra/uconv/samples/koi8r.txt b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/koi8r.txt
index 578a30f1233..578a30f1233 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/samples/koi8r.txt
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/koi8r.txt
diff --git a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/armenian.txt b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/armenian.txt
index 0cceb1bb60f..0cceb1bb60f 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/armenian.txt
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/armenian.txt
diff --git a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/banviet.txt b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/banviet.txt
index 7e1f5cb07ab..7e1f5cb07ab 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/banviet.txt
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/banviet.txt
diff --git a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/chinese-ulysses.txt b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/chinese-ulysses.txt
index 94e366238d9..94e366238d9 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/chinese-ulysses.txt
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/chinese-ulysses.txt
diff --git a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/croat.txt b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/croat.txt
index 2500a40ddf4..2500a40ddf4 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/croat.txt
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/croat.txt
diff --git a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/danish.txt b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/danish.txt
index 4f02a6ea47c..4f02a6ea47c 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/danish.txt
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/danish.txt
diff --git a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/greek.txt b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/greek.txt
index 473303faaee..473303faaee 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/greek.txt
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/greek.txt
diff --git a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/hangul.txt b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/hangul.txt
index 7557f2c1569..7557f2c1569 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/hangul.txt
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/hangul.txt
diff --git a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/hania.txt b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/hania.txt
index ff133eac838..ff133eac838 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/hania.txt
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/hania.txt
diff --git a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/jap.txt b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/jap.txt
index 7768896d478..7768896d478 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/jap.txt
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/jap.txt
diff --git a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/korean.txt b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/korean.txt
index 9628ef6878f..9628ef6878f 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/korean.txt
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/korean.txt
diff --git a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/linji.txt b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/linji.txt
index 6fe5922a467..6fe5922a467 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/linji.txt
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/linji.txt
diff --git a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/many.txt b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/many.txt
index 73088242827..73088242827 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/many.txt
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/many.txt
diff --git a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/maopoem.txt b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/maopoem.txt
index 61aeead1d6d..61aeead1d6d 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/maopoem.txt
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/maopoem.txt
diff --git a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/russian.txt b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/russian.txt
index 53ca1264401..53ca1264401 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/russian.txt
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/russian.txt
diff --git a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/simplechinese.txt b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/simplechinese.txt
index 70f7f6e403b..70f7f6e403b 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/simplechinese.txt
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/simplechinese.txt
diff --git a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/turkish.txt b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/turkish.txt
index 733945dffc9..733945dffc9 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/turkish.txt
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/turkish.txt
diff --git a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/utf-8-demo.txt b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/utf-8-demo.txt
index fdc1d1c9d8e..fdc1d1c9d8e 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/samples/utf8/utf-8-demo.txt
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/samples/utf8/utf-8-demo.txt
diff --git a/Build/source/libs/icu-xetex/extra/uconv/uconv.1.in b/Build/source/libs/icu/icu-xetex/extra/uconv/uconv.1.in
index 9cd2e49e934..9cd2e49e934 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/uconv.1.in
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/uconv.1.in
diff --git a/Build/source/libs/icu-xetex/extra/uconv/uconv.cpp b/Build/source/libs/icu/icu-xetex/extra/uconv/uconv.cpp
index 2468fbaefac..2468fbaefac 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/uconv.cpp
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/uconv.cpp
diff --git a/Build/source/libs/icu-xetex/extra/uconv/uconv.vcproj b/Build/source/libs/icu/icu-xetex/extra/uconv/uconv.vcproj
index 4a76026d6ee..4a76026d6ee 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/uconv.vcproj
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/uconv.vcproj
diff --git a/Build/source/libs/icu-xetex/extra/uconv/unicode/uwmsg.h b/Build/source/libs/icu/icu-xetex/extra/uconv/unicode/uwmsg.h
index 69a10356905..69a10356905 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/unicode/uwmsg.h
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/unicode/uwmsg.h
diff --git a/Build/source/libs/icu-xetex/extra/uconv/uwmsg.c b/Build/source/libs/icu/icu-xetex/extra/uconv/uwmsg.c
index 61e6c463719..61e6c463719 100644
--- a/Build/source/libs/icu-xetex/extra/uconv/uwmsg.c
+++ b/Build/source/libs/icu/icu-xetex/extra/uconv/uwmsg.c
diff --git a/Build/source/libs/icu-xetex/i18n/Makefile.in b/Build/source/libs/icu/icu-xetex/i18n/Makefile.in
index 14bec19c0e8..14bec19c0e8 100644
--- a/Build/source/libs/icu-xetex/i18n/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/i18n/Makefile.in
diff --git a/Build/source/libs/icu-xetex/i18n/anytrans.cpp b/Build/source/libs/icu/icu-xetex/i18n/anytrans.cpp
index 5b10caf1f93..5b10caf1f93 100644
--- a/Build/source/libs/icu-xetex/i18n/anytrans.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/anytrans.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/anytrans.h b/Build/source/libs/icu/icu-xetex/i18n/anytrans.h
index 228ccbe03af..228ccbe03af 100644
--- a/Build/source/libs/icu-xetex/i18n/anytrans.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/anytrans.h
diff --git a/Build/source/libs/icu-xetex/i18n/astro.cpp b/Build/source/libs/icu/icu-xetex/i18n/astro.cpp
index 566d498d904..566d498d904 100644
--- a/Build/source/libs/icu-xetex/i18n/astro.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/astro.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/astro.h b/Build/source/libs/icu/icu-xetex/i18n/astro.h
index 6c28f2e3e0e..6c28f2e3e0e 100644
--- a/Build/source/libs/icu-xetex/i18n/astro.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/astro.h
diff --git a/Build/source/libs/icu-xetex/i18n/basictz.cpp b/Build/source/libs/icu/icu-xetex/i18n/basictz.cpp
index 546adb691b5..546adb691b5 100644
--- a/Build/source/libs/icu-xetex/i18n/basictz.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/basictz.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/bocsu.c b/Build/source/libs/icu/icu-xetex/i18n/bocsu.c
index d4c6ab86ec8..d4c6ab86ec8 100644
--- a/Build/source/libs/icu-xetex/i18n/bocsu.c
+++ b/Build/source/libs/icu/icu-xetex/i18n/bocsu.c
diff --git a/Build/source/libs/icu-xetex/i18n/bocsu.h b/Build/source/libs/icu/icu-xetex/i18n/bocsu.h
index 26562b19948..26562b19948 100644
--- a/Build/source/libs/icu-xetex/i18n/bocsu.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/bocsu.h
diff --git a/Build/source/libs/icu-xetex/i18n/buddhcal.cpp b/Build/source/libs/icu/icu-xetex/i18n/buddhcal.cpp
index a887cbff02e..a887cbff02e 100644
--- a/Build/source/libs/icu-xetex/i18n/buddhcal.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/buddhcal.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/buddhcal.h b/Build/source/libs/icu/icu-xetex/i18n/buddhcal.h
index 735f61890a7..735f61890a7 100644
--- a/Build/source/libs/icu-xetex/i18n/buddhcal.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/buddhcal.h
diff --git a/Build/source/libs/icu-xetex/i18n/calendar.cpp b/Build/source/libs/icu/icu-xetex/i18n/calendar.cpp
index 03bedde03ee..03bedde03ee 100644
--- a/Build/source/libs/icu-xetex/i18n/calendar.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/calendar.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/casetrn.cpp b/Build/source/libs/icu/icu-xetex/i18n/casetrn.cpp
index 96778af6522..96778af6522 100644
--- a/Build/source/libs/icu-xetex/i18n/casetrn.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/casetrn.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/casetrn.h b/Build/source/libs/icu/icu-xetex/i18n/casetrn.h
index 2e6ab15161b..2e6ab15161b 100644
--- a/Build/source/libs/icu-xetex/i18n/casetrn.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/casetrn.h
diff --git a/Build/source/libs/icu-xetex/i18n/chnsecal.cpp b/Build/source/libs/icu/icu-xetex/i18n/chnsecal.cpp
index fda2aaca16e..fda2aaca16e 100644
--- a/Build/source/libs/icu-xetex/i18n/chnsecal.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/chnsecal.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/chnsecal.h b/Build/source/libs/icu/icu-xetex/i18n/chnsecal.h
index 9d5a9f7709e..9d5a9f7709e 100644
--- a/Build/source/libs/icu-xetex/i18n/chnsecal.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/chnsecal.h
diff --git a/Build/source/libs/icu-xetex/i18n/choicfmt.cpp b/Build/source/libs/icu/icu-xetex/i18n/choicfmt.cpp
index b9caa9a3b9c..b9caa9a3b9c 100644
--- a/Build/source/libs/icu-xetex/i18n/choicfmt.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/choicfmt.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/coleitr.cpp b/Build/source/libs/icu/icu-xetex/i18n/coleitr.cpp
index 96aa9681264..96aa9681264 100644
--- a/Build/source/libs/icu-xetex/i18n/coleitr.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/coleitr.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/coll.cpp b/Build/source/libs/icu/icu-xetex/i18n/coll.cpp
index 88229893de0..88229893de0 100644
--- a/Build/source/libs/icu-xetex/i18n/coll.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/coll.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/cpdtrans.cpp b/Build/source/libs/icu/icu-xetex/i18n/cpdtrans.cpp
index afd1fdbf8bd..afd1fdbf8bd 100644
--- a/Build/source/libs/icu-xetex/i18n/cpdtrans.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/cpdtrans.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/cpdtrans.h b/Build/source/libs/icu/icu-xetex/i18n/cpdtrans.h
index 833b2cb8198..833b2cb8198 100644
--- a/Build/source/libs/icu-xetex/i18n/cpdtrans.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/cpdtrans.h
diff --git a/Build/source/libs/icu-xetex/i18n/csdetect.cpp b/Build/source/libs/icu/icu-xetex/i18n/csdetect.cpp
index 08412477a0b..08412477a0b 100644
--- a/Build/source/libs/icu-xetex/i18n/csdetect.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/csdetect.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/csdetect.h b/Build/source/libs/icu/icu-xetex/i18n/csdetect.h
index 405e1f55800..405e1f55800 100644
--- a/Build/source/libs/icu-xetex/i18n/csdetect.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/csdetect.h
diff --git a/Build/source/libs/icu-xetex/i18n/csmatch.cpp b/Build/source/libs/icu/icu-xetex/i18n/csmatch.cpp
index f1d25d2dde9..f1d25d2dde9 100644
--- a/Build/source/libs/icu-xetex/i18n/csmatch.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/csmatch.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/csmatch.h b/Build/source/libs/icu/icu-xetex/i18n/csmatch.h
index 50b78a3a1dc..50b78a3a1dc 100644
--- a/Build/source/libs/icu-xetex/i18n/csmatch.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/csmatch.h
diff --git a/Build/source/libs/icu-xetex/i18n/csr2022.cpp b/Build/source/libs/icu/icu-xetex/i18n/csr2022.cpp
index c7165f1c0d3..c7165f1c0d3 100644
--- a/Build/source/libs/icu-xetex/i18n/csr2022.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/csr2022.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/csr2022.h b/Build/source/libs/icu/icu-xetex/i18n/csr2022.h
index 5d34711bdc3..5d34711bdc3 100644
--- a/Build/source/libs/icu-xetex/i18n/csr2022.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/csr2022.h
diff --git a/Build/source/libs/icu-xetex/i18n/csrecog.cpp b/Build/source/libs/icu/icu-xetex/i18n/csrecog.cpp
index ba70b1547f8..ba70b1547f8 100644
--- a/Build/source/libs/icu-xetex/i18n/csrecog.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/csrecog.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/csrecog.h b/Build/source/libs/icu/icu-xetex/i18n/csrecog.h
index 75cf94f49f4..75cf94f49f4 100644
--- a/Build/source/libs/icu-xetex/i18n/csrecog.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/csrecog.h
diff --git a/Build/source/libs/icu-xetex/i18n/csrmbcs.cpp b/Build/source/libs/icu/icu-xetex/i18n/csrmbcs.cpp
index 11f70a78861..11f70a78861 100644
--- a/Build/source/libs/icu-xetex/i18n/csrmbcs.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/csrmbcs.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/csrmbcs.h b/Build/source/libs/icu/icu-xetex/i18n/csrmbcs.h
index 4a5f1e63f20..4a5f1e63f20 100644
--- a/Build/source/libs/icu-xetex/i18n/csrmbcs.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/csrmbcs.h
diff --git a/Build/source/libs/icu-xetex/i18n/csrsbcs.cpp b/Build/source/libs/icu/icu-xetex/i18n/csrsbcs.cpp
index ddf5aedf520..ddf5aedf520 100644
--- a/Build/source/libs/icu-xetex/i18n/csrsbcs.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/csrsbcs.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/csrsbcs.h b/Build/source/libs/icu/icu-xetex/i18n/csrsbcs.h
index 456fc4dff43..456fc4dff43 100644
--- a/Build/source/libs/icu-xetex/i18n/csrsbcs.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/csrsbcs.h
diff --git a/Build/source/libs/icu-xetex/i18n/csrucode.cpp b/Build/source/libs/icu/icu-xetex/i18n/csrucode.cpp
index 99a76d850e6..99a76d850e6 100644
--- a/Build/source/libs/icu-xetex/i18n/csrucode.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/csrucode.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/csrucode.h b/Build/source/libs/icu/icu-xetex/i18n/csrucode.h
index 315bad6b25e..315bad6b25e 100644
--- a/Build/source/libs/icu-xetex/i18n/csrucode.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/csrucode.h
diff --git a/Build/source/libs/icu-xetex/i18n/csrutf8.cpp b/Build/source/libs/icu/icu-xetex/i18n/csrutf8.cpp
index 8af5307bdc3..8af5307bdc3 100644
--- a/Build/source/libs/icu-xetex/i18n/csrutf8.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/csrutf8.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/csrutf8.h b/Build/source/libs/icu/icu-xetex/i18n/csrutf8.h
index 10fe287a435..10fe287a435 100644
--- a/Build/source/libs/icu-xetex/i18n/csrutf8.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/csrutf8.h
diff --git a/Build/source/libs/icu-xetex/i18n/curramt.cpp b/Build/source/libs/icu/icu-xetex/i18n/curramt.cpp
index f4e1abb0572..f4e1abb0572 100644
--- a/Build/source/libs/icu-xetex/i18n/curramt.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/curramt.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/currfmt.cpp b/Build/source/libs/icu/icu-xetex/i18n/currfmt.cpp
index e2fc5a8f202..e2fc5a8f202 100644
--- a/Build/source/libs/icu-xetex/i18n/currfmt.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/currfmt.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/currfmt.h b/Build/source/libs/icu/icu-xetex/i18n/currfmt.h
index b9e8dd89686..b9e8dd89686 100644
--- a/Build/source/libs/icu-xetex/i18n/currfmt.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/currfmt.h
diff --git a/Build/source/libs/icu-xetex/i18n/currunit.cpp b/Build/source/libs/icu/icu-xetex/i18n/currunit.cpp
index 0ba2631d480..0ba2631d480 100644
--- a/Build/source/libs/icu-xetex/i18n/currunit.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/currunit.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/datefmt.cpp b/Build/source/libs/icu/icu-xetex/i18n/datefmt.cpp
index f49ca94cc50..f49ca94cc50 100644
--- a/Build/source/libs/icu-xetex/i18n/datefmt.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/datefmt.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/dcfmtsym.cpp b/Build/source/libs/icu/icu-xetex/i18n/dcfmtsym.cpp
index 34074750ad2..34074750ad2 100644
--- a/Build/source/libs/icu-xetex/i18n/dcfmtsym.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/dcfmtsym.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/decimfmt.cpp b/Build/source/libs/icu/icu-xetex/i18n/decimfmt.cpp
index 0598bbbd0b5..0598bbbd0b5 100644
--- a/Build/source/libs/icu-xetex/i18n/decimfmt.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/decimfmt.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/digitlst.cpp b/Build/source/libs/icu/icu-xetex/i18n/digitlst.cpp
index 39e69fd7998..39e69fd7998 100644
--- a/Build/source/libs/icu-xetex/i18n/digitlst.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/digitlst.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/digitlst.h b/Build/source/libs/icu/icu-xetex/i18n/digitlst.h
index e6266ddb471..e6266ddb471 100644
--- a/Build/source/libs/icu-xetex/i18n/digitlst.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/digitlst.h
diff --git a/Build/source/libs/icu-xetex/i18n/dtfmtsym.cpp b/Build/source/libs/icu/icu-xetex/i18n/dtfmtsym.cpp
index 8614493701e..8614493701e 100644
--- a/Build/source/libs/icu-xetex/i18n/dtfmtsym.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/dtfmtsym.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/dtptngen.cpp b/Build/source/libs/icu/icu-xetex/i18n/dtptngen.cpp
index 3cd632923f5..3cd632923f5 100644
--- a/Build/source/libs/icu-xetex/i18n/dtptngen.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/dtptngen.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/dtptngen_impl.h b/Build/source/libs/icu/icu-xetex/i18n/dtptngen_impl.h
index 73956ec6b4e..73956ec6b4e 100644
--- a/Build/source/libs/icu-xetex/i18n/dtptngen_impl.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/dtptngen_impl.h
diff --git a/Build/source/libs/icu-xetex/i18n/dtrule.cpp b/Build/source/libs/icu/icu-xetex/i18n/dtrule.cpp
index 42140249648..42140249648 100644
--- a/Build/source/libs/icu-xetex/i18n/dtrule.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/dtrule.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/esctrn.cpp b/Build/source/libs/icu/icu-xetex/i18n/esctrn.cpp
index 93f13f5816c..93f13f5816c 100644
--- a/Build/source/libs/icu-xetex/i18n/esctrn.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/esctrn.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/esctrn.h b/Build/source/libs/icu/icu-xetex/i18n/esctrn.h
index 96872b91684..96872b91684 100644
--- a/Build/source/libs/icu-xetex/i18n/esctrn.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/esctrn.h
diff --git a/Build/source/libs/icu-xetex/i18n/fmtable.cpp b/Build/source/libs/icu/icu-xetex/i18n/fmtable.cpp
index b767b332166..b767b332166 100644
--- a/Build/source/libs/icu-xetex/i18n/fmtable.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/fmtable.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/fmtable_cnv.cpp b/Build/source/libs/icu/icu-xetex/i18n/fmtable_cnv.cpp
index 9a270997f5a..9a270997f5a 100644
--- a/Build/source/libs/icu-xetex/i18n/fmtable_cnv.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/fmtable_cnv.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/format.cpp b/Build/source/libs/icu/icu-xetex/i18n/format.cpp
index 883a41d575e..883a41d575e 100644
--- a/Build/source/libs/icu-xetex/i18n/format.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/format.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/funcrepl.cpp b/Build/source/libs/icu/icu-xetex/i18n/funcrepl.cpp
index 61198a26592..61198a26592 100644
--- a/Build/source/libs/icu-xetex/i18n/funcrepl.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/funcrepl.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/funcrepl.h b/Build/source/libs/icu/icu-xetex/i18n/funcrepl.h
index f58d613bb5a..f58d613bb5a 100644
--- a/Build/source/libs/icu-xetex/i18n/funcrepl.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/funcrepl.h
diff --git a/Build/source/libs/icu-xetex/i18n/gregocal.cpp b/Build/source/libs/icu/icu-xetex/i18n/gregocal.cpp
index ba342505d5b..ba342505d5b 100644
--- a/Build/source/libs/icu-xetex/i18n/gregocal.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/gregocal.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/gregoimp.cpp b/Build/source/libs/icu/icu-xetex/i18n/gregoimp.cpp
index 22c22ca0139..22c22ca0139 100644
--- a/Build/source/libs/icu-xetex/i18n/gregoimp.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/gregoimp.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/gregoimp.h b/Build/source/libs/icu/icu-xetex/i18n/gregoimp.h
index d8ab8de48b0..d8ab8de48b0 100644
--- a/Build/source/libs/icu-xetex/i18n/gregoimp.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/gregoimp.h
diff --git a/Build/source/libs/icu-xetex/i18n/hebrwcal.cpp b/Build/source/libs/icu/icu-xetex/i18n/hebrwcal.cpp
index b3ac7bc7fe7..b3ac7bc7fe7 100644
--- a/Build/source/libs/icu-xetex/i18n/hebrwcal.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/hebrwcal.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/hebrwcal.h b/Build/source/libs/icu/icu-xetex/i18n/hebrwcal.h
index ead8bfae0b5..ead8bfae0b5 100644
--- a/Build/source/libs/icu-xetex/i18n/hebrwcal.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/hebrwcal.h
diff --git a/Build/source/libs/icu-xetex/i18n/i18n.rc b/Build/source/libs/icu/icu-xetex/i18n/i18n.rc
index 668ce3c3c9f..668ce3c3c9f 100644
--- a/Build/source/libs/icu-xetex/i18n/i18n.rc
+++ b/Build/source/libs/icu/icu-xetex/i18n/i18n.rc
diff --git a/Build/source/libs/icu-xetex/i18n/i18n.vcproj b/Build/source/libs/icu/icu-xetex/i18n/i18n.vcproj
index 288a45cd379..288a45cd379 100644
--- a/Build/source/libs/icu-xetex/i18n/i18n.vcproj
+++ b/Build/source/libs/icu/icu-xetex/i18n/i18n.vcproj
diff --git a/Build/source/libs/icu-xetex/i18n/indiancal.cpp b/Build/source/libs/icu/icu-xetex/i18n/indiancal.cpp
index 0d948cb520e..0d948cb520e 100644
--- a/Build/source/libs/icu-xetex/i18n/indiancal.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/indiancal.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/indiancal.h b/Build/source/libs/icu/icu-xetex/i18n/indiancal.h
index 94a6e9cf006..94a6e9cf006 100644
--- a/Build/source/libs/icu-xetex/i18n/indiancal.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/indiancal.h
diff --git a/Build/source/libs/icu-xetex/i18n/inputext.cpp b/Build/source/libs/icu/icu-xetex/i18n/inputext.cpp
index a36a931ab55..a36a931ab55 100644
--- a/Build/source/libs/icu-xetex/i18n/inputext.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/inputext.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/inputext.h b/Build/source/libs/icu/icu-xetex/i18n/inputext.h
index 1528f48e63f..1528f48e63f 100644
--- a/Build/source/libs/icu-xetex/i18n/inputext.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/inputext.h
diff --git a/Build/source/libs/icu-xetex/i18n/islamcal.cpp b/Build/source/libs/icu/icu-xetex/i18n/islamcal.cpp
index a6d093a94eb..a6d093a94eb 100644
--- a/Build/source/libs/icu-xetex/i18n/islamcal.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/islamcal.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/islamcal.h b/Build/source/libs/icu/icu-xetex/i18n/islamcal.h
index 0b4080d35f1..0b4080d35f1 100644
--- a/Build/source/libs/icu-xetex/i18n/islamcal.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/islamcal.h
diff --git a/Build/source/libs/icu-xetex/i18n/japancal.cpp b/Build/source/libs/icu/icu-xetex/i18n/japancal.cpp
index c06650b96a4..c06650b96a4 100644
--- a/Build/source/libs/icu-xetex/i18n/japancal.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/japancal.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/japancal.h b/Build/source/libs/icu/icu-xetex/i18n/japancal.h
index 05749340bf3..05749340bf3 100644
--- a/Build/source/libs/icu-xetex/i18n/japancal.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/japancal.h
diff --git a/Build/source/libs/icu-xetex/i18n/measfmt.cpp b/Build/source/libs/icu/icu-xetex/i18n/measfmt.cpp
index eaa37a24850..eaa37a24850 100644
--- a/Build/source/libs/icu-xetex/i18n/measfmt.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/measfmt.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/measure.cpp b/Build/source/libs/icu/icu-xetex/i18n/measure.cpp
index 03e6a7cbab9..03e6a7cbab9 100644
--- a/Build/source/libs/icu-xetex/i18n/measure.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/measure.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/msgfmt.cpp b/Build/source/libs/icu/icu-xetex/i18n/msgfmt.cpp
index 9eb7bcb303a..9eb7bcb303a 100644
--- a/Build/source/libs/icu-xetex/i18n/msgfmt.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/msgfmt.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/name2uni.cpp b/Build/source/libs/icu/icu-xetex/i18n/name2uni.cpp
index 6b9f2a3fb3c..6b9f2a3fb3c 100644
--- a/Build/source/libs/icu-xetex/i18n/name2uni.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/name2uni.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/name2uni.h b/Build/source/libs/icu/icu-xetex/i18n/name2uni.h
index 1324ec3e8d2..1324ec3e8d2 100644
--- a/Build/source/libs/icu-xetex/i18n/name2uni.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/name2uni.h
diff --git a/Build/source/libs/icu-xetex/i18n/nfrlist.h b/Build/source/libs/icu/icu-xetex/i18n/nfrlist.h
index 1a334085802..1a334085802 100644
--- a/Build/source/libs/icu-xetex/i18n/nfrlist.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/nfrlist.h
diff --git a/Build/source/libs/icu-xetex/i18n/nfrs.cpp b/Build/source/libs/icu/icu-xetex/i18n/nfrs.cpp
index ccf42b890d7..ccf42b890d7 100644
--- a/Build/source/libs/icu-xetex/i18n/nfrs.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/nfrs.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/nfrs.h b/Build/source/libs/icu/icu-xetex/i18n/nfrs.h
index fcfe06be892..fcfe06be892 100644
--- a/Build/source/libs/icu-xetex/i18n/nfrs.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/nfrs.h
diff --git a/Build/source/libs/icu-xetex/i18n/nfrule.cpp b/Build/source/libs/icu/icu-xetex/i18n/nfrule.cpp
index d6cf1850f48..d6cf1850f48 100644
--- a/Build/source/libs/icu-xetex/i18n/nfrule.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/nfrule.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/nfrule.h b/Build/source/libs/icu/icu-xetex/i18n/nfrule.h
index 73e4fe16ef8..73e4fe16ef8 100644
--- a/Build/source/libs/icu-xetex/i18n/nfrule.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/nfrule.h
diff --git a/Build/source/libs/icu-xetex/i18n/nfsubs.cpp b/Build/source/libs/icu/icu-xetex/i18n/nfsubs.cpp
index 37de55a4a1c..37de55a4a1c 100644
--- a/Build/source/libs/icu-xetex/i18n/nfsubs.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/nfsubs.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/nfsubs.h b/Build/source/libs/icu/icu-xetex/i18n/nfsubs.h
index 644b4b2f6e1..644b4b2f6e1 100644
--- a/Build/source/libs/icu-xetex/i18n/nfsubs.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/nfsubs.h
diff --git a/Build/source/libs/icu-xetex/i18n/nortrans.cpp b/Build/source/libs/icu/icu-xetex/i18n/nortrans.cpp
index f967f7dae5d..f967f7dae5d 100644
--- a/Build/source/libs/icu-xetex/i18n/nortrans.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/nortrans.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/nortrans.h b/Build/source/libs/icu/icu-xetex/i18n/nortrans.h
index 96bc7f00429..96bc7f00429 100644
--- a/Build/source/libs/icu-xetex/i18n/nortrans.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/nortrans.h
diff --git a/Build/source/libs/icu-xetex/i18n/nultrans.cpp b/Build/source/libs/icu/icu-xetex/i18n/nultrans.cpp
index 820c43d07e9..820c43d07e9 100644
--- a/Build/source/libs/icu-xetex/i18n/nultrans.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/nultrans.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/nultrans.h b/Build/source/libs/icu/icu-xetex/i18n/nultrans.h
index 699c323f8c6..699c323f8c6 100644
--- a/Build/source/libs/icu-xetex/i18n/nultrans.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/nultrans.h
diff --git a/Build/source/libs/icu-xetex/i18n/numfmt.cpp b/Build/source/libs/icu/icu-xetex/i18n/numfmt.cpp
index b2e6665b786..b2e6665b786 100644
--- a/Build/source/libs/icu-xetex/i18n/numfmt.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/numfmt.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/olsontz.cpp b/Build/source/libs/icu/icu-xetex/i18n/olsontz.cpp
index e98b9ef6e40..e98b9ef6e40 100644
--- a/Build/source/libs/icu-xetex/i18n/olsontz.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/olsontz.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/olsontz.h b/Build/source/libs/icu/icu-xetex/i18n/olsontz.h
index 64f8c0d774a..64f8c0d774a 100644
--- a/Build/source/libs/icu-xetex/i18n/olsontz.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/olsontz.h
diff --git a/Build/source/libs/icu-xetex/i18n/persncal.cpp b/Build/source/libs/icu/icu-xetex/i18n/persncal.cpp
index 5660163d007..5660163d007 100644
--- a/Build/source/libs/icu-xetex/i18n/persncal.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/persncal.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/persncal.h b/Build/source/libs/icu/icu-xetex/i18n/persncal.h
index 8314b543a39..8314b543a39 100644
--- a/Build/source/libs/icu-xetex/i18n/persncal.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/persncal.h
diff --git a/Build/source/libs/icu-xetex/i18n/quant.cpp b/Build/source/libs/icu/icu-xetex/i18n/quant.cpp
index bb34cebd380..bb34cebd380 100644
--- a/Build/source/libs/icu-xetex/i18n/quant.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/quant.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/quant.h b/Build/source/libs/icu/icu-xetex/i18n/quant.h
index 79388953172..79388953172 100644
--- a/Build/source/libs/icu-xetex/i18n/quant.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/quant.h
diff --git a/Build/source/libs/icu-xetex/i18n/rbnf.cpp b/Build/source/libs/icu/icu-xetex/i18n/rbnf.cpp
index f9a9ae3d671..f9a9ae3d671 100644
--- a/Build/source/libs/icu-xetex/i18n/rbnf.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/rbnf.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/rbt.cpp b/Build/source/libs/icu/icu-xetex/i18n/rbt.cpp
index 1664577b938..1664577b938 100644
--- a/Build/source/libs/icu-xetex/i18n/rbt.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/rbt.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/rbt.h b/Build/source/libs/icu/icu-xetex/i18n/rbt.h
index d061de6e637..d061de6e637 100644
--- a/Build/source/libs/icu-xetex/i18n/rbt.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/rbt.h
diff --git a/Build/source/libs/icu-xetex/i18n/rbt_data.cpp b/Build/source/libs/icu/icu-xetex/i18n/rbt_data.cpp
index bec4b48ce80..bec4b48ce80 100644
--- a/Build/source/libs/icu-xetex/i18n/rbt_data.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/rbt_data.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/rbt_data.h b/Build/source/libs/icu/icu-xetex/i18n/rbt_data.h
index ce833dc26dd..ce833dc26dd 100644
--- a/Build/source/libs/icu-xetex/i18n/rbt_data.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/rbt_data.h
diff --git a/Build/source/libs/icu-xetex/i18n/rbt_pars.cpp b/Build/source/libs/icu/icu-xetex/i18n/rbt_pars.cpp
index 83eccf54eaf..83eccf54eaf 100644
--- a/Build/source/libs/icu-xetex/i18n/rbt_pars.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/rbt_pars.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/rbt_pars.h b/Build/source/libs/icu/icu-xetex/i18n/rbt_pars.h
index 96bdac06479..96bdac06479 100644
--- a/Build/source/libs/icu-xetex/i18n/rbt_pars.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/rbt_pars.h
diff --git a/Build/source/libs/icu-xetex/i18n/rbt_rule.cpp b/Build/source/libs/icu/icu-xetex/i18n/rbt_rule.cpp
index 65ba78c2f8d..65ba78c2f8d 100644
--- a/Build/source/libs/icu-xetex/i18n/rbt_rule.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/rbt_rule.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/rbt_rule.h b/Build/source/libs/icu/icu-xetex/i18n/rbt_rule.h
index 0816956ce81..0816956ce81 100644
--- a/Build/source/libs/icu-xetex/i18n/rbt_rule.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/rbt_rule.h
diff --git a/Build/source/libs/icu-xetex/i18n/rbt_set.cpp b/Build/source/libs/icu/icu-xetex/i18n/rbt_set.cpp
index 21f85eef743..21f85eef743 100644
--- a/Build/source/libs/icu-xetex/i18n/rbt_set.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/rbt_set.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/rbt_set.h b/Build/source/libs/icu/icu-xetex/i18n/rbt_set.h
index f92e13002c2..f92e13002c2 100644
--- a/Build/source/libs/icu-xetex/i18n/rbt_set.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/rbt_set.h
diff --git a/Build/source/libs/icu-xetex/i18n/rbtz.cpp b/Build/source/libs/icu/icu-xetex/i18n/rbtz.cpp
index f810d70b841..f810d70b841 100644
--- a/Build/source/libs/icu-xetex/i18n/rbtz.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/rbtz.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/regexcmp.cpp b/Build/source/libs/icu/icu-xetex/i18n/regexcmp.cpp
index 558f80b6c48..558f80b6c48 100644
--- a/Build/source/libs/icu-xetex/i18n/regexcmp.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/regexcmp.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/regexcmp.h b/Build/source/libs/icu/icu-xetex/i18n/regexcmp.h
index ac81684afc3..ac81684afc3 100644
--- a/Build/source/libs/icu-xetex/i18n/regexcmp.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/regexcmp.h
diff --git a/Build/source/libs/icu-xetex/i18n/regexcst.h b/Build/source/libs/icu/icu-xetex/i18n/regexcst.h
index 6cca845310f..6cca845310f 100644
--- a/Build/source/libs/icu-xetex/i18n/regexcst.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/regexcst.h
diff --git a/Build/source/libs/icu-xetex/i18n/regexcst.pl b/Build/source/libs/icu/icu-xetex/i18n/regexcst.pl
index b525cf88b8d..b525cf88b8d 100755
--- a/Build/source/libs/icu-xetex/i18n/regexcst.pl
+++ b/Build/source/libs/icu/icu-xetex/i18n/regexcst.pl
diff --git a/Build/source/libs/icu-xetex/i18n/regexcst.txt b/Build/source/libs/icu/icu-xetex/i18n/regexcst.txt
index fec788c1417..fec788c1417 100644
--- a/Build/source/libs/icu-xetex/i18n/regexcst.txt
+++ b/Build/source/libs/icu/icu-xetex/i18n/regexcst.txt
diff --git a/Build/source/libs/icu-xetex/i18n/regeximp.h b/Build/source/libs/icu/icu-xetex/i18n/regeximp.h
index fbf700672ec..fbf700672ec 100644
--- a/Build/source/libs/icu-xetex/i18n/regeximp.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/regeximp.h
diff --git a/Build/source/libs/icu-xetex/i18n/regexst.cpp b/Build/source/libs/icu/icu-xetex/i18n/regexst.cpp
index 41014365dff..41014365dff 100644
--- a/Build/source/libs/icu-xetex/i18n/regexst.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/regexst.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/regexst.h b/Build/source/libs/icu/icu-xetex/i18n/regexst.h
index 2fd9c32d773..2fd9c32d773 100644
--- a/Build/source/libs/icu-xetex/i18n/regexst.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/regexst.h
diff --git a/Build/source/libs/icu-xetex/i18n/reldtfmt.cpp b/Build/source/libs/icu/icu-xetex/i18n/reldtfmt.cpp
index 56d63515d98..56d63515d98 100644
--- a/Build/source/libs/icu-xetex/i18n/reldtfmt.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/reldtfmt.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/reldtfmt.h b/Build/source/libs/icu/icu-xetex/i18n/reldtfmt.h
index 9957bf833a6..9957bf833a6 100644
--- a/Build/source/libs/icu-xetex/i18n/reldtfmt.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/reldtfmt.h
diff --git a/Build/source/libs/icu-xetex/i18n/rematch.cpp b/Build/source/libs/icu/icu-xetex/i18n/rematch.cpp
index 503303e7930..503303e7930 100644
--- a/Build/source/libs/icu-xetex/i18n/rematch.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/rematch.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/remtrans.cpp b/Build/source/libs/icu/icu-xetex/i18n/remtrans.cpp
index d4e616e1dfc..d4e616e1dfc 100644
--- a/Build/source/libs/icu-xetex/i18n/remtrans.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/remtrans.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/remtrans.h b/Build/source/libs/icu/icu-xetex/i18n/remtrans.h
index 25a5609dffe..25a5609dffe 100644
--- a/Build/source/libs/icu-xetex/i18n/remtrans.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/remtrans.h
diff --git a/Build/source/libs/icu-xetex/i18n/repattrn.cpp b/Build/source/libs/icu/icu-xetex/i18n/repattrn.cpp
index bcd11078c45..bcd11078c45 100644
--- a/Build/source/libs/icu-xetex/i18n/repattrn.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/repattrn.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/search.cpp b/Build/source/libs/icu/icu-xetex/i18n/search.cpp
index 91ece06b730..91ece06b730 100644
--- a/Build/source/libs/icu-xetex/i18n/search.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/search.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/simpletz.cpp b/Build/source/libs/icu/icu-xetex/i18n/simpletz.cpp
index c9cdade3af6..c9cdade3af6 100644
--- a/Build/source/libs/icu-xetex/i18n/simpletz.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/simpletz.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/smpdtfmt.cpp b/Build/source/libs/icu/icu-xetex/i18n/smpdtfmt.cpp
index b52134dc95e..b52134dc95e 100644
--- a/Build/source/libs/icu-xetex/i18n/smpdtfmt.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/smpdtfmt.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/sortkey.cpp b/Build/source/libs/icu/icu-xetex/i18n/sortkey.cpp
index ceca9d16506..ceca9d16506 100644
--- a/Build/source/libs/icu-xetex/i18n/sortkey.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/sortkey.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/strmatch.cpp b/Build/source/libs/icu/icu-xetex/i18n/strmatch.cpp
index 8286c7eaa07..8286c7eaa07 100644
--- a/Build/source/libs/icu-xetex/i18n/strmatch.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/strmatch.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/strmatch.h b/Build/source/libs/icu/icu-xetex/i18n/strmatch.h
index 90cba0c1d36..90cba0c1d36 100644
--- a/Build/source/libs/icu-xetex/i18n/strmatch.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/strmatch.h
diff --git a/Build/source/libs/icu-xetex/i18n/strrepl.cpp b/Build/source/libs/icu/icu-xetex/i18n/strrepl.cpp
index 4ae12b05c24..4ae12b05c24 100644
--- a/Build/source/libs/icu-xetex/i18n/strrepl.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/strrepl.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/strrepl.h b/Build/source/libs/icu/icu-xetex/i18n/strrepl.h
index 67a93e961f7..67a93e961f7 100644
--- a/Build/source/libs/icu-xetex/i18n/strrepl.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/strrepl.h
diff --git a/Build/source/libs/icu-xetex/i18n/stsearch.cpp b/Build/source/libs/icu/icu-xetex/i18n/stsearch.cpp
index 464e42fa667..464e42fa667 100644
--- a/Build/source/libs/icu-xetex/i18n/stsearch.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/stsearch.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/taiwncal.cpp b/Build/source/libs/icu/icu-xetex/i18n/taiwncal.cpp
index 60098c15fdf..60098c15fdf 100644
--- a/Build/source/libs/icu-xetex/i18n/taiwncal.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/taiwncal.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/taiwncal.h b/Build/source/libs/icu/icu-xetex/i18n/taiwncal.h
index fe6f89b1902..fe6f89b1902 100644
--- a/Build/source/libs/icu-xetex/i18n/taiwncal.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/taiwncal.h
diff --git a/Build/source/libs/icu-xetex/i18n/tblcoll.cpp b/Build/source/libs/icu/icu-xetex/i18n/tblcoll.cpp
index bd367fd33b2..bd367fd33b2 100644
--- a/Build/source/libs/icu-xetex/i18n/tblcoll.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/tblcoll.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/timezone.cpp b/Build/source/libs/icu/icu-xetex/i18n/timezone.cpp
index 566561173d6..566561173d6 100644
--- a/Build/source/libs/icu-xetex/i18n/timezone.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/timezone.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/titletrn.cpp b/Build/source/libs/icu/icu-xetex/i18n/titletrn.cpp
index 76c17d1bad7..76c17d1bad7 100644
--- a/Build/source/libs/icu-xetex/i18n/titletrn.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/titletrn.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/titletrn.h b/Build/source/libs/icu/icu-xetex/i18n/titletrn.h
index a093152b66c..a093152b66c 100644
--- a/Build/source/libs/icu-xetex/i18n/titletrn.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/titletrn.h
diff --git a/Build/source/libs/icu-xetex/i18n/tolowtrn.cpp b/Build/source/libs/icu/icu-xetex/i18n/tolowtrn.cpp
index c93f4d0eff8..c93f4d0eff8 100644
--- a/Build/source/libs/icu-xetex/i18n/tolowtrn.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/tolowtrn.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/tolowtrn.h b/Build/source/libs/icu/icu-xetex/i18n/tolowtrn.h
index 564b215a728..564b215a728 100644
--- a/Build/source/libs/icu-xetex/i18n/tolowtrn.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/tolowtrn.h
diff --git a/Build/source/libs/icu-xetex/i18n/toupptrn.cpp b/Build/source/libs/icu/icu-xetex/i18n/toupptrn.cpp
index 4b7c7d06aca..4b7c7d06aca 100644
--- a/Build/source/libs/icu-xetex/i18n/toupptrn.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/toupptrn.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/toupptrn.h b/Build/source/libs/icu/icu-xetex/i18n/toupptrn.h
index 77799acbfd6..77799acbfd6 100644
--- a/Build/source/libs/icu-xetex/i18n/toupptrn.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/toupptrn.h
diff --git a/Build/source/libs/icu-xetex/i18n/translit.cpp b/Build/source/libs/icu/icu-xetex/i18n/translit.cpp
index 6e9446e208a..6e9446e208a 100644
--- a/Build/source/libs/icu-xetex/i18n/translit.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/translit.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/transreg.cpp b/Build/source/libs/icu/icu-xetex/i18n/transreg.cpp
index 834e4ce8077..834e4ce8077 100644
--- a/Build/source/libs/icu-xetex/i18n/transreg.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/transreg.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/transreg.h b/Build/source/libs/icu/icu-xetex/i18n/transreg.h
index e74cfe43fed..e74cfe43fed 100644
--- a/Build/source/libs/icu-xetex/i18n/transreg.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/transreg.h
diff --git a/Build/source/libs/icu-xetex/i18n/tridpars.cpp b/Build/source/libs/icu/icu-xetex/i18n/tridpars.cpp
index f0338de254f..f0338de254f 100644
--- a/Build/source/libs/icu-xetex/i18n/tridpars.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/tridpars.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/tridpars.h b/Build/source/libs/icu/icu-xetex/i18n/tridpars.h
index e86f104ffd7..e86f104ffd7 100644
--- a/Build/source/libs/icu-xetex/i18n/tridpars.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/tridpars.h
diff --git a/Build/source/libs/icu-xetex/i18n/tzrule.cpp b/Build/source/libs/icu/icu-xetex/i18n/tzrule.cpp
index 1326149053e..1326149053e 100644
--- a/Build/source/libs/icu-xetex/i18n/tzrule.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/tzrule.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/tztrans.cpp b/Build/source/libs/icu/icu-xetex/i18n/tztrans.cpp
index 32e6ff7ffb9..32e6ff7ffb9 100644
--- a/Build/source/libs/icu-xetex/i18n/tztrans.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/tztrans.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/ucal.cpp b/Build/source/libs/icu/icu-xetex/i18n/ucal.cpp
index ce9ec5252a8..ce9ec5252a8 100644
--- a/Build/source/libs/icu-xetex/i18n/ucal.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/ucal.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/ucln_in.c b/Build/source/libs/icu/icu-xetex/i18n/ucln_in.c
index afcf07112fb..afcf07112fb 100644
--- a/Build/source/libs/icu-xetex/i18n/ucln_in.c
+++ b/Build/source/libs/icu/icu-xetex/i18n/ucln_in.c
diff --git a/Build/source/libs/icu-xetex/i18n/ucln_in.h b/Build/source/libs/icu/icu-xetex/i18n/ucln_in.h
index 66138191a93..66138191a93 100644
--- a/Build/source/libs/icu-xetex/i18n/ucln_in.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/ucln_in.h
diff --git a/Build/source/libs/icu-xetex/i18n/ucol.cpp b/Build/source/libs/icu/icu-xetex/i18n/ucol.cpp
index 9e4434818cd..9e4434818cd 100644
--- a/Build/source/libs/icu-xetex/i18n/ucol.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/ucol.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/ucol_bld.cpp b/Build/source/libs/icu/icu-xetex/i18n/ucol_bld.cpp
index 83f33f49e55..83f33f49e55 100644
--- a/Build/source/libs/icu-xetex/i18n/ucol_bld.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/ucol_bld.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/ucol_bld.h b/Build/source/libs/icu/icu-xetex/i18n/ucol_bld.h
index 67a28a36a50..67a28a36a50 100644
--- a/Build/source/libs/icu-xetex/i18n/ucol_bld.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/ucol_bld.h
diff --git a/Build/source/libs/icu-xetex/i18n/ucol_cnt.cpp b/Build/source/libs/icu/icu-xetex/i18n/ucol_cnt.cpp
index 368197c4bc5..368197c4bc5 100644
--- a/Build/source/libs/icu-xetex/i18n/ucol_cnt.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/ucol_cnt.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/ucol_cnt.h b/Build/source/libs/icu/icu-xetex/i18n/ucol_cnt.h
index c16211fc4d7..c16211fc4d7 100644
--- a/Build/source/libs/icu-xetex/i18n/ucol_cnt.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/ucol_cnt.h
diff --git a/Build/source/libs/icu-xetex/i18n/ucol_elm.cpp b/Build/source/libs/icu/icu-xetex/i18n/ucol_elm.cpp
index 929a4db816d..929a4db816d 100644
--- a/Build/source/libs/icu-xetex/i18n/ucol_elm.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/ucol_elm.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/ucol_elm.h b/Build/source/libs/icu/icu-xetex/i18n/ucol_elm.h
index fbe966eaefb..fbe966eaefb 100644
--- a/Build/source/libs/icu-xetex/i18n/ucol_elm.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/ucol_elm.h
diff --git a/Build/source/libs/icu-xetex/i18n/ucol_imp.h b/Build/source/libs/icu/icu-xetex/i18n/ucol_imp.h
index fcae8f02702..fcae8f02702 100644
--- a/Build/source/libs/icu-xetex/i18n/ucol_imp.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/ucol_imp.h
diff --git a/Build/source/libs/icu-xetex/i18n/ucol_res.cpp b/Build/source/libs/icu/icu-xetex/i18n/ucol_res.cpp
index e8cde356348..e8cde356348 100644
--- a/Build/source/libs/icu-xetex/i18n/ucol_res.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/ucol_res.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/ucol_sit.cpp b/Build/source/libs/icu/icu-xetex/i18n/ucol_sit.cpp
index e496b192fe2..e496b192fe2 100644
--- a/Build/source/libs/icu-xetex/i18n/ucol_sit.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/ucol_sit.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/ucol_tok.cpp b/Build/source/libs/icu/icu-xetex/i18n/ucol_tok.cpp
index 131c766763a..131c766763a 100644
--- a/Build/source/libs/icu-xetex/i18n/ucol_tok.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/ucol_tok.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/ucol_tok.h b/Build/source/libs/icu/icu-xetex/i18n/ucol_tok.h
index fc252e94c22..fc252e94c22 100644
--- a/Build/source/libs/icu-xetex/i18n/ucol_tok.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/ucol_tok.h
diff --git a/Build/source/libs/icu-xetex/i18n/ucol_wgt.c b/Build/source/libs/icu/icu-xetex/i18n/ucol_wgt.c
index f531344944c..f531344944c 100644
--- a/Build/source/libs/icu-xetex/i18n/ucol_wgt.c
+++ b/Build/source/libs/icu/icu-xetex/i18n/ucol_wgt.c
diff --git a/Build/source/libs/icu-xetex/i18n/ucol_wgt.h b/Build/source/libs/icu/icu-xetex/i18n/ucol_wgt.h
index db6094d6d4c..db6094d6d4c 100644
--- a/Build/source/libs/icu-xetex/i18n/ucol_wgt.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/ucol_wgt.h
diff --git a/Build/source/libs/icu-xetex/i18n/ucoleitr.cpp b/Build/source/libs/icu/icu-xetex/i18n/ucoleitr.cpp
index d31a90f837b..d31a90f837b 100644
--- a/Build/source/libs/icu-xetex/i18n/ucoleitr.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/ucoleitr.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/ucsdet.cpp b/Build/source/libs/icu/icu-xetex/i18n/ucsdet.cpp
index d06dd336428..d06dd336428 100644
--- a/Build/source/libs/icu-xetex/i18n/ucsdet.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/ucsdet.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/ucurr.cpp b/Build/source/libs/icu/icu-xetex/i18n/ucurr.cpp
index d6b7f432fda..d6b7f432fda 100644
--- a/Build/source/libs/icu-xetex/i18n/ucurr.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/ucurr.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/ucurrimp.h b/Build/source/libs/icu/icu-xetex/i18n/ucurrimp.h
index 9ecad6ccee4..9ecad6ccee4 100644
--- a/Build/source/libs/icu-xetex/i18n/ucurrimp.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/ucurrimp.h
diff --git a/Build/source/libs/icu-xetex/i18n/udat.cpp b/Build/source/libs/icu/icu-xetex/i18n/udat.cpp
index 7834b4cbba8..7834b4cbba8 100644
--- a/Build/source/libs/icu-xetex/i18n/udat.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/udat.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/udatpg.cpp b/Build/source/libs/icu/icu-xetex/i18n/udatpg.cpp
index 6122912b6be..6122912b6be 100644
--- a/Build/source/libs/icu-xetex/i18n/udatpg.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/udatpg.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/ulocdata.c b/Build/source/libs/icu/icu-xetex/i18n/ulocdata.c
index f39975ecc01..f39975ecc01 100644
--- a/Build/source/libs/icu-xetex/i18n/ulocdata.c
+++ b/Build/source/libs/icu/icu-xetex/i18n/ulocdata.c
diff --git a/Build/source/libs/icu-xetex/i18n/umsg.cpp b/Build/source/libs/icu/icu-xetex/i18n/umsg.cpp
index 8a58ee0442c..8a58ee0442c 100644
--- a/Build/source/libs/icu-xetex/i18n/umsg.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/umsg.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/umsg_imp.h b/Build/source/libs/icu/icu-xetex/i18n/umsg_imp.h
index 78bbf966bce..78bbf966bce 100644
--- a/Build/source/libs/icu-xetex/i18n/umsg_imp.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/umsg_imp.h
diff --git a/Build/source/libs/icu-xetex/i18n/unesctrn.cpp b/Build/source/libs/icu/icu-xetex/i18n/unesctrn.cpp
index 45ced8b1e9b..45ced8b1e9b 100644
--- a/Build/source/libs/icu-xetex/i18n/unesctrn.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/unesctrn.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/unesctrn.h b/Build/source/libs/icu/icu-xetex/i18n/unesctrn.h
index bfde6fc134f..bfde6fc134f 100644
--- a/Build/source/libs/icu-xetex/i18n/unesctrn.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unesctrn.h
diff --git a/Build/source/libs/icu-xetex/i18n/uni2name.cpp b/Build/source/libs/icu/icu-xetex/i18n/uni2name.cpp
index 5eba79daceb..5eba79daceb 100644
--- a/Build/source/libs/icu-xetex/i18n/uni2name.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/uni2name.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/uni2name.h b/Build/source/libs/icu/icu-xetex/i18n/uni2name.h
index aede864564a..aede864564a 100644
--- a/Build/source/libs/icu-xetex/i18n/uni2name.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/uni2name.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/basictz.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/basictz.h
index a49effd5b0b..a49effd5b0b 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/basictz.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/basictz.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/calendar.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/calendar.h
index d048a8b8a8a..d048a8b8a8a 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/calendar.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/calendar.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/choicfmt.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/choicfmt.h
index 409966a4c8f..409966a4c8f 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/choicfmt.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/choicfmt.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/coleitr.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/coleitr.h
index 51b5d2887d9..51b5d2887d9 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/coleitr.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/coleitr.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/coll.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/coll.h
index c3ebca16f23..c3ebca16f23 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/coll.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/coll.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/curramt.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/curramt.h
index c33e6f1f833..c33e6f1f833 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/curramt.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/curramt.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/currunit.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/currunit.h
index ecd94110292..ecd94110292 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/currunit.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/currunit.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/datefmt.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/datefmt.h
index 0022a99791b..0022a99791b 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/datefmt.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/datefmt.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/dcfmtsym.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/dcfmtsym.h
index bc5547d4cdd..bc5547d4cdd 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/dcfmtsym.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/dcfmtsym.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/decimfmt.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/decimfmt.h
index 296906fb7d7..296906fb7d7 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/decimfmt.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/decimfmt.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/dtfmtsym.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/dtfmtsym.h
index 5bc73fef829..5bc73fef829 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/dtfmtsym.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/dtfmtsym.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/dtptngen.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/dtptngen.h
index 09f6b84590c..09f6b84590c 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/dtptngen.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/dtptngen.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/dtrule.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/dtrule.h
index 7bdacd06aea..7bdacd06aea 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/dtrule.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/dtrule.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/fieldpos.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/fieldpos.h
index 38a9576e782..38a9576e782 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/fieldpos.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/fieldpos.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/fmtable.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/fmtable.h
index 94ee32843f5..94ee32843f5 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/fmtable.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/fmtable.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/format.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/format.h
index 7f17b52f00a..7f17b52f00a 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/format.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/format.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/gregocal.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/gregocal.h
index f2d1b0b17d5..f2d1b0b17d5 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/gregocal.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/gregocal.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/measfmt.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/measfmt.h
index a5af55e9d53..a5af55e9d53 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/measfmt.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/measfmt.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/measunit.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/measunit.h
index 9a210e65957..9a210e65957 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/measunit.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/measunit.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/measure.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/measure.h
index 6b7a0497b47..6b7a0497b47 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/measure.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/measure.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/msgfmt.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/msgfmt.h
index 815cabbb944..815cabbb944 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/msgfmt.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/msgfmt.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/numfmt.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/numfmt.h
index b27ed470819..b27ed470819 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/numfmt.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/numfmt.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/rbnf.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/rbnf.h
index 030565eb284..030565eb284 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/rbnf.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/rbnf.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/rbtz.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/rbtz.h
index d7f342d5f9e..d7f342d5f9e 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/rbtz.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/rbtz.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/regex.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/regex.h
index ce24ef5f89b..ce24ef5f89b 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/regex.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/regex.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/search.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/search.h
index a2fb2a8c7a0..a2fb2a8c7a0 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/search.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/search.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/simpletz.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/simpletz.h
index 08fdd208761..08fdd208761 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/simpletz.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/simpletz.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/smpdtfmt.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/smpdtfmt.h
index 2fb7c8eb0cf..2fb7c8eb0cf 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/smpdtfmt.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/smpdtfmt.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/sortkey.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/sortkey.h
index ef202dd9ba4..ef202dd9ba4 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/sortkey.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/sortkey.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/stsearch.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/stsearch.h
index a3e1bd79263..a3e1bd79263 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/stsearch.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/stsearch.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/tblcoll.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/tblcoll.h
index ab7d9eae21b..ab7d9eae21b 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/tblcoll.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/tblcoll.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/timezone.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/timezone.h
index e771cb90855..e771cb90855 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/timezone.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/timezone.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/translit.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/translit.h
index 1dcbb9a884d..1dcbb9a884d 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/translit.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/translit.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/tzrule.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/tzrule.h
index a0576ca87a3..a0576ca87a3 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/tzrule.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/tzrule.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/tztrans.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/tztrans.h
index 6c7b0215f03..6c7b0215f03 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/tztrans.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/tztrans.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/ucal.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/ucal.h
index 43648f4c502..43648f4c502 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/ucal.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/ucal.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/ucol.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/ucol.h
index 37abe2cc22e..37abe2cc22e 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/ucol.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/ucol.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/ucoleitr.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/ucoleitr.h
index 7184e96a767..7184e96a767 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/ucoleitr.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/ucoleitr.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/ucsdet.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/ucsdet.h
index 31f622c01a4..31f622c01a4 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/ucsdet.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/ucsdet.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/ucurr.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/ucurr.h
index 842b8864472..842b8864472 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/ucurr.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/ucurr.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/udat.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/udat.h
index 34573d2a1cf..34573d2a1cf 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/udat.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/udat.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/udatpg.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/udatpg.h
index 4a7f29594dd..4a7f29594dd 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/udatpg.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/udatpg.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/ulocdata.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/ulocdata.h
index 6bcc47220a7..6bcc47220a7 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/ulocdata.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/ulocdata.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/umsg.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/umsg.h
index 32ed063c274..32ed063c274 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/umsg.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/umsg.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/unirepl.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/unirepl.h
index 6b7746b2213..6b7746b2213 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/unirepl.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/unirepl.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/unum.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/unum.h
index c69d2f4b8b5..c69d2f4b8b5 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/unum.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/unum.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/uregex.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/uregex.h
index 862cf344641..862cf344641 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/uregex.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/uregex.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/usearch.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/usearch.h
index 0de1abb9e1a..0de1abb9e1a 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/usearch.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/usearch.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/utmscale.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/utmscale.h
index e903c88b7f8..e903c88b7f8 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/utmscale.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/utmscale.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/utrans.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/utrans.h
index a460a34c5b7..a460a34c5b7 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/utrans.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/utrans.h
diff --git a/Build/source/libs/icu-xetex/i18n/unicode/vtzone.h b/Build/source/libs/icu/icu-xetex/i18n/unicode/vtzone.h
index 420f61a2baa..420f61a2baa 100644
--- a/Build/source/libs/icu-xetex/i18n/unicode/vtzone.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/unicode/vtzone.h
diff --git a/Build/source/libs/icu-xetex/i18n/unum.cpp b/Build/source/libs/icu/icu-xetex/i18n/unum.cpp
index 1ba90922843..1ba90922843 100644
--- a/Build/source/libs/icu-xetex/i18n/unum.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/unum.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/uregex.cpp b/Build/source/libs/icu/icu-xetex/i18n/uregex.cpp
index 7207b6ece8b..7207b6ece8b 100644
--- a/Build/source/libs/icu-xetex/i18n/uregex.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/uregex.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/uregexc.cpp b/Build/source/libs/icu/icu-xetex/i18n/uregexc.cpp
index 6590020661e..6590020661e 100644
--- a/Build/source/libs/icu-xetex/i18n/uregexc.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/uregexc.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/usearch.cpp b/Build/source/libs/icu/icu-xetex/i18n/usearch.cpp
index df44aa8b192..df44aa8b192 100644
--- a/Build/source/libs/icu-xetex/i18n/usearch.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/usearch.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/usrchimp.h b/Build/source/libs/icu/icu-xetex/i18n/usrchimp.h
index fff52b2186e..fff52b2186e 100644
--- a/Build/source/libs/icu-xetex/i18n/usrchimp.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/usrchimp.h
diff --git a/Build/source/libs/icu-xetex/i18n/utmscale.c b/Build/source/libs/icu/icu-xetex/i18n/utmscale.c
index 33f5d9212d0..33f5d9212d0 100644
--- a/Build/source/libs/icu-xetex/i18n/utmscale.c
+++ b/Build/source/libs/icu/icu-xetex/i18n/utmscale.c
diff --git a/Build/source/libs/icu-xetex/i18n/utrans.cpp b/Build/source/libs/icu/icu-xetex/i18n/utrans.cpp
index 11da9d79438..11da9d79438 100644
--- a/Build/source/libs/icu-xetex/i18n/utrans.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/utrans.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/vtzone.cpp b/Build/source/libs/icu/icu-xetex/i18n/vtzone.cpp
index 68c659f234f..68c659f234f 100644
--- a/Build/source/libs/icu-xetex/i18n/vtzone.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/vtzone.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/windtfmt.cpp b/Build/source/libs/icu/icu-xetex/i18n/windtfmt.cpp
index 5e37e4156bc..5e37e4156bc 100644
--- a/Build/source/libs/icu-xetex/i18n/windtfmt.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/windtfmt.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/windtfmt.h b/Build/source/libs/icu/icu-xetex/i18n/windtfmt.h
index 869044e04bc..869044e04bc 100644
--- a/Build/source/libs/icu-xetex/i18n/windtfmt.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/windtfmt.h
diff --git a/Build/source/libs/icu-xetex/i18n/winnmfmt.cpp b/Build/source/libs/icu/icu-xetex/i18n/winnmfmt.cpp
index 4207c52e7e9..4207c52e7e9 100644
--- a/Build/source/libs/icu-xetex/i18n/winnmfmt.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/winnmfmt.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/winnmfmt.h b/Build/source/libs/icu/icu-xetex/i18n/winnmfmt.h
index 9b737f8ab79..9b737f8ab79 100644
--- a/Build/source/libs/icu-xetex/i18n/winnmfmt.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/winnmfmt.h
diff --git a/Build/source/libs/icu-xetex/i18n/zonemeta.cpp b/Build/source/libs/icu/icu-xetex/i18n/zonemeta.cpp
index 0e67c687c28..0e67c687c28 100644
--- a/Build/source/libs/icu-xetex/i18n/zonemeta.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/zonemeta.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/zonemeta.h b/Build/source/libs/icu/icu-xetex/i18n/zonemeta.h
index d7cb1a48bb0..d7cb1a48bb0 100644
--- a/Build/source/libs/icu-xetex/i18n/zonemeta.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/zonemeta.h
diff --git a/Build/source/libs/icu-xetex/i18n/zstrfmt.cpp b/Build/source/libs/icu/icu-xetex/i18n/zstrfmt.cpp
index b42bbfb25a5..b42bbfb25a5 100644
--- a/Build/source/libs/icu-xetex/i18n/zstrfmt.cpp
+++ b/Build/source/libs/icu/icu-xetex/i18n/zstrfmt.cpp
diff --git a/Build/source/libs/icu-xetex/i18n/zstrfmt.h b/Build/source/libs/icu/icu-xetex/i18n/zstrfmt.h
index 6765d6dd7b9..6765d6dd7b9 100644
--- a/Build/source/libs/icu-xetex/i18n/zstrfmt.h
+++ b/Build/source/libs/icu/icu-xetex/i18n/zstrfmt.h
diff --git a/Build/source/libs/icu-xetex/icu-xetex.ac b/Build/source/libs/icu/icu-xetex/icu-xetex.ac
index 5ccb0a6a36d..5ccb0a6a36d 100644
--- a/Build/source/libs/icu-xetex/icu-xetex.ac
+++ b/Build/source/libs/icu/icu-xetex/icu-xetex.ac
diff --git a/Build/source/libs/icu-xetex/icudefs.mk.in b/Build/source/libs/icu/icu-xetex/icudefs.mk.in
index 8b263a3a217..8b263a3a217 100644
--- a/Build/source/libs/icu-xetex/icudefs.mk.in
+++ b/Build/source/libs/icu/icu-xetex/icudefs.mk.in
diff --git a/Build/source/libs/icu-xetex/install-sh b/Build/source/libs/icu/icu-xetex/install-sh
index a5897de6ea7..a5897de6ea7 100755
--- a/Build/source/libs/icu-xetex/install-sh
+++ b/Build/source/libs/icu/icu-xetex/install-sh
diff --git a/Build/source/libs/icu-xetex/io/Makefile.in b/Build/source/libs/icu/icu-xetex/io/Makefile.in
index d2c5e4f32da..d2c5e4f32da 100644
--- a/Build/source/libs/icu-xetex/io/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/io/Makefile.in
diff --git a/Build/source/libs/icu-xetex/io/io.rc b/Build/source/libs/icu/icu-xetex/io/io.rc
index 76d7f30d139..76d7f30d139 100644
--- a/Build/source/libs/icu-xetex/io/io.rc
+++ b/Build/source/libs/icu/icu-xetex/io/io.rc
diff --git a/Build/source/libs/icu-xetex/io/io.vcproj b/Build/source/libs/icu/icu-xetex/io/io.vcproj
index 2513550f18f..2513550f18f 100644
--- a/Build/source/libs/icu-xetex/io/io.vcproj
+++ b/Build/source/libs/icu/icu-xetex/io/io.vcproj
diff --git a/Build/source/libs/icu-xetex/io/locbund.c b/Build/source/libs/icu/icu-xetex/io/locbund.c
index 1859999b158..1859999b158 100644
--- a/Build/source/libs/icu-xetex/io/locbund.c
+++ b/Build/source/libs/icu/icu-xetex/io/locbund.c
diff --git a/Build/source/libs/icu-xetex/io/locbund.h b/Build/source/libs/icu/icu-xetex/io/locbund.h
index f4ff449b1f1..f4ff449b1f1 100644
--- a/Build/source/libs/icu-xetex/io/locbund.h
+++ b/Build/source/libs/icu/icu-xetex/io/locbund.h
diff --git a/Build/source/libs/icu-xetex/io/sprintf.c b/Build/source/libs/icu/icu-xetex/io/sprintf.c
index 0d90b561bef..0d90b561bef 100644
--- a/Build/source/libs/icu-xetex/io/sprintf.c
+++ b/Build/source/libs/icu/icu-xetex/io/sprintf.c
diff --git a/Build/source/libs/icu-xetex/io/sscanf.c b/Build/source/libs/icu/icu-xetex/io/sscanf.c
index eb0bedfb84e..eb0bedfb84e 100644
--- a/Build/source/libs/icu-xetex/io/sscanf.c
+++ b/Build/source/libs/icu/icu-xetex/io/sscanf.c
diff --git a/Build/source/libs/icu-xetex/io/ucln_io.c b/Build/source/libs/icu/icu-xetex/io/ucln_io.c
index 01a88e81c60..01a88e81c60 100644
--- a/Build/source/libs/icu-xetex/io/ucln_io.c
+++ b/Build/source/libs/icu/icu-xetex/io/ucln_io.c
diff --git a/Build/source/libs/icu-xetex/io/ucln_io.h b/Build/source/libs/icu/icu-xetex/io/ucln_io.h
index e26c1b68833..e26c1b68833 100644
--- a/Build/source/libs/icu-xetex/io/ucln_io.h
+++ b/Build/source/libs/icu/icu-xetex/io/ucln_io.h
diff --git a/Build/source/libs/icu-xetex/io/ufile.c b/Build/source/libs/icu/icu-xetex/io/ufile.c
index 4afabf5b857..4afabf5b857 100644
--- a/Build/source/libs/icu-xetex/io/ufile.c
+++ b/Build/source/libs/icu/icu-xetex/io/ufile.c
diff --git a/Build/source/libs/icu-xetex/io/ufile.h b/Build/source/libs/icu/icu-xetex/io/ufile.h
index c1724c31e6e..c1724c31e6e 100644
--- a/Build/source/libs/icu-xetex/io/ufile.h
+++ b/Build/source/libs/icu/icu-xetex/io/ufile.h
diff --git a/Build/source/libs/icu-xetex/io/ufmt_cmn.c b/Build/source/libs/icu/icu-xetex/io/ufmt_cmn.c
index e4e09033911..e4e09033911 100644
--- a/Build/source/libs/icu-xetex/io/ufmt_cmn.c
+++ b/Build/source/libs/icu/icu-xetex/io/ufmt_cmn.c
diff --git a/Build/source/libs/icu-xetex/io/ufmt_cmn.h b/Build/source/libs/icu/icu-xetex/io/ufmt_cmn.h
index 29a4a07fc61..29a4a07fc61 100644
--- a/Build/source/libs/icu-xetex/io/ufmt_cmn.h
+++ b/Build/source/libs/icu/icu-xetex/io/ufmt_cmn.h
diff --git a/Build/source/libs/icu-xetex/io/unicode/ustdio.h b/Build/source/libs/icu/icu-xetex/io/unicode/ustdio.h
index f8c15e86434..f8c15e86434 100644
--- a/Build/source/libs/icu-xetex/io/unicode/ustdio.h
+++ b/Build/source/libs/icu/icu-xetex/io/unicode/ustdio.h
diff --git a/Build/source/libs/icu-xetex/io/unicode/ustream.h b/Build/source/libs/icu/icu-xetex/io/unicode/ustream.h
index 36ffec0bca2..36ffec0bca2 100644
--- a/Build/source/libs/icu-xetex/io/unicode/ustream.h
+++ b/Build/source/libs/icu/icu-xetex/io/unicode/ustream.h
diff --git a/Build/source/libs/icu-xetex/io/uprintf.c b/Build/source/libs/icu/icu-xetex/io/uprintf.c
index d95c02c671c..d95c02c671c 100644
--- a/Build/source/libs/icu-xetex/io/uprintf.c
+++ b/Build/source/libs/icu/icu-xetex/io/uprintf.c
diff --git a/Build/source/libs/icu-xetex/io/uprintf.h b/Build/source/libs/icu/icu-xetex/io/uprintf.h
index 4b538451023..4b538451023 100644
--- a/Build/source/libs/icu-xetex/io/uprintf.h
+++ b/Build/source/libs/icu/icu-xetex/io/uprintf.h
diff --git a/Build/source/libs/icu-xetex/io/uprntf_p.c b/Build/source/libs/icu/icu-xetex/io/uprntf_p.c
index 08236762210..08236762210 100644
--- a/Build/source/libs/icu-xetex/io/uprntf_p.c
+++ b/Build/source/libs/icu/icu-xetex/io/uprntf_p.c
diff --git a/Build/source/libs/icu-xetex/io/uscanf.c b/Build/source/libs/icu/icu-xetex/io/uscanf.c
index 5743f651991..5743f651991 100644
--- a/Build/source/libs/icu-xetex/io/uscanf.c
+++ b/Build/source/libs/icu/icu-xetex/io/uscanf.c
diff --git a/Build/source/libs/icu-xetex/io/uscanf.h b/Build/source/libs/icu/icu-xetex/io/uscanf.h
index dd8b8546a10..dd8b8546a10 100644
--- a/Build/source/libs/icu-xetex/io/uscanf.h
+++ b/Build/source/libs/icu/icu-xetex/io/uscanf.h
diff --git a/Build/source/libs/icu-xetex/io/uscanf_p.c b/Build/source/libs/icu/icu-xetex/io/uscanf_p.c
index 804f9a55de4..804f9a55de4 100644
--- a/Build/source/libs/icu-xetex/io/uscanf_p.c
+++ b/Build/source/libs/icu/icu-xetex/io/uscanf_p.c
diff --git a/Build/source/libs/icu-xetex/io/ustdio.c b/Build/source/libs/icu/icu-xetex/io/ustdio.c
index abb4d9f1274..abb4d9f1274 100644
--- a/Build/source/libs/icu-xetex/io/ustdio.c
+++ b/Build/source/libs/icu/icu-xetex/io/ustdio.c
diff --git a/Build/source/libs/icu-xetex/io/ustream.cpp b/Build/source/libs/icu/icu-xetex/io/ustream.cpp
index e9f57643d92..e9f57643d92 100644
--- a/Build/source/libs/icu-xetex/io/ustream.cpp
+++ b/Build/source/libs/icu/icu-xetex/io/ustream.cpp
diff --git a/Build/source/libs/icu-xetex/layout/AlternateSubstSubtables.cpp b/Build/source/libs/icu/icu-xetex/layout/AlternateSubstSubtables.cpp
index ffe65b320fe..ffe65b320fe 100644
--- a/Build/source/libs/icu-xetex/layout/AlternateSubstSubtables.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/AlternateSubstSubtables.cpp
diff --git a/Build/source/libs/icu-xetex/layout/AlternateSubstSubtables.h b/Build/source/libs/icu/icu-xetex/layout/AlternateSubstSubtables.h
index 41e3bc9409d..41e3bc9409d 100644
--- a/Build/source/libs/icu-xetex/layout/AlternateSubstSubtables.h
+++ b/Build/source/libs/icu/icu-xetex/layout/AlternateSubstSubtables.h
diff --git a/Build/source/libs/icu-xetex/layout/AnchorTables.cpp b/Build/source/libs/icu/icu-xetex/layout/AnchorTables.cpp
index 24f3cf31df4..24f3cf31df4 100644
--- a/Build/source/libs/icu-xetex/layout/AnchorTables.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/AnchorTables.cpp
diff --git a/Build/source/libs/icu-xetex/layout/AnchorTables.h b/Build/source/libs/icu/icu-xetex/layout/AnchorTables.h
index 71825c5ca16..71825c5ca16 100644
--- a/Build/source/libs/icu-xetex/layout/AnchorTables.h
+++ b/Build/source/libs/icu/icu-xetex/layout/AnchorTables.h
diff --git a/Build/source/libs/icu-xetex/layout/ArabicLayoutEngine.cpp b/Build/source/libs/icu/icu-xetex/layout/ArabicLayoutEngine.cpp
index c1e11f4c3ba..c1e11f4c3ba 100644
--- a/Build/source/libs/icu-xetex/layout/ArabicLayoutEngine.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/ArabicLayoutEngine.cpp
diff --git a/Build/source/libs/icu-xetex/layout/ArabicLayoutEngine.h b/Build/source/libs/icu/icu-xetex/layout/ArabicLayoutEngine.h
index 506b34a8cd1..506b34a8cd1 100644
--- a/Build/source/libs/icu-xetex/layout/ArabicLayoutEngine.h
+++ b/Build/source/libs/icu/icu-xetex/layout/ArabicLayoutEngine.h
diff --git a/Build/source/libs/icu-xetex/layout/ArabicShaping.cpp b/Build/source/libs/icu/icu-xetex/layout/ArabicShaping.cpp
index 9550910ad84..9550910ad84 100644
--- a/Build/source/libs/icu-xetex/layout/ArabicShaping.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/ArabicShaping.cpp
diff --git a/Build/source/libs/icu-xetex/layout/ArabicShaping.h b/Build/source/libs/icu/icu-xetex/layout/ArabicShaping.h
index 937d619a643..937d619a643 100644
--- a/Build/source/libs/icu-xetex/layout/ArabicShaping.h
+++ b/Build/source/libs/icu/icu-xetex/layout/ArabicShaping.h
diff --git a/Build/source/libs/icu-xetex/layout/AttachmentPosnSubtables.h b/Build/source/libs/icu/icu-xetex/layout/AttachmentPosnSubtables.h
index 7f8406dc19f..7f8406dc19f 100644
--- a/Build/source/libs/icu-xetex/layout/AttachmentPosnSubtables.h
+++ b/Build/source/libs/icu/icu-xetex/layout/AttachmentPosnSubtables.h
diff --git a/Build/source/libs/icu-xetex/layout/CanonData.cpp b/Build/source/libs/icu/icu-xetex/layout/CanonData.cpp
index f4fe33bb47a..f4fe33bb47a 100644
--- a/Build/source/libs/icu-xetex/layout/CanonData.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/CanonData.cpp
diff --git a/Build/source/libs/icu-xetex/layout/CanonShaping.cpp b/Build/source/libs/icu/icu-xetex/layout/CanonShaping.cpp
index ea109a77d98..ea109a77d98 100644
--- a/Build/source/libs/icu-xetex/layout/CanonShaping.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/CanonShaping.cpp
diff --git a/Build/source/libs/icu-xetex/layout/CanonShaping.h b/Build/source/libs/icu/icu-xetex/layout/CanonShaping.h
index cdf19595b59..cdf19595b59 100644
--- a/Build/source/libs/icu-xetex/layout/CanonShaping.h
+++ b/Build/source/libs/icu/icu-xetex/layout/CanonShaping.h
diff --git a/Build/source/libs/icu-xetex/layout/CharSubstitutionFilter.h b/Build/source/libs/icu/icu-xetex/layout/CharSubstitutionFilter.h
index 780e8ad2cdf..780e8ad2cdf 100644
--- a/Build/source/libs/icu-xetex/layout/CharSubstitutionFilter.h
+++ b/Build/source/libs/icu/icu-xetex/layout/CharSubstitutionFilter.h
diff --git a/Build/source/libs/icu-xetex/layout/ClassDefinitionTables.cpp b/Build/source/libs/icu/icu-xetex/layout/ClassDefinitionTables.cpp
index 124c4d0f24d..124c4d0f24d 100644
--- a/Build/source/libs/icu-xetex/layout/ClassDefinitionTables.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/ClassDefinitionTables.cpp
diff --git a/Build/source/libs/icu-xetex/layout/ClassDefinitionTables.h b/Build/source/libs/icu/icu-xetex/layout/ClassDefinitionTables.h
index 3dfe86e61a5..3dfe86e61a5 100644
--- a/Build/source/libs/icu-xetex/layout/ClassDefinitionTables.h
+++ b/Build/source/libs/icu/icu-xetex/layout/ClassDefinitionTables.h
diff --git a/Build/source/libs/icu-xetex/layout/ContextualGlyphInsertion.h b/Build/source/libs/icu/icu-xetex/layout/ContextualGlyphInsertion.h
index ead88425ddc..ead88425ddc 100644
--- a/Build/source/libs/icu-xetex/layout/ContextualGlyphInsertion.h
+++ b/Build/source/libs/icu/icu-xetex/layout/ContextualGlyphInsertion.h
diff --git a/Build/source/libs/icu-xetex/layout/ContextualGlyphSubstProc.cpp b/Build/source/libs/icu/icu-xetex/layout/ContextualGlyphSubstProc.cpp
index 94c4a60b075..94c4a60b075 100644
--- a/Build/source/libs/icu-xetex/layout/ContextualGlyphSubstProc.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/ContextualGlyphSubstProc.cpp
diff --git a/Build/source/libs/icu-xetex/layout/ContextualGlyphSubstProc.h b/Build/source/libs/icu/icu-xetex/layout/ContextualGlyphSubstProc.h
index b0c5a6b38c3..b0c5a6b38c3 100644
--- a/Build/source/libs/icu-xetex/layout/ContextualGlyphSubstProc.h
+++ b/Build/source/libs/icu/icu-xetex/layout/ContextualGlyphSubstProc.h
diff --git a/Build/source/libs/icu-xetex/layout/ContextualGlyphSubstitution.h b/Build/source/libs/icu/icu-xetex/layout/ContextualGlyphSubstitution.h
index 72c23559db9..72c23559db9 100644
--- a/Build/source/libs/icu-xetex/layout/ContextualGlyphSubstitution.h
+++ b/Build/source/libs/icu/icu-xetex/layout/ContextualGlyphSubstitution.h
diff --git a/Build/source/libs/icu-xetex/layout/ContextualSubstSubtables.cpp b/Build/source/libs/icu/icu-xetex/layout/ContextualSubstSubtables.cpp
index 1d8f28c8c17..1d8f28c8c17 100644
--- a/Build/source/libs/icu-xetex/layout/ContextualSubstSubtables.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/ContextualSubstSubtables.cpp
diff --git a/Build/source/libs/icu-xetex/layout/ContextualSubstSubtables.h b/Build/source/libs/icu/icu-xetex/layout/ContextualSubstSubtables.h
index a77a196d1f9..a77a196d1f9 100644
--- a/Build/source/libs/icu-xetex/layout/ContextualSubstSubtables.h
+++ b/Build/source/libs/icu/icu-xetex/layout/ContextualSubstSubtables.h
diff --git a/Build/source/libs/icu-xetex/layout/CoverageTables.cpp b/Build/source/libs/icu/icu-xetex/layout/CoverageTables.cpp
index e5f1597f864..e5f1597f864 100644
--- a/Build/source/libs/icu-xetex/layout/CoverageTables.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/CoverageTables.cpp
diff --git a/Build/source/libs/icu-xetex/layout/CoverageTables.h b/Build/source/libs/icu/icu-xetex/layout/CoverageTables.h
index 5e9dbaa15a7..5e9dbaa15a7 100644
--- a/Build/source/libs/icu-xetex/layout/CoverageTables.h
+++ b/Build/source/libs/icu/icu-xetex/layout/CoverageTables.h
diff --git a/Build/source/libs/icu-xetex/layout/CursiveAttachmentSubtables.cpp b/Build/source/libs/icu/icu-xetex/layout/CursiveAttachmentSubtables.cpp
index 9d2144fcefa..9d2144fcefa 100644
--- a/Build/source/libs/icu-xetex/layout/CursiveAttachmentSubtables.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/CursiveAttachmentSubtables.cpp
diff --git a/Build/source/libs/icu-xetex/layout/CursiveAttachmentSubtables.h b/Build/source/libs/icu/icu-xetex/layout/CursiveAttachmentSubtables.h
index 5eefb2f9888..5eefb2f9888 100644
--- a/Build/source/libs/icu-xetex/layout/CursiveAttachmentSubtables.h
+++ b/Build/source/libs/icu/icu-xetex/layout/CursiveAttachmentSubtables.h
diff --git a/Build/source/libs/icu-xetex/layout/DefaultCharMapper.h b/Build/source/libs/icu/icu-xetex/layout/DefaultCharMapper.h
index c0e1bc1c33b..c0e1bc1c33b 100644
--- a/Build/source/libs/icu-xetex/layout/DefaultCharMapper.h
+++ b/Build/source/libs/icu/icu-xetex/layout/DefaultCharMapper.h
diff --git a/Build/source/libs/icu-xetex/layout/DeviceTables.cpp b/Build/source/libs/icu/icu-xetex/layout/DeviceTables.cpp
index 0bbbf181496..0bbbf181496 100644
--- a/Build/source/libs/icu-xetex/layout/DeviceTables.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/DeviceTables.cpp
diff --git a/Build/source/libs/icu-xetex/layout/DeviceTables.h b/Build/source/libs/icu/icu-xetex/layout/DeviceTables.h
index 864bba1ad11..864bba1ad11 100644
--- a/Build/source/libs/icu-xetex/layout/DeviceTables.h
+++ b/Build/source/libs/icu/icu-xetex/layout/DeviceTables.h
diff --git a/Build/source/libs/icu-xetex/layout/ExtensionSubtables.cpp b/Build/source/libs/icu/icu-xetex/layout/ExtensionSubtables.cpp
index 4a6ac4fd571..4a6ac4fd571 100644
--- a/Build/source/libs/icu-xetex/layout/ExtensionSubtables.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/ExtensionSubtables.cpp
diff --git a/Build/source/libs/icu-xetex/layout/ExtensionSubtables.h b/Build/source/libs/icu/icu-xetex/layout/ExtensionSubtables.h
index f522b9ebf33..f522b9ebf33 100644
--- a/Build/source/libs/icu-xetex/layout/ExtensionSubtables.h
+++ b/Build/source/libs/icu/icu-xetex/layout/ExtensionSubtables.h
diff --git a/Build/source/libs/icu-xetex/layout/Features.cpp b/Build/source/libs/icu/icu-xetex/layout/Features.cpp
index e1c81a1ac9b..e1c81a1ac9b 100644
--- a/Build/source/libs/icu-xetex/layout/Features.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/Features.cpp
diff --git a/Build/source/libs/icu-xetex/layout/Features.h b/Build/source/libs/icu/icu-xetex/layout/Features.h
index 47563d9d433..47563d9d433 100644
--- a/Build/source/libs/icu-xetex/layout/Features.h
+++ b/Build/source/libs/icu/icu-xetex/layout/Features.h
diff --git a/Build/source/libs/icu-xetex/layout/GDEFMarkFilter.cpp b/Build/source/libs/icu/icu-xetex/layout/GDEFMarkFilter.cpp
index 344e07ab286..344e07ab286 100644
--- a/Build/source/libs/icu-xetex/layout/GDEFMarkFilter.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/GDEFMarkFilter.cpp
diff --git a/Build/source/libs/icu-xetex/layout/GDEFMarkFilter.h b/Build/source/libs/icu/icu-xetex/layout/GDEFMarkFilter.h
index 5ae5b45fdfc..5ae5b45fdfc 100644
--- a/Build/source/libs/icu-xetex/layout/GDEFMarkFilter.h
+++ b/Build/source/libs/icu/icu-xetex/layout/GDEFMarkFilter.h
diff --git a/Build/source/libs/icu-xetex/layout/GXLayoutEngine.cpp b/Build/source/libs/icu/icu-xetex/layout/GXLayoutEngine.cpp
index 4d596bb0f3d..4d596bb0f3d 100644
--- a/Build/source/libs/icu-xetex/layout/GXLayoutEngine.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/GXLayoutEngine.cpp
diff --git a/Build/source/libs/icu-xetex/layout/GXLayoutEngine.h b/Build/source/libs/icu/icu-xetex/layout/GXLayoutEngine.h
index faa511ab1ab..faa511ab1ab 100644
--- a/Build/source/libs/icu-xetex/layout/GXLayoutEngine.h
+++ b/Build/source/libs/icu/icu-xetex/layout/GXLayoutEngine.h
diff --git a/Build/source/libs/icu-xetex/layout/GlyphDefinitionTables.cpp b/Build/source/libs/icu/icu-xetex/layout/GlyphDefinitionTables.cpp
index a51e6ba0813..a51e6ba0813 100644
--- a/Build/source/libs/icu-xetex/layout/GlyphDefinitionTables.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/GlyphDefinitionTables.cpp
diff --git a/Build/source/libs/icu-xetex/layout/GlyphDefinitionTables.h b/Build/source/libs/icu/icu-xetex/layout/GlyphDefinitionTables.h
index e4cbbb6e1f5..e4cbbb6e1f5 100644
--- a/Build/source/libs/icu-xetex/layout/GlyphDefinitionTables.h
+++ b/Build/source/libs/icu/icu-xetex/layout/GlyphDefinitionTables.h
diff --git a/Build/source/libs/icu-xetex/layout/GlyphIterator.cpp b/Build/source/libs/icu/icu-xetex/layout/GlyphIterator.cpp
index eab023cf58b..eab023cf58b 100644
--- a/Build/source/libs/icu-xetex/layout/GlyphIterator.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/GlyphIterator.cpp
diff --git a/Build/source/libs/icu-xetex/layout/GlyphIterator.h b/Build/source/libs/icu/icu-xetex/layout/GlyphIterator.h
index 477cdd4c56f..477cdd4c56f 100644
--- a/Build/source/libs/icu-xetex/layout/GlyphIterator.h
+++ b/Build/source/libs/icu/icu-xetex/layout/GlyphIterator.h
diff --git a/Build/source/libs/icu-xetex/layout/GlyphLookupTables.cpp b/Build/source/libs/icu/icu-xetex/layout/GlyphLookupTables.cpp
index fdc646fe4f8..fdc646fe4f8 100644
--- a/Build/source/libs/icu-xetex/layout/GlyphLookupTables.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/GlyphLookupTables.cpp
diff --git a/Build/source/libs/icu-xetex/layout/GlyphLookupTables.h b/Build/source/libs/icu/icu-xetex/layout/GlyphLookupTables.h
index 65642d02e28..65642d02e28 100644
--- a/Build/source/libs/icu-xetex/layout/GlyphLookupTables.h
+++ b/Build/source/libs/icu/icu-xetex/layout/GlyphLookupTables.h
diff --git a/Build/source/libs/icu-xetex/layout/GlyphPositionAdjustments.cpp b/Build/source/libs/icu/icu-xetex/layout/GlyphPositionAdjustments.cpp
index 900e1aeecef..900e1aeecef 100644
--- a/Build/source/libs/icu-xetex/layout/GlyphPositionAdjustments.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/GlyphPositionAdjustments.cpp
diff --git a/Build/source/libs/icu-xetex/layout/GlyphPositionAdjustments.h b/Build/source/libs/icu/icu-xetex/layout/GlyphPositionAdjustments.h
index 9c9e39bffe6..9c9e39bffe6 100644
--- a/Build/source/libs/icu-xetex/layout/GlyphPositionAdjustments.h
+++ b/Build/source/libs/icu/icu-xetex/layout/GlyphPositionAdjustments.h
diff --git a/Build/source/libs/icu-xetex/layout/GlyphPositioningTables.cpp b/Build/source/libs/icu/icu-xetex/layout/GlyphPositioningTables.cpp
index b9187b4a295..b9187b4a295 100644
--- a/Build/source/libs/icu-xetex/layout/GlyphPositioningTables.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/GlyphPositioningTables.cpp
diff --git a/Build/source/libs/icu-xetex/layout/GlyphPositioningTables.h b/Build/source/libs/icu/icu-xetex/layout/GlyphPositioningTables.h
index a07c8c26716..a07c8c26716 100644
--- a/Build/source/libs/icu-xetex/layout/GlyphPositioningTables.h
+++ b/Build/source/libs/icu/icu-xetex/layout/GlyphPositioningTables.h
diff --git a/Build/source/libs/icu-xetex/layout/GlyphPosnLookupProc.cpp b/Build/source/libs/icu/icu-xetex/layout/GlyphPosnLookupProc.cpp
index 6f923a1389c..6f923a1389c 100644
--- a/Build/source/libs/icu-xetex/layout/GlyphPosnLookupProc.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/GlyphPosnLookupProc.cpp
diff --git a/Build/source/libs/icu-xetex/layout/GlyphPosnLookupProc.h b/Build/source/libs/icu/icu-xetex/layout/GlyphPosnLookupProc.h
index ee3606565d3..ee3606565d3 100644
--- a/Build/source/libs/icu-xetex/layout/GlyphPosnLookupProc.h
+++ b/Build/source/libs/icu/icu-xetex/layout/GlyphPosnLookupProc.h
diff --git a/Build/source/libs/icu-xetex/layout/GlyphSubstLookupProc.cpp b/Build/source/libs/icu/icu-xetex/layout/GlyphSubstLookupProc.cpp
index eb25680cce1..eb25680cce1 100644
--- a/Build/source/libs/icu-xetex/layout/GlyphSubstLookupProc.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/GlyphSubstLookupProc.cpp
diff --git a/Build/source/libs/icu-xetex/layout/GlyphSubstLookupProc.h b/Build/source/libs/icu/icu-xetex/layout/GlyphSubstLookupProc.h
index d8c5684a03b..d8c5684a03b 100644
--- a/Build/source/libs/icu-xetex/layout/GlyphSubstLookupProc.h
+++ b/Build/source/libs/icu/icu-xetex/layout/GlyphSubstLookupProc.h
diff --git a/Build/source/libs/icu-xetex/layout/GlyphSubstitutionTables.cpp b/Build/source/libs/icu/icu-xetex/layout/GlyphSubstitutionTables.cpp
index 661b30f3ab5..661b30f3ab5 100644
--- a/Build/source/libs/icu-xetex/layout/GlyphSubstitutionTables.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/GlyphSubstitutionTables.cpp
diff --git a/Build/source/libs/icu-xetex/layout/GlyphSubstitutionTables.h b/Build/source/libs/icu/icu-xetex/layout/GlyphSubstitutionTables.h
index 620da29c932..620da29c932 100644
--- a/Build/source/libs/icu-xetex/layout/GlyphSubstitutionTables.h
+++ b/Build/source/libs/icu/icu-xetex/layout/GlyphSubstitutionTables.h
diff --git a/Build/source/libs/icu-xetex/layout/HanLayoutEngine.cpp b/Build/source/libs/icu/icu-xetex/layout/HanLayoutEngine.cpp
index ae0d9dc7d4d..ae0d9dc7d4d 100644
--- a/Build/source/libs/icu-xetex/layout/HanLayoutEngine.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/HanLayoutEngine.cpp
diff --git a/Build/source/libs/icu-xetex/layout/HanLayoutEngine.h b/Build/source/libs/icu/icu-xetex/layout/HanLayoutEngine.h
index 6f683e1e286..6f683e1e286 100644
--- a/Build/source/libs/icu-xetex/layout/HanLayoutEngine.h
+++ b/Build/source/libs/icu/icu-xetex/layout/HanLayoutEngine.h
diff --git a/Build/source/libs/icu-xetex/layout/HangulLayoutEngine.cpp b/Build/source/libs/icu/icu-xetex/layout/HangulLayoutEngine.cpp
index 0782b85c7e8..0782b85c7e8 100644
--- a/Build/source/libs/icu-xetex/layout/HangulLayoutEngine.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/HangulLayoutEngine.cpp
diff --git a/Build/source/libs/icu-xetex/layout/HangulLayoutEngine.h b/Build/source/libs/icu/icu-xetex/layout/HangulLayoutEngine.h
index e77c3b97644..e77c3b97644 100644
--- a/Build/source/libs/icu-xetex/layout/HangulLayoutEngine.h
+++ b/Build/source/libs/icu/icu-xetex/layout/HangulLayoutEngine.h
diff --git a/Build/source/libs/icu-xetex/layout/HindiFeatureTags.h b/Build/source/libs/icu/icu-xetex/layout/HindiFeatureTags.h
index de78f485239..de78f485239 100644
--- a/Build/source/libs/icu-xetex/layout/HindiFeatureTags.h
+++ b/Build/source/libs/icu/icu-xetex/layout/HindiFeatureTags.h
diff --git a/Build/source/libs/icu-xetex/layout/IndicClassTables.cpp b/Build/source/libs/icu/icu-xetex/layout/IndicClassTables.cpp
index 7fb47b0f514..7fb47b0f514 100644
--- a/Build/source/libs/icu-xetex/layout/IndicClassTables.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/IndicClassTables.cpp
diff --git a/Build/source/libs/icu-xetex/layout/IndicLayoutEngine.cpp b/Build/source/libs/icu/icu-xetex/layout/IndicLayoutEngine.cpp
index ec83e73e462..ec83e73e462 100644
--- a/Build/source/libs/icu-xetex/layout/IndicLayoutEngine.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/IndicLayoutEngine.cpp
diff --git a/Build/source/libs/icu-xetex/layout/IndicLayoutEngine.h b/Build/source/libs/icu/icu-xetex/layout/IndicLayoutEngine.h
index af0f4c97f47..af0f4c97f47 100644
--- a/Build/source/libs/icu-xetex/layout/IndicLayoutEngine.h
+++ b/Build/source/libs/icu/icu-xetex/layout/IndicLayoutEngine.h
diff --git a/Build/source/libs/icu-xetex/layout/IndicRearrangement.h b/Build/source/libs/icu/icu-xetex/layout/IndicRearrangement.h
index 48b1d08adae..48b1d08adae 100644
--- a/Build/source/libs/icu-xetex/layout/IndicRearrangement.h
+++ b/Build/source/libs/icu/icu-xetex/layout/IndicRearrangement.h
diff --git a/Build/source/libs/icu-xetex/layout/IndicRearrangementProcessor.cpp b/Build/source/libs/icu/icu-xetex/layout/IndicRearrangementProcessor.cpp
index 92202450705..92202450705 100644
--- a/Build/source/libs/icu-xetex/layout/IndicRearrangementProcessor.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/IndicRearrangementProcessor.cpp
diff --git a/Build/source/libs/icu-xetex/layout/IndicRearrangementProcessor.h b/Build/source/libs/icu/icu-xetex/layout/IndicRearrangementProcessor.h
index 0cb46ddfccc..0cb46ddfccc 100644
--- a/Build/source/libs/icu-xetex/layout/IndicRearrangementProcessor.h
+++ b/Build/source/libs/icu/icu-xetex/layout/IndicRearrangementProcessor.h
diff --git a/Build/source/libs/icu-xetex/layout/IndicReordering.cpp b/Build/source/libs/icu/icu-xetex/layout/IndicReordering.cpp
index 5ca8b1084eb..5ca8b1084eb 100644
--- a/Build/source/libs/icu-xetex/layout/IndicReordering.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/IndicReordering.cpp
diff --git a/Build/source/libs/icu-xetex/layout/IndicReordering.h b/Build/source/libs/icu/icu-xetex/layout/IndicReordering.h
index abd1b722392..abd1b722392 100644
--- a/Build/source/libs/icu-xetex/layout/IndicReordering.h
+++ b/Build/source/libs/icu/icu-xetex/layout/IndicReordering.h
diff --git a/Build/source/libs/icu-xetex/layout/KernTable.cpp b/Build/source/libs/icu/icu-xetex/layout/KernTable.cpp
index 45ce091d440..45ce091d440 100644
--- a/Build/source/libs/icu-xetex/layout/KernTable.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/KernTable.cpp
diff --git a/Build/source/libs/icu-xetex/layout/KernTable.h b/Build/source/libs/icu/icu-xetex/layout/KernTable.h
index b8322cf1fe6..b8322cf1fe6 100644
--- a/Build/source/libs/icu-xetex/layout/KernTable.h
+++ b/Build/source/libs/icu/icu-xetex/layout/KernTable.h
diff --git a/Build/source/libs/icu-xetex/layout/KhmerLayoutEngine.cpp b/Build/source/libs/icu/icu-xetex/layout/KhmerLayoutEngine.cpp
index 7538eac5568..7538eac5568 100644
--- a/Build/source/libs/icu-xetex/layout/KhmerLayoutEngine.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/KhmerLayoutEngine.cpp
diff --git a/Build/source/libs/icu-xetex/layout/KhmerLayoutEngine.h b/Build/source/libs/icu/icu-xetex/layout/KhmerLayoutEngine.h
index 56b79e975ed..56b79e975ed 100644
--- a/Build/source/libs/icu-xetex/layout/KhmerLayoutEngine.h
+++ b/Build/source/libs/icu/icu-xetex/layout/KhmerLayoutEngine.h
diff --git a/Build/source/libs/icu-xetex/layout/KhmerReordering.cpp b/Build/source/libs/icu/icu-xetex/layout/KhmerReordering.cpp
index b448039c90c..b448039c90c 100644
--- a/Build/source/libs/icu-xetex/layout/KhmerReordering.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/KhmerReordering.cpp
diff --git a/Build/source/libs/icu-xetex/layout/KhmerReordering.h b/Build/source/libs/icu/icu-xetex/layout/KhmerReordering.h
index eecd12dff63..eecd12dff63 100644
--- a/Build/source/libs/icu-xetex/layout/KhmerReordering.h
+++ b/Build/source/libs/icu/icu-xetex/layout/KhmerReordering.h
diff --git a/Build/source/libs/icu-xetex/layout/LEFontInstance.cpp b/Build/source/libs/icu/icu-xetex/layout/LEFontInstance.cpp
index eaca51a51b3..eaca51a51b3 100644
--- a/Build/source/libs/icu-xetex/layout/LEFontInstance.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/LEFontInstance.cpp
diff --git a/Build/source/libs/icu-xetex/layout/LEFontInstance.h b/Build/source/libs/icu/icu-xetex/layout/LEFontInstance.h
index 5d6318d7f6d..5d6318d7f6d 100644
--- a/Build/source/libs/icu-xetex/layout/LEFontInstance.h
+++ b/Build/source/libs/icu/icu-xetex/layout/LEFontInstance.h
diff --git a/Build/source/libs/icu-xetex/layout/LEGlyphFilter.h b/Build/source/libs/icu/icu-xetex/layout/LEGlyphFilter.h
index f8fa1731879..f8fa1731879 100644
--- a/Build/source/libs/icu-xetex/layout/LEGlyphFilter.h
+++ b/Build/source/libs/icu/icu-xetex/layout/LEGlyphFilter.h
diff --git a/Build/source/libs/icu-xetex/layout/LEGlyphStorage.cpp b/Build/source/libs/icu/icu-xetex/layout/LEGlyphStorage.cpp
index 1b595159a11..1b595159a11 100644
--- a/Build/source/libs/icu-xetex/layout/LEGlyphStorage.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/LEGlyphStorage.cpp
diff --git a/Build/source/libs/icu-xetex/layout/LEGlyphStorage.h b/Build/source/libs/icu/icu-xetex/layout/LEGlyphStorage.h
index 87134543638..87134543638 100644
--- a/Build/source/libs/icu-xetex/layout/LEGlyphStorage.h
+++ b/Build/source/libs/icu/icu-xetex/layout/LEGlyphStorage.h
diff --git a/Build/source/libs/icu-xetex/layout/LEInsertionList.cpp b/Build/source/libs/icu/icu-xetex/layout/LEInsertionList.cpp
index b92cc474936..b92cc474936 100644
--- a/Build/source/libs/icu-xetex/layout/LEInsertionList.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/LEInsertionList.cpp
diff --git a/Build/source/libs/icu-xetex/layout/LEInsertionList.h b/Build/source/libs/icu/icu-xetex/layout/LEInsertionList.h
index a894295280d..a894295280d 100644
--- a/Build/source/libs/icu-xetex/layout/LEInsertionList.h
+++ b/Build/source/libs/icu/icu-xetex/layout/LEInsertionList.h
diff --git a/Build/source/libs/icu-xetex/layout/LELanguages.h b/Build/source/libs/icu/icu-xetex/layout/LELanguages.h
index d487729f02a..d487729f02a 100644
--- a/Build/source/libs/icu-xetex/layout/LELanguages.h
+++ b/Build/source/libs/icu/icu-xetex/layout/LELanguages.h
diff --git a/Build/source/libs/icu-xetex/layout/LEScripts.h b/Build/source/libs/icu/icu-xetex/layout/LEScripts.h
index d8441e7a5cb..d8441e7a5cb 100644
--- a/Build/source/libs/icu-xetex/layout/LEScripts.h
+++ b/Build/source/libs/icu/icu-xetex/layout/LEScripts.h
diff --git a/Build/source/libs/icu-xetex/layout/LESwaps.h b/Build/source/libs/icu/icu-xetex/layout/LESwaps.h
index 5309139d673..5309139d673 100644
--- a/Build/source/libs/icu-xetex/layout/LESwaps.h
+++ b/Build/source/libs/icu/icu-xetex/layout/LESwaps.h
diff --git a/Build/source/libs/icu-xetex/layout/LETypes.h b/Build/source/libs/icu/icu-xetex/layout/LETypes.h
index 4903a1c0d3a..4903a1c0d3a 100644
--- a/Build/source/libs/icu-xetex/layout/LETypes.h
+++ b/Build/source/libs/icu/icu-xetex/layout/LETypes.h
diff --git a/Build/source/libs/icu-xetex/layout/LayoutEngine.cpp b/Build/source/libs/icu/icu-xetex/layout/LayoutEngine.cpp
index b56854fa934..b56854fa934 100644
--- a/Build/source/libs/icu-xetex/layout/LayoutEngine.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/LayoutEngine.cpp
diff --git a/Build/source/libs/icu-xetex/layout/LayoutEngine.h b/Build/source/libs/icu/icu-xetex/layout/LayoutEngine.h
index f7711504c8a..f7711504c8a 100644
--- a/Build/source/libs/icu-xetex/layout/LayoutEngine.h
+++ b/Build/source/libs/icu/icu-xetex/layout/LayoutEngine.h
diff --git a/Build/source/libs/icu-xetex/layout/LayoutTables.h b/Build/source/libs/icu/icu-xetex/layout/LayoutTables.h
index fda5081c7a5..fda5081c7a5 100644
--- a/Build/source/libs/icu-xetex/layout/LayoutTables.h
+++ b/Build/source/libs/icu/icu-xetex/layout/LayoutTables.h
diff --git a/Build/source/libs/icu-xetex/layout/LigatureSubstProc.cpp b/Build/source/libs/icu/icu-xetex/layout/LigatureSubstProc.cpp
index 8df9a7861f3..8df9a7861f3 100644
--- a/Build/source/libs/icu-xetex/layout/LigatureSubstProc.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/LigatureSubstProc.cpp
diff --git a/Build/source/libs/icu-xetex/layout/LigatureSubstProc.h b/Build/source/libs/icu/icu-xetex/layout/LigatureSubstProc.h
index ef5b1edb5fc..ef5b1edb5fc 100644
--- a/Build/source/libs/icu-xetex/layout/LigatureSubstProc.h
+++ b/Build/source/libs/icu/icu-xetex/layout/LigatureSubstProc.h
diff --git a/Build/source/libs/icu-xetex/layout/LigatureSubstSubtables.cpp b/Build/source/libs/icu/icu-xetex/layout/LigatureSubstSubtables.cpp
index 391ffe649ee..391ffe649ee 100644
--- a/Build/source/libs/icu-xetex/layout/LigatureSubstSubtables.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/LigatureSubstSubtables.cpp
diff --git a/Build/source/libs/icu-xetex/layout/LigatureSubstSubtables.h b/Build/source/libs/icu/icu-xetex/layout/LigatureSubstSubtables.h
index 423c95a663d..423c95a663d 100644
--- a/Build/source/libs/icu-xetex/layout/LigatureSubstSubtables.h
+++ b/Build/source/libs/icu/icu-xetex/layout/LigatureSubstSubtables.h
diff --git a/Build/source/libs/icu-xetex/layout/LigatureSubstitution.h b/Build/source/libs/icu/icu-xetex/layout/LigatureSubstitution.h
index 2963b7c1444..2963b7c1444 100644
--- a/Build/source/libs/icu-xetex/layout/LigatureSubstitution.h
+++ b/Build/source/libs/icu/icu-xetex/layout/LigatureSubstitution.h
diff --git a/Build/source/libs/icu-xetex/layout/LookupProcessor.cpp b/Build/source/libs/icu/icu-xetex/layout/LookupProcessor.cpp
index 6f26a13bedb..6f26a13bedb 100644
--- a/Build/source/libs/icu-xetex/layout/LookupProcessor.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/LookupProcessor.cpp
diff --git a/Build/source/libs/icu-xetex/layout/LookupProcessor.h b/Build/source/libs/icu/icu-xetex/layout/LookupProcessor.h
index bc05ae63b79..bc05ae63b79 100644
--- a/Build/source/libs/icu-xetex/layout/LookupProcessor.h
+++ b/Build/source/libs/icu/icu-xetex/layout/LookupProcessor.h
diff --git a/Build/source/libs/icu-xetex/layout/LookupTables.cpp b/Build/source/libs/icu/icu-xetex/layout/LookupTables.cpp
index 9766a8133cc..9766a8133cc 100644
--- a/Build/source/libs/icu-xetex/layout/LookupTables.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/LookupTables.cpp
diff --git a/Build/source/libs/icu-xetex/layout/LookupTables.h b/Build/source/libs/icu/icu-xetex/layout/LookupTables.h
index 5fa849940ca..5fa849940ca 100644
--- a/Build/source/libs/icu-xetex/layout/LookupTables.h
+++ b/Build/source/libs/icu/icu-xetex/layout/LookupTables.h
diff --git a/Build/source/libs/icu-xetex/layout/Lookups.cpp b/Build/source/libs/icu/icu-xetex/layout/Lookups.cpp
index 67f62952e9c..67f62952e9c 100644
--- a/Build/source/libs/icu-xetex/layout/Lookups.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/Lookups.cpp
diff --git a/Build/source/libs/icu-xetex/layout/Lookups.h b/Build/source/libs/icu/icu-xetex/layout/Lookups.h
index 2316b573b81..2316b573b81 100644
--- a/Build/source/libs/icu-xetex/layout/Lookups.h
+++ b/Build/source/libs/icu/icu-xetex/layout/Lookups.h
diff --git a/Build/source/libs/icu-xetex/layout/MPreFixups.cpp b/Build/source/libs/icu/icu-xetex/layout/MPreFixups.cpp
index 75791eed02c..75791eed02c 100644
--- a/Build/source/libs/icu-xetex/layout/MPreFixups.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/MPreFixups.cpp
diff --git a/Build/source/libs/icu-xetex/layout/MPreFixups.h b/Build/source/libs/icu/icu-xetex/layout/MPreFixups.h
index 6053c088d29..6053c088d29 100644
--- a/Build/source/libs/icu-xetex/layout/MPreFixups.h
+++ b/Build/source/libs/icu/icu-xetex/layout/MPreFixups.h
diff --git a/Build/source/libs/icu-xetex/layout/MakeShapingTypeData.pl b/Build/source/libs/icu/icu-xetex/layout/MakeShapingTypeData.pl
index e8e5a105082..e8e5a105082 100644
--- a/Build/source/libs/icu-xetex/layout/MakeShapingTypeData.pl
+++ b/Build/source/libs/icu/icu-xetex/layout/MakeShapingTypeData.pl
diff --git a/Build/source/libs/icu-xetex/layout/Makefile.in b/Build/source/libs/icu/icu-xetex/layout/Makefile.in
index 5e9ec49819d..5e9ec49819d 100644
--- a/Build/source/libs/icu-xetex/layout/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/layout/Makefile.in
diff --git a/Build/source/libs/icu-xetex/layout/MarkArrays.cpp b/Build/source/libs/icu/icu-xetex/layout/MarkArrays.cpp
index 47a06251e6d..47a06251e6d 100644
--- a/Build/source/libs/icu-xetex/layout/MarkArrays.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/MarkArrays.cpp
diff --git a/Build/source/libs/icu-xetex/layout/MarkArrays.h b/Build/source/libs/icu/icu-xetex/layout/MarkArrays.h
index 66dca2ae688..66dca2ae688 100644
--- a/Build/source/libs/icu-xetex/layout/MarkArrays.h
+++ b/Build/source/libs/icu/icu-xetex/layout/MarkArrays.h
diff --git a/Build/source/libs/icu-xetex/layout/MarkToBasePosnSubtables.cpp b/Build/source/libs/icu/icu-xetex/layout/MarkToBasePosnSubtables.cpp
index 70ddf4788c8..70ddf4788c8 100644
--- a/Build/source/libs/icu-xetex/layout/MarkToBasePosnSubtables.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/MarkToBasePosnSubtables.cpp
diff --git a/Build/source/libs/icu-xetex/layout/MarkToBasePosnSubtables.h b/Build/source/libs/icu/icu-xetex/layout/MarkToBasePosnSubtables.h
index aa7a0a1262c..aa7a0a1262c 100644
--- a/Build/source/libs/icu-xetex/layout/MarkToBasePosnSubtables.h
+++ b/Build/source/libs/icu/icu-xetex/layout/MarkToBasePosnSubtables.h
diff --git a/Build/source/libs/icu-xetex/layout/MarkToLigaturePosnSubtables.cpp b/Build/source/libs/icu/icu-xetex/layout/MarkToLigaturePosnSubtables.cpp
index e247e4e5892..e247e4e5892 100644
--- a/Build/source/libs/icu-xetex/layout/MarkToLigaturePosnSubtables.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/MarkToLigaturePosnSubtables.cpp
diff --git a/Build/source/libs/icu-xetex/layout/MarkToLigaturePosnSubtables.h b/Build/source/libs/icu/icu-xetex/layout/MarkToLigaturePosnSubtables.h
index b8e34d1dd78..b8e34d1dd78 100644
--- a/Build/source/libs/icu-xetex/layout/MarkToLigaturePosnSubtables.h
+++ b/Build/source/libs/icu/icu-xetex/layout/MarkToLigaturePosnSubtables.h
diff --git a/Build/source/libs/icu-xetex/layout/MarkToMarkPosnSubtables.cpp b/Build/source/libs/icu/icu-xetex/layout/MarkToMarkPosnSubtables.cpp
index 3f571f5e39c..3f571f5e39c 100644
--- a/Build/source/libs/icu-xetex/layout/MarkToMarkPosnSubtables.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/MarkToMarkPosnSubtables.cpp
diff --git a/Build/source/libs/icu-xetex/layout/MarkToMarkPosnSubtables.h b/Build/source/libs/icu/icu-xetex/layout/MarkToMarkPosnSubtables.h
index 746ace2946d..746ace2946d 100644
--- a/Build/source/libs/icu-xetex/layout/MarkToMarkPosnSubtables.h
+++ b/Build/source/libs/icu/icu-xetex/layout/MarkToMarkPosnSubtables.h
diff --git a/Build/source/libs/icu-xetex/layout/MirroredCharData.cpp b/Build/source/libs/icu/icu-xetex/layout/MirroredCharData.cpp
index b813371708f..b813371708f 100644
--- a/Build/source/libs/icu-xetex/layout/MirroredCharData.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/MirroredCharData.cpp
diff --git a/Build/source/libs/icu-xetex/layout/MorphStateTables.h b/Build/source/libs/icu/icu-xetex/layout/MorphStateTables.h
index a2e0b00b7fc..a2e0b00b7fc 100644
--- a/Build/source/libs/icu-xetex/layout/MorphStateTables.h
+++ b/Build/source/libs/icu/icu-xetex/layout/MorphStateTables.h
diff --git a/Build/source/libs/icu-xetex/layout/MorphTables.cpp b/Build/source/libs/icu/icu-xetex/layout/MorphTables.cpp
index 9272cc3af3b..9272cc3af3b 100644
--- a/Build/source/libs/icu-xetex/layout/MorphTables.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/MorphTables.cpp
diff --git a/Build/source/libs/icu-xetex/layout/MorphTables.h b/Build/source/libs/icu/icu-xetex/layout/MorphTables.h
index 8d198cf41fe..8d198cf41fe 100644
--- a/Build/source/libs/icu-xetex/layout/MorphTables.h
+++ b/Build/source/libs/icu/icu-xetex/layout/MorphTables.h
diff --git a/Build/source/libs/icu-xetex/layout/MultipleSubstSubtables.cpp b/Build/source/libs/icu/icu-xetex/layout/MultipleSubstSubtables.cpp
index 450bf35bc94..450bf35bc94 100644
--- a/Build/source/libs/icu-xetex/layout/MultipleSubstSubtables.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/MultipleSubstSubtables.cpp
diff --git a/Build/source/libs/icu-xetex/layout/MultipleSubstSubtables.h b/Build/source/libs/icu/icu-xetex/layout/MultipleSubstSubtables.h
index e29963c5856..e29963c5856 100644
--- a/Build/source/libs/icu-xetex/layout/MultipleSubstSubtables.h
+++ b/Build/source/libs/icu/icu-xetex/layout/MultipleSubstSubtables.h
diff --git a/Build/source/libs/icu-xetex/layout/NonContextualGlyphSubst.h b/Build/source/libs/icu/icu-xetex/layout/NonContextualGlyphSubst.h
index ef2543a1a87..ef2543a1a87 100644
--- a/Build/source/libs/icu-xetex/layout/NonContextualGlyphSubst.h
+++ b/Build/source/libs/icu/icu-xetex/layout/NonContextualGlyphSubst.h
diff --git a/Build/source/libs/icu-xetex/layout/NonContextualGlyphSubstProc.cpp b/Build/source/libs/icu/icu-xetex/layout/NonContextualGlyphSubstProc.cpp
index 69c065b4848..69c065b4848 100644
--- a/Build/source/libs/icu-xetex/layout/NonContextualGlyphSubstProc.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/NonContextualGlyphSubstProc.cpp
diff --git a/Build/source/libs/icu-xetex/layout/NonContextualGlyphSubstProc.h b/Build/source/libs/icu/icu-xetex/layout/NonContextualGlyphSubstProc.h
index 4ce96cf3981..4ce96cf3981 100644
--- a/Build/source/libs/icu-xetex/layout/NonContextualGlyphSubstProc.h
+++ b/Build/source/libs/icu/icu-xetex/layout/NonContextualGlyphSubstProc.h
diff --git a/Build/source/libs/icu-xetex/layout/OpenTypeLayoutEngine.cpp b/Build/source/libs/icu/icu-xetex/layout/OpenTypeLayoutEngine.cpp
index 027d7d7c292..027d7d7c292 100644
--- a/Build/source/libs/icu-xetex/layout/OpenTypeLayoutEngine.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/OpenTypeLayoutEngine.cpp
diff --git a/Build/source/libs/icu-xetex/layout/OpenTypeLayoutEngine.h b/Build/source/libs/icu/icu-xetex/layout/OpenTypeLayoutEngine.h
index 961d0a1e6a8..961d0a1e6a8 100644
--- a/Build/source/libs/icu-xetex/layout/OpenTypeLayoutEngine.h
+++ b/Build/source/libs/icu/icu-xetex/layout/OpenTypeLayoutEngine.h
diff --git a/Build/source/libs/icu-xetex/layout/OpenTypeTables.h b/Build/source/libs/icu/icu-xetex/layout/OpenTypeTables.h
index 5398d176e47..5398d176e47 100644
--- a/Build/source/libs/icu-xetex/layout/OpenTypeTables.h
+++ b/Build/source/libs/icu/icu-xetex/layout/OpenTypeTables.h
diff --git a/Build/source/libs/icu-xetex/layout/OpenTypeUtilities.cpp b/Build/source/libs/icu/icu-xetex/layout/OpenTypeUtilities.cpp
index 29c38ddc104..29c38ddc104 100644
--- a/Build/source/libs/icu-xetex/layout/OpenTypeUtilities.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/OpenTypeUtilities.cpp
diff --git a/Build/source/libs/icu-xetex/layout/OpenTypeUtilities.h b/Build/source/libs/icu/icu-xetex/layout/OpenTypeUtilities.h
index 67a07c32a06..67a07c32a06 100644
--- a/Build/source/libs/icu-xetex/layout/OpenTypeUtilities.h
+++ b/Build/source/libs/icu/icu-xetex/layout/OpenTypeUtilities.h
diff --git a/Build/source/libs/icu-xetex/layout/PairPositioningSubtables.cpp b/Build/source/libs/icu/icu-xetex/layout/PairPositioningSubtables.cpp
index fce69f87cf0..fce69f87cf0 100644
--- a/Build/source/libs/icu-xetex/layout/PairPositioningSubtables.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/PairPositioningSubtables.cpp
diff --git a/Build/source/libs/icu-xetex/layout/PairPositioningSubtables.h b/Build/source/libs/icu/icu-xetex/layout/PairPositioningSubtables.h
index f017c33f65b..f017c33f65b 100644
--- a/Build/source/libs/icu-xetex/layout/PairPositioningSubtables.h
+++ b/Build/source/libs/icu/icu-xetex/layout/PairPositioningSubtables.h
diff --git a/Build/source/libs/icu-xetex/layout/ScriptAndLanguage.cpp b/Build/source/libs/icu/icu-xetex/layout/ScriptAndLanguage.cpp
index 126f5f2f078..126f5f2f078 100644
--- a/Build/source/libs/icu-xetex/layout/ScriptAndLanguage.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/ScriptAndLanguage.cpp
diff --git a/Build/source/libs/icu-xetex/layout/ScriptAndLanguage.h b/Build/source/libs/icu/icu-xetex/layout/ScriptAndLanguage.h
index 804dae9665e..804dae9665e 100644
--- a/Build/source/libs/icu-xetex/layout/ScriptAndLanguage.h
+++ b/Build/source/libs/icu/icu-xetex/layout/ScriptAndLanguage.h
diff --git a/Build/source/libs/icu-xetex/layout/ScriptAndLanguageTags.cpp b/Build/source/libs/icu/icu-xetex/layout/ScriptAndLanguageTags.cpp
index 500fb2528c8..500fb2528c8 100644
--- a/Build/source/libs/icu-xetex/layout/ScriptAndLanguageTags.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/ScriptAndLanguageTags.cpp
diff --git a/Build/source/libs/icu-xetex/layout/ScriptAndLanguageTags.h b/Build/source/libs/icu/icu-xetex/layout/ScriptAndLanguageTags.h
index 23372df32d2..23372df32d2 100644
--- a/Build/source/libs/icu-xetex/layout/ScriptAndLanguageTags.h
+++ b/Build/source/libs/icu/icu-xetex/layout/ScriptAndLanguageTags.h
diff --git a/Build/source/libs/icu-xetex/layout/SegmentArrayProcessor.cpp b/Build/source/libs/icu/icu-xetex/layout/SegmentArrayProcessor.cpp
index b915cb9b92c..b915cb9b92c 100644
--- a/Build/source/libs/icu-xetex/layout/SegmentArrayProcessor.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/SegmentArrayProcessor.cpp
diff --git a/Build/source/libs/icu-xetex/layout/SegmentArrayProcessor.h b/Build/source/libs/icu/icu-xetex/layout/SegmentArrayProcessor.h
index 7e2028c98b5..7e2028c98b5 100644
--- a/Build/source/libs/icu-xetex/layout/SegmentArrayProcessor.h
+++ b/Build/source/libs/icu/icu-xetex/layout/SegmentArrayProcessor.h
diff --git a/Build/source/libs/icu-xetex/layout/SegmentSingleProcessor.cpp b/Build/source/libs/icu/icu-xetex/layout/SegmentSingleProcessor.cpp
index 75e33eb01d2..75e33eb01d2 100644
--- a/Build/source/libs/icu-xetex/layout/SegmentSingleProcessor.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/SegmentSingleProcessor.cpp
diff --git a/Build/source/libs/icu-xetex/layout/SegmentSingleProcessor.h b/Build/source/libs/icu/icu-xetex/layout/SegmentSingleProcessor.h
index 64b2b72f162..64b2b72f162 100644
--- a/Build/source/libs/icu-xetex/layout/SegmentSingleProcessor.h
+++ b/Build/source/libs/icu/icu-xetex/layout/SegmentSingleProcessor.h
diff --git a/Build/source/libs/icu-xetex/layout/ShapingTypeData.cpp b/Build/source/libs/icu/icu-xetex/layout/ShapingTypeData.cpp
index e45be45a199..e45be45a199 100644
--- a/Build/source/libs/icu-xetex/layout/ShapingTypeData.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/ShapingTypeData.cpp
diff --git a/Build/source/libs/icu-xetex/layout/SimpleArrayProcessor.cpp b/Build/source/libs/icu/icu-xetex/layout/SimpleArrayProcessor.cpp
index d677f545f6b..d677f545f6b 100644
--- a/Build/source/libs/icu-xetex/layout/SimpleArrayProcessor.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/SimpleArrayProcessor.cpp
diff --git a/Build/source/libs/icu-xetex/layout/SimpleArrayProcessor.h b/Build/source/libs/icu/icu-xetex/layout/SimpleArrayProcessor.h
index afee79c4971..afee79c4971 100644
--- a/Build/source/libs/icu-xetex/layout/SimpleArrayProcessor.h
+++ b/Build/source/libs/icu/icu-xetex/layout/SimpleArrayProcessor.h
diff --git a/Build/source/libs/icu-xetex/layout/SinglePositioningSubtables.cpp b/Build/source/libs/icu/icu-xetex/layout/SinglePositioningSubtables.cpp
index e8759d21a19..e8759d21a19 100644
--- a/Build/source/libs/icu-xetex/layout/SinglePositioningSubtables.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/SinglePositioningSubtables.cpp
diff --git a/Build/source/libs/icu-xetex/layout/SinglePositioningSubtables.h b/Build/source/libs/icu/icu-xetex/layout/SinglePositioningSubtables.h
index ec2ffcc9269..ec2ffcc9269 100644
--- a/Build/source/libs/icu-xetex/layout/SinglePositioningSubtables.h
+++ b/Build/source/libs/icu/icu-xetex/layout/SinglePositioningSubtables.h
diff --git a/Build/source/libs/icu-xetex/layout/SingleSubstitutionSubtables.cpp b/Build/source/libs/icu/icu-xetex/layout/SingleSubstitutionSubtables.cpp
index ae72ddfd04f..ae72ddfd04f 100644
--- a/Build/source/libs/icu-xetex/layout/SingleSubstitutionSubtables.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/SingleSubstitutionSubtables.cpp
diff --git a/Build/source/libs/icu-xetex/layout/SingleSubstitutionSubtables.h b/Build/source/libs/icu/icu-xetex/layout/SingleSubstitutionSubtables.h
index dfd2dad8809..dfd2dad8809 100644
--- a/Build/source/libs/icu-xetex/layout/SingleSubstitutionSubtables.h
+++ b/Build/source/libs/icu/icu-xetex/layout/SingleSubstitutionSubtables.h
diff --git a/Build/source/libs/icu-xetex/layout/SingleTableProcessor.cpp b/Build/source/libs/icu/icu-xetex/layout/SingleTableProcessor.cpp
index 94a4edd7571..94a4edd7571 100644
--- a/Build/source/libs/icu-xetex/layout/SingleTableProcessor.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/SingleTableProcessor.cpp
diff --git a/Build/source/libs/icu-xetex/layout/SingleTableProcessor.h b/Build/source/libs/icu/icu-xetex/layout/SingleTableProcessor.h
index d6ca048b049..d6ca048b049 100644
--- a/Build/source/libs/icu-xetex/layout/SingleTableProcessor.h
+++ b/Build/source/libs/icu/icu-xetex/layout/SingleTableProcessor.h
diff --git a/Build/source/libs/icu-xetex/layout/StateTableProcessor.cpp b/Build/source/libs/icu/icu-xetex/layout/StateTableProcessor.cpp
index 223959b8b16..223959b8b16 100644
--- a/Build/source/libs/icu-xetex/layout/StateTableProcessor.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/StateTableProcessor.cpp
diff --git a/Build/source/libs/icu-xetex/layout/StateTableProcessor.h b/Build/source/libs/icu/icu-xetex/layout/StateTableProcessor.h
index 41c50debe94..41c50debe94 100644
--- a/Build/source/libs/icu-xetex/layout/StateTableProcessor.h
+++ b/Build/source/libs/icu/icu-xetex/layout/StateTableProcessor.h
diff --git a/Build/source/libs/icu-xetex/layout/StateTables.h b/Build/source/libs/icu/icu-xetex/layout/StateTables.h
index 8b5f867770a..8b5f867770a 100644
--- a/Build/source/libs/icu-xetex/layout/StateTables.h
+++ b/Build/source/libs/icu/icu-xetex/layout/StateTables.h
diff --git a/Build/source/libs/icu-xetex/layout/SubstitutionLookups.cpp b/Build/source/libs/icu/icu-xetex/layout/SubstitutionLookups.cpp
index fa6771ac1f7..fa6771ac1f7 100644
--- a/Build/source/libs/icu-xetex/layout/SubstitutionLookups.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/SubstitutionLookups.cpp
diff --git a/Build/source/libs/icu-xetex/layout/SubstitutionLookups.h b/Build/source/libs/icu/icu-xetex/layout/SubstitutionLookups.h
index 3365850642b..3365850642b 100644
--- a/Build/source/libs/icu-xetex/layout/SubstitutionLookups.h
+++ b/Build/source/libs/icu/icu-xetex/layout/SubstitutionLookups.h
diff --git a/Build/source/libs/icu-xetex/layout/SubtableProcessor.cpp b/Build/source/libs/icu/icu-xetex/layout/SubtableProcessor.cpp
index dd5ce187b21..dd5ce187b21 100644
--- a/Build/source/libs/icu-xetex/layout/SubtableProcessor.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/SubtableProcessor.cpp
diff --git a/Build/source/libs/icu-xetex/layout/SubtableProcessor.h b/Build/source/libs/icu/icu-xetex/layout/SubtableProcessor.h
index f304cb956e9..f304cb956e9 100644
--- a/Build/source/libs/icu-xetex/layout/SubtableProcessor.h
+++ b/Build/source/libs/icu/icu-xetex/layout/SubtableProcessor.h
diff --git a/Build/source/libs/icu-xetex/layout/ThaiLayoutEngine.cpp b/Build/source/libs/icu/icu-xetex/layout/ThaiLayoutEngine.cpp
index 89154277765..89154277765 100644
--- a/Build/source/libs/icu-xetex/layout/ThaiLayoutEngine.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/ThaiLayoutEngine.cpp
diff --git a/Build/source/libs/icu-xetex/layout/ThaiLayoutEngine.h b/Build/source/libs/icu/icu-xetex/layout/ThaiLayoutEngine.h
index b0e1a52dd33..b0e1a52dd33 100644
--- a/Build/source/libs/icu-xetex/layout/ThaiLayoutEngine.h
+++ b/Build/source/libs/icu/icu-xetex/layout/ThaiLayoutEngine.h
diff --git a/Build/source/libs/icu-xetex/layout/ThaiShaping.cpp b/Build/source/libs/icu/icu-xetex/layout/ThaiShaping.cpp
index 1680f0fe515..1680f0fe515 100644
--- a/Build/source/libs/icu-xetex/layout/ThaiShaping.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/ThaiShaping.cpp
diff --git a/Build/source/libs/icu-xetex/layout/ThaiShaping.h b/Build/source/libs/icu/icu-xetex/layout/ThaiShaping.h
index 4c6d6a51f4f..4c6d6a51f4f 100644
--- a/Build/source/libs/icu-xetex/layout/ThaiShaping.h
+++ b/Build/source/libs/icu/icu-xetex/layout/ThaiShaping.h
diff --git a/Build/source/libs/icu-xetex/layout/ThaiStateTables.cpp b/Build/source/libs/icu/icu-xetex/layout/ThaiStateTables.cpp
index b1f8b184fbf..b1f8b184fbf 100644
--- a/Build/source/libs/icu-xetex/layout/ThaiStateTables.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/ThaiStateTables.cpp
diff --git a/Build/source/libs/icu-xetex/layout/TibetanLayoutEngine.cpp b/Build/source/libs/icu/icu-xetex/layout/TibetanLayoutEngine.cpp
index be97ab5baf4..be97ab5baf4 100644
--- a/Build/source/libs/icu-xetex/layout/TibetanLayoutEngine.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/TibetanLayoutEngine.cpp
diff --git a/Build/source/libs/icu-xetex/layout/TibetanLayoutEngine.h b/Build/source/libs/icu/icu-xetex/layout/TibetanLayoutEngine.h
index 799d8b679a6..799d8b679a6 100644
--- a/Build/source/libs/icu-xetex/layout/TibetanLayoutEngine.h
+++ b/Build/source/libs/icu/icu-xetex/layout/TibetanLayoutEngine.h
diff --git a/Build/source/libs/icu-xetex/layout/TibetanReordering.cpp b/Build/source/libs/icu/icu-xetex/layout/TibetanReordering.cpp
index 3d018d596af..3d018d596af 100644
--- a/Build/source/libs/icu-xetex/layout/TibetanReordering.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/TibetanReordering.cpp
diff --git a/Build/source/libs/icu-xetex/layout/TibetanReordering.h b/Build/source/libs/icu/icu-xetex/layout/TibetanReordering.h
index cafcf5646c8..cafcf5646c8 100644
--- a/Build/source/libs/icu-xetex/layout/TibetanReordering.h
+++ b/Build/source/libs/icu/icu-xetex/layout/TibetanReordering.h
diff --git a/Build/source/libs/icu-xetex/layout/TrimmedArrayProcessor.cpp b/Build/source/libs/icu/icu-xetex/layout/TrimmedArrayProcessor.cpp
index a68c056267f..a68c056267f 100644
--- a/Build/source/libs/icu-xetex/layout/TrimmedArrayProcessor.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/TrimmedArrayProcessor.cpp
diff --git a/Build/source/libs/icu-xetex/layout/TrimmedArrayProcessor.h b/Build/source/libs/icu/icu-xetex/layout/TrimmedArrayProcessor.h
index 9d86980c327..9d86980c327 100644
--- a/Build/source/libs/icu-xetex/layout/TrimmedArrayProcessor.h
+++ b/Build/source/libs/icu/icu-xetex/layout/TrimmedArrayProcessor.h
diff --git a/Build/source/libs/icu-xetex/layout/ValueRecords.cpp b/Build/source/libs/icu/icu-xetex/layout/ValueRecords.cpp
index bdf68468d0c..bdf68468d0c 100644
--- a/Build/source/libs/icu-xetex/layout/ValueRecords.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/ValueRecords.cpp
diff --git a/Build/source/libs/icu-xetex/layout/ValueRecords.h b/Build/source/libs/icu/icu-xetex/layout/ValueRecords.h
index 83db7b31972..83db7b31972 100644
--- a/Build/source/libs/icu-xetex/layout/ValueRecords.h
+++ b/Build/source/libs/icu/icu-xetex/layout/ValueRecords.h
diff --git a/Build/source/libs/icu-xetex/layout/layout.rc b/Build/source/libs/icu/icu-xetex/layout/layout.rc
index 7eb64da2edf..7eb64da2edf 100644
--- a/Build/source/libs/icu-xetex/layout/layout.rc
+++ b/Build/source/libs/icu/icu-xetex/layout/layout.rc
diff --git a/Build/source/libs/icu-xetex/layout/layout.vcproj b/Build/source/libs/icu/icu-xetex/layout/layout.vcproj
index c428d1dde10..c428d1dde10 100644
--- a/Build/source/libs/icu-xetex/layout/layout.vcproj
+++ b/Build/source/libs/icu/icu-xetex/layout/layout.vcproj
diff --git a/Build/source/libs/icu-xetex/layout/loengine.cpp b/Build/source/libs/icu/icu-xetex/layout/loengine.cpp
index 3718b9f6f8a..3718b9f6f8a 100644
--- a/Build/source/libs/icu-xetex/layout/loengine.cpp
+++ b/Build/source/libs/icu/icu-xetex/layout/loengine.cpp
diff --git a/Build/source/libs/icu-xetex/layout/loengine.h b/Build/source/libs/icu/icu-xetex/layout/loengine.h
index 722dd32d844..722dd32d844 100644
--- a/Build/source/libs/icu-xetex/layout/loengine.h
+++ b/Build/source/libs/icu/icu-xetex/layout/loengine.h
diff --git a/Build/source/libs/icu-xetex/layoutex/LXUtilities.cpp b/Build/source/libs/icu/icu-xetex/layoutex/LXUtilities.cpp
index 29cff25dbbb..29cff25dbbb 100644
--- a/Build/source/libs/icu-xetex/layoutex/LXUtilities.cpp
+++ b/Build/source/libs/icu/icu-xetex/layoutex/LXUtilities.cpp
diff --git a/Build/source/libs/icu-xetex/layoutex/LXUtilities.h b/Build/source/libs/icu/icu-xetex/layoutex/LXUtilities.h
index 308b65f281b..308b65f281b 100644
--- a/Build/source/libs/icu-xetex/layoutex/LXUtilities.h
+++ b/Build/source/libs/icu/icu-xetex/layoutex/LXUtilities.h
diff --git a/Build/source/libs/icu-xetex/layoutex/Makefile.in b/Build/source/libs/icu/icu-xetex/layoutex/Makefile.in
index 0d5329ffce7..0d5329ffce7 100644
--- a/Build/source/libs/icu-xetex/layoutex/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/layoutex/Makefile.in
diff --git a/Build/source/libs/icu-xetex/layoutex/ParagraphLayout.cpp b/Build/source/libs/icu/icu-xetex/layoutex/ParagraphLayout.cpp
index 27e75c2e0d6..27e75c2e0d6 100644
--- a/Build/source/libs/icu-xetex/layoutex/ParagraphLayout.cpp
+++ b/Build/source/libs/icu/icu-xetex/layoutex/ParagraphLayout.cpp
diff --git a/Build/source/libs/icu-xetex/layoutex/RunArrays.cpp b/Build/source/libs/icu/icu-xetex/layoutex/RunArrays.cpp
index 574282ba706..574282ba706 100644
--- a/Build/source/libs/icu-xetex/layoutex/RunArrays.cpp
+++ b/Build/source/libs/icu/icu-xetex/layoutex/RunArrays.cpp
diff --git a/Build/source/libs/icu-xetex/layoutex/layout/ParagraphLayout.h b/Build/source/libs/icu/icu-xetex/layoutex/layout/ParagraphLayout.h
index bce2e2d4ee3..bce2e2d4ee3 100644
--- a/Build/source/libs/icu-xetex/layoutex/layout/ParagraphLayout.h
+++ b/Build/source/libs/icu/icu-xetex/layoutex/layout/ParagraphLayout.h
diff --git a/Build/source/libs/icu-xetex/layoutex/layout/RunArrays.h b/Build/source/libs/icu/icu-xetex/layoutex/layout/RunArrays.h
index b419616938f..b419616938f 100644
--- a/Build/source/libs/icu-xetex/layoutex/layout/RunArrays.h
+++ b/Build/source/libs/icu/icu-xetex/layoutex/layout/RunArrays.h
diff --git a/Build/source/libs/icu-xetex/layoutex/layout/playout.h b/Build/source/libs/icu/icu-xetex/layoutex/layout/playout.h
index 1d98e16e94a..1d98e16e94a 100644
--- a/Build/source/libs/icu-xetex/layoutex/layout/playout.h
+++ b/Build/source/libs/icu/icu-xetex/layoutex/layout/playout.h
diff --git a/Build/source/libs/icu-xetex/layoutex/layout/plruns.h b/Build/source/libs/icu/icu-xetex/layoutex/layout/plruns.h
index e0cb9d684fc..e0cb9d684fc 100644
--- a/Build/source/libs/icu-xetex/layoutex/layout/plruns.h
+++ b/Build/source/libs/icu/icu-xetex/layoutex/layout/plruns.h
diff --git a/Build/source/libs/icu-xetex/layoutex/layoutex.rc b/Build/source/libs/icu/icu-xetex/layoutex/layoutex.rc
index d6daefabc4e..d6daefabc4e 100644
--- a/Build/source/libs/icu-xetex/layoutex/layoutex.rc
+++ b/Build/source/libs/icu/icu-xetex/layoutex/layoutex.rc
diff --git a/Build/source/libs/icu-xetex/layoutex/layoutex.vcproj b/Build/source/libs/icu/icu-xetex/layoutex/layoutex.vcproj
index 108465a8b55..108465a8b55 100644
--- a/Build/source/libs/icu-xetex/layoutex/layoutex.vcproj
+++ b/Build/source/libs/icu/icu-xetex/layoutex/layoutex.vcproj
diff --git a/Build/source/libs/icu-xetex/layoutex/playout.cpp b/Build/source/libs/icu/icu-xetex/layoutex/playout.cpp
index f1c167ea3e6..f1c167ea3e6 100644
--- a/Build/source/libs/icu-xetex/layoutex/playout.cpp
+++ b/Build/source/libs/icu/icu-xetex/layoutex/playout.cpp
diff --git a/Build/source/libs/icu-xetex/layoutex/plruns.cpp b/Build/source/libs/icu/icu-xetex/layoutex/plruns.cpp
index 52517b5d1d5..52517b5d1d5 100644
--- a/Build/source/libs/icu-xetex/layoutex/plruns.cpp
+++ b/Build/source/libs/icu/icu-xetex/layoutex/plruns.cpp
diff --git a/Build/source/libs/icu-xetex/mkinstalldirs b/Build/source/libs/icu/icu-xetex/mkinstalldirs
index ef7e16fdafe..ef7e16fdafe 100644
--- a/Build/source/libs/icu-xetex/mkinstalldirs
+++ b/Build/source/libs/icu/icu-xetex/mkinstalldirs
diff --git a/Build/source/libs/icu-xetex/runConfigureICU b/Build/source/libs/icu/icu-xetex/runConfigureICU
index 9b97a13311e..9b97a13311e 100755
--- a/Build/source/libs/icu-xetex/runConfigureICU
+++ b/Build/source/libs/icu/icu-xetex/runConfigureICU
diff --git a/Build/source/libs/icu-xetex/samples/Makefile.in b/Build/source/libs/icu/icu-xetex/samples/Makefile.in
index a1d8e367b96..a1d8e367b96 100644
--- a/Build/source/libs/icu-xetex/samples/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/samples/Makefile.in
diff --git a/Build/source/libs/icu-xetex/samples/all/all.sln b/Build/source/libs/icu/icu-xetex/samples/all/all.sln
index 5d4c44618cd..5d4c44618cd 100644
--- a/Build/source/libs/icu-xetex/samples/all/all.sln
+++ b/Build/source/libs/icu/icu-xetex/samples/all/all.sln
diff --git a/Build/source/libs/icu-xetex/samples/break/Makefile b/Build/source/libs/icu/icu-xetex/samples/break/Makefile
index 3afd0c517bc..3afd0c517bc 100644
--- a/Build/source/libs/icu-xetex/samples/break/Makefile
+++ b/Build/source/libs/icu/icu-xetex/samples/break/Makefile
diff --git a/Build/source/libs/icu-xetex/samples/break/break.cpp b/Build/source/libs/icu/icu-xetex/samples/break/break.cpp
index 90d77efad42..90d77efad42 100644
--- a/Build/source/libs/icu-xetex/samples/break/break.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/break/break.cpp
diff --git a/Build/source/libs/icu-xetex/samples/break/break.sln b/Build/source/libs/icu/icu-xetex/samples/break/break.sln
index 879ec15b2da..879ec15b2da 100644
--- a/Build/source/libs/icu-xetex/samples/break/break.sln
+++ b/Build/source/libs/icu/icu-xetex/samples/break/break.sln
diff --git a/Build/source/libs/icu-xetex/samples/break/break.vcproj b/Build/source/libs/icu/icu-xetex/samples/break/break.vcproj
index 097a79359a4..097a79359a4 100644
--- a/Build/source/libs/icu-xetex/samples/break/break.vcproj
+++ b/Build/source/libs/icu/icu-xetex/samples/break/break.vcproj
diff --git a/Build/source/libs/icu-xetex/samples/break/readme.txt b/Build/source/libs/icu/icu-xetex/samples/break/readme.txt
index dbb69a5ada6..dbb69a5ada6 100644
--- a/Build/source/libs/icu-xetex/samples/break/readme.txt
+++ b/Build/source/libs/icu/icu-xetex/samples/break/readme.txt
diff --git a/Build/source/libs/icu-xetex/samples/break/ubreak.c b/Build/source/libs/icu/icu-xetex/samples/break/ubreak.c
index e70d877b303..e70d877b303 100644
--- a/Build/source/libs/icu-xetex/samples/break/ubreak.c
+++ b/Build/source/libs/icu/icu-xetex/samples/break/ubreak.c
diff --git a/Build/source/libs/icu-xetex/samples/cal/Makefile.in b/Build/source/libs/icu/icu-xetex/samples/cal/Makefile.in
index f2e81589075..f2e81589075 100644
--- a/Build/source/libs/icu-xetex/samples/cal/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/samples/cal/Makefile.in
diff --git a/Build/source/libs/icu-xetex/samples/cal/cal.c b/Build/source/libs/icu/icu-xetex/samples/cal/cal.c
index 4b6f838ec85..4b6f838ec85 100644
--- a/Build/source/libs/icu-xetex/samples/cal/cal.c
+++ b/Build/source/libs/icu/icu-xetex/samples/cal/cal.c
diff --git a/Build/source/libs/icu-xetex/samples/cal/cal.sln b/Build/source/libs/icu/icu-xetex/samples/cal/cal.sln
index 7a9c76a0a2b..7a9c76a0a2b 100644
--- a/Build/source/libs/icu-xetex/samples/cal/cal.sln
+++ b/Build/source/libs/icu/icu-xetex/samples/cal/cal.sln
diff --git a/Build/source/libs/icu-xetex/samples/cal/cal.vcproj b/Build/source/libs/icu/icu-xetex/samples/cal/cal.vcproj
index f67b44f9a6b..f67b44f9a6b 100644
--- a/Build/source/libs/icu-xetex/samples/cal/cal.vcproj
+++ b/Build/source/libs/icu/icu-xetex/samples/cal/cal.vcproj
diff --git a/Build/source/libs/icu-xetex/samples/cal/readme.txt b/Build/source/libs/icu/icu-xetex/samples/cal/readme.txt
index 69d08e8880b..69d08e8880b 100644
--- a/Build/source/libs/icu-xetex/samples/cal/readme.txt
+++ b/Build/source/libs/icu/icu-xetex/samples/cal/readme.txt
diff --git a/Build/source/libs/icu-xetex/samples/cal/uprint.c b/Build/source/libs/icu/icu-xetex/samples/cal/uprint.c
index 2b0c8115103..2b0c8115103 100644
--- a/Build/source/libs/icu-xetex/samples/cal/uprint.c
+++ b/Build/source/libs/icu/icu-xetex/samples/cal/uprint.c
diff --git a/Build/source/libs/icu-xetex/samples/cal/uprint.h b/Build/source/libs/icu/icu-xetex/samples/cal/uprint.h
index 16ffb47c115..16ffb47c115 100644
--- a/Build/source/libs/icu-xetex/samples/cal/uprint.h
+++ b/Build/source/libs/icu/icu-xetex/samples/cal/uprint.h
diff --git a/Build/source/libs/icu-xetex/samples/case/Makefile b/Build/source/libs/icu/icu-xetex/samples/case/Makefile
index 36905e4b33a..36905e4b33a 100644
--- a/Build/source/libs/icu-xetex/samples/case/Makefile
+++ b/Build/source/libs/icu/icu-xetex/samples/case/Makefile
diff --git a/Build/source/libs/icu-xetex/samples/case/case.cpp b/Build/source/libs/icu/icu-xetex/samples/case/case.cpp
index fa2fab1a157..fa2fab1a157 100644
--- a/Build/source/libs/icu-xetex/samples/case/case.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/case/case.cpp
diff --git a/Build/source/libs/icu-xetex/samples/case/case.sln b/Build/source/libs/icu/icu-xetex/samples/case/case.sln
index a34d55de47f..a34d55de47f 100644
--- a/Build/source/libs/icu-xetex/samples/case/case.sln
+++ b/Build/source/libs/icu/icu-xetex/samples/case/case.sln
diff --git a/Build/source/libs/icu-xetex/samples/case/case.vcproj b/Build/source/libs/icu/icu-xetex/samples/case/case.vcproj
index a4313781201..a4313781201 100644
--- a/Build/source/libs/icu-xetex/samples/case/case.vcproj
+++ b/Build/source/libs/icu/icu-xetex/samples/case/case.vcproj
diff --git a/Build/source/libs/icu-xetex/samples/case/readme.txt b/Build/source/libs/icu/icu-xetex/samples/case/readme.txt
index 893bb575fd5..893bb575fd5 100644
--- a/Build/source/libs/icu-xetex/samples/case/readme.txt
+++ b/Build/source/libs/icu/icu-xetex/samples/case/readme.txt
diff --git a/Build/source/libs/icu-xetex/samples/case/ucase.c b/Build/source/libs/icu/icu-xetex/samples/case/ucase.c
index 585f49b7cf0..585f49b7cf0 100644
--- a/Build/source/libs/icu-xetex/samples/case/ucase.c
+++ b/Build/source/libs/icu/icu-xetex/samples/case/ucase.c
diff --git a/Build/source/libs/icu-xetex/samples/citer/Makefile b/Build/source/libs/icu/icu-xetex/samples/citer/Makefile
index 712272a131f..712272a131f 100644
--- a/Build/source/libs/icu-xetex/samples/citer/Makefile
+++ b/Build/source/libs/icu/icu-xetex/samples/citer/Makefile
diff --git a/Build/source/libs/icu-xetex/samples/citer/citer.cpp b/Build/source/libs/icu/icu-xetex/samples/citer/citer.cpp
index c0be60c1bb2..c0be60c1bb2 100644
--- a/Build/source/libs/icu-xetex/samples/citer/citer.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/citer/citer.cpp
diff --git a/Build/source/libs/icu-xetex/samples/citer/citer.vcproj b/Build/source/libs/icu/icu-xetex/samples/citer/citer.vcproj
index 8eaf81e6818..8eaf81e6818 100644
--- a/Build/source/libs/icu-xetex/samples/citer/citer.vcproj
+++ b/Build/source/libs/icu/icu-xetex/samples/citer/citer.vcproj
diff --git a/Build/source/libs/icu-xetex/samples/citer/readme.txt b/Build/source/libs/icu/icu-xetex/samples/citer/readme.txt
index 6eb8cdb20aa..6eb8cdb20aa 100644
--- a/Build/source/libs/icu-xetex/samples/citer/readme.txt
+++ b/Build/source/libs/icu/icu-xetex/samples/citer/readme.txt
diff --git a/Build/source/libs/icu-xetex/samples/coll/Makefile b/Build/source/libs/icu/icu-xetex/samples/coll/Makefile
index 09981866588..09981866588 100644
--- a/Build/source/libs/icu-xetex/samples/coll/Makefile
+++ b/Build/source/libs/icu/icu-xetex/samples/coll/Makefile
diff --git a/Build/source/libs/icu-xetex/samples/coll/coll.cpp b/Build/source/libs/icu/icu-xetex/samples/coll/coll.cpp
index 28e52392c0a..28e52392c0a 100644
--- a/Build/source/libs/icu-xetex/samples/coll/coll.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/coll/coll.cpp
diff --git a/Build/source/libs/icu-xetex/samples/coll/coll.sln b/Build/source/libs/icu/icu-xetex/samples/coll/coll.sln
index 6744ce84c78..6744ce84c78 100644
--- a/Build/source/libs/icu-xetex/samples/coll/coll.sln
+++ b/Build/source/libs/icu/icu-xetex/samples/coll/coll.sln
diff --git a/Build/source/libs/icu-xetex/samples/coll/coll.vcproj b/Build/source/libs/icu/icu-xetex/samples/coll/coll.vcproj
index 517ad42756a..517ad42756a 100644
--- a/Build/source/libs/icu-xetex/samples/coll/coll.vcproj
+++ b/Build/source/libs/icu/icu-xetex/samples/coll/coll.vcproj
diff --git a/Build/source/libs/icu-xetex/samples/coll/readme.txt b/Build/source/libs/icu/icu-xetex/samples/coll/readme.txt
index b5aa4acf5f4..b5aa4acf5f4 100644
--- a/Build/source/libs/icu-xetex/samples/coll/readme.txt
+++ b/Build/source/libs/icu/icu-xetex/samples/coll/readme.txt
diff --git a/Build/source/libs/icu-xetex/samples/csdet/Makefile b/Build/source/libs/icu/icu-xetex/samples/csdet/Makefile
index 410590a2c11..410590a2c11 100644
--- a/Build/source/libs/icu-xetex/samples/csdet/Makefile
+++ b/Build/source/libs/icu/icu-xetex/samples/csdet/Makefile
diff --git a/Build/source/libs/icu-xetex/samples/csdet/csdet.c b/Build/source/libs/icu/icu-xetex/samples/csdet/csdet.c
index b0c89f28599..b0c89f28599 100644
--- a/Build/source/libs/icu-xetex/samples/csdet/csdet.c
+++ b/Build/source/libs/icu/icu-xetex/samples/csdet/csdet.c
diff --git a/Build/source/libs/icu-xetex/samples/csdet/csdet.vcproj b/Build/source/libs/icu/icu-xetex/samples/csdet/csdet.vcproj
index a6d3d0ed622..a6d3d0ed622 100644
--- a/Build/source/libs/icu-xetex/samples/csdet/csdet.vcproj
+++ b/Build/source/libs/icu/icu-xetex/samples/csdet/csdet.vcproj
diff --git a/Build/source/libs/icu-xetex/samples/date/Makefile.in b/Build/source/libs/icu/icu-xetex/samples/date/Makefile.in
index c1873721df5..c1873721df5 100644
--- a/Build/source/libs/icu-xetex/samples/date/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/samples/date/Makefile.in
diff --git a/Build/source/libs/icu-xetex/samples/date/date.c b/Build/source/libs/icu/icu-xetex/samples/date/date.c
index 8a7ebe1f964..8a7ebe1f964 100644
--- a/Build/source/libs/icu-xetex/samples/date/date.c
+++ b/Build/source/libs/icu/icu-xetex/samples/date/date.c
diff --git a/Build/source/libs/icu-xetex/samples/date/date.sln b/Build/source/libs/icu/icu-xetex/samples/date/date.sln
index d392b392bfb..d392b392bfb 100644
--- a/Build/source/libs/icu-xetex/samples/date/date.sln
+++ b/Build/source/libs/icu/icu-xetex/samples/date/date.sln
diff --git a/Build/source/libs/icu-xetex/samples/date/date.vcproj b/Build/source/libs/icu/icu-xetex/samples/date/date.vcproj
index eb4327dd166..eb4327dd166 100644
--- a/Build/source/libs/icu-xetex/samples/date/date.vcproj
+++ b/Build/source/libs/icu/icu-xetex/samples/date/date.vcproj
diff --git a/Build/source/libs/icu-xetex/samples/date/readme.txt b/Build/source/libs/icu/icu-xetex/samples/date/readme.txt
index 3ba36d518e4..3ba36d518e4 100644
--- a/Build/source/libs/icu-xetex/samples/date/readme.txt
+++ b/Build/source/libs/icu/icu-xetex/samples/date/readme.txt
diff --git a/Build/source/libs/icu-xetex/samples/date/uprint.c b/Build/source/libs/icu/icu-xetex/samples/date/uprint.c
index 27e82af2f2b..27e82af2f2b 100644
--- a/Build/source/libs/icu-xetex/samples/date/uprint.c
+++ b/Build/source/libs/icu/icu-xetex/samples/date/uprint.c
diff --git a/Build/source/libs/icu-xetex/samples/date/uprint.h b/Build/source/libs/icu/icu-xetex/samples/date/uprint.h
index 16ffb47c115..16ffb47c115 100644
--- a/Build/source/libs/icu-xetex/samples/date/uprint.h
+++ b/Build/source/libs/icu/icu-xetex/samples/date/uprint.h
diff --git a/Build/source/libs/icu-xetex/samples/datecal/Makefile b/Build/source/libs/icu/icu-xetex/samples/datecal/Makefile
index 89e728c87ba..89e728c87ba 100644
--- a/Build/source/libs/icu-xetex/samples/datecal/Makefile
+++ b/Build/source/libs/icu/icu-xetex/samples/datecal/Makefile
diff --git a/Build/source/libs/icu-xetex/samples/datecal/cal.cpp b/Build/source/libs/icu/icu-xetex/samples/datecal/cal.cpp
index f06538418f9..f06538418f9 100644
--- a/Build/source/libs/icu-xetex/samples/datecal/cal.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/datecal/cal.cpp
diff --git a/Build/source/libs/icu-xetex/samples/datecal/ccal.c b/Build/source/libs/icu/icu-xetex/samples/datecal/ccal.c
index 1b65579f1cc..1b65579f1cc 100644
--- a/Build/source/libs/icu-xetex/samples/datecal/ccal.c
+++ b/Build/source/libs/icu/icu-xetex/samples/datecal/ccal.c
diff --git a/Build/source/libs/icu-xetex/samples/datefmt/Makefile b/Build/source/libs/icu/icu-xetex/samples/datefmt/Makefile
index 6b0cb23b7b1..6b0cb23b7b1 100644
--- a/Build/source/libs/icu-xetex/samples/datefmt/Makefile
+++ b/Build/source/libs/icu/icu-xetex/samples/datefmt/Makefile
diff --git a/Build/source/libs/icu-xetex/samples/datefmt/README.TXT b/Build/source/libs/icu/icu-xetex/samples/datefmt/README.TXT
index 7a12224ddec..7a12224ddec 100644
--- a/Build/source/libs/icu-xetex/samples/datefmt/README.TXT
+++ b/Build/source/libs/icu/icu-xetex/samples/datefmt/README.TXT
diff --git a/Build/source/libs/icu-xetex/samples/datefmt/answers/main_0.cpp b/Build/source/libs/icu/icu-xetex/samples/datefmt/answers/main_0.cpp
index 2f4dad212aa..2f4dad212aa 100644
--- a/Build/source/libs/icu-xetex/samples/datefmt/answers/main_0.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/datefmt/answers/main_0.cpp
diff --git a/Build/source/libs/icu-xetex/samples/datefmt/answers/main_1.cpp b/Build/source/libs/icu/icu-xetex/samples/datefmt/answers/main_1.cpp
index ad8c99c88a6..ad8c99c88a6 100644
--- a/Build/source/libs/icu-xetex/samples/datefmt/answers/main_1.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/datefmt/answers/main_1.cpp
diff --git a/Build/source/libs/icu-xetex/samples/datefmt/answers/main_2.cpp b/Build/source/libs/icu/icu-xetex/samples/datefmt/answers/main_2.cpp
index e677a4fd1b2..e677a4fd1b2 100644
--- a/Build/source/libs/icu-xetex/samples/datefmt/answers/main_2.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/datefmt/answers/main_2.cpp
diff --git a/Build/source/libs/icu-xetex/samples/datefmt/answers/main_3.cpp b/Build/source/libs/icu/icu-xetex/samples/datefmt/answers/main_3.cpp
index e7776836277..e7776836277 100644
--- a/Build/source/libs/icu-xetex/samples/datefmt/answers/main_3.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/datefmt/answers/main_3.cpp
diff --git a/Build/source/libs/icu-xetex/samples/datefmt/datefmt.sln b/Build/source/libs/icu/icu-xetex/samples/datefmt/datefmt.sln
index 4ba47593e58..4ba47593e58 100644
--- a/Build/source/libs/icu-xetex/samples/datefmt/datefmt.sln
+++ b/Build/source/libs/icu/icu-xetex/samples/datefmt/datefmt.sln
diff --git a/Build/source/libs/icu-xetex/samples/datefmt/datefmt.vcproj b/Build/source/libs/icu/icu-xetex/samples/datefmt/datefmt.vcproj
index 8c420385aef..8c420385aef 100644
--- a/Build/source/libs/icu-xetex/samples/datefmt/datefmt.vcproj
+++ b/Build/source/libs/icu/icu-xetex/samples/datefmt/datefmt.vcproj
diff --git a/Build/source/libs/icu-xetex/samples/datefmt/main.cpp b/Build/source/libs/icu/icu-xetex/samples/datefmt/main.cpp
index e004f9c1307..e004f9c1307 100644
--- a/Build/source/libs/icu-xetex/samples/datefmt/main.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/datefmt/main.cpp
diff --git a/Build/source/libs/icu-xetex/samples/datefmt/util.cpp b/Build/source/libs/icu/icu-xetex/samples/datefmt/util.cpp
index 25a8f0224d4..25a8f0224d4 100644
--- a/Build/source/libs/icu-xetex/samples/datefmt/util.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/datefmt/util.cpp
diff --git a/Build/source/libs/icu-xetex/samples/datefmt/util.h b/Build/source/libs/icu/icu-xetex/samples/datefmt/util.h
index 2d9c4c724e2..2d9c4c724e2 100644
--- a/Build/source/libs/icu-xetex/samples/datefmt/util.h
+++ b/Build/source/libs/icu/icu-xetex/samples/datefmt/util.h
diff --git a/Build/source/libs/icu-xetex/samples/defs.mk b/Build/source/libs/icu/icu-xetex/samples/defs.mk
index 7b91c4ba1ad..7b91c4ba1ad 100644
--- a/Build/source/libs/icu-xetex/samples/defs.mk
+++ b/Build/source/libs/icu/icu-xetex/samples/defs.mk
diff --git a/Build/source/libs/icu-xetex/samples/layout/FontMap.GDI b/Build/source/libs/icu/icu-xetex/samples/layout/FontMap.GDI
index 198c02218a7..198c02218a7 100644
--- a/Build/source/libs/icu-xetex/samples/layout/FontMap.GDI
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/FontMap.GDI
diff --git a/Build/source/libs/icu-xetex/samples/layout/FontMap.Gnome b/Build/source/libs/icu/icu-xetex/samples/layout/FontMap.Gnome
index 1f57bb4814d..1f57bb4814d 100644
--- a/Build/source/libs/icu-xetex/samples/layout/FontMap.Gnome
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/FontMap.Gnome
diff --git a/Build/source/libs/icu-xetex/samples/layout/FontMap.cpp b/Build/source/libs/icu/icu-xetex/samples/layout/FontMap.cpp
index 1510b29b2da..1510b29b2da 100644
--- a/Build/source/libs/icu-xetex/samples/layout/FontMap.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/FontMap.cpp
diff --git a/Build/source/libs/icu-xetex/samples/layout/FontMap.h b/Build/source/libs/icu/icu-xetex/samples/layout/FontMap.h
index fa80ebfd090..fa80ebfd090 100644
--- a/Build/source/libs/icu-xetex/samples/layout/FontMap.h
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/FontMap.h
diff --git a/Build/source/libs/icu-xetex/samples/layout/FontTableCache.cpp b/Build/source/libs/icu/icu-xetex/samples/layout/FontTableCache.cpp
index 75130ff3af1..75130ff3af1 100644
--- a/Build/source/libs/icu-xetex/samples/layout/FontTableCache.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/FontTableCache.cpp
diff --git a/Build/source/libs/icu-xetex/samples/layout/FontTableCache.h b/Build/source/libs/icu/icu-xetex/samples/layout/FontTableCache.h
index bb85eeb011d..bb85eeb011d 100644
--- a/Build/source/libs/icu-xetex/samples/layout/FontTableCache.h
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/FontTableCache.h
diff --git a/Build/source/libs/icu-xetex/samples/layout/GDIFontInstance.cpp b/Build/source/libs/icu/icu-xetex/samples/layout/GDIFontInstance.cpp
index d3451e9a575..d3451e9a575 100644
--- a/Build/source/libs/icu-xetex/samples/layout/GDIFontInstance.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/GDIFontInstance.cpp
diff --git a/Build/source/libs/icu-xetex/samples/layout/GDIFontInstance.h b/Build/source/libs/icu/icu-xetex/samples/layout/GDIFontInstance.h
index 7b677e77262..7b677e77262 100644
--- a/Build/source/libs/icu-xetex/samples/layout/GDIFontInstance.h
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/GDIFontInstance.h
diff --git a/Build/source/libs/icu-xetex/samples/layout/GDIFontMap.cpp b/Build/source/libs/icu/icu-xetex/samples/layout/GDIFontMap.cpp
index 480bbe0eb8a..480bbe0eb8a 100644
--- a/Build/source/libs/icu-xetex/samples/layout/GDIFontMap.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/GDIFontMap.cpp
diff --git a/Build/source/libs/icu-xetex/samples/layout/GDIFontMap.h b/Build/source/libs/icu/icu-xetex/samples/layout/GDIFontMap.h
index e92f47f0c0c..e92f47f0c0c 100644
--- a/Build/source/libs/icu-xetex/samples/layout/GDIFontMap.h
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/GDIFontMap.h
diff --git a/Build/source/libs/icu-xetex/samples/layout/GDIGUISupport.cpp b/Build/source/libs/icu/icu-xetex/samples/layout/GDIGUISupport.cpp
index 9f55ffed61e..9f55ffed61e 100644
--- a/Build/source/libs/icu-xetex/samples/layout/GDIGUISupport.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/GDIGUISupport.cpp
diff --git a/Build/source/libs/icu-xetex/samples/layout/GDIGUISupport.h b/Build/source/libs/icu/icu-xetex/samples/layout/GDIGUISupport.h
index ad4c7143b5a..ad4c7143b5a 100644
--- a/Build/source/libs/icu-xetex/samples/layout/GDIGUISupport.h
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/GDIGUISupport.h
diff --git a/Build/source/libs/icu-xetex/samples/layout/GUISupport.h b/Build/source/libs/icu/icu-xetex/samples/layout/GUISupport.h
index f41b7cec91d..f41b7cec91d 100644
--- a/Build/source/libs/icu-xetex/samples/layout/GUISupport.h
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/GUISupport.h
diff --git a/Build/source/libs/icu-xetex/samples/layout/GnomeFontInstance.cpp b/Build/source/libs/icu/icu-xetex/samples/layout/GnomeFontInstance.cpp
index 2a5c307b8f7..2a5c307b8f7 100644
--- a/Build/source/libs/icu-xetex/samples/layout/GnomeFontInstance.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/GnomeFontInstance.cpp
diff --git a/Build/source/libs/icu-xetex/samples/layout/GnomeFontInstance.h b/Build/source/libs/icu/icu-xetex/samples/layout/GnomeFontInstance.h
index 4af393804cd..4af393804cd 100644
--- a/Build/source/libs/icu-xetex/samples/layout/GnomeFontInstance.h
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/GnomeFontInstance.h
diff --git a/Build/source/libs/icu-xetex/samples/layout/GnomeFontMap.cpp b/Build/source/libs/icu/icu-xetex/samples/layout/GnomeFontMap.cpp
index 6a23b305627..6a23b305627 100644
--- a/Build/source/libs/icu-xetex/samples/layout/GnomeFontMap.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/GnomeFontMap.cpp
diff --git a/Build/source/libs/icu-xetex/samples/layout/GnomeFontMap.h b/Build/source/libs/icu/icu-xetex/samples/layout/GnomeFontMap.h
index a068b2b558f..a068b2b558f 100644
--- a/Build/source/libs/icu-xetex/samples/layout/GnomeFontMap.h
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/GnomeFontMap.h
diff --git a/Build/source/libs/icu-xetex/samples/layout/GnomeGUISupport.cpp b/Build/source/libs/icu/icu-xetex/samples/layout/GnomeGUISupport.cpp
index 2835b616a01..2835b616a01 100644
--- a/Build/source/libs/icu-xetex/samples/layout/GnomeGUISupport.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/GnomeGUISupport.cpp
diff --git a/Build/source/libs/icu-xetex/samples/layout/GnomeGUISupport.h b/Build/source/libs/icu/icu-xetex/samples/layout/GnomeGUISupport.h
index e88ef128a14..e88ef128a14 100644
--- a/Build/source/libs/icu-xetex/samples/layout/GnomeGUISupport.h
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/GnomeGUISupport.h
diff --git a/Build/source/libs/icu-xetex/samples/layout/LayoutSample.rc b/Build/source/libs/icu/icu-xetex/samples/layout/LayoutSample.rc
index 9b0d3df88cc..9b0d3df88cc 100644
--- a/Build/source/libs/icu-xetex/samples/layout/LayoutSample.rc
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/LayoutSample.rc
diff --git a/Build/source/libs/icu-xetex/samples/layout/Makefile.in b/Build/source/libs/icu/icu-xetex/samples/layout/Makefile.in
index 15fae07c16a..15fae07c16a 100644
--- a/Build/source/libs/icu-xetex/samples/layout/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/Makefile.in
diff --git a/Build/source/libs/icu-xetex/samples/layout/RenderingSurface.h b/Build/source/libs/icu/icu-xetex/samples/layout/RenderingSurface.h
index ab0ad561956..ab0ad561956 100644
--- a/Build/source/libs/icu-xetex/samples/layout/RenderingSurface.h
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/RenderingSurface.h
diff --git a/Build/source/libs/icu-xetex/samples/layout/Sample.txt b/Build/source/libs/icu/icu-xetex/samples/layout/Sample.txt
index 367821b7933..367821b7933 100644
--- a/Build/source/libs/icu-xetex/samples/layout/Sample.txt
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/Sample.txt
diff --git a/Build/source/libs/icu-xetex/samples/layout/ScriptCompositeFontInstance.cpp b/Build/source/libs/icu/icu-xetex/samples/layout/ScriptCompositeFontInstance.cpp
index 2fbbaca0d4b..2fbbaca0d4b 100644
--- a/Build/source/libs/icu-xetex/samples/layout/ScriptCompositeFontInstance.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/ScriptCompositeFontInstance.cpp
diff --git a/Build/source/libs/icu-xetex/samples/layout/ScriptCompositeFontInstance.h b/Build/source/libs/icu/icu-xetex/samples/layout/ScriptCompositeFontInstance.h
index 241461769d0..241461769d0 100644
--- a/Build/source/libs/icu-xetex/samples/layout/ScriptCompositeFontInstance.h
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/ScriptCompositeFontInstance.h
diff --git a/Build/source/libs/icu-xetex/samples/layout/Surface.cpp b/Build/source/libs/icu/icu-xetex/samples/layout/Surface.cpp
index 1f515241a95..1f515241a95 100644
--- a/Build/source/libs/icu-xetex/samples/layout/Surface.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/Surface.cpp
diff --git a/Build/source/libs/icu-xetex/samples/layout/Surface.h b/Build/source/libs/icu/icu-xetex/samples/layout/Surface.h
index 423ddaaf12c..423ddaaf12c 100644
--- a/Build/source/libs/icu-xetex/samples/layout/Surface.h
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/Surface.h
diff --git a/Build/source/libs/icu-xetex/samples/layout/UnicodeReader.cpp b/Build/source/libs/icu/icu-xetex/samples/layout/UnicodeReader.cpp
index ab5a7ef70b7..ab5a7ef70b7 100644
--- a/Build/source/libs/icu-xetex/samples/layout/UnicodeReader.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/UnicodeReader.cpp
diff --git a/Build/source/libs/icu-xetex/samples/layout/UnicodeReader.h b/Build/source/libs/icu/icu-xetex/samples/layout/UnicodeReader.h
index 47959bb3a49..47959bb3a49 100644
--- a/Build/source/libs/icu-xetex/samples/layout/UnicodeReader.h
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/UnicodeReader.h
diff --git a/Build/source/libs/icu-xetex/samples/layout/arraymem.h b/Build/source/libs/icu/icu-xetex/samples/layout/arraymem.h
index 7c54d96bdd0..7c54d96bdd0 100644
--- a/Build/source/libs/icu-xetex/samples/layout/arraymem.h
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/arraymem.h
diff --git a/Build/source/libs/icu-xetex/samples/layout/cgnomelayout.c b/Build/source/libs/icu/icu-xetex/samples/layout/cgnomelayout.c
index f95b7a5c6bc..f95b7a5c6bc 100644
--- a/Build/source/libs/icu-xetex/samples/layout/cgnomelayout.c
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/cgnomelayout.c
diff --git a/Build/source/libs/icu-xetex/samples/layout/clayout.c b/Build/source/libs/icu/icu-xetex/samples/layout/clayout.c
index 701ab8dc09c..701ab8dc09c 100644
--- a/Build/source/libs/icu-xetex/samples/layout/clayout.c
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/clayout.c
diff --git a/Build/source/libs/icu-xetex/samples/layout/cmaps.cpp b/Build/source/libs/icu/icu-xetex/samples/layout/cmaps.cpp
index 33b5cbb801f..33b5cbb801f 100644
--- a/Build/source/libs/icu-xetex/samples/layout/cmaps.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/cmaps.cpp
diff --git a/Build/source/libs/icu-xetex/samples/layout/cmaps.h b/Build/source/libs/icu/icu-xetex/samples/layout/cmaps.h
index 868c357b763..868c357b763 100644
--- a/Build/source/libs/icu-xetex/samples/layout/cmaps.h
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/cmaps.h
diff --git a/Build/source/libs/icu-xetex/samples/layout/gdiglue.cpp b/Build/source/libs/icu/icu-xetex/samples/layout/gdiglue.cpp
index e553c0617b1..e553c0617b1 100644
--- a/Build/source/libs/icu-xetex/samples/layout/gdiglue.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/gdiglue.cpp
diff --git a/Build/source/libs/icu-xetex/samples/layout/gdiglue.h b/Build/source/libs/icu/icu-xetex/samples/layout/gdiglue.h
index bdd8422bb65..bdd8422bb65 100644
--- a/Build/source/libs/icu-xetex/samples/layout/gdiglue.h
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/gdiglue.h
diff --git a/Build/source/libs/icu-xetex/samples/layout/gnomeglue.cpp b/Build/source/libs/icu/icu-xetex/samples/layout/gnomeglue.cpp
index a081e0bfcbf..a081e0bfcbf 100644
--- a/Build/source/libs/icu-xetex/samples/layout/gnomeglue.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/gnomeglue.cpp
diff --git a/Build/source/libs/icu-xetex/samples/layout/gnomeglue.h b/Build/source/libs/icu/icu-xetex/samples/layout/gnomeglue.h
index 78561468eee..78561468eee 100644
--- a/Build/source/libs/icu-xetex/samples/layout/gnomeglue.h
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/gnomeglue.h
diff --git a/Build/source/libs/icu-xetex/samples/layout/gnomelayout.cpp b/Build/source/libs/icu/icu-xetex/samples/layout/gnomelayout.cpp
index 31e25871d45..31e25871d45 100644
--- a/Build/source/libs/icu-xetex/samples/layout/gnomelayout.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/gnomelayout.cpp
diff --git a/Build/source/libs/icu-xetex/samples/layout/gsupport.h b/Build/source/libs/icu/icu-xetex/samples/layout/gsupport.h
index 26f33b4c064..26f33b4c064 100644
--- a/Build/source/libs/icu-xetex/samples/layout/gsupport.h
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/gsupport.h
diff --git a/Build/source/libs/icu-xetex/samples/layout/layout.cpp b/Build/source/libs/icu/icu-xetex/samples/layout/layout.cpp
index 8501757edb9..8501757edb9 100644
--- a/Build/source/libs/icu-xetex/samples/layout/layout.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/layout.cpp
diff --git a/Build/source/libs/icu-xetex/samples/layout/layout.sln b/Build/source/libs/icu/icu-xetex/samples/layout/layout.sln
index 1be523e3bd5..1be523e3bd5 100644
--- a/Build/source/libs/icu-xetex/samples/layout/layout.sln
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/layout.sln
diff --git a/Build/source/libs/icu-xetex/samples/layout/layout.vcproj b/Build/source/libs/icu/icu-xetex/samples/layout/layout.vcproj
index c9c13375254..c9c13375254 100644
--- a/Build/source/libs/icu-xetex/samples/layout/layout.vcproj
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/layout.vcproj
diff --git a/Build/source/libs/icu-xetex/samples/layout/paragraph.cpp b/Build/source/libs/icu/icu-xetex/samples/layout/paragraph.cpp
index 65d3e368423..65d3e368423 100644
--- a/Build/source/libs/icu-xetex/samples/layout/paragraph.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/paragraph.cpp
diff --git a/Build/source/libs/icu-xetex/samples/layout/paragraph.h b/Build/source/libs/icu/icu-xetex/samples/layout/paragraph.h
index c51c9f41ef2..c51c9f41ef2 100644
--- a/Build/source/libs/icu-xetex/samples/layout/paragraph.h
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/paragraph.h
diff --git a/Build/source/libs/icu-xetex/samples/layout/pflow.c b/Build/source/libs/icu/icu-xetex/samples/layout/pflow.c
index 80450ad20be..80450ad20be 100644
--- a/Build/source/libs/icu-xetex/samples/layout/pflow.c
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/pflow.c
diff --git a/Build/source/libs/icu-xetex/samples/layout/pflow.h b/Build/source/libs/icu/icu-xetex/samples/layout/pflow.h
index 7e0b7f313d8..7e0b7f313d8 100644
--- a/Build/source/libs/icu-xetex/samples/layout/pflow.h
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/pflow.h
diff --git a/Build/source/libs/icu-xetex/samples/layout/readme.html b/Build/source/libs/icu/icu-xetex/samples/layout/readme.html
index 79a700519b9..79a700519b9 100644
--- a/Build/source/libs/icu-xetex/samples/layout/readme.html
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/readme.html
diff --git a/Build/source/libs/icu-xetex/samples/layout/resource.h b/Build/source/libs/icu/icu-xetex/samples/layout/resource.h
index f582d8ebbac..f582d8ebbac 100644
--- a/Build/source/libs/icu-xetex/samples/layout/resource.h
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/resource.h
diff --git a/Build/source/libs/icu-xetex/samples/layout/rsurface.cpp b/Build/source/libs/icu/icu-xetex/samples/layout/rsurface.cpp
index f383aa7dd56..f383aa7dd56 100644
--- a/Build/source/libs/icu-xetex/samples/layout/rsurface.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/rsurface.cpp
diff --git a/Build/source/libs/icu-xetex/samples/layout/rsurface.h b/Build/source/libs/icu/icu-xetex/samples/layout/rsurface.h
index c58194e5f94..c58194e5f94 100644
--- a/Build/source/libs/icu-xetex/samples/layout/rsurface.h
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/rsurface.h
diff --git a/Build/source/libs/icu-xetex/samples/layout/sfnt.h b/Build/source/libs/icu/icu-xetex/samples/layout/sfnt.h
index 3b3d991adcc..3b3d991adcc 100644
--- a/Build/source/libs/icu-xetex/samples/layout/sfnt.h
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/sfnt.h
diff --git a/Build/source/libs/icu-xetex/samples/layout/ucreader.cpp b/Build/source/libs/icu/icu-xetex/samples/layout/ucreader.cpp
index bc928417aef..bc928417aef 100644
--- a/Build/source/libs/icu-xetex/samples/layout/ucreader.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/ucreader.cpp
diff --git a/Build/source/libs/icu-xetex/samples/layout/ucreader.h b/Build/source/libs/icu/icu-xetex/samples/layout/ucreader.h
index 948db14deed..948db14deed 100644
--- a/Build/source/libs/icu-xetex/samples/layout/ucreader.h
+++ b/Build/source/libs/icu/icu-xetex/samples/layout/ucreader.h
diff --git a/Build/source/libs/icu-xetex/samples/legacy/Makefile b/Build/source/libs/icu/icu-xetex/samples/legacy/Makefile
index f47c300ca94..f47c300ca94 100644
--- a/Build/source/libs/icu-xetex/samples/legacy/Makefile
+++ b/Build/source/libs/icu/icu-xetex/samples/legacy/Makefile
diff --git a/Build/source/libs/icu-xetex/samples/legacy/README b/Build/source/libs/icu/icu-xetex/samples/legacy/README
index 3dcf5563382..3dcf5563382 100644
--- a/Build/source/libs/icu-xetex/samples/legacy/README
+++ b/Build/source/libs/icu/icu-xetex/samples/legacy/README
diff --git a/Build/source/libs/icu-xetex/samples/legacy/legacy.cpp b/Build/source/libs/icu/icu-xetex/samples/legacy/legacy.cpp
index 85fc0e660b4..85fc0e660b4 100644
--- a/Build/source/libs/icu-xetex/samples/legacy/legacy.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/legacy/legacy.cpp
diff --git a/Build/source/libs/icu-xetex/samples/legacy/legacy.sln b/Build/source/libs/icu/icu-xetex/samples/legacy/legacy.sln
index 1c65feb9a8a..1c65feb9a8a 100644
--- a/Build/source/libs/icu-xetex/samples/legacy/legacy.sln
+++ b/Build/source/libs/icu/icu-xetex/samples/legacy/legacy.sln
diff --git a/Build/source/libs/icu-xetex/samples/legacy/legacy.vcproj b/Build/source/libs/icu/icu-xetex/samples/legacy/legacy.vcproj
index 8004935f6f9..8004935f6f9 100644
--- a/Build/source/libs/icu-xetex/samples/legacy/legacy.vcproj
+++ b/Build/source/libs/icu/icu-xetex/samples/legacy/legacy.vcproj
diff --git a/Build/source/libs/icu-xetex/samples/legacy/newcol.cpp b/Build/source/libs/icu/icu-xetex/samples/legacy/newcol.cpp
index 195a8acdb48..195a8acdb48 100644
--- a/Build/source/libs/icu-xetex/samples/legacy/newcol.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/legacy/newcol.cpp
diff --git a/Build/source/libs/icu-xetex/samples/legacy/oldcol.cpp b/Build/source/libs/icu/icu-xetex/samples/legacy/oldcol.cpp
index c56ff2fcf6a..c56ff2fcf6a 100644
--- a/Build/source/libs/icu-xetex/samples/legacy/oldcol.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/legacy/oldcol.cpp
diff --git a/Build/source/libs/icu-xetex/samples/msgfmt/Makefile b/Build/source/libs/icu/icu-xetex/samples/msgfmt/Makefile
index 010618b661a..010618b661a 100644
--- a/Build/source/libs/icu-xetex/samples/msgfmt/Makefile
+++ b/Build/source/libs/icu/icu-xetex/samples/msgfmt/Makefile
diff --git a/Build/source/libs/icu-xetex/samples/msgfmt/README.TXT b/Build/source/libs/icu/icu-xetex/samples/msgfmt/README.TXT
index c1c23c0db80..c1c23c0db80 100644
--- a/Build/source/libs/icu-xetex/samples/msgfmt/README.TXT
+++ b/Build/source/libs/icu/icu-xetex/samples/msgfmt/README.TXT
diff --git a/Build/source/libs/icu-xetex/samples/msgfmt/answers/main_0.cpp b/Build/source/libs/icu/icu-xetex/samples/msgfmt/answers/main_0.cpp
index 112bd5a05e6..112bd5a05e6 100644
--- a/Build/source/libs/icu-xetex/samples/msgfmt/answers/main_0.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/msgfmt/answers/main_0.cpp
diff --git a/Build/source/libs/icu-xetex/samples/msgfmt/answers/main_1.cpp b/Build/source/libs/icu/icu-xetex/samples/msgfmt/answers/main_1.cpp
index d075d54c7bd..d075d54c7bd 100644
--- a/Build/source/libs/icu-xetex/samples/msgfmt/answers/main_1.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/msgfmt/answers/main_1.cpp
diff --git a/Build/source/libs/icu-xetex/samples/msgfmt/answers/main_2.cpp b/Build/source/libs/icu/icu-xetex/samples/msgfmt/answers/main_2.cpp
index de027787ac4..de027787ac4 100644
--- a/Build/source/libs/icu-xetex/samples/msgfmt/answers/main_2.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/msgfmt/answers/main_2.cpp
diff --git a/Build/source/libs/icu-xetex/samples/msgfmt/answers/main_3.cpp b/Build/source/libs/icu/icu-xetex/samples/msgfmt/answers/main_3.cpp
index 202ad2706bc..202ad2706bc 100644
--- a/Build/source/libs/icu-xetex/samples/msgfmt/answers/main_3.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/msgfmt/answers/main_3.cpp
diff --git a/Build/source/libs/icu-xetex/samples/msgfmt/main.cpp b/Build/source/libs/icu/icu-xetex/samples/msgfmt/main.cpp
index e92db51789b..e92db51789b 100644
--- a/Build/source/libs/icu-xetex/samples/msgfmt/main.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/msgfmt/main.cpp
diff --git a/Build/source/libs/icu-xetex/samples/msgfmt/msgfmt.sln b/Build/source/libs/icu/icu-xetex/samples/msgfmt/msgfmt.sln
index 9c22b2e14f9..9c22b2e14f9 100644
--- a/Build/source/libs/icu-xetex/samples/msgfmt/msgfmt.sln
+++ b/Build/source/libs/icu/icu-xetex/samples/msgfmt/msgfmt.sln
diff --git a/Build/source/libs/icu-xetex/samples/msgfmt/msgfmt.vcproj b/Build/source/libs/icu/icu-xetex/samples/msgfmt/msgfmt.vcproj
index 5f40d509eb3..5f40d509eb3 100644
--- a/Build/source/libs/icu-xetex/samples/msgfmt/msgfmt.vcproj
+++ b/Build/source/libs/icu/icu-xetex/samples/msgfmt/msgfmt.vcproj
diff --git a/Build/source/libs/icu-xetex/samples/msgfmt/util.cpp b/Build/source/libs/icu/icu-xetex/samples/msgfmt/util.cpp
index 25a8f0224d4..25a8f0224d4 100644
--- a/Build/source/libs/icu-xetex/samples/msgfmt/util.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/msgfmt/util.cpp
diff --git a/Build/source/libs/icu-xetex/samples/msgfmt/util.h b/Build/source/libs/icu/icu-xetex/samples/msgfmt/util.h
index 2d9c4c724e2..2d9c4c724e2 100644
--- a/Build/source/libs/icu-xetex/samples/msgfmt/util.h
+++ b/Build/source/libs/icu/icu-xetex/samples/msgfmt/util.h
diff --git a/Build/source/libs/icu-xetex/samples/numfmt/Makefile b/Build/source/libs/icu/icu-xetex/samples/numfmt/Makefile
index eca17b21692..eca17b21692 100644
--- a/Build/source/libs/icu-xetex/samples/numfmt/Makefile
+++ b/Build/source/libs/icu/icu-xetex/samples/numfmt/Makefile
diff --git a/Build/source/libs/icu-xetex/samples/numfmt/capi.c b/Build/source/libs/icu/icu-xetex/samples/numfmt/capi.c
index 9b8a1117b12..9b8a1117b12 100644
--- a/Build/source/libs/icu-xetex/samples/numfmt/capi.c
+++ b/Build/source/libs/icu/icu-xetex/samples/numfmt/capi.c
diff --git a/Build/source/libs/icu-xetex/samples/numfmt/main.cpp b/Build/source/libs/icu/icu-xetex/samples/numfmt/main.cpp
index 1ebd4948c37..1ebd4948c37 100644
--- a/Build/source/libs/icu-xetex/samples/numfmt/main.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/numfmt/main.cpp
diff --git a/Build/source/libs/icu-xetex/samples/numfmt/numfmt.sln b/Build/source/libs/icu/icu-xetex/samples/numfmt/numfmt.sln
index c8d8ed7509f..c8d8ed7509f 100644
--- a/Build/source/libs/icu-xetex/samples/numfmt/numfmt.sln
+++ b/Build/source/libs/icu/icu-xetex/samples/numfmt/numfmt.sln
diff --git a/Build/source/libs/icu-xetex/samples/numfmt/numfmt.vcproj b/Build/source/libs/icu/icu-xetex/samples/numfmt/numfmt.vcproj
index af787cb4b89..af787cb4b89 100644
--- a/Build/source/libs/icu-xetex/samples/numfmt/numfmt.vcproj
+++ b/Build/source/libs/icu/icu-xetex/samples/numfmt/numfmt.vcproj
diff --git a/Build/source/libs/icu-xetex/samples/numfmt/readme.txt b/Build/source/libs/icu/icu-xetex/samples/numfmt/readme.txt
index d652d9b6b57..d652d9b6b57 100644
--- a/Build/source/libs/icu-xetex/samples/numfmt/readme.txt
+++ b/Build/source/libs/icu/icu-xetex/samples/numfmt/readme.txt
diff --git a/Build/source/libs/icu-xetex/samples/numfmt/util.cpp b/Build/source/libs/icu/icu-xetex/samples/numfmt/util.cpp
index b4025444991..b4025444991 100644
--- a/Build/source/libs/icu-xetex/samples/numfmt/util.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/numfmt/util.cpp
diff --git a/Build/source/libs/icu-xetex/samples/numfmt/util.h b/Build/source/libs/icu/icu-xetex/samples/numfmt/util.h
index e50ef7aae2c..e50ef7aae2c 100644
--- a/Build/source/libs/icu-xetex/samples/numfmt/util.h
+++ b/Build/source/libs/icu/icu-xetex/samples/numfmt/util.h
diff --git a/Build/source/libs/icu-xetex/samples/props/Makefile b/Build/source/libs/icu/icu-xetex/samples/props/Makefile
index 6d0a60b22dc..6d0a60b22dc 100644
--- a/Build/source/libs/icu-xetex/samples/props/Makefile
+++ b/Build/source/libs/icu/icu-xetex/samples/props/Makefile
diff --git a/Build/source/libs/icu-xetex/samples/props/props.cpp b/Build/source/libs/icu/icu-xetex/samples/props/props.cpp
index f60f26a63fd..f60f26a63fd 100644
--- a/Build/source/libs/icu-xetex/samples/props/props.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/props/props.cpp
diff --git a/Build/source/libs/icu-xetex/samples/props/props.sln b/Build/source/libs/icu/icu-xetex/samples/props/props.sln
index 843fc74f3ff..843fc74f3ff 100644
--- a/Build/source/libs/icu-xetex/samples/props/props.sln
+++ b/Build/source/libs/icu/icu-xetex/samples/props/props.sln
diff --git a/Build/source/libs/icu-xetex/samples/props/props.vcproj b/Build/source/libs/icu/icu-xetex/samples/props/props.vcproj
index 2d3d50ac2ec..2d3d50ac2ec 100644
--- a/Build/source/libs/icu-xetex/samples/props/props.vcproj
+++ b/Build/source/libs/icu/icu-xetex/samples/props/props.vcproj
diff --git a/Build/source/libs/icu-xetex/samples/props/readme.txt b/Build/source/libs/icu/icu-xetex/samples/props/readme.txt
index b80aa2575a4..b80aa2575a4 100644
--- a/Build/source/libs/icu-xetex/samples/props/readme.txt
+++ b/Build/source/libs/icu/icu-xetex/samples/props/readme.txt
diff --git a/Build/source/libs/icu-xetex/samples/readme.txt b/Build/source/libs/icu/icu-xetex/samples/readme.txt
index 3e4eda7a1b0..3e4eda7a1b0 100644
--- a/Build/source/libs/icu-xetex/samples/readme.txt
+++ b/Build/source/libs/icu/icu-xetex/samples/readme.txt
diff --git a/Build/source/libs/icu-xetex/samples/rules.mk b/Build/source/libs/icu/icu-xetex/samples/rules.mk
index 5d39b7c7eae..5d39b7c7eae 100644
--- a/Build/source/libs/icu-xetex/samples/rules.mk
+++ b/Build/source/libs/icu/icu-xetex/samples/rules.mk
diff --git a/Build/source/libs/icu-xetex/samples/strsrch/Makefile b/Build/source/libs/icu/icu-xetex/samples/strsrch/Makefile
index ffd211c061c..ffd211c061c 100644
--- a/Build/source/libs/icu-xetex/samples/strsrch/Makefile
+++ b/Build/source/libs/icu/icu-xetex/samples/strsrch/Makefile
diff --git a/Build/source/libs/icu-xetex/samples/strsrch/readme.txt b/Build/source/libs/icu/icu-xetex/samples/strsrch/readme.txt
index 589c7adf83b..589c7adf83b 100644
--- a/Build/source/libs/icu-xetex/samples/strsrch/readme.txt
+++ b/Build/source/libs/icu/icu-xetex/samples/strsrch/readme.txt
diff --git a/Build/source/libs/icu-xetex/samples/strsrch/strsrch.cpp b/Build/source/libs/icu/icu-xetex/samples/strsrch/strsrch.cpp
index 5054ceebdaf..5054ceebdaf 100644
--- a/Build/source/libs/icu-xetex/samples/strsrch/strsrch.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/strsrch/strsrch.cpp
diff --git a/Build/source/libs/icu-xetex/samples/strsrch/strsrch.sln b/Build/source/libs/icu/icu-xetex/samples/strsrch/strsrch.sln
index 89a7bfba5eb..89a7bfba5eb 100644
--- a/Build/source/libs/icu-xetex/samples/strsrch/strsrch.sln
+++ b/Build/source/libs/icu/icu-xetex/samples/strsrch/strsrch.sln
diff --git a/Build/source/libs/icu-xetex/samples/strsrch/strsrch.vcproj b/Build/source/libs/icu/icu-xetex/samples/strsrch/strsrch.vcproj
index 4bfec78d752..4bfec78d752 100644
--- a/Build/source/libs/icu-xetex/samples/strsrch/strsrch.vcproj
+++ b/Build/source/libs/icu/icu-xetex/samples/strsrch/strsrch.vcproj
diff --git a/Build/source/libs/icu-xetex/samples/translit/Makefile b/Build/source/libs/icu/icu-xetex/samples/translit/Makefile
index d7d2baf97e1..d7d2baf97e1 100644
--- a/Build/source/libs/icu-xetex/samples/translit/Makefile
+++ b/Build/source/libs/icu/icu-xetex/samples/translit/Makefile
diff --git a/Build/source/libs/icu-xetex/samples/translit/README.TXT b/Build/source/libs/icu/icu-xetex/samples/translit/README.TXT
index a7c44e6008c..a7c44e6008c 100644
--- a/Build/source/libs/icu-xetex/samples/translit/README.TXT
+++ b/Build/source/libs/icu/icu-xetex/samples/translit/README.TXT
diff --git a/Build/source/libs/icu-xetex/samples/translit/answers/main_1.cpp b/Build/source/libs/icu/icu-xetex/samples/translit/answers/main_1.cpp
index ba526eb675b..ba526eb675b 100644
--- a/Build/source/libs/icu-xetex/samples/translit/answers/main_1.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/translit/answers/main_1.cpp
diff --git a/Build/source/libs/icu-xetex/samples/translit/answers/main_2.cpp b/Build/source/libs/icu/icu-xetex/samples/translit/answers/main_2.cpp
index bf392d105a6..bf392d105a6 100644
--- a/Build/source/libs/icu-xetex/samples/translit/answers/main_2.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/translit/answers/main_2.cpp
diff --git a/Build/source/libs/icu-xetex/samples/translit/answers/main_3.cpp b/Build/source/libs/icu/icu-xetex/samples/translit/answers/main_3.cpp
index 93065a252a0..93065a252a0 100644
--- a/Build/source/libs/icu-xetex/samples/translit/answers/main_3.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/translit/answers/main_3.cpp
diff --git a/Build/source/libs/icu-xetex/samples/translit/answers/main_4.cpp b/Build/source/libs/icu/icu-xetex/samples/translit/answers/main_4.cpp
index 5b51cb5672c..5b51cb5672c 100644
--- a/Build/source/libs/icu-xetex/samples/translit/answers/main_4.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/translit/answers/main_4.cpp
diff --git a/Build/source/libs/icu-xetex/samples/translit/answers/unaccent.cpp b/Build/source/libs/icu/icu-xetex/samples/translit/answers/unaccent.cpp
index 8b9832d79b6..8b9832d79b6 100644
--- a/Build/source/libs/icu-xetex/samples/translit/answers/unaccent.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/translit/answers/unaccent.cpp
diff --git a/Build/source/libs/icu-xetex/samples/translit/answers/unaccent.h b/Build/source/libs/icu/icu-xetex/samples/translit/answers/unaccent.h
index 4cda092d58f..4cda092d58f 100644
--- a/Build/source/libs/icu-xetex/samples/translit/answers/unaccent.h
+++ b/Build/source/libs/icu/icu-xetex/samples/translit/answers/unaccent.h
diff --git a/Build/source/libs/icu-xetex/samples/translit/main.cpp b/Build/source/libs/icu/icu-xetex/samples/translit/main.cpp
index 5bf46717ff1..5bf46717ff1 100644
--- a/Build/source/libs/icu-xetex/samples/translit/main.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/translit/main.cpp
diff --git a/Build/source/libs/icu-xetex/samples/translit/translit.sln b/Build/source/libs/icu/icu-xetex/samples/translit/translit.sln
index 1addab69a9b..1addab69a9b 100644
--- a/Build/source/libs/icu-xetex/samples/translit/translit.sln
+++ b/Build/source/libs/icu/icu-xetex/samples/translit/translit.sln
diff --git a/Build/source/libs/icu-xetex/samples/translit/translit.vcproj b/Build/source/libs/icu/icu-xetex/samples/translit/translit.vcproj
index fb3904ee67a..fb3904ee67a 100644
--- a/Build/source/libs/icu-xetex/samples/translit/translit.vcproj
+++ b/Build/source/libs/icu/icu-xetex/samples/translit/translit.vcproj
diff --git a/Build/source/libs/icu-xetex/samples/translit/unaccent.cpp b/Build/source/libs/icu/icu-xetex/samples/translit/unaccent.cpp
index d3af7f35df7..d3af7f35df7 100644
--- a/Build/source/libs/icu-xetex/samples/translit/unaccent.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/translit/unaccent.cpp
diff --git a/Build/source/libs/icu-xetex/samples/translit/unaccent.h b/Build/source/libs/icu/icu-xetex/samples/translit/unaccent.h
index 10ee9d9096b..10ee9d9096b 100644
--- a/Build/source/libs/icu-xetex/samples/translit/unaccent.h
+++ b/Build/source/libs/icu/icu-xetex/samples/translit/unaccent.h
diff --git a/Build/source/libs/icu-xetex/samples/translit/util.cpp b/Build/source/libs/icu/icu-xetex/samples/translit/util.cpp
index 25a8f0224d4..25a8f0224d4 100644
--- a/Build/source/libs/icu-xetex/samples/translit/util.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/translit/util.cpp
diff --git a/Build/source/libs/icu-xetex/samples/translit/util.h b/Build/source/libs/icu/icu-xetex/samples/translit/util.h
index 2d9c4c724e2..2d9c4c724e2 100644
--- a/Build/source/libs/icu-xetex/samples/translit/util.h
+++ b/Build/source/libs/icu/icu-xetex/samples/translit/util.h
diff --git a/Build/source/libs/icu-xetex/samples/uciter8/Makefile b/Build/source/libs/icu/icu-xetex/samples/uciter8/Makefile
index d89eee2cc58..d89eee2cc58 100644
--- a/Build/source/libs/icu-xetex/samples/uciter8/Makefile
+++ b/Build/source/libs/icu/icu-xetex/samples/uciter8/Makefile
diff --git a/Build/source/libs/icu-xetex/samples/uciter8/readme.txt b/Build/source/libs/icu/icu-xetex/samples/uciter8/readme.txt
index 320154a2881..320154a2881 100644
--- a/Build/source/libs/icu-xetex/samples/uciter8/readme.txt
+++ b/Build/source/libs/icu/icu-xetex/samples/uciter8/readme.txt
diff --git a/Build/source/libs/icu-xetex/samples/uciter8/uciter8.c b/Build/source/libs/icu/icu-xetex/samples/uciter8/uciter8.c
index 6c705538f64..6c705538f64 100644
--- a/Build/source/libs/icu-xetex/samples/uciter8/uciter8.c
+++ b/Build/source/libs/icu/icu-xetex/samples/uciter8/uciter8.c
diff --git a/Build/source/libs/icu-xetex/samples/uciter8/uciter8.sln b/Build/source/libs/icu/icu-xetex/samples/uciter8/uciter8.sln
index 8ea4dc279c4..8ea4dc279c4 100644
--- a/Build/source/libs/icu-xetex/samples/uciter8/uciter8.sln
+++ b/Build/source/libs/icu/icu-xetex/samples/uciter8/uciter8.sln
diff --git a/Build/source/libs/icu-xetex/samples/uciter8/uciter8.vcproj b/Build/source/libs/icu/icu-xetex/samples/uciter8/uciter8.vcproj
index 0957f8009af..0957f8009af 100644
--- a/Build/source/libs/icu-xetex/samples/uciter8/uciter8.vcproj
+++ b/Build/source/libs/icu/icu-xetex/samples/uciter8/uciter8.vcproj
diff --git a/Build/source/libs/icu-xetex/samples/uciter8/uit_len8.c b/Build/source/libs/icu/icu-xetex/samples/uciter8/uit_len8.c
index 16fa487c642..16fa487c642 100644
--- a/Build/source/libs/icu-xetex/samples/uciter8/uit_len8.c
+++ b/Build/source/libs/icu/icu-xetex/samples/uciter8/uit_len8.c
diff --git a/Build/source/libs/icu-xetex/samples/uciter8/uit_len8.h b/Build/source/libs/icu/icu-xetex/samples/uciter8/uit_len8.h
index 35748ed4f5d..35748ed4f5d 100644
--- a/Build/source/libs/icu-xetex/samples/uciter8/uit_len8.h
+++ b/Build/source/libs/icu/icu-xetex/samples/uciter8/uit_len8.h
diff --git a/Build/source/libs/icu-xetex/samples/ucnv/Makefile b/Build/source/libs/icu/icu-xetex/samples/ucnv/Makefile
index 77536b9946b..77536b9946b 100644
--- a/Build/source/libs/icu-xetex/samples/ucnv/Makefile
+++ b/Build/source/libs/icu/icu-xetex/samples/ucnv/Makefile
diff --git a/Build/source/libs/icu-xetex/samples/ucnv/convsamp.cpp b/Build/source/libs/icu/icu-xetex/samples/ucnv/convsamp.cpp
index 70b43b6512b..70b43b6512b 100644
--- a/Build/source/libs/icu-xetex/samples/ucnv/convsamp.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/ucnv/convsamp.cpp
diff --git a/Build/source/libs/icu-xetex/samples/ucnv/data01.txt b/Build/source/libs/icu/icu-xetex/samples/ucnv/data01.txt
index 5b53359cd46..5b53359cd46 100644
--- a/Build/source/libs/icu-xetex/samples/ucnv/data01.txt
+++ b/Build/source/libs/icu/icu-xetex/samples/ucnv/data01.txt
diff --git a/Build/source/libs/icu-xetex/samples/ucnv/data02.bin b/Build/source/libs/icu/icu-xetex/samples/ucnv/data02.bin
index e1a5aad9e51..e1a5aad9e51 100644
--- a/Build/source/libs/icu-xetex/samples/ucnv/data02.bin
+++ b/Build/source/libs/icu/icu-xetex/samples/ucnv/data02.bin
diff --git a/Build/source/libs/icu-xetex/samples/ucnv/data06.txt b/Build/source/libs/icu/icu-xetex/samples/ucnv/data06.txt
index 1d7858e18b8..1d7858e18b8 100644
--- a/Build/source/libs/icu-xetex/samples/ucnv/data06.txt
+++ b/Build/source/libs/icu/icu-xetex/samples/ucnv/data06.txt
diff --git a/Build/source/libs/icu-xetex/samples/ucnv/flagcb.c b/Build/source/libs/icu/icu-xetex/samples/ucnv/flagcb.c
index 3344c73f2bc..3344c73f2bc 100644
--- a/Build/source/libs/icu-xetex/samples/ucnv/flagcb.c
+++ b/Build/source/libs/icu/icu-xetex/samples/ucnv/flagcb.c
diff --git a/Build/source/libs/icu-xetex/samples/ucnv/flagcb.h b/Build/source/libs/icu/icu-xetex/samples/ucnv/flagcb.h
index 4b1cba5a451..4b1cba5a451 100644
--- a/Build/source/libs/icu-xetex/samples/ucnv/flagcb.h
+++ b/Build/source/libs/icu/icu-xetex/samples/ucnv/flagcb.h
diff --git a/Build/source/libs/icu-xetex/samples/ucnv/readme.txt b/Build/source/libs/icu/icu-xetex/samples/ucnv/readme.txt
index 34c81ad6ff2..34c81ad6ff2 100644
--- a/Build/source/libs/icu-xetex/samples/ucnv/readme.txt
+++ b/Build/source/libs/icu/icu-xetex/samples/ucnv/readme.txt
diff --git a/Build/source/libs/icu-xetex/samples/ucnv/ucnv.sln b/Build/source/libs/icu/icu-xetex/samples/ucnv/ucnv.sln
index 9d22e6ab8cf..9d22e6ab8cf 100644
--- a/Build/source/libs/icu-xetex/samples/ucnv/ucnv.sln
+++ b/Build/source/libs/icu/icu-xetex/samples/ucnv/ucnv.sln
diff --git a/Build/source/libs/icu-xetex/samples/ucnv/ucnv.vcproj b/Build/source/libs/icu/icu-xetex/samples/ucnv/ucnv.vcproj
index 6da4a6c5a8c..6da4a6c5a8c 100644
--- a/Build/source/libs/icu-xetex/samples/ucnv/ucnv.vcproj
+++ b/Build/source/libs/icu/icu-xetex/samples/ucnv/ucnv.vcproj
diff --git a/Build/source/libs/icu-xetex/samples/udata/Makefile b/Build/source/libs/icu/icu-xetex/samples/udata/Makefile
index 30927fc9860..30927fc9860 100644
--- a/Build/source/libs/icu-xetex/samples/udata/Makefile
+++ b/Build/source/libs/icu/icu-xetex/samples/udata/Makefile
diff --git a/Build/source/libs/icu-xetex/samples/udata/reader.c b/Build/source/libs/icu/icu-xetex/samples/udata/reader.c
index 6cde9480335..6cde9480335 100644
--- a/Build/source/libs/icu-xetex/samples/udata/reader.c
+++ b/Build/source/libs/icu/icu-xetex/samples/udata/reader.c
diff --git a/Build/source/libs/icu-xetex/samples/udata/reader.vcproj b/Build/source/libs/icu/icu-xetex/samples/udata/reader.vcproj
index 2b393b9be23..2b393b9be23 100644
--- a/Build/source/libs/icu-xetex/samples/udata/reader.vcproj
+++ b/Build/source/libs/icu/icu-xetex/samples/udata/reader.vcproj
diff --git a/Build/source/libs/icu-xetex/samples/udata/readme.txt b/Build/source/libs/icu/icu-xetex/samples/udata/readme.txt
index baccf626d34..baccf626d34 100644
--- a/Build/source/libs/icu-xetex/samples/udata/readme.txt
+++ b/Build/source/libs/icu/icu-xetex/samples/udata/readme.txt
diff --git a/Build/source/libs/icu-xetex/samples/udata/udata.sln b/Build/source/libs/icu/icu-xetex/samples/udata/udata.sln
index 4a2e29ba8d4..4a2e29ba8d4 100644
--- a/Build/source/libs/icu-xetex/samples/udata/udata.sln
+++ b/Build/source/libs/icu/icu-xetex/samples/udata/udata.sln
diff --git a/Build/source/libs/icu-xetex/samples/udata/writer.c b/Build/source/libs/icu/icu-xetex/samples/udata/writer.c
index db0b758e458..db0b758e458 100644
--- a/Build/source/libs/icu-xetex/samples/udata/writer.c
+++ b/Build/source/libs/icu/icu-xetex/samples/udata/writer.c
diff --git a/Build/source/libs/icu-xetex/samples/udata/writer.vcproj b/Build/source/libs/icu/icu-xetex/samples/udata/writer.vcproj
index 2cecd0c3ddb..2cecd0c3ddb 100644
--- a/Build/source/libs/icu-xetex/samples/udata/writer.vcproj
+++ b/Build/source/libs/icu/icu-xetex/samples/udata/writer.vcproj
diff --git a/Build/source/libs/icu-xetex/samples/ufortune/Makefile b/Build/source/libs/icu/icu-xetex/samples/ufortune/Makefile
index 258959a8f5a..258959a8f5a 100644
--- a/Build/source/libs/icu-xetex/samples/ufortune/Makefile
+++ b/Build/source/libs/icu/icu-xetex/samples/ufortune/Makefile
diff --git a/Build/source/libs/icu-xetex/samples/ufortune/fortunedefs.mk b/Build/source/libs/icu/icu-xetex/samples/ufortune/fortunedefs.mk
index 2d52788b17f..2d52788b17f 100644
--- a/Build/source/libs/icu-xetex/samples/ufortune/fortunedefs.mk
+++ b/Build/source/libs/icu/icu-xetex/samples/ufortune/fortunedefs.mk
diff --git a/Build/source/libs/icu-xetex/samples/ufortune/readme.txt b/Build/source/libs/icu/icu-xetex/samples/ufortune/readme.txt
index 3ad4425453e..3ad4425453e 100644
--- a/Build/source/libs/icu-xetex/samples/ufortune/readme.txt
+++ b/Build/source/libs/icu/icu-xetex/samples/ufortune/readme.txt
diff --git a/Build/source/libs/icu-xetex/samples/ufortune/resources/Makefile b/Build/source/libs/icu/icu-xetex/samples/ufortune/resources/Makefile
index 998a7a82557..998a7a82557 100644
--- a/Build/source/libs/icu-xetex/samples/ufortune/resources/Makefile
+++ b/Build/source/libs/icu/icu-xetex/samples/ufortune/resources/Makefile
diff --git a/Build/source/libs/icu-xetex/samples/ufortune/resources/es.txt b/Build/source/libs/icu/icu-xetex/samples/ufortune/resources/es.txt
index 1500b70dd87..1500b70dd87 100644
--- a/Build/source/libs/icu-xetex/samples/ufortune/resources/es.txt
+++ b/Build/source/libs/icu/icu-xetex/samples/ufortune/resources/es.txt
diff --git a/Build/source/libs/icu-xetex/samples/ufortune/resources/fortune_resources.mak b/Build/source/libs/icu/icu-xetex/samples/ufortune/resources/fortune_resources.mak
index fd06568f99d..fd06568f99d 100644
--- a/Build/source/libs/icu-xetex/samples/ufortune/resources/fortune_resources.mak
+++ b/Build/source/libs/icu/icu-xetex/samples/ufortune/resources/fortune_resources.mak
diff --git a/Build/source/libs/icu-xetex/samples/ufortune/resources/res-file-list.txt b/Build/source/libs/icu/icu-xetex/samples/ufortune/resources/res-file-list.txt
index aa183e9dfb9..aa183e9dfb9 100644
--- a/Build/source/libs/icu-xetex/samples/ufortune/resources/res-file-list.txt
+++ b/Build/source/libs/icu/icu-xetex/samples/ufortune/resources/res-file-list.txt
diff --git a/Build/source/libs/icu-xetex/samples/ufortune/resources/root.txt b/Build/source/libs/icu/icu-xetex/samples/ufortune/resources/root.txt
index da6ccd778b6..da6ccd778b6 100644
--- a/Build/source/libs/icu-xetex/samples/ufortune/resources/root.txt
+++ b/Build/source/libs/icu/icu-xetex/samples/ufortune/resources/root.txt
diff --git a/Build/source/libs/icu-xetex/samples/ufortune/ufortune.c b/Build/source/libs/icu/icu-xetex/samples/ufortune/ufortune.c
index 1adf999009e..1adf999009e 100644
--- a/Build/source/libs/icu-xetex/samples/ufortune/ufortune.c
+++ b/Build/source/libs/icu/icu-xetex/samples/ufortune/ufortune.c
diff --git a/Build/source/libs/icu-xetex/samples/ufortune/ufortune.sln b/Build/source/libs/icu/icu-xetex/samples/ufortune/ufortune.sln
index 21e78f0821e..21e78f0821e 100644
--- a/Build/source/libs/icu-xetex/samples/ufortune/ufortune.sln
+++ b/Build/source/libs/icu/icu-xetex/samples/ufortune/ufortune.sln
diff --git a/Build/source/libs/icu-xetex/samples/ufortune/ufortune.vcproj b/Build/source/libs/icu/icu-xetex/samples/ufortune/ufortune.vcproj
index 5bfcba49ec1..5bfcba49ec1 100644
--- a/Build/source/libs/icu-xetex/samples/ufortune/ufortune.vcproj
+++ b/Build/source/libs/icu/icu-xetex/samples/ufortune/ufortune.vcproj
diff --git a/Build/source/libs/icu-xetex/samples/ugrep/Makefile b/Build/source/libs/icu/icu-xetex/samples/ugrep/Makefile
index d214ba74f3f..d214ba74f3f 100644
--- a/Build/source/libs/icu-xetex/samples/ugrep/Makefile
+++ b/Build/source/libs/icu/icu-xetex/samples/ugrep/Makefile
diff --git a/Build/source/libs/icu-xetex/samples/ugrep/readme.txt b/Build/source/libs/icu/icu-xetex/samples/ugrep/readme.txt
index c96fb03633a..c96fb03633a 100644
--- a/Build/source/libs/icu-xetex/samples/ugrep/readme.txt
+++ b/Build/source/libs/icu/icu-xetex/samples/ugrep/readme.txt
diff --git a/Build/source/libs/icu-xetex/samples/ugrep/ugrep.cpp b/Build/source/libs/icu/icu-xetex/samples/ugrep/ugrep.cpp
index 0eeba6802aa..0eeba6802aa 100644
--- a/Build/source/libs/icu-xetex/samples/ugrep/ugrep.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/ugrep/ugrep.cpp
diff --git a/Build/source/libs/icu-xetex/samples/ugrep/ugrep.sln b/Build/source/libs/icu/icu-xetex/samples/ugrep/ugrep.sln
index 511ba0c2011..511ba0c2011 100644
--- a/Build/source/libs/icu-xetex/samples/ugrep/ugrep.sln
+++ b/Build/source/libs/icu/icu-xetex/samples/ugrep/ugrep.sln
diff --git a/Build/source/libs/icu-xetex/samples/ugrep/ugrep.vcproj b/Build/source/libs/icu/icu-xetex/samples/ugrep/ugrep.vcproj
index 4860449559e..4860449559e 100644
--- a/Build/source/libs/icu-xetex/samples/ugrep/ugrep.vcproj
+++ b/Build/source/libs/icu/icu-xetex/samples/ugrep/ugrep.vcproj
diff --git a/Build/source/libs/icu-xetex/samples/uresb/Makefile b/Build/source/libs/icu/icu-xetex/samples/uresb/Makefile
index 488cdb7400d..488cdb7400d 100644
--- a/Build/source/libs/icu-xetex/samples/uresb/Makefile
+++ b/Build/source/libs/icu/icu-xetex/samples/uresb/Makefile
diff --git a/Build/source/libs/icu-xetex/samples/uresb/en.txt b/Build/source/libs/icu/icu-xetex/samples/uresb/en.txt
index 394d53c4a76..394d53c4a76 100644
--- a/Build/source/libs/icu-xetex/samples/uresb/en.txt
+++ b/Build/source/libs/icu/icu-xetex/samples/uresb/en.txt
diff --git a/Build/source/libs/icu-xetex/samples/uresb/readme.txt b/Build/source/libs/icu/icu-xetex/samples/uresb/readme.txt
index 362975f15ee..362975f15ee 100644
--- a/Build/source/libs/icu-xetex/samples/uresb/readme.txt
+++ b/Build/source/libs/icu/icu-xetex/samples/uresb/readme.txt
diff --git a/Build/source/libs/icu-xetex/samples/uresb/resources.mak b/Build/source/libs/icu/icu-xetex/samples/uresb/resources.mak
index 0c8225fb351..0c8225fb351 100644
--- a/Build/source/libs/icu-xetex/samples/uresb/resources.mak
+++ b/Build/source/libs/icu/icu-xetex/samples/uresb/resources.mak
diff --git a/Build/source/libs/icu-xetex/samples/uresb/resources.vcproj b/Build/source/libs/icu/icu-xetex/samples/uresb/resources.vcproj
index c1fc0e3f02e..c1fc0e3f02e 100644
--- a/Build/source/libs/icu-xetex/samples/uresb/resources.vcproj
+++ b/Build/source/libs/icu/icu-xetex/samples/uresb/resources.vcproj
diff --git a/Build/source/libs/icu-xetex/samples/uresb/root.txt b/Build/source/libs/icu/icu-xetex/samples/uresb/root.txt
index 8d45c73b950..8d45c73b950 100644
--- a/Build/source/libs/icu-xetex/samples/uresb/root.txt
+++ b/Build/source/libs/icu/icu-xetex/samples/uresb/root.txt
diff --git a/Build/source/libs/icu-xetex/samples/uresb/sr.txt b/Build/source/libs/icu/icu-xetex/samples/uresb/sr.txt
index 698d4fcb56a..698d4fcb56a 100644
--- a/Build/source/libs/icu-xetex/samples/uresb/sr.txt
+++ b/Build/source/libs/icu/icu-xetex/samples/uresb/sr.txt
diff --git a/Build/source/libs/icu-xetex/samples/uresb/uresb.c b/Build/source/libs/icu/icu-xetex/samples/uresb/uresb.c
index e1930503146..e1930503146 100644
--- a/Build/source/libs/icu-xetex/samples/uresb/uresb.c
+++ b/Build/source/libs/icu/icu-xetex/samples/uresb/uresb.c
diff --git a/Build/source/libs/icu-xetex/samples/uresb/uresb.sln b/Build/source/libs/icu/icu-xetex/samples/uresb/uresb.sln
index bd14ff5edfa..bd14ff5edfa 100644
--- a/Build/source/libs/icu-xetex/samples/uresb/uresb.sln
+++ b/Build/source/libs/icu/icu-xetex/samples/uresb/uresb.sln
diff --git a/Build/source/libs/icu-xetex/samples/uresb/uresb.vcproj b/Build/source/libs/icu/icu-xetex/samples/uresb/uresb.vcproj
index ade8dd4517c..ade8dd4517c 100644
--- a/Build/source/libs/icu-xetex/samples/uresb/uresb.vcproj
+++ b/Build/source/libs/icu/icu-xetex/samples/uresb/uresb.vcproj
diff --git a/Build/source/libs/icu-xetex/samples/ustring/Makefile b/Build/source/libs/icu/icu-xetex/samples/ustring/Makefile
index ff94488d229..ff94488d229 100644
--- a/Build/source/libs/icu-xetex/samples/ustring/Makefile
+++ b/Build/source/libs/icu/icu-xetex/samples/ustring/Makefile
diff --git a/Build/source/libs/icu-xetex/samples/ustring/readme.txt b/Build/source/libs/icu/icu-xetex/samples/ustring/readme.txt
index f713963b574..f713963b574 100644
--- a/Build/source/libs/icu-xetex/samples/ustring/readme.txt
+++ b/Build/source/libs/icu/icu-xetex/samples/ustring/readme.txt
diff --git a/Build/source/libs/icu-xetex/samples/ustring/ustring.cpp b/Build/source/libs/icu/icu-xetex/samples/ustring/ustring.cpp
index 52351e47d07..52351e47d07 100644
--- a/Build/source/libs/icu-xetex/samples/ustring/ustring.cpp
+++ b/Build/source/libs/icu/icu-xetex/samples/ustring/ustring.cpp
diff --git a/Build/source/libs/icu-xetex/samples/ustring/ustring.sln b/Build/source/libs/icu/icu-xetex/samples/ustring/ustring.sln
index 5ce665f90bd..5ce665f90bd 100644
--- a/Build/source/libs/icu-xetex/samples/ustring/ustring.sln
+++ b/Build/source/libs/icu/icu-xetex/samples/ustring/ustring.sln
diff --git a/Build/source/libs/icu-xetex/samples/ustring/ustring.vcproj b/Build/source/libs/icu/icu-xetex/samples/ustring/ustring.vcproj
index c95d6a191a2..c95d6a191a2 100644
--- a/Build/source/libs/icu-xetex/samples/ustring/ustring.vcproj
+++ b/Build/source/libs/icu/icu-xetex/samples/ustring/ustring.vcproj
diff --git a/Build/source/libs/icu-xetex/stubdata/Makefile.in b/Build/source/libs/icu/icu-xetex/stubdata/Makefile.in
index 168fe2ceb17..168fe2ceb17 100644
--- a/Build/source/libs/icu-xetex/stubdata/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/stubdata/Makefile.in
diff --git a/Build/source/libs/icu-xetex/stubdata/stubdata.c b/Build/source/libs/icu/icu-xetex/stubdata/stubdata.c
index 69a5876f706..69a5876f706 100644
--- a/Build/source/libs/icu-xetex/stubdata/stubdata.c
+++ b/Build/source/libs/icu/icu-xetex/stubdata/stubdata.c
diff --git a/Build/source/libs/icu-xetex/stubdata/stubdata.vcproj b/Build/source/libs/icu/icu-xetex/stubdata/stubdata.vcproj
index e193e8c2818..e193e8c2818 100644
--- a/Build/source/libs/icu-xetex/stubdata/stubdata.vcproj
+++ b/Build/source/libs/icu/icu-xetex/stubdata/stubdata.vcproj
diff --git a/Build/source/libs/icu-xetex/test/Makefile.in b/Build/source/libs/icu/icu-xetex/test/Makefile.in
index 07023095710..07023095710 100644
--- a/Build/source/libs/icu-xetex/test/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/test/Makefile.in
diff --git a/Build/source/libs/icu-xetex/test/cintltst/Makefile.in b/Build/source/libs/icu/icu-xetex/test/cintltst/Makefile.in
index 262b7abf1bc..262b7abf1bc 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/Makefile.in
diff --git a/Build/source/libs/icu-xetex/test/cintltst/bocu1tst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/bocu1tst.c
index 0616b1cff9e..0616b1cff9e 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/bocu1tst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/bocu1tst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/callcoll.c b/Build/source/libs/icu/icu-xetex/test/cintltst/callcoll.c
index d898eea25f2..d898eea25f2 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/callcoll.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/callcoll.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/callcoll.h b/Build/source/libs/icu/icu-xetex/test/cintltst/callcoll.h
index ae07b1257ab..ae07b1257ab 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/callcoll.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/callcoll.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/calldata.h b/Build/source/libs/icu/icu-xetex/test/cintltst/calldata.h
index 4d3cb3983d2..4d3cb3983d2 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/calldata.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/calldata.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/calltest.c b/Build/source/libs/icu/icu-xetex/test/cintltst/calltest.c
index 8e5f192dbe1..8e5f192dbe1 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/calltest.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/calltest.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/capitst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/capitst.c
index db1de56f54a..db1de56f54a 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/capitst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/capitst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/capitst.h b/Build/source/libs/icu/icu-xetex/test/cintltst/capitst.h
index 49f8b7533c6..49f8b7533c6 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/capitst.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/capitst.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cbiapts.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cbiapts.c
index fe597ae1857..fe597ae1857 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cbiapts.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cbiapts.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cbiapts.h b/Build/source/libs/icu/icu-xetex/test/cintltst/cbiapts.h
index ea6769fcf08..ea6769fcf08 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cbiapts.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cbiapts.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cbididat.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cbididat.c
index a73f3a74655..a73f3a74655 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cbididat.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cbididat.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cbiditst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cbiditst.c
index 517d219df33..517d219df33 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cbiditst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cbiditst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cbiditst.h b/Build/source/libs/icu/icu-xetex/test/cintltst/cbiditst.h
index afaffb27d48..afaffb27d48 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cbiditst.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cbiditst.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cbkittst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cbkittst.c
index 4d25865584d..4d25865584d 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cbkittst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cbkittst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/ccaltst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/ccaltst.c
index bc04ceffbf0..bc04ceffbf0 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/ccaltst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/ccaltst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/ccaltst.h b/Build/source/libs/icu/icu-xetex/test/cintltst/ccaltst.h
index e4ec3fdafe0..e4ec3fdafe0 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/ccaltst.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/ccaltst.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/ccapitst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/ccapitst.c
index 4864ccd6260..4864ccd6260 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/ccapitst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/ccapitst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/ccapitst.h b/Build/source/libs/icu/icu-xetex/test/cintltst/ccapitst.h
index a15dfc67d88..a15dfc67d88 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/ccapitst.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/ccapitst.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/ccolltst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/ccolltst.c
index c2e4fd93bc0..c2e4fd93bc0 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/ccolltst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/ccolltst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/ccolltst.h b/Build/source/libs/icu/icu-xetex/test/cintltst/ccolltst.h
index d3e7f51da3b..d3e7f51da3b 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/ccolltst.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/ccolltst.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cconvtst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cconvtst.c
index c4d431b72a9..c4d431b72a9 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cconvtst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cconvtst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cctest.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cctest.c
index c7085a12b6a..c7085a12b6a 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cctest.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cctest.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/ccurrtst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/ccurrtst.c
index a768be7c8e3..a768be7c8e3 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/ccurrtst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/ccurrtst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/ccurrtst.h b/Build/source/libs/icu/icu-xetex/test/cintltst/ccurrtst.h
index bec5e99815e..bec5e99815e 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/ccurrtst.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/ccurrtst.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cdattst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cdattst.c
index 0bdd4906dd3..0bdd4906dd3 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cdattst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cdattst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cdattst.h b/Build/source/libs/icu/icu-xetex/test/cintltst/cdattst.h
index 861a1087645..861a1087645 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cdattst.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cdattst.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cdetst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cdetst.c
index 6d53b74e602..6d53b74e602 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cdetst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cdetst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cdetst.h b/Build/source/libs/icu/icu-xetex/test/cintltst/cdetst.h
index 36696a5c2ec..36696a5c2ec 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cdetst.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cdetst.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cdtdptst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cdtdptst.c
index d19b7eedac4..d19b7eedac4 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cdtdptst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cdtdptst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cdtdptst.h b/Build/source/libs/icu/icu-xetex/test/cintltst/cdtdptst.h
index 11fd9e5faaa..11fd9e5faaa 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cdtdptst.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cdtdptst.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cdtrgtst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cdtrgtst.c
index 3ef0f780af0..3ef0f780af0 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cdtrgtst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cdtrgtst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cdtrgtst.h b/Build/source/libs/icu/icu-xetex/test/cintltst/cdtrgtst.h
index 18df92e5ed2..18df92e5ed2 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cdtrgtst.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cdtrgtst.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cestst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cestst.c
index 650143fb1bc..650143fb1bc 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cestst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cestst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cestst.h b/Build/source/libs/icu/icu-xetex/test/cintltst/cestst.h
index e15f32d4875..e15f32d4875 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cestst.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cestst.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cfintst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cfintst.c
index 3ab68dfde1a..3ab68dfde1a 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cfintst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cfintst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cfintst.h b/Build/source/libs/icu/icu-xetex/test/cintltst/cfintst.h
index 4edd517611e..4edd517611e 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cfintst.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cfintst.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cformtst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cformtst.c
index cbbcf1ff54a..cbbcf1ff54a 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cformtst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cformtst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cformtst.h b/Build/source/libs/icu/icu-xetex/test/cintltst/cformtst.h
index e5c0e44ccea..e5c0e44ccea 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cformtst.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cformtst.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cfrtst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cfrtst.c
index 63a01284f85..63a01284f85 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cfrtst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cfrtst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cfrtst.h b/Build/source/libs/icu/icu-xetex/test/cintltst/cfrtst.h
index 1fe136a3f88..1fe136a3f88 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cfrtst.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cfrtst.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cg7coll.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cg7coll.c
index a493450ee6c..a493450ee6c 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cg7coll.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cg7coll.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cg7coll.h b/Build/source/libs/icu/icu-xetex/test/cintltst/cg7coll.h
index d45461cdb12..d45461cdb12 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cg7coll.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cg7coll.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/chashtst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/chashtst.c
index c70ae2bca5d..c70ae2bca5d 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/chashtst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/chashtst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cintltst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cintltst.c
index 03efad93248..03efad93248 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cintltst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cintltst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cintltst.h b/Build/source/libs/icu/icu-xetex/test/cintltst/cintltst.h
index e750424b895..e750424b895 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cintltst.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cintltst.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cintltst.vcproj b/Build/source/libs/icu/icu-xetex/test/cintltst/cintltst.vcproj
index 65c4c1b935c..65c4c1b935c 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cintltst.vcproj
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cintltst.vcproj
diff --git a/Build/source/libs/icu-xetex/test/cintltst/citertst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/citertst.c
index dc24f4acea5..dc24f4acea5 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/citertst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/citertst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/citertst.h b/Build/source/libs/icu/icu-xetex/test/cintltst/citertst.h
index b810131c898..b810131c898 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/citertst.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/citertst.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cjaptst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cjaptst.c
index 7318e07cb93..7318e07cb93 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cjaptst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cjaptst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cjaptst.h b/Build/source/libs/icu/icu-xetex/test/cintltst/cjaptst.h
index 311976b706b..311976b706b 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cjaptst.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cjaptst.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cldrtest.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cldrtest.c
index b7ba4fe9b98..b7ba4fe9b98 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cldrtest.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cldrtest.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cloctst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cloctst.c
index d75fce50d0f..d75fce50d0f 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cloctst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cloctst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cloctst.h b/Build/source/libs/icu/icu-xetex/test/cintltst/cloctst.h
index c82fa356aed..c82fa356aed 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cloctst.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cloctst.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cmsccoll.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cmsccoll.c
index 89581eeebdb..89581eeebdb 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cmsccoll.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cmsccoll.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cmsgtst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cmsgtst.c
index 96e01877029..96e01877029 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cmsgtst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cmsgtst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cmsgtst.h b/Build/source/libs/icu/icu-xetex/test/cintltst/cmsgtst.h
index 6936283980e..6936283980e 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cmsgtst.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cmsgtst.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cnmdptst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cnmdptst.c
index 152351487b5..152351487b5 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cnmdptst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cnmdptst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cnmdptst.h b/Build/source/libs/icu/icu-xetex/test/cintltst/cnmdptst.h
index c437490fabf..c437490fabf 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cnmdptst.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cnmdptst.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cnormtst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cnormtst.c
index 99e6540386a..99e6540386a 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cnormtst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cnormtst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cnormtst.h b/Build/source/libs/icu/icu-xetex/test/cintltst/cnormtst.h
index bc213a486aa..bc213a486aa 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cnormtst.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cnormtst.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cnumtst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cnumtst.c
index 7a8df1f70b4..7a8df1f70b4 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cnumtst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cnumtst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cnumtst.h b/Build/source/libs/icu/icu-xetex/test/cintltst/cnumtst.h
index 93851dc733e..93851dc733e 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cnumtst.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cnumtst.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/colutil.c b/Build/source/libs/icu/icu-xetex/test/cintltst/colutil.c
index 8e9f3609118..8e9f3609118 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/colutil.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/colutil.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cposxtst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cposxtst.c
index 8d6d7b67278..8d6d7b67278 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cposxtst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cposxtst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/crestst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/crestst.c
index 1f5cf321aa3..1f5cf321aa3 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/crestst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/crestst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/crestst.h b/Build/source/libs/icu/icu-xetex/test/cintltst/crestst.h
index de11a959ddd..de11a959ddd 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/crestst.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/crestst.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/creststn.c b/Build/source/libs/icu/icu-xetex/test/cintltst/creststn.c
index 159235d4755..159235d4755 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/creststn.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/creststn.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/creststn.h b/Build/source/libs/icu/icu-xetex/test/cintltst/creststn.h
index f6becdb979c..f6becdb979c 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/creststn.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/creststn.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cstrcase.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cstrcase.c
index befc6d4dc2d..befc6d4dc2d 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cstrcase.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cstrcase.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cstrtest.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cstrtest.c
index ea6fe5cbeaa..ea6fe5cbeaa 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cstrtest.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cstrtest.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cturtst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cturtst.c
index c4a1767d0f9..c4a1767d0f9 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cturtst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cturtst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cturtst.h b/Build/source/libs/icu/icu-xetex/test/cintltst/cturtst.h
index 542a484fc0c..542a484fc0c 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cturtst.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cturtst.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cucdapi.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cucdapi.c
index f59acfef16c..f59acfef16c 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cucdapi.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cucdapi.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cucdapi.h b/Build/source/libs/icu/icu-xetex/test/cintltst/cucdapi.h
index a61b52da4f3..a61b52da4f3 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cucdapi.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cucdapi.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cucdtst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cucdtst.c
index f132d12e6f2..f132d12e6f2 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cucdtst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cucdtst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/currtest.c b/Build/source/libs/icu/icu-xetex/test/cintltst/currtest.c
index adce0854037..adce0854037 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/currtest.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/currtest.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/custrtrn.c b/Build/source/libs/icu/icu-xetex/test/cintltst/custrtrn.c
index 90cc00ae5c4..90cc00ae5c4 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/custrtrn.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/custrtrn.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/custrtst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/custrtst.c
index 76cae0be6d7..76cae0be6d7 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/custrtst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/custrtst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/cutiltst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/cutiltst.c
index 2bb339c6d96..2bb339c6d96 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/cutiltst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/cutiltst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/encoll.c b/Build/source/libs/icu/icu-xetex/test/cintltst/encoll.c
index 1c48eca45aa..1c48eca45aa 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/encoll.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/encoll.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/encoll.h b/Build/source/libs/icu/icu-xetex/test/cintltst/encoll.h
index 1102885a213..1102885a213 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/encoll.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/encoll.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/eurocreg.c b/Build/source/libs/icu/icu-xetex/test/cintltst/eurocreg.c
index 8e29d4c6815..8e29d4c6815 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/eurocreg.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/eurocreg.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/hpmufn.c b/Build/source/libs/icu/icu-xetex/test/cintltst/hpmufn.c
index 02cf1576cd3..02cf1576cd3 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/hpmufn.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/hpmufn.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/idnatest.c b/Build/source/libs/icu/icu-xetex/test/cintltst/idnatest.c
index 6196523087a..6196523087a 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/idnatest.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/idnatest.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/nccbtst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/nccbtst.c
index d82d37b9e6d..d82d37b9e6d 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/nccbtst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/nccbtst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/nccbtst.h b/Build/source/libs/icu/icu-xetex/test/cintltst/nccbtst.h
index ebce4ae8d2b..ebce4ae8d2b 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/nccbtst.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/nccbtst.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/ncnvfbts.c b/Build/source/libs/icu/icu-xetex/test/cintltst/ncnvfbts.c
index 2158bfd41c3..2158bfd41c3 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/ncnvfbts.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/ncnvfbts.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/ncnvfbts.h b/Build/source/libs/icu/icu-xetex/test/cintltst/ncnvfbts.h
index a47e141ccfc..a47e141ccfc 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/ncnvfbts.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/ncnvfbts.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/ncnvtst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/ncnvtst.c
index 2f56c15f88d..2f56c15f88d 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/ncnvtst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/ncnvtst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/nfsprep.c b/Build/source/libs/icu/icu-xetex/test/cintltst/nfsprep.c
index 61b11214beb..61b11214beb 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/nfsprep.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/nfsprep.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/nfsprep.h b/Build/source/libs/icu/icu-xetex/test/cintltst/nfsprep.h
index fe3e63d5429..fe3e63d5429 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/nfsprep.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/nfsprep.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/nucnvtst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/nucnvtst.c
index bdd84eb0023..bdd84eb0023 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/nucnvtst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/nucnvtst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/nucnvtst.h b/Build/source/libs/icu/icu-xetex/test/cintltst/nucnvtst.h
index e70bc08163f..e70bc08163f 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/nucnvtst.h
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/nucnvtst.h
diff --git a/Build/source/libs/icu-xetex/test/cintltst/putiltst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/putiltst.c
index e6cff642b23..e6cff642b23 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/putiltst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/putiltst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/reapits.c b/Build/source/libs/icu/icu-xetex/test/cintltst/reapits.c
index 74fe674f7dc..74fe674f7dc 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/reapits.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/reapits.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/sorttest.c b/Build/source/libs/icu/icu-xetex/test/cintltst/sorttest.c
index c99ce507196..c99ce507196 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/sorttest.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/sorttest.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/spreptst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/spreptst.c
index 1652984b520..1652984b520 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/spreptst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/spreptst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/sprpdata.c b/Build/source/libs/icu/icu-xetex/test/cintltst/sprpdata.c
index 0349541c4be..0349541c4be 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/sprpdata.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/sprpdata.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/stdnmtst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/stdnmtst.c
index 2da96145b3c..2da96145b3c 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/stdnmtst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/stdnmtst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/tracetst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/tracetst.c
index d61804482a1..d61804482a1 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/tracetst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/tracetst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/trietest.c b/Build/source/libs/icu/icu-xetex/test/cintltst/trietest.c
index c4a7c1733fc..c4a7c1733fc 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/trietest.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/trietest.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/ucsdetst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/ucsdetst.c
index 9bc18d329ea..9bc18d329ea 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/ucsdetst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/ucsdetst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/udatatst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/udatatst.c
index 73b8f089ca3..73b8f089ca3 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/udatatst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/udatatst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/udatpg_test.c b/Build/source/libs/icu/icu-xetex/test/cintltst/udatpg_test.c
index 34542b0bcda..34542b0bcda 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/udatpg_test.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/udatpg_test.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/uenumtst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/uenumtst.c
index 2d9ed6c0ab8..2d9ed6c0ab8 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/uenumtst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/uenumtst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/usettest.c b/Build/source/libs/icu/icu-xetex/test/cintltst/usettest.c
index fc2a3e9b055..fc2a3e9b055 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/usettest.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/usettest.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/usrchdat.c b/Build/source/libs/icu/icu-xetex/test/cintltst/usrchdat.c
index 7f79e770db9..7f79e770db9 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/usrchdat.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/usrchdat.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/usrchtst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/usrchtst.c
index 80a9f9247da..80a9f9247da 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/usrchtst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/usrchtst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/utexttst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/utexttst.c
index be5941df403..be5941df403 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/utexttst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/utexttst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/utf16tst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/utf16tst.c
index 38b8fb5fcc2..38b8fb5fcc2 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/utf16tst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/utf16tst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/utf8tst.c b/Build/source/libs/icu/icu-xetex/test/cintltst/utf8tst.c
index eaa8fb28c54..eaa8fb28c54 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/utf8tst.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/utf8tst.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/utmstest.c b/Build/source/libs/icu/icu-xetex/test/cintltst/utmstest.c
index 069a8039479..069a8039479 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/utmstest.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/utmstest.c
diff --git a/Build/source/libs/icu-xetex/test/cintltst/utransts.c b/Build/source/libs/icu/icu-xetex/test/cintltst/utransts.c
index ec99292aa9f..ec99292aa9f 100644
--- a/Build/source/libs/icu-xetex/test/cintltst/utransts.c
+++ b/Build/source/libs/icu/icu-xetex/test/cintltst/utransts.c
diff --git a/Build/source/libs/icu-xetex/test/compat/Makefile.in b/Build/source/libs/icu/icu-xetex/test/compat/Makefile.in
index af87cf8e8bd..af87cf8e8bd 100644
--- a/Build/source/libs/icu-xetex/test/compat/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/test/compat/Makefile.in
diff --git a/Build/source/libs/icu-xetex/test/compat/readme.txt b/Build/source/libs/icu/icu-xetex/test/compat/readme.txt
index 8d56675e97e..8d56675e97e 100644
--- a/Build/source/libs/icu-xetex/test/compat/readme.txt
+++ b/Build/source/libs/icu/icu-xetex/test/compat/readme.txt
diff --git a/Build/source/libs/icu-xetex/test/compat/tzdate.c b/Build/source/libs/icu/icu-xetex/test/compat/tzdate.c
index 2615a7630ad..2615a7630ad 100644
--- a/Build/source/libs/icu-xetex/test/compat/tzdate.c
+++ b/Build/source/libs/icu/icu-xetex/test/compat/tzdate.c
diff --git a/Build/source/libs/icu-xetex/test/compat/tzone.pl b/Build/source/libs/icu/icu-xetex/test/compat/tzone.pl
index 583c9812855..583c9812855 100755
--- a/Build/source/libs/icu-xetex/test/compat/tzone.pl
+++ b/Build/source/libs/icu/icu-xetex/test/compat/tzone.pl
diff --git a/Build/source/libs/icu-xetex/test/hdrtst/Makefile.in b/Build/source/libs/icu/icu-xetex/test/hdrtst/Makefile.in
index ff8d964b095..ff8d964b095 100644
--- a/Build/source/libs/icu-xetex/test/hdrtst/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/test/hdrtst/Makefile.in
diff --git a/Build/source/libs/icu-xetex/test/hdrtst/cxxfiles.txt b/Build/source/libs/icu/icu-xetex/test/hdrtst/cxxfiles.txt
index 1fbb604e122..1fbb604e122 100644
--- a/Build/source/libs/icu-xetex/test/hdrtst/cxxfiles.txt
+++ b/Build/source/libs/icu/icu-xetex/test/hdrtst/cxxfiles.txt
diff --git a/Build/source/libs/icu-xetex/test/hdrtst/dfiles.txt b/Build/source/libs/icu/icu-xetex/test/hdrtst/dfiles.txt
index ecc60dac51d..ecc60dac51d 100644
--- a/Build/source/libs/icu-xetex/test/hdrtst/dfiles.txt
+++ b/Build/source/libs/icu/icu-xetex/test/hdrtst/dfiles.txt
diff --git a/Build/source/libs/icu-xetex/test/hdrtst/pfiles.txt b/Build/source/libs/icu/icu-xetex/test/hdrtst/pfiles.txt
index 95502b7f8b5..95502b7f8b5 100644
--- a/Build/source/libs/icu-xetex/test/hdrtst/pfiles.txt
+++ b/Build/source/libs/icu/icu-xetex/test/hdrtst/pfiles.txt
diff --git a/Build/source/libs/icu-xetex/test/intltest/Makefile.in b/Build/source/libs/icu/icu-xetex/test/intltest/Makefile.in
index 27a0424b3bd..27a0424b3bd 100644
--- a/Build/source/libs/icu-xetex/test/intltest/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/Makefile.in
diff --git a/Build/source/libs/icu-xetex/test/intltest/aliastst.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/aliastst.cpp
index 3abb2959edb..3abb2959edb 100644
--- a/Build/source/libs/icu-xetex/test/intltest/aliastst.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/aliastst.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/aliastst.h b/Build/source/libs/icu/icu-xetex/test/intltest/aliastst.h
index e9a0db4638d..e9a0db4638d 100644
--- a/Build/source/libs/icu-xetex/test/intltest/aliastst.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/aliastst.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/allcoll.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/allcoll.cpp
index f7518f03078..f7518f03078 100644
--- a/Build/source/libs/icu-xetex/test/intltest/allcoll.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/allcoll.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/allcoll.h b/Build/source/libs/icu/icu-xetex/test/intltest/allcoll.h
index 040a7501f56..040a7501f56 100644
--- a/Build/source/libs/icu-xetex/test/intltest/allcoll.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/allcoll.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/apicoll.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/apicoll.cpp
index 0150f1a9198..0150f1a9198 100644
--- a/Build/source/libs/icu-xetex/test/intltest/apicoll.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/apicoll.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/apicoll.h b/Build/source/libs/icu/icu-xetex/test/intltest/apicoll.h
index f3a4d2a7fda..f3a4d2a7fda 100644
--- a/Build/source/libs/icu-xetex/test/intltest/apicoll.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/apicoll.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/astrotst.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/astrotst.cpp
index ba7b5711396..ba7b5711396 100644
--- a/Build/source/libs/icu-xetex/test/intltest/astrotst.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/astrotst.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/astrotst.h b/Build/source/libs/icu/icu-xetex/test/intltest/astrotst.h
index 2ca062cf9ea..2ca062cf9ea 100644
--- a/Build/source/libs/icu-xetex/test/intltest/astrotst.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/astrotst.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/calcasts.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/calcasts.cpp
index 5246808b194..5246808b194 100644
--- a/Build/source/libs/icu-xetex/test/intltest/calcasts.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/calcasts.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/calcasts.h b/Build/source/libs/icu/icu-xetex/test/intltest/calcasts.h
index 6085c229f70..6085c229f70 100644
--- a/Build/source/libs/icu-xetex/test/intltest/calcasts.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/calcasts.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/callimts.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/callimts.cpp
index 40ad122bf47..40ad122bf47 100644
--- a/Build/source/libs/icu-xetex/test/intltest/callimts.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/callimts.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/callimts.h b/Build/source/libs/icu/icu-xetex/test/intltest/callimts.h
index 9ef1af36b5b..9ef1af36b5b 100644
--- a/Build/source/libs/icu-xetex/test/intltest/callimts.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/callimts.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/calregts.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/calregts.cpp
index d5f8c670ac4..d5f8c670ac4 100644
--- a/Build/source/libs/icu-xetex/test/intltest/calregts.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/calregts.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/calregts.h b/Build/source/libs/icu/icu-xetex/test/intltest/calregts.h
index 7133ffa3b3a..7133ffa3b3a 100644
--- a/Build/source/libs/icu-xetex/test/intltest/calregts.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/calregts.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/caltest.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/caltest.cpp
index 070564fcd37..070564fcd37 100644
--- a/Build/source/libs/icu-xetex/test/intltest/caltest.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/caltest.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/caltest.h b/Build/source/libs/icu/icu-xetex/test/intltest/caltest.h
index 94ec73185d4..94ec73185d4 100644
--- a/Build/source/libs/icu-xetex/test/intltest/caltest.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/caltest.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/caltztst.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/caltztst.cpp
index 3d50ce954c2..3d50ce954c2 100644
--- a/Build/source/libs/icu-xetex/test/intltest/caltztst.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/caltztst.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/caltztst.h b/Build/source/libs/icu/icu-xetex/test/intltest/caltztst.h
index 60e8447d184..60e8447d184 100644
--- a/Build/source/libs/icu-xetex/test/intltest/caltztst.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/caltztst.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/canittst.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/canittst.cpp
index ed04269b6d6..ed04269b6d6 100644
--- a/Build/source/libs/icu-xetex/test/intltest/canittst.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/canittst.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/canittst.h b/Build/source/libs/icu/icu-xetex/test/intltest/canittst.h
index 650cc089db0..650cc089db0 100644
--- a/Build/source/libs/icu-xetex/test/intltest/canittst.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/canittst.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/citrtest.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/citrtest.cpp
index 75bd1e583f7..75bd1e583f7 100644
--- a/Build/source/libs/icu-xetex/test/intltest/citrtest.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/citrtest.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/citrtest.h b/Build/source/libs/icu/icu-xetex/test/intltest/citrtest.h
index 09521c76605..09521c76605 100644
--- a/Build/source/libs/icu-xetex/test/intltest/citrtest.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/citrtest.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/cntabcol.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/cntabcol.cpp
index 28f38cb6f79..28f38cb6f79 100644
--- a/Build/source/libs/icu-xetex/test/intltest/cntabcol.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/cntabcol.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/cntabcol.h b/Build/source/libs/icu/icu-xetex/test/intltest/cntabcol.h
index 0e35d7dec0c..0e35d7dec0c 100644
--- a/Build/source/libs/icu-xetex/test/intltest/cntabcol.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/cntabcol.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/convtest.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/convtest.cpp
index 909c951464f..909c951464f 100644
--- a/Build/source/libs/icu-xetex/test/intltest/convtest.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/convtest.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/convtest.h b/Build/source/libs/icu/icu-xetex/test/intltest/convtest.h
index 888bbc7038e..888bbc7038e 100644
--- a/Build/source/libs/icu-xetex/test/intltest/convtest.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/convtest.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/cpdtrtst.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/cpdtrtst.cpp
index d02ceed97be..d02ceed97be 100644
--- a/Build/source/libs/icu-xetex/test/intltest/cpdtrtst.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/cpdtrtst.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/cpdtrtst.h b/Build/source/libs/icu/icu-xetex/test/intltest/cpdtrtst.h
index 463a29ebe71..463a29ebe71 100644
--- a/Build/source/libs/icu-xetex/test/intltest/cpdtrtst.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/cpdtrtst.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/csdetest.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/csdetest.cpp
index 1f5992f778f..1f5992f778f 100644
--- a/Build/source/libs/icu-xetex/test/intltest/csdetest.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/csdetest.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/csdetest.h b/Build/source/libs/icu/icu-xetex/test/intltest/csdetest.h
index 223a640a57b..223a640a57b 100644
--- a/Build/source/libs/icu-xetex/test/intltest/csdetest.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/csdetest.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/currcoll.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/currcoll.cpp
index df5a15f8fda..df5a15f8fda 100644
--- a/Build/source/libs/icu-xetex/test/intltest/currcoll.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/currcoll.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/currcoll.h b/Build/source/libs/icu/icu-xetex/test/intltest/currcoll.h
index 85abec996ac..85abec996ac 100644
--- a/Build/source/libs/icu-xetex/test/intltest/currcoll.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/currcoll.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/dadrcal.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/dadrcal.cpp
index da2e567abcf..da2e567abcf 100644
--- a/Build/source/libs/icu-xetex/test/intltest/dadrcal.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/dadrcal.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/dadrcal.h b/Build/source/libs/icu/icu-xetex/test/intltest/dadrcal.h
index 3d59494ccc7..3d59494ccc7 100644
--- a/Build/source/libs/icu-xetex/test/intltest/dadrcal.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/dadrcal.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/dadrcoll.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/dadrcoll.cpp
index 1b993840de0..1b993840de0 100644
--- a/Build/source/libs/icu-xetex/test/intltest/dadrcoll.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/dadrcoll.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/dadrcoll.h b/Build/source/libs/icu/icu-xetex/test/intltest/dadrcoll.h
index b76f40db8d1..b76f40db8d1 100644
--- a/Build/source/libs/icu-xetex/test/intltest/dadrcoll.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/dadrcoll.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/dadrfmt.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/dadrfmt.cpp
index 94a12e21e15..94a12e21e15 100644
--- a/Build/source/libs/icu-xetex/test/intltest/dadrfmt.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/dadrfmt.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/dadrfmt.h b/Build/source/libs/icu/icu-xetex/test/intltest/dadrfmt.h
index 77f098bbe56..77f098bbe56 100644
--- a/Build/source/libs/icu-xetex/test/intltest/dadrfmt.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/dadrfmt.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/dcfmapts.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/dcfmapts.cpp
index 792385da664..792385da664 100644
--- a/Build/source/libs/icu-xetex/test/intltest/dcfmapts.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/dcfmapts.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/dcfmapts.h b/Build/source/libs/icu/icu-xetex/test/intltest/dcfmapts.h
index 841b7942d98..841b7942d98 100644
--- a/Build/source/libs/icu-xetex/test/intltest/dcfmapts.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/dcfmapts.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/decoll.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/decoll.cpp
index 0b84d2576aa..0b84d2576aa 100644
--- a/Build/source/libs/icu-xetex/test/intltest/decoll.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/decoll.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/decoll.h b/Build/source/libs/icu/icu-xetex/test/intltest/decoll.h
index 19513e1bf4f..19513e1bf4f 100644
--- a/Build/source/libs/icu-xetex/test/intltest/decoll.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/decoll.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/dtfmapts.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/dtfmapts.cpp
index db443f1e446..db443f1e446 100644
--- a/Build/source/libs/icu-xetex/test/intltest/dtfmapts.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/dtfmapts.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/dtfmapts.h b/Build/source/libs/icu/icu-xetex/test/intltest/dtfmapts.h
index e8a109a578b..e8a109a578b 100644
--- a/Build/source/libs/icu-xetex/test/intltest/dtfmapts.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/dtfmapts.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/dtfmrgts.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/dtfmrgts.cpp
index 96385f40176..96385f40176 100644
--- a/Build/source/libs/icu-xetex/test/intltest/dtfmrgts.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/dtfmrgts.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/dtfmrgts.h b/Build/source/libs/icu/icu-xetex/test/intltest/dtfmrgts.h
index 1a9762c79b5..1a9762c79b5 100644
--- a/Build/source/libs/icu-xetex/test/intltest/dtfmrgts.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/dtfmrgts.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/dtfmtrtts.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/dtfmtrtts.cpp
index 63f3479a6bb..63f3479a6bb 100644
--- a/Build/source/libs/icu-xetex/test/intltest/dtfmtrtts.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/dtfmtrtts.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/dtfmtrtts.h b/Build/source/libs/icu/icu-xetex/test/intltest/dtfmtrtts.h
index 1749d0e6826..1749d0e6826 100644
--- a/Build/source/libs/icu-xetex/test/intltest/dtfmtrtts.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/dtfmtrtts.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/dtfmttst.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/dtfmttst.cpp
index 82e8018420c..82e8018420c 100644
--- a/Build/source/libs/icu-xetex/test/intltest/dtfmttst.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/dtfmttst.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/dtfmttst.h b/Build/source/libs/icu/icu-xetex/test/intltest/dtfmttst.h
index 091c459786e..091c459786e 100644
--- a/Build/source/libs/icu-xetex/test/intltest/dtfmttst.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/dtfmttst.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/dtptngts.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/dtptngts.cpp
index 11dc9e601b7..11dc9e601b7 100644
--- a/Build/source/libs/icu-xetex/test/intltest/dtptngts.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/dtptngts.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/dtptngts.h b/Build/source/libs/icu/icu-xetex/test/intltest/dtptngts.h
index 6834c7d5b4a..6834c7d5b4a 100644
--- a/Build/source/libs/icu-xetex/test/intltest/dtptngts.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/dtptngts.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/encoll.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/encoll.cpp
index abaeb561573..abaeb561573 100644
--- a/Build/source/libs/icu-xetex/test/intltest/encoll.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/encoll.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/encoll.h b/Build/source/libs/icu/icu-xetex/test/intltest/encoll.h
index 06beb89dd29..06beb89dd29 100644
--- a/Build/source/libs/icu-xetex/test/intltest/encoll.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/encoll.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/escoll.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/escoll.cpp
index 152453bdaf0..152453bdaf0 100644
--- a/Build/source/libs/icu-xetex/test/intltest/escoll.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/escoll.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/escoll.h b/Build/source/libs/icu/icu-xetex/test/intltest/escoll.h
index 917e30af156..917e30af156 100644
--- a/Build/source/libs/icu-xetex/test/intltest/escoll.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/escoll.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/ficoll.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/ficoll.cpp
index b67f6348e57..b67f6348e57 100644
--- a/Build/source/libs/icu-xetex/test/intltest/ficoll.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/ficoll.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/ficoll.h b/Build/source/libs/icu/icu-xetex/test/intltest/ficoll.h
index 8c185f4eef7..8c185f4eef7 100644
--- a/Build/source/libs/icu-xetex/test/intltest/ficoll.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/ficoll.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/fldset.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/fldset.cpp
index aa3aa284796..aa3aa284796 100644
--- a/Build/source/libs/icu-xetex/test/intltest/fldset.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/fldset.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/fldset.h b/Build/source/libs/icu/icu-xetex/test/intltest/fldset.h
index d471b026c19..d471b026c19 100644
--- a/Build/source/libs/icu-xetex/test/intltest/fldset.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/fldset.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/frcoll.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/frcoll.cpp
index fd8702c6112..fd8702c6112 100644
--- a/Build/source/libs/icu-xetex/test/intltest/frcoll.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/frcoll.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/frcoll.h b/Build/source/libs/icu/icu-xetex/test/intltest/frcoll.h
index a8dfea12c35..a8dfea12c35 100644
--- a/Build/source/libs/icu-xetex/test/intltest/frcoll.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/frcoll.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/g7coll.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/g7coll.cpp
index cb8f5f8563c..cb8f5f8563c 100644
--- a/Build/source/libs/icu-xetex/test/intltest/g7coll.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/g7coll.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/g7coll.h b/Build/source/libs/icu/icu-xetex/test/intltest/g7coll.h
index cd3d0a13c11..cd3d0a13c11 100644
--- a/Build/source/libs/icu-xetex/test/intltest/g7coll.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/g7coll.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/icusvtst.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/icusvtst.cpp
index b3aff063ae1..b3aff063ae1 100644
--- a/Build/source/libs/icu-xetex/test/intltest/icusvtst.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/icusvtst.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/icusvtst.h b/Build/source/libs/icu/icu-xetex/test/intltest/icusvtst.h
index 21d1f6a4836..21d1f6a4836 100644
--- a/Build/source/libs/icu-xetex/test/intltest/icusvtst.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/icusvtst.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/idnaconf.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/idnaconf.cpp
index cf199438467..cf199438467 100644
--- a/Build/source/libs/icu-xetex/test/intltest/idnaconf.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/idnaconf.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/idnaconf.h b/Build/source/libs/icu/icu-xetex/test/intltest/idnaconf.h
index 35e9063ab87..35e9063ab87 100644
--- a/Build/source/libs/icu-xetex/test/intltest/idnaconf.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/idnaconf.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/idnaref.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/idnaref.cpp
index eabe1f56d3a..eabe1f56d3a 100644
--- a/Build/source/libs/icu-xetex/test/intltest/idnaref.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/idnaref.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/idnaref.h b/Build/source/libs/icu/icu-xetex/test/intltest/idnaref.h
index 78af44b6fd3..78af44b6fd3 100644
--- a/Build/source/libs/icu-xetex/test/intltest/idnaref.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/idnaref.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/incaltst.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/incaltst.cpp
index ecc7377ba35..ecc7377ba35 100644
--- a/Build/source/libs/icu-xetex/test/intltest/incaltst.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/incaltst.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/incaltst.h b/Build/source/libs/icu/icu-xetex/test/intltest/incaltst.h
index 2c03ce32313..2c03ce32313 100644
--- a/Build/source/libs/icu-xetex/test/intltest/incaltst.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/incaltst.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/intltest.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/intltest.cpp
index 2a676bb0d41..2a676bb0d41 100644
--- a/Build/source/libs/icu-xetex/test/intltest/intltest.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/intltest.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/intltest.h b/Build/source/libs/icu/icu-xetex/test/intltest/intltest.h
index 975893ba93d..975893ba93d 100644
--- a/Build/source/libs/icu-xetex/test/intltest/intltest.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/intltest.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/intltest.vcproj b/Build/source/libs/icu/icu-xetex/test/intltest/intltest.vcproj
index 7284d2e15e1..7284d2e15e1 100644
--- a/Build/source/libs/icu-xetex/test/intltest/intltest.vcproj
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/intltest.vcproj
diff --git a/Build/source/libs/icu-xetex/test/intltest/itercoll.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/itercoll.cpp
index 5a0078b1494..5a0078b1494 100644
--- a/Build/source/libs/icu-xetex/test/intltest/itercoll.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/itercoll.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/itercoll.h b/Build/source/libs/icu/icu-xetex/test/intltest/itercoll.h
index 747f80f6689..747f80f6689 100644
--- a/Build/source/libs/icu-xetex/test/intltest/itercoll.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/itercoll.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/itformat.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/itformat.cpp
index eb80bad7c14..eb80bad7c14 100644
--- a/Build/source/libs/icu-xetex/test/intltest/itformat.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/itformat.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/itformat.h b/Build/source/libs/icu/icu-xetex/test/intltest/itformat.h
index 1d5d92a57c9..1d5d92a57c9 100644
--- a/Build/source/libs/icu-xetex/test/intltest/itformat.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/itformat.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/itmajor.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/itmajor.cpp
index 97b89ea43cc..97b89ea43cc 100644
--- a/Build/source/libs/icu-xetex/test/intltest/itmajor.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/itmajor.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/itmajor.h b/Build/source/libs/icu/icu-xetex/test/intltest/itmajor.h
index 0527e159172..0527e159172 100644
--- a/Build/source/libs/icu-xetex/test/intltest/itmajor.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/itmajor.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/itrbbi.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/itrbbi.cpp
index 75f01cff0d5..75f01cff0d5 100644
--- a/Build/source/libs/icu-xetex/test/intltest/itrbbi.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/itrbbi.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/itrbbi.h b/Build/source/libs/icu/icu-xetex/test/intltest/itrbbi.h
index 86a2ac4251c..86a2ac4251c 100644
--- a/Build/source/libs/icu-xetex/test/intltest/itrbbi.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/itrbbi.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/itrbnf.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/itrbnf.cpp
index 58233a39255..58233a39255 100644
--- a/Build/source/libs/icu-xetex/test/intltest/itrbnf.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/itrbnf.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/itrbnf.h b/Build/source/libs/icu/icu-xetex/test/intltest/itrbnf.h
index 939077b4752..939077b4752 100644
--- a/Build/source/libs/icu-xetex/test/intltest/itrbnf.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/itrbnf.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/itrbnfp.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/itrbnfp.cpp
index 907647875cd..907647875cd 100644
--- a/Build/source/libs/icu-xetex/test/intltest/itrbnfp.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/itrbnfp.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/itrbnfp.h b/Build/source/libs/icu/icu-xetex/test/intltest/itrbnfp.h
index c767ff195f8..c767ff195f8 100644
--- a/Build/source/libs/icu-xetex/test/intltest/itrbnfp.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/itrbnfp.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/itrbnfrt.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/itrbnfrt.cpp
index 515b351d945..515b351d945 100644
--- a/Build/source/libs/icu-xetex/test/intltest/itrbnfrt.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/itrbnfrt.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/itrbnfrt.h b/Build/source/libs/icu/icu-xetex/test/intltest/itrbnfrt.h
index 70bf23f6f5f..70bf23f6f5f 100644
--- a/Build/source/libs/icu-xetex/test/intltest/itrbnfrt.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/itrbnfrt.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/ittrans.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/ittrans.cpp
index 467ced423a1..467ced423a1 100644
--- a/Build/source/libs/icu-xetex/test/intltest/ittrans.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/ittrans.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/ittrans.h b/Build/source/libs/icu/icu-xetex/test/intltest/ittrans.h
index 4f4fb38dbb7..4f4fb38dbb7 100644
--- a/Build/source/libs/icu-xetex/test/intltest/ittrans.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/ittrans.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/itutil.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/itutil.cpp
index 218c1c83049..218c1c83049 100644
--- a/Build/source/libs/icu-xetex/test/intltest/itutil.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/itutil.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/itutil.h b/Build/source/libs/icu/icu-xetex/test/intltest/itutil.h
index e2dd8e10e3c..e2dd8e10e3c 100644
--- a/Build/source/libs/icu-xetex/test/intltest/itutil.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/itutil.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/jacoll.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/jacoll.cpp
index 8c8c3d67d58..8c8c3d67d58 100644
--- a/Build/source/libs/icu-xetex/test/intltest/jacoll.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/jacoll.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/jacoll.h b/Build/source/libs/icu/icu-xetex/test/intltest/jacoll.h
index 96a6ae1fd7e..96a6ae1fd7e 100644
--- a/Build/source/libs/icu-xetex/test/intltest/jacoll.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/jacoll.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/jamotest.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/jamotest.cpp
index 635794101d3..635794101d3 100644
--- a/Build/source/libs/icu-xetex/test/intltest/jamotest.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/jamotest.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/jamotest.h b/Build/source/libs/icu/icu-xetex/test/intltest/jamotest.h
index f6dbfd7c216..f6dbfd7c216 100644
--- a/Build/source/libs/icu-xetex/test/intltest/jamotest.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/jamotest.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/lcukocol.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/lcukocol.cpp
index f48ebd957f6..f48ebd957f6 100644
--- a/Build/source/libs/icu-xetex/test/intltest/lcukocol.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/lcukocol.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/lcukocol.h b/Build/source/libs/icu/icu-xetex/test/intltest/lcukocol.h
index c690c5b65e6..c690c5b65e6 100644
--- a/Build/source/libs/icu-xetex/test/intltest/lcukocol.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/lcukocol.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/loctest.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/loctest.cpp
index 1ce08214ade..1ce08214ade 100644
--- a/Build/source/libs/icu-xetex/test/intltest/loctest.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/loctest.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/loctest.h b/Build/source/libs/icu/icu-xetex/test/intltest/loctest.h
index c01d15ecb25..c01d15ecb25 100644
--- a/Build/source/libs/icu-xetex/test/intltest/loctest.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/loctest.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/miscdtfm.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/miscdtfm.cpp
index 36b9357a96b..36b9357a96b 100644
--- a/Build/source/libs/icu-xetex/test/intltest/miscdtfm.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/miscdtfm.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/miscdtfm.h b/Build/source/libs/icu/icu-xetex/test/intltest/miscdtfm.h
index 992e89a71aa..992e89a71aa 100644
--- a/Build/source/libs/icu-xetex/test/intltest/miscdtfm.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/miscdtfm.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/mnkytst.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/mnkytst.cpp
index ce26669a91a..ce26669a91a 100644
--- a/Build/source/libs/icu-xetex/test/intltest/mnkytst.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/mnkytst.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/mnkytst.h b/Build/source/libs/icu/icu-xetex/test/intltest/mnkytst.h
index e13c497cb20..e13c497cb20 100644
--- a/Build/source/libs/icu-xetex/test/intltest/mnkytst.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/mnkytst.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/msfmrgts.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/msfmrgts.cpp
index 97465a09be7..97465a09be7 100644
--- a/Build/source/libs/icu-xetex/test/intltest/msfmrgts.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/msfmrgts.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/msfmrgts.h b/Build/source/libs/icu/icu-xetex/test/intltest/msfmrgts.h
index e9e45218a70..e9e45218a70 100644
--- a/Build/source/libs/icu-xetex/test/intltest/msfmrgts.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/msfmrgts.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/nmfmapts.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/nmfmapts.cpp
index 117b2ed3159..117b2ed3159 100644
--- a/Build/source/libs/icu-xetex/test/intltest/nmfmapts.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/nmfmapts.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/nmfmapts.h b/Build/source/libs/icu/icu-xetex/test/intltest/nmfmapts.h
index a2bcae2381d..a2bcae2381d 100644
--- a/Build/source/libs/icu-xetex/test/intltest/nmfmapts.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/nmfmapts.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/nmfmtrt.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/nmfmtrt.cpp
index 580918aec8e..580918aec8e 100644
--- a/Build/source/libs/icu-xetex/test/intltest/nmfmtrt.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/nmfmtrt.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/nmfmtrt.h b/Build/source/libs/icu/icu-xetex/test/intltest/nmfmtrt.h
index 12eff9a29d8..12eff9a29d8 100644
--- a/Build/source/libs/icu-xetex/test/intltest/nmfmtrt.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/nmfmtrt.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/normconf.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/normconf.cpp
index c7a530dac9d..c7a530dac9d 100644
--- a/Build/source/libs/icu-xetex/test/intltest/normconf.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/normconf.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/normconf.h b/Build/source/libs/icu/icu-xetex/test/intltest/normconf.h
index 472c2dfd61f..472c2dfd61f 100644
--- a/Build/source/libs/icu-xetex/test/intltest/normconf.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/normconf.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/nptrans.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/nptrans.cpp
index eae8db5d59e..eae8db5d59e 100644
--- a/Build/source/libs/icu-xetex/test/intltest/nptrans.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/nptrans.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/nptrans.h b/Build/source/libs/icu/icu-xetex/test/intltest/nptrans.h
index ece53e3e8fd..ece53e3e8fd 100644
--- a/Build/source/libs/icu-xetex/test/intltest/nptrans.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/nptrans.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/numfmtst.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/numfmtst.cpp
index 14d8f113ce6..14d8f113ce6 100644
--- a/Build/source/libs/icu-xetex/test/intltest/numfmtst.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/numfmtst.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/numfmtst.h b/Build/source/libs/icu/icu-xetex/test/intltest/numfmtst.h
index 80baa1456e3..80baa1456e3 100644
--- a/Build/source/libs/icu-xetex/test/intltest/numfmtst.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/numfmtst.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/numrgts.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/numrgts.cpp
index e93eb5ce1d6..e93eb5ce1d6 100644
--- a/Build/source/libs/icu-xetex/test/intltest/numrgts.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/numrgts.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/numrgts.h b/Build/source/libs/icu/icu-xetex/test/intltest/numrgts.h
index e20141cd2a4..e20141cd2a4 100644
--- a/Build/source/libs/icu-xetex/test/intltest/numrgts.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/numrgts.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/pptest.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/pptest.cpp
index 2159183b17a..2159183b17a 100644
--- a/Build/source/libs/icu-xetex/test/intltest/pptest.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/pptest.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/pptest.h b/Build/source/libs/icu/icu-xetex/test/intltest/pptest.h
index 5bad9b1dc63..5bad9b1dc63 100644
--- a/Build/source/libs/icu-xetex/test/intltest/pptest.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/pptest.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/punyref.c b/Build/source/libs/icu/icu-xetex/test/intltest/punyref.c
index c61a8b61371..c61a8b61371 100644
--- a/Build/source/libs/icu-xetex/test/intltest/punyref.c
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/punyref.c
diff --git a/Build/source/libs/icu-xetex/test/intltest/punyref.h b/Build/source/libs/icu/icu-xetex/test/intltest/punyref.h
index 138446bcc06..138446bcc06 100644
--- a/Build/source/libs/icu-xetex/test/intltest/punyref.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/punyref.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/rbbiapts.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/rbbiapts.cpp
index 36305991862..36305991862 100644
--- a/Build/source/libs/icu-xetex/test/intltest/rbbiapts.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/rbbiapts.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/rbbiapts.h b/Build/source/libs/icu/icu-xetex/test/intltest/rbbiapts.h
index ae759248cea..ae759248cea 100644
--- a/Build/source/libs/icu-xetex/test/intltest/rbbiapts.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/rbbiapts.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/rbbitst.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/rbbitst.cpp
index 4a2453f0b5a..4a2453f0b5a 100644
--- a/Build/source/libs/icu-xetex/test/intltest/rbbitst.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/rbbitst.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/rbbitst.h b/Build/source/libs/icu/icu-xetex/test/intltest/rbbitst.h
index d625c4a42be..d625c4a42be 100644
--- a/Build/source/libs/icu-xetex/test/intltest/rbbitst.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/rbbitst.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/regcoll.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/regcoll.cpp
index 074f678be24..074f678be24 100644
--- a/Build/source/libs/icu-xetex/test/intltest/regcoll.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/regcoll.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/regcoll.h b/Build/source/libs/icu/icu-xetex/test/intltest/regcoll.h
index a9a90e22018..a9a90e22018 100644
--- a/Build/source/libs/icu-xetex/test/intltest/regcoll.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/regcoll.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/regextst.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/regextst.cpp
index 04b437a4a94..04b437a4a94 100644
--- a/Build/source/libs/icu-xetex/test/intltest/regextst.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/regextst.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/regextst.h b/Build/source/libs/icu/icu-xetex/test/intltest/regextst.h
index 6636a622d48..6636a622d48 100644
--- a/Build/source/libs/icu-xetex/test/intltest/regextst.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/regextst.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/reptest.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/reptest.cpp
index d203fed5347..d203fed5347 100644
--- a/Build/source/libs/icu-xetex/test/intltest/reptest.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/reptest.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/reptest.h b/Build/source/libs/icu/icu-xetex/test/intltest/reptest.h
index 4ab39412c30..4ab39412c30 100644
--- a/Build/source/libs/icu-xetex/test/intltest/reptest.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/reptest.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/restest.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/restest.cpp
index 3250303c238..3250303c238 100644
--- a/Build/source/libs/icu-xetex/test/intltest/restest.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/restest.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/restest.h b/Build/source/libs/icu/icu-xetex/test/intltest/restest.h
index 78ee08d9822..78ee08d9822 100644
--- a/Build/source/libs/icu-xetex/test/intltest/restest.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/restest.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/restsnew.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/restsnew.cpp
index 3bb62459bef..3bb62459bef 100644
--- a/Build/source/libs/icu-xetex/test/intltest/restsnew.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/restsnew.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/restsnew.h b/Build/source/libs/icu/icu-xetex/test/intltest/restsnew.h
index efc850c7faf..efc850c7faf 100644
--- a/Build/source/libs/icu-xetex/test/intltest/restsnew.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/restsnew.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/rndmcoll.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/rndmcoll.cpp
index be15570c67b..be15570c67b 100644
--- a/Build/source/libs/icu-xetex/test/intltest/rndmcoll.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/rndmcoll.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/rndmcoll.h b/Build/source/libs/icu/icu-xetex/test/intltest/rndmcoll.h
index d216af3b1f7..d216af3b1f7 100644
--- a/Build/source/libs/icu-xetex/test/intltest/rndmcoll.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/rndmcoll.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/sdtfmtts.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/sdtfmtts.cpp
index 064acba30ab..064acba30ab 100644
--- a/Build/source/libs/icu-xetex/test/intltest/sdtfmtts.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/sdtfmtts.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/sdtfmtts.h b/Build/source/libs/icu/icu-xetex/test/intltest/sdtfmtts.h
index c9ecd374857..c9ecd374857 100644
--- a/Build/source/libs/icu-xetex/test/intltest/sdtfmtts.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/sdtfmtts.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/sfwdchit.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/sfwdchit.cpp
index 703a4858e60..703a4858e60 100644
--- a/Build/source/libs/icu-xetex/test/intltest/sfwdchit.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/sfwdchit.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/sfwdchit.h b/Build/source/libs/icu/icu-xetex/test/intltest/sfwdchit.h
index 71fbd00ce26..71fbd00ce26 100644
--- a/Build/source/libs/icu-xetex/test/intltest/sfwdchit.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/sfwdchit.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/srchtest.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/srchtest.cpp
index cde9da4bdd3..cde9da4bdd3 100644
--- a/Build/source/libs/icu-xetex/test/intltest/srchtest.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/srchtest.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/srchtest.h b/Build/source/libs/icu/icu-xetex/test/intltest/srchtest.h
index e27ec620bb0..e27ec620bb0 100644
--- a/Build/source/libs/icu-xetex/test/intltest/srchtest.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/srchtest.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/strcase.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/strcase.cpp
index 0645f1269ce..0645f1269ce 100644
--- a/Build/source/libs/icu-xetex/test/intltest/strcase.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/strcase.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/strtest.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/strtest.cpp
index 97620c921ff..97620c921ff 100644
--- a/Build/source/libs/icu-xetex/test/intltest/strtest.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/strtest.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/strtest.h b/Build/source/libs/icu/icu-xetex/test/intltest/strtest.h
index 5f342e10980..5f342e10980 100644
--- a/Build/source/libs/icu-xetex/test/intltest/strtest.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/strtest.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/svccoll.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/svccoll.cpp
index 4c1db47406b..4c1db47406b 100644
--- a/Build/source/libs/icu-xetex/test/intltest/svccoll.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/svccoll.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/svccoll.h b/Build/source/libs/icu/icu-xetex/test/intltest/svccoll.h
index 3967f104ce8..3967f104ce8 100644
--- a/Build/source/libs/icu-xetex/test/intltest/svccoll.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/svccoll.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/tchcfmt.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/tchcfmt.cpp
index 82d237d5102..82d237d5102 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tchcfmt.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tchcfmt.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/tchcfmt.h b/Build/source/libs/icu/icu-xetex/test/intltest/tchcfmt.h
index ade2027a52f..ade2027a52f 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tchcfmt.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tchcfmt.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/testidn.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/testidn.cpp
index e1f627735db..e1f627735db 100644
--- a/Build/source/libs/icu-xetex/test/intltest/testidn.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/testidn.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/testidna.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/testidna.cpp
index d4d7a8d2a24..d4d7a8d2a24 100644
--- a/Build/source/libs/icu-xetex/test/intltest/testidna.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/testidna.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/testidna.h b/Build/source/libs/icu/icu-xetex/test/intltest/testidna.h
index 58567df59fd..58567df59fd 100644
--- a/Build/source/libs/icu-xetex/test/intltest/testidna.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/testidna.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/testutil.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/testutil.cpp
index 56ec038ab4a..56ec038ab4a 100644
--- a/Build/source/libs/icu-xetex/test/intltest/testutil.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/testutil.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/testutil.h b/Build/source/libs/icu/icu-xetex/test/intltest/testutil.h
index 9c14a2860b9..9c14a2860b9 100644
--- a/Build/source/libs/icu-xetex/test/intltest/testutil.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/testutil.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/textfile.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/textfile.cpp
index fe193b0fcbd..fe193b0fcbd 100644
--- a/Build/source/libs/icu-xetex/test/intltest/textfile.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/textfile.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/textfile.h b/Build/source/libs/icu/icu-xetex/test/intltest/textfile.h
index 3fcea074abc..3fcea074abc 100644
--- a/Build/source/libs/icu-xetex/test/intltest/textfile.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/textfile.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/tfsmalls.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/tfsmalls.cpp
index 6cc69a01210..6cc69a01210 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tfsmalls.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tfsmalls.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/tfsmalls.h b/Build/source/libs/icu/icu-xetex/test/intltest/tfsmalls.h
index 26f13279bb3..26f13279bb3 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tfsmalls.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tfsmalls.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/thcoll.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/thcoll.cpp
index 1fd99e7fb24..1fd99e7fb24 100644
--- a/Build/source/libs/icu-xetex/test/intltest/thcoll.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/thcoll.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/thcoll.h b/Build/source/libs/icu/icu-xetex/test/intltest/thcoll.h
index 2b10c201118..2b10c201118 100644
--- a/Build/source/libs/icu-xetex/test/intltest/thcoll.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/thcoll.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/tmsgfmt.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/tmsgfmt.cpp
index aef0179f167..aef0179f167 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tmsgfmt.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tmsgfmt.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/tmsgfmt.h b/Build/source/libs/icu/icu-xetex/test/intltest/tmsgfmt.h
index 5534dadfe14..5534dadfe14 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tmsgfmt.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tmsgfmt.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/tokiter.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/tokiter.cpp
index 202cbd93e3d..202cbd93e3d 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tokiter.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tokiter.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/tokiter.h b/Build/source/libs/icu/icu-xetex/test/intltest/tokiter.h
index 5db5753ae4d..5db5753ae4d 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tokiter.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tokiter.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/transapi.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/transapi.cpp
index faf995c16fc..faf995c16fc 100644
--- a/Build/source/libs/icu-xetex/test/intltest/transapi.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/transapi.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/transapi.h b/Build/source/libs/icu/icu-xetex/test/intltest/transapi.h
index 5dca65efc80..5dca65efc80 100644
--- a/Build/source/libs/icu-xetex/test/intltest/transapi.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/transapi.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/transrt.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/transrt.cpp
index 66afa048c90..66afa048c90 100644
--- a/Build/source/libs/icu-xetex/test/intltest/transrt.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/transrt.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/transrt.h b/Build/source/libs/icu/icu-xetex/test/intltest/transrt.h
index 196ad7d97b1..196ad7d97b1 100644
--- a/Build/source/libs/icu-xetex/test/intltest/transrt.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/transrt.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/transtst.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/transtst.cpp
index 9b9ef81a6b0..9b9ef81a6b0 100644
--- a/Build/source/libs/icu-xetex/test/intltest/transtst.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/transtst.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/transtst.h b/Build/source/libs/icu/icu-xetex/test/intltest/transtst.h
index 0a6eef78c40..0a6eef78c40 100644
--- a/Build/source/libs/icu-xetex/test/intltest/transtst.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/transtst.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/trcoll.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/trcoll.cpp
index 7da003a8ca3..7da003a8ca3 100644
--- a/Build/source/libs/icu-xetex/test/intltest/trcoll.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/trcoll.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/trcoll.h b/Build/source/libs/icu/icu-xetex/test/intltest/trcoll.h
index 4ab553e2621..4ab553e2621 100644
--- a/Build/source/libs/icu-xetex/test/intltest/trcoll.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/trcoll.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/trnserr.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/trnserr.cpp
index 40f41850f07..40f41850f07 100644
--- a/Build/source/libs/icu-xetex/test/intltest/trnserr.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/trnserr.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/trnserr.h b/Build/source/libs/icu/icu-xetex/test/intltest/trnserr.h
index 35b4c5a4bd6..35b4c5a4bd6 100644
--- a/Build/source/libs/icu-xetex/test/intltest/trnserr.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/trnserr.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/tscoll.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/tscoll.cpp
index 4c65e670ae3..4c65e670ae3 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tscoll.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tscoll.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/tscoll.h b/Build/source/libs/icu/icu-xetex/test/intltest/tscoll.h
index b3de70f3628..b3de70f3628 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tscoll.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tscoll.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/tsdate.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/tsdate.cpp
index 00f740ec0a1..00f740ec0a1 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tsdate.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tsdate.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/tsdate.h b/Build/source/libs/icu/icu-xetex/test/intltest/tsdate.h
index 2707bacde24..2707bacde24 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tsdate.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tsdate.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/tsdcfmsy.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/tsdcfmsy.cpp
index e243eec1a1f..e243eec1a1f 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tsdcfmsy.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tsdcfmsy.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/tsdcfmsy.h b/Build/source/libs/icu/icu-xetex/test/intltest/tsdcfmsy.h
index 828d0f434ad..828d0f434ad 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tsdcfmsy.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tsdcfmsy.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/tsdtfmsy.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/tsdtfmsy.cpp
index 3aae499398e..3aae499398e 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tsdtfmsy.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tsdtfmsy.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/tsdtfmsy.h b/Build/source/libs/icu/icu-xetex/test/intltest/tsdtfmsy.h
index d289ba4f751..d289ba4f751 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tsdtfmsy.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tsdtfmsy.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/tsmthred.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/tsmthred.cpp
index 3dd8e3da980..3dd8e3da980 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tsmthred.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tsmthred.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/tsmthred.h b/Build/source/libs/icu/icu-xetex/test/intltest/tsmthred.h
index f2f990608f9..f2f990608f9 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tsmthred.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tsmthred.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/tsnmfmt.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/tsnmfmt.cpp
index 57d49ecce4c..57d49ecce4c 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tsnmfmt.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tsnmfmt.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/tsnmfmt.h b/Build/source/libs/icu/icu-xetex/test/intltest/tsnmfmt.h
index 076a464467d..076a464467d 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tsnmfmt.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tsnmfmt.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/tsputil.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/tsputil.cpp
index 1f4b66ee218..1f4b66ee218 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tsputil.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tsputil.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/tsputil.h b/Build/source/libs/icu/icu-xetex/test/intltest/tsputil.h
index 77cd52b2b31..77cd52b2b31 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tsputil.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tsputil.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/tstnorm.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/tstnorm.cpp
index cadc0252232..cadc0252232 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tstnorm.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tstnorm.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/tstnorm.h b/Build/source/libs/icu/icu-xetex/test/intltest/tstnorm.h
index b77efd6bf2a..b77efd6bf2a 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tstnorm.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tstnorm.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/tstnrapi.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/tstnrapi.cpp
index 6499fefe2d0..6499fefe2d0 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tstnrapi.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tstnrapi.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/tzbdtest.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/tzbdtest.cpp
index 88e0fab9c7c..88e0fab9c7c 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tzbdtest.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tzbdtest.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/tzbdtest.h b/Build/source/libs/icu/icu-xetex/test/intltest/tzbdtest.h
index ecc867c9faf..ecc867c9faf 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tzbdtest.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tzbdtest.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/tzfmttst.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/tzfmttst.cpp
index 6be576f82ba..6be576f82ba 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tzfmttst.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tzfmttst.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/tzfmttst.h b/Build/source/libs/icu/icu-xetex/test/intltest/tzfmttst.h
index 22583309bd5..22583309bd5 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tzfmttst.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tzfmttst.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/tzoffloc.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/tzoffloc.cpp
index 1c4c5848347..1c4c5848347 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tzoffloc.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tzoffloc.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/tzoffloc.h b/Build/source/libs/icu/icu-xetex/test/intltest/tzoffloc.h
index 7d8fa235c66..7d8fa235c66 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tzoffloc.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tzoffloc.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/tzregts.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/tzregts.cpp
index b549b83c16a..b549b83c16a 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tzregts.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tzregts.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/tzregts.h b/Build/source/libs/icu/icu-xetex/test/intltest/tzregts.h
index 6b5500c953e..6b5500c953e 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tzregts.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tzregts.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/tzrulets.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/tzrulets.cpp
index 702b502ea2c..702b502ea2c 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tzrulets.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tzrulets.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/tzrulets.h b/Build/source/libs/icu/icu-xetex/test/intltest/tzrulets.h
index 643d2719d83..643d2719d83 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tzrulets.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tzrulets.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/tztest.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/tztest.cpp
index 0c5b07ccd21..0c5b07ccd21 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tztest.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tztest.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/tztest.h b/Build/source/libs/icu/icu-xetex/test/intltest/tztest.h
index 931509c199e..931509c199e 100644
--- a/Build/source/libs/icu-xetex/test/intltest/tztest.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/tztest.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/ucaconf.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/ucaconf.cpp
index ccd308a5712..ccd308a5712 100644
--- a/Build/source/libs/icu-xetex/test/intltest/ucaconf.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/ucaconf.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/ucaconf.h b/Build/source/libs/icu/icu-xetex/test/intltest/ucaconf.h
index 7e3368cb6c6..7e3368cb6c6 100644
--- a/Build/source/libs/icu-xetex/test/intltest/ucaconf.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/ucaconf.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/ucdtest.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/ucdtest.cpp
index e7195c25292..e7195c25292 100644
--- a/Build/source/libs/icu-xetex/test/intltest/ucdtest.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/ucdtest.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/ucdtest.h b/Build/source/libs/icu/icu-xetex/test/intltest/ucdtest.h
index 6695a878755..6695a878755 100644
--- a/Build/source/libs/icu-xetex/test/intltest/ucdtest.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/ucdtest.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/uobjtest.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/uobjtest.cpp
index 4d4b0f8a978..4d4b0f8a978 100644
--- a/Build/source/libs/icu-xetex/test/intltest/uobjtest.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/uobjtest.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/uobjtest.h b/Build/source/libs/icu/icu-xetex/test/intltest/uobjtest.h
index 6c4dd48e6de..6c4dd48e6de 100644
--- a/Build/source/libs/icu-xetex/test/intltest/uobjtest.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/uobjtest.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/usettest.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/usettest.cpp
index bcdd5ad3112..bcdd5ad3112 100644
--- a/Build/source/libs/icu-xetex/test/intltest/usettest.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/usettest.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/usettest.h b/Build/source/libs/icu/icu-xetex/test/intltest/usettest.h
index 94083406764..94083406764 100644
--- a/Build/source/libs/icu-xetex/test/intltest/usettest.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/usettest.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/ustrtest.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/ustrtest.cpp
index 5b50fbaf48e..5b50fbaf48e 100644
--- a/Build/source/libs/icu-xetex/test/intltest/ustrtest.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/ustrtest.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/ustrtest.h b/Build/source/libs/icu/icu-xetex/test/intltest/ustrtest.h
index 697db602786..697db602786 100644
--- a/Build/source/libs/icu-xetex/test/intltest/ustrtest.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/ustrtest.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/utxttest.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/utxttest.cpp
index d6264d9e6be..d6264d9e6be 100644
--- a/Build/source/libs/icu-xetex/test/intltest/utxttest.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/utxttest.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/utxttest.h b/Build/source/libs/icu/icu-xetex/test/intltest/utxttest.h
index ca1e2f605eb..ca1e2f605eb 100644
--- a/Build/source/libs/icu-xetex/test/intltest/utxttest.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/utxttest.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/uvectest.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/uvectest.cpp
index 434876f90f2..434876f90f2 100644
--- a/Build/source/libs/icu-xetex/test/intltest/uvectest.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/uvectest.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/uvectest.h b/Build/source/libs/icu/icu-xetex/test/intltest/uvectest.h
index 84a3e24fdb6..84a3e24fdb6 100644
--- a/Build/source/libs/icu-xetex/test/intltest/uvectest.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/uvectest.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/v32test.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/v32test.cpp
index c668a38ce64..c668a38ce64 100644
--- a/Build/source/libs/icu-xetex/test/intltest/v32test.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/v32test.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/v32test.h b/Build/source/libs/icu/icu-xetex/test/intltest/v32test.h
index f364aeb1bcd..f364aeb1bcd 100644
--- a/Build/source/libs/icu-xetex/test/intltest/v32test.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/v32test.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/wbnf.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/wbnf.cpp
index 7d08de7081b..7d08de7081b 100644
--- a/Build/source/libs/icu-xetex/test/intltest/wbnf.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/wbnf.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/wbnf.h b/Build/source/libs/icu/icu-xetex/test/intltest/wbnf.h
index 7b76f8f2daa..7b76f8f2daa 100644
--- a/Build/source/libs/icu-xetex/test/intltest/wbnf.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/wbnf.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/windttst.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/windttst.cpp
index 3869f34acfc..3869f34acfc 100644
--- a/Build/source/libs/icu-xetex/test/intltest/windttst.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/windttst.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/windttst.h b/Build/source/libs/icu/icu-xetex/test/intltest/windttst.h
index b9b3e637488..b9b3e637488 100644
--- a/Build/source/libs/icu-xetex/test/intltest/windttst.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/windttst.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/winnmtst.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/winnmtst.cpp
index dfbf200bff0..dfbf200bff0 100644
--- a/Build/source/libs/icu-xetex/test/intltest/winnmtst.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/winnmtst.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/winnmtst.h b/Build/source/libs/icu/icu-xetex/test/intltest/winnmtst.h
index 411969ad9ef..411969ad9ef 100644
--- a/Build/source/libs/icu-xetex/test/intltest/winnmtst.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/winnmtst.h
diff --git a/Build/source/libs/icu-xetex/test/intltest/winutil.cpp b/Build/source/libs/icu/icu-xetex/test/intltest/winutil.cpp
index 1963221ea4e..1963221ea4e 100644
--- a/Build/source/libs/icu-xetex/test/intltest/winutil.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/winutil.cpp
diff --git a/Build/source/libs/icu-xetex/test/intltest/winutil.h b/Build/source/libs/icu/icu-xetex/test/intltest/winutil.h
index 03a0044ac6e..03a0044ac6e 100644
--- a/Build/source/libs/icu-xetex/test/intltest/winutil.h
+++ b/Build/source/libs/icu/icu-xetex/test/intltest/winutil.h
diff --git a/Build/source/libs/icu-xetex/test/iotest/Makefile.in b/Build/source/libs/icu/icu-xetex/test/iotest/Makefile.in
index 22b70057e70..22b70057e70 100644
--- a/Build/source/libs/icu-xetex/test/iotest/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/test/iotest/Makefile.in
diff --git a/Build/source/libs/icu-xetex/test/iotest/filetst.c b/Build/source/libs/icu/icu-xetex/test/iotest/filetst.c
index 567a63c14a4..567a63c14a4 100644
--- a/Build/source/libs/icu-xetex/test/iotest/filetst.c
+++ b/Build/source/libs/icu/icu-xetex/test/iotest/filetst.c
diff --git a/Build/source/libs/icu-xetex/test/iotest/iotest.cpp b/Build/source/libs/icu/icu-xetex/test/iotest/iotest.cpp
index a035b2ad218..a035b2ad218 100644
--- a/Build/source/libs/icu-xetex/test/iotest/iotest.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/iotest/iotest.cpp
diff --git a/Build/source/libs/icu-xetex/test/iotest/iotest.h b/Build/source/libs/icu/icu-xetex/test/iotest/iotest.h
index 6d522dc435d..6d522dc435d 100644
--- a/Build/source/libs/icu-xetex/test/iotest/iotest.h
+++ b/Build/source/libs/icu/icu-xetex/test/iotest/iotest.h
diff --git a/Build/source/libs/icu-xetex/test/iotest/iotest.vcproj b/Build/source/libs/icu/icu-xetex/test/iotest/iotest.vcproj
index 71ecefa6252..71ecefa6252 100644
--- a/Build/source/libs/icu-xetex/test/iotest/iotest.vcproj
+++ b/Build/source/libs/icu/icu-xetex/test/iotest/iotest.vcproj
diff --git a/Build/source/libs/icu-xetex/test/iotest/stream.cpp b/Build/source/libs/icu/icu-xetex/test/iotest/stream.cpp
index c700437aae1..c700437aae1 100644
--- a/Build/source/libs/icu-xetex/test/iotest/stream.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/iotest/stream.cpp
diff --git a/Build/source/libs/icu-xetex/test/iotest/strtst.c b/Build/source/libs/icu/icu-xetex/test/iotest/strtst.c
index 0412f25efb2..0412f25efb2 100644
--- a/Build/source/libs/icu-xetex/test/iotest/strtst.c
+++ b/Build/source/libs/icu/icu-xetex/test/iotest/strtst.c
diff --git a/Build/source/libs/icu-xetex/test/iotest/trnstst.c b/Build/source/libs/icu/icu-xetex/test/iotest/trnstst.c
index 8f6101323f8..8f6101323f8 100644
--- a/Build/source/libs/icu-xetex/test/iotest/trnstst.c
+++ b/Build/source/libs/icu/icu-xetex/test/iotest/trnstst.c
diff --git a/Build/source/libs/icu-xetex/test/letest/FontObject.cpp b/Build/source/libs/icu/icu-xetex/test/letest/FontObject.cpp
index 1f8370bdecd..1f8370bdecd 100644
--- a/Build/source/libs/icu-xetex/test/letest/FontObject.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/letest/FontObject.cpp
diff --git a/Build/source/libs/icu-xetex/test/letest/FontObject.h b/Build/source/libs/icu/icu-xetex/test/letest/FontObject.h
index 76af46b5ee5..76af46b5ee5 100644
--- a/Build/source/libs/icu-xetex/test/letest/FontObject.h
+++ b/Build/source/libs/icu/icu-xetex/test/letest/FontObject.h
diff --git a/Build/source/libs/icu-xetex/test/letest/FontTableCache.cpp b/Build/source/libs/icu/icu-xetex/test/letest/FontTableCache.cpp
index cf28de2228b..cf28de2228b 100644
--- a/Build/source/libs/icu-xetex/test/letest/FontTableCache.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/letest/FontTableCache.cpp
diff --git a/Build/source/libs/icu-xetex/test/letest/FontTableCache.h b/Build/source/libs/icu/icu-xetex/test/letest/FontTableCache.h
index 088d7aa7948..088d7aa7948 100644
--- a/Build/source/libs/icu-xetex/test/letest/FontTableCache.h
+++ b/Build/source/libs/icu/icu-xetex/test/letest/FontTableCache.h
diff --git a/Build/source/libs/icu-xetex/test/letest/Makefile.in b/Build/source/libs/icu/icu-xetex/test/letest/Makefile.in
index 62138995d6d..62138995d6d 100644
--- a/Build/source/libs/icu-xetex/test/letest/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/test/letest/Makefile.in
diff --git a/Build/source/libs/icu-xetex/test/letest/PortableFontInstance.cpp b/Build/source/libs/icu/icu-xetex/test/letest/PortableFontInstance.cpp
index db5bf2fd16d..db5bf2fd16d 100644
--- a/Build/source/libs/icu-xetex/test/letest/PortableFontInstance.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/letest/PortableFontInstance.cpp
diff --git a/Build/source/libs/icu-xetex/test/letest/PortableFontInstance.h b/Build/source/libs/icu/icu-xetex/test/letest/PortableFontInstance.h
index e47cb65b197..e47cb65b197 100644
--- a/Build/source/libs/icu-xetex/test/letest/PortableFontInstance.h
+++ b/Build/source/libs/icu/icu-xetex/test/letest/PortableFontInstance.h
diff --git a/Build/source/libs/icu-xetex/test/letest/SimpleFontInstance.cpp b/Build/source/libs/icu/icu-xetex/test/letest/SimpleFontInstance.cpp
index fa5aaedda0a..fa5aaedda0a 100644
--- a/Build/source/libs/icu-xetex/test/letest/SimpleFontInstance.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/letest/SimpleFontInstance.cpp
diff --git a/Build/source/libs/icu-xetex/test/letest/SimpleFontInstance.h b/Build/source/libs/icu/icu-xetex/test/letest/SimpleFontInstance.h
index 9c13659dc29..9c13659dc29 100644
--- a/Build/source/libs/icu-xetex/test/letest/SimpleFontInstance.h
+++ b/Build/source/libs/icu/icu-xetex/test/letest/SimpleFontInstance.h
diff --git a/Build/source/libs/icu-xetex/test/letest/cfonts.cpp b/Build/source/libs/icu/icu-xetex/test/letest/cfonts.cpp
index a06ec08d5fd..a06ec08d5fd 100644
--- a/Build/source/libs/icu-xetex/test/letest/cfonts.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/letest/cfonts.cpp
diff --git a/Build/source/libs/icu-xetex/test/letest/cfonts.h b/Build/source/libs/icu/icu-xetex/test/letest/cfonts.h
index 2dda8a2a283..2dda8a2a283 100644
--- a/Build/source/libs/icu-xetex/test/letest/cfonts.h
+++ b/Build/source/libs/icu/icu-xetex/test/letest/cfonts.h
diff --git a/Build/source/libs/icu-xetex/test/letest/cletest.c b/Build/source/libs/icu/icu-xetex/test/letest/cletest.c
index fdd5a5f0e1e..fdd5a5f0e1e 100644
--- a/Build/source/libs/icu-xetex/test/letest/cletest.c
+++ b/Build/source/libs/icu/icu-xetex/test/letest/cletest.c
diff --git a/Build/source/libs/icu-xetex/test/letest/cletest.sln b/Build/source/libs/icu/icu-xetex/test/letest/cletest.sln
index 1ac75a272b2..1ac75a272b2 100644
--- a/Build/source/libs/icu-xetex/test/letest/cletest.sln
+++ b/Build/source/libs/icu/icu-xetex/test/letest/cletest.sln
diff --git a/Build/source/libs/icu-xetex/test/letest/cletest.vcproj b/Build/source/libs/icu/icu-xetex/test/letest/cletest.vcproj
index ed9685ab355..ed9685ab355 100644
--- a/Build/source/libs/icu-xetex/test/letest/cletest.vcproj
+++ b/Build/source/libs/icu/icu-xetex/test/letest/cletest.vcproj
diff --git a/Build/source/libs/icu-xetex/test/letest/cmaps.cpp b/Build/source/libs/icu/icu-xetex/test/letest/cmaps.cpp
index 3b8501b4cec..3b8501b4cec 100644
--- a/Build/source/libs/icu-xetex/test/letest/cmaps.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/letest/cmaps.cpp
diff --git a/Build/source/libs/icu-xetex/test/letest/cmaps.h b/Build/source/libs/icu/icu-xetex/test/letest/cmaps.h
index df0bb116ba5..df0bb116ba5 100644
--- a/Build/source/libs/icu-xetex/test/letest/cmaps.h
+++ b/Build/source/libs/icu/icu-xetex/test/letest/cmaps.h
diff --git a/Build/source/libs/icu-xetex/test/letest/gendata.cpp b/Build/source/libs/icu/icu-xetex/test/letest/gendata.cpp
index 103fb4b6fdd..103fb4b6fdd 100644
--- a/Build/source/libs/icu-xetex/test/letest/gendata.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/letest/gendata.cpp
diff --git a/Build/source/libs/icu-xetex/test/letest/gendata.sln b/Build/source/libs/icu/icu-xetex/test/letest/gendata.sln
index 8f46c1c2f1d..8f46c1c2f1d 100644
--- a/Build/source/libs/icu-xetex/test/letest/gendata.sln
+++ b/Build/source/libs/icu/icu-xetex/test/letest/gendata.sln
diff --git a/Build/source/libs/icu-xetex/test/letest/gendata.vcproj b/Build/source/libs/icu/icu-xetex/test/letest/gendata.vcproj
index e76679d334d..e76679d334d 100644
--- a/Build/source/libs/icu-xetex/test/letest/gendata.vcproj
+++ b/Build/source/libs/icu/icu-xetex/test/letest/gendata.vcproj
diff --git a/Build/source/libs/icu-xetex/test/letest/gendata.xml b/Build/source/libs/icu/icu-xetex/test/letest/gendata.xml
index a672644bc4c..a672644bc4c 100644
--- a/Build/source/libs/icu-xetex/test/letest/gendata.xml
+++ b/Build/source/libs/icu/icu-xetex/test/letest/gendata.xml
diff --git a/Build/source/libs/icu-xetex/test/letest/letest.cpp b/Build/source/libs/icu/icu-xetex/test/letest/letest.cpp
index df9bf8da932..df9bf8da932 100644
--- a/Build/source/libs/icu-xetex/test/letest/letest.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/letest/letest.cpp
diff --git a/Build/source/libs/icu-xetex/test/letest/letest.h b/Build/source/libs/icu/icu-xetex/test/letest/letest.h
index 9f066ca8c99..9f066ca8c99 100644
--- a/Build/source/libs/icu-xetex/test/letest/letest.h
+++ b/Build/source/libs/icu/icu-xetex/test/letest/letest.h
diff --git a/Build/source/libs/icu-xetex/test/letest/letest.sln b/Build/source/libs/icu/icu-xetex/test/letest/letest.sln
index de181d150ee..de181d150ee 100644
--- a/Build/source/libs/icu-xetex/test/letest/letest.sln
+++ b/Build/source/libs/icu/icu-xetex/test/letest/letest.sln
diff --git a/Build/source/libs/icu-xetex/test/letest/letest.vcproj b/Build/source/libs/icu/icu-xetex/test/letest/letest.vcproj
index a028ac97a8e..a028ac97a8e 100644
--- a/Build/source/libs/icu-xetex/test/letest/letest.vcproj
+++ b/Build/source/libs/icu/icu-xetex/test/letest/letest.vcproj
diff --git a/Build/source/libs/icu-xetex/test/letest/letsutil.cpp b/Build/source/libs/icu/icu-xetex/test/letest/letsutil.cpp
index edac65ac9a2..edac65ac9a2 100644
--- a/Build/source/libs/icu-xetex/test/letest/letsutil.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/letest/letsutil.cpp
diff --git a/Build/source/libs/icu-xetex/test/letest/letsutil.h b/Build/source/libs/icu/icu-xetex/test/letest/letsutil.h
index b7822e5d900..b7822e5d900 100644
--- a/Build/source/libs/icu-xetex/test/letest/letsutil.h
+++ b/Build/source/libs/icu/icu-xetex/test/letest/letsutil.h
diff --git a/Build/source/libs/icu-xetex/test/letest/readme.html b/Build/source/libs/icu/icu-xetex/test/letest/readme.html
index 8e91b9ae254..8e91b9ae254 100644
--- a/Build/source/libs/icu-xetex/test/letest/readme.html
+++ b/Build/source/libs/icu/icu-xetex/test/letest/readme.html
diff --git a/Build/source/libs/icu-xetex/test/letest/sfnt.h b/Build/source/libs/icu/icu-xetex/test/letest/sfnt.h
index f83f9212e35..f83f9212e35 100644
--- a/Build/source/libs/icu-xetex/test/letest/sfnt.h
+++ b/Build/source/libs/icu/icu-xetex/test/letest/sfnt.h
diff --git a/Build/source/libs/icu-xetex/test/letest/testdata.cpp b/Build/source/libs/icu/icu-xetex/test/letest/testdata.cpp
index f0624d2f7de..f0624d2f7de 100644
--- a/Build/source/libs/icu-xetex/test/letest/testdata.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/letest/testdata.cpp
diff --git a/Build/source/libs/icu-xetex/test/letest/xmlreader.cpp b/Build/source/libs/icu/icu-xetex/test/letest/xmlreader.cpp
index c84dc8ce28c..c84dc8ce28c 100644
--- a/Build/source/libs/icu-xetex/test/letest/xmlreader.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/letest/xmlreader.cpp
diff --git a/Build/source/libs/icu-xetex/test/letest/xmlreader.h b/Build/source/libs/icu/icu-xetex/test/letest/xmlreader.h
index be47b562795..be47b562795 100644
--- a/Build/source/libs/icu-xetex/test/letest/xmlreader.h
+++ b/Build/source/libs/icu/icu-xetex/test/letest/xmlreader.h
diff --git a/Build/source/libs/icu-xetex/test/perf/charperf/CharPerf.pl b/Build/source/libs/icu/icu-xetex/test/perf/charperf/CharPerf.pl
index ef5e1cf2e9e..ef5e1cf2e9e 100755
--- a/Build/source/libs/icu-xetex/test/perf/charperf/CharPerf.pl
+++ b/Build/source/libs/icu/icu-xetex/test/perf/charperf/CharPerf.pl
diff --git a/Build/source/libs/icu-xetex/test/perf/charperf/CharPerf_r.pl b/Build/source/libs/icu/icu-xetex/test/perf/charperf/CharPerf_r.pl
index a6f95842e8f..a6f95842e8f 100644
--- a/Build/source/libs/icu-xetex/test/perf/charperf/CharPerf_r.pl
+++ b/Build/source/libs/icu/icu-xetex/test/perf/charperf/CharPerf_r.pl
diff --git a/Build/source/libs/icu-xetex/test/perf/charperf/Makefile.in b/Build/source/libs/icu/icu-xetex/test/perf/charperf/Makefile.in
index 610b90d84ca..610b90d84ca 100644
--- a/Build/source/libs/icu-xetex/test/perf/charperf/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/test/perf/charperf/Makefile.in
diff --git a/Build/source/libs/icu-xetex/test/perf/charperf/charperf.cpp b/Build/source/libs/icu/icu-xetex/test/perf/charperf/charperf.cpp
index c964625bf2f..c964625bf2f 100644
--- a/Build/source/libs/icu-xetex/test/perf/charperf/charperf.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/perf/charperf/charperf.cpp
diff --git a/Build/source/libs/icu-xetex/test/perf/charperf/charperf.h b/Build/source/libs/icu/icu-xetex/test/perf/charperf/charperf.h
index e23785f84cb..e23785f84cb 100644
--- a/Build/source/libs/icu-xetex/test/perf/charperf/charperf.h
+++ b/Build/source/libs/icu/icu-xetex/test/perf/charperf/charperf.h
diff --git a/Build/source/libs/icu-xetex/test/perf/charperf/charperf.vcproj b/Build/source/libs/icu/icu-xetex/test/perf/charperf/charperf.vcproj
index d6f276a0a8b..d6f276a0a8b 100644
--- a/Build/source/libs/icu-xetex/test/perf/charperf/charperf.vcproj
+++ b/Build/source/libs/icu/icu-xetex/test/perf/charperf/charperf.vcproj
diff --git a/Build/source/libs/icu-xetex/test/perf/collperf/CollPerf.pl b/Build/source/libs/icu/icu-xetex/test/perf/collperf/CollPerf.pl
index 78c69f3549c..78c69f3549c 100755
--- a/Build/source/libs/icu-xetex/test/perf/collperf/CollPerf.pl
+++ b/Build/source/libs/icu/icu-xetex/test/perf/collperf/CollPerf.pl
diff --git a/Build/source/libs/icu-xetex/test/perf/collperf/Makefile.in b/Build/source/libs/icu/icu-xetex/test/perf/collperf/Makefile.in
index fcc1615b3fb..fcc1615b3fb 100644
--- a/Build/source/libs/icu-xetex/test/perf/collperf/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/test/perf/collperf/Makefile.in
diff --git a/Build/source/libs/icu-xetex/test/perf/collperf/collperf.cpp b/Build/source/libs/icu/icu-xetex/test/perf/collperf/collperf.cpp
index fd30f50bdea..fd30f50bdea 100644
--- a/Build/source/libs/icu-xetex/test/perf/collperf/collperf.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/perf/collperf/collperf.cpp
diff --git a/Build/source/libs/icu-xetex/test/perf/collperf/collperf.vcproj b/Build/source/libs/icu/icu-xetex/test/perf/collperf/collperf.vcproj
index f34d8bd48a7..f34d8bd48a7 100644
--- a/Build/source/libs/icu-xetex/test/perf/collperf/collperf.vcproj
+++ b/Build/source/libs/icu/icu-xetex/test/perf/collperf/collperf.vcproj
diff --git a/Build/source/libs/icu-xetex/test/perf/convperf/ConvPerf_r.pl b/Build/source/libs/icu/icu-xetex/test/perf/convperf/ConvPerf_r.pl
index 1b3e7c1a025..1b3e7c1a025 100644
--- a/Build/source/libs/icu-xetex/test/perf/convperf/ConvPerf_r.pl
+++ b/Build/source/libs/icu/icu-xetex/test/perf/convperf/ConvPerf_r.pl
diff --git a/Build/source/libs/icu-xetex/test/perf/convperf/Makefile.in b/Build/source/libs/icu/icu-xetex/test/perf/convperf/Makefile.in
index b2ec30bc698..b2ec30bc698 100644
--- a/Build/source/libs/icu-xetex/test/perf/convperf/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/test/perf/convperf/Makefile.in
diff --git a/Build/source/libs/icu-xetex/test/perf/convperf/convperf.cpp b/Build/source/libs/icu/icu-xetex/test/perf/convperf/convperf.cpp
index dabbef7f6ef..dabbef7f6ef 100644
--- a/Build/source/libs/icu-xetex/test/perf/convperf/convperf.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/perf/convperf/convperf.cpp
diff --git a/Build/source/libs/icu-xetex/test/perf/convperf/convperf.h b/Build/source/libs/icu/icu-xetex/test/perf/convperf/convperf.h
index 994553aa52d..994553aa52d 100644
--- a/Build/source/libs/icu-xetex/test/perf/convperf/convperf.h
+++ b/Build/source/libs/icu/icu-xetex/test/perf/convperf/convperf.h
diff --git a/Build/source/libs/icu-xetex/test/perf/convperf/convperf.vcproj b/Build/source/libs/icu/icu-xetex/test/perf/convperf/convperf.vcproj
index 8649cb78a46..8649cb78a46 100644
--- a/Build/source/libs/icu-xetex/test/perf/convperf/convperf.vcproj
+++ b/Build/source/libs/icu/icu-xetex/test/perf/convperf/convperf.vcproj
diff --git a/Build/source/libs/icu-xetex/test/perf/convperf/convperf_ansi.pl b/Build/source/libs/icu/icu-xetex/test/perf/convperf/convperf_ansi.pl
index 691a21f63fa..691a21f63fa 100755
--- a/Build/source/libs/icu-xetex/test/perf/convperf/convperf_ansi.pl
+++ b/Build/source/libs/icu/icu-xetex/test/perf/convperf/convperf_ansi.pl
diff --git a/Build/source/libs/icu-xetex/test/perf/convperf/convperf_iml.pl b/Build/source/libs/icu/icu-xetex/test/perf/convperf/convperf_iml.pl
index 194a1cce549..194a1cce549 100755
--- a/Build/source/libs/icu-xetex/test/perf/convperf/convperf_iml.pl
+++ b/Build/source/libs/icu/icu-xetex/test/perf/convperf/convperf_iml.pl
diff --git a/Build/source/libs/icu-xetex/test/perf/convperf/data.h b/Build/source/libs/icu/icu-xetex/test/perf/convperf/data.h
index e80be75c1cc..e80be75c1cc 100644
--- a/Build/source/libs/icu-xetex/test/perf/convperf/data.h
+++ b/Build/source/libs/icu/icu-xetex/test/perf/convperf/data.h
diff --git a/Build/source/libs/icu-xetex/test/perf/normperf/Makefile.in b/Build/source/libs/icu/icu-xetex/test/perf/normperf/Makefile.in
index 8b35cab0465..8b35cab0465 100644
--- a/Build/source/libs/icu-xetex/test/perf/normperf/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/test/perf/normperf/Makefile.in
diff --git a/Build/source/libs/icu-xetex/test/perf/normperf/NormPerf.pl b/Build/source/libs/icu/icu-xetex/test/perf/normperf/NormPerf.pl
index 2f8df8c0129..2f8df8c0129 100755
--- a/Build/source/libs/icu-xetex/test/perf/normperf/NormPerf.pl
+++ b/Build/source/libs/icu/icu-xetex/test/perf/normperf/NormPerf.pl
diff --git a/Build/source/libs/icu-xetex/test/perf/normperf/NormPerf_r.pl b/Build/source/libs/icu/icu-xetex/test/perf/normperf/NormPerf_r.pl
index 92900072be7..92900072be7 100644
--- a/Build/source/libs/icu-xetex/test/perf/normperf/NormPerf_r.pl
+++ b/Build/source/libs/icu/icu-xetex/test/perf/normperf/NormPerf_r.pl
diff --git a/Build/source/libs/icu-xetex/test/perf/normperf/normperf.cpp b/Build/source/libs/icu/icu-xetex/test/perf/normperf/normperf.cpp
index 011bbcbd3ec..011bbcbd3ec 100644
--- a/Build/source/libs/icu-xetex/test/perf/normperf/normperf.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/perf/normperf/normperf.cpp
diff --git a/Build/source/libs/icu-xetex/test/perf/normperf/normperf.h b/Build/source/libs/icu/icu-xetex/test/perf/normperf/normperf.h
index 6a43a7727be..6a43a7727be 100644
--- a/Build/source/libs/icu-xetex/test/perf/normperf/normperf.h
+++ b/Build/source/libs/icu/icu-xetex/test/perf/normperf/normperf.h
diff --git a/Build/source/libs/icu-xetex/test/perf/normperf/normperf.vcproj b/Build/source/libs/icu/icu-xetex/test/perf/normperf/normperf.vcproj
index b2151a3b9b3..b2151a3b9b3 100644
--- a/Build/source/libs/icu-xetex/test/perf/normperf/normperf.vcproj
+++ b/Build/source/libs/icu/icu-xetex/test/perf/normperf/normperf.vcproj
diff --git a/Build/source/libs/icu-xetex/test/perf/perf.sln b/Build/source/libs/icu/icu-xetex/test/perf/perf.sln
index 49312f49d91..49312f49d91 100644
--- a/Build/source/libs/icu-xetex/test/perf/perf.sln
+++ b/Build/source/libs/icu/icu-xetex/test/perf/perf.sln
diff --git a/Build/source/libs/icu-xetex/test/perf/perldriver/Dataset.pm b/Build/source/libs/icu/icu-xetex/test/perf/perldriver/Dataset.pm
index ab5d05bbb4e..ab5d05bbb4e 100644
--- a/Build/source/libs/icu-xetex/test/perf/perldriver/Dataset.pm
+++ b/Build/source/libs/icu/icu-xetex/test/perf/perldriver/Dataset.pm
diff --git a/Build/source/libs/icu-xetex/test/perf/perldriver/Format.pm b/Build/source/libs/icu/icu-xetex/test/perf/perldriver/Format.pm
index d12fd18ad25..d12fd18ad25 100644
--- a/Build/source/libs/icu-xetex/test/perf/perldriver/Format.pm
+++ b/Build/source/libs/icu/icu-xetex/test/perf/perldriver/Format.pm
diff --git a/Build/source/libs/icu-xetex/test/perf/perldriver/Output.pm b/Build/source/libs/icu/icu-xetex/test/perf/perldriver/Output.pm
index 7b67a9c337b..7b67a9c337b 100644
--- a/Build/source/libs/icu-xetex/test/perf/perldriver/Output.pm
+++ b/Build/source/libs/icu/icu-xetex/test/perf/perldriver/Output.pm
diff --git a/Build/source/libs/icu-xetex/test/perf/perldriver/PerfFramework.pm b/Build/source/libs/icu/icu-xetex/test/perf/perldriver/PerfFramework.pm
index 04d96a2b655..04d96a2b655 100644
--- a/Build/source/libs/icu-xetex/test/perf/perldriver/PerfFramework.pm
+++ b/Build/source/libs/icu/icu-xetex/test/perf/perldriver/PerfFramework.pm
diff --git a/Build/source/libs/icu-xetex/test/perf/ubrkperf/Makefile.in b/Build/source/libs/icu/icu-xetex/test/perf/ubrkperf/Makefile.in
index e255c38940e..e255c38940e 100644
--- a/Build/source/libs/icu-xetex/test/perf/ubrkperf/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/test/perf/ubrkperf/Makefile.in
diff --git a/Build/source/libs/icu-xetex/test/perf/ubrkperf/UBrkPerf.pl b/Build/source/libs/icu/icu-xetex/test/perf/ubrkperf/UBrkPerf.pl
index 4971ecf6f2c..4971ecf6f2c 100755
--- a/Build/source/libs/icu-xetex/test/perf/ubrkperf/UBrkPerf.pl
+++ b/Build/source/libs/icu/icu-xetex/test/perf/ubrkperf/UBrkPerf.pl
diff --git a/Build/source/libs/icu-xetex/test/perf/ubrkperf/UBrkPerf_r.pl b/Build/source/libs/icu/icu-xetex/test/perf/ubrkperf/UBrkPerf_r.pl
index 73983476296..73983476296 100644
--- a/Build/source/libs/icu-xetex/test/perf/ubrkperf/UBrkPerf_r.pl
+++ b/Build/source/libs/icu/icu-xetex/test/perf/ubrkperf/UBrkPerf_r.pl
diff --git a/Build/source/libs/icu-xetex/test/perf/ubrkperf/ubrkperf.cpp b/Build/source/libs/icu/icu-xetex/test/perf/ubrkperf/ubrkperf.cpp
index 18ed4038028..18ed4038028 100644
--- a/Build/source/libs/icu-xetex/test/perf/ubrkperf/ubrkperf.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/perf/ubrkperf/ubrkperf.cpp
diff --git a/Build/source/libs/icu-xetex/test/perf/ubrkperf/ubrkperf.dsp b/Build/source/libs/icu/icu-xetex/test/perf/ubrkperf/ubrkperf.dsp
index d3417e55961..d3417e55961 100644
--- a/Build/source/libs/icu-xetex/test/perf/ubrkperf/ubrkperf.dsp
+++ b/Build/source/libs/icu/icu-xetex/test/perf/ubrkperf/ubrkperf.dsp
diff --git a/Build/source/libs/icu-xetex/test/perf/ubrkperf/ubrkperf.h b/Build/source/libs/icu/icu-xetex/test/perf/ubrkperf/ubrkperf.h
index 4c55a73976c..4c55a73976c 100644
--- a/Build/source/libs/icu-xetex/test/perf/ubrkperf/ubrkperf.h
+++ b/Build/source/libs/icu/icu-xetex/test/perf/ubrkperf/ubrkperf.h
diff --git a/Build/source/libs/icu-xetex/test/perf/ubrkperf/ubrkperf.vcproj b/Build/source/libs/icu/icu-xetex/test/perf/ubrkperf/ubrkperf.vcproj
index 31f5bc03a51..31f5bc03a51 100644
--- a/Build/source/libs/icu-xetex/test/perf/ubrkperf/ubrkperf.vcproj
+++ b/Build/source/libs/icu/icu-xetex/test/perf/ubrkperf/ubrkperf.vcproj
diff --git a/Build/source/libs/icu-xetex/test/perf/ubrkperf/ubrkperf20.dsp b/Build/source/libs/icu/icu-xetex/test/perf/ubrkperf/ubrkperf20.dsp
index 197aed77abe..197aed77abe 100644
--- a/Build/source/libs/icu-xetex/test/perf/ubrkperf/ubrkperf20.dsp
+++ b/Build/source/libs/icu/icu-xetex/test/perf/ubrkperf/ubrkperf20.dsp
diff --git a/Build/source/libs/icu-xetex/test/perf/ubrkperf/ubrkperfold.cpp b/Build/source/libs/icu/icu-xetex/test/perf/ubrkperf/ubrkperfold.cpp
index 4ab8190f5ba..4ab8190f5ba 100644
--- a/Build/source/libs/icu-xetex/test/perf/ubrkperf/ubrkperfold.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/perf/ubrkperf/ubrkperfold.cpp
diff --git a/Build/source/libs/icu-xetex/test/perf/ubrkperf/ubrkperfold.dsp b/Build/source/libs/icu/icu-xetex/test/perf/ubrkperf/ubrkperfold.dsp
index 2befc0aba27..2befc0aba27 100644
--- a/Build/source/libs/icu-xetex/test/perf/ubrkperf/ubrkperfold.dsp
+++ b/Build/source/libs/icu/icu-xetex/test/perf/ubrkperf/ubrkperfold.dsp
diff --git a/Build/source/libs/icu-xetex/test/perf/unisetperf/Makefile.in b/Build/source/libs/icu/icu-xetex/test/perf/unisetperf/Makefile.in
index 07c62d657da..07c62d657da 100644
--- a/Build/source/libs/icu-xetex/test/perf/unisetperf/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/test/perf/unisetperf/Makefile.in
diff --git a/Build/source/libs/icu-xetex/test/perf/unisetperf/draft/bitset.cpp b/Build/source/libs/icu/icu-xetex/test/perf/unisetperf/draft/bitset.cpp
index 487d0c0985f..487d0c0985f 100644
--- a/Build/source/libs/icu-xetex/test/perf/unisetperf/draft/bitset.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/perf/unisetperf/draft/bitset.cpp
diff --git a/Build/source/libs/icu-xetex/test/perf/unisetperf/draft/contperf.bat b/Build/source/libs/icu/icu-xetex/test/perf/unisetperf/draft/contperf.bat
index 9ba8ea4ee14..9ba8ea4ee14 100755
--- a/Build/source/libs/icu-xetex/test/perf/unisetperf/draft/contperf.bat
+++ b/Build/source/libs/icu/icu-xetex/test/perf/unisetperf/draft/contperf.bat
diff --git a/Build/source/libs/icu-xetex/test/perf/unisetperf/draft/contperf.sh b/Build/source/libs/icu/icu-xetex/test/perf/unisetperf/draft/contperf.sh
index 027897ef2e0..027897ef2e0 100755
--- a/Build/source/libs/icu-xetex/test/perf/unisetperf/draft/contperf.sh
+++ b/Build/source/libs/icu/icu-xetex/test/perf/unisetperf/draft/contperf.sh
diff --git a/Build/source/libs/icu-xetex/test/perf/unisetperf/draft/span16perf.bat b/Build/source/libs/icu/icu-xetex/test/perf/unisetperf/draft/span16perf.bat
index f67cdb26e69..f67cdb26e69 100755
--- a/Build/source/libs/icu-xetex/test/perf/unisetperf/draft/span16perf.bat
+++ b/Build/source/libs/icu/icu-xetex/test/perf/unisetperf/draft/span16perf.bat
diff --git a/Build/source/libs/icu-xetex/test/perf/unisetperf/draft/span16perf.sh b/Build/source/libs/icu/icu-xetex/test/perf/unisetperf/draft/span16perf.sh
index 8a647e31858..8a647e31858 100755
--- a/Build/source/libs/icu-xetex/test/perf/unisetperf/draft/span16perf.sh
+++ b/Build/source/libs/icu/icu-xetex/test/perf/unisetperf/draft/span16perf.sh
diff --git a/Build/source/libs/icu-xetex/test/perf/unisetperf/draft/span8perf.bat b/Build/source/libs/icu/icu-xetex/test/perf/unisetperf/draft/span8perf.bat
index 611eaf633b8..611eaf633b8 100755
--- a/Build/source/libs/icu-xetex/test/perf/unisetperf/draft/span8perf.bat
+++ b/Build/source/libs/icu/icu-xetex/test/perf/unisetperf/draft/span8perf.bat
diff --git a/Build/source/libs/icu-xetex/test/perf/unisetperf/draft/span8perf.sh b/Build/source/libs/icu/icu-xetex/test/perf/unisetperf/draft/span8perf.sh
index b508320c3ef..b508320c3ef 100755
--- a/Build/source/libs/icu-xetex/test/perf/unisetperf/draft/span8perf.sh
+++ b/Build/source/libs/icu/icu-xetex/test/perf/unisetperf/draft/span8perf.sh
diff --git a/Build/source/libs/icu-xetex/test/perf/unisetperf/draft/trieset.cpp b/Build/source/libs/icu/icu-xetex/test/perf/unisetperf/draft/trieset.cpp
index 6c4720888c9..6c4720888c9 100644
--- a/Build/source/libs/icu-xetex/test/perf/unisetperf/draft/trieset.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/perf/unisetperf/draft/trieset.cpp
diff --git a/Build/source/libs/icu-xetex/test/perf/unisetperf/draft/unicont.h b/Build/source/libs/icu/icu-xetex/test/perf/unisetperf/draft/unicont.h
index 2e8a64e8cd9..2e8a64e8cd9 100644
--- a/Build/source/libs/icu-xetex/test/perf/unisetperf/draft/unicont.h
+++ b/Build/source/libs/icu/icu-xetex/test/perf/unisetperf/draft/unicont.h
diff --git a/Build/source/libs/icu-xetex/test/perf/unisetperf/unisetperf.cpp b/Build/source/libs/icu/icu-xetex/test/perf/unisetperf/unisetperf.cpp
index 36d61c1e193..36d61c1e193 100644
--- a/Build/source/libs/icu-xetex/test/perf/unisetperf/unisetperf.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/perf/unisetperf/unisetperf.cpp
diff --git a/Build/source/libs/icu-xetex/test/perf/unisetperf/unisetperf.pl b/Build/source/libs/icu/icu-xetex/test/perf/unisetperf/unisetperf.pl
index 18f83b8e070..18f83b8e070 100755
--- a/Build/source/libs/icu-xetex/test/perf/unisetperf/unisetperf.pl
+++ b/Build/source/libs/icu/icu-xetex/test/perf/unisetperf/unisetperf.pl
diff --git a/Build/source/libs/icu-xetex/test/perf/unisetperf/unisetperf.vcproj b/Build/source/libs/icu/icu-xetex/test/perf/unisetperf/unisetperf.vcproj
index 4a281ef978e..4a281ef978e 100644
--- a/Build/source/libs/icu-xetex/test/perf/unisetperf/unisetperf.vcproj
+++ b/Build/source/libs/icu/icu-xetex/test/perf/unisetperf/unisetperf.vcproj
diff --git a/Build/source/libs/icu-xetex/test/perf/usetperf/Makefile.in b/Build/source/libs/icu/icu-xetex/test/perf/usetperf/Makefile.in
index 3e737304748..3e737304748 100644
--- a/Build/source/libs/icu-xetex/test/perf/usetperf/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/test/perf/usetperf/Makefile.in
diff --git a/Build/source/libs/icu-xetex/test/perf/usetperf/UsetPerf.pl b/Build/source/libs/icu/icu-xetex/test/perf/usetperf/UsetPerf.pl
index 8c493806e20..8c493806e20 100755
--- a/Build/source/libs/icu-xetex/test/perf/usetperf/UsetPerf.pl
+++ b/Build/source/libs/icu/icu-xetex/test/perf/usetperf/UsetPerf.pl
diff --git a/Build/source/libs/icu-xetex/test/perf/usetperf/bitset.cpp b/Build/source/libs/icu/icu-xetex/test/perf/usetperf/bitset.cpp
index ea5f11b8b2f..ea5f11b8b2f 100644
--- a/Build/source/libs/icu-xetex/test/perf/usetperf/bitset.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/perf/usetperf/bitset.cpp
diff --git a/Build/source/libs/icu-xetex/test/perf/usetperf/bitset.h b/Build/source/libs/icu/icu-xetex/test/perf/usetperf/bitset.h
index 3148b1d7070..3148b1d7070 100644
--- a/Build/source/libs/icu-xetex/test/perf/usetperf/bitset.h
+++ b/Build/source/libs/icu/icu-xetex/test/perf/usetperf/bitset.h
diff --git a/Build/source/libs/icu-xetex/test/perf/usetperf/usetperf.cpp b/Build/source/libs/icu/icu-xetex/test/perf/usetperf/usetperf.cpp
index c75406a1ec4..c75406a1ec4 100644
--- a/Build/source/libs/icu-xetex/test/perf/usetperf/usetperf.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/perf/usetperf/usetperf.cpp
diff --git a/Build/source/libs/icu-xetex/test/perf/usetperf/usetperf.vcproj b/Build/source/libs/icu/icu-xetex/test/perf/usetperf/usetperf.vcproj
index c128b0487bc..c128b0487bc 100644
--- a/Build/source/libs/icu-xetex/test/perf/usetperf/usetperf.vcproj
+++ b/Build/source/libs/icu/icu-xetex/test/perf/usetperf/usetperf.vcproj
diff --git a/Build/source/libs/icu-xetex/test/perf/ustrperf/Makefile.in b/Build/source/libs/icu/icu-xetex/test/perf/ustrperf/Makefile.in
index 08bf330d82d..08bf330d82d 100644
--- a/Build/source/libs/icu-xetex/test/perf/ustrperf/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/test/perf/ustrperf/Makefile.in
diff --git a/Build/source/libs/icu-xetex/test/perf/ustrperf/StringPerf.pl b/Build/source/libs/icu/icu-xetex/test/perf/ustrperf/StringPerf.pl
index 02cde457e0f..02cde457e0f 100755
--- a/Build/source/libs/icu-xetex/test/perf/ustrperf/StringPerf.pl
+++ b/Build/source/libs/icu/icu-xetex/test/perf/ustrperf/StringPerf.pl
diff --git a/Build/source/libs/icu-xetex/test/perf/ustrperf/StringPerf_r.pl b/Build/source/libs/icu/icu-xetex/test/perf/ustrperf/StringPerf_r.pl
index 4a1ffa86420..4a1ffa86420 100644
--- a/Build/source/libs/icu-xetex/test/perf/ustrperf/StringPerf_r.pl
+++ b/Build/source/libs/icu/icu-xetex/test/perf/ustrperf/StringPerf_r.pl
diff --git a/Build/source/libs/icu-xetex/test/perf/ustrperf/stringperf.cpp b/Build/source/libs/icu/icu-xetex/test/perf/ustrperf/stringperf.cpp
index 342e060aa8c..342e060aa8c 100644
--- a/Build/source/libs/icu-xetex/test/perf/ustrperf/stringperf.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/perf/ustrperf/stringperf.cpp
diff --git a/Build/source/libs/icu-xetex/test/perf/ustrperf/stringperf.h b/Build/source/libs/icu/icu-xetex/test/perf/ustrperf/stringperf.h
index 84d6493a405..84d6493a405 100644
--- a/Build/source/libs/icu-xetex/test/perf/ustrperf/stringperf.h
+++ b/Build/source/libs/icu/icu-xetex/test/perf/ustrperf/stringperf.h
diff --git a/Build/source/libs/icu-xetex/test/perf/ustrperf/stringperf.vcproj b/Build/source/libs/icu/icu-xetex/test/perf/ustrperf/stringperf.vcproj
index 1c1f32309e6..1c1f32309e6 100644
--- a/Build/source/libs/icu-xetex/test/perf/ustrperf/stringperf.vcproj
+++ b/Build/source/libs/icu/icu-xetex/test/perf/ustrperf/stringperf.vcproj
diff --git a/Build/source/libs/icu-xetex/test/perf/utfperf/Makefile.in b/Build/source/libs/icu/icu-xetex/test/perf/utfperf/Makefile.in
index dbaf1ab4316..dbaf1ab4316 100644
--- a/Build/source/libs/icu-xetex/test/perf/utfperf/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/test/perf/utfperf/Makefile.in
diff --git a/Build/source/libs/icu-xetex/test/perf/utfperf/UtfPerf.pl b/Build/source/libs/icu/icu-xetex/test/perf/utfperf/UtfPerf.pl
index 0c7ff961a3a..0c7ff961a3a 100755
--- a/Build/source/libs/icu-xetex/test/perf/utfperf/UtfPerf.pl
+++ b/Build/source/libs/icu/icu-xetex/test/perf/utfperf/UtfPerf.pl
diff --git a/Build/source/libs/icu-xetex/test/perf/utfperf/utfperf.cpp b/Build/source/libs/icu/icu-xetex/test/perf/utfperf/utfperf.cpp
index e5e26ca49ea..e5e26ca49ea 100644
--- a/Build/source/libs/icu-xetex/test/perf/utfperf/utfperf.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/perf/utfperf/utfperf.cpp
diff --git a/Build/source/libs/icu-xetex/test/perf/utfperf/utfperf.vcproj b/Build/source/libs/icu/icu-xetex/test/perf/utfperf/utfperf.vcproj
index d333f02fd16..d333f02fd16 100644
--- a/Build/source/libs/icu-xetex/test/perf/utfperf/utfperf.vcproj
+++ b/Build/source/libs/icu/icu-xetex/test/perf/utfperf/utfperf.vcproj
diff --git a/Build/source/libs/icu-xetex/test/testdata/CollationTest_NON_IGNORABLE_STUB.txt b/Build/source/libs/icu/icu-xetex/test/testdata/CollationTest_NON_IGNORABLE_STUB.txt
index e980f37b977..e980f37b977 100644
--- a/Build/source/libs/icu-xetex/test/testdata/CollationTest_NON_IGNORABLE_STUB.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/CollationTest_NON_IGNORABLE_STUB.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/CollationTest_SHIFTED_STUB.txt b/Build/source/libs/icu/icu-xetex/test/testdata/CollationTest_SHIFTED_STUB.txt
index 9f9221c4be9..9f9221c4be9 100644
--- a/Build/source/libs/icu-xetex/test/testdata/CollationTest_SHIFTED_STUB.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/CollationTest_SHIFTED_STUB.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/DataDrivenCollationTest.txt b/Build/source/libs/icu/icu-xetex/test/testdata/DataDrivenCollationTest.txt
index 6374f4d0f78..6374f4d0f78 100644
--- a/Build/source/libs/icu-xetex/test/testdata/DataDrivenCollationTest.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/DataDrivenCollationTest.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/GraphemeBreakTest.txt b/Build/source/libs/icu/icu-xetex/test/testdata/GraphemeBreakTest.txt
index 69096e10659..69096e10659 100644
--- a/Build/source/libs/icu-xetex/test/testdata/GraphemeBreakTest.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/GraphemeBreakTest.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/GraphemeClusterBreakTest.txt b/Build/source/libs/icu/icu-xetex/test/testdata/GraphemeClusterBreakTest.txt
index edf77bd0aa1..edf77bd0aa1 100644
--- a/Build/source/libs/icu-xetex/test/testdata/GraphemeClusterBreakTest.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/GraphemeClusterBreakTest.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/Makefile.in b/Build/source/libs/icu/icu-xetex/test/testdata/Makefile.in
index 657c770c972..657c770c972 100644
--- a/Build/source/libs/icu-xetex/test/testdata/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/Makefile.in
diff --git a/Build/source/libs/icu-xetex/test/testdata/NormalizationTest-3.2.0.txt b/Build/source/libs/icu/icu-xetex/test/testdata/NormalizationTest-3.2.0.txt
index 927b831e953..927b831e953 100644
--- a/Build/source/libs/icu-xetex/test/testdata/NormalizationTest-3.2.0.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/NormalizationTest-3.2.0.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/NumberFormatTestCases.txt b/Build/source/libs/icu/icu-xetex/test/testdata/NumberFormatTestCases.txt
index 5003e6dfc64..5003e6dfc64 100644
--- a/Build/source/libs/icu-xetex/test/testdata/NumberFormatTestCases.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/NumberFormatTestCases.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/SentenceBreakTest.txt b/Build/source/libs/icu/icu-xetex/test/testdata/SentenceBreakTest.txt
index 431d0e6a368..431d0e6a368 100644
--- a/Build/source/libs/icu-xetex/test/testdata/SentenceBreakTest.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/SentenceBreakTest.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/TestFont1.otf b/Build/source/libs/icu/icu-xetex/test/testdata/TestFont1.otf
index 5aa8abdbd1c..5aa8abdbd1c 100644
--- a/Build/source/libs/icu-xetex/test/testdata/TestFont1.otf
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/TestFont1.otf
diff --git a/Build/source/libs/icu-xetex/test/testdata/WordBreakTest.txt b/Build/source/libs/icu/icu-xetex/test/testdata/WordBreakTest.txt
index 1828b35f855..1828b35f855 100644
--- a/Build/source/libs/icu-xetex/test/testdata/WordBreakTest.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/WordBreakTest.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/calendar.txt b/Build/source/libs/icu/icu-xetex/test/testdata/calendar.txt
index 1d126213fb9..1d126213fb9 100644
--- a/Build/source/libs/icu-xetex/test/testdata/calendar.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/calendar.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/casing.txt b/Build/source/libs/icu/icu-xetex/test/testdata/casing.txt
index 11df9611043..11df9611043 100644
--- a/Build/source/libs/icu-xetex/test/testdata/casing.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/casing.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/conversion.txt b/Build/source/libs/icu/icu-xetex/test/testdata/conversion.txt
index 5e792b9be87..5e792b9be87 100644
--- a/Build/source/libs/icu-xetex/test/testdata/conversion.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/conversion.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/csdetest.xml b/Build/source/libs/icu/icu-xetex/test/testdata/csdetest.xml
index 03b0ac8583f..03b0ac8583f 100644
--- a/Build/source/libs/icu-xetex/test/testdata/csdetest.xml
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/csdetest.xml
diff --git a/Build/source/libs/icu-xetex/test/testdata/default.txt b/Build/source/libs/icu/icu-xetex/test/testdata/default.txt
index d26f3831e9e..d26f3831e9e 100644
--- a/Build/source/libs/icu-xetex/test/testdata/default.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/default.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/format.txt b/Build/source/libs/icu/icu-xetex/test/testdata/format.txt
index 2d6e8756f7e..2d6e8756f7e 100644
--- a/Build/source/libs/icu-xetex/test/testdata/format.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/format.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/ibm9027.ucm b/Build/source/libs/icu/icu-xetex/test/testdata/ibm9027.ucm
index 4e0b88a2418..4e0b88a2418 100644
--- a/Build/source/libs/icu-xetex/test/testdata/ibm9027.ucm
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/ibm9027.ucm
diff --git a/Build/source/libs/icu-xetex/test/testdata/icu26_testtypes.res b/Build/source/libs/icu/icu-xetex/test/testdata/icu26_testtypes.res
index d7747ce691c..d7747ce691c 100644
--- a/Build/source/libs/icu-xetex/test/testdata/icu26_testtypes.res
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/icu26_testtypes.res
diff --git a/Build/source/libs/icu-xetex/test/testdata/icu26e_testtypes.res b/Build/source/libs/icu/icu-xetex/test/testdata/icu26e_testtypes.res
index 89acde07914..89acde07914 100644
--- a/Build/source/libs/icu-xetex/test/testdata/icu26e_testtypes.res
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/icu26e_testtypes.res
diff --git a/Build/source/libs/icu-xetex/test/testdata/icuio.txt b/Build/source/libs/icu/icu-xetex/test/testdata/icuio.txt
index 3f5fbb88e65..3f5fbb88e65 100644
--- a/Build/source/libs/icu-xetex/test/testdata/icuio.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/icuio.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/idna_conf.txt b/Build/source/libs/icu/icu-xetex/test/testdata/idna_conf.txt
index 8f2650dc94d..8f2650dc94d 100644
--- a/Build/source/libs/icu-xetex/test/testdata/idna_conf.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/idna_conf.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/idna_rules.txt b/Build/source/libs/icu/icu-xetex/test/testdata/idna_rules.txt
index 7ef6404e951..7ef6404e951 100644
--- a/Build/source/libs/icu-xetex/test/testdata/idna_rules.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/idna_rules.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/importtest.bin b/Build/source/libs/icu/icu-xetex/test/testdata/importtest.bin
index 8fa2b2144d8..8fa2b2144d8 100644
--- a/Build/source/libs/icu-xetex/test/testdata/importtest.bin
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/importtest.bin
diff --git a/Build/source/libs/icu-xetex/test/testdata/iscii.bin b/Build/source/libs/icu/icu-xetex/test/testdata/iscii.bin
index 88051f09455..88051f09455 100644
--- a/Build/source/libs/icu-xetex/test/testdata/iscii.bin
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/iscii.bin
diff --git a/Build/source/libs/icu-xetex/test/testdata/letest.xml b/Build/source/libs/icu/icu-xetex/test/testdata/letest.xml
index 9df3918dc65..9df3918dc65 100644
--- a/Build/source/libs/icu-xetex/test/testdata/letest.xml
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/letest.xml
diff --git a/Build/source/libs/icu-xetex/test/testdata/mc.txt b/Build/source/libs/icu/icu-xetex/test/testdata/mc.txt
index dd27145ba85..dd27145ba85 100644
--- a/Build/source/libs/icu-xetex/test/testdata/mc.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/mc.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/nfs4_cis_prep.txt b/Build/source/libs/icu/icu-xetex/test/testdata/nfs4_cis_prep.txt
index 0ed83d5d35a..0ed83d5d35a 100644
--- a/Build/source/libs/icu-xetex/test/testdata/nfs4_cis_prep.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/nfs4_cis_prep.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/nfs4_cs_prep_ci.txt b/Build/source/libs/icu/icu-xetex/test/testdata/nfs4_cs_prep_ci.txt
index a47b66eb490..a47b66eb490 100644
--- a/Build/source/libs/icu-xetex/test/testdata/nfs4_cs_prep_ci.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/nfs4_cs_prep_ci.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/nfs4_cs_prep_cs.txt b/Build/source/libs/icu/icu-xetex/test/testdata/nfs4_cs_prep_cs.txt
index 8d2e73b4a2e..8d2e73b4a2e 100644
--- a/Build/source/libs/icu-xetex/test/testdata/nfs4_cs_prep_cs.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/nfs4_cs_prep_cs.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/nfs4_mixed_prep_p.txt b/Build/source/libs/icu/icu-xetex/test/testdata/nfs4_mixed_prep_p.txt
index 5fdeb5952c7..5fdeb5952c7 100644
--- a/Build/source/libs/icu-xetex/test/testdata/nfs4_mixed_prep_p.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/nfs4_mixed_prep_p.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/nfs4_mixed_prep_s.txt b/Build/source/libs/icu/icu-xetex/test/testdata/nfs4_mixed_prep_s.txt
index 0ed83d5d35a..0ed83d5d35a 100644
--- a/Build/source/libs/icu-xetex/test/testdata/nfs4_mixed_prep_s.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/nfs4_mixed_prep_s.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/pkgdata.inc.in b/Build/source/libs/icu/icu-xetex/test/testdata/pkgdata.inc.in
index 40cc60fcf23..40cc60fcf23 100644
--- a/Build/source/libs/icu-xetex/test/testdata/pkgdata.inc.in
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/pkgdata.inc.in
diff --git a/Build/source/libs/icu-xetex/test/testdata/ra.txt b/Build/source/libs/icu/icu-xetex/test/testdata/ra.txt
index a94e0b3c21d..a94e0b3c21d 100644
--- a/Build/source/libs/icu-xetex/test/testdata/ra.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/ra.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/ra.xlf b/Build/source/libs/icu/icu-xetex/test/testdata/ra.xlf
index 86a56080a31..86a56080a31 100644
--- a/Build/source/libs/icu-xetex/test/testdata/ra.xlf
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/ra.xlf
diff --git a/Build/source/libs/icu-xetex/test/testdata/rbbitst.txt b/Build/source/libs/icu/icu-xetex/test/testdata/rbbitst.txt
index 9cb3147341c..9cb3147341c 100644
--- a/Build/source/libs/icu-xetex/test/testdata/rbbitst.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/rbbitst.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/re_tests.txt b/Build/source/libs/icu/icu-xetex/test/testdata/re_tests.txt
index 910ff3f2eff..910ff3f2eff 100644
--- a/Build/source/libs/icu-xetex/test/testdata/re_tests.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/re_tests.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/readme.txt b/Build/source/libs/icu/icu-xetex/test/testdata/readme.txt
index cb9bc2855a2..cb9bc2855a2 100644
--- a/Build/source/libs/icu-xetex/test/testdata/readme.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/readme.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/regextst.txt b/Build/source/libs/icu/icu-xetex/test/testdata/regextst.txt
index afc274e84ef..afc274e84ef 100644
--- a/Build/source/libs/icu-xetex/test/testdata/regextst.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/regextst.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/riwords.txt b/Build/source/libs/icu/icu-xetex/test/testdata/riwords.txt
index 67dab277590..67dab277590 100644
--- a/Build/source/libs/icu-xetex/test/testdata/riwords.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/riwords.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/root.txt b/Build/source/libs/icu/icu-xetex/test/testdata/root.txt
index dc5d7982ffe..dc5d7982ffe 100644
--- a/Build/source/libs/icu-xetex/test/testdata/root.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/root.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/sh.txt b/Build/source/libs/icu/icu-xetex/test/testdata/sh.txt
index 0519dadac21..0519dadac21 100644
--- a/Build/source/libs/icu-xetex/test/testdata/sh.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/sh.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/sh_YU.txt b/Build/source/libs/icu/icu-xetex/test/testdata/sh_YU.txt
index bdd009d8b02..bdd009d8b02 100644
--- a/Build/source/libs/icu-xetex/test/testdata/sh_YU.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/sh_YU.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/structLocale.txt b/Build/source/libs/icu/icu-xetex/test/testdata/structLocale.txt
index 9a540119db4..9a540119db4 100644
--- a/Build/source/libs/icu-xetex/test/testdata/structLocale.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/structLocale.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/te.txt b/Build/source/libs/icu/icu-xetex/test/testdata/te.txt
index 3a83c82cf4e..3a83c82cf4e 100644
--- a/Build/source/libs/icu-xetex/test/testdata/te.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/te.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/te_IN.txt b/Build/source/libs/icu/icu-xetex/test/testdata/te_IN.txt
index 6d2aa73b058..6d2aa73b058 100644
--- a/Build/source/libs/icu-xetex/test/testdata/te_IN.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/te_IN.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/te_IN_REVISED.txt b/Build/source/libs/icu/icu-xetex/test/testdata/te_IN_REVISED.txt
index 18efd30b7b4..18efd30b7b4 100644
--- a/Build/source/libs/icu-xetex/test/testdata/te_IN_REVISED.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/te_IN_REVISED.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/test1.ucm b/Build/source/libs/icu/icu-xetex/test/testdata/test1.ucm
index b4da4768a58..b4da4768a58 100644
--- a/Build/source/libs/icu-xetex/test/testdata/test1.ucm
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/test1.ucm
diff --git a/Build/source/libs/icu-xetex/test/testdata/test3.ucm b/Build/source/libs/icu/icu-xetex/test/testdata/test3.ucm
index aee69c28982..aee69c28982 100644
--- a/Build/source/libs/icu-xetex/test/testdata/test3.ucm
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/test3.ucm
diff --git a/Build/source/libs/icu-xetex/test/testdata/test4.ucm b/Build/source/libs/icu/icu-xetex/test/testdata/test4.ucm
index 3b0aad0f0a8..3b0aad0f0a8 100644
--- a/Build/source/libs/icu-xetex/test/testdata/test4.ucm
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/test4.ucm
diff --git a/Build/source/libs/icu-xetex/test/testdata/test4x.ucm b/Build/source/libs/icu/icu-xetex/test/testdata/test4x.ucm
index c7692aaece8..c7692aaece8 100644
--- a/Build/source/libs/icu-xetex/test/testdata/test4x.ucm
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/test4x.ucm
diff --git a/Build/source/libs/icu-xetex/test/testdata/testaliases.txt b/Build/source/libs/icu/icu-xetex/test/testdata/testaliases.txt
index 1ae48be88cf..1ae48be88cf 100644
--- a/Build/source/libs/icu-xetex/test/testdata/testaliases.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/testaliases.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/testdata.mak b/Build/source/libs/icu/icu-xetex/test/testdata/testdata.mak
index 3bd1585d87d..3bd1585d87d 100644
--- a/Build/source/libs/icu-xetex/test/testdata/testdata.mak
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/testdata.mak
diff --git a/Build/source/libs/icu-xetex/test/testdata/testempty.txt b/Build/source/libs/icu/icu-xetex/test/testdata/testempty.txt
index 98cf164788f..98cf164788f 100644
--- a/Build/source/libs/icu-xetex/test/testdata/testempty.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/testempty.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/testtypes.txt b/Build/source/libs/icu/icu-xetex/test/testdata/testtypes.txt
index df5b4627efc..df5b4627efc 100644
--- a/Build/source/libs/icu-xetex/test/testdata/testtypes.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/testtypes.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/translit_rules.txt b/Build/source/libs/icu/icu-xetex/test/testdata/translit_rules.txt
index b45837d691f..b45837d691f 100644
--- a/Build/source/libs/icu-xetex/test/testdata/translit_rules.txt
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/translit_rules.txt
diff --git a/Build/source/libs/icu-xetex/test/testdata/tstfiles.mk b/Build/source/libs/icu/icu-xetex/test/testdata/tstfiles.mk
index 8ba8d45593c..8ba8d45593c 100644
--- a/Build/source/libs/icu-xetex/test/testdata/tstfiles.mk
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/tstfiles.mk
diff --git a/Build/source/libs/icu-xetex/test/testdata/uni-text.bin b/Build/source/libs/icu/icu-xetex/test/testdata/uni-text.bin
index 08adec348a5..08adec348a5 100644
--- a/Build/source/libs/icu-xetex/test/testdata/uni-text.bin
+++ b/Build/source/libs/icu/icu-xetex/test/testdata/uni-text.bin
diff --git a/Build/source/libs/icu-xetex/test/testmap/Makefile.in b/Build/source/libs/icu/icu-xetex/test/testmap/Makefile.in
index 9499b2c942e..9499b2c942e 100644
--- a/Build/source/libs/icu-xetex/test/testmap/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/test/testmap/Makefile.in
diff --git a/Build/source/libs/icu-xetex/test/testmap/testmap.c b/Build/source/libs/icu/icu-xetex/test/testmap/testmap.c
index 793faa18f47..793faa18f47 100644
--- a/Build/source/libs/icu-xetex/test/testmap/testmap.c
+++ b/Build/source/libs/icu/icu-xetex/test/testmap/testmap.c
diff --git a/Build/source/libs/icu-xetex/test/testmap/testmap.dsp b/Build/source/libs/icu/icu-xetex/test/testmap/testmap.dsp
index c2b49ad8ea0..c2b49ad8ea0 100644
--- a/Build/source/libs/icu-xetex/test/testmap/testmap.dsp
+++ b/Build/source/libs/icu/icu-xetex/test/testmap/testmap.dsp
diff --git a/Build/source/libs/icu-xetex/test/thaitest/Makefile.in b/Build/source/libs/icu/icu-xetex/test/thaitest/Makefile.in
index 63cc7b7f632..63cc7b7f632 100644
--- a/Build/source/libs/icu-xetex/test/thaitest/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/test/thaitest/Makefile.in
diff --git a/Build/source/libs/icu-xetex/test/thaitest/space.txt b/Build/source/libs/icu/icu-xetex/test/thaitest/space.txt
index f89194260ed..f89194260ed 100644
--- a/Build/source/libs/icu-xetex/test/thaitest/space.txt
+++ b/Build/source/libs/icu/icu-xetex/test/thaitest/space.txt
diff --git a/Build/source/libs/icu-xetex/test/thaitest/thaitest.cpp b/Build/source/libs/icu/icu-xetex/test/thaitest/thaitest.cpp
index 657fab433c0..657fab433c0 100644
--- a/Build/source/libs/icu-xetex/test/thaitest/thaitest.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/thaitest/thaitest.cpp
diff --git a/Build/source/libs/icu-xetex/test/thaitest/thaitest.dsp b/Build/source/libs/icu/icu-xetex/test/thaitest/thaitest.dsp
index 3aecea249fa..3aecea249fa 100644
--- a/Build/source/libs/icu-xetex/test/thaitest/thaitest.dsp
+++ b/Build/source/libs/icu/icu-xetex/test/thaitest/thaitest.dsp
diff --git a/Build/source/libs/icu-xetex/test/threadtest/Makefile.in b/Build/source/libs/icu/icu-xetex/test/threadtest/Makefile.in
index 8d268925fbc..8d268925fbc 100644
--- a/Build/source/libs/icu-xetex/test/threadtest/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/test/threadtest/Makefile.in
diff --git a/Build/source/libs/icu-xetex/test/threadtest/converttest.cpp b/Build/source/libs/icu/icu-xetex/test/threadtest/converttest.cpp
index 8de22efa786..8de22efa786 100644
--- a/Build/source/libs/icu-xetex/test/threadtest/converttest.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/threadtest/converttest.cpp
diff --git a/Build/source/libs/icu-xetex/test/threadtest/stringtest.cpp b/Build/source/libs/icu/icu-xetex/test/threadtest/stringtest.cpp
index 2380a3c7713..2380a3c7713 100644
--- a/Build/source/libs/icu-xetex/test/threadtest/stringtest.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/threadtest/stringtest.cpp
diff --git a/Build/source/libs/icu-xetex/test/threadtest/threadtest.cpp b/Build/source/libs/icu/icu-xetex/test/threadtest/threadtest.cpp
index 7891a888f19..7891a888f19 100644
--- a/Build/source/libs/icu-xetex/test/threadtest/threadtest.cpp
+++ b/Build/source/libs/icu/icu-xetex/test/threadtest/threadtest.cpp
diff --git a/Build/source/libs/icu-xetex/test/threadtest/threadtest.dsp b/Build/source/libs/icu/icu-xetex/test/threadtest/threadtest.dsp
index 385111507d9..385111507d9 100644
--- a/Build/source/libs/icu-xetex/test/threadtest/threadtest.dsp
+++ b/Build/source/libs/icu/icu-xetex/test/threadtest/threadtest.dsp
diff --git a/Build/source/libs/icu-xetex/test/threadtest/threadtest.dsw b/Build/source/libs/icu/icu-xetex/test/threadtest/threadtest.dsw
index 485fcb290e2..485fcb290e2 100644
--- a/Build/source/libs/icu-xetex/test/threadtest/threadtest.dsw
+++ b/Build/source/libs/icu/icu-xetex/test/threadtest/threadtest.dsw
diff --git a/Build/source/libs/icu-xetex/test/threadtest/threadtest.h b/Build/source/libs/icu/icu-xetex/test/threadtest/threadtest.h
index 1cb38803969..1cb38803969 100644
--- a/Build/source/libs/icu-xetex/test/threadtest/threadtest.h
+++ b/Build/source/libs/icu/icu-xetex/test/threadtest/threadtest.h
diff --git a/Build/source/libs/icu-xetex/tools/Makefile.in b/Build/source/libs/icu/icu-xetex/tools/Makefile.in
index da7c907b686..da7c907b686 100644
--- a/Build/source/libs/icu-xetex/tools/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/tools/Makefile.in
diff --git a/Build/source/libs/icu-xetex/tools/cpysearch/cpyscan.pl b/Build/source/libs/icu/icu-xetex/tools/cpysearch/cpyscan.pl
index b386bfde974..b386bfde974 100755
--- a/Build/source/libs/icu-xetex/tools/cpysearch/cpyscan.pl
+++ b/Build/source/libs/icu/icu-xetex/tools/cpysearch/cpyscan.pl
diff --git a/Build/source/libs/icu-xetex/tools/cpysearch/cpysearch.pl b/Build/source/libs/icu/icu-xetex/tools/cpysearch/cpysearch.pl
index dd4a7de53d0..dd4a7de53d0 100755
--- a/Build/source/libs/icu-xetex/tools/cpysearch/cpysearch.pl
+++ b/Build/source/libs/icu/icu-xetex/tools/cpysearch/cpysearch.pl
diff --git a/Build/source/libs/icu-xetex/tools/cpysearch/cpyskip.txt b/Build/source/libs/icu/icu-xetex/tools/cpysearch/cpyskip.txt
index f137004123a..f137004123a 100644
--- a/Build/source/libs/icu-xetex/tools/cpysearch/cpyskip.txt
+++ b/Build/source/libs/icu/icu-xetex/tools/cpysearch/cpyskip.txt
diff --git a/Build/source/libs/icu-xetex/tools/cpysearch/readme.txt b/Build/source/libs/icu/icu-xetex/tools/cpysearch/readme.txt
index bb1d5a66499..bb1d5a66499 100644
--- a/Build/source/libs/icu-xetex/tools/cpysearch/readme.txt
+++ b/Build/source/libs/icu/icu-xetex/tools/cpysearch/readme.txt
diff --git a/Build/source/libs/icu-xetex/tools/ctestfw/Makefile.in b/Build/source/libs/icu/icu-xetex/tools/ctestfw/Makefile.in
index 4651a2fbd65..4651a2fbd65 100644
--- a/Build/source/libs/icu-xetex/tools/ctestfw/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/tools/ctestfw/Makefile.in
diff --git a/Build/source/libs/icu-xetex/tools/ctestfw/ctest.c b/Build/source/libs/icu/icu-xetex/tools/ctestfw/ctest.c
index d99450b1d62..d99450b1d62 100644
--- a/Build/source/libs/icu-xetex/tools/ctestfw/ctest.c
+++ b/Build/source/libs/icu/icu-xetex/tools/ctestfw/ctest.c
diff --git a/Build/source/libs/icu-xetex/tools/ctestfw/ctestfw.vcproj b/Build/source/libs/icu/icu-xetex/tools/ctestfw/ctestfw.vcproj
index a3d3b326a65..a3d3b326a65 100644
--- a/Build/source/libs/icu-xetex/tools/ctestfw/ctestfw.vcproj
+++ b/Build/source/libs/icu/icu-xetex/tools/ctestfw/ctestfw.vcproj
diff --git a/Build/source/libs/icu-xetex/tools/ctestfw/datamap.cpp b/Build/source/libs/icu/icu-xetex/tools/ctestfw/datamap.cpp
index c59447c8a7e..c59447c8a7e 100644
--- a/Build/source/libs/icu-xetex/tools/ctestfw/datamap.cpp
+++ b/Build/source/libs/icu/icu-xetex/tools/ctestfw/datamap.cpp
diff --git a/Build/source/libs/icu-xetex/tools/ctestfw/dbgutil.cpp b/Build/source/libs/icu/icu-xetex/tools/ctestfw/dbgutil.cpp
index 46c7f0c05e4..46c7f0c05e4 100644
--- a/Build/source/libs/icu-xetex/tools/ctestfw/dbgutil.cpp
+++ b/Build/source/libs/icu/icu-xetex/tools/ctestfw/dbgutil.cpp
diff --git a/Build/source/libs/icu-xetex/tools/ctestfw/testdata.cpp b/Build/source/libs/icu/icu-xetex/tools/ctestfw/testdata.cpp
index 0925cb59e9c..0925cb59e9c 100644
--- a/Build/source/libs/icu-xetex/tools/ctestfw/testdata.cpp
+++ b/Build/source/libs/icu/icu-xetex/tools/ctestfw/testdata.cpp
diff --git a/Build/source/libs/icu-xetex/tools/ctestfw/tstdtmod.cpp b/Build/source/libs/icu/icu-xetex/tools/ctestfw/tstdtmod.cpp
index 2f050296c37..2f050296c37 100644
--- a/Build/source/libs/icu-xetex/tools/ctestfw/tstdtmod.cpp
+++ b/Build/source/libs/icu/icu-xetex/tools/ctestfw/tstdtmod.cpp
diff --git a/Build/source/libs/icu-xetex/tools/ctestfw/udbgutil.cpp b/Build/source/libs/icu/icu-xetex/tools/ctestfw/udbgutil.cpp
index c4f55966b17..c4f55966b17 100644
--- a/Build/source/libs/icu-xetex/tools/ctestfw/udbgutil.cpp
+++ b/Build/source/libs/icu/icu-xetex/tools/ctestfw/udbgutil.cpp
diff --git a/Build/source/libs/icu-xetex/tools/ctestfw/unicode/ctest.h b/Build/source/libs/icu/icu-xetex/tools/ctestfw/unicode/ctest.h
index 9c2f04c5ee7..9c2f04c5ee7 100644
--- a/Build/source/libs/icu-xetex/tools/ctestfw/unicode/ctest.h
+++ b/Build/source/libs/icu/icu-xetex/tools/ctestfw/unicode/ctest.h
diff --git a/Build/source/libs/icu-xetex/tools/ctestfw/unicode/datamap.h b/Build/source/libs/icu/icu-xetex/tools/ctestfw/unicode/datamap.h
index 00d8b05eaca..00d8b05eaca 100644
--- a/Build/source/libs/icu-xetex/tools/ctestfw/unicode/datamap.h
+++ b/Build/source/libs/icu/icu-xetex/tools/ctestfw/unicode/datamap.h
diff --git a/Build/source/libs/icu-xetex/tools/ctestfw/unicode/dbgutil.h b/Build/source/libs/icu/icu-xetex/tools/ctestfw/unicode/dbgutil.h
index e4d9cc7f1a8..e4d9cc7f1a8 100644
--- a/Build/source/libs/icu-xetex/tools/ctestfw/unicode/dbgutil.h
+++ b/Build/source/libs/icu/icu-xetex/tools/ctestfw/unicode/dbgutil.h
diff --git a/Build/source/libs/icu-xetex/tools/ctestfw/unicode/testdata.h b/Build/source/libs/icu/icu-xetex/tools/ctestfw/unicode/testdata.h
index a248bf568dc..a248bf568dc 100644
--- a/Build/source/libs/icu-xetex/tools/ctestfw/unicode/testdata.h
+++ b/Build/source/libs/icu/icu-xetex/tools/ctestfw/unicode/testdata.h
diff --git a/Build/source/libs/icu-xetex/tools/ctestfw/unicode/testlog.h b/Build/source/libs/icu/icu-xetex/tools/ctestfw/unicode/testlog.h
index a6c8f0d1f0c..a6c8f0d1f0c 100644
--- a/Build/source/libs/icu-xetex/tools/ctestfw/unicode/testlog.h
+++ b/Build/source/libs/icu/icu-xetex/tools/ctestfw/unicode/testlog.h
diff --git a/Build/source/libs/icu-xetex/tools/ctestfw/unicode/testtype.h b/Build/source/libs/icu/icu-xetex/tools/ctestfw/unicode/testtype.h
index 6deb1cdff09..6deb1cdff09 100644
--- a/Build/source/libs/icu-xetex/tools/ctestfw/unicode/testtype.h
+++ b/Build/source/libs/icu/icu-xetex/tools/ctestfw/unicode/testtype.h
diff --git a/Build/source/libs/icu-xetex/tools/ctestfw/unicode/tstdtmod.h b/Build/source/libs/icu/icu-xetex/tools/ctestfw/unicode/tstdtmod.h
index 06799b5f688..06799b5f688 100644
--- a/Build/source/libs/icu-xetex/tools/ctestfw/unicode/tstdtmod.h
+++ b/Build/source/libs/icu/icu-xetex/tools/ctestfw/unicode/tstdtmod.h
diff --git a/Build/source/libs/icu-xetex/tools/ctestfw/unicode/udbgutil.h b/Build/source/libs/icu/icu-xetex/tools/ctestfw/unicode/udbgutil.h
index e1decd4d026..e1decd4d026 100644
--- a/Build/source/libs/icu-xetex/tools/ctestfw/unicode/udbgutil.h
+++ b/Build/source/libs/icu/icu-xetex/tools/ctestfw/unicode/udbgutil.h
diff --git a/Build/source/libs/icu-xetex/tools/ctestfw/unicode/uperf.h b/Build/source/libs/icu/icu-xetex/tools/ctestfw/unicode/uperf.h
index 5568f0e6652..5568f0e6652 100644
--- a/Build/source/libs/icu-xetex/tools/ctestfw/unicode/uperf.h
+++ b/Build/source/libs/icu/icu-xetex/tools/ctestfw/unicode/uperf.h
diff --git a/Build/source/libs/icu-xetex/tools/ctestfw/unicode/utimer.h b/Build/source/libs/icu/icu-xetex/tools/ctestfw/unicode/utimer.h
index e08deae0555..e08deae0555 100644
--- a/Build/source/libs/icu-xetex/tools/ctestfw/unicode/utimer.h
+++ b/Build/source/libs/icu/icu-xetex/tools/ctestfw/unicode/utimer.h
diff --git a/Build/source/libs/icu-xetex/tools/ctestfw/uperf.cpp b/Build/source/libs/icu/icu-xetex/tools/ctestfw/uperf.cpp
index 5b2dbe667b0..5b2dbe667b0 100644
--- a/Build/source/libs/icu-xetex/tools/ctestfw/uperf.cpp
+++ b/Build/source/libs/icu/icu-xetex/tools/ctestfw/uperf.cpp
diff --git a/Build/source/libs/icu-xetex/tools/dumpce/Makefile.in b/Build/source/libs/icu/icu-xetex/tools/dumpce/Makefile.in
index 81f6808b047..81f6808b047 100644
--- a/Build/source/libs/icu-xetex/tools/dumpce/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/tools/dumpce/Makefile.in
diff --git a/Build/source/libs/icu-xetex/tools/dumpce/dumpce.cpp b/Build/source/libs/icu/icu-xetex/tools/dumpce/dumpce.cpp
index 47792faafd5..47792faafd5 100644
--- a/Build/source/libs/icu-xetex/tools/dumpce/dumpce.cpp
+++ b/Build/source/libs/icu/icu-xetex/tools/dumpce/dumpce.cpp
diff --git a/Build/source/libs/icu-xetex/tools/dumpce/dumpce.dsp b/Build/source/libs/icu/icu-xetex/tools/dumpce/dumpce.dsp
index 704b9e81c62..704b9e81c62 100644
--- a/Build/source/libs/icu-xetex/tools/dumpce/dumpce.dsp
+++ b/Build/source/libs/icu/icu-xetex/tools/dumpce/dumpce.dsp
diff --git a/Build/source/libs/icu-xetex/tools/dumpce/dumpce.dsw b/Build/source/libs/icu/icu-xetex/tools/dumpce/dumpce.dsw
index 31792b1cdce..31792b1cdce 100644
--- a/Build/source/libs/icu-xetex/tools/dumpce/dumpce.dsw
+++ b/Build/source/libs/icu/icu-xetex/tools/dumpce/dumpce.dsw
diff --git a/Build/source/libs/icu-xetex/tools/genbidi/Makefile.in b/Build/source/libs/icu/icu-xetex/tools/genbidi/Makefile.in
index 2f93e7d6179..2f93e7d6179 100644
--- a/Build/source/libs/icu-xetex/tools/genbidi/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/tools/genbidi/Makefile.in
diff --git a/Build/source/libs/icu-xetex/tools/genbidi/genbidi.c b/Build/source/libs/icu/icu-xetex/tools/genbidi/genbidi.c
index 4e21925fb5d..4e21925fb5d 100644
--- a/Build/source/libs/icu-xetex/tools/genbidi/genbidi.c
+++ b/Build/source/libs/icu/icu-xetex/tools/genbidi/genbidi.c
diff --git a/Build/source/libs/icu-xetex/tools/genbidi/genbidi.h b/Build/source/libs/icu/icu-xetex/tools/genbidi/genbidi.h
index a6fc8d571a2..a6fc8d571a2 100644
--- a/Build/source/libs/icu-xetex/tools/genbidi/genbidi.h
+++ b/Build/source/libs/icu/icu-xetex/tools/genbidi/genbidi.h
diff --git a/Build/source/libs/icu-xetex/tools/genbidi/genbidi.vcproj b/Build/source/libs/icu/icu-xetex/tools/genbidi/genbidi.vcproj
index 9f2a7a2260a..9f2a7a2260a 100644
--- a/Build/source/libs/icu-xetex/tools/genbidi/genbidi.vcproj
+++ b/Build/source/libs/icu/icu-xetex/tools/genbidi/genbidi.vcproj
diff --git a/Build/source/libs/icu-xetex/tools/genbidi/store.c b/Build/source/libs/icu/icu-xetex/tools/genbidi/store.c
index 9a5b5bb1fa1..9a5b5bb1fa1 100644
--- a/Build/source/libs/icu-xetex/tools/genbidi/store.c
+++ b/Build/source/libs/icu/icu-xetex/tools/genbidi/store.c
diff --git a/Build/source/libs/icu-xetex/tools/genbrk/Makefile.in b/Build/source/libs/icu/icu-xetex/tools/genbrk/Makefile.in
index 5884cef323d..5884cef323d 100644
--- a/Build/source/libs/icu-xetex/tools/genbrk/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/tools/genbrk/Makefile.in
diff --git a/Build/source/libs/icu-xetex/tools/genbrk/genbrk.1.in b/Build/source/libs/icu/icu-xetex/tools/genbrk/genbrk.1.in
index a6e214a9791..a6e214a9791 100644
--- a/Build/source/libs/icu-xetex/tools/genbrk/genbrk.1.in
+++ b/Build/source/libs/icu/icu-xetex/tools/genbrk/genbrk.1.in
diff --git a/Build/source/libs/icu-xetex/tools/genbrk/genbrk.cpp b/Build/source/libs/icu/icu-xetex/tools/genbrk/genbrk.cpp
index ddbcfc2d575..ddbcfc2d575 100644
--- a/Build/source/libs/icu-xetex/tools/genbrk/genbrk.cpp
+++ b/Build/source/libs/icu/icu-xetex/tools/genbrk/genbrk.cpp
diff --git a/Build/source/libs/icu-xetex/tools/genbrk/genbrk.vcproj b/Build/source/libs/icu/icu-xetex/tools/genbrk/genbrk.vcproj
index 2289a3c54c5..2289a3c54c5 100644
--- a/Build/source/libs/icu-xetex/tools/genbrk/genbrk.vcproj
+++ b/Build/source/libs/icu/icu-xetex/tools/genbrk/genbrk.vcproj
diff --git a/Build/source/libs/icu-xetex/tools/gencase/Makefile.in b/Build/source/libs/icu/icu-xetex/tools/gencase/Makefile.in
index 7ab1d619dde..7ab1d619dde 100644
--- a/Build/source/libs/icu-xetex/tools/gencase/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/tools/gencase/Makefile.in
diff --git a/Build/source/libs/icu-xetex/tools/gencase/gencase.c b/Build/source/libs/icu/icu-xetex/tools/gencase/gencase.c
index af54e9d8a6e..af54e9d8a6e 100644
--- a/Build/source/libs/icu-xetex/tools/gencase/gencase.c
+++ b/Build/source/libs/icu/icu-xetex/tools/gencase/gencase.c
diff --git a/Build/source/libs/icu-xetex/tools/gencase/gencase.h b/Build/source/libs/icu/icu-xetex/tools/gencase/gencase.h
index 8b09cb2dfd1..8b09cb2dfd1 100644
--- a/Build/source/libs/icu-xetex/tools/gencase/gencase.h
+++ b/Build/source/libs/icu/icu-xetex/tools/gencase/gencase.h
diff --git a/Build/source/libs/icu-xetex/tools/gencase/gencase.vcproj b/Build/source/libs/icu/icu-xetex/tools/gencase/gencase.vcproj
index 445880f7b5b..445880f7b5b 100644
--- a/Build/source/libs/icu-xetex/tools/gencase/gencase.vcproj
+++ b/Build/source/libs/icu/icu-xetex/tools/gencase/gencase.vcproj
diff --git a/Build/source/libs/icu-xetex/tools/gencase/store.c b/Build/source/libs/icu/icu-xetex/tools/gencase/store.c
index 90d3abf8d71..90d3abf8d71 100644
--- a/Build/source/libs/icu-xetex/tools/gencase/store.c
+++ b/Build/source/libs/icu/icu-xetex/tools/gencase/store.c
diff --git a/Build/source/libs/icu-xetex/tools/genccode/Makefile.in b/Build/source/libs/icu/icu-xetex/tools/genccode/Makefile.in
index a1d8e06c417..a1d8e06c417 100644
--- a/Build/source/libs/icu-xetex/tools/genccode/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/tools/genccode/Makefile.in
diff --git a/Build/source/libs/icu-xetex/tools/genccode/genccode.8.in b/Build/source/libs/icu/icu-xetex/tools/genccode/genccode.8.in
index add079edfb0..add079edfb0 100644
--- a/Build/source/libs/icu-xetex/tools/genccode/genccode.8.in
+++ b/Build/source/libs/icu/icu-xetex/tools/genccode/genccode.8.in
diff --git a/Build/source/libs/icu-xetex/tools/genccode/genccode.c b/Build/source/libs/icu/icu-xetex/tools/genccode/genccode.c
index 291ca22952c..291ca22952c 100644
--- a/Build/source/libs/icu-xetex/tools/genccode/genccode.c
+++ b/Build/source/libs/icu/icu-xetex/tools/genccode/genccode.c
diff --git a/Build/source/libs/icu-xetex/tools/genccode/genccode.vcproj b/Build/source/libs/icu/icu-xetex/tools/genccode/genccode.vcproj
index 24f63263113..24f63263113 100644
--- a/Build/source/libs/icu-xetex/tools/genccode/genccode.vcproj
+++ b/Build/source/libs/icu/icu-xetex/tools/genccode/genccode.vcproj
diff --git a/Build/source/libs/icu-xetex/tools/gencmn/Makefile.in b/Build/source/libs/icu/icu-xetex/tools/gencmn/Makefile.in
index 72ddfc39df3..72ddfc39df3 100644
--- a/Build/source/libs/icu-xetex/tools/gencmn/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/tools/gencmn/Makefile.in
diff --git a/Build/source/libs/icu-xetex/tools/gencmn/gencmn.8.in b/Build/source/libs/icu/icu-xetex/tools/gencmn/gencmn.8.in
index 1bb7ab7c672..1bb7ab7c672 100644
--- a/Build/source/libs/icu-xetex/tools/gencmn/gencmn.8.in
+++ b/Build/source/libs/icu/icu-xetex/tools/gencmn/gencmn.8.in
diff --git a/Build/source/libs/icu-xetex/tools/gencmn/gencmn.c b/Build/source/libs/icu/icu-xetex/tools/gencmn/gencmn.c
index 3b4c683504d..3b4c683504d 100644
--- a/Build/source/libs/icu-xetex/tools/gencmn/gencmn.c
+++ b/Build/source/libs/icu/icu-xetex/tools/gencmn/gencmn.c
diff --git a/Build/source/libs/icu-xetex/tools/gencmn/gencmn.vcproj b/Build/source/libs/icu/icu-xetex/tools/gencmn/gencmn.vcproj
index 070f275ebb7..070f275ebb7 100644
--- a/Build/source/libs/icu-xetex/tools/gencmn/gencmn.vcproj
+++ b/Build/source/libs/icu/icu-xetex/tools/gencmn/gencmn.vcproj
diff --git a/Build/source/libs/icu-xetex/tools/gencnval/Makefile.in b/Build/source/libs/icu/icu-xetex/tools/gencnval/Makefile.in
index c4c2ab56be8..c4c2ab56be8 100644
--- a/Build/source/libs/icu-xetex/tools/gencnval/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/tools/gencnval/Makefile.in
diff --git a/Build/source/libs/icu-xetex/tools/gencnval/gencnval.1.in b/Build/source/libs/icu/icu-xetex/tools/gencnval/gencnval.1.in
index e9e65964218..e9e65964218 100644
--- a/Build/source/libs/icu-xetex/tools/gencnval/gencnval.1.in
+++ b/Build/source/libs/icu/icu-xetex/tools/gencnval/gencnval.1.in
diff --git a/Build/source/libs/icu-xetex/tools/gencnval/gencnval.c b/Build/source/libs/icu/icu-xetex/tools/gencnval/gencnval.c
index 83eebd9cc4e..83eebd9cc4e 100644
--- a/Build/source/libs/icu-xetex/tools/gencnval/gencnval.c
+++ b/Build/source/libs/icu/icu-xetex/tools/gencnval/gencnval.c
diff --git a/Build/source/libs/icu-xetex/tools/gencnval/gencnval.vcproj b/Build/source/libs/icu/icu-xetex/tools/gencnval/gencnval.vcproj
index 5b1ebe48c35..5b1ebe48c35 100644
--- a/Build/source/libs/icu-xetex/tools/gencnval/gencnval.vcproj
+++ b/Build/source/libs/icu/icu-xetex/tools/gencnval/gencnval.vcproj
diff --git a/Build/source/libs/icu-xetex/tools/genctd/Makefile.in b/Build/source/libs/icu/icu-xetex/tools/genctd/Makefile.in
index daefb61b37f..daefb61b37f 100644
--- a/Build/source/libs/icu-xetex/tools/genctd/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/tools/genctd/Makefile.in
diff --git a/Build/source/libs/icu-xetex/tools/genctd/genctd.1.in b/Build/source/libs/icu/icu-xetex/tools/genctd/genctd.1.in
index de5a7e4d6a3..de5a7e4d6a3 100644
--- a/Build/source/libs/icu-xetex/tools/genctd/genctd.1.in
+++ b/Build/source/libs/icu/icu-xetex/tools/genctd/genctd.1.in
diff --git a/Build/source/libs/icu-xetex/tools/genctd/genctd.cpp b/Build/source/libs/icu/icu-xetex/tools/genctd/genctd.cpp
index 1b114ec28e5..1b114ec28e5 100644
--- a/Build/source/libs/icu-xetex/tools/genctd/genctd.cpp
+++ b/Build/source/libs/icu/icu-xetex/tools/genctd/genctd.cpp
diff --git a/Build/source/libs/icu-xetex/tools/genctd/genctd.vcproj b/Build/source/libs/icu/icu-xetex/tools/genctd/genctd.vcproj
index 54a25cd047a..54a25cd047a 100644
--- a/Build/source/libs/icu-xetex/tools/genctd/genctd.vcproj
+++ b/Build/source/libs/icu/icu-xetex/tools/genctd/genctd.vcproj
diff --git a/Build/source/libs/icu-xetex/tools/gendraft/exclude.txt b/Build/source/libs/icu/icu-xetex/tools/gendraft/exclude.txt
index 9f5c31988a2..9f5c31988a2 100644
--- a/Build/source/libs/icu-xetex/tools/gendraft/exclude.txt
+++ b/Build/source/libs/icu/icu-xetex/tools/gendraft/exclude.txt
diff --git a/Build/source/libs/icu-xetex/tools/gendraft/genheaders.pl b/Build/source/libs/icu/icu-xetex/tools/gendraft/genheaders.pl
index 6f83b2dfa85..6f83b2dfa85 100755
--- a/Build/source/libs/icu-xetex/tools/gendraft/genheaders.pl
+++ b/Build/source/libs/icu/icu-xetex/tools/gendraft/genheaders.pl
diff --git a/Build/source/libs/icu-xetex/tools/gennames/Makefile.in b/Build/source/libs/icu/icu-xetex/tools/gennames/Makefile.in
index ed2f88f3fd8..ed2f88f3fd8 100644
--- a/Build/source/libs/icu-xetex/tools/gennames/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/tools/gennames/Makefile.in
diff --git a/Build/source/libs/icu-xetex/tools/gennames/gennames.c b/Build/source/libs/icu/icu-xetex/tools/gennames/gennames.c
index 8a50acc0efc..8a50acc0efc 100644
--- a/Build/source/libs/icu-xetex/tools/gennames/gennames.c
+++ b/Build/source/libs/icu/icu-xetex/tools/gennames/gennames.c
diff --git a/Build/source/libs/icu-xetex/tools/gennames/gennames.vcproj b/Build/source/libs/icu/icu-xetex/tools/gennames/gennames.vcproj
index 1ac7db3c1eb..1ac7db3c1eb 100644
--- a/Build/source/libs/icu-xetex/tools/gennames/gennames.vcproj
+++ b/Build/source/libs/icu/icu-xetex/tools/gennames/gennames.vcproj
diff --git a/Build/source/libs/icu-xetex/tools/gennorm/Makefile.in b/Build/source/libs/icu/icu-xetex/tools/gennorm/Makefile.in
index baec685901f..baec685901f 100644
--- a/Build/source/libs/icu-xetex/tools/gennorm/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/tools/gennorm/Makefile.in
diff --git a/Build/source/libs/icu-xetex/tools/gennorm/gennorm.c b/Build/source/libs/icu/icu-xetex/tools/gennorm/gennorm.c
index 69a12e30db6..69a12e30db6 100644
--- a/Build/source/libs/icu-xetex/tools/gennorm/gennorm.c
+++ b/Build/source/libs/icu/icu-xetex/tools/gennorm/gennorm.c
diff --git a/Build/source/libs/icu-xetex/tools/gennorm/gennorm.h b/Build/source/libs/icu/icu-xetex/tools/gennorm/gennorm.h
index ea33d957098..ea33d957098 100644
--- a/Build/source/libs/icu-xetex/tools/gennorm/gennorm.h
+++ b/Build/source/libs/icu/icu-xetex/tools/gennorm/gennorm.h
diff --git a/Build/source/libs/icu-xetex/tools/gennorm/gennorm.vcproj b/Build/source/libs/icu/icu-xetex/tools/gennorm/gennorm.vcproj
index 62d16f05797..62d16f05797 100644
--- a/Build/source/libs/icu-xetex/tools/gennorm/gennorm.vcproj
+++ b/Build/source/libs/icu/icu-xetex/tools/gennorm/gennorm.vcproj
diff --git a/Build/source/libs/icu-xetex/tools/gennorm/store.c b/Build/source/libs/icu/icu-xetex/tools/gennorm/store.c
index e0e4051b9fe..e0e4051b9fe 100644
--- a/Build/source/libs/icu-xetex/tools/gennorm/store.c
+++ b/Build/source/libs/icu/icu-xetex/tools/gennorm/store.c
diff --git a/Build/source/libs/icu-xetex/tools/genpname/Makefile.in b/Build/source/libs/icu/icu-xetex/tools/genpname/Makefile.in
index 0a592a9f913..0a592a9f913 100644
--- a/Build/source/libs/icu-xetex/tools/genpname/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/tools/genpname/Makefile.in
diff --git a/Build/source/libs/icu-xetex/tools/genpname/SyntheticPropertyAliases.txt b/Build/source/libs/icu/icu-xetex/tools/genpname/SyntheticPropertyAliases.txt
index 77d71f23b36..77d71f23b36 100644
--- a/Build/source/libs/icu-xetex/tools/genpname/SyntheticPropertyAliases.txt
+++ b/Build/source/libs/icu/icu-xetex/tools/genpname/SyntheticPropertyAliases.txt
diff --git a/Build/source/libs/icu-xetex/tools/genpname/SyntheticPropertyValueAliases.txt b/Build/source/libs/icu/icu-xetex/tools/genpname/SyntheticPropertyValueAliases.txt
index 33946973225..33946973225 100644
--- a/Build/source/libs/icu-xetex/tools/genpname/SyntheticPropertyValueAliases.txt
+++ b/Build/source/libs/icu/icu-xetex/tools/genpname/SyntheticPropertyValueAliases.txt
diff --git a/Build/source/libs/icu-xetex/tools/genpname/data.h b/Build/source/libs/icu/icu-xetex/tools/genpname/data.h
index db7785f407e..db7785f407e 100644
--- a/Build/source/libs/icu-xetex/tools/genpname/data.h
+++ b/Build/source/libs/icu/icu-xetex/tools/genpname/data.h
diff --git a/Build/source/libs/icu-xetex/tools/genpname/genpname.cpp b/Build/source/libs/icu/icu-xetex/tools/genpname/genpname.cpp
index 84294a62ee0..84294a62ee0 100644
--- a/Build/source/libs/icu-xetex/tools/genpname/genpname.cpp
+++ b/Build/source/libs/icu/icu-xetex/tools/genpname/genpname.cpp
diff --git a/Build/source/libs/icu-xetex/tools/genpname/genpname.vcproj b/Build/source/libs/icu/icu-xetex/tools/genpname/genpname.vcproj
index 34a991fbbc6..34a991fbbc6 100644
--- a/Build/source/libs/icu-xetex/tools/genpname/genpname.vcproj
+++ b/Build/source/libs/icu/icu-xetex/tools/genpname/genpname.vcproj
diff --git a/Build/source/libs/icu-xetex/tools/genpname/gensvpa.pl b/Build/source/libs/icu/icu-xetex/tools/genpname/gensvpa.pl
index bcbf1cc4224..bcbf1cc4224 100755
--- a/Build/source/libs/icu-xetex/tools/genpname/gensvpa.pl
+++ b/Build/source/libs/icu/icu-xetex/tools/genpname/gensvpa.pl
diff --git a/Build/source/libs/icu-xetex/tools/genpname/preparse.pl b/Build/source/libs/icu/icu-xetex/tools/genpname/preparse.pl
index 3e6c9704de2..3e6c9704de2 100755
--- a/Build/source/libs/icu-xetex/tools/genpname/preparse.pl
+++ b/Build/source/libs/icu/icu-xetex/tools/genpname/preparse.pl
diff --git a/Build/source/libs/icu-xetex/tools/genprops/Makefile.in b/Build/source/libs/icu/icu-xetex/tools/genprops/Makefile.in
index 2856edf6e7f..2856edf6e7f 100644
--- a/Build/source/libs/icu-xetex/tools/genprops/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/tools/genprops/Makefile.in
diff --git a/Build/source/libs/icu-xetex/tools/genprops/genprops.c b/Build/source/libs/icu/icu-xetex/tools/genprops/genprops.c
index bb388126874..bb388126874 100644
--- a/Build/source/libs/icu-xetex/tools/genprops/genprops.c
+++ b/Build/source/libs/icu/icu-xetex/tools/genprops/genprops.c
diff --git a/Build/source/libs/icu-xetex/tools/genprops/genprops.h b/Build/source/libs/icu/icu-xetex/tools/genprops/genprops.h
index 40915235b6f..40915235b6f 100644
--- a/Build/source/libs/icu-xetex/tools/genprops/genprops.h
+++ b/Build/source/libs/icu/icu-xetex/tools/genprops/genprops.h
diff --git a/Build/source/libs/icu-xetex/tools/genprops/genprops.vcproj b/Build/source/libs/icu/icu-xetex/tools/genprops/genprops.vcproj
index 93d33a8695a..93d33a8695a 100644
--- a/Build/source/libs/icu-xetex/tools/genprops/genprops.vcproj
+++ b/Build/source/libs/icu/icu-xetex/tools/genprops/genprops.vcproj
diff --git a/Build/source/libs/icu-xetex/tools/genprops/misc/ucdmerge.c b/Build/source/libs/icu/icu-xetex/tools/genprops/misc/ucdmerge.c
index 35f6850cea2..35f6850cea2 100644
--- a/Build/source/libs/icu-xetex/tools/genprops/misc/ucdmerge.c
+++ b/Build/source/libs/icu/icu-xetex/tools/genprops/misc/ucdmerge.c
diff --git a/Build/source/libs/icu-xetex/tools/genprops/misc/ucdstrip.c b/Build/source/libs/icu/icu-xetex/tools/genprops/misc/ucdstrip.c
index 33ef53f153b..33ef53f153b 100644
--- a/Build/source/libs/icu-xetex/tools/genprops/misc/ucdstrip.c
+++ b/Build/source/libs/icu/icu-xetex/tools/genprops/misc/ucdstrip.c
diff --git a/Build/source/libs/icu-xetex/tools/genprops/misc/ucdstrip.pl b/Build/source/libs/icu/icu-xetex/tools/genprops/misc/ucdstrip.pl
index 6109770b69d..6109770b69d 100755
--- a/Build/source/libs/icu-xetex/tools/genprops/misc/ucdstrip.pl
+++ b/Build/source/libs/icu/icu-xetex/tools/genprops/misc/ucdstrip.pl
diff --git a/Build/source/libs/icu-xetex/tools/genprops/props2.c b/Build/source/libs/icu/icu-xetex/tools/genprops/props2.c
index 9f18a11ba58..9f18a11ba58 100644
--- a/Build/source/libs/icu-xetex/tools/genprops/props2.c
+++ b/Build/source/libs/icu/icu-xetex/tools/genprops/props2.c
diff --git a/Build/source/libs/icu-xetex/tools/genprops/store.c b/Build/source/libs/icu/icu-xetex/tools/genprops/store.c
index 76cfa3e75a6..76cfa3e75a6 100644
--- a/Build/source/libs/icu-xetex/tools/genprops/store.c
+++ b/Build/source/libs/icu/icu-xetex/tools/genprops/store.c
diff --git a/Build/source/libs/icu-xetex/tools/genrb/Makefile.in b/Build/source/libs/icu/icu-xetex/tools/genrb/Makefile.in
index 6c7cb271ed6..6c7cb271ed6 100644
--- a/Build/source/libs/icu-xetex/tools/genrb/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/tools/genrb/Makefile.in
diff --git a/Build/source/libs/icu-xetex/tools/genrb/derb.1.in b/Build/source/libs/icu/icu-xetex/tools/genrb/derb.1.in
index c981a5b721f..c981a5b721f 100644
--- a/Build/source/libs/icu-xetex/tools/genrb/derb.1.in
+++ b/Build/source/libs/icu/icu-xetex/tools/genrb/derb.1.in
diff --git a/Build/source/libs/icu-xetex/tools/genrb/derb.c b/Build/source/libs/icu/icu-xetex/tools/genrb/derb.c
index d63c481193e..d63c481193e 100644
--- a/Build/source/libs/icu-xetex/tools/genrb/derb.c
+++ b/Build/source/libs/icu/icu-xetex/tools/genrb/derb.c
diff --git a/Build/source/libs/icu-xetex/tools/genrb/derb.vcproj b/Build/source/libs/icu/icu-xetex/tools/genrb/derb.vcproj
index 0a779c22bba..0a779c22bba 100644
--- a/Build/source/libs/icu-xetex/tools/genrb/derb.vcproj
+++ b/Build/source/libs/icu/icu-xetex/tools/genrb/derb.vcproj
diff --git a/Build/source/libs/icu-xetex/tools/genrb/errmsg.c b/Build/source/libs/icu/icu-xetex/tools/genrb/errmsg.c
index 8b47f261a32..8b47f261a32 100644
--- a/Build/source/libs/icu-xetex/tools/genrb/errmsg.c
+++ b/Build/source/libs/icu/icu-xetex/tools/genrb/errmsg.c
diff --git a/Build/source/libs/icu-xetex/tools/genrb/errmsg.h b/Build/source/libs/icu/icu-xetex/tools/genrb/errmsg.h
index dbb8c66ffeb..dbb8c66ffeb 100644
--- a/Build/source/libs/icu-xetex/tools/genrb/errmsg.h
+++ b/Build/source/libs/icu/icu-xetex/tools/genrb/errmsg.h
diff --git a/Build/source/libs/icu-xetex/tools/genrb/gendtjar.pl b/Build/source/libs/icu/icu-xetex/tools/genrb/gendtjar.pl
index 8f9a552d382..8f9a552d382 100755
--- a/Build/source/libs/icu-xetex/tools/genrb/gendtjar.pl
+++ b/Build/source/libs/icu/icu-xetex/tools/genrb/gendtjar.pl
diff --git a/Build/source/libs/icu-xetex/tools/genrb/genrb.1.in b/Build/source/libs/icu/icu-xetex/tools/genrb/genrb.1.in
index b636bd93650..b636bd93650 100644
--- a/Build/source/libs/icu-xetex/tools/genrb/genrb.1.in
+++ b/Build/source/libs/icu/icu-xetex/tools/genrb/genrb.1.in
diff --git a/Build/source/libs/icu-xetex/tools/genrb/genrb.c b/Build/source/libs/icu/icu-xetex/tools/genrb/genrb.c
index fcf7870f51f..fcf7870f51f 100644
--- a/Build/source/libs/icu-xetex/tools/genrb/genrb.c
+++ b/Build/source/libs/icu/icu-xetex/tools/genrb/genrb.c
diff --git a/Build/source/libs/icu-xetex/tools/genrb/genrb.h b/Build/source/libs/icu/icu-xetex/tools/genrb/genrb.h
index 995ad5ea15d..995ad5ea15d 100644
--- a/Build/source/libs/icu-xetex/tools/genrb/genrb.h
+++ b/Build/source/libs/icu/icu-xetex/tools/genrb/genrb.h
diff --git a/Build/source/libs/icu-xetex/tools/genrb/genrb.vcproj b/Build/source/libs/icu/icu-xetex/tools/genrb/genrb.vcproj
index 5beba7698d1..5beba7698d1 100644
--- a/Build/source/libs/icu-xetex/tools/genrb/genrb.vcproj
+++ b/Build/source/libs/icu/icu-xetex/tools/genrb/genrb.vcproj
diff --git a/Build/source/libs/icu-xetex/tools/genrb/parse.c b/Build/source/libs/icu/icu-xetex/tools/genrb/parse.c
index c6de231abc3..c6de231abc3 100644
--- a/Build/source/libs/icu-xetex/tools/genrb/parse.c
+++ b/Build/source/libs/icu/icu-xetex/tools/genrb/parse.c
diff --git a/Build/source/libs/icu-xetex/tools/genrb/parse.h b/Build/source/libs/icu/icu-xetex/tools/genrb/parse.h
index da5b345beb1..da5b345beb1 100644
--- a/Build/source/libs/icu-xetex/tools/genrb/parse.h
+++ b/Build/source/libs/icu/icu-xetex/tools/genrb/parse.h
diff --git a/Build/source/libs/icu-xetex/tools/genrb/prscmnts.cpp b/Build/source/libs/icu/icu-xetex/tools/genrb/prscmnts.cpp
index 758cf831cee..758cf831cee 100644
--- a/Build/source/libs/icu-xetex/tools/genrb/prscmnts.cpp
+++ b/Build/source/libs/icu/icu-xetex/tools/genrb/prscmnts.cpp
diff --git a/Build/source/libs/icu-xetex/tools/genrb/prscmnts.h b/Build/source/libs/icu/icu-xetex/tools/genrb/prscmnts.h
index c4f27054567..c4f27054567 100644
--- a/Build/source/libs/icu-xetex/tools/genrb/prscmnts.h
+++ b/Build/source/libs/icu/icu-xetex/tools/genrb/prscmnts.h
diff --git a/Build/source/libs/icu-xetex/tools/genrb/rbutil.c b/Build/source/libs/icu/icu-xetex/tools/genrb/rbutil.c
index 92d45fd7f5a..92d45fd7f5a 100644
--- a/Build/source/libs/icu-xetex/tools/genrb/rbutil.c
+++ b/Build/source/libs/icu/icu-xetex/tools/genrb/rbutil.c
diff --git a/Build/source/libs/icu-xetex/tools/genrb/rbutil.h b/Build/source/libs/icu/icu-xetex/tools/genrb/rbutil.h
index b059bfa00d4..b059bfa00d4 100644
--- a/Build/source/libs/icu-xetex/tools/genrb/rbutil.h
+++ b/Build/source/libs/icu/icu-xetex/tools/genrb/rbutil.h
diff --git a/Build/source/libs/icu-xetex/tools/genrb/read.c b/Build/source/libs/icu/icu-xetex/tools/genrb/read.c
index be8cea118ef..be8cea118ef 100644
--- a/Build/source/libs/icu-xetex/tools/genrb/read.c
+++ b/Build/source/libs/icu/icu-xetex/tools/genrb/read.c
diff --git a/Build/source/libs/icu-xetex/tools/genrb/read.h b/Build/source/libs/icu/icu-xetex/tools/genrb/read.h
index 96bd9608128..96bd9608128 100644
--- a/Build/source/libs/icu-xetex/tools/genrb/read.h
+++ b/Build/source/libs/icu/icu-xetex/tools/genrb/read.h
diff --git a/Build/source/libs/icu-xetex/tools/genrb/reslist.c b/Build/source/libs/icu/icu-xetex/tools/genrb/reslist.c
index 9f30ca9c108..9f30ca9c108 100644
--- a/Build/source/libs/icu-xetex/tools/genrb/reslist.c
+++ b/Build/source/libs/icu/icu-xetex/tools/genrb/reslist.c
diff --git a/Build/source/libs/icu-xetex/tools/genrb/reslist.h b/Build/source/libs/icu/icu-xetex/tools/genrb/reslist.h
index 2d6a3783df6..2d6a3783df6 100644
--- a/Build/source/libs/icu-xetex/tools/genrb/reslist.h
+++ b/Build/source/libs/icu/icu-xetex/tools/genrb/reslist.h
diff --git a/Build/source/libs/icu-xetex/tools/genrb/rle.c b/Build/source/libs/icu/icu-xetex/tools/genrb/rle.c
index 053cb33e49f..053cb33e49f 100644
--- a/Build/source/libs/icu-xetex/tools/genrb/rle.c
+++ b/Build/source/libs/icu/icu-xetex/tools/genrb/rle.c
diff --git a/Build/source/libs/icu-xetex/tools/genrb/rle.h b/Build/source/libs/icu/icu-xetex/tools/genrb/rle.h
index 60f6bdc6a75..60f6bdc6a75 100644
--- a/Build/source/libs/icu-xetex/tools/genrb/rle.h
+++ b/Build/source/libs/icu/icu-xetex/tools/genrb/rle.h
diff --git a/Build/source/libs/icu-xetex/tools/genrb/ustr.c b/Build/source/libs/icu/icu-xetex/tools/genrb/ustr.c
index aafcec54241..aafcec54241 100644
--- a/Build/source/libs/icu-xetex/tools/genrb/ustr.c
+++ b/Build/source/libs/icu/icu-xetex/tools/genrb/ustr.c
diff --git a/Build/source/libs/icu-xetex/tools/genrb/ustr.h b/Build/source/libs/icu/icu-xetex/tools/genrb/ustr.h
index 085643a8d7a..085643a8d7a 100644
--- a/Build/source/libs/icu-xetex/tools/genrb/ustr.h
+++ b/Build/source/libs/icu/icu-xetex/tools/genrb/ustr.h
diff --git a/Build/source/libs/icu-xetex/tools/genrb/wrtjava.c b/Build/source/libs/icu/icu-xetex/tools/genrb/wrtjava.c
index a4293ae2807..a4293ae2807 100644
--- a/Build/source/libs/icu-xetex/tools/genrb/wrtjava.c
+++ b/Build/source/libs/icu/icu-xetex/tools/genrb/wrtjava.c
diff --git a/Build/source/libs/icu-xetex/tools/genrb/wrtxml.c b/Build/source/libs/icu/icu-xetex/tools/genrb/wrtxml.c
index fbcbec3813c..fbcbec3813c 100644
--- a/Build/source/libs/icu-xetex/tools/genrb/wrtxml.c
+++ b/Build/source/libs/icu/icu-xetex/tools/genrb/wrtxml.c
diff --git a/Build/source/libs/icu-xetex/tools/genren/Makefile b/Build/source/libs/icu/icu-xetex/tools/genren/Makefile
index 53e196c538a..53e196c538a 100644
--- a/Build/source/libs/icu-xetex/tools/genren/Makefile
+++ b/Build/source/libs/icu/icu-xetex/tools/genren/Makefile
diff --git a/Build/source/libs/icu-xetex/tools/genren/README b/Build/source/libs/icu/icu-xetex/tools/genren/README
index a289dbc538c..a289dbc538c 100644
--- a/Build/source/libs/icu-xetex/tools/genren/README
+++ b/Build/source/libs/icu/icu-xetex/tools/genren/README
diff --git a/Build/source/libs/icu-xetex/tools/genren/genren.pl b/Build/source/libs/icu/icu-xetex/tools/genren/genren.pl
index 181491fa97a..181491fa97a 100755
--- a/Build/source/libs/icu-xetex/tools/genren/genren.pl
+++ b/Build/source/libs/icu/icu-xetex/tools/genren/genren.pl
diff --git a/Build/source/libs/icu-xetex/tools/gensprep/Makefile.in b/Build/source/libs/icu/icu-xetex/tools/gensprep/Makefile.in
index be170ac4194..be170ac4194 100644
--- a/Build/source/libs/icu-xetex/tools/gensprep/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/tools/gensprep/Makefile.in
diff --git a/Build/source/libs/icu-xetex/tools/gensprep/filterRFC3454.pl b/Build/source/libs/icu/icu-xetex/tools/gensprep/filterRFC3454.pl
index fc52836f97f..fc52836f97f 100755
--- a/Build/source/libs/icu-xetex/tools/gensprep/filterRFC3454.pl
+++ b/Build/source/libs/icu/icu-xetex/tools/gensprep/filterRFC3454.pl
diff --git a/Build/source/libs/icu-xetex/tools/gensprep/gensprep.8.in b/Build/source/libs/icu/icu-xetex/tools/gensprep/gensprep.8.in
index f50a3a4d370..f50a3a4d370 100644
--- a/Build/source/libs/icu-xetex/tools/gensprep/gensprep.8.in
+++ b/Build/source/libs/icu/icu-xetex/tools/gensprep/gensprep.8.in
diff --git a/Build/source/libs/icu-xetex/tools/gensprep/gensprep.c b/Build/source/libs/icu/icu-xetex/tools/gensprep/gensprep.c
index 7421545158f..7421545158f 100644
--- a/Build/source/libs/icu-xetex/tools/gensprep/gensprep.c
+++ b/Build/source/libs/icu/icu-xetex/tools/gensprep/gensprep.c
diff --git a/Build/source/libs/icu-xetex/tools/gensprep/gensprep.h b/Build/source/libs/icu/icu-xetex/tools/gensprep/gensprep.h
index cb3a6744706..cb3a6744706 100644
--- a/Build/source/libs/icu-xetex/tools/gensprep/gensprep.h
+++ b/Build/source/libs/icu/icu-xetex/tools/gensprep/gensprep.h
diff --git a/Build/source/libs/icu-xetex/tools/gensprep/gensprep.vcproj b/Build/source/libs/icu/icu-xetex/tools/gensprep/gensprep.vcproj
index b57c6c53b76..b57c6c53b76 100644
--- a/Build/source/libs/icu-xetex/tools/gensprep/gensprep.vcproj
+++ b/Build/source/libs/icu/icu-xetex/tools/gensprep/gensprep.vcproj
diff --git a/Build/source/libs/icu-xetex/tools/gensprep/store.c b/Build/source/libs/icu/icu-xetex/tools/gensprep/store.c
index 58b88b3ae7c..58b88b3ae7c 100644
--- a/Build/source/libs/icu-xetex/tools/gensprep/store.c
+++ b/Build/source/libs/icu/icu-xetex/tools/gensprep/store.c
diff --git a/Build/source/libs/icu-xetex/tools/gentest/Makefile.in b/Build/source/libs/icu/icu-xetex/tools/gentest/Makefile.in
index eb5658a96e0..eb5658a96e0 100644
--- a/Build/source/libs/icu-xetex/tools/gentest/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/tools/gentest/Makefile.in
diff --git a/Build/source/libs/icu-xetex/tools/gentest/genres32.c b/Build/source/libs/icu/icu-xetex/tools/gentest/genres32.c
index 460d076c54e..460d076c54e 100644
--- a/Build/source/libs/icu-xetex/tools/gentest/genres32.c
+++ b/Build/source/libs/icu/icu-xetex/tools/gentest/genres32.c
diff --git a/Build/source/libs/icu-xetex/tools/gentest/gentest.c b/Build/source/libs/icu/icu-xetex/tools/gentest/gentest.c
index 9225377d3e4..9225377d3e4 100644
--- a/Build/source/libs/icu-xetex/tools/gentest/gentest.c
+++ b/Build/source/libs/icu/icu-xetex/tools/gentest/gentest.c
diff --git a/Build/source/libs/icu-xetex/tools/gentest/gentest.h b/Build/source/libs/icu/icu-xetex/tools/gentest/gentest.h
index ed71042c289..ed71042c289 100644
--- a/Build/source/libs/icu-xetex/tools/gentest/gentest.h
+++ b/Build/source/libs/icu/icu-xetex/tools/gentest/gentest.h
diff --git a/Build/source/libs/icu-xetex/tools/gentest/gentest.vcproj b/Build/source/libs/icu/icu-xetex/tools/gentest/gentest.vcproj
index b273be5c5cb..b273be5c5cb 100644
--- a/Build/source/libs/icu-xetex/tools/gentest/gentest.vcproj
+++ b/Build/source/libs/icu/icu-xetex/tools/gentest/gentest.vcproj
diff --git a/Build/source/libs/icu-xetex/tools/genuca/Makefile.in b/Build/source/libs/icu/icu-xetex/tools/genuca/Makefile.in
index 31a9f501158..31a9f501158 100644
--- a/Build/source/libs/icu-xetex/tools/genuca/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/tools/genuca/Makefile.in
diff --git a/Build/source/libs/icu-xetex/tools/genuca/genuca.8.in b/Build/source/libs/icu/icu-xetex/tools/genuca/genuca.8.in
index e8ab27d0175..e8ab27d0175 100644
--- a/Build/source/libs/icu-xetex/tools/genuca/genuca.8.in
+++ b/Build/source/libs/icu/icu-xetex/tools/genuca/genuca.8.in
diff --git a/Build/source/libs/icu-xetex/tools/genuca/genuca.cpp b/Build/source/libs/icu/icu-xetex/tools/genuca/genuca.cpp
index 24882603781..24882603781 100644
--- a/Build/source/libs/icu-xetex/tools/genuca/genuca.cpp
+++ b/Build/source/libs/icu/icu-xetex/tools/genuca/genuca.cpp
diff --git a/Build/source/libs/icu-xetex/tools/genuca/genuca.h b/Build/source/libs/icu/icu-xetex/tools/genuca/genuca.h
index a98e6699428..a98e6699428 100644
--- a/Build/source/libs/icu-xetex/tools/genuca/genuca.h
+++ b/Build/source/libs/icu/icu-xetex/tools/genuca/genuca.h
diff --git a/Build/source/libs/icu-xetex/tools/genuca/genuca.vcproj b/Build/source/libs/icu/icu-xetex/tools/genuca/genuca.vcproj
index 4710d481699..4710d481699 100644
--- a/Build/source/libs/icu-xetex/tools/genuca/genuca.vcproj
+++ b/Build/source/libs/icu/icu-xetex/tools/genuca/genuca.vcproj
diff --git a/Build/source/libs/icu-xetex/tools/icupkg/Makefile.in b/Build/source/libs/icu/icu-xetex/tools/icupkg/Makefile.in
index 9b67b489201..9b67b489201 100644
--- a/Build/source/libs/icu-xetex/tools/icupkg/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/tools/icupkg/Makefile.in
diff --git a/Build/source/libs/icu-xetex/tools/icupkg/icupkg.8.in b/Build/source/libs/icu/icu-xetex/tools/icupkg/icupkg.8.in
index 37caabaf9bf..37caabaf9bf 100644
--- a/Build/source/libs/icu-xetex/tools/icupkg/icupkg.8.in
+++ b/Build/source/libs/icu/icu-xetex/tools/icupkg/icupkg.8.in
diff --git a/Build/source/libs/icu-xetex/tools/icupkg/icupkg.cpp b/Build/source/libs/icu/icu-xetex/tools/icupkg/icupkg.cpp
index f1ebfeed0ae..f1ebfeed0ae 100644
--- a/Build/source/libs/icu-xetex/tools/icupkg/icupkg.cpp
+++ b/Build/source/libs/icu/icu-xetex/tools/icupkg/icupkg.cpp
diff --git a/Build/source/libs/icu-xetex/tools/icupkg/icupkg.vcproj b/Build/source/libs/icu/icu-xetex/tools/icupkg/icupkg.vcproj
index a7e8d620281..a7e8d620281 100644
--- a/Build/source/libs/icu-xetex/tools/icupkg/icupkg.vcproj
+++ b/Build/source/libs/icu/icu-xetex/tools/icupkg/icupkg.vcproj
diff --git a/Build/source/libs/icu-xetex/tools/icuswap/Makefile.in b/Build/source/libs/icu/icu-xetex/tools/icuswap/Makefile.in
index 16779f6060c..16779f6060c 100644
--- a/Build/source/libs/icu-xetex/tools/icuswap/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/tools/icuswap/Makefile.in
diff --git a/Build/source/libs/icu-xetex/tools/icuswap/icuswap.cpp b/Build/source/libs/icu/icu-xetex/tools/icuswap/icuswap.cpp
index a5295df651f..a5295df651f 100644
--- a/Build/source/libs/icu-xetex/tools/icuswap/icuswap.cpp
+++ b/Build/source/libs/icu/icu-xetex/tools/icuswap/icuswap.cpp
diff --git a/Build/source/libs/icu-xetex/tools/icuswap/icuswap.vcproj b/Build/source/libs/icu/icu-xetex/tools/icuswap/icuswap.vcproj
index 0b912a8c68e..0b912a8c68e 100644
--- a/Build/source/libs/icu-xetex/tools/icuswap/icuswap.vcproj
+++ b/Build/source/libs/icu/icu-xetex/tools/icuswap/icuswap.vcproj
diff --git a/Build/source/libs/icu-xetex/tools/makeconv/Makefile.in b/Build/source/libs/icu/icu-xetex/tools/makeconv/Makefile.in
index 365401e2496..365401e2496 100644
--- a/Build/source/libs/icu-xetex/tools/makeconv/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/tools/makeconv/Makefile.in
diff --git a/Build/source/libs/icu-xetex/tools/makeconv/gencnvex.c b/Build/source/libs/icu/icu-xetex/tools/makeconv/gencnvex.c
index 3b657366b62..3b657366b62 100644
--- a/Build/source/libs/icu-xetex/tools/makeconv/gencnvex.c
+++ b/Build/source/libs/icu/icu-xetex/tools/makeconv/gencnvex.c
diff --git a/Build/source/libs/icu-xetex/tools/makeconv/genmbcs.c b/Build/source/libs/icu/icu-xetex/tools/makeconv/genmbcs.c
index 139ab0109b7..139ab0109b7 100644
--- a/Build/source/libs/icu-xetex/tools/makeconv/genmbcs.c
+++ b/Build/source/libs/icu/icu-xetex/tools/makeconv/genmbcs.c
diff --git a/Build/source/libs/icu-xetex/tools/makeconv/genmbcs.h b/Build/source/libs/icu/icu-xetex/tools/makeconv/genmbcs.h
index 60f52e3ddb5..60f52e3ddb5 100644
--- a/Build/source/libs/icu-xetex/tools/makeconv/genmbcs.h
+++ b/Build/source/libs/icu/icu-xetex/tools/makeconv/genmbcs.h
diff --git a/Build/source/libs/icu-xetex/tools/makeconv/makeconv.1.in b/Build/source/libs/icu/icu-xetex/tools/makeconv/makeconv.1.in
index dfecc32fdde..dfecc32fdde 100644
--- a/Build/source/libs/icu-xetex/tools/makeconv/makeconv.1.in
+++ b/Build/source/libs/icu/icu-xetex/tools/makeconv/makeconv.1.in
diff --git a/Build/source/libs/icu-xetex/tools/makeconv/makeconv.c b/Build/source/libs/icu/icu-xetex/tools/makeconv/makeconv.c
index d5aeafadc6a..d5aeafadc6a 100644
--- a/Build/source/libs/icu-xetex/tools/makeconv/makeconv.c
+++ b/Build/source/libs/icu/icu-xetex/tools/makeconv/makeconv.c
diff --git a/Build/source/libs/icu-xetex/tools/makeconv/makeconv.h b/Build/source/libs/icu/icu-xetex/tools/makeconv/makeconv.h
index 0fa0fb2d1dc..0fa0fb2d1dc 100644
--- a/Build/source/libs/icu-xetex/tools/makeconv/makeconv.h
+++ b/Build/source/libs/icu/icu-xetex/tools/makeconv/makeconv.h
diff --git a/Build/source/libs/icu-xetex/tools/makeconv/makeconv.vcproj b/Build/source/libs/icu/icu-xetex/tools/makeconv/makeconv.vcproj
index 9ca0457f661..9ca0457f661 100644
--- a/Build/source/libs/icu-xetex/tools/makeconv/makeconv.vcproj
+++ b/Build/source/libs/icu/icu-xetex/tools/makeconv/makeconv.vcproj
diff --git a/Build/source/libs/icu-xetex/tools/makeconv/ucnvstat.c b/Build/source/libs/icu/icu-xetex/tools/makeconv/ucnvstat.c
index 0dfdc956875..0dfdc956875 100644
--- a/Build/source/libs/icu-xetex/tools/makeconv/ucnvstat.c
+++ b/Build/source/libs/icu/icu-xetex/tools/makeconv/ucnvstat.c
diff --git a/Build/source/libs/icu-xetex/tools/memcheck/ICUMemCheck.pl b/Build/source/libs/icu/icu-xetex/tools/memcheck/ICUMemCheck.pl
index ea9c14862f0..ea9c14862f0 100755
--- a/Build/source/libs/icu-xetex/tools/memcheck/ICUMemCheck.pl
+++ b/Build/source/libs/icu/icu-xetex/tools/memcheck/ICUMemCheck.pl
diff --git a/Build/source/libs/icu-xetex/tools/pkgdata/Makefile.in b/Build/source/libs/icu/icu-xetex/tools/pkgdata/Makefile.in
index 95cb61b5ab1..95cb61b5ab1 100644
--- a/Build/source/libs/icu-xetex/tools/pkgdata/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/tools/pkgdata/Makefile.in
diff --git a/Build/source/libs/icu-xetex/tools/pkgdata/cmnmode.c b/Build/source/libs/icu/icu-xetex/tools/pkgdata/cmnmode.c
index 8213e46528b..8213e46528b 100644
--- a/Build/source/libs/icu-xetex/tools/pkgdata/cmnmode.c
+++ b/Build/source/libs/icu/icu-xetex/tools/pkgdata/cmnmode.c
diff --git a/Build/source/libs/icu-xetex/tools/pkgdata/dllmode.c b/Build/source/libs/icu/icu-xetex/tools/pkgdata/dllmode.c
index 9aac5a56d2d..9aac5a56d2d 100644
--- a/Build/source/libs/icu-xetex/tools/pkgdata/dllmode.c
+++ b/Build/source/libs/icu/icu-xetex/tools/pkgdata/dllmode.c
diff --git a/Build/source/libs/icu-xetex/tools/pkgdata/filemode.c b/Build/source/libs/icu/icu-xetex/tools/pkgdata/filemode.c
index 6710a83ca14..6710a83ca14 100644
--- a/Build/source/libs/icu-xetex/tools/pkgdata/filemode.c
+++ b/Build/source/libs/icu/icu-xetex/tools/pkgdata/filemode.c
diff --git a/Build/source/libs/icu-xetex/tools/pkgdata/make.c b/Build/source/libs/icu/icu-xetex/tools/pkgdata/make.c
index 630e1d92b87..630e1d92b87 100644
--- a/Build/source/libs/icu-xetex/tools/pkgdata/make.c
+++ b/Build/source/libs/icu/icu-xetex/tools/pkgdata/make.c
diff --git a/Build/source/libs/icu-xetex/tools/pkgdata/makefile.h b/Build/source/libs/icu/icu-xetex/tools/pkgdata/makefile.h
index 1a5cd7b5866..1a5cd7b5866 100644
--- a/Build/source/libs/icu-xetex/tools/pkgdata/makefile.h
+++ b/Build/source/libs/icu/icu-xetex/tools/pkgdata/makefile.h
diff --git a/Build/source/libs/icu-xetex/tools/pkgdata/pkgdata.1.in b/Build/source/libs/icu/icu-xetex/tools/pkgdata/pkgdata.1.in
index b8b68a577c7..b8b68a577c7 100644
--- a/Build/source/libs/icu-xetex/tools/pkgdata/pkgdata.1.in
+++ b/Build/source/libs/icu/icu-xetex/tools/pkgdata/pkgdata.1.in
diff --git a/Build/source/libs/icu-xetex/tools/pkgdata/pkgdata.c b/Build/source/libs/icu/icu-xetex/tools/pkgdata/pkgdata.c
index 8bdd9708318..8bdd9708318 100644
--- a/Build/source/libs/icu-xetex/tools/pkgdata/pkgdata.c
+++ b/Build/source/libs/icu/icu-xetex/tools/pkgdata/pkgdata.c
diff --git a/Build/source/libs/icu-xetex/tools/pkgdata/pkgdata.vcproj b/Build/source/libs/icu/icu-xetex/tools/pkgdata/pkgdata.vcproj
index 955cf30f87b..955cf30f87b 100644
--- a/Build/source/libs/icu-xetex/tools/pkgdata/pkgdata.vcproj
+++ b/Build/source/libs/icu/icu-xetex/tools/pkgdata/pkgdata.vcproj
diff --git a/Build/source/libs/icu-xetex/tools/pkgdata/pkgtypes.c b/Build/source/libs/icu/icu-xetex/tools/pkgdata/pkgtypes.c
index 8282b79d5b4..8282b79d5b4 100644
--- a/Build/source/libs/icu-xetex/tools/pkgdata/pkgtypes.c
+++ b/Build/source/libs/icu/icu-xetex/tools/pkgdata/pkgtypes.c
diff --git a/Build/source/libs/icu-xetex/tools/pkgdata/pkgtypes.h b/Build/source/libs/icu/icu-xetex/tools/pkgdata/pkgtypes.h
index 7c8d4349950..7c8d4349950 100644
--- a/Build/source/libs/icu-xetex/tools/pkgdata/pkgtypes.h
+++ b/Build/source/libs/icu/icu-xetex/tools/pkgdata/pkgtypes.h
diff --git a/Build/source/libs/icu-xetex/tools/pkgdata/sttcmode.c b/Build/source/libs/icu/icu-xetex/tools/pkgdata/sttcmode.c
index ba44541291f..ba44541291f 100644
--- a/Build/source/libs/icu-xetex/tools/pkgdata/sttcmode.c
+++ b/Build/source/libs/icu/icu-xetex/tools/pkgdata/sttcmode.c
diff --git a/Build/source/libs/icu-xetex/tools/pkgdata/winmode.c b/Build/source/libs/icu/icu-xetex/tools/pkgdata/winmode.c
index 460ae12ca7b..460ae12ca7b 100644
--- a/Build/source/libs/icu-xetex/tools/pkgdata/winmode.c
+++ b/Build/source/libs/icu/icu-xetex/tools/pkgdata/winmode.c
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/Makefile.in b/Build/source/libs/icu/icu-xetex/tools/toolutil/Makefile.in
index be483c88702..be483c88702 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/Makefile.in
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/filestrm.c b/Build/source/libs/icu/icu-xetex/tools/toolutil/filestrm.c
index bf646916f61..bf646916f61 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/filestrm.c
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/filestrm.c
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/filestrm.h b/Build/source/libs/icu/icu-xetex/tools/toolutil/filestrm.h
index 0eeba98b661..0eeba98b661 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/filestrm.h
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/filestrm.h
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/package.cpp b/Build/source/libs/icu/icu-xetex/tools/toolutil/package.cpp
index c5db3017338..c5db3017338 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/package.cpp
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/package.cpp
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/package.h b/Build/source/libs/icu/icu-xetex/tools/toolutil/package.h
index 067397d8b33..067397d8b33 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/package.h
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/package.h
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/pkg_imp.h b/Build/source/libs/icu/icu-xetex/tools/toolutil/pkg_imp.h
index 0b0c2b740f8..0b0c2b740f8 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/pkg_imp.h
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/pkg_imp.h
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/pkgitems.cpp b/Build/source/libs/icu/icu-xetex/tools/toolutil/pkgitems.cpp
index 6a93769c0d2..6a93769c0d2 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/pkgitems.cpp
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/pkgitems.cpp
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/propsvec.c b/Build/source/libs/icu/icu-xetex/tools/toolutil/propsvec.c
index c4cb7b17293..c4cb7b17293 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/propsvec.c
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/propsvec.c
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/propsvec.h b/Build/source/libs/icu/icu-xetex/tools/toolutil/propsvec.h
index c899d5885e4..c899d5885e4 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/propsvec.h
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/propsvec.h
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/swapimpl.cpp b/Build/source/libs/icu/icu-xetex/tools/toolutil/swapimpl.cpp
index fd0f7faf6ad..fd0f7faf6ad 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/swapimpl.cpp
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/swapimpl.cpp
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/swapimpl.h b/Build/source/libs/icu/icu-xetex/tools/toolutil/swapimpl.h
index b36ec2609da..b36ec2609da 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/swapimpl.h
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/swapimpl.h
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/toolutil.c b/Build/source/libs/icu/icu-xetex/tools/toolutil/toolutil.c
index d4246a85680..d4246a85680 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/toolutil.c
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/toolutil.c
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/toolutil.h b/Build/source/libs/icu/icu-xetex/tools/toolutil/toolutil.h
index 91c6c881ca0..91c6c881ca0 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/toolutil.h
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/toolutil.h
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/toolutil.vcproj b/Build/source/libs/icu/icu-xetex/tools/toolutil/toolutil.vcproj
index 1ada5504bec..1ada5504bec 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/toolutil.vcproj
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/toolutil.vcproj
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/ucbuf.c b/Build/source/libs/icu/icu-xetex/tools/toolutil/ucbuf.c
index 7d7556e6ddc..7d7556e6ddc 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/ucbuf.c
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/ucbuf.c
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/ucbuf.h b/Build/source/libs/icu/icu-xetex/tools/toolutil/ucbuf.h
index abb36c851ee..abb36c851ee 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/ucbuf.h
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/ucbuf.h
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/ucm.c b/Build/source/libs/icu/icu-xetex/tools/toolutil/ucm.c
index bb7c3bb0edd..bb7c3bb0edd 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/ucm.c
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/ucm.c
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/ucm.h b/Build/source/libs/icu/icu-xetex/tools/toolutil/ucm.h
index 6575721175e..6575721175e 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/ucm.h
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/ucm.h
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/ucmstate.c b/Build/source/libs/icu/icu-xetex/tools/toolutil/ucmstate.c
index 393d18b3781..393d18b3781 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/ucmstate.c
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/ucmstate.c
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/unewdata.c b/Build/source/libs/icu/icu-xetex/tools/toolutil/unewdata.c
index 5666c87fda2..5666c87fda2 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/unewdata.c
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/unewdata.c
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/unewdata.h b/Build/source/libs/icu/icu-xetex/tools/toolutil/unewdata.h
index fb190e6f89d..fb190e6f89d 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/unewdata.h
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/unewdata.h
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/uoptions.c b/Build/source/libs/icu/icu-xetex/tools/toolutil/uoptions.c
index 05efc170cbd..05efc170cbd 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/uoptions.c
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/uoptions.c
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/uoptions.h b/Build/source/libs/icu/icu-xetex/tools/toolutil/uoptions.h
index 55e30f681b2..55e30f681b2 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/uoptions.h
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/uoptions.h
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/uparse.c b/Build/source/libs/icu/icu-xetex/tools/toolutil/uparse.c
index ed2f1e90005..ed2f1e90005 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/uparse.c
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/uparse.c
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/uparse.h b/Build/source/libs/icu/icu-xetex/tools/toolutil/uparse.h
index dc3e0b8cbbd..dc3e0b8cbbd 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/uparse.h
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/uparse.h
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/writesrc.c b/Build/source/libs/icu/icu-xetex/tools/toolutil/writesrc.c
index 28303c733e5..28303c733e5 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/writesrc.c
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/writesrc.c
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/writesrc.h b/Build/source/libs/icu/icu-xetex/tools/toolutil/writesrc.h
index 613ee9d7074..613ee9d7074 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/writesrc.h
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/writesrc.h
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/xmlparser.cpp b/Build/source/libs/icu/icu-xetex/tools/toolutil/xmlparser.cpp
index 195fa30385c..195fa30385c 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/xmlparser.cpp
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/xmlparser.cpp
diff --git a/Build/source/libs/icu-xetex/tools/toolutil/xmlparser.h b/Build/source/libs/icu/icu-xetex/tools/toolutil/xmlparser.h
index a619769be49..a619769be49 100644
--- a/Build/source/libs/icu-xetex/tools/toolutil/xmlparser.h
+++ b/Build/source/libs/icu/icu-xetex/tools/toolutil/xmlparser.h
diff --git a/Build/source/libs/icu-xetex/tools/tzcode/Makefile.in b/Build/source/libs/icu/icu-xetex/tools/tzcode/Makefile.in
index ce7c1a503a0..ce7c1a503a0 100644
--- a/Build/source/libs/icu-xetex/tools/tzcode/Makefile.in
+++ b/Build/source/libs/icu/icu-xetex/tools/tzcode/Makefile.in
diff --git a/Build/source/libs/icu-xetex/tools/tzcode/asctime.c b/Build/source/libs/icu/icu-xetex/tools/tzcode/asctime.c
index e0804f16f4d..e0804f16f4d 100644
--- a/Build/source/libs/icu-xetex/tools/tzcode/asctime.c
+++ b/Build/source/libs/icu/icu-xetex/tools/tzcode/asctime.c
diff --git a/Build/source/libs/icu-xetex/tools/tzcode/ialloc.c b/Build/source/libs/icu/icu-xetex/tools/tzcode/ialloc.c
index 1fc2035f452..1fc2035f452 100644
--- a/Build/source/libs/icu-xetex/tools/tzcode/ialloc.c
+++ b/Build/source/libs/icu/icu-xetex/tools/tzcode/ialloc.c
diff --git a/Build/source/libs/icu-xetex/tools/tzcode/icuzdump.cpp b/Build/source/libs/icu/icu-xetex/tools/tzcode/icuzdump.cpp
index ffad9405dab..ffad9405dab 100644
--- a/Build/source/libs/icu-xetex/tools/tzcode/icuzdump.cpp
+++ b/Build/source/libs/icu/icu-xetex/tools/tzcode/icuzdump.cpp
diff --git a/Build/source/libs/icu-xetex/tools/tzcode/icuzdump.vcproj b/Build/source/libs/icu/icu-xetex/tools/tzcode/icuzdump.vcproj
index 26a767c5388..26a767c5388 100644
--- a/Build/source/libs/icu-xetex/tools/tzcode/icuzdump.vcproj
+++ b/Build/source/libs/icu/icu-xetex/tools/tzcode/icuzdump.vcproj
diff --git a/Build/source/libs/icu-xetex/tools/tzcode/icuzones b/Build/source/libs/icu/icu-xetex/tools/tzcode/icuzones
index 528ea26bf99..528ea26bf99 100644
--- a/Build/source/libs/icu-xetex/tools/tzcode/icuzones
+++ b/Build/source/libs/icu/icu-xetex/tools/tzcode/icuzones
diff --git a/Build/source/libs/icu-xetex/tools/tzcode/localtime.c b/Build/source/libs/icu/icu-xetex/tools/tzcode/localtime.c
index 1fdfbdbb312..1fdfbdbb312 100644
--- a/Build/source/libs/icu-xetex/tools/tzcode/localtime.c
+++ b/Build/source/libs/icu/icu-xetex/tools/tzcode/localtime.c
diff --git a/Build/source/libs/icu-xetex/tools/tzcode/private.h b/Build/source/libs/icu/icu-xetex/tools/tzcode/private.h
index 2837b70c101..2837b70c101 100644
--- a/Build/source/libs/icu-xetex/tools/tzcode/private.h
+++ b/Build/source/libs/icu/icu-xetex/tools/tzcode/private.h
diff --git a/Build/source/libs/icu-xetex/tools/tzcode/readme.txt b/Build/source/libs/icu/icu-xetex/tools/tzcode/readme.txt
index 7ad2cce0c9f..7ad2cce0c9f 100644
--- a/Build/source/libs/icu-xetex/tools/tzcode/readme.txt
+++ b/Build/source/libs/icu/icu-xetex/tools/tzcode/readme.txt
diff --git a/Build/source/libs/icu-xetex/tools/tzcode/scheck.c b/Build/source/libs/icu/icu-xetex/tools/tzcode/scheck.c
index 74d9b07c149..74d9b07c149 100644
--- a/Build/source/libs/icu-xetex/tools/tzcode/scheck.c
+++ b/Build/source/libs/icu/icu-xetex/tools/tzcode/scheck.c
diff --git a/Build/source/libs/icu-xetex/tools/tzcode/tz.alias b/Build/source/libs/icu/icu-xetex/tools/tzcode/tz.alias
index cf984ba098f..cf984ba098f 100644
--- a/Build/source/libs/icu-xetex/tools/tzcode/tz.alias
+++ b/Build/source/libs/icu/icu-xetex/tools/tzcode/tz.alias
diff --git a/Build/source/libs/icu-xetex/tools/tzcode/tz2icu.cpp b/Build/source/libs/icu/icu-xetex/tools/tzcode/tz2icu.cpp
index 1bd50262257..1bd50262257 100644
--- a/Build/source/libs/icu-xetex/tools/tzcode/tz2icu.cpp
+++ b/Build/source/libs/icu/icu-xetex/tools/tzcode/tz2icu.cpp
diff --git a/Build/source/libs/icu-xetex/tools/tzcode/tz2icu.h b/Build/source/libs/icu/icu-xetex/tools/tzcode/tz2icu.h
index d3cfa641876..d3cfa641876 100644
--- a/Build/source/libs/icu-xetex/tools/tzcode/tz2icu.h
+++ b/Build/source/libs/icu/icu-xetex/tools/tzcode/tz2icu.h
diff --git a/Build/source/libs/icu-xetex/tools/tzcode/tzfile.h b/Build/source/libs/icu/icu-xetex/tools/tzcode/tzfile.h
index 3a9eee305a5..3a9eee305a5 100644
--- a/Build/source/libs/icu-xetex/tools/tzcode/tzfile.h
+++ b/Build/source/libs/icu/icu-xetex/tools/tzcode/tzfile.h
diff --git a/Build/source/libs/icu-xetex/tools/tzcode/tzselect.ksh b/Build/source/libs/icu/icu-xetex/tools/tzcode/tzselect.ksh
index 26dfa984766..26dfa984766 100644
--- a/Build/source/libs/icu-xetex/tools/tzcode/tzselect.ksh
+++ b/Build/source/libs/icu/icu-xetex/tools/tzcode/tzselect.ksh
diff --git a/Build/source/libs/icu-xetex/tools/tzcode/zdump.c b/Build/source/libs/icu/icu-xetex/tools/tzcode/zdump.c
index c7199acb872..c7199acb872 100644
--- a/Build/source/libs/icu-xetex/tools/tzcode/zdump.c
+++ b/Build/source/libs/icu/icu-xetex/tools/tzcode/zdump.c
diff --git a/Build/source/libs/icu-xetex/tools/tzcode/zic.c b/Build/source/libs/icu/icu-xetex/tools/tzcode/zic.c
index d4e9461d170..d4e9461d170 100644
--- a/Build/source/libs/icu-xetex/tools/tzcode/zic.c
+++ b/Build/source/libs/icu/icu-xetex/tools/tzcode/zic.c
diff --git a/Build/source/libs/icu-xetex/withenable.ac b/Build/source/libs/icu/icu-xetex/withenable.ac
index c9be41e2a36..c9be41e2a36 100644
--- a/Build/source/libs/icu-xetex/withenable.ac
+++ b/Build/source/libs/icu/icu-xetex/withenable.ac
diff --git a/Build/source/m4/README b/Build/source/m4/README
index 310caf5fca2..ee5af011a98 100644
--- a/Build/source/m4/README
+++ b/Build/source/m4/README
@@ -1,28 +1,31 @@
+Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+You may freely use, modify and/or distribute this file.
+
 This directory is the central repository for Autoconf macros needed to build
 the teTeX / TeX Live (TL) tree.
 
-(1) `Public' macros such as libtool.m4 used to build the libraries and
+(1) Public macros such as libtool.m4 used to build the libraries and
 programs in the TL subdirectories libs/*/, utils/*/, and texk/*/ that are
-owned by the TL tree (i.e., either not maintained independently or with a
-proxy Makefile.am using an unmodified source tree and bypassing the original
-build system).
+owned by the TL tree, i.e., either not maintained independently or with a
+proxy Makefile.am using an (almost) unmodified source tree and bypassing the
+original build system.
 
 Note: the files libtool.m4 and ../build-aux/ltmain.sh must match.
 
-(2) `Private' macros for the TL infrastructure, used in directories owned
-by the TL tree.
+(2) `Public' macros for the TL build system and for the TL libraries in the
+subdirectories libs/*/ and texk/kpathsea/, used to configure programs and
+other libraries requiring these TL libraries.  The macros are designed with
+the aim that programs maintained independently can be built as part of the
+TL tree or without TL (using installed versions of the required libraries),
+ideally using the same unmodified sources.
+
+(3) `Private' macros for the TL infrastructure, only used in directories
+owned by the TL tree.
 
-kpse-pkgs.m4: defines lists of subdirectories libs/LIB/, utils/PROG/, and
-	tex/PROG/ with libraries and programs that can be built as part of
+kpse-pkgs.m4: defines lists of subdirectories libs/Lib/, utils/Util/, and
+	tex/Prog/ with libraries and programs that can be built as part of
 	the TL tree.
 kpse-setup.m4: macros that recurse through these lists to provide configure
 	options.  They depend on configure fragments */*/ac/withenable.ac
 	defining the dependencies between these libraries and programs.
 
-(3) `Public' macros for the TL libraries in the subdirectories libs/*/ and
-texk/kpathsea/, used to configure programs and other libraries requiring
-these TL libraries.  The macros are designed with the aim that programs
-maintained independently can be built as part of the TL tree or without TL
-(using installed versions of the required libraries), ideally using the same
-unmodified sources.
-
diff --git a/Build/source/m4/cho-kpse.m4 b/Build/source/m4/cho-kpse.m4
index 6c6014d9e45..34ea0ff1e37 100644
--- a/Build/source/m4/cho-kpse.m4
+++ b/Build/source/m4/cho-kpse.m4
@@ -15,7 +15,8 @@
 # of these truetype was introduced last (Dec 1997).
 AC_DEFUN([CHO_CHECK_KPSE_SUPPORT],
 [KPSE_CHECK_KPSE_FORMAT([truetype], ,
-                        [AC_MSG_ERROR([Required file formats not found in Kpathsea header files.
+                        [KPSE_MSG_ERROR([$1],
+                                        [Required file formats not found in Kpathsea header files.
 
 This version of $1 requires that kpathsea and its headers be available.
 If you are sure they are installed and in a standard place, maybe you need a
@@ -25,7 +26,8 @@ the file "kpathsea/kpathsea.h"
 
 ])])
 KPSE_CHECK_XBASENAME([],
-                     [AC_MSG_ERROR([This version of $1 requires xbasename in libkpathsea.])])
+                     [KPSE_MSG_ERROR([$1],
+                                     [This version of $1 requires xbasename in libkpathsea.])])
 ]) # CHO_CHECK_KPSE_SUPPORT
 
 # CHO_CHECK_KPSE_TDS_VERSION
diff --git a/Build/source/m4/cho-libs.m4 b/Build/source/m4/cho-libs.m4
index 426f44660fa..fa3d6f812f2 100644
--- a/Build/source/m4/cho-libs.m4
+++ b/Build/source/m4/cho-libs.m4
@@ -107,7 +107,8 @@ AS_IF([test "x$cho_cv_have_freetype" = xyes],
       [AC_CHECK_FUNCS([FT_Init_FreeType],
                       [AC_DEFINE([HAVE_LIBFREETYPE], 1,
                                  [Define if you have libfreetype and its headers.])])],
-      [AC_MSG_ERROR([This version of $1 requires that FreeType2 and its headers be available.
+      [KPSE_MSG_ERROR([$1],
+                      [This version of $1 requires that FreeType2 and its headers be available.
 You can use the --with-freetype2-includes and/or --with-freetype2-libdir options
 to indicate the location of the installed freetype2 library and headers.])])
 ])# CHO_CHECK_LIBFREETYPE
diff --git a/Build/source/m4/kpse-common.m4 b/Build/source/m4/kpse-common.m4
index 86ab1decc8c..05386a7b70d 100644
--- a/Build/source/m4/kpse-common.m4
+++ b/Build/source/m4/kpse-common.m4
@@ -259,3 +259,19 @@ AC_DEFUN([KPSE_ADD_FLAGS],
 CPPFLAGS="$CPPFLAGS $[]AS_TR_CPP($1)_INCLUDES"
 LIBS="$[]AS_TR_CPP($1)_LIBS $LIBS"
 ]) # KPSE_ADD_FLAGS
+
+# KPSE_MSG_ERROR(PACKAGE, ERROR, [EXIT-STATUS = 1])
+# -------------------------------------------------
+# Same as AC_MSG_ERROR(ERROR, EXIT-STATUS), except when building this
+# package PACKAGE has been disabled.
+#
+# The new (2009) TL build system requires all directories to be configured
+# for the benefit of 'dist*' Make targets.  When building PACKAGE has been
+# disabled, configuring that package must not fail because building required
+# libraries from the TL tree has been disabled as a consequence.
+AC_DEFUN([KPSE_MSG_ERROR],
+[AS_IF([test "x$enable_build" = xno],
+       [AC_MSG_WARN([building $1 has been disabled and would fail because
+$2])],
+       [AC_MSG_ERROR([$2], m4_default([$3], 1))])
+]) # KPSE_MSG_ERROR
diff --git a/Build/source/m4/kpse-cxx-hack.m4 b/Build/source/m4/kpse-cxx-hack.m4
index 40a06b29385..e8fbd8533a4 100644
--- a/Build/source/m4/kpse-cxx-hack.m4
+++ b/Build/source/m4/kpse-cxx-hack.m4
@@ -29,7 +29,6 @@ AC_DEFUN([KPSE_ENABLE_CXX_HACK],
 AC_DEFUN([KPSE_CXX_HACK],
 [AC_REQUIRE([AC_PROG_CXX])[]dnl
 AC_REQUIRE([KPSE_ENABLE_CXX_HACK])[]dnl
-cpp_link_hack=false
 if test "x$GXX:$enable_cxx_runtime_hack" = xyes:yes; then
   _KPSE_CXX_HACK
 fi
diff --git a/Build/source/m4/kpse-fontconfig-flags.m4 b/Build/source/m4/kpse-fontconfig-flags.m4
new file mode 100644
index 00000000000..40a95bf9d25
--- /dev/null
+++ b/Build/source/m4/kpse-fontconfig-flags.m4
@@ -0,0 +1,49 @@
+# Public macros for the teTeX / TeX Live (TL) tree.
+# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+#
+# This file is free software; the copyright holder
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 0
+
+# KPSE_FONTCONFIG_FLAGS
+# ---------------------
+# Provide the configure option '--with-fontconfig' and check for
+# installed fontconfig headers and library.
+# Check or set the cache variables kpse_cv_have_fontconfig,
+# kpse_cv_fontconfig_includes, and kpse_cv_fontconfig_libs.
+# If found set the make variables FONTCONFIG_INCLUDES and FONTCONFIG_LIBS
+# to the CPPFLAGS and LIBS required for the installed '-lfontconfig'
+# library and define HAVE_LIBFONTCONFIG.
+AC_DEFUN([KPSE_FONTCONFIG_FLAGS],
+[AC_ARG_WITH([fontconfig],
+             AS_HELP_STRING([--with-fontconfig=DIR],
+                            [use fontconfig include/library files from DIR]))[]dnl
+AC_CACHE_CHECK([for installed fontconfig headers and library],
+               [kpse_cv_have_fontconfig],
+[kpse_save_CPPFLAGS=$CPPFLAGS
+kpse_save_LIBS=$LIBS
+if test "x$with_fontconfig" != x && test -d "$with_fontconfig"; then
+  kpse_cv_fontconfig_includes="-I$with_fontconfig/include"
+  kpse_cv_fontconfig_libs="-L$with_fontconfig/lib -lfontconfig"
+else
+  kpse_cv_fontconfig_includes=
+  kpse_cv_fontconfig_libs='-lfontconfig'
+fi
+CPPFLAGS="$with_fontconfig $CPPFLAGS"
+LIBS="$kpse_cv_fontconfig_libs $LIBS"
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <fontconfig/fontconfig.h>]],
+                                [[FcObjectSet *os; FcInit();]])],
+               [kpse_cv_have_fontconfig=yes],
+               [kpse_cv_have_fontconfig=no])
+CPPFLAGS=$kpse_save_CPPFLAGS
+LIBS=$kpse_save_LIBS])
+if test "x$kpse_cv_have_fontconfig" = xyes; then
+  FONTCONFIG_INCLUDES=$kpse_cv_fontconfig_includes
+  FONTCONFIG_LIBS=$kpse_cv_fontconfig_libs
+  AC_DEFINE([HAVE_LIBFONTCONFIG], 1, [Define if you have libfontconfig.])
+fi
+AC_SUBST([FONTCONFIG_INCLUDES])
+AC_SUBST([FONTCONFIG_LIBS])
+]) # KPSE_FONTCONFIG_FLAGS
diff --git a/Build/source/m4/kpse-icu-flags.m4 b/Build/source/m4/kpse-icu-flags.m4
new file mode 100644
index 00000000000..261937388a6
--- /dev/null
+++ b/Build/source/m4/kpse-icu-flags.m4
@@ -0,0 +1,21 @@
+# Public macros for the teTeX / TeX Live (TL) tree.
+# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+#
+# This file is free software; the copyright holder
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 0
+
+# KPSE_ICU_FLAGS()
+# ----------------
+# Set the make variables ICU_INCLUDES and ICU_LIBS to
+# the CPPFLAGS and LIBS required for the icu-xetex libraries in
+# libs/icu/ of the TL tree.
+AC_DEFUN([KPSE_ICU_FLAGS],
+[_KPSE_LIB_FLAGS([icu], [sicuxxx], [],
+                 [-IBLD/libs/icu/icu-build/common -ISRC/libs/icu/icu-xetex/common -ISRC/libs/icu/icu-xetex/layout],
+                 [BLD/libs/icu/icu-build/lib/libsicuuc.a BLD/libs/icu/icu-build/lib/libsicule.a BLD/libs/icu/icu-build/lib/libsicudata.a],
+                 [tree], [],
+                 [${top_builddir}/../../libs/icu/icu-build/common/unicode/platform.h])[]dnl
+]) # KPSE_ICU_FLAGS
diff --git a/Build/source/m4/kpse-macos-framework.m4 b/Build/source/m4/kpse-macos-framework.m4
index 476220b7157..d76413d96a9 100644
--- a/Build/source/m4/kpse-macos-framework.m4
+++ b/Build/source/m4/kpse-macos-framework.m4
@@ -10,6 +10,8 @@
 
 # KPSE_CHECK_FRAMEWORK(FRAMEWORK, BODY)
 # -------------------------------------
+# Check for mthe Mac OS X framework FRAMEWORK (using BODY) and if found,
+# set kpse_cv_have_FRAMEWORK to yes and define HAVE_FRAMEWORK.
 AC_DEFUN([KPSE_CHECK_FRAMEWORK],
 [AC_CACHE_CHECK([for Mac OS X $1 framework],
                 [kpse_cv_have_$1],
diff --git a/Build/source/m4/kpse-pkgs.m4 b/Build/source/m4/kpse-pkgs.m4
index 328ece77abd..27ac4c7a7db 100644
--- a/Build/source/m4/kpse-pkgs.m4
+++ b/Build/source/m4/kpse-pkgs.m4
@@ -20,6 +20,7 @@
 # Each library must precede required other libraries (if any).
 AC_DEFUN([KPSE_LIBS_PKGS],
 [m4_define([kpse_libs_pkgs], [
+icu
 teckit
 graphite
 xpdf
@@ -70,7 +71,6 @@ vlna
 AC_DEFUN([KPSE_TEXK_PKGS],
 [m4_define([kpse_texk_pkgs], [
 web2c
-one
 afm2pl
 bibtex8
 cjkutils
diff --git a/Build/source/m4/kpse-setup.m4 b/Build/source/m4/kpse-setup.m4
index 8eeb4a22a87..48097c1f9ea 100644
--- a/Build/source/m4/kpse-setup.m4
+++ b/Build/source/m4/kpse-setup.m4
@@ -13,12 +13,12 @@
 # Sinclude all withenable.ac files providing:
 #   configure options --with-system-LIB, --with-LIB-includes, and --with-LIB-libdir
 #     for libraries
-#   configure option --without-PKG for programs
+#   configure option --disable-PKG or --enable-PKG for programs
+#   additional program specific configure options (if any)
 #   library dependencies for programs and libraries
 AC_DEFUN([KPSE_SETUP],
 [m4_define([kpse_TL], [$1])[]dnl
 m4_define([kpse_indent_26], [28])[]dnl
-m4_define([kpse_indent_28], [30])[]dnl
 AC_ARG_ENABLE([all-pkgs],
               AS_HELP_STRING([--disable-all-pkgs],
                              [do not build packages unless explicitly enabled]))[]dnl
diff --git a/Build/source/m4/kpse-web2c.m4 b/Build/source/m4/kpse-web2c.m4
index 831d60b0404..57d80bd9c32 100644
--- a/Build/source/m4/kpse-web2c.m4
+++ b/Build/source/m4/kpse-web2c.m4
@@ -20,7 +20,7 @@ m4_define([KPSE_WITH_MKTEX],
                AS_HELP_STRING([--]m4_if($2, [yes], [dis], [en])[able-$1-default],
                               m4_if($2, [yes],
                                     [do not ])[run $1 if $3 missing],
-                              kpse_indent_28))[]dnl
+                              kpse_indent_26+2))[]dnl
 AS_CASE([$enable_$1_default], [yes|no], ,
                             [enable_$1_default=$2])[]dnl
 ]) # KPSE_WITH_MKTEX
@@ -44,11 +44,11 @@ m4_define([KPSE_WITH_XTEX],
                AS_HELP_STRING([--]m4_if($2, [yes], [dis], [en])[able-$1],
                               m4_if($2, [yes],
                                     [do not ])[compile and install $4],
-                              kpse_indent_28))[]dnl
+                              kpse_indent_26+2))[]dnl
 AS_CASE([$enable_$1], [yes|no], ,
                     [enable_$1=$2])[]dnl
 m4_ifval([$5], [
-test "x$enable_$1" = xno || {
+test "x$enable_web2c:$enable_$1" = xyes:yes && {
 AC_FOREACH([Kpse_Lib], [$5], [  need_[]AS_TR_SH(Kpse_Lib)=yes
 ])}
 ])[]dnl m4_ifval
@@ -69,7 +69,7 @@ m4_define([KPSE_WITH_MFWIN],
 [AC_ARG_ENABLE([$1win],
                AS_HELP_STRING([--enable-$1win],
                               [include $3 window support],
-                              kpse_indent_28))[]dnl
+                              kpse_indent_26+2))[]dnl
 ]) # KPSE_WITH_MFWIN
 
 # KPSE_MFWIN_DEFINE(WINDOW, DEFINE, TEXT)
diff --git a/Build/source/texk/Makefile.am b/Build/source/texk/Makefile.am
index 48a693bcdc5..e37ad692836 100644
--- a/Build/source/texk/Makefile.am
+++ b/Build/source/texk/Makefile.am
@@ -4,8 +4,6 @@ ACLOCAL_AMFLAGS = -I ../m4
 SUBDIRS = dummy . $(SUBTEXK)
 DIST_SUBDIRS = dummy $(DIST_SUBTEXK)
 
-EXTRA_DIST = README.orig
-
 ## just in case a subdirectory has added directories
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in
index 803ae867140..6fb5f028f74 100644
--- a/Build/source/texk/Makefile.in
+++ b/Build/source/texk/Makefile.in
@@ -61,7 +61,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../texk/ac/withenable.ac \
 	$(top_srcdir)/../texk/web2c/ac/withenable.ac \
 	$(top_srcdir)/../texk/web2c/ac/web2c.ac \
-	$(top_srcdir)/../texk/one/ac/withenable.ac \
 	$(top_srcdir)/../texk/afm2pl/ac/withenable.ac \
 	$(top_srcdir)/../texk/bibtex8/ac/withenable.ac \
 	$(top_srcdir)/../texk/cjkutils/ac/withenable.ac \
@@ -97,6 +96,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../texk/kpathsea/ac/withenable.ac \
 	$(top_srcdir)/../texk/kpathsea/ac/web2c.ac \
 	$(top_srcdir)/../libs/ac/withenable.ac \
+	$(top_srcdir)/../libs/icu/ac/withenable.ac \
 	$(top_srcdir)/../libs/teckit/ac/withenable.ac \
 	$(top_srcdir)/../libs/graphite/ac/withenable.ac \
 	$(top_srcdir)/../libs/xpdf/ac/withenable.ac \
@@ -225,7 +225,6 @@ top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../m4
 SUBDIRS = dummy . $(SUBTEXK)
 DIST_SUBDIRS = dummy $(DIST_SUBTEXK)
-EXTRA_DIST = README.orig
 SUBTEXK_AUX = subtexkdir-configure subtexkdir-conf.args
 noinst_DATA = $(SUBTEXK_AUX)
 DISTCLEANFILES = $(noinst_DATA)
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index 24df28d0c5b..790682ad92c 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -716,7 +716,6 @@ enable_tektronixwin
 enable_unitermwin
 enable_mp
 enable_web_progs
-enable_one
 enable_afm2pl
 enable_bibtex8
 enable_cjkutils
@@ -803,7 +802,6 @@ host_alias
 target_alias'
 ac_subdirs_all='dummy
 web2c
-one
 afm2pl
 bibtex8
 cjkutils
@@ -1479,25 +1477,24 @@ Optional Features:
   --disable-dump-share      make fmt/base/mem files architecture-dependent
   --enable-fmtutil          use fmtutil for build dumps
   --enable-ipc              enable TeX's --ipc option, i.e., pipe to a program
-  --disable-tex               do not compile and install TeX
-  --enable-etex               compile and install e-TeX
-  --disable-aleph             do not compile and install Aleph
-  --disable-pdftex            do not compile and install pdfTeX
-  --disable-luatex            do not compile and install luaTeX
-  --enable-xetex              compile and install XeTeX
+  --disable-tex             do not compile and install TeX
+  --enable-etex             compile and install e-TeX
+  --disable-aleph           do not compile and install Aleph
+  --disable-pdftex          do not compile and install pdfTeX
+  --disable-luatex          do not compile and install luaTeX
+  --disable-xetex           do not compile and install XeTeX
   --disable-mf              do not build METAFONT
-  --enable-mf-nowin           build a separate non-windows-capable METAFONT
-  --enable-epsfwin            include EPSF pseudo window support
-  --enable-hp2627win          include HP 2627 window support
-  --enable-mftalkwin          include mftalk (generic server) window support
-  --enable-nextwin            include NeXT window support
-  --enable-regiswin           include Regis window support
-  --enable-suntoolswin        include old Suntools (not X) window support
-  --enable-tektronixwin       include Tektronix window support
-  --enable-unitermwin         include Uniterm window support
+  --enable-mf-nowin         build a separate non-windows-capable METAFONT
+  --enable-epsfwin          include EPSF pseudo window support
+  --enable-hp2627win        include HP 2627 window support
+  --enable-mftalkwin        include mftalk (generic server) window support
+  --enable-nextwin          include NeXT window support
+  --enable-regiswin         include Regis window support
+  --enable-suntoolswin      include old Suntools (not X) window support
+  --enable-tektronixwin     include Tektronix window support
+  --enable-unitermwin       include Uniterm window support
   --disable-mp              do not build METAPOST
   --disable-web-progs       do not build WEB programs bibtex ... weave
-  --enable-one            build the one (testing) package
   --disable-afm2pl        do not build the afm2pl package
   --disable-bibtex8       do not build the bibtex8 package
   --disable-cjkutils      do not build the cjkutils package
@@ -1544,13 +1541,14 @@ Optional Features:
   --disable-xdvipdfmx     do not build the xdvipdfmx package
   --disable-tetex         do not build the tetex (teTeX scripts) package
   --disable-texlive       do not build the texlive (TeX Live scripts) package
-  --disable-mktexmf-default   do not run mktexmf if MF source missing
-  --disable-mktexpk-default   do not run mktexpk if PK font missing
-  --disable-mktextfm-default  do not run mktextfm if TFM file missing
-  --disable-mkocp-default     do not run mkocp if OCP file missing
-  --disable-mkofm-default     do not run mkofm if OFM file missing
-  --enable-mktexfmt-default   run mktexfmt if format file missing
-  --enable-mktextex-default   run mktextex if TeX source missing
+  --disable-mktexmf-default do not run mktexmf if MF source missing
+  --disable-mktexpk-default do not run mktexpk if PK font missing
+  --disable-mktextfm-default
+                            do not run mktextfm if TFM file missing
+  --disable-mkocp-default   do not run mkocp if OCP file missing
+  --disable-mkofm-default   do not run mkofm if OFM file missing
+  --enable-mktexfmt-default run mktexfmt if format file missing
+  --enable-mktextex-default run mktextex if TeX source missing
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
 
@@ -2310,7 +2308,7 @@ esac
 
 ## texk/ac/withenable.ac
 
-## texk/web2c/ac/withenable.ac
+## texk/web2c/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
 ## configure options and TL libraries required for web2c
 # Check whether --enable-web2c was given.
 if test "${enable_web2c+set}" = set; then
@@ -2329,7 +2327,7 @@ test "x$enable_web2c" = xno || {
   need_zlib=yes
 }
 
-## texk/web2c/ac/web2c.ac
+## texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
 ## configure options for TeX and MF
 
 # Check whether --with-editor was given.
@@ -2386,7 +2384,7 @@ case $enable_pdftex in
   *) enable_pdftex=yes ;;
 esac
 
-test "x$enable_pdftex" = xno || {
+test "x$enable_web2c:$enable_pdftex" = xyes:yes && {
   need_xpdf=yes
   need_libpng=yes
   need_obsdcompat=yes
@@ -2400,7 +2398,7 @@ case $enable_luatex in
   *) enable_luatex=yes ;;
 esac
 
-test "x$enable_luatex" = xno || {
+test "x$enable_web2c:$enable_luatex" = xyes:yes && {
   need_xpdf=yes
   need_libpng=yes
   need_obsdcompat=yes
@@ -2411,13 +2409,16 @@ if test "${enable_xetex+set}" = set; then
 fi
 case $enable_xetex in
   yes|no) : ;;
-  *) enable_xetex=no ;;
+  *) enable_xetex=yes ;;
 esac
 
-test "x$enable_xetex" = xno || {
+test "x$enable_web2c:$enable_xetex" = xyes:yes && {
   need_xpdf=yes
   need_libpng=yes
   need_freetype2=yes
+  need_icu=yes
+  need_teckit=yes
+  need_graphite=yes
 }
 ## configure options for MF
 # Check whether --enable-mf was given.
@@ -2477,29 +2478,6 @@ if test "${enable_web_progs+set}" = set; then
 fi
 
 
-## texk/one/ac/withenable.ac
-## configure options and TL libraries required for one
-# Check whether --enable-one was given.
-if test "${enable_one+set}" = set; then
-  enableval=$enable_one;
-fi
-case $enable_one in #(
-  yes|no);; #(
-  *) enable_one=no
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-one=$enable_one'" >&5
-$as_echo "$as_me: Assuming \`--enable-one=$enable_one'" >&6;}
-     ac_configure_args="$ac_configure_args '--enable-one=$enable_one'";;
-esac
-
-test "x$enable_one" = xno || {
-  need_freetype2=yes
-  need_t1lib=yes
-  need_gd=yes
-  need_teckit=yes
-  need_graphite=yes
-}
-
-
 ## texk/afm2pl/ac/withenable.ac
 ## configure options and TL libraries required for afm2pl
 # Check whether --enable-afm2pl was given.
@@ -3134,7 +3112,7 @@ esac
 
 
 
-## texk/kpathsea/ac/withenable.ac
+## texk/kpathsea/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
 ## configure options and TL libraries required for kpathsea
 
 # Check whether --with-system-kpathsea was given.
@@ -3164,7 +3142,7 @@ $as_echo "$as_me: Assuming installed \`kpathsea' headers and library" >&6;}
   ac_configure_args="$ac_configure_args '--with-system-kpathsea=$with_system_kpathsea'"
 fi
 
-## texk/kpathsea/ac/web2c.ac
+## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
 ## configure options for mktextmf-default & Co
 # Check whether --enable-mktexmf-default was given.
 if test "${enable_mktexmf_default+set}" = set; then
@@ -3226,6 +3204,10 @@ esac
 
 ## libs/ac/withenable.ac
 
+## libs/icu/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/icu/
+## configure options and TL libraries required for icu (modified for XeTeX)
+
+
 ## libs/teckit/ac/withenable.ac
 ## configure options and TL libraries required for teckit
 
@@ -4094,16 +4076,6 @@ if test -x $srcdir/web2c/configure; then
 fi
 
 
-if test -x $srcdir/one/configure; then
-  test "x$enable_one" = xno || SUBTEXK="$SUBTEXK one"
-  DIST_SUBTEXK="$DIST_SUBTEXK one"
-  if false; then
-    subdirs="$subdirs one"
-
-  fi
-fi
-
-
 if test -x $srcdir/afm2pl/configure; then
   test "x$enable_afm2pl" = xno || SUBTEXK="$SUBTEXK afm2pl"
   DIST_SUBTEXK="$DIST_SUBTEXK afm2pl"
diff --git a/Build/source/texk/dvipdfmx/Makefile.am b/Build/source/texk/dvipdfmx/Makefile.am
index faef0d05e71..eea486dc358 100644
--- a/Build/source/texk/dvipdfmx/Makefile.am
+++ b/Build/source/texk/dvipdfmx/Makefile.am
@@ -1,6 +1,8 @@
-SUBDIRS = data src
+##
 ACLOCAL_AMFLAGS = -I ../../m4
 
+SUBDIRS = data src
+
 EXTRA_DIST = ChangeLog.TL
 
 ## Eventually delete these files
diff --git a/Build/source/texk/dvipdfmx/Makefile.in b/Build/source/texk/dvipdfmx/Makefile.in
index 7ab55463f29..97f37995235 100644
--- a/Build/source/texk/dvipdfmx/Makefile.in
+++ b/Build/source/texk/dvipdfmx/Makefile.in
@@ -44,7 +44,7 @@ DIST_COMMON = README $(am__configure_deps) \
 	../../build-aux/install-sh ../../build-aux/ltmain.sh \
 	../../build-aux/missing ../../build-aux/texinfo.tex \
 	../../build-aux/ylwrap AUTHORS COPYING ChangeLog INSTALL NEWS \
-	TODO compile depcomp install-sh missing mkinstalldirs
+	TODO
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/cho-kpse.m4 \
 	$(top_srcdir)/../../m4/cho-libs.m4 \
@@ -210,8 +210,8 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = data src
 ACLOCAL_AMFLAGS = -I ../../m4
+SUBDIRS = data src
 EXTRA_DIST = ChangeLog.TL Makefile.am.orig configure.in.orig
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/Build/source/texk/dvipdfmx/config.h.in b/Build/source/texk/dvipdfmx/config.h.in
index 575e3101aa9..be3f6d5b5a4 100644
--- a/Build/source/texk/dvipdfmx/config.h.in
+++ b/Build/source/texk/dvipdfmx/config.h.in
@@ -1,70 +1,170 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
+/* Define to 1 if the `closedir' function returns void instead of `int'. */
+#undef CLOSEDIR_VOID
+
+/* Define to 1 if you have the <assert.h> header file. */
+#undef HAVE_ASSERT_H
 
 /* Define to 1 if you have the `basename' function. */
 #undef HAVE_BASENAME
 
+/* Define to 1 if you have the `bcmp' function. */
+#undef HAVE_BCMP
+
+/* Define to 1 if you have the `bcopy' function. */
+#undef HAVE_BCOPY
+
+/* Define to 1 if you have the `bzero' function. */
+#undef HAVE_BZERO
+
 /* Define to 1 if you have the `close' function. */
 #undef HAVE_CLOSE
 
+/* Define to 1 if you have the `compress' function. */
+#undef HAVE_COMPRESS
+
+/* Define to 1 if you have the `compress2' function. */
+#undef HAVE_COMPRESS2
+
 /* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
    */
 #undef HAVE_DECL_TZNAME
 
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_DIRENT_H
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <float.h> header file. */
+#undef HAVE_FLOAT_H
+
 /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
 #undef HAVE_FSEEKO
 
+/* Define to 1 if you have the `getcwd' function. */
+#undef HAVE_GETCWD
+
 /* Define to 1 if you have the `getenv' function. */
 #undef HAVE_GETENV
 
+/* Define to 1 if you have the `getwd' function. */
+#undef HAVE_GETWD
+
+/* Define to 1 if you have the `index' function. */
+#undef HAVE_INDEX
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define to 1 if you have the `kpathsea' library (-lkpathsea). */
-#undef HAVE_LIBKPATHSEA
-
 /* Define if you have libpaper */
 #undef HAVE_LIBPAPER
 
-/* Define if you have libpng */
+/* Define if you have libpng and its headers. */
 #undef HAVE_LIBPNG
 
+/* Define to 1 if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
+
+/* Define to 1 if you have the `memcmp' function. */
+#undef HAVE_MEMCMP
+
+/* Define to 1 if you have the `memcpy' function. */
+#undef HAVE_MEMCPY
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
 /* Define to 1 if you have the `mkstemp' function. */
 #undef HAVE_MKSTEMP
 
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+#undef HAVE_NDIR_H
+
 /* Define to 1 if you have the `open' function. */
 #undef HAVE_OPEN
 
+/* Define to 1 if you have the `png_get_image_width' function. */
+#undef HAVE_PNG_GET_IMAGE_WIDTH
+
+/* Define to 1 if you are using GNU libc or otherwise have global variables
+   `program_invocation_name' and `program_invocation_short_name'. */
+#undef HAVE_PROGRAM_INVOCATION_NAME
+
+/* Define to 1 if your compiler understands prototypes. */
+#undef HAVE_PROTOTYPES
+
+/* Define to 1 if you have the `putenv' function. */
+#undef HAVE_PUTENV
+
+/* Define to 1 if you have the <pwd.h> header file. */
+#undef HAVE_PWD_H
+
+/* Define to 1 if you have the `rindex' function. */
+#undef HAVE_RINDEX
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
+/* Define to 1 if you have the `strcasecmp' function. */
+#undef HAVE_STRCASECMP
+
+/* Define to 1 if you have the `strchr' function. */
+#undef HAVE_STRCHR
+
 /* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
+/* Define to 1 if you have the `strrchr' function. */
+#undef HAVE_STRRCHR
+
+/* Define to 1 if you have the `strstr' function. */
+#undef HAVE_STRSTR
+
+/* Define to 1 if you have the `strtol' function. */
+#undef HAVE_STRTOL
+
+/* Define to 1 if `st_mtim' is member of `struct stat'. */
+#undef HAVE_STRUCT_STAT_ST_MTIM
+
 /* Define to 1 if `tm_zone' is member of `struct tm'. */
 #undef HAVE_STRUCT_TM_TM_ZONE
 
 /* Define to 1 if you have the `system' function. */
 #undef HAVE_SYSTEM
 
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_SYS_DIR_H
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_SYS_NDIR_H
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
+
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
-/* external timezone variable */
+/* Define if <time.h> has timezone as an external variable. */
 #undef HAVE_TIMEZONE
 
-/* struct tz has tm_gmtoff */
+/* Define if struct tm has tm_gmtoff as a member. */
 #undef HAVE_TM_GMTOFF
 
 /* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
@@ -78,14 +178,15 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define if you have zlib and its headers */
+/* Define if you have zlib and its headers. */
 #undef HAVE_ZLIB
 
-/* Define if your zlib has the compress2 function */
+/* Define if your zlib has the compress2 function. */
 #undef HAVE_ZLIB_COMPRESS2
 
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
 
 /* Name of package */
 #undef PACKAGE
@@ -126,9 +227,17 @@
 /* Version number of package */
 #undef VERSION
 
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
 
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
@@ -139,7 +248,8 @@
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
 
-/* Define if your libkpathsea supports enc formats */
+/* Define as 0x200406L if your libkpathsea supports enc formats, or as
+   0x200302L otherwise. */
 #undef __TDS_VERSION__
 
 /* Define to empty if `const' does not conform to ANSI C. */
diff --git a/Build/source/texk/dvipdfmx/data/Makefile.am b/Build/source/texk/dvipdfmx/data/Makefile.am
index 30a0ef6c465..45183b7f382 100644
--- a/Build/source/texk/dvipdfmx/data/Makefile.am
+++ b/Build/source/texk/dvipdfmx/data/Makefile.am
@@ -1,12 +1,12 @@
-configdatadir = $(prefix)/texmf/dvipdfmx
+configdatadir = ${prefix}/texmf/dvipdfmx
 dist_configdata_DATA = \
   $(srcdir)/dvipdfmx.cfg
  
-glyphlistdatadir = $(prefix)/texmf-dist/fonts/map/glyphlist
+glyphlistdatadir = ${prefix}/texmf-dist/fonts/map/glyphlist
 dist_glyphlistdata_DATA = \
   $(srcdir)/glyphlist.txt \
   $(srcdir)/pdfglyphlist.txt
 
-mapdatadir = $(prefix)/texmf/fonts/map/dvipdfm/dvipdfmx
+mapdatadir = ${prefix}/texmf/fonts/map/dvipdfm/dvipdfmx
 dist_mapdata_DATA = \
   $(srcdir)/cid-x.map
diff --git a/Build/source/texk/dvipdfmx/data/Makefile.in b/Build/source/texk/dvipdfmx/data/Makefile.in
index 868ff3674d5..c6c67f00519 100644
--- a/Build/source/texk/dvipdfmx/data/Makefile.in
+++ b/Build/source/texk/dvipdfmx/data/Makefile.in
@@ -190,16 +190,16 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-configdatadir = $(prefix)/texmf/dvipdfmx
+configdatadir = ${prefix}/texmf/dvipdfmx
 dist_configdata_DATA = \
   $(srcdir)/dvipdfmx.cfg
 
-glyphlistdatadir = $(prefix)/texmf-dist/fonts/map/glyphlist
+glyphlistdatadir = ${prefix}/texmf-dist/fonts/map/glyphlist
 dist_glyphlistdata_DATA = \
   $(srcdir)/glyphlist.txt \
   $(srcdir)/pdfglyphlist.txt
 
-mapdatadir = $(prefix)/texmf/fonts/map/dvipdfm/dvipdfmx
+mapdatadir = ${prefix}/texmf/fonts/map/dvipdfm/dvipdfmx
 dist_mapdata_DATA = \
   $(srcdir)/cid-x.map
 
diff --git a/Build/source/texk/kpathsea/ac/kpathsea.ac b/Build/source/texk/kpathsea/ac/kpathsea.ac
index 5f89998c35d..73e38ba2391 100644
--- a/Build/source/texk/kpathsea/ac/kpathsea.ac
+++ b/Build/source/texk/kpathsea/ac/kpathsea.ac
@@ -1,4 +1,8 @@
-## texk/kpathsea/ac/kpathsea.ac
+## texk/kpathsea/ac/kpathsea.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
 ## define required functions and headers from system kpathsea
 KPSE_CHECK_LIB([kpathsea], [kpse_set_program_name],
                            [kpathsea/kpathsea.h kpathsea/tex-file.h])
diff --git a/Build/source/texk/kpathsea/ac/web2c.ac b/Build/source/texk/kpathsea/ac/web2c.ac
index d21e211f317..ef7164aba52 100644
--- a/Build/source/texk/kpathsea/ac/web2c.ac
+++ b/Build/source/texk/kpathsea/ac/web2c.ac
@@ -1,6 +1,10 @@
-## texk/kpathsea/ac/web2c.ac
+## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
 ## configure options for mktextmf-default & Co
-m4_define_default([kpse_indent_28], [28])[]dnl
+m4_define_default([kpse_indent_26], [26])[]dnl
 m4_define([kpse_mktex_opts], [dnl
 [[mktexmf],  [yes], [MF source],   [TEX_MF]],
 [[mktexpk],  [yes], [PK font],     [TEX_PK]],
diff --git a/Build/source/texk/kpathsea/ac/withenable.ac b/Build/source/texk/kpathsea/ac/withenable.ac
index 032d8271b91..12c4072287a 100644
--- a/Build/source/texk/kpathsea/ac/withenable.ac
+++ b/Build/source/texk/kpathsea/ac/withenable.ac
@@ -1,4 +1,8 @@
-## texk/kpathsea/ac/withenable.ac
+## texk/kpathsea/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
 ## configure options and TL libraries required for kpathsea
 KPSE_WITH_LIB([kpathsea])
 m4_include(kpse_TL[texk/kpathsea/ac/web2c.ac])
diff --git a/Build/source/texk/kpathsea/configure b/Build/source/texk/kpathsea/configure
index 3ebf963469d..6187e314f21 100755
--- a/Build/source/texk/kpathsea/configure
+++ b/Build/source/texk/kpathsea/configure
@@ -1566,14 +1566,18 @@ Optional Features:
   --enable-dependency-tracking   do not reject slow dependency extractors
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --disable-largefile     omit support for large files
-  --disable-mktexmf-default do not run mktexmf if MF source missing
-  --disable-mktexpk-default do not run mktexpk if PK font missing
+  --disable-mktexmf-default
+                          do not run mktexmf if MF source missing
+  --disable-mktexpk-default
+                          do not run mktexpk if PK font missing
   --disable-mktextfm-default
-                            do not run mktextfm if TFM file missing
-  --disable-mkocp-default   do not run mkocp if OCP file missing
-  --disable-mkofm-default   do not run mkofm if OFM file missing
-  --enable-mktexfmt-default run mktexfmt if format file missing
-  --enable-mktextex-default run mktextex if TeX source missing
+                          do not run mktextfm if TFM file missing
+  --disable-mkocp-default do not run mkocp if OCP file missing
+  --disable-mkofm-default do not run mkofm if OFM file missing
+  --enable-mktexfmt-default
+                          run mktexfmt if format file missing
+  --enable-mktextex-default
+                          run mktextex if TeX source missing
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -4182,13 +4186,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4185: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4189: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4188: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4192: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4191: output\"" >&5)
+  (eval echo "\"\$as_me:4195: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5394,7 +5398,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5397 "configure"' > conftest.$ac_ext
+  echo '#line 5401 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7441,11 +7445,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7444: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7448: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7448: \$? = $ac_status" >&5
+   echo "$as_me:7452: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7780,11 +7784,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7783: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7787: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7787: \$? = $ac_status" >&5
+   echo "$as_me:7791: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7885,11 +7889,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7888: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7892: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7892: \$? = $ac_status" >&5
+   echo "$as_me:7896: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -7940,11 +7944,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7943: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7947: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7947: \$? = $ac_status" >&5
+   echo "$as_me:7951: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10740,7 +10744,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10743 "configure"
+#line 10747 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10836,7 +10840,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10839 "configure"
+#line 10843 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12841,7 +12845,7 @@ _ACEOF
 fi
 
 
-## texk/kpathsea/ac/web2c.ac
+## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
 ## configure options for mktextmf-default & Co
 # Check whether --enable-mktexmf-default was given.
 if test "${enable_mktexmf_default+set}" = set; then
diff --git a/Build/source/texk/lcdf-typetools/cfftot1/Makefile.in b/Build/source/texk/lcdf-typetools/cfftot1/Makefile.in
index 1b54226cd10..884469acc82 100644
--- a/Build/source/texk/lcdf-typetools/cfftot1/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/cfftot1/Makefile.in
@@ -317,11 +317,11 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-man1: $(man1_MANS) $(man_MANS)
+install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
 	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	@list=''; \
+	l2='$(man_MANS)'; \
 	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
@@ -343,8 +343,8 @@ install-man1: $(man1_MANS) $(man_MANS)
 	done
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	@list=''; \
+	l2='$(man_MANS)'; \
 	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure
index 65b7c526eda..be732244e31 100755
--- a/Build/source/texk/lcdf-typetools/configure
+++ b/Build/source/texk/lcdf-typetools/configure
@@ -17580,7 +17580,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 fi
-if test "x$kpse_cv_cxx_flags" = xok; then
+if test "x$kpse_cv_cxx_hack" = xok; then
   CXXLD='$(top_builddir)/CXXLD.sh'
   CXX_HACK_DEPS=$CXXLD
   CXX_HACK_LIBS=$kpse_cv_cxx_flags
diff --git a/Build/source/texk/lcdf-typetools/mmafm/Makefile.in b/Build/source/texk/lcdf-typetools/mmafm/Makefile.in
index b325971fc9b..b880ec5d105 100644
--- a/Build/source/texk/lcdf-typetools/mmafm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/mmafm/Makefile.in
@@ -305,11 +305,11 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-man1: $(man1_MANS) $(man_MANS)
+install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
 	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	@list=''; \
+	l2='$(man_MANS)'; \
 	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
@@ -331,8 +331,8 @@ install-man1: $(man1_MANS) $(man_MANS)
 	done
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	@list=''; \
+	l2='$(man_MANS)'; \
 	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
diff --git a/Build/source/texk/lcdf-typetools/mmpfb/Makefile.in b/Build/source/texk/lcdf-typetools/mmpfb/Makefile.in
index 09566644b98..75f627113b5 100644
--- a/Build/source/texk/lcdf-typetools/mmpfb/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/mmpfb/Makefile.in
@@ -322,11 +322,11 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-man1: $(man1_MANS) $(man_MANS)
+install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
 	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	@list=''; \
+	l2='$(man_MANS)'; \
 	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
@@ -348,8 +348,8 @@ install-man1: $(man1_MANS) $(man_MANS)
 	done
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	@list=''; \
+	l2='$(man_MANS)'; \
 	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
diff --git a/Build/source/texk/lcdf-typetools/otfinfo/Makefile.in b/Build/source/texk/lcdf-typetools/otfinfo/Makefile.in
index de9bc392c9e..f8bf60bb995 100644
--- a/Build/source/texk/lcdf-typetools/otfinfo/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/otfinfo/Makefile.in
@@ -307,11 +307,11 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-man1: $(man1_MANS) $(man_MANS)
+install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
 	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	@list=''; \
+	l2='$(man_MANS)'; \
 	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
@@ -333,8 +333,8 @@ install-man1: $(man1_MANS) $(man_MANS)
 	done
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	@list=''; \
+	l2='$(man_MANS)'; \
 	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/Makefile.in b/Build/source/texk/lcdf-typetools/otftotfm/Makefile.in
index 5b49c27bb57..d8a50ff9409 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/otftotfm/Makefile.in
@@ -363,11 +363,11 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-man1: $(man1_MANS) $(man_MANS)
+install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
 	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	@list=''; \
+	l2='$(man_MANS)'; \
 	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
@@ -389,8 +389,8 @@ install-man1: $(man1_MANS) $(man_MANS)
 	done
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	@list=''; \
+	l2='$(man_MANS)'; \
 	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
diff --git a/Build/source/texk/lcdf-typetools/t1dotlessj/Makefile.in b/Build/source/texk/lcdf-typetools/t1dotlessj/Makefile.in
index a87a9e5e0c7..e186dc480c1 100644
--- a/Build/source/texk/lcdf-typetools/t1dotlessj/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/t1dotlessj/Makefile.in
@@ -305,11 +305,11 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-man1: $(man1_MANS) $(man_MANS)
+install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
 	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	@list=''; \
+	l2='$(man_MANS)'; \
 	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
@@ -331,8 +331,8 @@ install-man1: $(man1_MANS) $(man_MANS)
 	done
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	@list=''; \
+	l2='$(man_MANS)'; \
 	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
diff --git a/Build/source/texk/lcdf-typetools/t1lint/Makefile.in b/Build/source/texk/lcdf-typetools/t1lint/Makefile.in
index 8e1a1cf297b..cfd04901fab 100644
--- a/Build/source/texk/lcdf-typetools/t1lint/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/t1lint/Makefile.in
@@ -317,11 +317,11 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-man1: $(man1_MANS) $(man_MANS)
+install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
 	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	@list=''; \
+	l2='$(man_MANS)'; \
 	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
@@ -343,8 +343,8 @@ install-man1: $(man1_MANS) $(man_MANS)
 	done
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	@list=''; \
+	l2='$(man_MANS)'; \
 	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
diff --git a/Build/source/texk/lcdf-typetools/t1rawafm/Makefile.in b/Build/source/texk/lcdf-typetools/t1rawafm/Makefile.in
index a9f8714fa6d..4c6174cd123 100644
--- a/Build/source/texk/lcdf-typetools/t1rawafm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/t1rawafm/Makefile.in
@@ -305,11 +305,11 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-man1: $(man1_MANS) $(man_MANS)
+install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
 	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	@list=''; \
+	l2='$(man_MANS)'; \
 	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
@@ -331,8 +331,8 @@ install-man1: $(man1_MANS) $(man_MANS)
 	done
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	@list=''; \
+	l2='$(man_MANS)'; \
 	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
diff --git a/Build/source/texk/lcdf-typetools/t1reencode/Makefile.in b/Build/source/texk/lcdf-typetools/t1reencode/Makefile.in
index 280a3dd9696..86bb78ad739 100644
--- a/Build/source/texk/lcdf-typetools/t1reencode/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/t1reencode/Makefile.in
@@ -341,11 +341,11 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-man1: $(man1_MANS) $(man_MANS)
+install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
 	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	@list=''; \
+	l2='$(man_MANS)'; \
 	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
@@ -367,8 +367,8 @@ install-man1: $(man1_MANS) $(man_MANS)
 	done
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	@list=''; \
+	l2='$(man_MANS)'; \
 	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
diff --git a/Build/source/texk/lcdf-typetools/t1testpage/Makefile.in b/Build/source/texk/lcdf-typetools/t1testpage/Makefile.in
index 4db306246f3..5740e64a3ee 100644
--- a/Build/source/texk/lcdf-typetools/t1testpage/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/t1testpage/Makefile.in
@@ -305,11 +305,11 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-man1: $(man1_MANS) $(man_MANS)
+install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
 	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	@list=''; \
+	l2='$(man_MANS)'; \
 	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
@@ -331,8 +331,8 @@ install-man1: $(man1_MANS) $(man_MANS)
 	done
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	@list=''; \
+	l2='$(man_MANS)'; \
 	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
diff --git a/Build/source/texk/lcdf-typetools/ttftotype42/Makefile.in b/Build/source/texk/lcdf-typetools/ttftotype42/Makefile.in
index 56e3dac151f..b620b85a4b1 100644
--- a/Build/source/texk/lcdf-typetools/ttftotype42/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/ttftotype42/Makefile.in
@@ -305,11 +305,11 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-man1: $(man1_MANS) $(man_MANS)
+install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
 	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	@list=''; \
+	l2='$(man_MANS)'; \
 	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
@@ -331,8 +331,8 @@ install-man1: $(man1_MANS) $(man_MANS)
 	done
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	@list=''; \
+	l2='$(man_MANS)'; \
 	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in
index ca3a1f91a67..4f1c129dac5 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.in
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.in
@@ -33,7 +33,7 @@ POST_UNINSTALL = :
 subdir = linked_scripts
 DIST_COMMON = $(nobase_dist_script_SCRIPTS) \
 	$(nobase_dist_scriptx_SCRIPTS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
+	$(srcdir)/Makefile.in ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -157,6 +157,9 @@ nobase_dist_scriptx_SCRIPTS = \
 
 scriptdir = ${prefix}/texmf-dist/scripts
 nobase_dist_script_SCRIPTS = \
+	accfonts/mkt1font \
+	accfonts/vpl2ovp \
+	accfonts/vpl2vpl \
 	bengali/ebong.py \
 	context/lua/luatools.lua \
 	context/lua/mtxrun.lua \
@@ -184,6 +187,13 @@ nobase_dist_script_SCRIPTS = \
 	dviasm/dviasm.py \
 	epspdf/epspdf \
 	epspdf/epspdftk \
+	fontools/afm2afm \
+	fontools/autoinst \
+	fontools/cmap2enc \
+	fontools/font2afm \
+	fontools/ot2kpx \
+	fontools/pfm2kpx \
+	fontools/showglyphs \
 	fragmaster/fragmaster.pl \
 	glossaries/makeglossaries \
 	latex2man/latex2man \
diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am
index ebcad54cd25..d3cd2bbaa24 100644
--- a/Build/source/texk/web2c/Makefile.am
+++ b/Build/source/texk/web2c/Makefile.am
@@ -69,6 +69,14 @@ $(web2c_programs): $(web2c_common) ${srcdir}/web2c/*.[chly]
 @XPDF_RULE@
 ## Rebuild libopenbsd-compat
 @OBSDCOMPAT_RULE@
+## Rebuild libgraphite
+@GRAPHITE_RULE@
+## Rebuild libfreetype
+@FREETYPE2_RULE@
+## Rebuild libTEXkit
+@TECKIT_RULE@
+## Rebuild libsicuxxx
+@ICU_RULE@
 
 ## The environment for building.
 buildenv = TEXMFCNF=$(srcdir)/../kpathsea
@@ -117,9 +125,19 @@ include $(srcdir)/etexdir/am/etex.am
 
 ## pdfTeX
 include $(srcdir)/pdftexdir/am/pdftex.am
+include $(srcdir)/pdftexdir/am/libpdftex.am
+include $(srcdir)/pdftexdir/am/ttf2afm.am
+include $(srcdir)/pdftexdir/am/pdftosrc.am
 
 ## luaTeX
 include $(srcdir)/luatexdir/am/luatex.am
+include $(srcdir)/luatexdir/am/luatangle.am
+include $(srcdir)/luatexdir/am/liblua51.am
+include $(srcdir)/luatexdir/am/libzzip.am
+include $(srcdir)/luatexdir/am/luasocket.am
+include $(srcdir)/luatexdir/am/luamisc.am
+include $(srcdir)/luatexdir/am/luafontforge.am
+include $(srcdir)/luatexdir/am/libluatex.am
 
 ## XeTeX
 include $(srcdir)/xetexdir/am/xetex.am
@@ -130,7 +148,7 @@ include $(srcdir)/omegaware/am/omegaware.am
 ## Aleph
 include $(srcdir)/alephdir/am/aleph.am
 
-## SyncTeX
+## SyncTeX, must come after all TeX-like engines
 include $(srcdir)/synctexdir/am/synctex.am
 
 ## libmd5
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index a583ddcfdef..f702a9ff6d2 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -34,15 +34,17 @@ build_triplet = @build@
 host_triplet = @host@
 @OMFONTS_TRUE@am__append_1 = omegafonts
 EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEEXT) \
-	mf-nowin$(EXEEXT) mpost$(EXEEXT) etex$(EXEEXT) pdftex$(EXEEXT) \
-	luatex$(EXEEXT) luatangle$(EXEEXT) $(am__EXEEXT_4) \
+	mf-nowin$(EXEEXT) mpost$(EXEEXT) newmpost$(EXEEXT) \
+	etex$(EXEEXT) pdftex$(EXEEXT) luatex$(EXEEXT) \
+	luatangle$(EXEEXT) xetex$(EXEEXT) $(am__EXEEXT_4) \
 	aleph$(EXEEXT)
 bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
 	ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_6) \
 	$(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
 	$(am__EXEEXT_10) $(am__EXEEXT_11) ttf2afm$(EXEEXT) \
 	pdftosrc$(EXEEXT) $(am__EXEEXT_12) $(am__EXEEXT_13) \
-	$(am__EXEEXT_14) $(am__EXEEXT_15) synctex$(EXEEXT)
+	$(am__EXEEXT_14) $(am__EXEEXT_15) $(am__EXEEXT_16) \
+	synctex$(EXEEXT)
 noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT)
 check_PROGRAMS = md5main$(EXEEXT)
 DIST_COMMON = README $(am__configure_deps) $(dist_check_SCRIPTS) \
@@ -56,10 +58,20 @@ DIST_COMMON = README $(am__configure_deps) $(dist_check_SCRIPTS) \
 	$(srcdir)/am/bootstrap.am $(srcdir)/am/cweb.am \
 	$(srcdir)/am/texmf.am $(srcdir)/am/web.am $(srcdir)/c-auto.in \
 	$(srcdir)/etexdir/am/etex.am $(srcdir)/libmd5/am/md5.am \
+	$(srcdir)/luatexdir/am/liblua51.am \
+	$(srcdir)/luatexdir/am/libluatex.am \
+	$(srcdir)/luatexdir/am/libzzip.am \
+	$(srcdir)/luatexdir/am/luafontforge.am \
+	$(srcdir)/luatexdir/am/luamisc.am \
+	$(srcdir)/luatexdir/am/luasocket.am \
+	$(srcdir)/luatexdir/am/luatangle.am \
 	$(srcdir)/luatexdir/am/luatex.am $(srcdir)/mpdir/am/mp.am \
 	$(srcdir)/mplibdir/am/mplib.am \
 	$(srcdir)/omegaware/am/omegaware.am \
+	$(srcdir)/pdftexdir/am/libpdftex.am \
 	$(srcdir)/pdftexdir/am/pdftex.am \
+	$(srcdir)/pdftexdir/am/pdftosrc.am \
+	$(srcdir)/pdftexdir/am/ttf2afm.am \
 	$(srcdir)/synctexdir/am/synctex.am \
 	$(srcdir)/xetexdir/am/xetex.am $(top_srcdir)/configure \
 	$(top_srcdir)/luatexdir/luafontloader/ff-config.in \
@@ -72,7 +84,7 @@ DIST_COMMON = README $(am__configure_deps) $(dist_check_SCRIPTS) \
 @TEX_TRUE@am__append_3 = tex
 @MF_TRUE@am__append_4 = mf
 @MFN_TRUE@@MF_TRUE@am__append_5 = mf-nowin
-@MP_TRUE@am__append_6 = mpost
+@MP_TRUE@am__append_6 = mpost newmpost
 @ETEX_TRUE@am__append_7 = etex
 @PDFTEX_TRUE@am__append_8 = pdftex
 @MINGW32_TRUE@am__append_9 = \
@@ -80,24 +92,61 @@ DIST_COMMON = README $(am__configure_deps) $(dist_check_SCRIPTS) \
 @MINGW32_TRUE@	pdftexdir/regex/regex.h
 
 @LUATEX_TRUE@am__append_10 = luatex luatangle
-@MINGW32_FALSE@am__append_11 = -DLUA_USE_POSIX
-@LUATEX_TRUE@am__append_12 = luatexdir/luatangle.test
-@OTANGLE_TRUE@am__append_13 = $(omegaware_tools)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_14 = $(omegaware_font_tools)
-@OTANGLE_TRUE@am__append_15 = omegaware/otangle.test
-@ALEPH_TRUE@am__append_16 = aleph
-@TEX_SYNCTEX_TRUE@am__append_17 = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES)
-@TEX_SYNCTEX_TRUE@am__append_18 = $(ZLIB_LIBS)
-@TEX_SYNCTEX_TRUE@am__append_19 = \
+@LUATEX_TRUE@am__append_11 = luatexdir/luatangle.test
+@MINGW32_FALSE@am__append_12 = -DLUA_USE_POSIX
+@XETEX_TRUE@am__append_13 = xetex
+@XETEX_MACOSX_TRUE@am__append_14 = -DXETEX_MAC
+@XETEX_MACOSX_TRUE@am__append_15 = libxetexmm.a
+@XETEX_MACOSX_FALSE@am__append_16 = -DXETEX_OTHER \
+@XETEX_MACOSX_FALSE@	$(FONTCONFIG_INCLUDES) $(XPDF_INCLUDES) \
+@XETEX_MACOSX_FALSE@	$(LIBPNG_INCLUDES)
+@XETEX_MACOSX_FALSE@am__append_17 = $(FONTCONFIG_LIBS) $(XPDF_LIBS) $(LIBPNG_LIBS)
+@XETEX_MACOSX_FALSE@am__append_18 = $(XPDF_DEPEND) $(LIBPNG_DEPEND)
+@XETEX_GRAPHITE_TRUE@am__append_19 = -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES)
+@XETEX_GRAPHITE_TRUE@am__append_20 = $(GRAPHITE_LIBS)
+@XETEX_GRAPHITE_TRUE@am__append_21 = $(GRAPHITE_DEPEND)
+@XETEX_MACOSX_TRUE@am__append_22 = \
+@XETEX_MACOSX_TRUE@	xetexdir/XeTeXFontInst_Mac.cpp \
+@XETEX_MACOSX_TRUE@	xetexdir/XeTeXFontInst_Mac.h \
+@XETEX_MACOSX_TRUE@	xetexdir/XeTeX_mac.c
+
+@XETEX_MACOSX_FALSE@am__append_23 = \
+@XETEX_MACOSX_FALSE@	xetexdir/XeTeXFontMgr_FC.cpp \
+@XETEX_MACOSX_FALSE@	xetexdir/XeTeXFontMgr_FC.h \
+@XETEX_MACOSX_FALSE@	xetexdir/XeTeX_pic.c \
+@XETEX_MACOSX_FALSE@	xetexdir/bmpimage.c \
+@XETEX_MACOSX_FALSE@	xetexdir/bmpimage.h \
+@XETEX_MACOSX_FALSE@	xetexdir/jpegimage.c \
+@XETEX_MACOSX_FALSE@	xetexdir/jpegimage.h \
+@XETEX_MACOSX_FALSE@	xetexdir/mfileio.c \
+@XETEX_MACOSX_FALSE@	xetexdir/mfileio.h \
+@XETEX_MACOSX_FALSE@	xetexdir/numbers.c \
+@XETEX_MACOSX_FALSE@	xetexdir/numbers.h \
+@XETEX_MACOSX_FALSE@	xetexdir/pdfimage.cpp \
+@XETEX_MACOSX_FALSE@	xetexdir/pdfimage.h \
+@XETEX_MACOSX_FALSE@	xetexdir/pngimage.c \
+@XETEX_MACOSX_FALSE@	xetexdir/pngimage.h
+
+@XETEX_GRAPHITE_TRUE@am__append_24 = \
+@XETEX_GRAPHITE_TRUE@	xetexdir/XeTeXGrLayout.cpp \
+@XETEX_GRAPHITE_TRUE@	xetexdir/XeTeXGrLayout.h
+
+@OTANGLE_TRUE@am__append_25 = $(omegaware_tools)
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_26 = $(omegaware_font_tools)
+@OTANGLE_TRUE@am__append_27 = omegaware/otangle.test
+@ALEPH_TRUE@am__append_28 = aleph
+@TEX_SYNCTEX_TRUE@am__append_29 = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES)
+@TEX_SYNCTEX_TRUE@am__append_30 = $(ZLIB_LIBS)
+@TEX_SYNCTEX_TRUE@am__append_31 = \
 @TEX_SYNCTEX_TRUE@	synctex.c
 
-@ETEX_SYNCTEX_TRUE@am__append_20 = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES)
-@ETEX_SYNCTEX_TRUE@am__append_21 = $(ZLIB_LIBS)
-@ETEX_SYNCTEX_TRUE@am__append_22 = \
+@ETEX_SYNCTEX_TRUE@am__append_32 = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES)
+@ETEX_SYNCTEX_TRUE@am__append_33 = $(ZLIB_LIBS)
+@ETEX_SYNCTEX_TRUE@am__append_34 = \
 @ETEX_SYNCTEX_TRUE@	synctex-e.c
 
-@PDFTEX_SYNCTEX_TRUE@am__append_23 = -I$(srcdir)/synctexdir
-@PDFTEX_SYNCTEX_TRUE@am__append_24 = \
+@PDFTEX_SYNCTEX_TRUE@am__append_35 = -I$(srcdir)/synctexdir
+@PDFTEX_SYNCTEX_TRUE@am__append_36 = \
 @PDFTEX_SYNCTEX_TRUE@	synctex-pdf.c
 
 subdir = .
@@ -106,11 +155,17 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-cross.m4 \
 	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
+	$(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-graphite-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-icu-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-lex.m4 \
 	$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-macos-framework.m4 \
 	$(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-socket-libs.m4 \
+	$(top_srcdir)/../../m4/kpse-teckit-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-web2c.m4 \
 	$(top_srcdir)/../../m4/kpse-win32.m4 \
 	$(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \
@@ -170,16 +225,15 @@ am_liblua51_a_OBJECTS = liblua51_a-lapi.$(OBJEXT) \
 	liblua51_a-ldblib.$(OBJEXT) liblua51_a-ldebug.$(OBJEXT) \
 	liblua51_a-ldo.$(OBJEXT) liblua51_a-ldump.$(OBJEXT) \
 	liblua51_a-lfunc.$(OBJEXT) liblua51_a-lgc.$(OBJEXT) \
-	liblua51_a-linit.$(OBJEXT) liblua51_a-liolib.$(OBJEXT) \
-	liblua51_a-llex.$(OBJEXT) liblua51_a-lmathlib.$(OBJEXT) \
-	liblua51_a-lmem.$(OBJEXT) liblua51_a-loadlib.$(OBJEXT) \
-	liblua51_a-lobject.$(OBJEXT) liblua51_a-lopcodes.$(OBJEXT) \
-	liblua51_a-loslib.$(OBJEXT) liblua51_a-lparser.$(OBJEXT) \
-	liblua51_a-lstate.$(OBJEXT) liblua51_a-lstring.$(OBJEXT) \
-	liblua51_a-lstrlib.$(OBJEXT) liblua51_a-ltable.$(OBJEXT) \
-	liblua51_a-ltablib.$(OBJEXT) liblua51_a-ltm.$(OBJEXT) \
-	liblua51_a-lundump.$(OBJEXT) liblua51_a-lvm.$(OBJEXT) \
-	liblua51_a-lzio.$(OBJEXT)
+	liblua51_a-linit.$(OBJEXT) liblua51_a-llex.$(OBJEXT) \
+	liblua51_a-lmathlib.$(OBJEXT) liblua51_a-lmem.$(OBJEXT) \
+	liblua51_a-loadlib.$(OBJEXT) liblua51_a-lobject.$(OBJEXT) \
+	liblua51_a-lopcodes.$(OBJEXT) liblua51_a-loslib.$(OBJEXT) \
+	liblua51_a-lparser.$(OBJEXT) liblua51_a-lstate.$(OBJEXT) \
+	liblua51_a-lstring.$(OBJEXT) liblua51_a-lstrlib.$(OBJEXT) \
+	liblua51_a-ltable.$(OBJEXT) liblua51_a-ltablib.$(OBJEXT) \
+	liblua51_a-ltm.$(OBJEXT) liblua51_a-lundump.$(OBJEXT) \
+	liblua51_a-lvm.$(OBJEXT) liblua51_a-lzio.$(OBJEXT)
 liblua51_a_OBJECTS = $(am_liblua51_a_OBJECTS)
 libluamisc_a_AR = $(AR) $(ARFLAGS)
 libluamisc_a_LIBADD =
@@ -188,10 +242,10 @@ am_libluamisc_a_OBJECTS = libluamisc_a-lfs.$(OBJEXT) \
 	libluamisc_a-lpeg.$(OBJEXT) libluamisc_a-clocks.$(OBJEXT) \
 	libluamisc_a-core_profiler.$(OBJEXT) \
 	libluamisc_a-function_meter.$(OBJEXT) \
+	libluamisc_a-stack.$(OBJEXT) \
 	libluamisc_a-lua50_profiler.$(OBJEXT) \
-	libluamisc_a-stack.$(OBJEXT) libluamisc_a-luazip.$(OBJEXT) \
-	libluamisc_a-lgzip.$(OBJEXT) libluamisc_a-lzlib.$(OBJEXT) \
-	libluamisc_a-slnunico.$(OBJEXT)
+	libluamisc_a-luazip.$(OBJEXT) libluamisc_a-lgzip.$(OBJEXT) \
+	libluamisc_a-lzlib.$(OBJEXT) libluamisc_a-slnunico.$(OBJEXT)
 libluamisc_a_OBJECTS = $(am_libluamisc_a_OBJECTS)
 libluasocket_a_AR = $(AR) $(ARFLAGS)
 libluasocket_a_LIBADD =
@@ -229,18 +283,18 @@ am_libluatex_a_OBJECTS = libluatex_a-dofont.$(OBJEXT) \
 	libluatex_a-lfontlib.$(OBJEXT) libluatex_a-limglib.$(OBJEXT) \
 	libluatex_a-lkpselib.$(OBJEXT) libluatex_a-llanglib.$(OBJEXT) \
 	libluatex_a-llualib.$(OBJEXT) libluatex_a-lnodelib.$(OBJEXT) \
-	libluatex_a-loslibext.$(OBJEXT) libluatex_a-lpdflib.$(OBJEXT) \
-	libluatex_a-lstatslib.$(OBJEXT) \
+	libluatex_a-loslibext.$(OBJEXT) libluatex_a-liolib.$(OBJEXT) \
+	libluatex_a-lpdflib.$(OBJEXT) libluatex_a-lstatslib.$(OBJEXT) \
 	libluatex_a-ltexiolib.$(OBJEXT) libluatex_a-ltexlib.$(OBJEXT) \
 	libluatex_a-ltokenlib.$(OBJEXT) libluatex_a-luainit.$(OBJEXT) \
 	libluatex_a-luanode.$(OBJEXT) libluatex_a-luastuff.$(OBJEXT) \
 	libluatex_a-luatex.$(OBJEXT) libluatex_a-luatoken.$(OBJEXT) \
 	libluatex_a-texluac.$(OBJEXT) libluatex_a-makecpool.$(OBJEXT) \
 	libluatex_a-managed-sa.$(OBJEXT) \
-	libluatex_a-mathcodes.$(OBJEXT) libluatex_a-lmplib.$(OBJEXT) \
-	libluatex_a-pagetree.$(OBJEXT) libluatex_a-pdfpage.$(OBJEXT) \
-	libluatex_a-filename.$(OBJEXT) libluatex_a-linebreak.$(OBJEXT) \
-	libluatex_a-math.$(OBJEXT) libluatex_a-mlist.$(OBJEXT) \
+	libluatex_a-mathcodes.$(OBJEXT) libluatex_a-pagetree.$(OBJEXT) \
+	libluatex_a-pdfpage.$(OBJEXT) libluatex_a-filename.$(OBJEXT) \
+	libluatex_a-linebreak.$(OBJEXT) libluatex_a-math.$(OBJEXT) \
+	libluatex_a-mlist.$(OBJEXT) \
 	libluatex_a-postlinebreak.$(OBJEXT) \
 	libluatex_a-primitive.$(OBJEXT) \
 	libluatex_a-texdeffont.$(OBJEXT) \
@@ -248,22 +302,28 @@ am_libluatex_a_OBJECTS = libluatex_a-dofont.$(OBJEXT) \
 	libluatex_a-textoken.$(OBJEXT) libluatex_a-textcodes.$(OBJEXT) \
 	libluatex_a-avl.$(OBJEXT) libluatex_a-avlstuff.$(OBJEXT) \
 	libluatex_a-synctex.$(OBJEXT) libluatex_a-utils.$(OBJEXT) \
-	libluatex_a-writezip.$(OBJEXT)
-am__objects_1 = libluatex_a-mp.$(OBJEXT) libluatex_a-psout.$(OBJEXT) \
-	libluatex_a-memio.$(OBJEXT) libluatex_a-tfmin.$(OBJEXT)
-nodist_libluatex_a_OBJECTS = $(am__objects_1)
-libluatex_a_OBJECTS = $(am_libluatex_a_OBJECTS) \
-	$(nodist_libluatex_a_OBJECTS)
+	libluatex_a-writezip.$(OBJEXT) libluatex_a-lmplib.$(OBJEXT)
+libluatex_a_OBJECTS = $(am_libluatex_a_OBJECTS)
 libmd5_a_AR = $(AR) $(ARFLAGS)
 libmd5_a_LIBADD =
 am_libmd5_a_OBJECTS = libmd5_a-md5.$(OBJEXT)
 libmd5_a_OBJECTS = $(am_libmd5_a_OBJECTS)
 libmf_a_AR = $(AR) $(ARFLAGS)
 libmf_a_LIBADD =
-am__objects_2 = libmf_a-mfini.$(OBJEXT) libmf_a-mf0.$(OBJEXT) \
+am__objects_1 = libmf_a-mfini.$(OBJEXT) libmf_a-mf0.$(OBJEXT) \
 	libmf_a-mf1.$(OBJEXT)
-nodist_libmf_a_OBJECTS = $(am__objects_2) libmf_a-mf-pool.$(OBJEXT)
+nodist_libmf_a_OBJECTS = $(am__objects_1) libmf_a-mf-pool.$(OBJEXT)
 libmf_a_OBJECTS = $(nodist_libmf_a_OBJECTS)
+libmplib_a_AR = $(AR) $(ARFLAGS)
+libmplib_a_LIBADD =
+am__objects_2 = libmplib_a-avl.$(OBJEXT)
+am_libmplib_a_OBJECTS = $(am__objects_2)
+am__objects_3 = libmplib_a-mp.$(OBJEXT) libmplib_a-psout.$(OBJEXT) \
+	libmplib_a-svgout.$(OBJEXT) libmplib_a-memio.$(OBJEXT) \
+	libmplib_a-tfmin.$(OBJEXT)
+nodist_libmplib_a_OBJECTS = $(am__objects_3)
+libmplib_a_OBJECTS = $(am_libmplib_a_OBJECTS) \
+	$(nodist_libmplib_a_OBJECTS)
 libmpost_a_AR = $(AR) $(ARFLAGS)
 libmpost_a_LIBADD =
 am_libmpost_a_OBJECTS = libmpost_a-avl.$(OBJEXT) \
@@ -286,7 +346,7 @@ am__libpdftex_a_SOURCES_DIST = pdftexdir/avl.c pdftexdir/avl.h \
 	pdftexdir/writepng.c pdftexdir/writet1.c pdftexdir/writet3.c \
 	pdftexdir/writettf.c pdftexdir/writettf.h pdftexdir/writezip.c \
 	pdftexdir/regex/regex.c pdftexdir/regex/regex.h
-@MINGW32_TRUE@am__objects_3 = libpdftex_a-regex.$(OBJEXT)
+@MINGW32_TRUE@am__objects_4 = libpdftex_a-regex.$(OBJEXT)
 am_libpdftex_a_OBJECTS = libpdftex_a-avl.$(OBJEXT) \
 	libpdftex_a-avlstuff.$(OBJEXT) libpdftex_a-epdf.$(OBJEXT) \
 	libpdftex_a-mapfile.$(OBJEXT) libpdftex_a-pdftoepdf.$(OBJEXT) \
@@ -298,8 +358,60 @@ am_libpdftex_a_OBJECTS = libpdftex_a-avl.$(OBJEXT) \
 	libpdftex_a-writejpg.$(OBJEXT) libpdftex_a-writepng.$(OBJEXT) \
 	libpdftex_a-writet1.$(OBJEXT) libpdftex_a-writet3.$(OBJEXT) \
 	libpdftex_a-writettf.$(OBJEXT) libpdftex_a-writezip.$(OBJEXT) \
-	$(am__objects_3)
+	$(am__objects_4)
 libpdftex_a_OBJECTS = $(am_libpdftex_a_OBJECTS)
+libxetex_a_AR = $(AR) $(ARFLAGS)
+libxetex_a_LIBADD =
+am__libxetex_a_SOURCES_DIST = xetexdir/MathTable.h \
+	xetexdir/FontTableCache.cpp xetexdir/FontTableCache.h \
+	xetexdir/XeTeXFontInst.cpp xetexdir/XeTeXFontInst.h \
+	xetexdir/XeTeXFontInst_FT2.cpp xetexdir/XeTeXFontInst_FT2.h \
+	xetexdir/XeTeXFontMgr.cpp xetexdir/XeTeXFontMgr.h \
+	xetexdir/XeTeXLayoutInterface.cpp \
+	xetexdir/XeTeXLayoutInterface.h \
+	xetexdir/XeTeXOTLayoutEngine.cpp \
+	xetexdir/XeTeXOTLayoutEngine.h xetexdir/XeTeXOTMath.cpp \
+	xetexdir/XeTeXOTMath.h xetexdir/XeTeX_ext.c \
+	xetexdir/XeTeX_ext.h xetexdir/XeTeXswap.h xetexdir/cmaps.cpp \
+	xetexdir/cmaps.h xetexdir/sfnt.h xetexdir/trans.c \
+	xetexdir/trans.h xetexdir/xetex.h \
+	xetexdir/XeTeXFontInst_Mac.cpp xetexdir/XeTeXFontInst_Mac.h \
+	xetexdir/XeTeX_mac.c xetexdir/XeTeXFontMgr_FC.cpp \
+	xetexdir/XeTeXFontMgr_FC.h xetexdir/XeTeX_pic.c \
+	xetexdir/bmpimage.c xetexdir/bmpimage.h xetexdir/jpegimage.c \
+	xetexdir/jpegimage.h xetexdir/mfileio.c xetexdir/mfileio.h \
+	xetexdir/numbers.c xetexdir/numbers.h xetexdir/pdfimage.cpp \
+	xetexdir/pdfimage.h xetexdir/pngimage.c xetexdir/pngimage.h \
+	xetexdir/XeTeXGrLayout.cpp xetexdir/XeTeXGrLayout.h
+@XETEX_MACOSX_TRUE@am__objects_5 =  \
+@XETEX_MACOSX_TRUE@	libxetex_a-XeTeXFontInst_Mac.$(OBJEXT) \
+@XETEX_MACOSX_TRUE@	libxetex_a-XeTeX_mac.$(OBJEXT)
+@XETEX_MACOSX_FALSE@am__objects_6 =  \
+@XETEX_MACOSX_FALSE@	libxetex_a-XeTeXFontMgr_FC.$(OBJEXT) \
+@XETEX_MACOSX_FALSE@	libxetex_a-XeTeX_pic.$(OBJEXT) \
+@XETEX_MACOSX_FALSE@	libxetex_a-bmpimage.$(OBJEXT) \
+@XETEX_MACOSX_FALSE@	libxetex_a-jpegimage.$(OBJEXT) \
+@XETEX_MACOSX_FALSE@	libxetex_a-mfileio.$(OBJEXT) \
+@XETEX_MACOSX_FALSE@	libxetex_a-numbers.$(OBJEXT) \
+@XETEX_MACOSX_FALSE@	libxetex_a-pdfimage.$(OBJEXT) \
+@XETEX_MACOSX_FALSE@	libxetex_a-pngimage.$(OBJEXT)
+@XETEX_GRAPHITE_TRUE@am__objects_7 =  \
+@XETEX_GRAPHITE_TRUE@	libxetex_a-XeTeXGrLayout.$(OBJEXT)
+am_libxetex_a_OBJECTS = libxetex_a-FontTableCache.$(OBJEXT) \
+	libxetex_a-XeTeXFontInst.$(OBJEXT) \
+	libxetex_a-XeTeXFontInst_FT2.$(OBJEXT) \
+	libxetex_a-XeTeXFontMgr.$(OBJEXT) \
+	libxetex_a-XeTeXLayoutInterface.$(OBJEXT) \
+	libxetex_a-XeTeXOTLayoutEngine.$(OBJEXT) \
+	libxetex_a-XeTeXOTMath.$(OBJEXT) \
+	libxetex_a-XeTeX_ext.$(OBJEXT) libxetex_a-cmaps.$(OBJEXT) \
+	libxetex_a-trans.$(OBJEXT) $(am__objects_5) $(am__objects_6) \
+	$(am__objects_7)
+libxetex_a_OBJECTS = $(am_libxetex_a_OBJECTS)
+libxetexmm_a_AR = $(AR) $(ARFLAGS)
+libxetexmm_a_LIBADD =
+am_libxetexmm_a_OBJECTS = libxetexmm_a-XeTeXFontMgr_Mac.$(OBJEXT)
+libxetexmm_a_OBJECTS = $(am_libxetexmm_a_OBJECTS)
 libzzip_a_AR = $(AR) $(ARFLAGS)
 libzzip_a_LIBADD =
 am_libzzip_a_OBJECTS = libzzip_a-dir.$(OBJEXT) libzzip_a-err.$(OBJEXT) \
@@ -322,27 +434,28 @@ am__EXEEXT_4 = $(am__EXEEXT_2) $(am__EXEEXT_3)
 @TEX_TRUE@am__EXEEXT_6 = tex$(EXEEXT)
 @MF_TRUE@am__EXEEXT_7 = mf$(EXEEXT)
 @MFN_TRUE@@MF_TRUE@am__EXEEXT_8 = mf-nowin$(EXEEXT)
-@MP_TRUE@am__EXEEXT_9 = mpost$(EXEEXT)
+@MP_TRUE@am__EXEEXT_9 = mpost$(EXEEXT) newmpost$(EXEEXT)
 @ETEX_TRUE@am__EXEEXT_10 = etex$(EXEEXT)
 @PDFTEX_TRUE@am__EXEEXT_11 = pdftex$(EXEEXT)
 @LUATEX_TRUE@am__EXEEXT_12 = luatex$(EXEEXT) luatangle$(EXEEXT)
-@OTANGLE_TRUE@am__EXEEXT_13 = $(am__EXEEXT_2)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__EXEEXT_14 = $(am__EXEEXT_3)
-@ALEPH_TRUE@am__EXEEXT_15 = aleph$(EXEEXT)
+@XETEX_TRUE@am__EXEEXT_13 = xetex$(EXEEXT)
+@OTANGLE_TRUE@am__EXEEXT_14 = $(am__EXEEXT_2)
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__EXEEXT_15 = $(am__EXEEXT_3)
+@ALEPH_TRUE@am__EXEEXT_16 = aleph$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
 	"$(DESTDIR)$(man5dir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 am_aleph_OBJECTS = aleph-aleph.$(OBJEXT) aleph-alephbis.$(OBJEXT)
-am__objects_4 = aleph-alephini.$(OBJEXT) aleph-aleph0.$(OBJEXT) \
+am__objects_8 = aleph-alephini.$(OBJEXT) aleph-aleph0.$(OBJEXT) \
 	aleph-aleph1.$(OBJEXT) aleph-aleph2.$(OBJEXT) \
 	aleph-aleph3.$(OBJEXT)
-nodist_aleph_OBJECTS = $(am__objects_4) aleph-aleph-pool.$(OBJEXT) \
+nodist_aleph_OBJECTS = $(am__objects_8) aleph-aleph-pool.$(OBJEXT) \
 	aleph-alephextra.$(OBJEXT)
 aleph_OBJECTS = $(am_aleph_OBJECTS) $(nodist_aleph_OBJECTS)
 am__DEPENDENCIES_1 =
 am__DEPENDENCIES_2 = $(proglib) $(am__DEPENDENCIES_1)
-aleph_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
+aleph_DEPENDENCIES = $(am__DEPENDENCIES_2)
 nodist_bibtex_OBJECTS = bibtex.$(OBJEXT)
 bibtex_OBJECTS = $(nodist_bibtex_OBJECTS)
 bibtex_LDADD = $(LDADD)
@@ -378,15 +491,14 @@ dvitype_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
 am__dist_etex_SOURCES_DIST = synctexdir/synctex.h \
 	synctexdir/synctex-common.h synctexdir/synctex-etex.h
 dist_etex_OBJECTS =
-am__objects_5 = etex-etexini.$(OBJEXT) etex-etex0.$(OBJEXT) \
+am__objects_9 = etex-etexini.$(OBJEXT) etex-etex0.$(OBJEXT) \
 	etex-etex1.$(OBJEXT) etex-etex2.$(OBJEXT)
-@ETEX_SYNCTEX_TRUE@am__objects_6 = etex-synctex-e.$(OBJEXT)
-nodist_etex_OBJECTS = $(am__objects_5) etex-etex-pool.$(OBJEXT) \
-	etex-etexextra.$(OBJEXT) $(am__objects_6)
+@ETEX_SYNCTEX_TRUE@am__objects_10 = etex-synctex-e.$(OBJEXT)
+nodist_etex_OBJECTS = $(am__objects_9) etex-etex-pool.$(OBJEXT) \
+	etex-etexextra.$(OBJEXT) $(am__objects_10)
 etex_OBJECTS = $(dist_etex_OBJECTS) $(nodist_etex_OBJECTS)
 @ETEX_SYNCTEX_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
-etex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_3)
+etex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3)
 am_gftodvi_OBJECTS =
 nodist_gftodvi_OBJECTS = gftodvi.$(OBJEXT)
 gftodvi_OBJECTS = $(am_gftodvi_OBJECTS) $(nodist_gftodvi_OBJECTS)
@@ -404,14 +516,14 @@ nodist_luatangle_OBJECTS = luatangle.$(OBJEXT)
 luatangle_OBJECTS = $(nodist_luatangle_OBJECTS)
 luatangle_LDADD = $(LDADD)
 luatangle_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-am__objects_7 = luatex-luatexini.$(OBJEXT) luatex-luatex0.$(OBJEXT)
-nodist_luatex_OBJECTS = $(am__objects_7) luatex-luatex-pool.$(OBJEXT) \
+am__objects_11 = luatex-luatexini.$(OBJEXT) luatex-luatex0.$(OBJEXT)
+nodist_luatex_OBJECTS = $(am__objects_11) luatex-luatex-pool.$(OBJEXT) \
 	luatex-luatexextra.$(OBJEXT)
 luatex_OBJECTS = $(nodist_luatex_OBJECTS)
 am__DEPENDENCIES_4 = libluatex.a libff.a libluamisc.a libzzip.a \
 	libluasocket.a liblua51.a $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) libmd5.a
+	$(am__DEPENDENCIES_1) libmd5.a libmplib.a
 am_md5main_OBJECTS = md5main-md5main.$(OBJEXT)
 md5main_OBJECTS = $(am_md5main_OBJECTS)
 md5main_DEPENDENCIES = libmd5.a
@@ -430,12 +542,15 @@ nodist_mft_OBJECTS = mft.$(OBJEXT)
 mft_OBJECTS = $(nodist_mft_OBJECTS)
 mft_LDADD = $(LDADD)
 mft_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-am__objects_8 = mpost-mpini.$(OBJEXT) mpost-mp0.$(OBJEXT) \
+am__objects_12 = mpost-mpini.$(OBJEXT) mpost-mp0.$(OBJEXT) \
 	mpost-mp1.$(OBJEXT) mpost-mp2.$(OBJEXT)
-nodist_mpost_OBJECTS = $(am__objects_8) mpost-mp-pool.$(OBJEXT) \
+nodist_mpost_OBJECTS = $(am__objects_12) mpost-mp-pool.$(OBJEXT) \
 	mpost-mpextra.$(OBJEXT)
 mpost_OBJECTS = $(nodist_mpost_OBJECTS)
 mpost_DEPENDENCIES = libmpost.a $(am__DEPENDENCIES_2)
+am__objects_13 = newmpost-mpost.$(OBJEXT) newmpost-mpxout.$(OBJEXT)
+nodist_newmpost_OBJECTS = $(am__objects_13)
+newmpost_OBJECTS = $(nodist_newmpost_OBJECTS)
 nodist_odvicopy_OBJECTS = odvicopy.$(OBJEXT)
 odvicopy_OBJECTS = $(nodist_odvicopy_OBJECTS)
 odvicopy_LDADD = $(LDADD)
@@ -471,12 +586,12 @@ patgen_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
 am__dist_pdftex_SOURCES_DIST = synctexdir/synctex.h \
 	synctexdir/synctex-common.h synctexdir/synctex-pdftex.h
 dist_pdftex_OBJECTS =
-am__objects_9 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT) \
+am__objects_14 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT) \
 	pdftex-pdftex1.$(OBJEXT) pdftex-pdftex2.$(OBJEXT) \
 	pdftex-pdftex3.$(OBJEXT)
-@PDFTEX_SYNCTEX_TRUE@am__objects_10 = pdftex-synctex-pdf.$(OBJEXT)
-nodist_pdftex_OBJECTS = $(am__objects_9) pdftex-pdftex-pool.$(OBJEXT) \
-	pdftex-pdftexextra.$(OBJEXT) $(am__objects_10)
+@PDFTEX_SYNCTEX_TRUE@am__objects_15 = pdftex-synctex-pdf.$(OBJEXT)
+nodist_pdftex_OBJECTS = $(am__objects_14) pdftex-pdftex-pool.$(OBJEXT) \
+	pdftex-pdftexextra.$(OBJEXT) $(am__objects_15)
 pdftex_OBJECTS = $(dist_pdftex_OBJECTS) $(nodist_pdftex_OBJECTS)
 am__DEPENDENCIES_6 = libpdftex.a $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -513,15 +628,14 @@ tangleboot_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
 am__dist_tex_SOURCES_DIST = synctexdir/synctex.h \
 	synctexdir/synctex-common.h synctexdir/synctex-tex.h
 dist_tex_OBJECTS =
-am__objects_11 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT) \
+am__objects_16 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT) \
 	tex-tex1.$(OBJEXT) tex-tex2.$(OBJEXT)
-@TEX_SYNCTEX_TRUE@am__objects_12 = tex-synctex.$(OBJEXT)
-nodist_tex_OBJECTS = $(am__objects_11) tex-tex-pool.$(OBJEXT) \
-	tex-texextra.$(OBJEXT) $(am__objects_12)
+@TEX_SYNCTEX_TRUE@am__objects_17 = tex-synctex.$(OBJEXT)
+nodist_tex_OBJECTS = $(am__objects_16) tex-tex-pool.$(OBJEXT) \
+	tex-texextra.$(OBJEXT) $(am__objects_17)
 tex_OBJECTS = $(dist_tex_OBJECTS) $(nodist_tex_OBJECTS)
 @TEX_SYNCTEX_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
-tex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_7)
+tex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_7)
 nodist_tftopl_OBJECTS = tftopl.$(OBJEXT)
 tftopl_OBJECTS = $(nodist_tftopl_OBJECTS)
 tftopl_LDADD = $(LDADD)
@@ -546,6 +660,22 @@ nodist_weave_OBJECTS = weave.$(OBJEXT)
 weave_OBJECTS = $(nodist_weave_OBJECTS)
 weave_LDADD = $(LDADD)
 weave_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
+am__objects_18 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT) \
+	xetex-xetex1.$(OBJEXT) xetex-xetex2.$(OBJEXT)
+nodist_xetex_OBJECTS = $(am__objects_18) xetex-xetex_pool.$(OBJEXT) \
+	xetex-xetexextra.$(OBJEXT)
+xetex_OBJECTS = $(nodist_xetex_OBJECTS)
+@XETEX_MACOSX_FALSE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1) \
+@XETEX_MACOSX_FALSE@	$(am__DEPENDENCIES_1) \
+@XETEX_MACOSX_FALSE@	$(am__DEPENDENCIES_1)
+@XETEX_GRAPHITE_TRUE@am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_10 = $(libxetex) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8) \
+	$(am__DEPENDENCIES_9) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+xetex_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+	$(xetex_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -569,11 +699,12 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 SOURCES = $(libff_a_SOURCES) $(liblua51_a_SOURCES) \
 	$(libluamisc_a_SOURCES) $(EXTRA_libluamisc_a_SOURCES) \
 	$(libluasocket_a_SOURCES) $(libluatex_a_SOURCES) \
-	$(EXTRA_libluatex_a_SOURCES) $(nodist_libluatex_a_SOURCES) \
-	$(libmd5_a_SOURCES) $(nodist_libmf_a_SOURCES) \
-	$(libmpost_a_SOURCES) $(libpdftex_a_SOURCES) \
-	$(EXTRA_libpdftex_a_SOURCES) $(libzzip_a_SOURCES) \
-	$(aleph_SOURCES) $(nodist_aleph_SOURCES) \
+	$(EXTRA_libluatex_a_SOURCES) $(libmd5_a_SOURCES) \
+	$(nodist_libmf_a_SOURCES) $(libmplib_a_SOURCES) \
+	$(nodist_libmplib_a_SOURCES) $(libmpost_a_SOURCES) \
+	$(libpdftex_a_SOURCES) $(EXTRA_libpdftex_a_SOURCES) \
+	$(libxetex_a_SOURCES) $(libxetexmm_a_SOURCES) \
+	$(libzzip_a_SOURCES) $(aleph_SOURCES) $(nodist_aleph_SOURCES) \
 	$(nodist_bibtex_SOURCES) $(nodist_ctangle_SOURCES) \
 	$(nodist_ctangleboot_SOURCES) $(nodist_ctie_SOURCES) \
 	$(nodist_cweave_SOURCES) $(nodist_dvicopy_SOURCES) \
@@ -584,32 +715,36 @@ SOURCES = $(libff_a_SOURCES) $(liblua51_a_SOURCES) \
 	$(nodist_luatex_SOURCES) $(nodist_EXTRA_luatex_SOURCES) \
 	$(md5main_SOURCES) $(nodist_mf_SOURCES) \
 	$(nodist_mf_nowin_SOURCES) $(nodist_mft_SOURCES) \
-	$(nodist_mpost_SOURCES) $(nodist_odvicopy_SOURCES) \
-	$(nodist_odvitype_SOURCES) $(nodist_ofm2opl_SOURCES) \
-	$(nodist_opl2ofm_SOURCES) $(nodist_otangle_SOURCES) \
-	$(nodist_ovf2ovp_SOURCES) $(nodist_ovp2ovf_SOURCES) \
-	$(nodist_patgen_SOURCES) $(dist_pdftex_SOURCES) \
-	$(nodist_pdftex_SOURCES) $(nodist_EXTRA_pdftex_SOURCES) \
-	$(pdftosrc_SOURCES) $(nodist_EXTRA_pdftosrc_SOURCES) \
-	$(nodist_pktogf_SOURCES) $(nodist_pktype_SOURCES) \
-	$(nodist_pltotf_SOURCES) $(nodist_pooltype_SOURCES) \
-	$(synctex_SOURCES) $(nodist_tangle_SOURCES) \
-	$(nodist_tangleboot_SOURCES) $(dist_tex_SOURCES) \
-	$(nodist_tex_SOURCES) $(nodist_tftopl_SOURCES) \
-	$(nodist_tie_SOURCES) $(ttf2afm_SOURCES) \
-	$(EXTRA_ttf2afm_SOURCES) $(nodist_vftovp_SOURCES) \
-	$(nodist_vptovf_SOURCES) $(nodist_weave_SOURCES)
+	$(nodist_mpost_SOURCES) $(nodist_newmpost_SOURCES) \
+	$(nodist_odvicopy_SOURCES) $(nodist_odvitype_SOURCES) \
+	$(nodist_ofm2opl_SOURCES) $(nodist_opl2ofm_SOURCES) \
+	$(nodist_otangle_SOURCES) $(nodist_ovf2ovp_SOURCES) \
+	$(nodist_ovp2ovf_SOURCES) $(nodist_patgen_SOURCES) \
+	$(dist_pdftex_SOURCES) $(nodist_pdftex_SOURCES) \
+	$(nodist_EXTRA_pdftex_SOURCES) $(pdftosrc_SOURCES) \
+	$(nodist_EXTRA_pdftosrc_SOURCES) $(nodist_pktogf_SOURCES) \
+	$(nodist_pktype_SOURCES) $(nodist_pltotf_SOURCES) \
+	$(nodist_pooltype_SOURCES) $(synctex_SOURCES) \
+	$(nodist_tangle_SOURCES) $(nodist_tangleboot_SOURCES) \
+	$(dist_tex_SOURCES) $(nodist_tex_SOURCES) \
+	$(nodist_tftopl_SOURCES) $(nodist_tie_SOURCES) \
+	$(ttf2afm_SOURCES) $(EXTRA_ttf2afm_SOURCES) \
+	$(nodist_vftovp_SOURCES) $(nodist_vptovf_SOURCES) \
+	$(nodist_weave_SOURCES) $(nodist_xetex_SOURCES) \
+	$(nodist_EXTRA_xetex_SOURCES)
 DIST_SOURCES = $(libff_a_SOURCES) $(liblua51_a_SOURCES) \
 	$(libluamisc_a_SOURCES) $(EXTRA_libluamisc_a_SOURCES) \
 	$(libluasocket_a_SOURCES) $(libluatex_a_SOURCES) \
 	$(EXTRA_libluatex_a_SOURCES) $(libmd5_a_SOURCES) \
-	$(libmpost_a_SOURCES) $(am__libpdftex_a_SOURCES_DIST) \
-	$(EXTRA_libpdftex_a_SOURCES) $(libzzip_a_SOURCES) \
-	$(aleph_SOURCES) $(am__dist_etex_SOURCES_DIST) \
-	$(gftodvi_SOURCES) $(md5main_SOURCES) \
-	$(am__dist_pdftex_SOURCES_DIST) $(pdftosrc_SOURCES) \
-	$(synctex_SOURCES) $(am__dist_tex_SOURCES_DIST) \
-	$(ttf2afm_SOURCES) $(EXTRA_ttf2afm_SOURCES)
+	$(libmplib_a_SOURCES) $(libmpost_a_SOURCES) \
+	$(am__libpdftex_a_SOURCES_DIST) $(EXTRA_libpdftex_a_SOURCES) \
+	$(am__libxetex_a_SOURCES_DIST) $(libxetexmm_a_SOURCES) \
+	$(libzzip_a_SOURCES) $(aleph_SOURCES) \
+	$(am__dist_etex_SOURCES_DIST) $(gftodvi_SOURCES) \
+	$(md5main_SOURCES) $(am__dist_pdftex_SOURCES_DIST) \
+	$(pdftosrc_SOURCES) $(synctex_SOURCES) \
+	$(am__dist_tex_SOURCES_DIST) $(ttf2afm_SOURCES) \
+	$(EXTRA_ttf2afm_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-dvi-recursive install-exec-recursive \
@@ -669,7 +804,18 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FONTCONFIG_INCLUDES = @FONTCONFIG_INCLUDES@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
+FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
+FREETYPE2_LIBS = @FREETYPE2_LIBS@
+GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
+GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
+GRAPHITE_LIBS = @GRAPHITE_LIBS@
 GREP = @GREP@
+ICU_DEPEND = @ICU_DEPEND@
+ICU_INCLUDES = @ICU_INCLUDES@
+ICU_LIBS = @ICU_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -721,6 +867,9 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 TANGLE = @TANGLE@
 TANGLEBOOT = @TANGLEBOOT@
+TECKIT_DEPEND = @TECKIT_DEPEND@
+TECKIT_INCLUDES = @TECKIT_INCLUDES@
+TECKIT_LIBS = @TECKIT_LIBS@
 TIE = @TIE@
 VERSION = @VERSION@
 WEB2CVERSION = @WEB2CVERSION@
@@ -770,11 +919,13 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+ipc_socketlibs = @ipc_socketlibs@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 lt_ECHO = @lt_ECHO@
+lua_socketlibs = @lua_socketlibs@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -784,7 +935,6 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-socketlibs = @socketlibs@
 srcdir = @srcdir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
@@ -804,10 +954,11 @@ dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
 nodist_man_MANS = ctiedir/ctie.1 tiedir/tie.1
 dist_check_SCRIPTS = tangle.test luatexdir/luatangle.test \
 	omegaware/otangle.test libmd5/md5.test
-TESTS = tangle.test tiedir/tie.test $(am__append_12) $(am__append_15) \
+TESTS = tangle.test tiedir/tie.test $(am__append_11) $(am__append_27) \
 	libmd5/md5.test
-EXTRA_LIBRARIES = libmf.a libmpost.a libpdftex.a liblua51.a libzzip.a \
-	libluasocket.a libluamisc.a libff.a libluatex.a libmd5.a
+EXTRA_LIBRARIES = libmf.a libmpost.a libmplib.a libpdftex.a liblua51.a \
+	libzzip.a libluasocket.a libluamisc.a libff.a libluatex.a \
+	libxetex.a libxetexmm.a libmd5.a
 EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h tangle.web \
 	tangle.ch tangleboot.p cwebdir ctangleboot.c cwebboot.c \
 	$(web_programs:=.web) $(web_programs:=.ch) ctiedir tiedir \
@@ -816,19 +967,21 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h tangle.web \
 	tmf-pool.h mf.web mf-binpool.ch mf.ch mftalk.h lib/texmfmp.c \
 	tmf-pool.h mp.web mp.ch lib/texmfmp.c mpdir/mp.defines \
 	mpdir/mplib.h metapost.mk mpdir/Makefile.in.orig \
-	mpdir/mpostlib.mk $(etex_web_srcs) $(etex_ch_srcs) \
+	mpdir/mpostlib.mk $(newmpost_web) $(libmplib_web) \
+	mplibdir/lmplib.c $(etex_web_srcs) $(etex_ch_srcs) \
 	etexdir/etexextra.in lib/texmfmp.c tmf-pool.h \
 	etexdir/ChangeLog etexdir/INSTALL etexdir/README \
 	etexdir/etex_gen.tex etexdir/etex.mak etexdir/etex.mk \
 	$(pdftex_ch_srcs) pdftexdir/pdftex.defines pdftexdir/pdftex.h \
 	pdftexdir/pdftexextra.in pdftexdir/ChangeLog pdftexdir/NEWS \
 	pdftexdir/README pdftexdir/change-files.txt \
-	pdftexdir/regex/COPYING.LIB pdftexdir/regex/README \
 	pdftexdir/pdftex.mak pdftexdir/Makefile.in.orig \
-	pdftexdir/pdftex.mk pdftexdir/pdftexlib.mk $(luatex_sources) \
-	luatexdir/luatex.defines luatexdir/luatexextra.in \
-	luatexdir/ptexlib.h $(luatangle_sources) \
-	luatexdir/lua51/Makefile luatexdir/lua51/lua.c \
+	pdftexdir/pdftex.mk pdftexdir/pdftexlib.mk \
+	pdftexdir/regex/COPYING.LIB pdftexdir/regex/README \
+	$(luatex_sources) luatexdir/luatex.defines \
+	luatexdir/luatexextra.in luatexdir/ptexlib.h \
+	$(luatangle_sources) luatexdir/lua51/Makefile \
+	luatexdir/lua51/liolib.c luatexdir/lua51/lua.c \
 	luatexdir/lua51/luac.c luatexdir/lua51/print.c \
 	luatexdir/zziplib/COPYING.LIB luatexdir/zziplib/ChangeLog \
 	luatexdir/zziplib/README luatexdir/zziplib/TODO \
@@ -942,56 +1095,36 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h tangle.web \
 	luatexdir/luafontloader/fontforge/gutils/Makefile.in \
 	luatexdir/luafontloader/fontforge/inc/config.h.in \
 	luatexdir/luafontloader/fontforge/plugins/Makefile.in \
-	$(lua_mp_web) luatexdir/ChangeLog luatexdir/NEWS \
-	luatexdir/README luatexdir/change-files.txt \
-	luatexdir/font/subfont.txt luatexdir/Makefile.in \
-	luatexdir/luatex.mk luatexdir/luatexlib.mk \
-	xetexdir/FontTableCache.cpp xetexdir/FontTableCache.h \
-	xetexdir/MathTable.h xetexdir/XeTeXFontInst.cpp \
-	xetexdir/XeTeXFontInst.h xetexdir/XeTeXFontInst_FT2.cpp \
-	xetexdir/XeTeXFontInst_FT2.h xetexdir/XeTeXFontInst_Mac.cpp \
-	xetexdir/XeTeXFontInst_Mac.h xetexdir/XeTeXFontMgr.cpp \
-	xetexdir/XeTeXFontMgr.h xetexdir/XeTeXFontMgr_FC.cpp \
-	xetexdir/XeTeXFontMgr_FC.h xetexdir/XeTeXFontMgr_Mac.h \
-	xetexdir/XeTeXFontMgr_Mac.mm xetexdir/XeTeXGrLayout.cpp \
-	xetexdir/XeTeXGrLayout.h xetexdir/XeTeXLayoutInterface.cpp \
-	xetexdir/XeTeXLayoutInterface.h \
-	xetexdir/XeTeXOTLayoutEngine.cpp \
-	xetexdir/XeTeXOTLayoutEngine.h xetexdir/XeTeXOTMath.cpp \
-	xetexdir/XeTeXOTMath.h xetexdir/XeTeX_ext.c \
-	xetexdir/XeTeX_ext.h xetexdir/XeTeX_mac.c xetexdir/XeTeX_pic.c \
-	xetexdir/XeTeXswap.h xetexdir/appleGlyphNames.c \
-	xetexdir/bmpimage.c xetexdir/bmpimage.h xetexdir/cmaps.cpp \
-	xetexdir/cmaps.h xetexdir/jpegimage.c xetexdir/jpegimage.h \
-	xetexdir/mfileio.c xetexdir/mfileio.h xetexdir/numbers.c \
-	xetexdir/numbers.h xetexdir/pdfimage.cpp xetexdir/pdfimage.h \
-	xetexdir/pngimage.c xetexdir/pngimage.h xetexdir/pool2c.pl \
-	xetexdir/sfnt.h xetexdir/trans.c xetexdir/trans.h \
-	xetexdir/unicode-char-prep.pl xetexdir/xetex.ch \
-	xetexdir/xetex.defines xetexdir/xetex.h xetexdir/xetexextra.in \
-	xetexdir/LICENSE.txt xetexdir/acx_pthread.m4 xetexdir/tests.ac \
-	xetexdir/withenable.ac xetexdir/xetex.mk omegaware/ChangeLog \
-	$(odvicopy_sources) $(odvitype_sources) $(ofm2opl_sources) \
-	$(opl2ofm_sources) $(otangle_sources) $(ovf2ovp_sources) \
-	$(ovp2ovf_sources) $(aleph_web_srcs) $(aleph_ch_srcs) \
-	lib/texmfmp.c alephdir/ChangeLog alephdir/Makefile \
-	alephdir/aleph.defines alephdir/aleph.version \
-	alephdir/eomega.ech alephdir/etex.ch alephdir/omega.ch0 \
-	alephdir/omega.ch1 alephdir/omega.ch2 alephdir/omxml.ch \
-	alephdir/aleph.mk synctexdir/INSTALL synctexdir/Makefile \
-	synctexdir/Makefile.in synctexdir/README.txt \
-	synctexdir/synctex-common.h synctexdir/synctex-convert.sh \
-	synctexdir/synctex.c synctexdir/synctex.defines \
-	synctexdir/synctex.h synctexdir/synctex-mem.ch0 \
-	synctexdir/synctex-mem.ch1 synctexdir/synctex-mem.ch2 \
-	synctexdir/synctex-rec.ch0 synctexdir/synctex-rec.ch1 \
-	synctexdir/synctex-rec.ch2 synctexdir/synctex-e-mem.ch0 \
-	synctexdir/synctex-e-mem.ch1 synctexdir/synctex-e-rec.ch0 \
-	synctexdir/synctex-e-rec.ch1 synctexdir/synctex-pdf-rec.ch2 \
-	synctexdir/synctex-xe-mem.ch2 synctexdir/synctex-xe-rec.ch2 \
-	synctexdir/synctex-xe-rec.ch3 synctexdir/synctex-xetex.h \
-	synctexdir/synctex.mk fmtutil.in Makefile.in.orig \
-	configure.in.orig
+	luatexdir/ChangeLog luatexdir/NEWS luatexdir/README \
+	luatexdir/change-files.txt luatexdir/font/subfont.txt \
+	luatexdir/Makefile.in luatexdir/luatex.mk \
+	luatexdir/luatexlib.mk $(xetex_web_srcs) \
+	xetexdir/xetex.defines xetexdir/xetexextra.in \
+	xetexdir/pool2c.pl xetexdir/unicode-char-prep.pl \
+	xetexdir/appleGlyphNames.c xetexdir/XeTeXFontMgr_Mac.mm \
+	xetexdir/LICENSE.txt xetexdir/acx_pthread.m4 \
+	xetexdir/am/xetex.mk xetexdir/tests.ac xetexdir/withenable.ac \
+	xetexdir/xetex.mk omegaware/ChangeLog $(odvicopy_sources) \
+	$(odvitype_sources) $(ofm2opl_sources) $(opl2ofm_sources) \
+	$(otangle_sources) $(ovf2ovp_sources) $(ovp2ovf_sources) \
+	$(aleph_web_srcs) $(aleph_ch_srcs) lib/texmfmp.c \
+	alephdir/ChangeLog alephdir/Makefile alephdir/aleph.defines \
+	alephdir/aleph.version alephdir/eomega.ech alephdir/etex.ch \
+	alephdir/omega.ch0 alephdir/omega.ch1 alephdir/omega.ch2 \
+	alephdir/omxml.ch alephdir/aleph.mk synctexdir/INSTALL \
+	synctexdir/Makefile synctexdir/Makefile.in \
+	synctexdir/README.txt synctexdir/synctex-common.h \
+	synctexdir/synctex-convert.sh synctexdir/synctex.c \
+	synctexdir/synctex.defines synctexdir/synctex.h \
+	synctexdir/synctex-mem.ch0 synctexdir/synctex-mem.ch1 \
+	synctexdir/synctex-mem.ch2 synctexdir/synctex-rec.ch0 \
+	synctexdir/synctex-rec.ch1 synctexdir/synctex-rec.ch2 \
+	synctexdir/synctex-e-mem.ch0 synctexdir/synctex-e-mem.ch1 \
+	synctexdir/synctex-e-rec.ch0 synctexdir/synctex-e-rec.ch1 \
+	synctexdir/synctex-pdf-rec.ch2 synctexdir/synctex-xe-mem.ch2 \
+	synctexdir/synctex-xe-rec.ch2 synctexdir/synctex-xe-rec.ch3 \
+	synctexdir/synctex-xetex.h synctexdir/synctex.mk fmtutil.in \
+	Makefile.in.orig configure.in.orig
 DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \
 	tangle-web2c stamp-tangle tangleboot.c tangleboot.h ctangle.c \
 	cweb.c stamp-ctangle cftest.p $(web_programs:=.c) \
@@ -1001,13 +1134,16 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \
 	tex.pool tex-tangle $(nodist_libmf_a_SOURCES) mfextra.c \
 	mf-final.ch mf-web2c mf.p mf.pool mf-tangle \
 	$(nodist_mpost_SOURCES) mp-web2c mp.p mp.pool mp-tangle \
+	$(newmpost_c_h) mpost-ctangle $(libmplib_c_h) mplib-ctangle \
 	$(nodist_etex_SOURCES) etex.web etex.ch etex-web2c etex.p \
 	etex.pool etex-tangle etexdir/etex.version \
 	$(nodist_pdftex_SOURCES) pdftex.ch pdftex-web2c pdftex.p \
 	pdftex.pool pdftex-tangle pdftexdir/pdftex.version \
 	$(nodist_luatex_SOURCES) luatex-web2c luatex.p luatex.pool \
 	luatex-tangle luatexdir/luatex.version luatangle.c luatangle.h \
-	luatangle.p $(lua_mp_c_h) mp-ctangle cftest.p \
+	luatangle-web2c luatangle.p cftest.p $(nodist_xetex_SOURCES) \
+	xetex.web xetex-web2c xetex.p xetex.pool xetex-tangle \
+	xetexdir/etex.version xetexdir/xetex.version \
 	$(omegaware_programs:=.c) $(omegaware_programs:=.h) \
 	$(omegaware_programs:=.p) $(omegaware_programs:=-web2c) \
 	cftest.p $(nodist_aleph_SOURCES) aleph.web aleph.ch \
@@ -1057,10 +1193,10 @@ nodist_weave_SOURCES = weave.c weave.h
 nodist_ctie_SOURCES = ctie.c
 nodist_cweave_SOURCES = cweave.c cweb.c
 nodist_tie_SOURCES = tie.c
-tex_CPPFLAGS = $(am__append_17)
-tex_LDADD = $(LDADD) $(socketlibs) $(am__append_18)
+tex_CPPFLAGS = $(am__append_29)
+tex_LDADD = $(LDADD) $(socketlibs) $(am__append_30)
 tex_c_h = texini.c tex0.c tex1.c tex2.c texcoerce.h texd.h
-nodist_tex_SOURCES = $(tex_c_h) tex-pool.c texextra.c $(am__append_19)
+nodist_tex_SOURCES = $(tex_c_h) tex-pool.c texextra.c $(am__append_31)
 tex_ch_srcs = \
 	tex.web \
 	tex.ch \
@@ -1096,11 +1232,25 @@ libmpost_a_SOURCES = \
 	mpdir/writefont.c \
 	mpdir/writet1.c
 
-etex_CPPFLAGS = $(am__append_20)
-etex_LDADD = $(LDADD) $(socketlibs) $(am__append_21)
+newmpost_c_h = mpost.c mpxout.c mpxout.h
+newmpost_web = mplibdir/mpost.w mplibdir/mpxout.w
+newmpost_CPPFLAGS = -I$(srcdir)/mplibdir
+newmpost_DEPENDENCIES = libmplib.a
+newmpost_LDADD = libmplib.a $(KPATHSEA_LIBS) -lm
+nodist_newmpost_SOURCES = $(newmpost_c_h)
+libmplib_c_h = mp.c mplib.h mpmp.h mppsout.h psout.c mplibps.h \
+	mplibsvg.h mpsvgout.h svgout.c memio.c tfmin.c
+libmplib_true_c = mplibdir/avl.h mplibdir/avl.c 
+libmplib_web = $(libmplib_true_c) mplibdir/mp.w mplibdir/psout.w \
+	mplibdir/svgout.w mplibdir/memio.w mplibdir/tfmin.w
+libmplib_a_CPPFLAGS = -I$(srcdir)/mplibdir
+nodist_libmplib_a_SOURCES = $(libmplib_c_h)
+libmplib_a_SOURCES = $(libmplib_true_c)
+etex_CPPFLAGS = $(am__append_32)
+etex_LDADD = $(LDADD) $(socketlibs) $(am__append_33)
 etex_c_h = etexini.c etex0.c etex1.c etex2.c etexcoerce.h etexd.h
 nodist_etex_SOURCES = $(etex_c_h) etex-pool.c etexextra.c \
-	etexdir/etexextra.h $(am__append_22)
+	etexdir/etexextra.h $(am__append_34)
 etex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch \
@@ -1123,12 +1273,12 @@ pdftex_dependencies = $(proglib) $(LIBPNG_DEPEND) $(ZLIB_DEPEND) \
 	$(XPDF_DEPEND) $(OBSDCOMPAT_DEPEND) libmd5.a
 nodist_EXTRA_pdftex_SOURCES = dummy.cxx
 pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir $(buildenv) $(TANGLE)
-pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_23)
-pdftex_LDADD = $(pdftex_ldadd) $(LDADD) $(socketlibs)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_35)
+pdftex_LDADD = $(pdftex_ldadd) $(LDADD) $(ipc_socketlibs)
 pdftex_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a
 pdftex_c_h = pdftexini.c pdftex0.c pdftex1.c pdftex2.c pdftex3.c pdftexcoerce.h pdftexd.h
 nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c pdftexextra.c \
-	pdftexdir/pdftexextra.h $(am__append_24)
+	pdftexdir/pdftexextra.h $(am__append_36)
 pdftex_ch_srcs = \
 	pdftexdir/pdftex.web \
 	pdftexdir/tex.ch0 \
@@ -1136,14 +1286,6 @@ pdftex_ch_srcs = \
 	$(pdftex_ch_synctex) \
 	pdftexdir/pdftex.ch
 
-ttf2afm_CPPFLAGS = -I$(srcdir)/pdftexdir 
-ttf2afm_SOURCES = pdftexdir/ttf2afm.c
-EXTRA_ttf2afm_SOURCES = pdftexdir/macnames.c
-nodist_EXTRA_pdftosrc_SOURCES = dummy.cxx
-pdftosrc_CPPFLAGS = $(pdftex_cppflags)
-pdftosrc_SOURCES = pdftexdir/pdftosrc.cc
-pdftosrc_LDADD = $(pdftex_ldadd) $(LDADD)
-pdftosrc_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a
 libpdftex_a_CPPFLAGS = $(pdftex_cppflags)
 libpdftex_a_SOURCES = pdftexdir/avl.c pdftexdir/avl.h \
 	pdftexdir/avlstuff.c pdftexdir/avlstuff.h pdftexdir/epdf.c \
@@ -1160,16 +1302,23 @@ libpdftex_a_SOURCES = pdftexdir/avl.c pdftexdir/avl.h \
 EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c \
 	pdftexdir/regex/regcomp.c pdftexdir/regex/regex_internal.c \
 	pdftexdir/regex/regex_internal.h pdftexdir/regex/regexec.c
+ttf2afm_CPPFLAGS = -I$(srcdir)/pdftexdir 
+ttf2afm_SOURCES = pdftexdir/ttf2afm.c
+EXTRA_ttf2afm_SOURCES = pdftexdir/macnames.c
+nodist_EXTRA_pdftosrc_SOURCES = dummy.cxx
+pdftosrc_CPPFLAGS = $(pdftex_cppflags)
+pdftosrc_SOURCES = pdftexdir/pdftosrc.cc
+pdftosrc_LDADD = $(pdftex_ldadd) $(LDADD)
+pdftosrc_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a
 nodist_EXTRA_luatex_SOURCES = dummy.cxx
 luatex_tangle = WEBINPUTS=$(srcdir)/luatexdir $(buildenv) $(LUATANGLE)
 luatex_CPPFLAGS = $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES) \
 	$(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 -Iluatexdir \
 	-I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51 \
-	-I$(srcdir)/luatexdir/mp -Dextra_version_info=`date \
-	+-%Y%m%d%H`
+	-I$(srcdir)/mplibdir -Dextra_version_info=`date +-%Y%m%d%H`
 luatex_ldadd = libluatex.a libff.a libluamisc.a libzzip.a \
 	libluasocket.a liblua51.a $(LIBPNG_LIBS) $(ZLIB_LIBS) \
-	$(XPDF_LIBS) $(OBSDCOMPAT_LIBS) libmd5.a
+	$(XPDF_LIBS) $(OBSDCOMPAT_LIBS) libmd5.a libmplib.a
 luatex_LDADD = $(luatex_ldadd) $(LDADD) $(socketlibs)
 luatex_DEPENDENCIES = $(proglib) libluatex.a $(LIBPNG_DEPEND) \
 	$(ZLIB_DEPEND) $(XPDF_DEPEND) $(OBSDCOMPAT_DEPEND) libmd5.a
@@ -1178,7 +1327,7 @@ nodist_luatex_SOURCES = $(luatex_c_h) luatex-pool.c luatexextra.c luatexdir/luat
 luatex_sources = luatexdir/luatex.web luatexdir/luatex.ch
 nodist_luatangle_SOURCES = luatangle.c luatangle.h
 luatangle_sources = luatexdir/luatangle.web luatexdir/luatangle.ch
-liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_11)
+liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_12)
 liblua51_a_SOURCES = \
 	luatexdir/lua51/lapi.c \
 	luatexdir/lua51/lapi.h \
@@ -1200,7 +1349,6 @@ liblua51_a_SOURCES = \
 	luatexdir/lua51/lgc.c \
 	luatexdir/lua51/lgc.h \
 	luatexdir/lua51/linit.c \
-	luatexdir/lua51/liolib.c \
 	luatexdir/lua51/llex.c \
 	luatexdir/lua51/llex.h \
 	luatexdir/lua51/llimits.h \
@@ -1273,7 +1421,7 @@ libzzip_a_SOURCES = \
 
 libluasocket_a_DEPENDENCIES = $(ZLIB_DEPEND) libzzip.a 
 libluasocket_a_CPPFLAGS = \
-	-I$(top_srcdir)/luatexdir/luasocket -I$(srcdir)/luatexdir/lua51
+	-DLUASOCKET_DEBUG -I$(top_srcdir)/luatexdir/luasocket -I$(srcdir)/luatexdir/lua51
 
 libluasocket_a_SOURCES = \
 	luatexdir/luasocket/src/auxiliar.c \
@@ -1318,16 +1466,16 @@ libluamisc_a_SOURCES = \
 	luatexdir/luamd5/md5.h \
 	luatexdir/luamd5/md5lib.c \
 	luatexdir/luapeg/lpeg.c \
-	luatexdir/luaprofiler/clocks.h \
-	luatexdir/luaprofiler/core_profiler.h \
-	luatexdir/luaprofiler/function_meter.h  \
-	luatexdir/luaprofiler/luaprofiler.h  \
-	luatexdir/luaprofiler/stack.h \
 	luatexdir/luaprofiler/clocks.c \
+	luatexdir/luaprofiler/clocks.h \
 	luatexdir/luaprofiler/core_profiler.c \
+	luatexdir/luaprofiler/core_profiler.h \
 	luatexdir/luaprofiler/function_meter.c \
-	luatexdir/luaprofiler/lua50_profiler.c \
+	luatexdir/luaprofiler/function_meter.h \
+	luatexdir/luaprofiler/luaprofiler.h \
 	luatexdir/luaprofiler/stack.c \
+	luatexdir/luaprofiler/stack.h \
+	luatexdir/luaprofiler/lua50_profiler.c \
 	luatexdir/luazip/src/luazip.c \
 	luatexdir/luazip/src/luazip.h \
 	luatexdir/luazlib/lgzip.c \
@@ -1451,93 +1599,96 @@ libluatex_a_DEPENDENCIES = libff.a
 libluatex_a_CPPFLAGS = $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) \
 	$(XPDF_INCLUDES) $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 \
 	-Iluatexdir -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51 \
-	-DpdfTeX -I$(srcdir)/luatexdir/mp
+	-DpdfTeX
 libluatex_a_SOURCES = \
-	luatexdir/commands.h  \
-	luatexdir/font/dofont.c  \
-	luatexdir/font/luatexfont.h  \
-	luatexdir/font/luafont.c  \
-	luatexdir/font/mapfile.c  \
-	luatexdir/font/pkin.c  \
-	luatexdir/font/sfnt.c  \
-	luatexdir/font/sfnt.h  \
-	luatexdir/font/subfont.c  \
-	luatexdir/font/texfont.c  \
-	luatexdir/font/texfont.h  \
-	luatexdir/font/tfmofm.c  \
-	luatexdir/font/tounicode.c  \
-	luatexdir/font/tt_glyf.c  \
-	luatexdir/font/tt_glyf.h  \
-	luatexdir/font/tt_table.c  \
-	luatexdir/font/tt_table.h  \
-	luatexdir/font/vfovf.c  \
-	luatexdir/font/vfpacket.c  \
-	luatexdir/font/writecff.c  \
-	luatexdir/font/writecff.h  \
-	luatexdir/font/writeenc.c  \
-	luatexdir/font/writefont.c  \
-	luatexdir/font/writet1.c  \
-	luatexdir/font/writet3.c  \
-	luatexdir/font/writettf.c  \
-	luatexdir/font/writettf.h  \
-	luatexdir/font/writetype0.c  \
-	luatexdir/font/writetype2.c  \
-	luatexdir/get_svnversion.sh  \
+	luatexdir/commands.h \
+	luatexdir/font/dofont.c \
+	luatexdir/font/luatexfont.h \
+	luatexdir/font/luafont.c \
+	luatexdir/font/mapfile.c \
+	luatexdir/font/mapfile.h \
+	luatexdir/font/pkin.c \
+	luatexdir/font/sfnt.c \
+	luatexdir/font/sfnt.h \
+	luatexdir/font/subfont.c \
+	luatexdir/font/texfont.c \
+	luatexdir/font/texfont.h \
+	luatexdir/font/tfmofm.c \
+	luatexdir/font/tounicode.c \
+	luatexdir/font/tt_glyf.c \
+	luatexdir/font/tt_glyf.h \
+	luatexdir/font/tt_table.c \
+	luatexdir/font/tt_table.h \
+	luatexdir/font/vfovf.c \
+	luatexdir/font/vfpacket.c \
+	luatexdir/font/writecff.c \
+	luatexdir/font/writecff.h \
+	luatexdir/font/writeenc.c \
+	luatexdir/font/writefont.c \
+	luatexdir/font/writet1.c \
+	luatexdir/font/writet3.c \
+	luatexdir/font/writettf.c \
+	luatexdir/font/writettf.h \
+	luatexdir/font/writetype0.c \
+	luatexdir/font/writetype2.c \
+	luatexdir/get_svnversion.sh \
 	luatexdir/hyphen.h \
-	luatexdir/image/epdf.c  \
-	luatexdir/image/epdf.h  \
-	luatexdir/image/image.h  \
-	luatexdir/image/pdftoepdf.cc  \
-	luatexdir/image/writeimg.c  \
-	luatexdir/image/writejbig2.c  \
-	luatexdir/image/writejbig2.h  \
-	luatexdir/image/writejpg.c  \
-	luatexdir/image/writepng.c  \
-	luatexdir/lang/hnjalloc.c  \
-	luatexdir/lang/hnjalloc.h  \
-	luatexdir/lang/hyphen.c  \
-	luatexdir/lang/texlang.c  \
-	luatexdir/lua/lcallbacklib.c  \
-	luatexdir/lua/lfontlib.c  \
-	luatexdir/lua/limglib.c  \
-	luatexdir/lua/lkpselib.c  \
-	luatexdir/lua/llanglib.c  \
-	luatexdir/lua/llualib.c  \
-	luatexdir/lua/lnodelib.c  \
-	luatexdir/lua/loslibext.c  \
-	luatexdir/lua/lpdflib.c  \
-	luatexdir/lua/lstatslib.c  \
-	luatexdir/lua/ltexiolib.c  \
-	luatexdir/lua/ltexlib.c  \
-	luatexdir/lua/ltokenlib.c  \
-	luatexdir/lua/luainit.c  \
-	luatexdir/lua/luanode.c  \
-	luatexdir/lua/luastuff.c  \
-	luatexdir/lua/luatex.c  \
-	luatexdir/lua/luatoken.c  \
-	luatexdir/lua/texluac.c  \
+	luatexdir/image/epdf.c \
+	luatexdir/image/epdf.h \
+	luatexdir/image/image.h \
+	luatexdir/image/pdftoepdf.cc \
+	luatexdir/image/writeimg.c \
+	luatexdir/image/writejbig2.c \
+	luatexdir/image/writejbig2.h \
+	luatexdir/image/writejpg.c \
+	luatexdir/image/writepng.c \
+	luatexdir/lang/hnjalloc.c \
+	luatexdir/lang/hnjalloc.h \
+	luatexdir/lang/hyphen.c \
+	luatexdir/lang/texlang.c \
+	luatexdir/lua/lcallbacklib.c \
+	luatexdir/lua/lfontlib.c \
+	luatexdir/lua/limglib.c \
+	luatexdir/lua/lkpselib.c \
+	luatexdir/lua/llanglib.c \
+	luatexdir/lua/llualib.c \
+	luatexdir/lua/lnodelib.c \
+	luatexdir/lua/loslibext.c \
+	luatexdir/lua/liolib.c \
+	luatexdir/lua/lpdflib.c \
+	luatexdir/lua/lstatslib.c \
+	luatexdir/lua/ltexiolib.c \
+	luatexdir/lua/ltexlib.c \
+	luatexdir/lua/ltokenlib.c \
+	luatexdir/lua/luainit.c \
+	luatexdir/lua/luanode.c \
+	luatexdir/lua/luastuff.c \
+	luatexdir/lua/luatex.c \
+	luatexdir/lua/luatoken.c \
+	luatexdir/lua/texluac.c \
 	luatexdir/luatex-api.h \
 	luatexdir/luatex.h \
 	luatexdir/makecpool.c \
 	luatexdir/managed-sa.c \
 	luatexdir/managed-sa.h \
 	luatexdir/mathcodes.c \
-	luatexdir/mp/lmplib.c \
 	luatexdir/nodes.h \
 	luatexdir/pdf/pagetree.c \
+	luatexdir/pdf/pagetree.h \
 	luatexdir/pdf/pdfpage.c \
+	luatexdir/pdf/pdfpage.h \
 	luatexdir/primitive.h \
 	luatexdir/ptexmac.h \
-	luatexdir/tex/filename.c  \
-	luatexdir/tex/linebreak.c  \
-	luatexdir/tex/math.c  \
-	luatexdir/tex/mlist.c  \
-	luatexdir/tex/postlinebreak.c  \
-	luatexdir/tex/primitive.c  \
-	luatexdir/tex/texdeffont.c  \
-	luatexdir/tex/texnodes.c  \
-	luatexdir/tex/texpdf.c  \
-	luatexdir/tex/textoken.c  \
+	luatexdir/tex/filename.c \
+	luatexdir/tex/linebreak.c \
+	luatexdir/tex/math.c \
+	luatexdir/tex/mlist.c \
+	luatexdir/tex/postlinebreak.c \
+	luatexdir/tex/primitive.c \
+	luatexdir/tex/texdeffont.c \
+	luatexdir/tex/texnodes.c \
+	luatexdir/tex/texpdf.c \
+	luatexdir/tex/textoken.c \
 	luatexdir/texmath.h \
 	luatexdir/textcodes.c \
 	luatexdir/tokens.h \
@@ -1548,15 +1699,57 @@ libluatex_a_SOURCES = \
 	luatexdir/utils/synctex.h \
 	luatexdir/utils/synctex.c \
 	luatexdir/utils/utils.c \
-	luatexdir/utils/writezip.c
-
-nodist_libluatex_a_SOURCES = $(lua_mp_c_h)
-lua_mp_c_h = luatexdir/mp.c luatexdir/mplib.h luatexdir/mpmp.h \
-	luatexdir/mppsout.h luatexdir/psout.c luatexdir/mplibps.h \
-	luatexdir/memio.c luatexdir/tfmin.c
-lua_mp_web = luatexdir/mp/avl.h luatexdir/mp/avl.c luatexdir/mp/mp.w \
-	luatexdir/mp/psout.w luatexdir/mp/memio.w luatexdir/mp/tfmin.w
+	luatexdir/utils/writezip.c \
+	mplibdir/lmplib.c
+
 EXTRA_libluatex_a_SOURCES = luatexdir/font/macnames.c
+nodist_EXTRA_xetex_SOURCES = dummy.cxx
+libxetex = libxetex.a $(am__append_15)
+xetex_cppflags = -DLE_USE_CMEMORY -I$(srcdir)/xetexdir $(ICU_INCLUDES) \
+	$(TECKIT_INCLUDES) $(am__append_14) $(am__append_16) \
+	$(am__append_19) $(FREETYPE2_INCLUDES) $(ZLIB_INCLUDES)
+xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_17) \
+	$(am__append_20) $(FREETYPE2_LIBS) $(ZLIB_LIBS)
+xetex_dependencies = $(proglib) $(ICU_DEPEND) $(TECKIT_DEPEND) \
+	$(am__append_18) $(am__append_21) $(FREETYPE2_DEPEND) \
+	$(ZLIB_DEPEND)
+@XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework Carbon -framework Cocoa -framework QuickTime
+xetex_CPPFLAGS = $(xetex_cppflags)
+xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
+xetex_DEPENDENCIES = $(xetex_dependencies) $(libxetex)
+xetex_c_h = xetexini.c xetex0.c xetex1.c xetex2.c xetexcoerce.h xetexd.h
+nodist_xetex_SOURCES = $(xetex_c_h) xetex_pool.c xetexextra.c xetexdir/xetexextra.h
+xetex_web_srcs = \
+	tex.web \
+	etexdir/etex.ch \
+	etexdir/tex.ch0 \
+	tex.ch \
+	etexdir/tex.ch1 \
+	etexdir/tex.ech \
+	$(xetex_ch_synctex) \
+	xetexdir/xetex.ch \
+	$(xetex_post_ch_synctex)
+
+libxetex_a_CPPFLAGS = $(xetex_cppflags)
+libxetex_a_SOURCES = xetexdir/MathTable.h xetexdir/FontTableCache.cpp \
+	xetexdir/FontTableCache.h xetexdir/XeTeXFontInst.cpp \
+	xetexdir/XeTeXFontInst.h xetexdir/XeTeXFontInst_FT2.cpp \
+	xetexdir/XeTeXFontInst_FT2.h xetexdir/XeTeXFontMgr.cpp \
+	xetexdir/XeTeXFontMgr.h xetexdir/XeTeXLayoutInterface.cpp \
+	xetexdir/XeTeXLayoutInterface.h \
+	xetexdir/XeTeXOTLayoutEngine.cpp \
+	xetexdir/XeTeXOTLayoutEngine.h xetexdir/XeTeXOTMath.cpp \
+	xetexdir/XeTeXOTMath.h xetexdir/XeTeX_ext.c \
+	xetexdir/XeTeX_ext.h xetexdir/XeTeXswap.h xetexdir/cmaps.cpp \
+	xetexdir/cmaps.h xetexdir/sfnt.h xetexdir/trans.c \
+	xetexdir/trans.h xetexdir/xetex.h $(am__append_22) \
+	$(am__append_23) $(am__append_24)
+libxetexmm_a_CPPFLAGS = $(xetex_cppflags)
+libxetexmm_a_CXXFLAGS = -ObjC++
+libxetexmm_a_SOURCES = \
+	xetexdir/XeTeXFontMgr_Mac.cpp \
+	xetexdir/XeTeXFontMgr_Mac.h
+
 omegaware_tools = odvicopy odvitype otangle
 omegaware_font_tools = ofm2opl opl2ofm ovf2ovp ovp2ovf
 omegaware_programs = $(omegaware_tools) $(omegaware_font_tools)
@@ -1693,10 +1886,10 @@ all: c-auto.h ff-config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .c .cc .cxx .lo .o .obj
+.SUFFIXES: .c .cc .cpp .cxx .lo .o .obj
 am--refresh:
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mpdir/am/mp.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mpdir/am/mp.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/luatangle.am $(srcdir)/luatexdir/am/liblua51.am $(srcdir)/luatexdir/am/libzzip.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -1781,6 +1974,10 @@ libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES)
 	-rm -f libmf.a
 	$(libmf_a_AR) libmf.a $(libmf_a_OBJECTS) $(libmf_a_LIBADD)
 	$(RANLIB) libmf.a
+libmplib.a: $(libmplib_a_OBJECTS) $(libmplib_a_DEPENDENCIES) 
+	-rm -f libmplib.a
+	$(libmplib_a_AR) libmplib.a $(libmplib_a_OBJECTS) $(libmplib_a_LIBADD)
+	$(RANLIB) libmplib.a
 libmpost.a: $(libmpost_a_OBJECTS) $(libmpost_a_DEPENDENCIES) 
 	-rm -f libmpost.a
 	$(libmpost_a_AR) libmpost.a $(libmpost_a_OBJECTS) $(libmpost_a_LIBADD)
@@ -1789,6 +1986,14 @@ libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES)
 	-rm -f libpdftex.a
 	$(libpdftex_a_AR) libpdftex.a $(libpdftex_a_OBJECTS) $(libpdftex_a_LIBADD)
 	$(RANLIB) libpdftex.a
+libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) 
+	-rm -f libxetex.a
+	$(libxetex_a_AR) libxetex.a $(libxetex_a_OBJECTS) $(libxetex_a_LIBADD)
+	$(RANLIB) libxetex.a
+libxetexmm.a: $(libxetexmm_a_OBJECTS) $(libxetexmm_a_DEPENDENCIES) 
+	-rm -f libxetexmm.a
+	$(libxetexmm_a_AR) libxetexmm.a $(libxetexmm_a_OBJECTS) $(libxetexmm_a_LIBADD)
+	$(RANLIB) libxetexmm.a
 libzzip.a: $(libzzip_a_OBJECTS) $(libzzip_a_DEPENDENCIES) 
 	-rm -f libzzip.a
 	$(libzzip_a_AR) libzzip.a $(libzzip_a_OBJECTS) $(libzzip_a_LIBADD)
@@ -1895,6 +2100,9 @@ mft$(EXEEXT): $(mft_OBJECTS) $(mft_DEPENDENCIES)
 mpost$(EXEEXT): $(mpost_OBJECTS) $(mpost_DEPENDENCIES) 
 	@rm -f mpost$(EXEEXT)
 	$(LINK) $(mpost_OBJECTS) $(mpost_LDADD) $(LIBS)
+newmpost$(EXEEXT): $(newmpost_OBJECTS) $(newmpost_DEPENDENCIES) 
+	@rm -f newmpost$(EXEEXT)
+	$(LINK) $(newmpost_OBJECTS) $(newmpost_LDADD) $(LIBS)
 odvicopy$(EXEEXT): $(odvicopy_OBJECTS) $(odvicopy_DEPENDENCIES) 
 	@rm -f odvicopy$(EXEEXT)
 	$(LINK) $(odvicopy_OBJECTS) $(odvicopy_LDADD) $(LIBS)
@@ -1967,6 +2175,9 @@ vptovf$(EXEEXT): $(vptovf_OBJECTS) $(vptovf_DEPENDENCIES)
 weave$(EXEEXT): $(weave_OBJECTS) $(weave_DEPENDENCIES) 
 	@rm -f weave$(EXEEXT)
 	$(LINK) $(weave_OBJECTS) $(weave_LDADD) $(LIBS)
+xetex$(EXEEXT): $(xetex_OBJECTS) $(xetex_DEPENDENCIES) 
+	@rm -f xetex$(EXEEXT)
+	$(xetex_LINK) $(xetex_OBJECTS) $(xetex_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -2073,7 +2284,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblua51_a-lfunc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblua51_a-lgc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblua51_a-linit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblua51_a-liolib.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblua51_a-llex.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblua51_a-lmathlib.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblua51_a-lmem.Po@am__quote@
@@ -2130,6 +2340,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-lfontlib.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-limglib.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-linebreak.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-liolib.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-lkpselib.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-llanglib.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-llualib.Po@am__quote@
@@ -2153,16 +2364,13 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-mapfile.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-math.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-mathcodes.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-memio.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-mlist.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-mp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-pagetree.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-pdfpage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-pdftoepdf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-pkin.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-postlinebreak.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-primitive.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-psout.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-sfnt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-subfont.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-synctex.Po@am__quote@
@@ -2174,7 +2382,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-texpdf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-textcodes.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-textoken.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-tfmin.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-tfmofm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-tounicode.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libluatex_a-tt_glyf.Po@am__quote@
@@ -2200,6 +2407,12 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmf_a-mf0.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmf_a-mf1.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmf_a-mfini.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmplib_a-avl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmplib_a-memio.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmplib_a-mp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmplib_a-psout.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmplib_a-svgout.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmplib_a-tfmin.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmpost_a-avl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmpost_a-avlstuff.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmpost_a-mapfile.Po@am__quote@
@@ -2233,6 +2446,28 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpdftex_a-writet3.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpdftex_a-writettf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpdftex_a-writezip.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxetex_a-FontTableCache.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxetex_a-XeTeXFontInst.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxetex_a-XeTeXFontInst_FT2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxetex_a-XeTeXFontInst_Mac.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxetex_a-XeTeXFontMgr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxetex_a-XeTeXFontMgr_FC.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxetex_a-XeTeXGrLayout.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxetex_a-XeTeXLayoutInterface.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxetex_a-XeTeXOTLayoutEngine.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxetex_a-XeTeXOTMath.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxetex_a-XeTeX_ext.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxetex_a-XeTeX_mac.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxetex_a-XeTeX_pic.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxetex_a-bmpimage.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxetex_a-cmaps.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxetex_a-jpegimage.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxetex_a-mfileio.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxetex_a-numbers.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxetex_a-pdfimage.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxetex_a-pngimage.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxetex_a-trans.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxetexmm_a-XeTeXFontMgr_Mac.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libzzip_a-dir.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libzzip_a-err.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libzzip_a-fetch.Po@am__quote@
@@ -2260,6 +2495,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpost-mp2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpost-mpextra.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpost-mpini.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newmpost-mpost.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newmpost-mpxout.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/odvicopy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/odvitype.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ofm2opl.Po@am__quote@
@@ -2301,6 +2538,13 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vftovp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vptovf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xetex-dummy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xetex-xetex0.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xetex-xetex1.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xetex-xetex2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xetex-xetex_pool.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xetex-xetexextra.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xetex-xetexini.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -3303,20 +3547,6 @@ liblua51_a-linit.obj: luatexdir/lua51/linit.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua51_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblua51_a-linit.obj `if test -f 'luatexdir/lua51/linit.c'; then $(CYGPATH_W) 'luatexdir/lua51/linit.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/lua51/linit.c'; fi`
 
-liblua51_a-liolib.o: luatexdir/lua51/liolib.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua51_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblua51_a-liolib.o -MD -MP -MF $(DEPDIR)/liblua51_a-liolib.Tpo -c -o liblua51_a-liolib.o `test -f 'luatexdir/lua51/liolib.c' || echo '$(srcdir)/'`luatexdir/lua51/liolib.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/liblua51_a-liolib.Tpo $(DEPDIR)/liblua51_a-liolib.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/lua51/liolib.c' object='liblua51_a-liolib.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua51_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblua51_a-liolib.o `test -f 'luatexdir/lua51/liolib.c' || echo '$(srcdir)/'`luatexdir/lua51/liolib.c
-
-liblua51_a-liolib.obj: luatexdir/lua51/liolib.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua51_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblua51_a-liolib.obj -MD -MP -MF $(DEPDIR)/liblua51_a-liolib.Tpo -c -o liblua51_a-liolib.obj `if test -f 'luatexdir/lua51/liolib.c'; then $(CYGPATH_W) 'luatexdir/lua51/liolib.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/lua51/liolib.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/liblua51_a-liolib.Tpo $(DEPDIR)/liblua51_a-liolib.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/lua51/liolib.c' object='liblua51_a-liolib.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua51_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblua51_a-liolib.obj `if test -f 'luatexdir/lua51/liolib.c'; then $(CYGPATH_W) 'luatexdir/lua51/liolib.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/lua51/liolib.c'; fi`
-
 liblua51_a-llex.o: luatexdir/lua51/llex.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblua51_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblua51_a-llex.o -MD -MP -MF $(DEPDIR)/liblua51_a-llex.Tpo -c -o liblua51_a-llex.o `test -f 'luatexdir/lua51/llex.c' || echo '$(srcdir)/'`luatexdir/lua51/llex.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/liblua51_a-llex.Tpo $(DEPDIR)/liblua51_a-llex.Po
@@ -3653,20 +3883,6 @@ libluamisc_a-function_meter.obj: luatexdir/luaprofiler/function_meter.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluamisc_a-function_meter.obj `if test -f 'luatexdir/luaprofiler/function_meter.c'; then $(CYGPATH_W) 'luatexdir/luaprofiler/function_meter.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaprofiler/function_meter.c'; fi`
 
-libluamisc_a-lua50_profiler.o: luatexdir/luaprofiler/lua50_profiler.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluamisc_a-lua50_profiler.o -MD -MP -MF $(DEPDIR)/libluamisc_a-lua50_profiler.Tpo -c -o libluamisc_a-lua50_profiler.o `test -f 'luatexdir/luaprofiler/lua50_profiler.c' || echo '$(srcdir)/'`luatexdir/luaprofiler/lua50_profiler.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluamisc_a-lua50_profiler.Tpo $(DEPDIR)/libluamisc_a-lua50_profiler.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luaprofiler/lua50_profiler.c' object='libluamisc_a-lua50_profiler.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluamisc_a-lua50_profiler.o `test -f 'luatexdir/luaprofiler/lua50_profiler.c' || echo '$(srcdir)/'`luatexdir/luaprofiler/lua50_profiler.c
-
-libluamisc_a-lua50_profiler.obj: luatexdir/luaprofiler/lua50_profiler.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluamisc_a-lua50_profiler.obj -MD -MP -MF $(DEPDIR)/libluamisc_a-lua50_profiler.Tpo -c -o libluamisc_a-lua50_profiler.obj `if test -f 'luatexdir/luaprofiler/lua50_profiler.c'; then $(CYGPATH_W) 'luatexdir/luaprofiler/lua50_profiler.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaprofiler/lua50_profiler.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluamisc_a-lua50_profiler.Tpo $(DEPDIR)/libluamisc_a-lua50_profiler.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luaprofiler/lua50_profiler.c' object='libluamisc_a-lua50_profiler.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluamisc_a-lua50_profiler.obj `if test -f 'luatexdir/luaprofiler/lua50_profiler.c'; then $(CYGPATH_W) 'luatexdir/luaprofiler/lua50_profiler.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaprofiler/lua50_profiler.c'; fi`
-
 libluamisc_a-stack.o: luatexdir/luaprofiler/stack.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluamisc_a-stack.o -MD -MP -MF $(DEPDIR)/libluamisc_a-stack.Tpo -c -o libluamisc_a-stack.o `test -f 'luatexdir/luaprofiler/stack.c' || echo '$(srcdir)/'`luatexdir/luaprofiler/stack.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluamisc_a-stack.Tpo $(DEPDIR)/libluamisc_a-stack.Po
@@ -3681,6 +3897,20 @@ libluamisc_a-stack.obj: luatexdir/luaprofiler/stack.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluamisc_a-stack.obj `if test -f 'luatexdir/luaprofiler/stack.c'; then $(CYGPATH_W) 'luatexdir/luaprofiler/stack.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaprofiler/stack.c'; fi`
 
+libluamisc_a-lua50_profiler.o: luatexdir/luaprofiler/lua50_profiler.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluamisc_a-lua50_profiler.o -MD -MP -MF $(DEPDIR)/libluamisc_a-lua50_profiler.Tpo -c -o libluamisc_a-lua50_profiler.o `test -f 'luatexdir/luaprofiler/lua50_profiler.c' || echo '$(srcdir)/'`luatexdir/luaprofiler/lua50_profiler.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluamisc_a-lua50_profiler.Tpo $(DEPDIR)/libluamisc_a-lua50_profiler.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luaprofiler/lua50_profiler.c' object='libluamisc_a-lua50_profiler.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluamisc_a-lua50_profiler.o `test -f 'luatexdir/luaprofiler/lua50_profiler.c' || echo '$(srcdir)/'`luatexdir/luaprofiler/lua50_profiler.c
+
+libluamisc_a-lua50_profiler.obj: luatexdir/luaprofiler/lua50_profiler.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluamisc_a-lua50_profiler.obj -MD -MP -MF $(DEPDIR)/libluamisc_a-lua50_profiler.Tpo -c -o libluamisc_a-lua50_profiler.obj `if test -f 'luatexdir/luaprofiler/lua50_profiler.c'; then $(CYGPATH_W) 'luatexdir/luaprofiler/lua50_profiler.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaprofiler/lua50_profiler.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluamisc_a-lua50_profiler.Tpo $(DEPDIR)/libluamisc_a-lua50_profiler.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/luaprofiler/lua50_profiler.c' object='libluamisc_a-lua50_profiler.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluamisc_a-lua50_profiler.obj `if test -f 'luatexdir/luaprofiler/lua50_profiler.c'; then $(CYGPATH_W) 'luatexdir/luaprofiler/lua50_profiler.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luaprofiler/lua50_profiler.c'; fi`
+
 libluamisc_a-luazip.o: luatexdir/luazip/src/luazip.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluamisc_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluamisc_a-luazip.o -MD -MP -MF $(DEPDIR)/libluamisc_a-luazip.Tpo -c -o libluamisc_a-luazip.o `test -f 'luatexdir/luazip/src/luazip.c' || echo '$(srcdir)/'`luatexdir/luazip/src/luazip.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluamisc_a-luazip.Tpo $(DEPDIR)/libluamisc_a-luazip.Po
@@ -4465,6 +4695,20 @@ libluatex_a-loslibext.obj: luatexdir/lua/loslibext.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-loslibext.obj `if test -f 'luatexdir/lua/loslibext.c'; then $(CYGPATH_W) 'luatexdir/lua/loslibext.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/lua/loslibext.c'; fi`
 
+libluatex_a-liolib.o: luatexdir/lua/liolib.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-liolib.o -MD -MP -MF $(DEPDIR)/libluatex_a-liolib.Tpo -c -o libluatex_a-liolib.o `test -f 'luatexdir/lua/liolib.c' || echo '$(srcdir)/'`luatexdir/lua/liolib.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-liolib.Tpo $(DEPDIR)/libluatex_a-liolib.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/lua/liolib.c' object='libluatex_a-liolib.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-liolib.o `test -f 'luatexdir/lua/liolib.c' || echo '$(srcdir)/'`luatexdir/lua/liolib.c
+
+libluatex_a-liolib.obj: luatexdir/lua/liolib.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-liolib.obj -MD -MP -MF $(DEPDIR)/libluatex_a-liolib.Tpo -c -o libluatex_a-liolib.obj `if test -f 'luatexdir/lua/liolib.c'; then $(CYGPATH_W) 'luatexdir/lua/liolib.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/lua/liolib.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-liolib.Tpo $(DEPDIR)/libluatex_a-liolib.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/lua/liolib.c' object='libluatex_a-liolib.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-liolib.obj `if test -f 'luatexdir/lua/liolib.c'; then $(CYGPATH_W) 'luatexdir/lua/liolib.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/lua/liolib.c'; fi`
+
 libluatex_a-lpdflib.o: luatexdir/lua/lpdflib.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-lpdflib.o -MD -MP -MF $(DEPDIR)/libluatex_a-lpdflib.Tpo -c -o libluatex_a-lpdflib.o `test -f 'luatexdir/lua/lpdflib.c' || echo '$(srcdir)/'`luatexdir/lua/lpdflib.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-lpdflib.Tpo $(DEPDIR)/libluatex_a-lpdflib.Po
@@ -4661,20 +4905,6 @@ libluatex_a-mathcodes.obj: luatexdir/mathcodes.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-mathcodes.obj `if test -f 'luatexdir/mathcodes.c'; then $(CYGPATH_W) 'luatexdir/mathcodes.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/mathcodes.c'; fi`
 
-libluatex_a-lmplib.o: luatexdir/mp/lmplib.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-lmplib.o -MD -MP -MF $(DEPDIR)/libluatex_a-lmplib.Tpo -c -o libluatex_a-lmplib.o `test -f 'luatexdir/mp/lmplib.c' || echo '$(srcdir)/'`luatexdir/mp/lmplib.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-lmplib.Tpo $(DEPDIR)/libluatex_a-lmplib.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/mp/lmplib.c' object='libluatex_a-lmplib.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-lmplib.o `test -f 'luatexdir/mp/lmplib.c' || echo '$(srcdir)/'`luatexdir/mp/lmplib.c
-
-libluatex_a-lmplib.obj: luatexdir/mp/lmplib.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-lmplib.obj -MD -MP -MF $(DEPDIR)/libluatex_a-lmplib.Tpo -c -o libluatex_a-lmplib.obj `if test -f 'luatexdir/mp/lmplib.c'; then $(CYGPATH_W) 'luatexdir/mp/lmplib.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/mp/lmplib.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-lmplib.Tpo $(DEPDIR)/libluatex_a-lmplib.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/mp/lmplib.c' object='libluatex_a-lmplib.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-lmplib.obj `if test -f 'luatexdir/mp/lmplib.c'; then $(CYGPATH_W) 'luatexdir/mp/lmplib.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/mp/lmplib.c'; fi`
-
 libluatex_a-pagetree.o: luatexdir/pdf/pagetree.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-pagetree.o -MD -MP -MF $(DEPDIR)/libluatex_a-pagetree.Tpo -c -o libluatex_a-pagetree.o `test -f 'luatexdir/pdf/pagetree.c' || echo '$(srcdir)/'`luatexdir/pdf/pagetree.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-pagetree.Tpo $(DEPDIR)/libluatex_a-pagetree.Po
@@ -4927,6 +5157,20 @@ libluatex_a-writezip.obj: luatexdir/utils/writezip.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-writezip.obj `if test -f 'luatexdir/utils/writezip.c'; then $(CYGPATH_W) 'luatexdir/utils/writezip.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/utils/writezip.c'; fi`
 
+libluatex_a-lmplib.o: mplibdir/lmplib.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-lmplib.o -MD -MP -MF $(DEPDIR)/libluatex_a-lmplib.Tpo -c -o libluatex_a-lmplib.o `test -f 'mplibdir/lmplib.c' || echo '$(srcdir)/'`mplibdir/lmplib.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-lmplib.Tpo $(DEPDIR)/libluatex_a-lmplib.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mplibdir/lmplib.c' object='libluatex_a-lmplib.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-lmplib.o `test -f 'mplibdir/lmplib.c' || echo '$(srcdir)/'`mplibdir/lmplib.c
+
+libluatex_a-lmplib.obj: mplibdir/lmplib.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-lmplib.obj -MD -MP -MF $(DEPDIR)/libluatex_a-lmplib.Tpo -c -o libluatex_a-lmplib.obj `if test -f 'mplibdir/lmplib.c'; then $(CYGPATH_W) 'mplibdir/lmplib.c'; else $(CYGPATH_W) '$(srcdir)/mplibdir/lmplib.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-lmplib.Tpo $(DEPDIR)/libluatex_a-lmplib.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mplibdir/lmplib.c' object='libluatex_a-lmplib.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-lmplib.obj `if test -f 'mplibdir/lmplib.c'; then $(CYGPATH_W) 'mplibdir/lmplib.c'; else $(CYGPATH_W) '$(srcdir)/mplibdir/lmplib.c'; fi`
+
 libluatex_a-macnames.o: luatexdir/font/macnames.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-macnames.o -MD -MP -MF $(DEPDIR)/libluatex_a-macnames.Tpo -c -o libluatex_a-macnames.o `test -f 'luatexdir/font/macnames.c' || echo '$(srcdir)/'`luatexdir/font/macnames.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-macnames.Tpo $(DEPDIR)/libluatex_a-macnames.Po
@@ -4941,62 +5185,6 @@ libluatex_a-macnames.obj: luatexdir/font/macnames.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-macnames.obj `if test -f 'luatexdir/font/macnames.c'; then $(CYGPATH_W) 'luatexdir/font/macnames.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/font/macnames.c'; fi`
 
-libluatex_a-mp.o: luatexdir/mp.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-mp.o -MD -MP -MF $(DEPDIR)/libluatex_a-mp.Tpo -c -o libluatex_a-mp.o `test -f 'luatexdir/mp.c' || echo '$(srcdir)/'`luatexdir/mp.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-mp.Tpo $(DEPDIR)/libluatex_a-mp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/mp.c' object='libluatex_a-mp.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-mp.o `test -f 'luatexdir/mp.c' || echo '$(srcdir)/'`luatexdir/mp.c
-
-libluatex_a-mp.obj: luatexdir/mp.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-mp.obj -MD -MP -MF $(DEPDIR)/libluatex_a-mp.Tpo -c -o libluatex_a-mp.obj `if test -f 'luatexdir/mp.c'; then $(CYGPATH_W) 'luatexdir/mp.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/mp.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-mp.Tpo $(DEPDIR)/libluatex_a-mp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/mp.c' object='libluatex_a-mp.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-mp.obj `if test -f 'luatexdir/mp.c'; then $(CYGPATH_W) 'luatexdir/mp.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/mp.c'; fi`
-
-libluatex_a-psout.o: luatexdir/psout.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-psout.o -MD -MP -MF $(DEPDIR)/libluatex_a-psout.Tpo -c -o libluatex_a-psout.o `test -f 'luatexdir/psout.c' || echo '$(srcdir)/'`luatexdir/psout.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-psout.Tpo $(DEPDIR)/libluatex_a-psout.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/psout.c' object='libluatex_a-psout.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-psout.o `test -f 'luatexdir/psout.c' || echo '$(srcdir)/'`luatexdir/psout.c
-
-libluatex_a-psout.obj: luatexdir/psout.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-psout.obj -MD -MP -MF $(DEPDIR)/libluatex_a-psout.Tpo -c -o libluatex_a-psout.obj `if test -f 'luatexdir/psout.c'; then $(CYGPATH_W) 'luatexdir/psout.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/psout.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-psout.Tpo $(DEPDIR)/libluatex_a-psout.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/psout.c' object='libluatex_a-psout.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-psout.obj `if test -f 'luatexdir/psout.c'; then $(CYGPATH_W) 'luatexdir/psout.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/psout.c'; fi`
-
-libluatex_a-memio.o: luatexdir/memio.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-memio.o -MD -MP -MF $(DEPDIR)/libluatex_a-memio.Tpo -c -o libluatex_a-memio.o `test -f 'luatexdir/memio.c' || echo '$(srcdir)/'`luatexdir/memio.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-memio.Tpo $(DEPDIR)/libluatex_a-memio.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/memio.c' object='libluatex_a-memio.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-memio.o `test -f 'luatexdir/memio.c' || echo '$(srcdir)/'`luatexdir/memio.c
-
-libluatex_a-memio.obj: luatexdir/memio.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-memio.obj -MD -MP -MF $(DEPDIR)/libluatex_a-memio.Tpo -c -o libluatex_a-memio.obj `if test -f 'luatexdir/memio.c'; then $(CYGPATH_W) 'luatexdir/memio.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/memio.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-memio.Tpo $(DEPDIR)/libluatex_a-memio.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/memio.c' object='libluatex_a-memio.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-memio.obj `if test -f 'luatexdir/memio.c'; then $(CYGPATH_W) 'luatexdir/memio.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/memio.c'; fi`
-
-libluatex_a-tfmin.o: luatexdir/tfmin.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-tfmin.o -MD -MP -MF $(DEPDIR)/libluatex_a-tfmin.Tpo -c -o libluatex_a-tfmin.o `test -f 'luatexdir/tfmin.c' || echo '$(srcdir)/'`luatexdir/tfmin.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-tfmin.Tpo $(DEPDIR)/libluatex_a-tfmin.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/tfmin.c' object='libluatex_a-tfmin.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-tfmin.o `test -f 'luatexdir/tfmin.c' || echo '$(srcdir)/'`luatexdir/tfmin.c
-
-libluatex_a-tfmin.obj: luatexdir/tfmin.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libluatex_a-tfmin.obj -MD -MP -MF $(DEPDIR)/libluatex_a-tfmin.Tpo -c -o libluatex_a-tfmin.obj `if test -f 'luatexdir/tfmin.c'; then $(CYGPATH_W) 'luatexdir/tfmin.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/tfmin.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libluatex_a-tfmin.Tpo $(DEPDIR)/libluatex_a-tfmin.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='luatexdir/tfmin.c' object='libluatex_a-tfmin.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libluatex_a-tfmin.obj `if test -f 'luatexdir/tfmin.c'; then $(CYGPATH_W) 'luatexdir/tfmin.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/tfmin.c'; fi`
-
 libmd5_a-md5.o: libmd5/md5.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmd5_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmd5_a-md5.o -MD -MP -MF $(DEPDIR)/libmd5_a-md5.Tpo -c -o libmd5_a-md5.o `test -f 'libmd5/md5.c' || echo '$(srcdir)/'`libmd5/md5.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libmd5_a-md5.Tpo $(DEPDIR)/libmd5_a-md5.Po
@@ -5067,6 +5255,90 @@ libmf_a-mf-pool.obj: mf-pool.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmf_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmf_a-mf-pool.obj `if test -f 'mf-pool.c'; then $(CYGPATH_W) 'mf-pool.c'; else $(CYGPATH_W) '$(srcdir)/mf-pool.c'; fi`
 
+libmplib_a-avl.o: mplibdir/avl.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-avl.o -MD -MP -MF $(DEPDIR)/libmplib_a-avl.Tpo -c -o libmplib_a-avl.o `test -f 'mplibdir/avl.c' || echo '$(srcdir)/'`mplibdir/avl.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libmplib_a-avl.Tpo $(DEPDIR)/libmplib_a-avl.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mplibdir/avl.c' object='libmplib_a-avl.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-avl.o `test -f 'mplibdir/avl.c' || echo '$(srcdir)/'`mplibdir/avl.c
+
+libmplib_a-avl.obj: mplibdir/avl.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-avl.obj -MD -MP -MF $(DEPDIR)/libmplib_a-avl.Tpo -c -o libmplib_a-avl.obj `if test -f 'mplibdir/avl.c'; then $(CYGPATH_W) 'mplibdir/avl.c'; else $(CYGPATH_W) '$(srcdir)/mplibdir/avl.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libmplib_a-avl.Tpo $(DEPDIR)/libmplib_a-avl.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mplibdir/avl.c' object='libmplib_a-avl.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-avl.obj `if test -f 'mplibdir/avl.c'; then $(CYGPATH_W) 'mplibdir/avl.c'; else $(CYGPATH_W) '$(srcdir)/mplibdir/avl.c'; fi`
+
+libmplib_a-mp.o: mp.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-mp.o -MD -MP -MF $(DEPDIR)/libmplib_a-mp.Tpo -c -o libmplib_a-mp.o `test -f 'mp.c' || echo '$(srcdir)/'`mp.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libmplib_a-mp.Tpo $(DEPDIR)/libmplib_a-mp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mp.c' object='libmplib_a-mp.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-mp.o `test -f 'mp.c' || echo '$(srcdir)/'`mp.c
+
+libmplib_a-mp.obj: mp.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-mp.obj -MD -MP -MF $(DEPDIR)/libmplib_a-mp.Tpo -c -o libmplib_a-mp.obj `if test -f 'mp.c'; then $(CYGPATH_W) 'mp.c'; else $(CYGPATH_W) '$(srcdir)/mp.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libmplib_a-mp.Tpo $(DEPDIR)/libmplib_a-mp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mp.c' object='libmplib_a-mp.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-mp.obj `if test -f 'mp.c'; then $(CYGPATH_W) 'mp.c'; else $(CYGPATH_W) '$(srcdir)/mp.c'; fi`
+
+libmplib_a-psout.o: psout.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-psout.o -MD -MP -MF $(DEPDIR)/libmplib_a-psout.Tpo -c -o libmplib_a-psout.o `test -f 'psout.c' || echo '$(srcdir)/'`psout.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libmplib_a-psout.Tpo $(DEPDIR)/libmplib_a-psout.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='psout.c' object='libmplib_a-psout.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-psout.o `test -f 'psout.c' || echo '$(srcdir)/'`psout.c
+
+libmplib_a-psout.obj: psout.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-psout.obj -MD -MP -MF $(DEPDIR)/libmplib_a-psout.Tpo -c -o libmplib_a-psout.obj `if test -f 'psout.c'; then $(CYGPATH_W) 'psout.c'; else $(CYGPATH_W) '$(srcdir)/psout.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libmplib_a-psout.Tpo $(DEPDIR)/libmplib_a-psout.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='psout.c' object='libmplib_a-psout.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-psout.obj `if test -f 'psout.c'; then $(CYGPATH_W) 'psout.c'; else $(CYGPATH_W) '$(srcdir)/psout.c'; fi`
+
+libmplib_a-svgout.o: svgout.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-svgout.o -MD -MP -MF $(DEPDIR)/libmplib_a-svgout.Tpo -c -o libmplib_a-svgout.o `test -f 'svgout.c' || echo '$(srcdir)/'`svgout.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libmplib_a-svgout.Tpo $(DEPDIR)/libmplib_a-svgout.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='svgout.c' object='libmplib_a-svgout.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-svgout.o `test -f 'svgout.c' || echo '$(srcdir)/'`svgout.c
+
+libmplib_a-svgout.obj: svgout.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-svgout.obj -MD -MP -MF $(DEPDIR)/libmplib_a-svgout.Tpo -c -o libmplib_a-svgout.obj `if test -f 'svgout.c'; then $(CYGPATH_W) 'svgout.c'; else $(CYGPATH_W) '$(srcdir)/svgout.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libmplib_a-svgout.Tpo $(DEPDIR)/libmplib_a-svgout.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='svgout.c' object='libmplib_a-svgout.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-svgout.obj `if test -f 'svgout.c'; then $(CYGPATH_W) 'svgout.c'; else $(CYGPATH_W) '$(srcdir)/svgout.c'; fi`
+
+libmplib_a-memio.o: memio.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-memio.o -MD -MP -MF $(DEPDIR)/libmplib_a-memio.Tpo -c -o libmplib_a-memio.o `test -f 'memio.c' || echo '$(srcdir)/'`memio.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libmplib_a-memio.Tpo $(DEPDIR)/libmplib_a-memio.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='memio.c' object='libmplib_a-memio.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-memio.o `test -f 'memio.c' || echo '$(srcdir)/'`memio.c
+
+libmplib_a-memio.obj: memio.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-memio.obj -MD -MP -MF $(DEPDIR)/libmplib_a-memio.Tpo -c -o libmplib_a-memio.obj `if test -f 'memio.c'; then $(CYGPATH_W) 'memio.c'; else $(CYGPATH_W) '$(srcdir)/memio.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libmplib_a-memio.Tpo $(DEPDIR)/libmplib_a-memio.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='memio.c' object='libmplib_a-memio.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-memio.obj `if test -f 'memio.c'; then $(CYGPATH_W) 'memio.c'; else $(CYGPATH_W) '$(srcdir)/memio.c'; fi`
+
+libmplib_a-tfmin.o: tfmin.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-tfmin.o -MD -MP -MF $(DEPDIR)/libmplib_a-tfmin.Tpo -c -o libmplib_a-tfmin.o `test -f 'tfmin.c' || echo '$(srcdir)/'`tfmin.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libmplib_a-tfmin.Tpo $(DEPDIR)/libmplib_a-tfmin.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tfmin.c' object='libmplib_a-tfmin.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-tfmin.o `test -f 'tfmin.c' || echo '$(srcdir)/'`tfmin.c
+
+libmplib_a-tfmin.obj: tfmin.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-tfmin.obj -MD -MP -MF $(DEPDIR)/libmplib_a-tfmin.Tpo -c -o libmplib_a-tfmin.obj `if test -f 'tfmin.c'; then $(CYGPATH_W) 'tfmin.c'; else $(CYGPATH_W) '$(srcdir)/tfmin.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libmplib_a-tfmin.Tpo $(DEPDIR)/libmplib_a-tfmin.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tfmin.c' object='libmplib_a-tfmin.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-tfmin.obj `if test -f 'tfmin.c'; then $(CYGPATH_W) 'tfmin.c'; else $(CYGPATH_W) '$(srcdir)/tfmin.c'; fi`
+
 libmpost_a-avl.o: mpdir/avl.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmpost_a-avl.o -MD -MP -MF $(DEPDIR)/libmpost_a-avl.Tpo -c -o libmpost_a-avl.o `test -f 'mpdir/avl.c' || echo '$(srcdir)/'`mpdir/avl.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libmpost_a-avl.Tpo $(DEPDIR)/libmpost_a-avl.Po
@@ -5515,6 +5787,132 @@ libpdftex_a-regexec.obj: pdftexdir/regex/regexec.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpdftex_a-regexec.obj `if test -f 'pdftexdir/regex/regexec.c'; then $(CYGPATH_W) 'pdftexdir/regex/regexec.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/regex/regexec.c'; fi`
 
+libxetex_a-XeTeX_ext.o: xetexdir/XeTeX_ext.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxetex_a-XeTeX_ext.o -MD -MP -MF $(DEPDIR)/libxetex_a-XeTeX_ext.Tpo -c -o libxetex_a-XeTeX_ext.o `test -f 'xetexdir/XeTeX_ext.c' || echo '$(srcdir)/'`xetexdir/XeTeX_ext.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libxetex_a-XeTeX_ext.Tpo $(DEPDIR)/libxetex_a-XeTeX_ext.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetexdir/XeTeX_ext.c' object='libxetex_a-XeTeX_ext.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxetex_a-XeTeX_ext.o `test -f 'xetexdir/XeTeX_ext.c' || echo '$(srcdir)/'`xetexdir/XeTeX_ext.c
+
+libxetex_a-XeTeX_ext.obj: xetexdir/XeTeX_ext.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxetex_a-XeTeX_ext.obj -MD -MP -MF $(DEPDIR)/libxetex_a-XeTeX_ext.Tpo -c -o libxetex_a-XeTeX_ext.obj `if test -f 'xetexdir/XeTeX_ext.c'; then $(CYGPATH_W) 'xetexdir/XeTeX_ext.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeX_ext.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libxetex_a-XeTeX_ext.Tpo $(DEPDIR)/libxetex_a-XeTeX_ext.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetexdir/XeTeX_ext.c' object='libxetex_a-XeTeX_ext.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxetex_a-XeTeX_ext.obj `if test -f 'xetexdir/XeTeX_ext.c'; then $(CYGPATH_W) 'xetexdir/XeTeX_ext.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeX_ext.c'; fi`
+
+libxetex_a-trans.o: xetexdir/trans.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxetex_a-trans.o -MD -MP -MF $(DEPDIR)/libxetex_a-trans.Tpo -c -o libxetex_a-trans.o `test -f 'xetexdir/trans.c' || echo '$(srcdir)/'`xetexdir/trans.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libxetex_a-trans.Tpo $(DEPDIR)/libxetex_a-trans.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetexdir/trans.c' object='libxetex_a-trans.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxetex_a-trans.o `test -f 'xetexdir/trans.c' || echo '$(srcdir)/'`xetexdir/trans.c
+
+libxetex_a-trans.obj: xetexdir/trans.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxetex_a-trans.obj -MD -MP -MF $(DEPDIR)/libxetex_a-trans.Tpo -c -o libxetex_a-trans.obj `if test -f 'xetexdir/trans.c'; then $(CYGPATH_W) 'xetexdir/trans.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/trans.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libxetex_a-trans.Tpo $(DEPDIR)/libxetex_a-trans.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetexdir/trans.c' object='libxetex_a-trans.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxetex_a-trans.obj `if test -f 'xetexdir/trans.c'; then $(CYGPATH_W) 'xetexdir/trans.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/trans.c'; fi`
+
+libxetex_a-XeTeX_mac.o: xetexdir/XeTeX_mac.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxetex_a-XeTeX_mac.o -MD -MP -MF $(DEPDIR)/libxetex_a-XeTeX_mac.Tpo -c -o libxetex_a-XeTeX_mac.o `test -f 'xetexdir/XeTeX_mac.c' || echo '$(srcdir)/'`xetexdir/XeTeX_mac.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libxetex_a-XeTeX_mac.Tpo $(DEPDIR)/libxetex_a-XeTeX_mac.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetexdir/XeTeX_mac.c' object='libxetex_a-XeTeX_mac.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxetex_a-XeTeX_mac.o `test -f 'xetexdir/XeTeX_mac.c' || echo '$(srcdir)/'`xetexdir/XeTeX_mac.c
+
+libxetex_a-XeTeX_mac.obj: xetexdir/XeTeX_mac.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxetex_a-XeTeX_mac.obj -MD -MP -MF $(DEPDIR)/libxetex_a-XeTeX_mac.Tpo -c -o libxetex_a-XeTeX_mac.obj `if test -f 'xetexdir/XeTeX_mac.c'; then $(CYGPATH_W) 'xetexdir/XeTeX_mac.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeX_mac.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libxetex_a-XeTeX_mac.Tpo $(DEPDIR)/libxetex_a-XeTeX_mac.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetexdir/XeTeX_mac.c' object='libxetex_a-XeTeX_mac.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxetex_a-XeTeX_mac.obj `if test -f 'xetexdir/XeTeX_mac.c'; then $(CYGPATH_W) 'xetexdir/XeTeX_mac.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeX_mac.c'; fi`
+
+libxetex_a-XeTeX_pic.o: xetexdir/XeTeX_pic.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxetex_a-XeTeX_pic.o -MD -MP -MF $(DEPDIR)/libxetex_a-XeTeX_pic.Tpo -c -o libxetex_a-XeTeX_pic.o `test -f 'xetexdir/XeTeX_pic.c' || echo '$(srcdir)/'`xetexdir/XeTeX_pic.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libxetex_a-XeTeX_pic.Tpo $(DEPDIR)/libxetex_a-XeTeX_pic.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetexdir/XeTeX_pic.c' object='libxetex_a-XeTeX_pic.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxetex_a-XeTeX_pic.o `test -f 'xetexdir/XeTeX_pic.c' || echo '$(srcdir)/'`xetexdir/XeTeX_pic.c
+
+libxetex_a-XeTeX_pic.obj: xetexdir/XeTeX_pic.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxetex_a-XeTeX_pic.obj -MD -MP -MF $(DEPDIR)/libxetex_a-XeTeX_pic.Tpo -c -o libxetex_a-XeTeX_pic.obj `if test -f 'xetexdir/XeTeX_pic.c'; then $(CYGPATH_W) 'xetexdir/XeTeX_pic.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeX_pic.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libxetex_a-XeTeX_pic.Tpo $(DEPDIR)/libxetex_a-XeTeX_pic.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetexdir/XeTeX_pic.c' object='libxetex_a-XeTeX_pic.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxetex_a-XeTeX_pic.obj `if test -f 'xetexdir/XeTeX_pic.c'; then $(CYGPATH_W) 'xetexdir/XeTeX_pic.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeX_pic.c'; fi`
+
+libxetex_a-bmpimage.o: xetexdir/bmpimage.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxetex_a-bmpimage.o -MD -MP -MF $(DEPDIR)/libxetex_a-bmpimage.Tpo -c -o libxetex_a-bmpimage.o `test -f 'xetexdir/bmpimage.c' || echo '$(srcdir)/'`xetexdir/bmpimage.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libxetex_a-bmpimage.Tpo $(DEPDIR)/libxetex_a-bmpimage.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetexdir/bmpimage.c' object='libxetex_a-bmpimage.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxetex_a-bmpimage.o `test -f 'xetexdir/bmpimage.c' || echo '$(srcdir)/'`xetexdir/bmpimage.c
+
+libxetex_a-bmpimage.obj: xetexdir/bmpimage.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxetex_a-bmpimage.obj -MD -MP -MF $(DEPDIR)/libxetex_a-bmpimage.Tpo -c -o libxetex_a-bmpimage.obj `if test -f 'xetexdir/bmpimage.c'; then $(CYGPATH_W) 'xetexdir/bmpimage.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/bmpimage.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libxetex_a-bmpimage.Tpo $(DEPDIR)/libxetex_a-bmpimage.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetexdir/bmpimage.c' object='libxetex_a-bmpimage.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxetex_a-bmpimage.obj `if test -f 'xetexdir/bmpimage.c'; then $(CYGPATH_W) 'xetexdir/bmpimage.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/bmpimage.c'; fi`
+
+libxetex_a-jpegimage.o: xetexdir/jpegimage.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxetex_a-jpegimage.o -MD -MP -MF $(DEPDIR)/libxetex_a-jpegimage.Tpo -c -o libxetex_a-jpegimage.o `test -f 'xetexdir/jpegimage.c' || echo '$(srcdir)/'`xetexdir/jpegimage.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libxetex_a-jpegimage.Tpo $(DEPDIR)/libxetex_a-jpegimage.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetexdir/jpegimage.c' object='libxetex_a-jpegimage.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxetex_a-jpegimage.o `test -f 'xetexdir/jpegimage.c' || echo '$(srcdir)/'`xetexdir/jpegimage.c
+
+libxetex_a-jpegimage.obj: xetexdir/jpegimage.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxetex_a-jpegimage.obj -MD -MP -MF $(DEPDIR)/libxetex_a-jpegimage.Tpo -c -o libxetex_a-jpegimage.obj `if test -f 'xetexdir/jpegimage.c'; then $(CYGPATH_W) 'xetexdir/jpegimage.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/jpegimage.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libxetex_a-jpegimage.Tpo $(DEPDIR)/libxetex_a-jpegimage.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetexdir/jpegimage.c' object='libxetex_a-jpegimage.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxetex_a-jpegimage.obj `if test -f 'xetexdir/jpegimage.c'; then $(CYGPATH_W) 'xetexdir/jpegimage.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/jpegimage.c'; fi`
+
+libxetex_a-mfileio.o: xetexdir/mfileio.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxetex_a-mfileio.o -MD -MP -MF $(DEPDIR)/libxetex_a-mfileio.Tpo -c -o libxetex_a-mfileio.o `test -f 'xetexdir/mfileio.c' || echo '$(srcdir)/'`xetexdir/mfileio.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libxetex_a-mfileio.Tpo $(DEPDIR)/libxetex_a-mfileio.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetexdir/mfileio.c' object='libxetex_a-mfileio.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxetex_a-mfileio.o `test -f 'xetexdir/mfileio.c' || echo '$(srcdir)/'`xetexdir/mfileio.c
+
+libxetex_a-mfileio.obj: xetexdir/mfileio.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxetex_a-mfileio.obj -MD -MP -MF $(DEPDIR)/libxetex_a-mfileio.Tpo -c -o libxetex_a-mfileio.obj `if test -f 'xetexdir/mfileio.c'; then $(CYGPATH_W) 'xetexdir/mfileio.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/mfileio.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libxetex_a-mfileio.Tpo $(DEPDIR)/libxetex_a-mfileio.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetexdir/mfileio.c' object='libxetex_a-mfileio.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxetex_a-mfileio.obj `if test -f 'xetexdir/mfileio.c'; then $(CYGPATH_W) 'xetexdir/mfileio.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/mfileio.c'; fi`
+
+libxetex_a-numbers.o: xetexdir/numbers.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxetex_a-numbers.o -MD -MP -MF $(DEPDIR)/libxetex_a-numbers.Tpo -c -o libxetex_a-numbers.o `test -f 'xetexdir/numbers.c' || echo '$(srcdir)/'`xetexdir/numbers.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libxetex_a-numbers.Tpo $(DEPDIR)/libxetex_a-numbers.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetexdir/numbers.c' object='libxetex_a-numbers.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxetex_a-numbers.o `test -f 'xetexdir/numbers.c' || echo '$(srcdir)/'`xetexdir/numbers.c
+
+libxetex_a-numbers.obj: xetexdir/numbers.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxetex_a-numbers.obj -MD -MP -MF $(DEPDIR)/libxetex_a-numbers.Tpo -c -o libxetex_a-numbers.obj `if test -f 'xetexdir/numbers.c'; then $(CYGPATH_W) 'xetexdir/numbers.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/numbers.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libxetex_a-numbers.Tpo $(DEPDIR)/libxetex_a-numbers.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetexdir/numbers.c' object='libxetex_a-numbers.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxetex_a-numbers.obj `if test -f 'xetexdir/numbers.c'; then $(CYGPATH_W) 'xetexdir/numbers.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/numbers.c'; fi`
+
+libxetex_a-pngimage.o: xetexdir/pngimage.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxetex_a-pngimage.o -MD -MP -MF $(DEPDIR)/libxetex_a-pngimage.Tpo -c -o libxetex_a-pngimage.o `test -f 'xetexdir/pngimage.c' || echo '$(srcdir)/'`xetexdir/pngimage.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libxetex_a-pngimage.Tpo $(DEPDIR)/libxetex_a-pngimage.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetexdir/pngimage.c' object='libxetex_a-pngimage.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxetex_a-pngimage.o `test -f 'xetexdir/pngimage.c' || echo '$(srcdir)/'`xetexdir/pngimage.c
+
+libxetex_a-pngimage.obj: xetexdir/pngimage.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxetex_a-pngimage.obj -MD -MP -MF $(DEPDIR)/libxetex_a-pngimage.Tpo -c -o libxetex_a-pngimage.obj `if test -f 'xetexdir/pngimage.c'; then $(CYGPATH_W) 'xetexdir/pngimage.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/pngimage.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libxetex_a-pngimage.Tpo $(DEPDIR)/libxetex_a-pngimage.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetexdir/pngimage.c' object='libxetex_a-pngimage.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxetex_a-pngimage.obj `if test -f 'xetexdir/pngimage.c'; then $(CYGPATH_W) 'xetexdir/pngimage.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/pngimage.c'; fi`
+
 libzzip_a-dir.o: luatexdir/zziplib/zzip/dir.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libzzip_a-dir.o -MD -MP -MF $(DEPDIR)/libzzip_a-dir.Tpo -c -o libzzip_a-dir.o `test -f 'luatexdir/zziplib/zzip/dir.c' || echo '$(srcdir)/'`luatexdir/zziplib/zzip/dir.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libzzip_a-dir.Tpo $(DEPDIR)/libzzip_a-dir.Po
@@ -6075,6 +6473,34 @@ mpost-mpextra.obj: mpextra.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpost-mpextra.obj `if test -f 'mpextra.c'; then $(CYGPATH_W) 'mpextra.c'; else $(CYGPATH_W) '$(srcdir)/mpextra.c'; fi`
 
+newmpost-mpost.o: mpost.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(newmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT newmpost-mpost.o -MD -MP -MF $(DEPDIR)/newmpost-mpost.Tpo -c -o newmpost-mpost.o `test -f 'mpost.c' || echo '$(srcdir)/'`mpost.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/newmpost-mpost.Tpo $(DEPDIR)/newmpost-mpost.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mpost.c' object='newmpost-mpost.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(newmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o newmpost-mpost.o `test -f 'mpost.c' || echo '$(srcdir)/'`mpost.c
+
+newmpost-mpost.obj: mpost.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(newmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT newmpost-mpost.obj -MD -MP -MF $(DEPDIR)/newmpost-mpost.Tpo -c -o newmpost-mpost.obj `if test -f 'mpost.c'; then $(CYGPATH_W) 'mpost.c'; else $(CYGPATH_W) '$(srcdir)/mpost.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/newmpost-mpost.Tpo $(DEPDIR)/newmpost-mpost.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mpost.c' object='newmpost-mpost.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(newmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o newmpost-mpost.obj `if test -f 'mpost.c'; then $(CYGPATH_W) 'mpost.c'; else $(CYGPATH_W) '$(srcdir)/mpost.c'; fi`
+
+newmpost-mpxout.o: mpxout.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(newmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT newmpost-mpxout.o -MD -MP -MF $(DEPDIR)/newmpost-mpxout.Tpo -c -o newmpost-mpxout.o `test -f 'mpxout.c' || echo '$(srcdir)/'`mpxout.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/newmpost-mpxout.Tpo $(DEPDIR)/newmpost-mpxout.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mpxout.c' object='newmpost-mpxout.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(newmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o newmpost-mpxout.o `test -f 'mpxout.c' || echo '$(srcdir)/'`mpxout.c
+
+newmpost-mpxout.obj: mpxout.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(newmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT newmpost-mpxout.obj -MD -MP -MF $(DEPDIR)/newmpost-mpxout.Tpo -c -o newmpost-mpxout.obj `if test -f 'mpxout.c'; then $(CYGPATH_W) 'mpxout.c'; else $(CYGPATH_W) '$(srcdir)/mpxout.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/newmpost-mpxout.Tpo $(DEPDIR)/newmpost-mpxout.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mpxout.c' object='newmpost-mpxout.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(newmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o newmpost-mpxout.obj `if test -f 'mpxout.c'; then $(CYGPATH_W) 'mpxout.c'; else $(CYGPATH_W) '$(srcdir)/mpxout.c'; fi`
+
 pdftex-pdftexini.o: pdftexini.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftex-pdftexini.o -MD -MP -MF $(DEPDIR)/pdftex-pdftexini.Tpo -c -o pdftex-pdftexini.o `test -f 'pdftexini.c' || echo '$(srcdir)/'`pdftexini.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/pdftex-pdftexini.Tpo $(DEPDIR)/pdftex-pdftexini.Po
@@ -6341,6 +6767,90 @@ ttf2afm-macnames.obj: pdftexdir/macnames.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ttf2afm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ttf2afm-macnames.obj `if test -f 'pdftexdir/macnames.c'; then $(CYGPATH_W) 'pdftexdir/macnames.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/macnames.c'; fi`
 
+xetex-xetexini.o: xetexini.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xetex-xetexini.o -MD -MP -MF $(DEPDIR)/xetex-xetexini.Tpo -c -o xetex-xetexini.o `test -f 'xetexini.c' || echo '$(srcdir)/'`xetexini.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xetex-xetexini.Tpo $(DEPDIR)/xetex-xetexini.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetexini.c' object='xetex-xetexini.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xetex-xetexini.o `test -f 'xetexini.c' || echo '$(srcdir)/'`xetexini.c
+
+xetex-xetexini.obj: xetexini.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xetex-xetexini.obj -MD -MP -MF $(DEPDIR)/xetex-xetexini.Tpo -c -o xetex-xetexini.obj `if test -f 'xetexini.c'; then $(CYGPATH_W) 'xetexini.c'; else $(CYGPATH_W) '$(srcdir)/xetexini.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xetex-xetexini.Tpo $(DEPDIR)/xetex-xetexini.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetexini.c' object='xetex-xetexini.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xetex-xetexini.obj `if test -f 'xetexini.c'; then $(CYGPATH_W) 'xetexini.c'; else $(CYGPATH_W) '$(srcdir)/xetexini.c'; fi`
+
+xetex-xetex0.o: xetex0.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xetex-xetex0.o -MD -MP -MF $(DEPDIR)/xetex-xetex0.Tpo -c -o xetex-xetex0.o `test -f 'xetex0.c' || echo '$(srcdir)/'`xetex0.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xetex-xetex0.Tpo $(DEPDIR)/xetex-xetex0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetex0.c' object='xetex-xetex0.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xetex-xetex0.o `test -f 'xetex0.c' || echo '$(srcdir)/'`xetex0.c
+
+xetex-xetex0.obj: xetex0.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xetex-xetex0.obj -MD -MP -MF $(DEPDIR)/xetex-xetex0.Tpo -c -o xetex-xetex0.obj `if test -f 'xetex0.c'; then $(CYGPATH_W) 'xetex0.c'; else $(CYGPATH_W) '$(srcdir)/xetex0.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xetex-xetex0.Tpo $(DEPDIR)/xetex-xetex0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetex0.c' object='xetex-xetex0.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xetex-xetex0.obj `if test -f 'xetex0.c'; then $(CYGPATH_W) 'xetex0.c'; else $(CYGPATH_W) '$(srcdir)/xetex0.c'; fi`
+
+xetex-xetex1.o: xetex1.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xetex-xetex1.o -MD -MP -MF $(DEPDIR)/xetex-xetex1.Tpo -c -o xetex-xetex1.o `test -f 'xetex1.c' || echo '$(srcdir)/'`xetex1.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xetex-xetex1.Tpo $(DEPDIR)/xetex-xetex1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetex1.c' object='xetex-xetex1.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xetex-xetex1.o `test -f 'xetex1.c' || echo '$(srcdir)/'`xetex1.c
+
+xetex-xetex1.obj: xetex1.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xetex-xetex1.obj -MD -MP -MF $(DEPDIR)/xetex-xetex1.Tpo -c -o xetex-xetex1.obj `if test -f 'xetex1.c'; then $(CYGPATH_W) 'xetex1.c'; else $(CYGPATH_W) '$(srcdir)/xetex1.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xetex-xetex1.Tpo $(DEPDIR)/xetex-xetex1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetex1.c' object='xetex-xetex1.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xetex-xetex1.obj `if test -f 'xetex1.c'; then $(CYGPATH_W) 'xetex1.c'; else $(CYGPATH_W) '$(srcdir)/xetex1.c'; fi`
+
+xetex-xetex2.o: xetex2.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xetex-xetex2.o -MD -MP -MF $(DEPDIR)/xetex-xetex2.Tpo -c -o xetex-xetex2.o `test -f 'xetex2.c' || echo '$(srcdir)/'`xetex2.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xetex-xetex2.Tpo $(DEPDIR)/xetex-xetex2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetex2.c' object='xetex-xetex2.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xetex-xetex2.o `test -f 'xetex2.c' || echo '$(srcdir)/'`xetex2.c
+
+xetex-xetex2.obj: xetex2.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xetex-xetex2.obj -MD -MP -MF $(DEPDIR)/xetex-xetex2.Tpo -c -o xetex-xetex2.obj `if test -f 'xetex2.c'; then $(CYGPATH_W) 'xetex2.c'; else $(CYGPATH_W) '$(srcdir)/xetex2.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xetex-xetex2.Tpo $(DEPDIR)/xetex-xetex2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetex2.c' object='xetex-xetex2.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xetex-xetex2.obj `if test -f 'xetex2.c'; then $(CYGPATH_W) 'xetex2.c'; else $(CYGPATH_W) '$(srcdir)/xetex2.c'; fi`
+
+xetex-xetex_pool.o: xetex_pool.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xetex-xetex_pool.o -MD -MP -MF $(DEPDIR)/xetex-xetex_pool.Tpo -c -o xetex-xetex_pool.o `test -f 'xetex_pool.c' || echo '$(srcdir)/'`xetex_pool.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xetex-xetex_pool.Tpo $(DEPDIR)/xetex-xetex_pool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetex_pool.c' object='xetex-xetex_pool.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xetex-xetex_pool.o `test -f 'xetex_pool.c' || echo '$(srcdir)/'`xetex_pool.c
+
+xetex-xetex_pool.obj: xetex_pool.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xetex-xetex_pool.obj -MD -MP -MF $(DEPDIR)/xetex-xetex_pool.Tpo -c -o xetex-xetex_pool.obj `if test -f 'xetex_pool.c'; then $(CYGPATH_W) 'xetex_pool.c'; else $(CYGPATH_W) '$(srcdir)/xetex_pool.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xetex-xetex_pool.Tpo $(DEPDIR)/xetex-xetex_pool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetex_pool.c' object='xetex-xetex_pool.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xetex-xetex_pool.obj `if test -f 'xetex_pool.c'; then $(CYGPATH_W) 'xetex_pool.c'; else $(CYGPATH_W) '$(srcdir)/xetex_pool.c'; fi`
+
+xetex-xetexextra.o: xetexextra.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xetex-xetexextra.o -MD -MP -MF $(DEPDIR)/xetex-xetexextra.Tpo -c -o xetex-xetexextra.o `test -f 'xetexextra.c' || echo '$(srcdir)/'`xetexextra.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xetex-xetexextra.Tpo $(DEPDIR)/xetex-xetexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetexextra.c' object='xetex-xetexextra.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xetex-xetexextra.o `test -f 'xetexextra.c' || echo '$(srcdir)/'`xetexextra.c
+
+xetex-xetexextra.obj: xetexextra.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xetex-xetexextra.obj -MD -MP -MF $(DEPDIR)/xetex-xetexextra.Tpo -c -o xetex-xetexextra.obj `if test -f 'xetexextra.c'; then $(CYGPATH_W) 'xetexextra.c'; else $(CYGPATH_W) '$(srcdir)/xetexextra.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xetex-xetexextra.Tpo $(DEPDIR)/xetex-xetexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xetexextra.c' object='xetex-xetexextra.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xetex-xetexextra.obj `if test -f 'xetexextra.c'; then $(CYGPATH_W) 'xetexextra.c'; else $(CYGPATH_W) '$(srcdir)/xetexextra.c'; fi`
+
 .cc.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@@ -6390,6 +6900,188 @@ libpdftex_a-pdftoepdf.obj: pdftexdir/pdftoepdf.cc
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libpdftex_a-pdftoepdf.obj `if test -f 'pdftexdir/pdftoepdf.cc'; then $(CYGPATH_W) 'pdftexdir/pdftoepdf.cc'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/pdftoepdf.cc'; fi`
 
+libxetex_a-FontTableCache.o: xetexdir/FontTableCache.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libxetex_a-FontTableCache.o -MD -MP -MF $(DEPDIR)/libxetex_a-FontTableCache.Tpo -c -o libxetex_a-FontTableCache.o `test -f 'xetexdir/FontTableCache.cpp' || echo '$(srcdir)/'`xetexdir/FontTableCache.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libxetex_a-FontTableCache.Tpo $(DEPDIR)/libxetex_a-FontTableCache.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xetexdir/FontTableCache.cpp' object='libxetex_a-FontTableCache.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libxetex_a-FontTableCache.o `test -f 'xetexdir/FontTableCache.cpp' || echo '$(srcdir)/'`xetexdir/FontTableCache.cpp
+
+libxetex_a-FontTableCache.obj: xetexdir/FontTableCache.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libxetex_a-FontTableCache.obj -MD -MP -MF $(DEPDIR)/libxetex_a-FontTableCache.Tpo -c -o libxetex_a-FontTableCache.obj `if test -f 'xetexdir/FontTableCache.cpp'; then $(CYGPATH_W) 'xetexdir/FontTableCache.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/FontTableCache.cpp'; fi`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libxetex_a-FontTableCache.Tpo $(DEPDIR)/libxetex_a-FontTableCache.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xetexdir/FontTableCache.cpp' object='libxetex_a-FontTableCache.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libxetex_a-FontTableCache.obj `if test -f 'xetexdir/FontTableCache.cpp'; then $(CYGPATH_W) 'xetexdir/FontTableCache.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/FontTableCache.cpp'; fi`
+
+libxetex_a-XeTeXFontInst.o: xetexdir/XeTeXFontInst.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libxetex_a-XeTeXFontInst.o -MD -MP -MF $(DEPDIR)/libxetex_a-XeTeXFontInst.Tpo -c -o libxetex_a-XeTeXFontInst.o `test -f 'xetexdir/XeTeXFontInst.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXFontInst.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libxetex_a-XeTeXFontInst.Tpo $(DEPDIR)/libxetex_a-XeTeXFontInst.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xetexdir/XeTeXFontInst.cpp' object='libxetex_a-XeTeXFontInst.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libxetex_a-XeTeXFontInst.o `test -f 'xetexdir/XeTeXFontInst.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXFontInst.cpp
+
+libxetex_a-XeTeXFontInst.obj: xetexdir/XeTeXFontInst.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libxetex_a-XeTeXFontInst.obj -MD -MP -MF $(DEPDIR)/libxetex_a-XeTeXFontInst.Tpo -c -o libxetex_a-XeTeXFontInst.obj `if test -f 'xetexdir/XeTeXFontInst.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXFontInst.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXFontInst.cpp'; fi`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libxetex_a-XeTeXFontInst.Tpo $(DEPDIR)/libxetex_a-XeTeXFontInst.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xetexdir/XeTeXFontInst.cpp' object='libxetex_a-XeTeXFontInst.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libxetex_a-XeTeXFontInst.obj `if test -f 'xetexdir/XeTeXFontInst.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXFontInst.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXFontInst.cpp'; fi`
+
+libxetex_a-XeTeXFontInst_FT2.o: xetexdir/XeTeXFontInst_FT2.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libxetex_a-XeTeXFontInst_FT2.o -MD -MP -MF $(DEPDIR)/libxetex_a-XeTeXFontInst_FT2.Tpo -c -o libxetex_a-XeTeXFontInst_FT2.o `test -f 'xetexdir/XeTeXFontInst_FT2.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXFontInst_FT2.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libxetex_a-XeTeXFontInst_FT2.Tpo $(DEPDIR)/libxetex_a-XeTeXFontInst_FT2.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xetexdir/XeTeXFontInst_FT2.cpp' object='libxetex_a-XeTeXFontInst_FT2.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libxetex_a-XeTeXFontInst_FT2.o `test -f 'xetexdir/XeTeXFontInst_FT2.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXFontInst_FT2.cpp
+
+libxetex_a-XeTeXFontInst_FT2.obj: xetexdir/XeTeXFontInst_FT2.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libxetex_a-XeTeXFontInst_FT2.obj -MD -MP -MF $(DEPDIR)/libxetex_a-XeTeXFontInst_FT2.Tpo -c -o libxetex_a-XeTeXFontInst_FT2.obj `if test -f 'xetexdir/XeTeXFontInst_FT2.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXFontInst_FT2.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXFontInst_FT2.cpp'; fi`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libxetex_a-XeTeXFontInst_FT2.Tpo $(DEPDIR)/libxetex_a-XeTeXFontInst_FT2.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xetexdir/XeTeXFontInst_FT2.cpp' object='libxetex_a-XeTeXFontInst_FT2.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libxetex_a-XeTeXFontInst_FT2.obj `if test -f 'xetexdir/XeTeXFontInst_FT2.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXFontInst_FT2.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXFontInst_FT2.cpp'; fi`
+
+libxetex_a-XeTeXFontMgr.o: xetexdir/XeTeXFontMgr.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libxetex_a-XeTeXFontMgr.o -MD -MP -MF $(DEPDIR)/libxetex_a-XeTeXFontMgr.Tpo -c -o libxetex_a-XeTeXFontMgr.o `test -f 'xetexdir/XeTeXFontMgr.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXFontMgr.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libxetex_a-XeTeXFontMgr.Tpo $(DEPDIR)/libxetex_a-XeTeXFontMgr.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xetexdir/XeTeXFontMgr.cpp' object='libxetex_a-XeTeXFontMgr.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libxetex_a-XeTeXFontMgr.o `test -f 'xetexdir/XeTeXFontMgr.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXFontMgr.cpp
+
+libxetex_a-XeTeXFontMgr.obj: xetexdir/XeTeXFontMgr.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libxetex_a-XeTeXFontMgr.obj -MD -MP -MF $(DEPDIR)/libxetex_a-XeTeXFontMgr.Tpo -c -o libxetex_a-XeTeXFontMgr.obj `if test -f 'xetexdir/XeTeXFontMgr.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXFontMgr.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXFontMgr.cpp'; fi`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libxetex_a-XeTeXFontMgr.Tpo $(DEPDIR)/libxetex_a-XeTeXFontMgr.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xetexdir/XeTeXFontMgr.cpp' object='libxetex_a-XeTeXFontMgr.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libxetex_a-XeTeXFontMgr.obj `if test -f 'xetexdir/XeTeXFontMgr.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXFontMgr.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXFontMgr.cpp'; fi`
+
+libxetex_a-XeTeXLayoutInterface.o: xetexdir/XeTeXLayoutInterface.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libxetex_a-XeTeXLayoutInterface.o -MD -MP -MF $(DEPDIR)/libxetex_a-XeTeXLayoutInterface.Tpo -c -o libxetex_a-XeTeXLayoutInterface.o `test -f 'xetexdir/XeTeXLayoutInterface.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXLayoutInterface.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libxetex_a-XeTeXLayoutInterface.Tpo $(DEPDIR)/libxetex_a-XeTeXLayoutInterface.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xetexdir/XeTeXLayoutInterface.cpp' object='libxetex_a-XeTeXLayoutInterface.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libxetex_a-XeTeXLayoutInterface.o `test -f 'xetexdir/XeTeXLayoutInterface.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXLayoutInterface.cpp
+
+libxetex_a-XeTeXLayoutInterface.obj: xetexdir/XeTeXLayoutInterface.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libxetex_a-XeTeXLayoutInterface.obj -MD -MP -MF $(DEPDIR)/libxetex_a-XeTeXLayoutInterface.Tpo -c -o libxetex_a-XeTeXLayoutInterface.obj `if test -f 'xetexdir/XeTeXLayoutInterface.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXLayoutInterface.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXLayoutInterface.cpp'; fi`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libxetex_a-XeTeXLayoutInterface.Tpo $(DEPDIR)/libxetex_a-XeTeXLayoutInterface.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xetexdir/XeTeXLayoutInterface.cpp' object='libxetex_a-XeTeXLayoutInterface.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libxetex_a-XeTeXLayoutInterface.obj `if test -f 'xetexdir/XeTeXLayoutInterface.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXLayoutInterface.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXLayoutInterface.cpp'; fi`
+
+libxetex_a-XeTeXOTLayoutEngine.o: xetexdir/XeTeXOTLayoutEngine.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libxetex_a-XeTeXOTLayoutEngine.o -MD -MP -MF $(DEPDIR)/libxetex_a-XeTeXOTLayoutEngine.Tpo -c -o libxetex_a-XeTeXOTLayoutEngine.o `test -f 'xetexdir/XeTeXOTLayoutEngine.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXOTLayoutEngine.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libxetex_a-XeTeXOTLayoutEngine.Tpo $(DEPDIR)/libxetex_a-XeTeXOTLayoutEngine.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xetexdir/XeTeXOTLayoutEngine.cpp' object='libxetex_a-XeTeXOTLayoutEngine.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libxetex_a-XeTeXOTLayoutEngine.o `test -f 'xetexdir/XeTeXOTLayoutEngine.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXOTLayoutEngine.cpp
+
+libxetex_a-XeTeXOTLayoutEngine.obj: xetexdir/XeTeXOTLayoutEngine.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libxetex_a-XeTeXOTLayoutEngine.obj -MD -MP -MF $(DEPDIR)/libxetex_a-XeTeXOTLayoutEngine.Tpo -c -o libxetex_a-XeTeXOTLayoutEngine.obj `if test -f 'xetexdir/XeTeXOTLayoutEngine.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXOTLayoutEngine.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXOTLayoutEngine.cpp'; fi`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libxetex_a-XeTeXOTLayoutEngine.Tpo $(DEPDIR)/libxetex_a-XeTeXOTLayoutEngine.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xetexdir/XeTeXOTLayoutEngine.cpp' object='libxetex_a-XeTeXOTLayoutEngine.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libxetex_a-XeTeXOTLayoutEngine.obj `if test -f 'xetexdir/XeTeXOTLayoutEngine.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXOTLayoutEngine.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXOTLayoutEngine.cpp'; fi`
+
+libxetex_a-XeTeXOTMath.o: xetexdir/XeTeXOTMath.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libxetex_a-XeTeXOTMath.o -MD -MP -MF $(DEPDIR)/libxetex_a-XeTeXOTMath.Tpo -c -o libxetex_a-XeTeXOTMath.o `test -f 'xetexdir/XeTeXOTMath.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXOTMath.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libxetex_a-XeTeXOTMath.Tpo $(DEPDIR)/libxetex_a-XeTeXOTMath.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xetexdir/XeTeXOTMath.cpp' object='libxetex_a-XeTeXOTMath.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libxetex_a-XeTeXOTMath.o `test -f 'xetexdir/XeTeXOTMath.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXOTMath.cpp
+
+libxetex_a-XeTeXOTMath.obj: xetexdir/XeTeXOTMath.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libxetex_a-XeTeXOTMath.obj -MD -MP -MF $(DEPDIR)/libxetex_a-XeTeXOTMath.Tpo -c -o libxetex_a-XeTeXOTMath.obj `if test -f 'xetexdir/XeTeXOTMath.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXOTMath.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXOTMath.cpp'; fi`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libxetex_a-XeTeXOTMath.Tpo $(DEPDIR)/libxetex_a-XeTeXOTMath.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xetexdir/XeTeXOTMath.cpp' object='libxetex_a-XeTeXOTMath.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libxetex_a-XeTeXOTMath.obj `if test -f 'xetexdir/XeTeXOTMath.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXOTMath.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXOTMath.cpp'; fi`
+
+libxetex_a-cmaps.o: xetexdir/cmaps.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libxetex_a-cmaps.o -MD -MP -MF $(DEPDIR)/libxetex_a-cmaps.Tpo -c -o libxetex_a-cmaps.o `test -f 'xetexdir/cmaps.cpp' || echo '$(srcdir)/'`xetexdir/cmaps.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libxetex_a-cmaps.Tpo $(DEPDIR)/libxetex_a-cmaps.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xetexdir/cmaps.cpp' object='libxetex_a-cmaps.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libxetex_a-cmaps.o `test -f 'xetexdir/cmaps.cpp' || echo '$(srcdir)/'`xetexdir/cmaps.cpp
+
+libxetex_a-cmaps.obj: xetexdir/cmaps.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libxetex_a-cmaps.obj -MD -MP -MF $(DEPDIR)/libxetex_a-cmaps.Tpo -c -o libxetex_a-cmaps.obj `if test -f 'xetexdir/cmaps.cpp'; then $(CYGPATH_W) 'xetexdir/cmaps.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/cmaps.cpp'; fi`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libxetex_a-cmaps.Tpo $(DEPDIR)/libxetex_a-cmaps.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xetexdir/cmaps.cpp' object='libxetex_a-cmaps.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libxetex_a-cmaps.obj `if test -f 'xetexdir/cmaps.cpp'; then $(CYGPATH_W) 'xetexdir/cmaps.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/cmaps.cpp'; fi`
+
+libxetex_a-XeTeXFontInst_Mac.o: xetexdir/XeTeXFontInst_Mac.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libxetex_a-XeTeXFontInst_Mac.o -MD -MP -MF $(DEPDIR)/libxetex_a-XeTeXFontInst_Mac.Tpo -c -o libxetex_a-XeTeXFontInst_Mac.o `test -f 'xetexdir/XeTeXFontInst_Mac.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXFontInst_Mac.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libxetex_a-XeTeXFontInst_Mac.Tpo $(DEPDIR)/libxetex_a-XeTeXFontInst_Mac.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xetexdir/XeTeXFontInst_Mac.cpp' object='libxetex_a-XeTeXFontInst_Mac.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libxetex_a-XeTeXFontInst_Mac.o `test -f 'xetexdir/XeTeXFontInst_Mac.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXFontInst_Mac.cpp
+
+libxetex_a-XeTeXFontInst_Mac.obj: xetexdir/XeTeXFontInst_Mac.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libxetex_a-XeTeXFontInst_Mac.obj -MD -MP -MF $(DEPDIR)/libxetex_a-XeTeXFontInst_Mac.Tpo -c -o libxetex_a-XeTeXFontInst_Mac.obj `if test -f 'xetexdir/XeTeXFontInst_Mac.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXFontInst_Mac.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXFontInst_Mac.cpp'; fi`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libxetex_a-XeTeXFontInst_Mac.Tpo $(DEPDIR)/libxetex_a-XeTeXFontInst_Mac.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xetexdir/XeTeXFontInst_Mac.cpp' object='libxetex_a-XeTeXFontInst_Mac.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libxetex_a-XeTeXFontInst_Mac.obj `if test -f 'xetexdir/XeTeXFontInst_Mac.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXFontInst_Mac.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXFontInst_Mac.cpp'; fi`
+
+libxetex_a-XeTeXFontMgr_FC.o: xetexdir/XeTeXFontMgr_FC.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libxetex_a-XeTeXFontMgr_FC.o -MD -MP -MF $(DEPDIR)/libxetex_a-XeTeXFontMgr_FC.Tpo -c -o libxetex_a-XeTeXFontMgr_FC.o `test -f 'xetexdir/XeTeXFontMgr_FC.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXFontMgr_FC.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libxetex_a-XeTeXFontMgr_FC.Tpo $(DEPDIR)/libxetex_a-XeTeXFontMgr_FC.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xetexdir/XeTeXFontMgr_FC.cpp' object='libxetex_a-XeTeXFontMgr_FC.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libxetex_a-XeTeXFontMgr_FC.o `test -f 'xetexdir/XeTeXFontMgr_FC.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXFontMgr_FC.cpp
+
+libxetex_a-XeTeXFontMgr_FC.obj: xetexdir/XeTeXFontMgr_FC.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libxetex_a-XeTeXFontMgr_FC.obj -MD -MP -MF $(DEPDIR)/libxetex_a-XeTeXFontMgr_FC.Tpo -c -o libxetex_a-XeTeXFontMgr_FC.obj `if test -f 'xetexdir/XeTeXFontMgr_FC.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXFontMgr_FC.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXFontMgr_FC.cpp'; fi`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libxetex_a-XeTeXFontMgr_FC.Tpo $(DEPDIR)/libxetex_a-XeTeXFontMgr_FC.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xetexdir/XeTeXFontMgr_FC.cpp' object='libxetex_a-XeTeXFontMgr_FC.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libxetex_a-XeTeXFontMgr_FC.obj `if test -f 'xetexdir/XeTeXFontMgr_FC.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXFontMgr_FC.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXFontMgr_FC.cpp'; fi`
+
+libxetex_a-pdfimage.o: xetexdir/pdfimage.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libxetex_a-pdfimage.o -MD -MP -MF $(DEPDIR)/libxetex_a-pdfimage.Tpo -c -o libxetex_a-pdfimage.o `test -f 'xetexdir/pdfimage.cpp' || echo '$(srcdir)/'`xetexdir/pdfimage.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libxetex_a-pdfimage.Tpo $(DEPDIR)/libxetex_a-pdfimage.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xetexdir/pdfimage.cpp' object='libxetex_a-pdfimage.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libxetex_a-pdfimage.o `test -f 'xetexdir/pdfimage.cpp' || echo '$(srcdir)/'`xetexdir/pdfimage.cpp
+
+libxetex_a-pdfimage.obj: xetexdir/pdfimage.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libxetex_a-pdfimage.obj -MD -MP -MF $(DEPDIR)/libxetex_a-pdfimage.Tpo -c -o libxetex_a-pdfimage.obj `if test -f 'xetexdir/pdfimage.cpp'; then $(CYGPATH_W) 'xetexdir/pdfimage.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/pdfimage.cpp'; fi`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libxetex_a-pdfimage.Tpo $(DEPDIR)/libxetex_a-pdfimage.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xetexdir/pdfimage.cpp' object='libxetex_a-pdfimage.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libxetex_a-pdfimage.obj `if test -f 'xetexdir/pdfimage.cpp'; then $(CYGPATH_W) 'xetexdir/pdfimage.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/pdfimage.cpp'; fi`
+
+libxetex_a-XeTeXGrLayout.o: xetexdir/XeTeXGrLayout.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libxetex_a-XeTeXGrLayout.o -MD -MP -MF $(DEPDIR)/libxetex_a-XeTeXGrLayout.Tpo -c -o libxetex_a-XeTeXGrLayout.o `test -f 'xetexdir/XeTeXGrLayout.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXGrLayout.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libxetex_a-XeTeXGrLayout.Tpo $(DEPDIR)/libxetex_a-XeTeXGrLayout.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xetexdir/XeTeXGrLayout.cpp' object='libxetex_a-XeTeXGrLayout.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libxetex_a-XeTeXGrLayout.o `test -f 'xetexdir/XeTeXGrLayout.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXGrLayout.cpp
+
+libxetex_a-XeTeXGrLayout.obj: xetexdir/XeTeXGrLayout.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libxetex_a-XeTeXGrLayout.obj -MD -MP -MF $(DEPDIR)/libxetex_a-XeTeXGrLayout.Tpo -c -o libxetex_a-XeTeXGrLayout.obj `if test -f 'xetexdir/XeTeXGrLayout.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXGrLayout.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXGrLayout.cpp'; fi`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libxetex_a-XeTeXGrLayout.Tpo $(DEPDIR)/libxetex_a-XeTeXGrLayout.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xetexdir/XeTeXGrLayout.cpp' object='libxetex_a-XeTeXGrLayout.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libxetex_a-XeTeXGrLayout.obj `if test -f 'xetexdir/XeTeXGrLayout.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXGrLayout.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXGrLayout.cpp'; fi`
+
+libxetexmm_a-XeTeXFontMgr_Mac.o: xetexdir/XeTeXFontMgr_Mac.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetexmm_a_CPPFLAGS) $(CPPFLAGS) $(libxetexmm_a_CXXFLAGS) $(CXXFLAGS) -MT libxetexmm_a-XeTeXFontMgr_Mac.o -MD -MP -MF $(DEPDIR)/libxetexmm_a-XeTeXFontMgr_Mac.Tpo -c -o libxetexmm_a-XeTeXFontMgr_Mac.o `test -f 'xetexdir/XeTeXFontMgr_Mac.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXFontMgr_Mac.cpp
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libxetexmm_a-XeTeXFontMgr_Mac.Tpo $(DEPDIR)/libxetexmm_a-XeTeXFontMgr_Mac.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xetexdir/XeTeXFontMgr_Mac.cpp' object='libxetexmm_a-XeTeXFontMgr_Mac.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetexmm_a_CPPFLAGS) $(CPPFLAGS) $(libxetexmm_a_CXXFLAGS) $(CXXFLAGS) -c -o libxetexmm_a-XeTeXFontMgr_Mac.o `test -f 'xetexdir/XeTeXFontMgr_Mac.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXFontMgr_Mac.cpp
+
+libxetexmm_a-XeTeXFontMgr_Mac.obj: xetexdir/XeTeXFontMgr_Mac.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetexmm_a_CPPFLAGS) $(CPPFLAGS) $(libxetexmm_a_CXXFLAGS) $(CXXFLAGS) -MT libxetexmm_a-XeTeXFontMgr_Mac.obj -MD -MP -MF $(DEPDIR)/libxetexmm_a-XeTeXFontMgr_Mac.Tpo -c -o libxetexmm_a-XeTeXFontMgr_Mac.obj `if test -f 'xetexdir/XeTeXFontMgr_Mac.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXFontMgr_Mac.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXFontMgr_Mac.cpp'; fi`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libxetexmm_a-XeTeXFontMgr_Mac.Tpo $(DEPDIR)/libxetexmm_a-XeTeXFontMgr_Mac.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xetexdir/XeTeXFontMgr_Mac.cpp' object='libxetexmm_a-XeTeXFontMgr_Mac.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetexmm_a_CPPFLAGS) $(CPPFLAGS) $(libxetexmm_a_CXXFLAGS) $(CXXFLAGS) -c -o libxetexmm_a-XeTeXFontMgr_Mac.obj `if test -f 'xetexdir/XeTeXFontMgr_Mac.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXFontMgr_Mac.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXFontMgr_Mac.cpp'; fi`
+
 luatex-dummy.o: dummy.cxx
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(luatex_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT luatex-dummy.o -MD -MP -MF $(DEPDIR)/luatex-dummy.Tpo -c -o luatex-dummy.o `test -f 'dummy.cxx' || echo '$(srcdir)/'`dummy.cxx
 @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/luatex-dummy.Tpo $(DEPDIR)/luatex-dummy.Po
@@ -6446,6 +7138,41 @@ pdftosrc-dummy.obj: dummy.cxx
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftosrc_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o pdftosrc-dummy.obj `if test -f 'dummy.cxx'; then $(CYGPATH_W) 'dummy.cxx'; else $(CYGPATH_W) '$(srcdir)/dummy.cxx'; fi`
 
+xetex-dummy.o: dummy.cxx
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xetex-dummy.o -MD -MP -MF $(DEPDIR)/xetex-dummy.Tpo -c -o xetex-dummy.o `test -f 'dummy.cxx' || echo '$(srcdir)/'`dummy.cxx
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xetex-dummy.Tpo $(DEPDIR)/xetex-dummy.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='dummy.cxx' object='xetex-dummy.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xetex-dummy.o `test -f 'dummy.cxx' || echo '$(srcdir)/'`dummy.cxx
+
+xetex-dummy.obj: dummy.cxx
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xetex-dummy.obj -MD -MP -MF $(DEPDIR)/xetex-dummy.Tpo -c -o xetex-dummy.obj `if test -f 'dummy.cxx'; then $(CYGPATH_W) 'dummy.cxx'; else $(CYGPATH_W) '$(srcdir)/dummy.cxx'; fi`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xetex-dummy.Tpo $(DEPDIR)/xetex-dummy.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='dummy.cxx' object='xetex-dummy.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xetex-dummy.obj `if test -f 'dummy.cxx'; then $(CYGPATH_W) 'dummy.cxx'; else $(CYGPATH_W) '$(srcdir)/dummy.cxx'; fi`
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+
 .cxx.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@@ -7073,6 +7800,10 @@ $(web2c_programs): $(web2c_common) ${srcdir}/web2c/*.[chly]
 @LIBPNG_RULE@
 @XPDF_RULE@
 @OBSDCOMPAT_RULE@
+@GRAPHITE_RULE@
+@FREETYPE2_RULE@
+@TECKIT_RULE@
+@ICU_RULE@
 
 .PRECIOUS: %.ch %.p %.c
 tangle.c tangle.h: tangle-web2c
@@ -7309,6 +8040,23 @@ mp-pool.c: mp.pool $(makecpool) mpdir/mplib.h
 	$(makecpool) mp.pool $(srcdir)/mpdir/mplib.h >$@ || rm -f $@
 
 $(libmpost_a_OBJECTS): mpd.h
+
+$(newmpost_c_h): mpost-ctangle libmplib.a
+mpost-ctangle: ctangle$(EXEEXT) $(newmpost_web)
+	CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) mpost.w
+	CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) mpxout.w
+	echo timestamp >$@
+	touch $(newmpost_c_h)
+
+$(libmplib_c_h): mplib-ctangle  $(libmplib_true_c)
+mplib-ctangle: ctangle$(EXEEXT) $(libmplib_web)
+	CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) mp.w
+	CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) psout.w
+	CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) svgout.w
+	CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) tfmin.w
+	CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) memio.w
+	echo timestamp >$@
+	touch $(libmplib_c_h)
 $(etex_c_h): etex-web2c
 etex-web2c: etex.p $(web2c_texmf)
 	$(web2c) etex
@@ -7362,6 +8110,8 @@ pdftex.ch: $(TIE) $(pdftex_ch_srcs)
 	$(tie) -c pdftex.ch $(pdftex_ch_srcs)
 
 $(libpdftex_a_OBJECTS): pdftexd.h
+
+$(luatex_OBJECTS): libluatex.a libmplib.a
 $(luatex_c_h): luatex-web2c
 luatex-web2c: luatex.p $(web2c_texmf) luatexdir/luatex.defines
 	$(web2c) luatex
@@ -7383,23 +8133,65 @@ luatexdir/luatex.version: luatexdir/luatex.web
 luatexdir/luatexextra.h: luatexdir/luatexextra.in luatexdir/luatex.version
 	sed -e s/LUATEX-VERSION/`cat luatexdir/luatex.version`/ \
 	  $(srcdir)/luatexdir/luatexextra.in >$@
-luatangle.c luatangle.h: $(web2c_common) $(web2c_programs) luatangle.p
+luatangle.c luatangle.h: luatangle-web2c
+luatangle-web2c: $(web2c_common) $(web2c_programs) luatangle.p
 	$(web2c) luatangle
+	echo timestamp >$@
+	touch luatangle.c luatangle.h
 luatangle.p: tangle$(EXEEXT) $(luatangle_sources)
 	WEBINPUTS=$(srcdir)/luatexdir $(buildenv) $(TANGLE) luatangle luatangle
 
-$(libluatex_a_OBJECTS): $(lua_mp_c_h)
-$(lua_mp_c_h): mp-ctangle
-mp-ctangle: ctangle$(EXEEXT) $(lua_mp_web) luatexd.h
-	$(mkdir_p) luatexdir
-	CWEBINPUTS=$(srcdir)/luatexdir/mp $(ctangle) mp.w
-	CWEBINPUTS=$(srcdir)/luatexdir/mp $(ctangle) psout.w
-	CWEBINPUTS=$(srcdir)/luatexdir/mp $(ctangle) tfmin.w
-	CWEBINPUTS=$(srcdir)/luatexdir/mp $(ctangle) memio.w
-	rm -f $(lua_mp_c_h)
-	mv mp.c mplib.h mpmp.h mppsout.h psout.c mplibps.h memio.c tfmin.c luatexdir
+$(libzzip_a_OBJECTS): liblua51.a
+
+$(libluasocket_a_OBJECTS): libzzip.a 
+
+$(libluamisc_a_OBJECTS): libluasocket.a
+
+$(libff_a_OBJECTS): libluamisc.a
+
+$(libluatex_a_OBJECTS): libff.a $(luatex_c_h)
+
+$(libluatex_a_OBJECTS): libff.a
+
+$(xetex_c_h): xetex-web2c
+xetex-web2c: xetex.p $(web2c_texmf) xetexdir/xetex.defines
+	$(web2c) xetex
+	: $(synctex_convert_xetex)
 	echo timestamp >$@
-	touch $(lua_mp_c_h)
+	touch $(xetex_c_h)
+
+xetex_pool.c: xetex.pool xetexd.h
+	perl $(srcdir)/xetexdir/pool2c.pl $< $@
+
+xetexextra.c: xetexdir/xetexextra.h lib/texmfmp.c xetexd.h
+	sed s/TEX-OR-MF-OR-MP/xetex/ $(srcdir)/lib/texmfmp.c >$@
+
+xetexdir/xetexextra.h: xetexdir/xetexextra.in xetexdir/xetex.version xetexdir/etex.version
+	$(mkdir_p) xetexdir
+	sed -e s/XETEX-VERSION/`cat xetexdir/xetex.version`/ \
+	    -e s/ETEX-VERSION/`cat xetexdir/etex.version`/ \
+	  $(srcdir)/xetexdir/xetexextra.in >$@
+
+xetex.p xetex.pool: xetex-tangle
+xetex-tangle: ./otangle$(EXEEXT) xetex.web
+	$(otangle) xetex
+	echo timestamp >$@
+	touch xetex.p xetex.pool
+
+xetexdir/etex.version: etexdir/etex.ch
+	$(mkdir_p) xetexdir
+	grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
+	  | sed "s/^.*'-//;s/'.*$$//" >$@
+
+xetexdir/xetex.version: xetexdir/xetex.ch
+	$(mkdir_p) xetexdir
+	grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.ch \
+	  | sed "s/^.*'-//;s/'.*$$//" >$@
+
+xetex.web: $(TIE) $(xetex_web_srcs)
+	$(tie) -m xetex.web $(xetex_web_srcs)
+
+$(libxetex_a_OBJECTS): xetexd.h
 odvicopy.c odvicopy.h: odvicopy-web2c
 odvicopy-web2c: $(web2c_common) $(web2c_programs) odvicopy.p
 	$(web2c) odvicopy
diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac
index 73f72cb3825..e024927493b 100644
--- a/Build/source/texk/web2c/ac/web2c.ac
+++ b/Build/source/texk/web2c/ac/web2c.ac
@@ -1,7 +1,10 @@
-## texk/web2c/ac/web2c.ac
+## texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
 ## configure options for TeX and MF
 m4_define_default([kpse_indent_26], [26])[]dnl
-m4_define_default([kpse_indent_28], [28])[]dnl
 AC_ARG_WITH([editor],
             [AS_HELP_STRING([--with-editor=CMD],
                             [invoke CMD from the `e' option @<:@vi +%d %s@:>@])])[]dnl
@@ -28,7 +31,7 @@ m4_define([kpse_tex_progs], [dnl
 [[aleph],  [yes], [no],  [Aleph],  []],
 [[pdftex], [yes], [yes], [pdfTeX], [xpdf libpng obsdcompat]],
 [[luatex], [yes], [no],  [luaTeX], [xpdf libpng obsdcompat]],
-[[xetex],  [no],  [yes], [XeTeX],  [xpdf libpng freetype2]],
+[[xetex],  [yes], [yes], [XeTeX],  [xpdf libpng freetype2 icu teckit graphite]],
 ])[]dnl
 m4_foreach([Kpse_Prog], [kpse_tex_progs],
            [m4_ifset([Kpse_Prog],
@@ -41,7 +44,7 @@ AC_ARG_ENABLE([mf],
 AC_ARG_ENABLE([mf-nowin],
               [AS_HELP_STRING([--enable-mf-nowin],
                               [build a separate non-windows-capable METAFONT],
-                              kpse_indent_28)])[]dnl
+                              kpse_indent_26+2)])[]dnl
 AC_ARG_WITH([mf-x-toolkit],
             [AS_HELP_STRING([--with-mf-x-toolkit],
                             [Use X toolkit for METAFONT])])[]dnl
diff --git a/Build/source/texk/web2c/ac/withenable.ac b/Build/source/texk/web2c/ac/withenable.ac
index be83880a3e5..42d9c3f6e99 100644
--- a/Build/source/texk/web2c/ac/withenable.ac
+++ b/Build/source/texk/web2c/ac/withenable.ac
@@ -1,4 +1,8 @@
-## texk/web2c/ac/withenable.ac
+## texk/web2c/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
 ## configure options and TL libraries required for web2c
 KPSE_WITH_PROG([web2c], [kpathsea zlib], , [TeX & Co.])
 m4_include(kpse_TL[texk/web2c/ac/web2c.ac])
diff --git a/Build/source/texk/web2c/aclocal.m4 b/Build/source/texk/web2c/aclocal.m4
index b74dce3a433..899966a1aa4 100644
--- a/Build/source/texk/web2c/aclocal.m4
+++ b/Build/source/texk/web2c/aclocal.m4
@@ -1018,11 +1018,17 @@ m4_include([../../m4/kpse-asm.m4])
 m4_include([../../m4/kpse-common.m4])
 m4_include([../../m4/kpse-cross.m4])
 m4_include([../../m4/kpse-cxx-hack.m4])
+m4_include([../../m4/kpse-fontconfig-flags.m4])
+m4_include([../../m4/kpse-freetype2-flags.m4])
+m4_include([../../m4/kpse-graphite-flags.m4])
+m4_include([../../m4/kpse-icu-flags.m4])
 m4_include([../../m4/kpse-kpathsea-flags.m4])
 m4_include([../../m4/kpse-lex.m4])
 m4_include([../../m4/kpse-libpng-flags.m4])
+m4_include([../../m4/kpse-macos-framework.m4])
 m4_include([../../m4/kpse-obsdcompat-flags.m4])
 m4_include([../../m4/kpse-socket-libs.m4])
+m4_include([../../m4/kpse-teckit-flags.m4])
 m4_include([../../m4/kpse-web2c.m4])
 m4_include([../../m4/kpse-win32.m4])
 m4_include([../../m4/kpse-xpdf-flags.m4])
diff --git a/Build/source/texk/web2c/c-auto.in b/Build/source/texk/web2c/c-auto.in
index 82438d1d59b..aab36c7aa07 100644
--- a/Build/source/texk/web2c/c-auto.in
+++ b/Build/source/texk/web2c/c-auto.in
@@ -58,6 +58,9 @@
 /* Define to 1 if you have the `bzero' function. */
 #undef HAVE_BZERO
 
+/* Define to 1 if you have the Mac OS X Carbon framework. */
+#undef HAVE_CARBON
+
 /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
    */
 #undef HAVE_DIRENT_H
@@ -92,6 +95,9 @@
 /* Define to 1 if you have the <langinfo.h> header file. */
 #undef HAVE_LANGINFO_H
 
+/* Define if you have libfontconfig. */
+#undef HAVE_LIBFONTCONFIG
+
 /* Define to 1 if you have the `posix' library (-lposix). */
 #undef HAVE_LIBPOSIX
 
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 7ab4b31d77e..3c59d28c423 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -801,6 +801,22 @@ OBSDCOMPAT_RULE
 OBSDCOMPAT_DEPEND
 OBSDCOMPAT_LIBS
 OBSDCOMPAT_INCLUDES
+ICU_RULE
+ICU_DEPEND
+ICU_LIBS
+ICU_INCLUDES
+TECKIT_RULE
+TECKIT_DEPEND
+TECKIT_LIBS
+TECKIT_INCLUDES
+FREETYPE2_RULE
+FREETYPE2_DEPEND
+FREETYPE2_LIBS
+FREETYPE2_INCLUDES
+GRAPHITE_RULE
+GRAPHITE_DEPEND
+GRAPHITE_LIBS
+GRAPHITE_INCLUDES
 XPDF_RULE
 XPDF_DEPEND
 XPDF_LIBS
@@ -869,7 +885,14 @@ TEX_SYNCTEX_FALSE
 TEX_SYNCTEX_TRUE
 TEX_FALSE
 TEX_TRUE
-socketlibs
+XETEX_GRAPHITE_FALSE
+XETEX_GRAPHITE_TRUE
+XETEX_MACOSX_FALSE
+XETEX_MACOSX_TRUE
+FONTCONFIG_LIBS
+FONTCONFIG_INCLUDES
+ipc_socketlibs
+lua_socketlibs
 MINGW32_FALSE
 MINGW32_TRUE
 WIN32_FALSE
@@ -1031,6 +1054,7 @@ enable_tektronixwin
 enable_unitermwin
 enable_mp
 enable_web_progs
+with_fontconfig
 with_x
 with_system_kpathsea
 with_kpathsea_includes
@@ -1041,6 +1065,15 @@ with_zlib_libdir
 with_system_libpng
 with_libpng_includes
 with_libpng_libdir
+with_system_graphite
+with_graphite_includes
+with_graphite_libdir
+with_system_freetype2
+with_freetype2_includes
+with_freetype2_libdir
+with_system_teckit
+with_teckit_includes
+with_teckit_libdir
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1707,22 +1740,22 @@ Optional Features:
   --disable-dump-share    make fmt/base/mem files architecture-dependent
   --enable-fmtutil        use fmtutil for build dumps
   --enable-ipc            enable TeX's --ipc option, i.e., pipe to a program
-  --disable-tex             do not compile and install TeX
-  --enable-etex             compile and install e-TeX
-  --disable-aleph           do not compile and install Aleph
-  --disable-pdftex          do not compile and install pdfTeX
-  --disable-luatex          do not compile and install luaTeX
-  --enable-xetex            compile and install XeTeX
+  --disable-tex           do not compile and install TeX
+  --enable-etex           compile and install e-TeX
+  --disable-aleph         do not compile and install Aleph
+  --disable-pdftex        do not compile and install pdfTeX
+  --disable-luatex        do not compile and install luaTeX
+  --disable-xetex         do not compile and install XeTeX
   --disable-mf            do not build METAFONT
-  --enable-mf-nowin         build a separate non-windows-capable METAFONT
-  --enable-epsfwin          include EPSF pseudo window support
-  --enable-hp2627win        include HP 2627 window support
-  --enable-mftalkwin        include mftalk (generic server) window support
-  --enable-nextwin          include NeXT window support
-  --enable-regiswin         include Regis window support
-  --enable-suntoolswin      include old Suntools (not X) window support
-  --enable-tektronixwin     include Tektronix window support
-  --enable-unitermwin       include Uniterm window support
+  --enable-mf-nowin       build a separate non-windows-capable METAFONT
+  --enable-epsfwin        include EPSF pseudo window support
+  --enable-hp2627win      include HP 2627 window support
+  --enable-mftalkwin      include mftalk (generic server) window support
+  --enable-nextwin        include NeXT window support
+  --enable-regiswin       include Regis window support
+  --enable-suntoolswin    include old Suntools (not X) window support
+  --enable-tektronixwin   include Tektronix window support
+  --enable-unitermwin     include Uniterm window support
   --disable-mp            do not build METAPOST
   --disable-web-progs     do not build WEB programs bibtex ... weave
 
@@ -1734,6 +1767,7 @@ Optional Packages:
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-editor=CMD       invoke CMD from the `e' option [vi +%d %s]
   --with-mf-x-toolkit     Use X toolkit for METAFONT
+  --with-fontconfig=DIR   use fontconfig include/library files from DIR
   --with-x                use the X Window System
   --with-system-kpathsea  use installed kpathsea headers and library
   --with-kpathsea-includes=DIR
@@ -1749,6 +1783,21 @@ Optional Packages:
                           libpng headers installed in DIR
   --with-libpng-libdir=DIR
                           libpng library installed in DIR
+  --with-system-graphite  use installed graphite headers and library
+  --with-graphite-includes=DIR
+                          graphite headers installed in DIR
+  --with-graphite-libdir=DIR
+                          graphite library installed in DIR
+  --with-system-freetype2 use installed freetype2 headers and library
+  --with-freetype2-includes=DIR
+                          freetype2 headers installed in DIR
+  --with-freetype2-libdir=DIR
+                          freetype2 library installed in DIR
+  --with-system-teckit    use installed teckit headers and library
+  --with-teckit-includes=DIR
+                          teckit headers installed in DIR
+  --with-teckit-libdir=DIR
+                          teckit library installed in DIR
 
 Some influential environment variables:
   CC          C compiler command
@@ -4357,13 +4406,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4360: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4409: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4363: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4412: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4366: output\"" >&5)
+  (eval echo "\"\$as_me:4415: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5569,7 +5618,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5572 "configure"' > conftest.$ac_ext
+  echo '#line 5621 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7616,11 +7665,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7619: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7668: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7623: \$? = $ac_status" >&5
+   echo "$as_me:7672: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7955,11 +8004,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7958: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8007: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7962: \$? = $ac_status" >&5
+   echo "$as_me:8011: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8060,11 +8109,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8063: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8112: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8067: \$? = $ac_status" >&5
+   echo "$as_me:8116: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8115,11 +8164,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8118: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8167: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8122: \$? = $ac_status" >&5
+   echo "$as_me:8171: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10915,7 +10964,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10918 "configure"
+#line 10967 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11011,7 +11060,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11014 "configure"
+#line 11063 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16027,11 +16076,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16030: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16079: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16034: \$? = $ac_status" >&5
+   echo "$as_me:16083: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16126,11 +16175,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16129: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16178: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16133: \$? = $ac_status" >&5
+   echo "$as_me:16182: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16178,11 +16227,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16181: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16230: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16185: \$? = $ac_status" >&5
+   echo "$as_me:16234: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17149,7 +17198,6 @@ if test "${enable_cxx_runtime_hack+set}" = set; then
 fi
 
 
-cpp_link_hack=false
 if test "x$GXX:$enable_cxx_runtime_hack" = xyes:yes; then
 
 ac_ext=cpp
@@ -17404,7 +17452,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 fi
-if test "x$kpse_cv_cxx_flags" = xok; then
+if test "x$kpse_cv_cxx_hack" = xok; then
   CXXLD='$(top_builddir)/CXXLD.sh'
   CXX_HACK_DEPS=$CXXLD
   CXX_HACK_LIBS=$kpse_cv_cxx_flags
@@ -17424,7 +17472,7 @@ fi
 
 
 
-## texk/web2c/ac/web2c.ac
+## texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
 ## configure options for TeX and MF
 
 # Check whether --with-editor was given.
@@ -17481,7 +17529,7 @@ case $enable_pdftex in
   *) enable_pdftex=yes ;;
 esac
 
-test "x$enable_pdftex" = xno || {
+test "x$enable_web2c:$enable_pdftex" = xyes:yes && {
   need_xpdf=yes
   need_libpng=yes
   need_obsdcompat=yes
@@ -17495,7 +17543,7 @@ case $enable_luatex in
   *) enable_luatex=yes ;;
 esac
 
-test "x$enable_luatex" = xno || {
+test "x$enable_web2c:$enable_luatex" = xyes:yes && {
   need_xpdf=yes
   need_libpng=yes
   need_obsdcompat=yes
@@ -17506,13 +17554,16 @@ if test "${enable_xetex+set}" = set; then
 fi
 case $enable_xetex in
   yes|no) : ;;
-  *) enable_xetex=no ;;
+  *) enable_xetex=yes ;;
 esac
 
-test "x$enable_xetex" = xno || {
+test "x$enable_web2c:$enable_xetex" = xyes:yes && {
   need_xpdf=yes
   need_libpng=yes
   need_freetype2=yes
+  need_icu=yes
+  need_teckit=yes
+  need_graphite=yes
 }
 ## configure options for MF
 # Check whether --enable-mf was given.
@@ -17961,17 +18012,19 @@ fi
 fi
 
 
-if test "x$enable_ipc:$enable_luatex" != xno:no; then
+if test "x$enable_luatex:$enable_ipc" != xno:no; then
   case $ac_cv_search_connect in
   "none required") : ;;
   no) if test "x$enable_luatex" = xyes; then
-  { { $as_echo "$as_me:$LINENO: error: Sorry, no socket library: can not build luaTeX" >&5
-$as_echo "$as_me: error: Sorry, no socket library: can not build luaTeX" >&2;}
-   { (exit 1); exit 1; }; }
-else
+  { $as_echo "$as_me:$LINENO: WARNING: Sorry, no socket library: can not build luaTeX" >&5
+$as_echo "$as_me: WARNING: Sorry, no socket library: can not build luaTeX" >&2;}
+                             enable_luatex=no
+fi
+
+                      if test "x$enable_ipc" = xyes; then
   { $as_echo "$as_me:$LINENO: WARNING: no socket library: disabling ipc" >&5
 $as_echo "$as_me: WARNING: no socket library: disabling ipc" >&2;}
-                                          enable_ipc=no
+                             enable_ipc=no
 fi
  ;;
   *) socketlibs="-l$ac_cv_search_connect" ;;
@@ -17979,7 +18032,12 @@ esac
 
 fi
 
+if test "x$enable_luatex" = xyes; then
+  lua_socketlibs=$socketlibs
+fi
+
 if test "x$enable_ipc" = xyes; then
+  ipc_socketlibs=$socketlibs
 
 cat >>confdefs.h <<\_ACEOF
 #define IPC 1
@@ -17989,6 +18047,176 @@ fi
 
 
 
+
+{ $as_echo "$as_me:$LINENO: checking for Mac OS X Carbon framework" >&5
+$as_echo_n "checking for Mac OS X Carbon framework... " >&6; }
+if test "${kpse_cv_have_Carbon+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <Carbon/Carbon.h>
+int
+main ()
+{
+ATSUStyle style
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  kpse_cv_have_Carbon=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	kpse_cv_have_Carbon=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $kpse_cv_have_Carbon" >&5
+$as_echo "$kpse_cv_have_Carbon" >&6; }
+if test "x$kpse_cv_have_Carbon" = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_CARBON 1
+_ACEOF
+
+fi
+
+if test "x$kpse_cv_have_Carbon" = xno; then
+
+# Check whether --with-fontconfig was given.
+if test "${with_fontconfig+set}" = set; then
+  withval=$with_fontconfig;
+fi
+{ $as_echo "$as_me:$LINENO: checking for installed fontconfig headers and library" >&5
+$as_echo_n "checking for installed fontconfig headers and library... " >&6; }
+if test "${kpse_cv_have_fontconfig+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  kpse_save_CPPFLAGS=$CPPFLAGS
+kpse_save_LIBS=$LIBS
+if test "x$with_fontconfig" != x && test -d "$with_fontconfig"; then
+  kpse_cv_fontconfig_includes="-I$with_fontconfig/include"
+  kpse_cv_fontconfig_libs="-L$with_fontconfig/lib -lfontconfig"
+else
+  kpse_cv_fontconfig_includes=
+  kpse_cv_fontconfig_libs='-lfontconfig'
+fi
+CPPFLAGS="$with_fontconfig $CPPFLAGS"
+LIBS="$kpse_cv_fontconfig_libs $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <fontconfig/fontconfig.h>
+int
+main ()
+{
+FcObjectSet *os; FcInit();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  kpse_cv_have_fontconfig=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	kpse_cv_have_fontconfig=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+CPPFLAGS=$kpse_save_CPPFLAGS
+LIBS=$kpse_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $kpse_cv_have_fontconfig" >&5
+$as_echo "$kpse_cv_have_fontconfig" >&6; }
+if test "x$kpse_cv_have_fontconfig" = xyes; then
+  FONTCONFIG_INCLUDES=$kpse_cv_fontconfig_includes
+  FONTCONFIG_LIBS=$kpse_cv_fontconfig_libs
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBFONTCONFIG 1
+_ACEOF
+
+fi
+
+
+
+       if test "x$enable_xetex:$kpse_cv_have_fontconfig" = xyes:no; then
+  { $as_echo "$as_me:$LINENO: WARNING: Sorry, can not build XeTeX without fontconfig" >&5
+$as_echo "$as_me: WARNING: Sorry, can not build XeTeX without fontconfig" >&2;}
+              enable_xetex=no
+fi
+
+fi
+
+ if test "x$kpse_cv_have_Carbon" = xyes; then
+  XETEX_MACOSX_TRUE=
+  XETEX_MACOSX_FALSE='#'
+else
+  XETEX_MACOSX_TRUE='#'
+  XETEX_MACOSX_FALSE=
+fi
+
+ if test "x$with_graphite" != xno; then
+  XETEX_GRAPHITE_TRUE=
+  XETEX_GRAPHITE_FALSE='#'
+else
+  XETEX_GRAPHITE_TRUE='#'
+  XETEX_GRAPHITE_FALSE=
+fi
+
+
  if test "x$enable_tex" = xyes; then
   TEX_TRUE=
   TEX_FALSE='#'
@@ -23244,6 +23472,133 @@ $(XPDF_DEPEND): ${top_builddir}/../../libs/xpdf/xpdf/Stream.h
 ${top_builddir}/../../libs/xpdf/xpdf/Stream.h:
 	cd ${top_builddir}/../../libs/xpdf && $(MAKE) $(AM_MAKEFLAGS)'
 
+## _KPSE_LIB_FLAGS: Setup graphite (-lgraphite) flags
+
+# Check whether --with-system-graphite was given.
+if test "${with_system_graphite+set}" = set; then
+  withval=$with_system_graphite;
+fi
+
+# Check whether --with-graphite-includes was given.
+if test "${with_graphite_includes+set}" = set; then
+  withval=$with_graphite_includes;
+fi
+
+# Check whether --with-graphite-libdir was given.
+if test "${with_graphite_libdir+set}" = set; then
+  withval=$with_graphite_libdir;
+fi
+if test "x$with_system_graphite" = xyes; then
+  if test "x$with_graphite_includes" != x && test "x$with_graphite_includes" != xyes; then
+  GRAPHITE_INCLUDES="-I$with_graphite_includes"
+fi
+GRAPHITE_LIBS="-lgraphite"
+if test "x$with_graphite_libdir" != x && test "x$with_graphite_libdir" != xyes; then
+  GRAPHITE_LIBS="-L$with_graphite_libdir $GRAPHITE_LIBS"
+fi
+else
+  GRAPHITE_INCLUDES=`echo '-ISRC/libs/graphite/include' | sed \
+    -e "s,SRC/,$kpse_SRC/,g" \
+    -e "s,BLD/,$kpse_BLD/,g"`
+  GRAPHITE_LIBS=`echo 'BLD/libs/graphite/libgraphite.a' | sed \
+    -e "s,BLD/,$kpse_BLD/,g"`
+  GRAPHITE_DEPEND=`echo 'BLD/libs/graphite/libgraphite.a' | sed \
+    -e 's,BLD/,${top_builddir}/../../,g'`
+   GRAPHITE_RULE='# Rebuild libgraphite
+$(GRAPHITE_DEPEND):
+	cd ${top_builddir}/../../libs/graphite && $(MAKE) $(AM_MAKEFLAGS)'
+fi
+
+## _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags
+
+# Check whether --with-system-freetype2 was given.
+if test "${with_system_freetype2+set}" = set; then
+  withval=$with_system_freetype2;
+fi
+
+# Check whether --with-freetype2-includes was given.
+if test "${with_freetype2_includes+set}" = set; then
+  withval=$with_freetype2_includes;
+fi
+
+# Check whether --with-freetype2-libdir was given.
+if test "${with_freetype2_libdir+set}" = set; then
+  withval=$with_freetype2_libdir;
+fi
+if test "x$with_system_freetype2" = xyes; then
+  if test "x$with_freetype2_includes" != x && test "x$with_freetype2_includes" != xyes; then
+  FREETYPE2_INCLUDES="-I$with_freetype2_includes/freetype2 -I$with_freetype2_includes"
+fi
+FREETYPE2_LIBS="-lfreetype"
+if test "x$with_freetype2_libdir" != x && test "x$with_freetype2_libdir" != xyes; then
+  FREETYPE2_LIBS="-L$with_freetype2_libdir $FREETYPE2_LIBS"
+fi
+else
+  FREETYPE2_INCLUDES=`echo '-IBLD/libs/freetype2/freetype2 -IBLD/libs/freetype2' | sed \
+    -e "s,SRC/,$kpse_SRC/,g" \
+    -e "s,BLD/,$kpse_BLD/,g"`
+  FREETYPE2_LIBS=`echo 'BLD/libs/freetype2/libfreetype.a' | sed \
+    -e "s,BLD/,$kpse_BLD/,g"`
+  FREETYPE2_DEPEND=`echo 'BLD/libs/freetype2/libfreetype.a' | sed \
+    -e 's,BLD/,${top_builddir}/../../,g'`
+   FREETYPE2_RULE='# Rebuild libfreetype
+$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h
+	cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS)
+${top_builddir}/../../libs/freetype2/ft2build.h:
+	cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS)'
+fi
+
+## _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags
+
+# Check whether --with-system-teckit was given.
+if test "${with_system_teckit+set}" = set; then
+  withval=$with_system_teckit;
+fi
+
+# Check whether --with-teckit-includes was given.
+if test "${with_teckit_includes+set}" = set; then
+  withval=$with_teckit_includes;
+fi
+
+# Check whether --with-teckit-libdir was given.
+if test "${with_teckit_libdir+set}" = set; then
+  withval=$with_teckit_libdir;
+fi
+if test "x$with_system_teckit" = xyes; then
+  if test "x$with_teckit_includes" != x && test "x$with_teckit_includes" != xyes; then
+  TECKIT_INCLUDES="-I$with_teckit_includes"
+fi
+TECKIT_LIBS="-lTECkit"
+if test "x$with_teckit_libdir" != x && test "x$with_teckit_libdir" != xyes; then
+  TECKIT_LIBS="-L$with_teckit_libdir $TECKIT_LIBS"
+fi
+else
+  TECKIT_INCLUDES=`echo '-ISRC/libs/teckit/source/Public-headers' | sed \
+    -e "s,SRC/,$kpse_SRC/,g" \
+    -e "s,BLD/,$kpse_BLD/,g"`
+  TECKIT_LIBS=`echo 'BLD/libs/teckit/libTECkit.a' | sed \
+    -e "s,BLD/,$kpse_BLD/,g"`
+  TECKIT_DEPEND=`echo 'BLD/libs/teckit/libTECkit.a' | sed \
+    -e 's,BLD/,${top_builddir}/../../,g'`
+   TECKIT_RULE='# Rebuild libTECkit
+$(TECKIT_DEPEND):
+	cd ${top_builddir}/../../libs/teckit && $(MAKE) $(AM_MAKEFLAGS)'
+fi
+
+## _KPSE_LIB_FLAGS: Setup icu (-lsicuxxx) flags
+  ICU_INCLUDES=`echo '-IBLD/libs/icu/icu-build/common -ISRC/libs/icu/icu-xetex/common -ISRC/libs/icu/icu-xetex/layout' | sed \
+    -e "s,SRC/,$kpse_SRC/,g" \
+    -e "s,BLD/,$kpse_BLD/,g"`
+  ICU_LIBS=`echo 'BLD/libs/icu/icu-build/lib/libsicuuc.a BLD/libs/icu/icu-build/lib/libsicule.a BLD/libs/icu/icu-build/lib/libsicudata.a' | sed \
+    -e "s,BLD/,$kpse_BLD/,g"`
+  ICU_DEPEND=`echo 'BLD/libs/icu/icu-build/lib/libsicuuc.a BLD/libs/icu/icu-build/lib/libsicule.a BLD/libs/icu/icu-build/lib/libsicudata.a' | sed \
+    -e 's,BLD/,${top_builddir}/../../,g'`
+   ICU_RULE='# Rebuild libsicuxxx
+$(ICU_DEPEND): ${top_builddir}/../../libs/icu/icu-build/common/unicode/platform.h
+	cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS)
+${top_builddir}/../../libs/icu/icu-build/common/unicode/platform.h:
+	cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS)'
+
 ## _KPSE_LIB_FLAGS: Setup obsdcompat (-lopenbsd-compat) flags
   OBSDCOMPAT_INCLUDES=`echo '-IBLD/libs/obsdcompat -ISRC/libs/obsdcompat' | sed \
     -e "s,SRC/,$kpse_SRC/,g" \
@@ -23864,6 +24219,20 @@ $as_echo "$as_me: error: conditional \"MINGW32\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${XETEX_MACOSX_TRUE}" && test -z "${XETEX_MACOSX_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"XETEX_MACOSX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"XETEX_MACOSX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${XETEX_GRAPHITE_TRUE}" && test -z "${XETEX_GRAPHITE_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"XETEX_GRAPHITE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"XETEX_GRAPHITE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${TEX_TRUE}" && test -z "${TEX_FALSE}"; then
   { { $as_echo "$as_me:$LINENO: error: conditional \"TEX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index f75959c1839..29f1e28b273 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -66,17 +66,32 @@ AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno])
 AM_CONDITIONAL([MINGW32], [test "x$kpse_cv_have_win32" = xmingw32])
 
 KPSE_CHECK_SOCKET_LIBS
-AS_IF([test "x$enable_ipc:$enable_luatex" != xno:no],
+AS_IF([test "x$enable_luatex:$enable_ipc" != xno:no],
       [AS_CASE([$ac_cv_search_connect],
                ["none required"], [],
                [no], [AS_IF([test "x$enable_luatex" = xyes],
-                            [AC_MSG_ERROR([Sorry, no socket library: can not build luaTeX])],
+                            [AC_MSG_WARN([Sorry, no socket library: can not build luaTeX])
+                             enable_luatex=no])
+                      AS_IF([test "x$enable_ipc" = xyes],
                             [AC_MSG_WARN([no socket library: disabling ipc])
-                                          enable_ipc=no])],
+                             enable_ipc=no])],
                [socketlibs="-l$ac_cv_search_connect"])])
+AS_IF([test "x$enable_luatex" = xyes],
+      [lua_socketlibs=$socketlibs])
 AS_IF([test "x$enable_ipc" = xyes],
-      [AC_DEFINE([IPC], 1, [tex: Define to enable --ipc.])])
-AC_SUBST([socketlibs])
+      [ipc_socketlibs=$socketlibs
+       AC_DEFINE([IPC], 1, [tex: Define to enable --ipc.])])
+AC_SUBST([lua_socketlibs])
+AC_SUBST([ipc_socketlibs])
+
+KPSE_CHECK_FRAMEWORK([Carbon], [ATSUStyle style])
+AS_IF([test "x$kpse_cv_have_Carbon" = xno],
+      [KPSE_FONTCONFIG_FLAGS
+       AS_IF([test "x$enable_xetex:$kpse_cv_have_fontconfig" = xyes:no],
+             [AC_MSG_WARN([Sorry, can not build XeTeX without fontconfig])
+              enable_xetex=no])])
+AM_CONDITIONAL([XETEX_MACOSX], [test "x$kpse_cv_have_Carbon" = xyes])
+AM_CONDITIONAL([XETEX_GRAPHITE], [test "x$with_graphite" != xno])
 
 dnl Generate *TEX and ALEPH conditionals.
 m4_foreach([Kpse_Prog], [kpse_tex_progs],
@@ -190,6 +205,10 @@ KPSE_KPATHSEA_FLAGS
 KPSE_ZLIB_FLAGS
 KPSE_LIBPNG_FLAGS
 KPSE_XPDF_FLAGS
+KPSE_GRAPHITE_FLAGS
+KPSE_FREETYPE2_FLAGS
+KPSE_TECKIT_FLAGS
+KPSE_ICU_FLAGS
 KPSE_OBSDCOMPAT_FLAGS
 
 dnl Write output here, instead of putting a zillion -D's on the command line.
diff --git a/Build/source/texk/web2c/doc/Makefile.in b/Build/source/texk/web2c/doc/Makefile.in
index 85153e6041f..d8c78308f50 100644
--- a/Build/source/texk/web2c/doc/Makefile.in
+++ b/Build/source/texk/web2c/doc/Makefile.in
@@ -39,11 +39,17 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-cross.m4 \
 	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
+	$(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-graphite-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-icu-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-lex.m4 \
 	$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-macos-framework.m4 \
 	$(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-socket-libs.m4 \
+	$(top_srcdir)/../../m4/kpse-teckit-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-web2c.m4 \
 	$(top_srcdir)/../../m4/kpse-win32.m4 \
 	$(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \
@@ -114,7 +120,18 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FONTCONFIG_INCLUDES = @FONTCONFIG_INCLUDES@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
+FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
+FREETYPE2_LIBS = @FREETYPE2_LIBS@
+GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
+GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
+GRAPHITE_LIBS = @GRAPHITE_LIBS@
 GREP = @GREP@
+ICU_DEPEND = @ICU_DEPEND@
+ICU_INCLUDES = @ICU_INCLUDES@
+ICU_LIBS = @ICU_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -166,6 +183,9 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 TANGLE = @TANGLE@
 TANGLEBOOT = @TANGLEBOOT@
+TECKIT_DEPEND = @TECKIT_DEPEND@
+TECKIT_INCLUDES = @TECKIT_INCLUDES@
+TECKIT_LIBS = @TECKIT_LIBS@
 TIE = @TIE@
 VERSION = @VERSION@
 WEB2CVERSION = @WEB2CVERSION@
@@ -215,11 +235,13 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+ipc_socketlibs = @ipc_socketlibs@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 lt_ECHO = @lt_ECHO@
+lua_socketlibs = @lua_socketlibs@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -229,7 +251,6 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-socketlibs = @socketlibs@
 srcdir = @srcdir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in
index b33937ddb54..16bdcf1cdd6 100644
--- a/Build/source/texk/web2c/lib/Makefile.in
+++ b/Build/source/texk/web2c/lib/Makefile.in
@@ -40,11 +40,17 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-cross.m4 \
 	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
+	$(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-graphite-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-icu-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-lex.m4 \
 	$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-macos-framework.m4 \
 	$(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-socket-libs.m4 \
+	$(top_srcdir)/../../m4/kpse-teckit-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-web2c.m4 \
 	$(top_srcdir)/../../m4/kpse-win32.m4 \
 	$(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \
@@ -119,7 +125,18 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FONTCONFIG_INCLUDES = @FONTCONFIG_INCLUDES@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
+FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
+FREETYPE2_LIBS = @FREETYPE2_LIBS@
+GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
+GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
+GRAPHITE_LIBS = @GRAPHITE_LIBS@
 GREP = @GREP@
+ICU_DEPEND = @ICU_DEPEND@
+ICU_INCLUDES = @ICU_INCLUDES@
+ICU_LIBS = @ICU_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -171,6 +188,9 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 TANGLE = @TANGLE@
 TANGLEBOOT = @TANGLEBOOT@
+TECKIT_DEPEND = @TECKIT_DEPEND@
+TECKIT_INCLUDES = @TECKIT_INCLUDES@
+TECKIT_LIBS = @TECKIT_LIBS@
 TIE = @TIE@
 VERSION = @VERSION@
 WEB2CVERSION = @WEB2CVERSION@
@@ -220,11 +240,13 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+ipc_socketlibs = @ipc_socketlibs@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 lt_ECHO = @lt_ECHO@
+lua_socketlibs = @lua_socketlibs@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -234,7 +256,6 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-socketlibs = @socketlibs@
 srcdir = @srcdir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
diff --git a/Build/source/texk/web2c/luatexdir/am/liblua51.am b/Build/source/texk/web2c/luatexdir/am/liblua51.am
new file mode 100644
index 00000000000..3af4f056f97
--- /dev/null
+++ b/Build/source/texk/web2c/luatexdir/am/liblua51.am
@@ -0,0 +1,75 @@
+## texk/web2c/luatexdir/am/liblua51.am: Makefile fragment for liblua51.
+
+## liblua51
+##
+EXTRA_LIBRARIES += liblua51.a
+
+liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51
+if !MINGW32
+liblua51_a_CPPFLAGS += -DLUA_USE_POSIX
+endif !MINGW32
+
+liblua51_a_SOURCES = \
+	luatexdir/lua51/lapi.c \
+	luatexdir/lua51/lapi.h \
+	luatexdir/lua51/lauxlib.c \
+	luatexdir/lua51/lauxlib.h \
+	luatexdir/lua51/lbaselib.c \
+	luatexdir/lua51/lcoco.c \
+	luatexdir/lua51/lcoco.h \
+	luatexdir/lua51/lcode.c \
+	luatexdir/lua51/lcode.h \
+	luatexdir/lua51/ldblib.c \
+	luatexdir/lua51/ldebug.c \
+	luatexdir/lua51/ldebug.h \
+	luatexdir/lua51/ldo.c \
+	luatexdir/lua51/ldo.h \
+	luatexdir/lua51/ldump.c \
+	luatexdir/lua51/lfunc.c \
+	luatexdir/lua51/lfunc.h \
+	luatexdir/lua51/lgc.c \
+	luatexdir/lua51/lgc.h \
+	luatexdir/lua51/linit.c \
+	luatexdir/lua51/llex.c \
+	luatexdir/lua51/llex.h \
+	luatexdir/lua51/llimits.h \
+	luatexdir/lua51/lmathlib.c \
+	luatexdir/lua51/lmem.c \
+	luatexdir/lua51/lmem.h \
+	luatexdir/lua51/loadlib.c \
+	luatexdir/lua51/lobject.c \
+	luatexdir/lua51/lobject.h \
+	luatexdir/lua51/lopcodes.c \
+	luatexdir/lua51/lopcodes.h \
+	luatexdir/lua51/loslib.c \
+	luatexdir/lua51/lparser.c \
+	luatexdir/lua51/lparser.h \
+	luatexdir/lua51/lstate.c \
+	luatexdir/lua51/lstate.h \
+	luatexdir/lua51/lstring.c \
+	luatexdir/lua51/lstring.h \
+	luatexdir/lua51/lstrlib.c \
+	luatexdir/lua51/ltable.c \
+	luatexdir/lua51/ltable.h \
+	luatexdir/lua51/ltablib.c \
+	luatexdir/lua51/ltm.c \
+	luatexdir/lua51/ltm.h \
+	luatexdir/lua51/lua.h \
+	luatexdir/lua51/luaconf.h \
+	luatexdir/lua51/lualib.h \
+	luatexdir/lua51/lundump.c \
+	luatexdir/lua51/lundump.h \
+	luatexdir/lua51/lvm.c \
+	luatexdir/lua51/lvm.h \
+	luatexdir/lua51/lzio.c \
+	luatexdir/lua51/lzio.h
+
+## Not used
+##
+EXTRA_DIST += \
+	luatexdir/lua51/Makefile \
+	luatexdir/lua51/liolib.c \
+	luatexdir/lua51/lua.c \
+	luatexdir/lua51/luac.c \
+	luatexdir/lua51/print.c
+
diff --git a/Build/source/texk/web2c/luatexdir/am/libluatex.am b/Build/source/texk/web2c/luatexdir/am/libluatex.am
new file mode 100644
index 00000000000..c5a85a8483c
--- /dev/null
+++ b/Build/source/texk/web2c/luatexdir/am/libluatex.am
@@ -0,0 +1,135 @@
+## texk/web2c/luatexdir/am/libluatex.am: Makefile fragment for libluatex.
+
+## libluatex
+##
+EXTRA_LIBRARIES += libluatex.a
+
+libluatex_a_DEPENDENCIES = libff.a
+
+$(libluatex_a_OBJECTS): libff.a $(luatex_c_h)
+
+libluatex_a_CPPFLAGS = $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES)
+libluatex_a_CPPFLAGS += $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5
+libluatex_a_CPPFLAGS += -Iluatexdir -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51
+libluatex_a_CPPFLAGS += -DpdfTeX
+
+libluatex_a_SOURCES = \
+	luatexdir/commands.h \
+	luatexdir/font/dofont.c \
+	luatexdir/font/luatexfont.h \
+	luatexdir/font/luafont.c \
+	luatexdir/font/mapfile.c \
+	luatexdir/font/mapfile.h \
+	luatexdir/font/pkin.c \
+	luatexdir/font/sfnt.c \
+	luatexdir/font/sfnt.h \
+	luatexdir/font/subfont.c \
+	luatexdir/font/texfont.c \
+	luatexdir/font/texfont.h \
+	luatexdir/font/tfmofm.c \
+	luatexdir/font/tounicode.c \
+	luatexdir/font/tt_glyf.c \
+	luatexdir/font/tt_glyf.h \
+	luatexdir/font/tt_table.c \
+	luatexdir/font/tt_table.h \
+	luatexdir/font/vfovf.c \
+	luatexdir/font/vfpacket.c \
+	luatexdir/font/writecff.c \
+	luatexdir/font/writecff.h \
+	luatexdir/font/writeenc.c \
+	luatexdir/font/writefont.c \
+	luatexdir/font/writet1.c \
+	luatexdir/font/writet3.c \
+	luatexdir/font/writettf.c \
+	luatexdir/font/writettf.h \
+	luatexdir/font/writetype0.c \
+	luatexdir/font/writetype2.c \
+	luatexdir/get_svnversion.sh \
+	luatexdir/hyphen.h \
+	luatexdir/image/epdf.c \
+	luatexdir/image/epdf.h \
+	luatexdir/image/image.h \
+	luatexdir/image/pdftoepdf.cc \
+	luatexdir/image/writeimg.c \
+	luatexdir/image/writejbig2.c \
+	luatexdir/image/writejbig2.h \
+	luatexdir/image/writejpg.c \
+	luatexdir/image/writepng.c \
+	luatexdir/lang/hnjalloc.c \
+	luatexdir/lang/hnjalloc.h \
+	luatexdir/lang/hyphen.c \
+	luatexdir/lang/texlang.c \
+	luatexdir/lua/lcallbacklib.c \
+	luatexdir/lua/lfontlib.c \
+	luatexdir/lua/limglib.c \
+	luatexdir/lua/lkpselib.c \
+	luatexdir/lua/llanglib.c \
+	luatexdir/lua/llualib.c \
+	luatexdir/lua/lnodelib.c \
+	luatexdir/lua/loslibext.c \
+	luatexdir/lua/liolib.c \
+	luatexdir/lua/lpdflib.c \
+	luatexdir/lua/lstatslib.c \
+	luatexdir/lua/ltexiolib.c \
+	luatexdir/lua/ltexlib.c \
+	luatexdir/lua/ltokenlib.c \
+	luatexdir/lua/luainit.c \
+	luatexdir/lua/luanode.c \
+	luatexdir/lua/luastuff.c \
+	luatexdir/lua/luatex.c \
+	luatexdir/lua/luatoken.c \
+	luatexdir/lua/texluac.c \
+	luatexdir/luatex-api.h \
+	luatexdir/luatex.h \
+	luatexdir/makecpool.c \
+	luatexdir/managed-sa.c \
+	luatexdir/managed-sa.h \
+	luatexdir/mathcodes.c \
+	luatexdir/nodes.h \
+	luatexdir/pdf/pagetree.c \
+	luatexdir/pdf/pagetree.h \
+	luatexdir/pdf/pdfpage.c \
+	luatexdir/pdf/pdfpage.h \
+	luatexdir/primitive.h \
+	luatexdir/ptexmac.h \
+	luatexdir/tex/filename.c \
+	luatexdir/tex/linebreak.c \
+	luatexdir/tex/math.c \
+	luatexdir/tex/mlist.c \
+	luatexdir/tex/postlinebreak.c \
+	luatexdir/tex/primitive.c \
+	luatexdir/tex/texdeffont.c \
+	luatexdir/tex/texnodes.c \
+	luatexdir/tex/texpdf.c \
+	luatexdir/tex/textoken.c \
+	luatexdir/texmath.h \
+	luatexdir/textcodes.c \
+	luatexdir/tokens.h \
+	luatexdir/utils/avl.c \
+	luatexdir/utils/avl.h \
+	luatexdir/utils/avlstuff.c \
+	luatexdir/utils/avlstuff.h \
+	luatexdir/utils/synctex.h \
+	luatexdir/utils/synctex.c \
+	luatexdir/utils/utils.c \
+	luatexdir/utils/writezip.c \
+	mplibdir/lmplib.c
+
+## included by luatexdir/font/writettf.c
+EXTRA_libluatex_a_SOURCES = luatexdir/font/macnames.c
+
+$(libluatex_a_OBJECTS): libff.a
+
+EXTRA_DIST += \
+	luatexdir/ChangeLog \
+	luatexdir/NEWS \
+	luatexdir/README \
+	luatexdir/change-files.txt \
+	luatexdir/font/subfont.txt
+
+## Eventually delete these files
+##
+EXTRA_DIST += \
+	luatexdir/Makefile.in \
+	luatexdir/luatex.mk \
+	luatexdir/luatexlib.mk
diff --git a/Build/source/texk/web2c/luatexdir/am/libzzip.am b/Build/source/texk/web2c/luatexdir/am/libzzip.am
new file mode 100644
index 00000000000..89389901e79
--- /dev/null
+++ b/Build/source/texk/web2c/luatexdir/am/libzzip.am
@@ -0,0 +1,83 @@
+## texk/web2c/luatexdir/am/libzzip.am: Makefile fragment for libzzip.
+
+## zziplib
+##
+EXTRA_LIBRARIES += libzzip.a
+
+libzzip_a_DEPENDENCIES = liblua51.a
+
+$(libzzip_a_OBJECTS): liblua51.a
+
+libzzip_a_CPPFLAGS = \
+	$(ZLIB_INCLUDES) \
+	-I$(top_srcdir)/luatexdir/zziplib
+
+libzzip_a_SOURCES = \
+	luatexdir/zziplib/zzip/__debug.h \
+	luatexdir/zziplib/zzip/__dirent.h \
+	luatexdir/zziplib/zzip/__fnmatch.h \
+	luatexdir/zziplib/zzip/__hints.h \
+	luatexdir/zziplib/zzip/__mmap.h \
+	luatexdir/zziplib/zzip/_config.h \
+	luatexdir/zziplib/zzip/conf.h \
+	luatexdir/zziplib/zzip/dir.c \
+	luatexdir/zziplib/zzip/err.c \
+	luatexdir/zziplib/zzip/fetch.c \
+	luatexdir/zziplib/zzip/fetch.h \
+	luatexdir/zziplib/zzip/file.c \
+	luatexdir/zziplib/zzip/file.h \
+	luatexdir/zziplib/zzip/format.h \
+	luatexdir/zziplib/zzip/info.c \
+	luatexdir/zziplib/zzip/info.h \
+	luatexdir/zziplib/zzip/lib.h \
+	luatexdir/zziplib/zzip/memdisk.c \
+	luatexdir/zziplib/zzip/memdisk.h \
+	luatexdir/zziplib/zzip/mmapped.c \
+	luatexdir/zziplib/zzip/mmapped.h \
+	luatexdir/zziplib/zzip/plugin.c \
+	luatexdir/zziplib/zzip/plugin.h \
+	luatexdir/zziplib/zzip/stdint.h \
+	luatexdir/zziplib/zzip/stat.c \
+	luatexdir/zziplib/zzip/types.h \
+	luatexdir/zziplib/zzip/write.c \
+	luatexdir/zziplib/zzip/zip.c \
+	luatexdir/zziplib/zzip/zzip.h
+
+EXTRA_DIST += \
+	luatexdir/zziplib/COPYING.LIB \
+	luatexdir/zziplib/ChangeLog \
+	luatexdir/zziplib/README \
+	luatexdir/zziplib/TODO \
+	luatexdir/zziplib/zziplib.spec
+
+## Not used
+##
+EXTRA_DIST += \
+	luatexdir/zziplib/Makefile.am \
+	luatexdir/zziplib/Makefile.in \
+	luatexdir/zziplib/Makefile.mk \
+	luatexdir/zziplib/SDL \
+	luatexdir/zziplib/aclocal.m4 \
+	luatexdir/zziplib/bins \
+	luatexdir/zziplib/config.h.in \
+	luatexdir/zziplib/configure \
+	luatexdir/zziplib/configure.ac \
+	luatexdir/zziplib/docs \
+	luatexdir/zziplib/m4 \
+	luatexdir/zziplib/msvc6 \
+	luatexdir/zziplib/msvc7 \
+	luatexdir/zziplib/msvc8 \
+	luatexdir/zziplib/test \
+	luatexdir/zziplib/uses \
+	luatexdir/zziplib/zzip/Makefile \
+	luatexdir/zziplib/zzip/Makefile.am \
+	luatexdir/zziplib/zzip/Makefile.in \
+	luatexdir/zziplib/zzip/_msvc.h \
+	luatexdir/zziplib/zzip/_msvc.sed \
+	luatexdir/zziplib/zzip/autoconf.h \
+	luatexdir/zziplib/zzip/fseeko.c \
+	luatexdir/zziplib/zzip/fseeko.h \
+	luatexdir/zziplib/zzip/zziplib.wpj \
+	luatexdir/zziplib/zzipback.sed \
+	luatexdir/zziplib/zzipwrap
+
diff --git a/Build/source/texk/web2c/luatexdir/am/luafontforge.am b/Build/source/texk/web2c/luatexdir/am/luafontforge.am
new file mode 100644
index 00000000000..de2872824d3
--- /dev/null
+++ b/Build/source/texk/web2c/luatexdir/am/luafontforge.am
@@ -0,0 +1,141 @@
+## texk/web2c/luatexdir/am/luafontforge.am: Makefile fragment for libff.
+
+## luafontforge
+##
+EXTRA_LIBRARIES += libff.a
+
+libff_a_DEPENDENCIES = libluamisc.a
+
+$(libff_a_OBJECTS): libluamisc.a
+
+libff_a_CPPFLAGS = \
+	-DFONTFORGE_CONFIG_NO_WINDOWING_UI=1 -DLUA_FF_LIB=1 \
+	-D_NO_PYTHON=1 -DX_DISPLAY_MISSING=1 -DNODYNAMIC=1 \
+	-D_NO_FREETYPE=1 -D_NO_LIBUNINAMESLIST=1 -UHAVE_LIBINTL_H \
+	-I$(top_srcdir)/luatexdir/lua51 \
+	-I$(top_srcdir)/luatexdir/luafontloader/fontforge/inc \
+	-I$(top_srcdir)/luatexdir/luafontloader/fontforge/fontforge
+
+libff_a_SOURCES = \
+	luatexdir/luafontloader/fontforge/Unicode/ArabicForms.c \
+	luatexdir/luafontloader/fontforge/Unicode/alphabet.c \
+	luatexdir/luafontloader/fontforge/Unicode/backtrns.c \
+	luatexdir/luafontloader/fontforge/Unicode/char.c \
+	luatexdir/luafontloader/fontforge/Unicode/cjk.c \
+	luatexdir/luafontloader/fontforge/Unicode/combiners.h \
+	luatexdir/luafontloader/fontforge/Unicode/dump.c \
+	luatexdir/luafontloader/fontforge/Unicode/gwwiconv.c \
+	luatexdir/luafontloader/fontforge/Unicode/memory.c \
+	luatexdir/luafontloader/fontforge/Unicode/ucharmap.c \
+	luatexdir/luafontloader/fontforge/Unicode/unialt.c \
+	luatexdir/luafontloader/fontforge/Unicode/ustring.c \
+	luatexdir/luafontloader/fontforge/Unicode/utype.c \
+	luatexdir/luafontloader/fontforge/fontforge/PfEd.h \
+	luatexdir/luafontloader/fontforge/fontforge/autohint.c \
+	luatexdir/luafontloader/fontforge/fontforge/baseviews.h \
+	luatexdir/luafontloader/fontforge/fontforge/clipnoui.c \
+	luatexdir/luafontloader/fontforge/fontforge/configure-pfaedit.h \
+	luatexdir/luafontloader/fontforge/fontforge/cvundoes.c \
+	luatexdir/luafontloader/fontforge/fontforge/dumppfa.c \
+	luatexdir/luafontloader/fontforge/fontforge/edgelist.h \
+	luatexdir/luafontloader/fontforge/fontforge/edgelist2.h \
+	luatexdir/luafontloader/fontforge/fontforge/encoding.c \
+	luatexdir/luafontloader/fontforge/fontforge/encoding.h \
+	luatexdir/luafontloader/fontforge/fontforge/featurefile.c \
+	luatexdir/luafontloader/fontforge/fontforge/fontforgevw.h \
+	luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c \
+	luatexdir/luafontloader/fontforge/fontforge/fvcomposit.c \
+	luatexdir/luafontloader/fontforge/fontforge/fvfonts.c \
+	luatexdir/luafontloader/fontforge/fontforge/libffstamp.h \
+	luatexdir/luafontloader/fontforge/fontforge/libstamp.pre \
+	luatexdir/luafontloader/fontforge/fontforge/lookups.c \
+	luatexdir/luafontloader/fontforge/fontforge/lookups.h \
+	luatexdir/luafontloader/fontforge/fontforge/macbinary.c \
+	luatexdir/luafontloader/fontforge/fontforge/macenc.c \
+	luatexdir/luafontloader/fontforge/fontforge/mathconstants.c \
+	luatexdir/luafontloader/fontforge/fontforge/mm.c \
+	luatexdir/luafontloader/fontforge/fontforge/mm.h \
+	luatexdir/luafontloader/fontforge/fontforge/namelist.c \
+	luatexdir/luafontloader/fontforge/fontforge/noprefs.c \
+	luatexdir/luafontloader/fontforge/fontforge/nouiutil.c \
+	luatexdir/luafontloader/fontforge/fontforge/parsepfa.c \
+	luatexdir/luafontloader/fontforge/fontforge/parsettf.c \
+	luatexdir/luafontloader/fontforge/fontforge/parsettfatt.c \
+	luatexdir/luafontloader/fontforge/fontforge/parsettfvar.c \
+	luatexdir/luafontloader/fontforge/fontforge/pfaedit.h \
+	luatexdir/luafontloader/fontforge/fontforge/plugins.h \
+	luatexdir/luafontloader/fontforge/fontforge/psfont.h \
+	luatexdir/luafontloader/fontforge/fontforge/psread.c \
+	luatexdir/luafontloader/fontforge/fontforge/pua.c \
+	luatexdir/luafontloader/fontforge/fontforge/python.c \
+	luatexdir/luafontloader/fontforge/fontforge/scripting.h \
+	luatexdir/luafontloader/fontforge/fontforge/sd.h \
+	luatexdir/luafontloader/fontforge/fontforge/sfd1.c \
+	luatexdir/luafontloader/fontforge/fontforge/sfd1.h \
+	luatexdir/luafontloader/fontforge/fontforge/splinechar.c \
+	luatexdir/luafontloader/fontforge/fontforge/splinefill.c \
+	luatexdir/luafontloader/fontforge/fontforge/splinefont.c \
+	luatexdir/luafontloader/fontforge/fontforge/splinefont.h \
+	luatexdir/luafontloader/fontforge/fontforge/splineorder2.c \
+	luatexdir/luafontloader/fontforge/fontforge/splineoverlap.c \
+	luatexdir/luafontloader/fontforge/fontforge/splinerefigure.c \
+	luatexdir/luafontloader/fontforge/fontforge/splinesave.c \
+	luatexdir/luafontloader/fontforge/fontforge/splinesaveafm.c \
+	luatexdir/luafontloader/fontforge/fontforge/splinestroke.c \
+	luatexdir/luafontloader/fontforge/fontforge/splineutil.c \
+	luatexdir/luafontloader/fontforge/fontforge/splineutil2.c \
+	luatexdir/luafontloader/fontforge/fontforge/start.c \
+	luatexdir/luafontloader/fontforge/fontforge/stemdb.c \
+	luatexdir/luafontloader/fontforge/fontforge/stemdb.h \
+	luatexdir/luafontloader/fontforge/fontforge/tottf.c \
+	luatexdir/luafontloader/fontforge/fontforge/tottfaat.c \
+	luatexdir/luafontloader/fontforge/fontforge/tottfgpos.c \
+	luatexdir/luafontloader/fontforge/fontforge/ttf.h \
+	luatexdir/luafontloader/fontforge/fontforge/ttfspecial.c \
+	luatexdir/luafontloader/fontforge/fontforge/uiinterface.h \
+	luatexdir/luafontloader/fontforge/fontforge/unicoderange.h \
+	luatexdir/luafontloader/fontforge/fontforge/views.h \
+	luatexdir/luafontloader/fontforge/gutils/fsys.c \
+	luatexdir/luafontloader/fontforge/gutils/gwwintl.c \
+	luatexdir/luafontloader/fontforge/inc/basics.h \
+	luatexdir/luafontloader/fontforge/inc/chardata.h \
+	luatexdir/luafontloader/fontforge/inc/charset.h \
+	luatexdir/luafontloader/fontforge/inc/dynamic.h \
+	luatexdir/luafontloader/fontforge/inc/fileutil.h \
+	luatexdir/luafontloader/fontforge/inc/gdraw.h \
+	luatexdir/luafontloader/fontforge/inc/gfile.h \
+	luatexdir/luafontloader/fontforge/inc/ggadget.h \
+	luatexdir/luafontloader/fontforge/inc/gicons.h \
+	luatexdir/luafontloader/fontforge/inc/gimage.h \
+	luatexdir/luafontloader/fontforge/inc/gio.h \
+	luatexdir/luafontloader/fontforge/inc/gkeysym.h \
+	luatexdir/luafontloader/fontforge/inc/gprogress.h \
+	luatexdir/luafontloader/fontforge/inc/gresource.h \
+	luatexdir/luafontloader/fontforge/inc/gwidget.h \
+	luatexdir/luafontloader/fontforge/inc/gwwiconv.h \
+	luatexdir/luafontloader/fontforge/inc/intl.h \
+	luatexdir/luafontloader/fontforge/inc/ustring.h \
+	luatexdir/luafontloader/fontforge/inc/utype.h \
+	luatexdir/luafontloader/src/ffdummies.c \
+	luatexdir/luafontloader/src/luafflib.c
+
+EXTRA_DIST += \
+	luatexdir/luafontloader/ChangeLog \
+	luatexdir/luafontloader/fontforge/AUTHORS \
+	luatexdir/luafontloader/fontforge/INSTALL \
+	luatexdir/luafontloader/fontforge/LICENSE \
+	luatexdir/luafontloader/fontforge/VERSION
+
+## Not used
+##
+EXTRA_DIST += \
+	luatexdir/luafontloader/fontforge/Makefile.in \
+	luatexdir/luafontloader/fontforge/Unicode/Makefile.in \
+	luatexdir/luafontloader/fontforge/configure-options \
+	luatexdir/luafontloader/fontforge/configure.in \
+	luatexdir/luafontloader/fontforge/fontforge/Makefile.in \
+	luatexdir/luafontloader/fontforge/gdraw/Makefile.in \
+	luatexdir/luafontloader/fontforge/gutils/Makefile.in \
+	luatexdir/luafontloader/fontforge/inc/config.h.in \
+	luatexdir/luafontloader/fontforge/plugins/Makefile.in
+
diff --git a/Build/source/texk/web2c/luatexdir/am/luamisc.am b/Build/source/texk/web2c/luatexdir/am/luamisc.am
new file mode 100644
index 00000000000..cb1cee694e3
--- /dev/null
+++ b/Build/source/texk/web2c/luatexdir/am/luamisc.am
@@ -0,0 +1,74 @@
+## texk/web2c/luatexdir/am/luamisc.am: Makefile fragment for libluamisc
+## (luafilesystem, luamd5, luapeg, luazip, luazlib, luaprofiler, and slnunicode)
+
+## libluamisc (luafilesystem, luamd5, luapeg, luazip, luazlib, luaprofiler,
+## and slnunicode)
+EXTRA_LIBRARIES += libluamisc.a
+
+libluamisc_a_DEPENDENCIES = libluasocket.a
+
+$(libluamisc_a_OBJECTS): libluasocket.a
+
+libluamisc_a_CPPFLAGS = \
+	$(ZLIB_INCLUDES) \
+	-I$(top_srcdir)/luatexdir/lua51 \
+	-I$(top_srcdir)/luatexdir/zziplib
+
+libluamisc_a_SOURCES = \
+	luatexdir/luafilesystem/src/lfs.c \
+	luatexdir/luafilesystem/src/lfs.h \
+	luatexdir/luamd5/md5.c \
+	luatexdir/luamd5/md5.h \
+	luatexdir/luamd5/md5lib.c \
+	luatexdir/luapeg/lpeg.c \
+	luatexdir/luaprofiler/clocks.c \
+	luatexdir/luaprofiler/clocks.h \
+	luatexdir/luaprofiler/core_profiler.c \
+	luatexdir/luaprofiler/core_profiler.h \
+	luatexdir/luaprofiler/function_meter.c \
+	luatexdir/luaprofiler/function_meter.h \
+	luatexdir/luaprofiler/luaprofiler.h \
+	luatexdir/luaprofiler/stack.c \
+	luatexdir/luaprofiler/stack.h \
+	luatexdir/luaprofiler/lua50_profiler.c \
+	luatexdir/luazip/src/luazip.c \
+	luatexdir/luazip/src/luazip.h \
+	luatexdir/luazlib/lgzip.c \
+	luatexdir/luazlib/lzlib.c \
+	luatexdir/slnunicode/slnunico.c
+
+## Included by slnunico.c
+EXTRA_libluamisc_a_SOURCES = luatexdir/slnunicode/slnudata.c
+
+## Not used
+##
+EXTRA_DIST += \
+	luatexdir/luafilesystem/Makefile \
+	luatexdir/luafilesystem/Makefile.win \
+	luatexdir/luafilesystem/README \
+	luatexdir/luafilesystem/config \
+	luatexdir/luafilesystem/config.win \
+	luatexdir/luafilesystem/doc \
+	luatexdir/luafilesystem/src/lfs.def \
+	luatexdir/luafilesystem/tests \
+	luatexdir/luafilesystem/vc6 \
+	luatexdir/luamd5/makefile \
+	luatexdir/luamd5/md5.html \
+	luatexdir/luamd5/md5.lua \
+	luatexdir/luamd5/md5tests.lua \
+	luatexdir/luaprofiler/Makefile \
+	luatexdir/luazip/Makefile \
+	luatexdir/luazip/README \
+	luatexdir/luazip/config \
+	luatexdir/luazip/doc \
+	luatexdir/luazip/tests \
+	luatexdir/luazip/vc6 \
+	luatexdir/luazip/vc7 \
+	luatexdir/luazlib/Makefile \
+	luatexdir/luazlib/README \
+	luatexdir/luazlib/gzip.lua \
+	luatexdir/luazlib/test_gzip.lua \
+	luatexdir/luazlib/test_zlib.lua \
+	luatexdir/luazlib/zlib.lua \
+	luatexdir/slnunicode/unitest
+
diff --git a/Build/source/texk/web2c/luatexdir/am/luasocket.am b/Build/source/texk/web2c/luatexdir/am/luasocket.am
new file mode 100644
index 00000000000..a58704c0476
--- /dev/null
+++ b/Build/source/texk/web2c/luatexdir/am/luasocket.am
@@ -0,0 +1,121 @@
+## texk/web2c/luatexdir/am/luasocket.am: Makefile fragment for libluasocket.
+
+## luasocket
+##
+EXTRA_LIBRARIES += libluasocket.a
+
+libluasocket_a_DEPENDENCIES = $(ZLIB_DEPEND) libzzip.a 
+
+$(libluasocket_a_OBJECTS): libzzip.a 
+
+libluasocket_a_CPPFLAGS = \
+	-DLUASOCKET_DEBUG -I$(top_srcdir)/luatexdir/luasocket -I$(srcdir)/luatexdir/lua51
+
+libluasocket_a_SOURCES = \
+	luatexdir/luasocket/src/auxiliar.c \
+	luatexdir/luasocket/src/auxiliar.h \
+	luatexdir/luasocket/src/buffer.c \
+	luatexdir/luasocket/src/buffer.h \
+	luatexdir/luasocket/src/except.c \
+	luatexdir/luasocket/src/except.h \
+	luatexdir/luasocket/src/inet.c \
+	luatexdir/luasocket/src/inet.h \
+	luatexdir/luasocket/src/io.c \
+	luatexdir/luasocket/src/io.h \
+	luatexdir/luasocket/src/lua_preload.c \
+	luatexdir/luasocket/src/luasocket.c \
+	luatexdir/luasocket/src/luasocket.h \
+	luatexdir/luasocket/src/mime.c \
+	luatexdir/luasocket/src/mime.h \
+	luatexdir/luasocket/src/options.c \
+	luatexdir/luasocket/src/options.h \
+	luatexdir/luasocket/src/select.c \
+	luatexdir/luasocket/src/select.h \
+	luatexdir/luasocket/src/socket.c \
+	luatexdir/luasocket/src/socket.h \
+	luatexdir/luasocket/src/tcp.c \
+	luatexdir/luasocket/src/tcp.h \
+	luatexdir/luasocket/src/timeout.c \
+	luatexdir/luasocket/src/timeout.h \
+	luatexdir/luasocket/src/udp.c \
+	luatexdir/luasocket/src/udp.h \
+	luatexdir/luasocket/src/usocket.h
+
+
+EXTRA_DIST += \
+	luatexdir/luasocket/src/socket_lua.c \
+	luatexdir/luasocket/src/ftp_lua.c \
+	luatexdir/luasocket/src/http_lua.c \
+	luatexdir/luasocket/src/smtp_lua.c \
+	luatexdir/luasocket/src/tp_lua.c \
+	luatexdir/luasocket/src/url_lua.c \
+	luatexdir/luasocket/src/ltn12_lua.c \
+	luatexdir/luasocket/src/mime_lua.c
+
+## Not used
+##
+EXTRA_DIST += \
+	luatexdir/luasocket/src/Makefile \
+	luatexdir/luasocket/src/unix.c \
+	luatexdir/luasocket/src/unix.h \
+	luatexdir/luasocket/src/usocket.c \
+	luatexdir/luasocket/src/wsocket.c \
+	luatexdir/luasocket/src/wsocket.h \
+	luatexdir/luasocket/src/ftp.lua \
+	luatexdir/luasocket/src/http.lua \
+	luatexdir/luasocket/src/smtp.lua \
+	luatexdir/luasocket/src/socket.lua \
+	luatexdir/luasocket/src/tp.lua \
+	luatexdir/luasocket/src/url.lua \
+	luatexdir/luasocket/src/ltn12.lua \
+	luatexdir/luasocket/src/mime.lua \
+	luatexdir/luasocket/LICENSE \
+	luatexdir/luasocket/NEW \
+	luatexdir/luasocket/README \
+	luatexdir/luasocket/config \
+	luatexdir/luasocket/luasocket.sln \
+	luatexdir/luasocket/makefile \
+	luatexdir/luasocket/mime.vcproj \
+	luatexdir/luasocket/socket.vcproj \
+	luatexdir/luasocket/doc/dns.html \
+	luatexdir/luasocket/doc/ftp.html \
+	luatexdir/luasocket/doc/http.html \
+	luatexdir/luasocket/doc/index.html \
+	luatexdir/luasocket/doc/installation.html \
+	luatexdir/luasocket/doc/introduction.html \
+	luatexdir/luasocket/doc/ltn12.html \
+	luatexdir/luasocket/doc/luasocket.png \
+	luatexdir/luasocket/doc/mime.html \
+	luatexdir/luasocket/doc/reference.css \
+	luatexdir/luasocket/doc/reference.html \
+	luatexdir/luasocket/doc/smtp.html \
+	luatexdir/luasocket/doc/socket.html \
+	luatexdir/luasocket/doc/tcp.html \
+	luatexdir/luasocket/doc/udp.html \
+	luatexdir/luasocket/doc/url.html \
+	luatexdir/luasocket/etc/README \
+	luatexdir/luasocket/etc/b64.lua \
+	luatexdir/luasocket/etc/check-links.lua \
+	luatexdir/luasocket/etc/check-memory.lua \
+	luatexdir/luasocket/etc/dict.lua \
+	luatexdir/luasocket/etc/dispatch.lua \
+	luatexdir/luasocket/etc/eol.lua \
+	luatexdir/luasocket/etc/forward.lua \
+	luatexdir/luasocket/etc/get.lua \
+	luatexdir/luasocket/etc/lp.lua \
+	luatexdir/luasocket/etc/qp.lua \
+	luatexdir/luasocket/etc/tftp.lua \
+	luatexdir/luasocket/samples/README \
+	luatexdir/luasocket/samples/cddb.lua \
+	luatexdir/luasocket/samples/daytimeclnt.lua \
+	luatexdir/luasocket/samples/echoclnt.lua \
+	luatexdir/luasocket/samples/echosrvr.lua \
+	luatexdir/luasocket/samples/listener.lua \
+	luatexdir/luasocket/samples/lpr.lua \
+	luatexdir/luasocket/samples/talker.lua \
+	luatexdir/luasocket/samples/tinyirc.lua \
+	luatexdir/luasocket/test/README \
+	luatexdir/luasocket/test/testclnt.lua \
+	luatexdir/luasocket/test/testsrvr.lua \
+	luatexdir/luasocket/test/testsupport.lua
+
diff --git a/Build/source/texk/web2c/luatexdir/am/luatangle.am b/Build/source/texk/web2c/luatexdir/am/luatangle.am
new file mode 100644
index 00000000000..2e4e7451699
--- /dev/null
+++ b/Build/source/texk/web2c/luatexdir/am/luatangle.am
@@ -0,0 +1,33 @@
+## texk/web2c/luatexdir/am/luatangle.am: Makefile fragment for luatangle.
+
+## luatangle
+##
+if LUATEX
+bin_PROGRAMS += luatangle
+endif LUATEX
+EXTRA_PROGRAMS += luatangle
+
+nodist_luatangle_SOURCES = luatangle.c luatangle.h
+luatangle.c luatangle.h: luatangle-web2c
+luatangle-web2c: $(web2c_common) $(web2c_programs) luatangle.p
+	$(web2c) luatangle
+	echo timestamp >$@
+	touch luatangle.c luatangle.h
+
+EXTRA_DIST += $(luatangle_sources)
+
+luatangle_sources = luatexdir/luatangle.web luatexdir/luatangle.ch
+luatangle.p: tangle$(EXEEXT) $(luatangle_sources)
+	WEBINPUTS=$(srcdir)/luatexdir $(buildenv) $(TANGLE) luatangle luatangle
+
+DISTCLEANFILES += luatangle.c luatangle.h luatangle-web2c luatangle.p
+
+## Tests
+##
+dist_check_SCRIPTS += luatexdir/luatangle.test
+
+if LUATEX
+TESTS += luatexdir/luatangle.test
+endif LUATEX
+
+DISTCLEANFILES += cftest.p
diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am
index 77c20a36b36..c607dd8e570 100644
--- a/Build/source/texk/web2c/luatexdir/am/luatex.am
+++ b/Build/source/texk/web2c/luatexdir/am/luatex.am
@@ -23,13 +23,12 @@ luatex_ldadd += $(OBSDCOMPAT_LIBS) libmd5.a libmplib.a
 
 luatex_LDADD = $(luatex_ldadd) $(LDADD) $(socketlibs)
 
-## We must have created libmplib.a already
-$(luatex_OBJECTS): libmplib.a
-
 luatex_DEPENDENCIES = $(proglib) libluatex.a
 luatex_DEPENDENCIES += $(LIBPNG_DEPEND) $(ZLIB_DEPEND) $(XPDF_DEPEND)
 luatex_DEPENDENCIES += $(OBSDCOMPAT_DEPEND) libmd5.a
 
+$(luatex_OBJECTS): libluatex.a libmplib.a
+
 luatex_c_h = luatexini.c luatex0.c luatexcoerce.h luatexd.h
 nodist_luatex_SOURCES = $(luatex_c_h) luatex-pool.c luatexextra.c luatexdir/luatexextra.h
 $(luatex_c_h): luatex-web2c
@@ -64,632 +63,3 @@ EXTRA_DIST += $(luatex_sources) \
 DISTCLEANFILES += $(nodist_luatex_SOURCES) luatex-web2c \
 	luatex.p luatex.pool luatex-tangle luatexdir/luatex.version
 
-## luatangle
-##
-if LUATEX
-bin_PROGRAMS += luatangle
-endif LUATEX
-EXTRA_PROGRAMS += luatangle
-
-nodist_luatangle_SOURCES = luatangle.c luatangle.h
-luatangle.c luatangle.h: $(web2c_common) $(web2c_programs) luatangle.p
-	$(web2c) luatangle
-EXTRA_DIST += $(luatangle_sources)
-luatangle_sources = luatexdir/luatangle.web luatexdir/luatangle.ch
-luatangle.p: tangle$(EXEEXT) $(luatangle_sources)
-	WEBINPUTS=$(srcdir)/luatexdir $(buildenv) $(TANGLE) luatangle luatangle
-DISTCLEANFILES += luatangle.c luatangle.h luatangle.p
-
-## liblua51
-##
-EXTRA_LIBRARIES += liblua51.a
-
-liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51
-if !MINGW32
-liblua51_a_CPPFLAGS += -DLUA_USE_POSIX
-endif !MINGW32
-
-liblua51_a_SOURCES = \
-	luatexdir/lua51/lapi.c \
-	luatexdir/lua51/lapi.h \
-	luatexdir/lua51/lauxlib.c \
-	luatexdir/lua51/lauxlib.h \
-	luatexdir/lua51/lbaselib.c \
-	luatexdir/lua51/lcoco.c \
-	luatexdir/lua51/lcoco.h \
-	luatexdir/lua51/lcode.c \
-	luatexdir/lua51/lcode.h \
-	luatexdir/lua51/ldblib.c \
-	luatexdir/lua51/ldebug.c \
-	luatexdir/lua51/ldebug.h \
-	luatexdir/lua51/ldo.c \
-	luatexdir/lua51/ldo.h \
-	luatexdir/lua51/ldump.c \
-	luatexdir/lua51/lfunc.c \
-	luatexdir/lua51/lfunc.h \
-	luatexdir/lua51/lgc.c \
-	luatexdir/lua51/lgc.h \
-	luatexdir/lua51/linit.c \
-	luatexdir/lua51/llex.c \
-	luatexdir/lua51/llex.h \
-	luatexdir/lua51/llimits.h \
-	luatexdir/lua51/lmathlib.c \
-	luatexdir/lua51/lmem.c \
-	luatexdir/lua51/lmem.h \
-	luatexdir/lua51/loadlib.c \
-	luatexdir/lua51/lobject.c \
-	luatexdir/lua51/lobject.h \
-	luatexdir/lua51/lopcodes.c \
-	luatexdir/lua51/lopcodes.h \
-	luatexdir/lua51/loslib.c \
-	luatexdir/lua51/lparser.c \
-	luatexdir/lua51/lparser.h \
-	luatexdir/lua51/lstate.c \
-	luatexdir/lua51/lstate.h \
-	luatexdir/lua51/lstring.c \
-	luatexdir/lua51/lstring.h \
-	luatexdir/lua51/lstrlib.c \
-	luatexdir/lua51/ltable.c \
-	luatexdir/lua51/ltable.h \
-	luatexdir/lua51/ltablib.c \
-	luatexdir/lua51/ltm.c \
-	luatexdir/lua51/ltm.h \
-	luatexdir/lua51/lua.h \
-	luatexdir/lua51/luaconf.h \
-	luatexdir/lua51/lualib.h \
-	luatexdir/lua51/lundump.c \
-	luatexdir/lua51/lundump.h \
-	luatexdir/lua51/lvm.c \
-	luatexdir/lua51/lvm.h \
-	luatexdir/lua51/lzio.c \
-	luatexdir/lua51/lzio.h
-
-## Not used
-##
-EXTRA_DIST += \
-	luatexdir/lua51/Makefile \
-	luatexdir/lua51/lua.c \
-	luatexdir/lua51/luac.c \
-	luatexdir/lua51/liolib.c \
-	luatexdir/lua51/print.c
-
-## zziplib
-##
-EXTRA_LIBRARIES += libzzip.a
-
-libzzip_a_DEPENDENCIES = liblua51.a
-
-libzzip_a_CPPFLAGS = \
-	$(ZLIB_INCLUDES) \
-	-I$(top_srcdir)/luatexdir/zziplib
-
-libzzip_a_SOURCES = \
-	luatexdir/zziplib/zzip/__debug.h \
-	luatexdir/zziplib/zzip/__dirent.h \
-	luatexdir/zziplib/zzip/__fnmatch.h \
-	luatexdir/zziplib/zzip/__hints.h \
-	luatexdir/zziplib/zzip/__mmap.h \
-	luatexdir/zziplib/zzip/_config.h \
-	luatexdir/zziplib/zzip/conf.h \
-	luatexdir/zziplib/zzip/dir.c \
-	luatexdir/zziplib/zzip/err.c \
-	luatexdir/zziplib/zzip/fetch.c \
-	luatexdir/zziplib/zzip/fetch.h \
-	luatexdir/zziplib/zzip/file.c \
-	luatexdir/zziplib/zzip/file.h \
-	luatexdir/zziplib/zzip/format.h \
-	luatexdir/zziplib/zzip/info.c \
-	luatexdir/zziplib/zzip/info.h \
-	luatexdir/zziplib/zzip/lib.h \
-	luatexdir/zziplib/zzip/memdisk.c \
-	luatexdir/zziplib/zzip/memdisk.h \
-	luatexdir/zziplib/zzip/mmapped.c \
-	luatexdir/zziplib/zzip/mmapped.h \
-	luatexdir/zziplib/zzip/plugin.c \
-	luatexdir/zziplib/zzip/plugin.h \
-	luatexdir/zziplib/zzip/stdint.h \
-	luatexdir/zziplib/zzip/stat.c \
-	luatexdir/zziplib/zzip/types.h \
-	luatexdir/zziplib/zzip/write.c \
-	luatexdir/zziplib/zzip/zip.c \
-	luatexdir/zziplib/zzip/zzip.h
-
-EXTRA_DIST += \
-	luatexdir/zziplib/COPYING.LIB \
-	luatexdir/zziplib/ChangeLog \
-	luatexdir/zziplib/README \
-	luatexdir/zziplib/TODO \
-	luatexdir/zziplib/zziplib.spec
-
-## Not used
-##
-EXTRA_DIST += \
-	luatexdir/zziplib/Makefile.am \
-	luatexdir/zziplib/Makefile.in \
-	luatexdir/zziplib/Makefile.mk \
-	luatexdir/zziplib/SDL \
-	luatexdir/zziplib/aclocal.m4 \
-	luatexdir/zziplib/bins \
-	luatexdir/zziplib/config.h.in \
-	luatexdir/zziplib/configure \
-	luatexdir/zziplib/configure.ac \
-	luatexdir/zziplib/docs \
-	luatexdir/zziplib/m4 \
-	luatexdir/zziplib/msvc6 \
-	luatexdir/zziplib/msvc7 \
-	luatexdir/zziplib/msvc8 \
-	luatexdir/zziplib/test \
-	luatexdir/zziplib/uses \
-	luatexdir/zziplib/zzip/Makefile \
-	luatexdir/zziplib/zzip/Makefile.am \
-	luatexdir/zziplib/zzip/Makefile.in \
-	luatexdir/zziplib/zzip/_msvc.h \
-	luatexdir/zziplib/zzip/_msvc.sed \
-	luatexdir/zziplib/zzip/autoconf.h \
-	luatexdir/zziplib/zzip/fseeko.c \
-	luatexdir/zziplib/zzip/fseeko.h \
-	luatexdir/zziplib/zzip/zziplib.wpj \
-	luatexdir/zziplib/zzipback.sed \
-	luatexdir/zziplib/zzipwrap
-
-
-## luasocket
-##
-EXTRA_LIBRARIES += libluasocket.a
-
-libluasocket_a_DEPENDENCIES = $(ZLIB_DEPEND) libzzip.a 
-
-libluasocket_a_CPPFLAGS = \
-	-DLUASOCKET_DEBUG -I$(top_srcdir)/luatexdir/luasocket -I$(srcdir)/luatexdir/lua51
-
-libluasocket_a_SOURCES = \
-	luatexdir/luasocket/src/auxiliar.c \
-	luatexdir/luasocket/src/auxiliar.h \
-	luatexdir/luasocket/src/buffer.c \
-	luatexdir/luasocket/src/buffer.h \
-	luatexdir/luasocket/src/except.c \
-	luatexdir/luasocket/src/except.h \
-	luatexdir/luasocket/src/inet.c \
-	luatexdir/luasocket/src/inet.h \
-	luatexdir/luasocket/src/io.c \
-	luatexdir/luasocket/src/io.h \
-	luatexdir/luasocket/src/lua_preload.c \
-	luatexdir/luasocket/src/luasocket.c \
-	luatexdir/luasocket/src/luasocket.h \
-	luatexdir/luasocket/src/mime.c \
-	luatexdir/luasocket/src/mime.h \
-	luatexdir/luasocket/src/options.c \
-	luatexdir/luasocket/src/options.h \
-	luatexdir/luasocket/src/select.c \
-	luatexdir/luasocket/src/select.h \
-	luatexdir/luasocket/src/socket.c \
-	luatexdir/luasocket/src/socket.h \
-	luatexdir/luasocket/src/tcp.c \
-	luatexdir/luasocket/src/tcp.h \
-	luatexdir/luasocket/src/timeout.c \
-	luatexdir/luasocket/src/timeout.h \
-	luatexdir/luasocket/src/udp.c \
-	luatexdir/luasocket/src/udp.h \
-	luatexdir/luasocket/src/usocket.h
-
-
-EXTRA_DIST += \
-	luatexdir/luasocket/src/socket_lua.c \
-    luatexdir/luasocket/src/ftp_lua.c \
-    luatexdir/luasocket/src/http_lua.c \
-    luatexdir/luasocket/src/smtp_lua.c \
-    luatexdir/luasocket/src/tp_lua.c \
-    luatexdir/luasocket/src/url_lua.c \
-    luatexdir/luasocket/src/ltn12_lua.c \
-    luatexdir/luasocket/src/mime_lua.c
-
-## Not used
-##
-EXTRA_DIST += \
-	luatexdir/luasocket/src/Makefile \
-	luatexdir/luasocket/src/unix.c \
-	luatexdir/luasocket/src/unix.h \
-	luatexdir/luasocket/src/usocket.c \
-	luatexdir/luasocket/src/wsocket.c \
-	luatexdir/luasocket/src/wsocket.h \
-    luatexdir/luasocket/src/ftp.lua \
-    luatexdir/luasocket/src/http.lua \
-    luatexdir/luasocket/src/smtp.lua \
-    luatexdir/luasocket/src/socket.lua \
-    luatexdir/luasocket/src/tp.lua \
-    luatexdir/luasocket/src/url.lua \
-    luatexdir/luasocket/src/ltn12.lua \
-    luatexdir/luasocket/src/mime.lua \
-    luatexdir/luasocket/LICENSE \
-    luatexdir/luasocket/NEW \
-    luatexdir/luasocket/README \
-    luatexdir/luasocket/config \
-    luatexdir/luasocket/luasocket.sln \
-    luatexdir/luasocket/makefile \
-    luatexdir/luasocket/mime.vcproj \
-    luatexdir/luasocket/socket.vcproj \
-    luatexdir/luasocket/doc/dns.html \
-    luatexdir/luasocket/doc/ftp.html \
-    luatexdir/luasocket/doc/http.html \
-    luatexdir/luasocket/doc/index.html \
-    luatexdir/luasocket/doc/installation.html \
-    luatexdir/luasocket/doc/introduction.html \
-    luatexdir/luasocket/doc/ltn12.html \
-    luatexdir/luasocket/doc/luasocket.png \
-    luatexdir/luasocket/doc/mime.html \
-    luatexdir/luasocket/doc/reference.css \
-    luatexdir/luasocket/doc/reference.html \
-    luatexdir/luasocket/doc/smtp.html \
-    luatexdir/luasocket/doc/socket.html \
-    luatexdir/luasocket/doc/tcp.html \
-    luatexdir/luasocket/doc/udp.html \
-    luatexdir/luasocket/doc/url.html \
-    luatexdir/luasocket/etc/README \
-    luatexdir/luasocket/etc/b64.lua \
-    luatexdir/luasocket/etc/check-links.lua \
-    luatexdir/luasocket/etc/check-memory.lua \
-    luatexdir/luasocket/etc/dict.lua \
-    luatexdir/luasocket/etc/dispatch.lua \
-    luatexdir/luasocket/etc/eol.lua \
-    luatexdir/luasocket/etc/forward.lua \
-    luatexdir/luasocket/etc/get.lua \
-    luatexdir/luasocket/etc/lp.lua \
-    luatexdir/luasocket/etc/qp.lua \
-    luatexdir/luasocket/etc/tftp.lua \
-    luatexdir/luasocket/samples/README \
-    luatexdir/luasocket/samples/cddb.lua \
-    luatexdir/luasocket/samples/daytimeclnt.lua \
-    luatexdir/luasocket/samples/echoclnt.lua \
-    luatexdir/luasocket/samples/echosrvr.lua \
-    luatexdir/luasocket/samples/listener.lua \
-    luatexdir/luasocket/samples/lpr.lua \
-    luatexdir/luasocket/samples/talker.lua \
-    luatexdir/luasocket/samples/tinyirc.lua \
-    luatexdir/luasocket/test/README \
-    luatexdir/luasocket/test/testclnt.lua \
-    luatexdir/luasocket/test/testsrvr.lua \
-    luatexdir/luasocket/test/testsupport.lua
-
-## libluamisc (luafilesystem, luamd5, luapeg, luazip, luazlib, luaprofiler,
-## and slnunicode)
-EXTRA_LIBRARIES += libluamisc.a
-
-libluamisc_a_DEPENDENCIES = libluasocket.a
-
-libluamisc_a_CPPFLAGS = \
-	$(ZLIB_INCLUDES) \
-	-I$(top_srcdir)/luatexdir/lua51 \
-	-I$(top_srcdir)/luatexdir/zziplib
-
-libluamisc_a_SOURCES = \
-	luatexdir/luafilesystem/src/lfs.c \
-	luatexdir/luafilesystem/src/lfs.h \
-	luatexdir/luamd5/md5.c \
-	luatexdir/luamd5/md5.h \
-	luatexdir/luamd5/md5lib.c \
-	luatexdir/luapeg/lpeg.c \
-	luatexdir/luaprofiler/clocks.h \
-    luatexdir/luaprofiler/core_profiler.h \
-    luatexdir/luaprofiler/function_meter.h  \
-    luatexdir/luaprofiler/luaprofiler.h  \
-    luatexdir/luaprofiler/stack.h \
-    luatexdir/luaprofiler/clocks.c \
-	luatexdir/luaprofiler/core_profiler.c \
-	luatexdir/luaprofiler/function_meter.c \
-	luatexdir/luaprofiler/lua50_profiler.c \
-	luatexdir/luaprofiler/stack.c \
-	luatexdir/luazip/src/luazip.c \
-	luatexdir/luazip/src/luazip.h \
-	luatexdir/luazlib/lgzip.c \
-	luatexdir/luazlib/lzlib.c \
-	luatexdir/slnunicode/slnunico.c
-
-## Included by slnunico.c
-EXTRA_libluamisc_a_SOURCES = luatexdir/slnunicode/slnudata.c
-
-## Not used
-##
-EXTRA_DIST += \
-	luatexdir/luafilesystem/Makefile \
-	luatexdir/luafilesystem/Makefile.win \
-	luatexdir/luafilesystem/README \
-	luatexdir/luafilesystem/config \
-	luatexdir/luafilesystem/config.win \
-	luatexdir/luafilesystem/doc \
-	luatexdir/luafilesystem/src/lfs.def \
-	luatexdir/luafilesystem/tests \
-	luatexdir/luafilesystem/vc6 \
-	luatexdir/luamd5/makefile \
-	luatexdir/luamd5/md5.html \
-	luatexdir/luamd5/md5.lua \
-	luatexdir/luamd5/md5tests.lua \
-	luatexdir/luaprofiler/Makefile \
-	luatexdir/luazip/Makefile \
-	luatexdir/luazip/README \
-	luatexdir/luazip/config \
-	luatexdir/luazip/doc \
-	luatexdir/luazip/tests \
-	luatexdir/luazip/vc6 \
-	luatexdir/luazip/vc7 \
-	luatexdir/luazlib/Makefile \
-	luatexdir/luazlib/README \
-	luatexdir/luazlib/gzip.lua \
-	luatexdir/luazlib/test_gzip.lua \
-	luatexdir/luazlib/test_zlib.lua \
-	luatexdir/luazlib/zlib.lua \
-	luatexdir/slnunicode/unitest
-
-## luafontforge
-##
-EXTRA_LIBRARIES += libff.a
-
-libff_a_DEPENDENCIES = libluamisc.a
-
-libff_a_CPPFLAGS = \
-	-DFONTFORGE_CONFIG_NO_WINDOWING_UI=1 -DLUA_FF_LIB=1 \
-	-D_NO_PYTHON=1 -DX_DISPLAY_MISSING=1 -DNODYNAMIC=1 \
-	-D_NO_FREETYPE=1 -D_NO_LIBUNINAMESLIST=1 -UHAVE_LIBINTL_H \
-	-I$(top_srcdir)/luatexdir/lua51 \
-	-I$(top_srcdir)/luatexdir/luafontloader/fontforge/inc \
-	-I$(top_srcdir)/luatexdir/luafontloader/fontforge/fontforge
-
-libff_a_SOURCES = \
-    luatexdir/luafontloader/fontforge/Unicode/ArabicForms.c \
-    luatexdir/luafontloader/fontforge/Unicode/alphabet.c \
-    luatexdir/luafontloader/fontforge/Unicode/backtrns.c \
-    luatexdir/luafontloader/fontforge/Unicode/char.c \
-    luatexdir/luafontloader/fontforge/Unicode/cjk.c \
-    luatexdir/luafontloader/fontforge/Unicode/combiners.h \
-    luatexdir/luafontloader/fontforge/Unicode/dump.c \
-    luatexdir/luafontloader/fontforge/Unicode/gwwiconv.c \
-    luatexdir/luafontloader/fontforge/Unicode/memory.c \
-    luatexdir/luafontloader/fontforge/Unicode/ucharmap.c \
-    luatexdir/luafontloader/fontforge/Unicode/unialt.c \
-    luatexdir/luafontloader/fontforge/Unicode/ustring.c \
-    luatexdir/luafontloader/fontforge/Unicode/utype.c \
-    luatexdir/luafontloader/fontforge/fontforge/PfEd.h \
-    luatexdir/luafontloader/fontforge/fontforge/autohint.c \
-    luatexdir/luafontloader/fontforge/fontforge/baseviews.h \
-    luatexdir/luafontloader/fontforge/fontforge/clipnoui.c \
-    luatexdir/luafontloader/fontforge/fontforge/configure-pfaedit.h \
-    luatexdir/luafontloader/fontforge/fontforge/cvundoes.c \
-    luatexdir/luafontloader/fontforge/fontforge/dumppfa.c \
-    luatexdir/luafontloader/fontforge/fontforge/edgelist.h \
-    luatexdir/luafontloader/fontforge/fontforge/edgelist2.h \
-    luatexdir/luafontloader/fontforge/fontforge/encoding.c \
-    luatexdir/luafontloader/fontforge/fontforge/encoding.h \
-    luatexdir/luafontloader/fontforge/fontforge/featurefile.c \
-    luatexdir/luafontloader/fontforge/fontforge/fontforgevw.h \
-    luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c \
-    luatexdir/luafontloader/fontforge/fontforge/fvcomposit.c \
-    luatexdir/luafontloader/fontforge/fontforge/fvfonts.c \
-    luatexdir/luafontloader/fontforge/fontforge/libffstamp.h \
-    luatexdir/luafontloader/fontforge/fontforge/libstamp.pre \
-    luatexdir/luafontloader/fontforge/fontforge/lookups.c \
-    luatexdir/luafontloader/fontforge/fontforge/lookups.h \
-    luatexdir/luafontloader/fontforge/fontforge/macbinary.c \
-    luatexdir/luafontloader/fontforge/fontforge/macenc.c \
-    luatexdir/luafontloader/fontforge/fontforge/mathconstants.c \
-    luatexdir/luafontloader/fontforge/fontforge/mm.c \
-    luatexdir/luafontloader/fontforge/fontforge/mm.h \
-    luatexdir/luafontloader/fontforge/fontforge/namelist.c \
-    luatexdir/luafontloader/fontforge/fontforge/noprefs.c \
-    luatexdir/luafontloader/fontforge/fontforge/nouiutil.c \
-    luatexdir/luafontloader/fontforge/fontforge/parsepfa.c \
-    luatexdir/luafontloader/fontforge/fontforge/parsettf.c \
-    luatexdir/luafontloader/fontforge/fontforge/parsettfatt.c \
-    luatexdir/luafontloader/fontforge/fontforge/parsettfvar.c \
-    luatexdir/luafontloader/fontforge/fontforge/pfaedit.h \
-    luatexdir/luafontloader/fontforge/fontforge/plugins.h \
-    luatexdir/luafontloader/fontforge/fontforge/psfont.h \
-    luatexdir/luafontloader/fontforge/fontforge/psread.c \
-    luatexdir/luafontloader/fontforge/fontforge/pua.c \
-    luatexdir/luafontloader/fontforge/fontforge/python.c \
-    luatexdir/luafontloader/fontforge/fontforge/scripting.h \
-    luatexdir/luafontloader/fontforge/fontforge/sd.h \
-    luatexdir/luafontloader/fontforge/fontforge/sfd1.c \
-    luatexdir/luafontloader/fontforge/fontforge/sfd1.h \
-    luatexdir/luafontloader/fontforge/fontforge/splinechar.c \
-    luatexdir/luafontloader/fontforge/fontforge/splinefill.c \
-    luatexdir/luafontloader/fontforge/fontforge/splinefont.c \
-    luatexdir/luafontloader/fontforge/fontforge/splinefont.h \
-    luatexdir/luafontloader/fontforge/fontforge/splineorder2.c \
-    luatexdir/luafontloader/fontforge/fontforge/splineoverlap.c \
-    luatexdir/luafontloader/fontforge/fontforge/splinerefigure.c \
-    luatexdir/luafontloader/fontforge/fontforge/splinesave.c \
-    luatexdir/luafontloader/fontforge/fontforge/splinesaveafm.c \
-    luatexdir/luafontloader/fontforge/fontforge/splinestroke.c \
-    luatexdir/luafontloader/fontforge/fontforge/splineutil.c \
-    luatexdir/luafontloader/fontforge/fontforge/splineutil2.c \
-    luatexdir/luafontloader/fontforge/fontforge/start.c \
-    luatexdir/luafontloader/fontforge/fontforge/stemdb.c \
-    luatexdir/luafontloader/fontforge/fontforge/stemdb.h \
-    luatexdir/luafontloader/fontforge/fontforge/tottf.c \
-    luatexdir/luafontloader/fontforge/fontforge/tottfaat.c \
-    luatexdir/luafontloader/fontforge/fontforge/tottfgpos.c \
-    luatexdir/luafontloader/fontforge/fontforge/ttf.h \
-    luatexdir/luafontloader/fontforge/fontforge/ttfspecial.c \
-    luatexdir/luafontloader/fontforge/fontforge/uiinterface.h \
-    luatexdir/luafontloader/fontforge/fontforge/unicoderange.h \
-    luatexdir/luafontloader/fontforge/fontforge/views.h \
-    luatexdir/luafontloader/fontforge/gutils/fsys.c \
-    luatexdir/luafontloader/fontforge/gutils/gwwintl.c \
-    luatexdir/luafontloader/fontforge/inc/basics.h \
-    luatexdir/luafontloader/fontforge/inc/chardata.h \
-    luatexdir/luafontloader/fontforge/inc/charset.h \
-    luatexdir/luafontloader/fontforge/inc/dynamic.h \
-    luatexdir/luafontloader/fontforge/inc/fileutil.h \
-    luatexdir/luafontloader/fontforge/inc/gdraw.h \
-    luatexdir/luafontloader/fontforge/inc/gfile.h \
-    luatexdir/luafontloader/fontforge/inc/ggadget.h \
-    luatexdir/luafontloader/fontforge/inc/gicons.h \
-    luatexdir/luafontloader/fontforge/inc/gimage.h \
-    luatexdir/luafontloader/fontforge/inc/gio.h \
-    luatexdir/luafontloader/fontforge/inc/gkeysym.h \
-    luatexdir/luafontloader/fontforge/inc/gprogress.h \
-    luatexdir/luafontloader/fontforge/inc/gresource.h \
-    luatexdir/luafontloader/fontforge/inc/gwidget.h \
-    luatexdir/luafontloader/fontforge/inc/gwwiconv.h \
-    luatexdir/luafontloader/fontforge/inc/intl.h \
-    luatexdir/luafontloader/fontforge/inc/ustring.h \
-    luatexdir/luafontloader/fontforge/inc/utype.h \
-    luatexdir/luafontloader/src/ffdummies.c \
-    luatexdir/luafontloader/src/luafflib.c
-
-EXTRA_DIST += \
-	luatexdir/luafontloader/ChangeLog \
-	luatexdir/luafontloader/fontforge/AUTHORS \
-	luatexdir/luafontloader/fontforge/INSTALL \
-	luatexdir/luafontloader/fontforge/LICENSE \
-	luatexdir/luafontloader/fontforge/VERSION
-
-## Not used
-##
-EXTRA_DIST += \
-    luatexdir/luafontloader/fontforge/Makefile.in \
-    luatexdir/luafontloader/fontforge/Unicode/Makefile.in \
-    luatexdir/luafontloader/fontforge/configure-options \
-    luatexdir/luafontloader/fontforge/configure.in \
-    luatexdir/luafontloader/fontforge/fontforge/Makefile.in \
-    luatexdir/luafontloader/fontforge/gdraw/Makefile.in \
-    luatexdir/luafontloader/fontforge/gutils/Makefile.in \
-    luatexdir/luafontloader/fontforge/inc/config.h.in \
-    luatexdir/luafontloader/fontforge/plugins/Makefile.in
-
-## libluatex
-##
-EXTRA_LIBRARIES += libluatex.a
-
-libluatex_a_DEPENDENCIES = libff.a
-
-libluatex_a_CPPFLAGS = $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES)
-libluatex_a_CPPFLAGS += $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5
-libluatex_a_CPPFLAGS += -Iluatexdir -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51
-libluatex_a_CPPFLAGS += -DpdfTeX
-
-libluatex_a_SOURCES = \
-	luatexdir/commands.h  \
-	luatexdir/font/dofont.c  \
-	luatexdir/font/luatexfont.h  \
-	luatexdir/font/luafont.c  \
-	luatexdir/font/mapfile.c  \
-	luatexdir/font/pkin.c  \
-	luatexdir/font/sfnt.c  \
-	luatexdir/font/sfnt.h  \
-	luatexdir/font/subfont.c  \
-	luatexdir/font/texfont.c  \
-	luatexdir/font/texfont.h  \
-	luatexdir/font/tfmofm.c  \
-	luatexdir/font/tounicode.c  \
-	luatexdir/font/tt_glyf.c  \
-	luatexdir/font/tt_glyf.h  \
-	luatexdir/font/tt_table.c  \
-	luatexdir/font/tt_table.h  \
-	luatexdir/font/vfovf.c  \
-	luatexdir/font/vfpacket.c  \
-	luatexdir/font/writecff.c  \
-	luatexdir/font/writecff.h  \
-	luatexdir/font/writeenc.c  \
-	luatexdir/font/writefont.c  \
-	luatexdir/font/writet1.c  \
-	luatexdir/font/writet3.c  \
-	luatexdir/font/writettf.c  \
-	luatexdir/font/writettf.h  \
-	luatexdir/font/writetype0.c  \
-	luatexdir/font/writetype2.c  \
-	luatexdir/get_svnversion.sh  \
-	luatexdir/hyphen.h \
-	luatexdir/image/epdf.c  \
-	luatexdir/image/epdf.h  \
-	luatexdir/image/image.h  \
-	luatexdir/image/pdftoepdf.cc  \
-	luatexdir/image/writeimg.c  \
-	luatexdir/image/writejbig2.c  \
-	luatexdir/image/writejbig2.h  \
-	luatexdir/image/writejpg.c  \
-	luatexdir/image/writepng.c  \
-	luatexdir/lang/hnjalloc.c  \
-	luatexdir/lang/hnjalloc.h  \
-	luatexdir/lang/hyphen.c  \
-	luatexdir/lang/texlang.c  \
-	luatexdir/lua/lcallbacklib.c  \
-	luatexdir/lua/lfontlib.c  \
-	luatexdir/lua/limglib.c  \
-	luatexdir/lua/lkpselib.c  \
-	luatexdir/lua/llanglib.c  \
-	luatexdir/lua/llualib.c  \
-	luatexdir/lua/lnodelib.c  \
-	luatexdir/lua/loslibext.c  \
-	luatexdir/lua/liolib.c  \
-	luatexdir/lua/lpdflib.c  \
-	luatexdir/lua/lstatslib.c  \
-	luatexdir/lua/ltexiolib.c  \
-	luatexdir/lua/ltexlib.c  \
-	luatexdir/lua/ltokenlib.c  \
-	luatexdir/lua/luainit.c  \
-	luatexdir/lua/luanode.c  \
-	luatexdir/lua/luastuff.c  \
-	luatexdir/lua/luatex.c  \
-	luatexdir/lua/luatoken.c  \
-	luatexdir/lua/texluac.c  \
-	luatexdir/luatex-api.h \
-	luatexdir/luatex.h \
-	luatexdir/makecpool.c \
-	luatexdir/managed-sa.c \
-	luatexdir/managed-sa.h \
-	luatexdir/mathcodes.c \
-    mplibdir/lmplib.c \
-	luatexdir/nodes.h \
-	luatexdir/pdf/pagetree.c \
-	luatexdir/pdf/pdfpage.c \
-	luatexdir/primitive.h \
-	luatexdir/ptexmac.h \
-	luatexdir/tex/filename.c  \
-	luatexdir/tex/linebreak.c  \
-	luatexdir/tex/math.c  \
-	luatexdir/tex/mlist.c  \
-	luatexdir/tex/postlinebreak.c  \
-	luatexdir/tex/primitive.c  \
-	luatexdir/tex/texdeffont.c  \
-	luatexdir/tex/texnodes.c  \
-	luatexdir/tex/texpdf.c  \
-	luatexdir/tex/textoken.c  \
-	luatexdir/texmath.h \
-	luatexdir/textcodes.c \
-	luatexdir/tokens.h \
-	luatexdir/utils/avl.c \
-	luatexdir/utils/avl.h \
-	luatexdir/utils/avlstuff.c \
-	luatexdir/utils/avlstuff.h \
-	luatexdir/utils/synctex.h \
-	luatexdir/utils/synctex.c \
-	luatexdir/utils/utils.c \
-	luatexdir/utils/writezip.c
-
-## included by luatexdir/font/writettf.c
-EXTRA_libluatex_a_SOURCES = luatexdir/font/macnames.c
-
-EXTRA_DIST += \
-	luatexdir/ChangeLog \
-	luatexdir/NEWS \
-	luatexdir/README \
-	luatexdir/change-files.txt \
-	luatexdir/font/subfont.txt
-
-
-## Tests
-##
-dist_check_SCRIPTS += luatexdir/luatangle.test
-
-if LUATEX
-TESTS += luatexdir/luatangle.test
-endif LUATEX
-
-DISTCLEANFILES += cftest.p
-
-## Eventually delete these files
-##
-EXTRA_DIST += \
-	luatexdir/Makefile.in \
-	luatexdir/luatex.mk \
-	luatexdir/luatexlib.mk
diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in
index af58e162c75..6c35f62656f 100644
--- a/Build/source/texk/web2c/man/Makefile.in
+++ b/Build/source/texk/web2c/man/Makefile.in
@@ -50,11 +50,17 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-cross.m4 \
 	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
+	$(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-graphite-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-icu-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-lex.m4 \
 	$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-macos-framework.m4 \
 	$(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-socket-libs.m4 \
+	$(top_srcdir)/../../m4/kpse-teckit-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-web2c.m4 \
 	$(top_srcdir)/../../m4/kpse-win32.m4 \
 	$(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \
@@ -109,7 +115,18 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FONTCONFIG_INCLUDES = @FONTCONFIG_INCLUDES@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
+FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
+FREETYPE2_LIBS = @FREETYPE2_LIBS@
+GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
+GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
+GRAPHITE_LIBS = @GRAPHITE_LIBS@
 GREP = @GREP@
+ICU_DEPEND = @ICU_DEPEND@
+ICU_INCLUDES = @ICU_INCLUDES@
+ICU_LIBS = @ICU_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -161,6 +178,9 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 TANGLE = @TANGLE@
 TANGLEBOOT = @TANGLEBOOT@
+TECKIT_DEPEND = @TECKIT_DEPEND@
+TECKIT_INCLUDES = @TECKIT_INCLUDES@
+TECKIT_LIBS = @TECKIT_LIBS@
 TIE = @TIE@
 VERSION = @VERSION@
 WEB2CVERSION = @WEB2CVERSION@
@@ -210,11 +230,13 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+ipc_socketlibs = @ipc_socketlibs@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 lt_ECHO = @lt_ECHO@
+lua_socketlibs = @lua_socketlibs@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -224,7 +246,6 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-socketlibs = @socketlibs@
 srcdir = @srcdir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
diff --git a/Build/source/texk/web2c/mplibdir/am/mplib.am b/Build/source/texk/web2c/mplibdir/am/mplib.am
index c979b25f7d8..26414bf8dfe 100644
--- a/Build/source/texk/web2c/mplibdir/am/mplib.am
+++ b/Build/source/texk/web2c/mplibdir/am/mplib.am
@@ -2,19 +2,22 @@
 
 ## metapost
 ##
+if MP
 bin_PROGRAMS += newmpost
-
+endif MP
 EXTRA_PROGRAMS += newmpost
 
 EXTRA_LIBRARIES += libmplib.a
 
-newmpost_c_h = mpost.c mpxout.c
+newmpost_c_h = mpost.c mpxout.c mpxout.h
 newmpost_web = mplibdir/mpost.w mplibdir/mpxout.w
 
-newmpost_CPPFLAGS = -I. -I$(srcdir)/mplibdir
+EXTRA_DIST += $(newmpost_web)
+
+newmpost_CPPFLAGS = -I$(srcdir)/mplibdir
 newmpost_DEPENDENCIES = libmplib.a
 newmpost_LDADD = libmplib.a $(KPATHSEA_LIBS) -lm
-newmpost_SOURCES = $(newmpost_c_h)
+nodist_newmpost_SOURCES = $(newmpost_c_h)
 
 $(newmpost_c_h): mpost-ctangle libmplib.a
 mpost-ctangle: ctangle$(EXEEXT) $(newmpost_web)
@@ -26,13 +29,17 @@ mpost-ctangle: ctangle$(EXEEXT) $(newmpost_web)
 DISTCLEANFILES += $(newmpost_c_h) mpost-ctangle
 
 ## These files are mutually dependent
-libmplib_c_h =  mp.c mplib.h mpmp.h mppsout.h psout.c mplibps.h svgout.c memio.c tfmin.c
+libmplib_c_h =  mp.c mplib.h mpmp.h
+libmplib_c_h += mppsout.h psout.c mplibps.h
+libmplib_c_h += mplibsvg.h mpsvgout.h svgout.c
+libmplib_c_h += memio.c tfmin.c
 libmplib_true_c = mplibdir/avl.h mplibdir/avl.c 
 libmplib_web = $(libmplib_true_c) mplibdir/mp.w mplibdir/psout.w
 libmplib_web += mplibdir/svgout.w mplibdir/memio.w mplibdir/tfmin.w
 
-libmplib_a_CPPFLAGS = -I. -I$(srcdir)/mplibdir
-libmplib_a_SOURCES = $(libmplib_c_h) $(libmplib_true_c)
+libmplib_a_CPPFLAGS = -I$(srcdir)/mplibdir
+nodist_libmplib_a_SOURCES = $(libmplib_c_h)
+libmplib_a_SOURCES = $(libmplib_true_c)
 
 $(libmplib_c_h): mplib-ctangle  $(libmplib_true_c)
 mplib-ctangle: ctangle$(EXEEXT) $(libmplib_web)
@@ -48,7 +55,6 @@ EXTRA_DIST += $(libmplib_web)
 
 DISTCLEANFILES += $(libmplib_c_h) mplib-ctangle
 
-# only used by luatex, perhaps should not be mentioned here
+## only used by luatex, perhaps should not be mentioned here
 EXTRA_DIST += mplibdir/lmplib.c
 
-
diff --git a/Build/source/texk/web2c/mpware/Makefile.in b/Build/source/texk/web2c/mpware/Makefile.in
index ba5fc514656..bff25a6a7bf 100644
--- a/Build/source/texk/web2c/mpware/Makefile.in
+++ b/Build/source/texk/web2c/mpware/Makefile.in
@@ -42,11 +42,17 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-cross.m4 \
 	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
+	$(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-graphite-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-icu-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-lex.m4 \
 	$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-macos-framework.m4 \
 	$(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-socket-libs.m4 \
+	$(top_srcdir)/../../m4/kpse-teckit-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-web2c.m4 \
 	$(top_srcdir)/../../m4/kpse-win32.m4 \
 	$(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \
@@ -129,7 +135,18 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FONTCONFIG_INCLUDES = @FONTCONFIG_INCLUDES@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
+FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
+FREETYPE2_LIBS = @FREETYPE2_LIBS@
+GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
+GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
+GRAPHITE_LIBS = @GRAPHITE_LIBS@
 GREP = @GREP@
+ICU_DEPEND = @ICU_DEPEND@
+ICU_INCLUDES = @ICU_INCLUDES@
+ICU_LIBS = @ICU_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -181,6 +198,9 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 TANGLE = @TANGLE@
 TANGLEBOOT = @TANGLEBOOT@
+TECKIT_DEPEND = @TECKIT_DEPEND@
+TECKIT_INCLUDES = @TECKIT_INCLUDES@
+TECKIT_LIBS = @TECKIT_LIBS@
 TIE = @TIE@
 VERSION = @VERSION@
 WEB2CVERSION = @WEB2CVERSION@
@@ -230,11 +250,13 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+ipc_socketlibs = @ipc_socketlibs@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 lt_ECHO = @lt_ECHO@
+lua_socketlibs = @lua_socketlibs@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -244,7 +266,6 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-socketlibs = @socketlibs@
 srcdir = @srcdir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in
index e5322590687..b223bc30a0f 100644
--- a/Build/source/texk/web2c/omegafonts/Makefile.in
+++ b/Build/source/texk/web2c/omegafonts/Makefile.in
@@ -41,11 +41,17 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-cross.m4 \
 	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
+	$(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-graphite-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-icu-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-lex.m4 \
 	$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-macos-framework.m4 \
 	$(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-socket-libs.m4 \
+	$(top_srcdir)/../../m4/kpse-teckit-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-web2c.m4 \
 	$(top_srcdir)/../../m4/kpse-win32.m4 \
 	$(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \
@@ -135,7 +141,18 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FONTCONFIG_INCLUDES = @FONTCONFIG_INCLUDES@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
+FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
+FREETYPE2_LIBS = @FREETYPE2_LIBS@
+GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
+GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
+GRAPHITE_LIBS = @GRAPHITE_LIBS@
 GREP = @GREP@
+ICU_DEPEND = @ICU_DEPEND@
+ICU_INCLUDES = @ICU_INCLUDES@
+ICU_LIBS = @ICU_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -187,6 +204,9 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 TANGLE = @TANGLE@
 TANGLEBOOT = @TANGLEBOOT@
+TECKIT_DEPEND = @TECKIT_DEPEND@
+TECKIT_INCLUDES = @TECKIT_INCLUDES@
+TECKIT_LIBS = @TECKIT_LIBS@
 TIE = @TIE@
 VERSION = @VERSION@
 WEB2CVERSION = @WEB2CVERSION@
@@ -236,11 +256,13 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+ipc_socketlibs = @ipc_socketlibs@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 lt_ECHO = @lt_ECHO@
+lua_socketlibs = @lua_socketlibs@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -250,7 +272,6 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-socketlibs = @socketlibs@
 srcdir = @srcdir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in
index 1049d75ea8d..93d016d7e78 100644
--- a/Build/source/texk/web2c/otps/Makefile.in
+++ b/Build/source/texk/web2c/otps/Makefile.in
@@ -44,11 +44,17 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-cross.m4 \
 	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
+	$(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-graphite-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-icu-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-lex.m4 \
 	$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-macos-framework.m4 \
 	$(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-socket-libs.m4 \
+	$(top_srcdir)/../../m4/kpse-teckit-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-web2c.m4 \
 	$(top_srcdir)/../../m4/kpse-win32.m4 \
 	$(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \
@@ -137,7 +143,18 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FONTCONFIG_INCLUDES = @FONTCONFIG_INCLUDES@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
+FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
+FREETYPE2_LIBS = @FREETYPE2_LIBS@
+GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
+GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
+GRAPHITE_LIBS = @GRAPHITE_LIBS@
 GREP = @GREP@
+ICU_DEPEND = @ICU_DEPEND@
+ICU_INCLUDES = @ICU_INCLUDES@
+ICU_LIBS = @ICU_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -189,6 +206,9 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 TANGLE = @TANGLE@
 TANGLEBOOT = @TANGLEBOOT@
+TECKIT_DEPEND = @TECKIT_DEPEND@
+TECKIT_INCLUDES = @TECKIT_INCLUDES@
+TECKIT_LIBS = @TECKIT_LIBS@
 TIE = @TIE@
 VERSION = @VERSION@
 WEB2CVERSION = @WEB2CVERSION@
@@ -238,11 +258,13 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+ipc_socketlibs = @ipc_socketlibs@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 lt_ECHO = @lt_ECHO@
+lua_socketlibs = @lua_socketlibs@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -252,7 +274,6 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-socketlibs = @socketlibs@
 srcdir = @srcdir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
diff --git a/Build/source/texk/web2c/pdftexdir/am/libpdftex.am b/Build/source/texk/web2c/pdftexdir/am/libpdftex.am
new file mode 100644
index 00000000000..7b464242f0e
--- /dev/null
+++ b/Build/source/texk/web2c/pdftexdir/am/libpdftex.am
@@ -0,0 +1,61 @@
+## texk/web2c/pdftexdir/am/libpdftex.am: Makefile fragment for libpdftex.
+
+## libpdftex
+##
+EXTRA_LIBRARIES += libpdftex.a
+
+libpdftex_a_CPPFLAGS = $(pdftex_cppflags)
+
+libpdftex_a_SOURCES = \
+	pdftexdir/avl.c \
+	pdftexdir/avl.h \
+	pdftexdir/avlstuff.c \
+	pdftexdir/avlstuff.h \
+	pdftexdir/epdf.c \
+	pdftexdir/epdf.h \
+	pdftexdir/image.h \
+	pdftexdir/mapfile.c \
+	pdftexdir/pdftex.h \
+	pdftexdir/pdftoepdf.cc \
+	pdftexdir/pkin.c \
+	pdftexdir/ptexlib.h \
+	pdftexdir/ptexmac.h \
+	pdftexdir/subfont.c \
+	pdftexdir/tounicode.c \
+	pdftexdir/utils.c \
+	pdftexdir/vfpacket.c \
+	pdftexdir/writeenc.c \
+	pdftexdir/writefont.c \
+	pdftexdir/writeimg.c \
+	pdftexdir/writejbig2.c \
+	pdftexdir/writejbig2.h \
+	pdftexdir/writejpg.c \
+	pdftexdir/writepng.c \
+	pdftexdir/writet1.c \
+	pdftexdir/writet3.c \
+	pdftexdir/writettf.c \
+	pdftexdir/writettf.h \
+	pdftexdir/writezip.c
+
+if MINGW32
+libpdftex_a_SOURCES += \
+	pdftexdir/regex/regex.c \
+	pdftexdir/regex/regex.h
+endif MINGW32
+
+## We must create pdftexd.h before building the libpdftex_a_OBJECTS.
+$(libpdftex_a_OBJECTS): pdftexd.h
+
+## included by pdftexdir/writettf.c
+EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c
+
+## included by pdftexdir/regex/regex.c
+EXTRA_libpdftex_a_SOURCES += \
+	pdftexdir/regex/regcomp.c \
+	pdftexdir/regex/regex_internal.c \
+	pdftexdir/regex/regex_internal.h \
+	pdftexdir/regex/regexec.c
+
+EXTRA_DIST += \
+	pdftexdir/regex/COPYING.LIB \
+	pdftexdir/regex/README
diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
index b4caa4323bb..808103ed721 100644
--- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am
+++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
@@ -25,7 +25,8 @@ pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir $(buildenv) $(TANGLE)
 
 pdftex_CPPFLAGS = $(pdftex_cppflags)
 
-pdftex_LDADD = $(pdftex_ldadd) $(LDADD) $(socketlibs)
+## With --enable-ipc, pdfTeX may need to link with -lsocket.
+pdftex_LDADD = $(pdftex_ldadd) $(LDADD) $(ipc_socketlibs)
 
 pdftex_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a
 
@@ -71,95 +72,11 @@ EXTRA_DIST += $(pdftex_ch_srcs) \
 DISTCLEANFILES += $(nodist_pdftex_SOURCES) pdftex.ch pdftex-web2c \
 	pdftex.p pdftex.pool pdftex-tangle pdftexdir/pdftex.version
 
-## ttf2afm
-##
-bin_PROGRAMS += ttf2afm
-
-ttf2afm_CPPFLAGS = -I$(srcdir)/pdftexdir 
-
-ttf2afm_SOURCES = pdftexdir/ttf2afm.c
-
-## included by pdftexdir/ttf2afm.c
-EXTRA_ttf2afm_SOURCES = pdftexdir/macnames.c
-
-## pdftosrc
-##
-bin_PROGRAMS += pdftosrc
-
-## Force Automake to use CXXLD for linking
-nodist_EXTRA_pdftosrc_SOURCES = dummy.cxx
-
-pdftosrc_CPPFLAGS = $(pdftex_cppflags)
-
-pdftosrc_SOURCES = pdftexdir/pdftosrc.cc
-
-pdftosrc_LDADD = $(pdftex_ldadd) $(LDADD)
-
-pdftosrc_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a
-
-## libpdftex
-##
-EXTRA_LIBRARIES += libpdftex.a
-
-libpdftex_a_CPPFLAGS = $(pdftex_cppflags)
-
-libpdftex_a_SOURCES = \
-	pdftexdir/avl.c \
-	pdftexdir/avl.h \
-	pdftexdir/avlstuff.c \
-	pdftexdir/avlstuff.h \
-	pdftexdir/epdf.c \
-	pdftexdir/epdf.h \
-	pdftexdir/image.h \
-	pdftexdir/mapfile.c \
-	pdftexdir/pdftex.h \
-	pdftexdir/pdftoepdf.cc \
-	pdftexdir/pkin.c \
-	pdftexdir/ptexlib.h \
-	pdftexdir/ptexmac.h \
-	pdftexdir/subfont.c \
-	pdftexdir/tounicode.c \
-	pdftexdir/utils.c \
-	pdftexdir/vfpacket.c \
-	pdftexdir/writeenc.c \
-	pdftexdir/writefont.c \
-	pdftexdir/writeimg.c \
-	pdftexdir/writejbig2.c \
-	pdftexdir/writejbig2.h \
-	pdftexdir/writejpg.c \
-	pdftexdir/writepng.c \
-	pdftexdir/writet1.c \
-	pdftexdir/writet3.c \
-	pdftexdir/writettf.c \
-	pdftexdir/writettf.h \
-	pdftexdir/writezip.c
-
-if MINGW32
-libpdftex_a_SOURCES += \
-	pdftexdir/regex/regex.c \
-	pdftexdir/regex/regex.h
-endif MINGW32
-
-## We must create pdftexd.h before building the libpdftex_a_OBJECTS.
-$(libpdftex_a_OBJECTS): pdftexd.h
-
-## included by pdftexdir/writettf.c
-EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c
-
-## included by pdftexdir/regex/regex.c
-EXTRA_libpdftex_a_SOURCES += \
-	pdftexdir/regex/regcomp.c \
-	pdftexdir/regex/regex_internal.c \
-	pdftexdir/regex/regex_internal.h \
-	pdftexdir/regex/regexec.c
-
 EXTRA_DIST += \
 	pdftexdir/ChangeLog \
 	pdftexdir/NEWS \
 	pdftexdir/README \
-	pdftexdir/change-files.txt \
-	pdftexdir/regex/COPYING.LIB \
-	pdftexdir/regex/README
+	pdftexdir/change-files.txt
 
 ## Not used
 ##
diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftosrc.am b/Build/source/texk/web2c/pdftexdir/am/pdftosrc.am
new file mode 100644
index 00000000000..039589db40f
--- /dev/null
+++ b/Build/source/texk/web2c/pdftexdir/am/pdftosrc.am
@@ -0,0 +1,16 @@
+## texk/web2c/pdftexdir/am/pdftosrc.am: Makefile fragment for pdftosrc.
+
+## pdftosrc
+##
+bin_PROGRAMS += pdftosrc
+
+## Force Automake to use CXXLD for linking
+nodist_EXTRA_pdftosrc_SOURCES = dummy.cxx
+
+pdftosrc_CPPFLAGS = $(pdftex_cppflags)
+
+pdftosrc_SOURCES = pdftexdir/pdftosrc.cc
+
+pdftosrc_LDADD = $(pdftex_ldadd) $(LDADD)
+
+pdftosrc_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a
diff --git a/Build/source/texk/web2c/pdftexdir/am/ttf2afm.am b/Build/source/texk/web2c/pdftexdir/am/ttf2afm.am
new file mode 100644
index 00000000000..0382bd5ae63
--- /dev/null
+++ b/Build/source/texk/web2c/pdftexdir/am/ttf2afm.am
@@ -0,0 +1,12 @@
+## texk/web2c/pdftexdir/am/ttf2afm.am: Makefile fragment for ttf2afm.
+
+## ttf2afm
+##
+bin_PROGRAMS += ttf2afm
+
+ttf2afm_CPPFLAGS = -I$(srcdir)/pdftexdir 
+
+ttf2afm_SOURCES = pdftexdir/ttf2afm.c
+
+## included by pdftexdir/ttf2afm.c
+EXTRA_ttf2afm_SOURCES = pdftexdir/macnames.c
diff --git a/Build/source/texk/web2c/window/Makefile.in b/Build/source/texk/web2c/window/Makefile.in
index 950c78a2101..4b954acd3b3 100644
--- a/Build/source/texk/web2c/window/Makefile.in
+++ b/Build/source/texk/web2c/window/Makefile.in
@@ -41,11 +41,17 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-cross.m4 \
 	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
+	$(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-graphite-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-icu-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-lex.m4 \
 	$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
+	$(top_srcdir)/../../m4/kpse-macos-framework.m4 \
 	$(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-socket-libs.m4 \
+	$(top_srcdir)/../../m4/kpse-teckit-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-web2c.m4 \
 	$(top_srcdir)/../../m4/kpse-win32.m4 \
 	$(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \
@@ -124,7 +130,18 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FONTCONFIG_INCLUDES = @FONTCONFIG_INCLUDES@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
+FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
+FREETYPE2_LIBS = @FREETYPE2_LIBS@
+GRAPHITE_DEPEND = @GRAPHITE_DEPEND@
+GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@
+GRAPHITE_LIBS = @GRAPHITE_LIBS@
 GREP = @GREP@
+ICU_DEPEND = @ICU_DEPEND@
+ICU_INCLUDES = @ICU_INCLUDES@
+ICU_LIBS = @ICU_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -176,6 +193,9 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 TANGLE = @TANGLE@
 TANGLEBOOT = @TANGLEBOOT@
+TECKIT_DEPEND = @TECKIT_DEPEND@
+TECKIT_INCLUDES = @TECKIT_INCLUDES@
+TECKIT_LIBS = @TECKIT_LIBS@
 TIE = @TIE@
 VERSION = @VERSION@
 WEB2CVERSION = @WEB2CVERSION@
@@ -225,11 +245,13 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+ipc_socketlibs = @ipc_socketlibs@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 lt_ECHO = @lt_ECHO@
+lua_socketlibs = @lua_socketlibs@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -239,7 +261,6 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-socketlibs = @socketlibs@
 srcdir = @srcdir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXFontMgr_Mac.cpp b/Build/source/texk/web2c/xetexdir/XeTeXFontMgr_Mac.cpp
new file mode 100644
index 00000000000..8da48ac0f43
--- /dev/null
+++ b/Build/source/texk/web2c/xetexdir/XeTeXFontMgr_Mac.cpp
@@ -0,0 +1,13 @@
+/****************************************************************************\
+ Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+
+ This file is free software; the copyright holder
+ gives unlimited permission to copy and/or distribute it,
+ with or without modifications, as long as this notice is preserved.
+
+ Automake (1.10.2) does not generate a rule to compile
+ the Objective C++ file XeTeXFontMgr_Mac.mm.
+ Since that file is to be compiled with '$(CXX) -ObjC++' we provide
+ this C++ wrapper XeTeXFontMgr_Mac.cpp including the Objective C++ file.
+\****************************************************************************/
+#include "XeTeXFontMgr_Mac.mm"
diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am
index 62aff84e37c..9c4cb58a0f2 100644
--- a/Build/source/texk/web2c/xetexdir/am/xetex.am
+++ b/Build/source/texk/web2c/xetexdir/am/xetex.am
@@ -2,24 +2,140 @@
 
 ## XeTeX
 ##
+if XETEX
+bin_PROGRAMS += xetex
+endif XETEX
+EXTRA_PROGRAMS += xetex
+
+## Force Automake to use CXXLD for linking
+nodist_EXTRA_xetex_SOURCES = dummy.cxx
+
+libxetex = libxetex.a
+
+xetex_cppflags = -DLE_USE_CMEMORY -I$(srcdir)/xetexdir
+xetex_cppflags += $(ICU_INCLUDES) $(TECKIT_INCLUDES)
+xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS)
+xetex_dependencies = $(proglib)
+xetex_dependencies += $(ICU_DEPEND) $(TECKIT_DEPEND)
+
+if XETEX_MACOSX
+
+xetex_cppflags += -DXETEX_MAC
+xetex_LDFLAGS = -framework Carbon -framework Cocoa -framework QuickTime
+
+## Extra library for the Objective C++ file xetexdir/XeTeXFontMgr_Mac.mm.
+libxetex += libxetexmm.a
+
+else !XETEX_MACOSX
+
+xetex_cppflags += -DXETEX_OTHER
+xetex_cppflags += $(FONTCONFIG_INCLUDES) $(XPDF_INCLUDES) $(LIBPNG_INCLUDES)
+xetex_ldadd += $(FONTCONFIG_LIBS) $(XPDF_LIBS) $(LIBPNG_LIBS)
+xetex_dependencies += $(XPDF_DEPEND) $(LIBPNG_DEPEND)
+
+endif !XETEX_MACOSX
+
+if XETEX_GRAPHITE
+
+xetex_cppflags += -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES)
+xetex_ldadd += $(GRAPHITE_LIBS)
+xetex_dependencies += $(GRAPHITE_DEPEND)
+
+endif XETEX_GRAPHITE
+
+xetex_cppflags += $(FREETYPE2_INCLUDES) $(ZLIB_INCLUDES)
+xetex_ldadd += $(FREETYPE2_LIBS) $(ZLIB_LIBS)
+xetex_dependencies += $(FREETYPE2_DEPEND) $(ZLIB_DEPEND)
+
+xetex_CPPFLAGS = $(xetex_cppflags)
+
+## With --enable-ipc, XeTeX may need to link with -lsocket.
+xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
+
+xetex_DEPENDENCIES = $(xetex_dependencies) $(libxetex)
+
+## XeTeX C sources
+xetex_c_h = xetexini.c xetex0.c xetex1.c xetex2.c xetexcoerce.h xetexd.h
+nodist_xetex_SOURCES = $(xetex_c_h) xetex_pool.c xetexextra.c xetexdir/xetexextra.h
+
+$(xetex_c_h): xetex-web2c
+xetex-web2c: xetex.p $(web2c_texmf) xetexdir/xetex.defines
+	$(web2c) xetex
+	: $(synctex_convert_xetex)
+	echo timestamp >$@
+	touch $(xetex_c_h)
+
+xetex_pool.c: xetex.pool xetexd.h
+	perl $(srcdir)/xetexdir/pool2c.pl $< $@
+
+xetexextra.c: xetexdir/xetexextra.h lib/texmfmp.c xetexd.h
+	sed s/TEX-OR-MF-OR-MP/xetex/ $(srcdir)/lib/texmfmp.c >$@
+
+xetexdir/xetexextra.h: xetexdir/xetexextra.in xetexdir/xetex.version xetexdir/etex.version
+	$(mkdir_p) xetexdir
+	sed -e s/XETEX-VERSION/`cat xetexdir/xetex.version`/ \
+	    -e s/ETEX-VERSION/`cat xetexdir/etex.version`/ \
+	  $(srcdir)/xetexdir/xetexextra.in >$@
+
+## Tangling XeTeX
+xetex.p xetex.pool: xetex-tangle
+xetex-tangle: ./otangle$(EXEEXT) xetex.web
+	$(otangle) xetex
+	echo timestamp >$@
+	touch xetex.p xetex.pool
+
+## Extract etex version
+xetexdir/etex.version: etexdir/etex.ch
+	$(mkdir_p) xetexdir
+	grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
+	  | sed "s/^.*'-//;s/'.*$$//" >$@
+
+## Extract xetex version
+xetexdir/xetex.version: xetexdir/xetex.ch
+	$(mkdir_p) xetexdir
+	grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.ch \
+	  | sed "s/^.*'-//;s/'.*$$//" >$@
+
+## Generate xetex.web
+xetex.web: $(TIE) $(xetex_web_srcs)
+	$(tie) -m xetex.web $(xetex_web_srcs)
+
+xetex_web_srcs = \
+	tex.web \
+	etexdir/etex.ch \
+	etexdir/tex.ch0 \
+	tex.ch \
+	etexdir/tex.ch1 \
+	etexdir/tex.ech \
+	$(xetex_ch_synctex) \
+	xetexdir/xetex.ch \
+	$(xetex_post_ch_synctex)
+##
+EXTRA_DIST += $(xetex_web_srcs) xetexdir/xetex.defines xetexdir/xetexextra.in
+
+DISTCLEANFILES += $(nodist_xetex_SOURCES) xetex.web xetex-web2c \
+	xetex.p xetex.pool xetex-tangle xetexdir/etex.version xetexdir/xetex.version
+
 EXTRA_DIST += \
+	xetexdir/pool2c.pl \
+	xetexdir/unicode-char-prep.pl
+
+## libxetex
+##
+EXTRA_LIBRARIES += libxetex.a
+
+libxetex_a_CPPFLAGS = $(xetex_cppflags)
+
+libxetex_a_SOURCES = \
+	xetexdir/MathTable.h \
 	xetexdir/FontTableCache.cpp \
 	xetexdir/FontTableCache.h \
-	xetexdir/MathTable.h \
 	xetexdir/XeTeXFontInst.cpp \
 	xetexdir/XeTeXFontInst.h \
 	xetexdir/XeTeXFontInst_FT2.cpp \
 	xetexdir/XeTeXFontInst_FT2.h \
-	xetexdir/XeTeXFontInst_Mac.cpp \
-	xetexdir/XeTeXFontInst_Mac.h \
 	xetexdir/XeTeXFontMgr.cpp \
 	xetexdir/XeTeXFontMgr.h \
-	xetexdir/XeTeXFontMgr_FC.cpp \
-	xetexdir/XeTeXFontMgr_FC.h \
-	xetexdir/XeTeXFontMgr_Mac.h \
-	xetexdir/XeTeXFontMgr_Mac.mm \
-	xetexdir/XeTeXGrLayout.cpp \
-	xetexdir/XeTeXGrLayout.h \
 	xetexdir/XeTeXLayoutInterface.cpp \
 	xetexdir/XeTeXLayoutInterface.h \
 	xetexdir/XeTeXOTLayoutEngine.cpp \
@@ -28,14 +144,32 @@ EXTRA_DIST += \
 	xetexdir/XeTeXOTMath.h \
 	xetexdir/XeTeX_ext.c \
 	xetexdir/XeTeX_ext.h \
-	xetexdir/XeTeX_mac.c \
-	xetexdir/XeTeX_pic.c \
 	xetexdir/XeTeXswap.h \
-	xetexdir/appleGlyphNames.c \
-	xetexdir/bmpimage.c \
-	xetexdir/bmpimage.h \
 	xetexdir/cmaps.cpp \
 	xetexdir/cmaps.h \
+	xetexdir/sfnt.h \
+	xetexdir/trans.c \
+	xetexdir/trans.h \
+	xetexdir/xetex.h
+
+## included by xetexdir/XeTeXLayoutInterface.cpp
+EXTRA_DIST += xetexdir/appleGlyphNames.c
+
+if XETEX_MACOSX
+
+libxetex_a_SOURCES += \
+	xetexdir/XeTeXFontInst_Mac.cpp \
+	xetexdir/XeTeXFontInst_Mac.h \
+	xetexdir/XeTeX_mac.c
+
+else !XETEX_MACOSX
+
+libxetex_a_SOURCES += \
+	xetexdir/XeTeXFontMgr_FC.cpp \
+	xetexdir/XeTeXFontMgr_FC.h \
+	xetexdir/XeTeX_pic.c \
+	xetexdir/bmpimage.c \
+	xetexdir/bmpimage.h \
 	xetexdir/jpegimage.c \
 	xetexdir/jpegimage.h \
 	xetexdir/mfileio.c \
@@ -45,16 +179,41 @@ EXTRA_DIST += \
 	xetexdir/pdfimage.cpp \
 	xetexdir/pdfimage.h \
 	xetexdir/pngimage.c \
-	xetexdir/pngimage.h \
-	xetexdir/pool2c.pl \
-	xetexdir/sfnt.h \
-	xetexdir/trans.c \
-	xetexdir/trans.h \
-	xetexdir/unicode-char-prep.pl \
-	xetexdir/xetex.ch \
-	xetexdir/xetex.defines \
-	xetexdir/xetex.h \
-	xetexdir/xetexextra.in
+	xetexdir/pngimage.h
+
+endif !XETEX_MACOSX
+
+if XETEX_GRAPHITE
+
+libxetex_a_SOURCES += \
+	xetexdir/XeTeXGrLayout.cpp \
+	xetexdir/XeTeXGrLayout.h
+
+endif XETEX_GRAPHITE
+
+## We must create xetexd.h before building the libxetex_a_OBJECTS.
+$(libxetex_a_OBJECTS): xetexd.h
+
+## libxetexmm (Mac OS X only)
+##
+## Automake (1.10.2) does not generate a rule to compile
+## the Objective C++ file xetexdir/XeTeXFontMgr_Mac.mm.
+## Since this file is to be compiled with '$(CXX) -ObjC++' we provide a
+## C++ wrapper xetexdir/XeTeXFontMgr_Mac.cpp including the Objective C++ file.
+## Since Automake does not allow to specify CXXFLAGS for inividual objects,
+## we use an additional library libxetexmm.a.
+EXTRA_LIBRARIES += libxetexmm.a
+
+libxetexmm_a_CPPFLAGS = $(xetex_cppflags)
+
+libxetexmm_a_CXXFLAGS = -ObjC++
+
+libxetexmm_a_SOURCES = \
+	xetexdir/XeTeXFontMgr_Mac.cpp \
+	xetexdir/XeTeXFontMgr_Mac.h
+
+## included by xetexdir/XeTeXFontMgr_Mac.cpp
+EXTRA_DIST += xetexdir/XeTeXFontMgr_Mac.mm
 
 ## Not used
 ##
@@ -65,6 +224,7 @@ EXTRA_DIST += \
 ##
 EXTRA_DIST += \
 	xetexdir/acx_pthread.m4 \
+	xetexdir/am/xetex.mk \
 	xetexdir/tests.ac \
 	xetexdir/withenable.ac \
 	xetexdir/xetex.mk
diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.mk b/Build/source/texk/web2c/xetexdir/am/xetex.mk
new file mode 100644
index 00000000000..94c9a75727d
--- /dev/null
+++ b/Build/source/texk/web2c/xetexdir/am/xetex.mk
@@ -0,0 +1,205 @@
+# Makefile fragment for XeTeX and web2c. -- Jonathan Kew -- Public domain.
+# This fragment contains the parts of the makefile that are most likely to
+# differ between releases of XeTeX.
+
+Makefile: $(srcdir)/xetexdir/xetex.mk
+
+# this should probably move to common.mk some day,
+# but need to check possible effect on other programs
+ALL_CXXFLAGS = @CXXFLAGS@
+
+# We build xetex unless configure decides to skip it
+xetex = @XETEX@ xetex
+
+### Platform-specific defines and files to be built
+
+# On Mac OS X:
+@XETEX_MACOSX@ xetex_platform_o = XeTeXFontMgr_Mac.o
+
+# On non-Mac platforms:
+
+@XETEX_GENERIC@ EXTRADEPS = @LIBXPDFDEP@ @LIBPNGDEP@
+
+### is Graphite support included?
+
+@XETEX_GRAPHITE@ GRAPHITEDIR = ../../libs/graphite-engine
+@XETEX_GRAPHITE@ GRAPHITESRCDIR = $(srcdir)/$(GRAPHITEDIR)
+
+@XETEX_GRAPHITE@ GRAPHITEFLAGS = @GRAPHITECPPFLAGS@
+@XETEX_GRAPHITE@ LDGRAPHITE = @LDGRAPHITE@
+@XETEX_GRAPHITE@ GRAPHITEDEP = @GRAPHITEDEP@
+
+### end of platform-specific setup
+
+LDLIBXPDF=@LDLIBXPDF@
+LIBXPDFCPPFLAGS=@LIBXPDFCPPFLAGS@
+LIBXPDFDEP=@LIBXPDFDEP@
+
+LIBXPDFDIR=../../libs/xpdf
+LIBXPDFSRCDIR=$(srcdir)/$(LIBXPDFDIR)
+
+LDLIBPNG=@LDLIBPNG@
+LIBPNGCPPFLAGS=@LIBPNGCPPFLAGS@
+LIBPNGDEP=@LIBPNGDEP@
+
+LIBPNGDIR=../../libs/libpng
+LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR)
+
+LDFREETYPE2 = @LDFREETYPE2@
+FTFLAGS =  @FREETYPE2CPPFLAGS@
+FREETYPE2DEP = @FREETYPE2DEP@
+
+FREETYPE2DIR = ../../libs/freetype2
+FREETYPE2SRCDIR = $(srcdir)/$(FREETYPE2DIR)
+
+TECKITFLAGS = @TECKITCPPFLAGS@
+LDTECKIT = @LDTECKIT@
+TECKITDEP = @TECKITDEP@
+
+TECKITDIR=../../libs/teckit
+TECKITSRCDIR=$(srcdir)/$(TECKITDIR)
+
+ICUFLAGS = @ICUCPPFLAGS@
+LDICU = @LDICU@
+ICUDEP = @ICUDEP@
+
+ICUDIR=../../libs/icu-xetex
+ICUSRCDIR=$(srcdir)/$(ICUDIR)
+
+ICUCFLAGS = @ICUCPPFLAGS@ -DLE_USE_CMEMORY
+
+ZLIBCPPFLAGS = @ZLIBCPPFLAGS@
+LDZLIB = @LDZLIB@
+
+ZLIBDIR = ../../libs/zlib
+ZLIBSRCDIR = $(srcdir)/$(ZLIBDIR)
+
+FONTCONFIGCPPFLAGS = @FONTCONFIGCPPFLAGS@
+FONTCONFIGLDFLAGS  = @FONTCONFIGLDFLAGS@
+
+xetexlibs = $(LDICU) $(LDTECKIT) $(LDFREETYPE2) $(LDGRAPHITE) $(LDZLIB)
+
+# Font-related headers
+XeTeXFontHdrs = \
+	$(srcdir)/xetexdir/XeTeXFontMgr_Mac.h
+	
+
+# The C sources.
+xetex_c = xetexini.c xetex0.c xetex1.c xetex2.c
+xetex_o = xetexini.o xetex0.o xetex1.o xetex2.o xetexextra.o
+xetex_add_o = xetex_pool.o $(xetex_platform_o)
+
+# these compilations require the path to TECkit headers;
+# just setting it in XCFLAGS doesn't seem to work when we're called
+# recursively from "make world" etc
+xetexini.o: xetexini.c $(srcdir)/xetexdir/XeTeX_ext.h
+	$(compile) $(TECKITFLAGS) $(FTFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
+xetex0.o: xetex0.c $(srcdir)/xetexdir/XeTeX_ext.h
+	$(compile) $(TECKITFLAGS) $(FTFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
+xetex1.o: xetex1.c $(srcdir)/xetexdir/XeTeX_ext.h
+	$(compile) $(TECKITFLAGS) $(FTFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
+xetex2.o: xetex2.c $(srcdir)/xetexdir/XeTeX_ext.h
+	$(compile) $(TECKITFLAGS) $(FTFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
+xetexextra.o: xetexextra.c $(srcdir)/xetexdir/XeTeX_ext.h
+	$(compile) $(TECKITFLAGS) $(FTFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
+xetex_pool.o: xetex_pool.c $(srcdir)/xetexdir/XeTeX_ext.h
+	$(compile) $(TECKITFLAGS) $(FTFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
+
+# image support
+mfileio.o: $(srcdir)/xetexdir/mfileio.c $(srcdir)/xetexdir/mfileio.h
+	$(compile) $(ALL_CFLAGS) $(FTFLAGS) -c $< -o $@
+
+numbers.o: $(srcdir)/xetexdir/numbers.c $(srcdir)/xetexdir/numbers.h
+	$(compile) $(ALL_CFLAGS) $(FTFLAGS) -c $< -o $@
+
+bmpimage.o: $(srcdir)/xetexdir/bmpimage.c $(srcdir)/xetexdir/bmpimage.h
+	$(compile) $(ALL_CFLAGS) $(FTFLAGS) -c $< -o $@
+
+jpegimage.o: $(srcdir)/xetexdir/jpegimage.c $(srcdir)/xetexdir/jpegimage.h
+	$(compile) $(ALL_CFLAGS) $(FTFLAGS) -c $< -o $@
+
+pngimage.o: $(srcdir)/xetexdir/pngimage.c $(srcdir)/xetexdir/pngimage.h
+	$(compile) $(ALL_CFLAGS) $(FTFLAGS) $(LIBPNGCPPFLAGS) $(ZLIBCPPFLAGS) -c $< -o $@
+
+pdfimage.o: $(srcdir)/xetexdir/pdfimage.cpp $(srcdir)/xetexdir/pdfimage.h
+	$(CXX) $(ALL_CFLAGS) $(FTFLAGS) $(LIBXPDFCPPFLAGS) -c $< -o $@
+
+XeTeX_pic.o: $(srcdir)/xetexdir/XeTeX_pic.c $(srcdir)/xetexdir/XeTeX_ext.h $(XeTeXImageHdrs)
+	$(compile) $(TECKITFLAGS) $(FTFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
+
+# Layout library
+xetex_ot_layout_o = \
+		$(xetex_platform_layout_o) 
+
+XeTeXLayoutInterface.o: $(srcdir)/xetexdir/XeTeXLayoutInterface.cpp $(XeTeXFontHdrs)
+	$(CXX) $(ICUCFLAGS) $(FTFLAGS) $(GRAPHITEFLAGS) $(FONTCONFIGCPPFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) $(XETEX_GRAPHITE) -c $< -o $@
+XeTeXOTLayoutEngine.o: $(srcdir)/xetexdir/XeTeXOTLayoutEngine.cpp $(XeTeXFontHdrs)
+	$(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
+
+XeTeXFontMgr.o: $(srcdir)/xetexdir/XeTeXFontMgr.cpp  $(XeTeXFontHdrs)
+	$(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
+XeTeXFontMgr_FC.o: $(srcdir)/xetexdir/XeTeXFontMgr_FC.cpp  $(XeTeXFontHdrs)
+	$(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
+
+XeTeXFontMgr_Mac.o: $(srcdir)/xetexdir/XeTeXFontMgr_Mac.mm  $(XeTeXFontHdrs)
+	$(CXX) -ObjC++ $(ICUCFLAGS) $(FTFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
+
+cmaps.o: $(srcdir)/xetexdir/cmaps.cpp
+	$(CXX) $(ICUCFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
+FontTableCache.o: $(srcdir)/xetexdir/FontTableCache.cpp
+	$(CXX) $(ICUCFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
+
+XeTeXFontInst.o: $(srcdir)/xetexdir/XeTeXFontInst.cpp $(XeTeXFontHdrs)
+	$(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
+XeTeXFontInst_Mac.o: $(srcdir)/xetexdir/XeTeXFontInst_Mac.cpp $(XeTeXFontHdrs)
+	$(CXX) $(ICUCFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
+XeTeXFontInst_FT2.o: $(srcdir)/xetexdir/XeTeXFontInst_FT2.cpp $(XeTeXFontHdrs)
+	$(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
+
+XeTeXOTMath.o: $(srcdir)/xetexdir/XeTeXOTMath.cpp $(XeTeXFontHdrs)
+	$(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
+
+XeTeXGrLayout.o: $(srcdir)/xetexdir/XeTeXGrLayout.cpp $(srcdir)/xetexdir/XeTeXGrLayout.h \
+		$(XeTeXFontHdrs) $(GRAPHITESRCDIR)/include/graphite/Font.h
+	$(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(GRAPHITEFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
+
+# special rules for files that need the TECkit headers as well
+XeTeX_ext.o: $(srcdir)/xetexdir/XeTeX_ext.c xetexd.h
+	$(compile) $(ICUCFLAGS) $(FTFLAGS) $(TECKITFLAGS) $(LIBPNGCPPFLAGS) $(LIBXPDFCPPFLAGS) $(ZLIBCPPFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) $(XETEX_GRAPHITE) -c $< -o $@
+XeTeX_mac.o: $(srcdir)/xetexdir/XeTeX_mac.c xetexd.h
+	$(compile) $(ICUCFLAGS) $(TECKITFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
+
+trans.o: $(srcdir)/xetexdir/trans.c
+	$(compile) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
+
+# sync
+synctex-xe.o: synctex-xe.c
+	$(compile) $(ALL_CFLAGS) $(TECKITFLAGS) $(FTFLAGS) $(XETEX_DEFINES) -c $< -o $@
+
+# Making xetex.
+xetex: $(xetex_o) $(xetex_add_o) $(xetex_images_o) $(xetex_ot_layout_o) \
+		$(GRAPHITEDEP) $(TECKITDEP) $(FREETYPE2DEP) $(ICUDEP) $(EXTRADEPS)
+	@CXXHACKLINK@ $(xetex_o) $(xetex_add_o) $(xetex_images_o) $(xetex_ot_layout_o) \
+	$(FONTCONFIGLDFLAGS) $(socketlibs) $(xetexlibs) $(EXTRALIBS) \
+	@CXXHACKLDLIBS@ @CXXLDEXTRA@ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
+
+
+
+# Dumps
+all_xefmts = xetex.fmt $(xefmts)
+
+dumps: @XETEX@ xefmts
+xefmts: $(all_xefmts)
+
+xefmtdir = $(web2cdir)/xetex
+$(xefmtdir)::
+	$(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(xefmtdir)
+
+xetex.fmt: xetex
+	$(dumpenv) $(MAKE) progname=xetex files="xetex.ini unicode-letters.tex plain.tex cmr10.tfm" prereq-check
+	$(dumpenv) ./xetex --progname=xetex --jobname=xetex --ini \*\\input xetex.ini \\dump </dev/null
+
+xelatex.fmt: xetex
+	$(dumpenv) $(MAKE) progname=xelatex files="xelatex.ini unicode-letters.tex latex.ltx" prereq-check
+	$(dumpenv) ./xetex --progname=xelatex --jobname=xelatex --ini \*\\input xelatex.ini </dev/null
+
diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure
index cda840b9bae..6aa442472e9 100755
--- a/Build/source/texk/xdvipdfmx/configure
+++ b/Build/source/texk/xdvipdfmx/configure
@@ -17452,6 +17452,28 @@ $as_echo "$kpse_cv_have_truetype_format" >&6; }
 if test "x$kpse_cv_have_truetype_format" = xyes; then
   :
 else
+  if test "x$enable_build" = xno; then
+  { $as_echo "$as_me:$LINENO: WARNING: building xdvipdfmx has been disabled and would fail because
+Required file formats not found in Kpathsea header files.
+
+This version of xdvipdfmx requires that kpathsea and its headers be available.
+If you are sure they are installed and in a standard place, maybe you need a
+newer version of kpathsea?  You also might try setting the environment
+variable CPPFLAGS (or CFLAGS) with -I pointing to the directory containing
+the file \"kpathsea/kpathsea.h\"
+
+" >&5
+$as_echo "$as_me: WARNING: building xdvipdfmx has been disabled and would fail because
+Required file formats not found in Kpathsea header files.
+
+This version of xdvipdfmx requires that kpathsea and its headers be available.
+If you are sure they are installed and in a standard place, maybe you need a
+newer version of kpathsea?  You also might try setting the environment
+variable CPPFLAGS (or CFLAGS) with -I pointing to the directory containing
+the file \"kpathsea/kpathsea.h\"
+
+" >&2;}
+else
   { { $as_echo "$as_me:$LINENO: error: Required file formats not found in Kpathsea header files.
 
 This version of xdvipdfmx requires that kpathsea and its headers be available.
@@ -17473,6 +17495,9 @@ the file \"kpathsea/kpathsea.h\"
    { (exit 1); exit 1; }; }
 fi
 
+
+fi
+
 { $as_echo "$as_me:$LINENO: checking whether xbasename is declared" >&5
 $as_echo_n "checking whether xbasename is declared... " >&6; }
 if test "${ac_cv_have_decl_xbasename+set}" = set; then
@@ -17530,12 +17555,21 @@ $as_echo "$ac_cv_have_decl_xbasename" >&6; }
 if test "x$ac_cv_have_decl_xbasename" = x""yes; then
   :
 else
+  if test "x$enable_build" = xno; then
+  { $as_echo "$as_me:$LINENO: WARNING: building xdvipdfmx has been disabled and would fail because
+This version of xdvipdfmx requires xbasename in libkpathsea." >&5
+$as_echo "$as_me: WARNING: building xdvipdfmx has been disabled and would fail because
+This version of xdvipdfmx requires xbasename in libkpathsea." >&2;}
+else
   { { $as_echo "$as_me:$LINENO: error: This version of xdvipdfmx requires xbasename in libkpathsea." >&5
 $as_echo "$as_me: error: This version of xdvipdfmx requires xbasename in libkpathsea." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
+fi
+
+
 
 { $as_echo "$as_me:$LINENO: checking whether kpathsea declares the kpse_opentype_format" >&5
 $as_echo_n "checking whether kpathsea declares the kpse_opentype_format... " >&6; }
@@ -18228,6 +18262,16 @@ fi
 done
 
 else
+  if test "x$enable_build" = xno; then
+  { $as_echo "$as_me:$LINENO: WARNING: building xdvipdfmx has been disabled and would fail because
+This version of xdvipdfmx requires that FreeType2 and its headers be available.
+You can use the --with-freetype2-includes and/or --with-freetype2-libdir options
+to indicate the location of the installed freetype2 library and headers." >&5
+$as_echo "$as_me: WARNING: building xdvipdfmx has been disabled and would fail because
+This version of xdvipdfmx requires that FreeType2 and its headers be available.
+You can use the --with-freetype2-includes and/or --with-freetype2-libdir options
+to indicate the location of the installed freetype2 library and headers." >&2;}
+else
   { { $as_echo "$as_me:$LINENO: error: This version of xdvipdfmx requires that FreeType2 and its headers be available.
 You can use the --with-freetype2-includes and/or --with-freetype2-libdir options
 to indicate the location of the installed freetype2 library and headers." >&5
@@ -18238,6 +18282,9 @@ to indicate the location of the installed freetype2 library and headers." >&2;}
 fi
 
 
+fi
+
+
 
 CPPFLAGS=$kpse_save_CPPFLAGS
 LIBS=$kpse_save_LIBS
diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in
index fa3e1c9f566..3528c1e6355 100644
--- a/Build/source/utils/Makefile.in
+++ b/Build/source/utils/Makefile.in
@@ -61,7 +61,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../texk/ac/withenable.ac \
 	$(top_srcdir)/../texk/web2c/ac/withenable.ac \
 	$(top_srcdir)/../texk/web2c/ac/web2c.ac \
-	$(top_srcdir)/../texk/one/ac/withenable.ac \
 	$(top_srcdir)/../texk/afm2pl/ac/withenable.ac \
 	$(top_srcdir)/../texk/bibtex8/ac/withenable.ac \
 	$(top_srcdir)/../texk/cjkutils/ac/withenable.ac \
@@ -97,6 +96,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cxx-hack.m4 \
 	$(top_srcdir)/../texk/kpathsea/ac/withenable.ac \
 	$(top_srcdir)/../texk/kpathsea/ac/web2c.ac \
 	$(top_srcdir)/../libs/ac/withenable.ac \
+	$(top_srcdir)/../libs/icu/ac/withenable.ac \
 	$(top_srcdir)/../libs/teckit/ac/withenable.ac \
 	$(top_srcdir)/../libs/graphite/ac/withenable.ac \
 	$(top_srcdir)/../libs/xpdf/ac/withenable.ac \
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index cb1655e2678..cddff3df811 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -716,7 +716,6 @@ enable_tektronixwin
 enable_unitermwin
 enable_mp
 enable_web_progs
-enable_one
 enable_afm2pl
 enable_bibtex8
 enable_cjkutils
@@ -1455,25 +1454,24 @@ Optional Features:
   --disable-dump-share      make fmt/base/mem files architecture-dependent
   --enable-fmtutil          use fmtutil for build dumps
   --enable-ipc              enable TeX's --ipc option, i.e., pipe to a program
-  --disable-tex               do not compile and install TeX
-  --enable-etex               compile and install e-TeX
-  --disable-aleph             do not compile and install Aleph
-  --disable-pdftex            do not compile and install pdfTeX
-  --disable-luatex            do not compile and install luaTeX
-  --enable-xetex              compile and install XeTeX
+  --disable-tex             do not compile and install TeX
+  --enable-etex             compile and install e-TeX
+  --disable-aleph           do not compile and install Aleph
+  --disable-pdftex          do not compile and install pdfTeX
+  --disable-luatex          do not compile and install luaTeX
+  --disable-xetex           do not compile and install XeTeX
   --disable-mf              do not build METAFONT
-  --enable-mf-nowin           build a separate non-windows-capable METAFONT
-  --enable-epsfwin            include EPSF pseudo window support
-  --enable-hp2627win          include HP 2627 window support
-  --enable-mftalkwin          include mftalk (generic server) window support
-  --enable-nextwin            include NeXT window support
-  --enable-regiswin           include Regis window support
-  --enable-suntoolswin        include old Suntools (not X) window support
-  --enable-tektronixwin       include Tektronix window support
-  --enable-unitermwin         include Uniterm window support
+  --enable-mf-nowin         build a separate non-windows-capable METAFONT
+  --enable-epsfwin          include EPSF pseudo window support
+  --enable-hp2627win        include HP 2627 window support
+  --enable-mftalkwin        include mftalk (generic server) window support
+  --enable-nextwin          include NeXT window support
+  --enable-regiswin         include Regis window support
+  --enable-suntoolswin      include old Suntools (not X) window support
+  --enable-tektronixwin     include Tektronix window support
+  --enable-unitermwin       include Uniterm window support
   --disable-mp              do not build METAPOST
   --disable-web-progs       do not build WEB programs bibtex ... weave
-  --enable-one            build the one (testing) package
   --disable-afm2pl        do not build the afm2pl package
   --disable-bibtex8       do not build the bibtex8 package
   --disable-cjkutils      do not build the cjkutils package
@@ -1520,13 +1518,14 @@ Optional Features:
   --disable-xdvipdfmx     do not build the xdvipdfmx package
   --disable-tetex         do not build the tetex (teTeX scripts) package
   --disable-texlive       do not build the texlive (TeX Live scripts) package
-  --disable-mktexmf-default   do not run mktexmf if MF source missing
-  --disable-mktexpk-default   do not run mktexpk if PK font missing
-  --disable-mktextfm-default  do not run mktextfm if TFM file missing
-  --disable-mkocp-default     do not run mkocp if OCP file missing
-  --disable-mkofm-default     do not run mkofm if OFM file missing
-  --enable-mktexfmt-default   run mktexfmt if format file missing
-  --enable-mktextex-default   run mktextex if TeX source missing
+  --disable-mktexmf-default do not run mktexmf if MF source missing
+  --disable-mktexpk-default do not run mktexpk if PK font missing
+  --disable-mktextfm-default
+                            do not run mktextfm if TFM file missing
+  --disable-mkocp-default   do not run mkocp if OCP file missing
+  --disable-mkofm-default   do not run mkofm if OFM file missing
+  --enable-mktexfmt-default run mktexfmt if format file missing
+  --enable-mktextex-default run mktextex if TeX source missing
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
 
@@ -2286,7 +2285,7 @@ esac
 
 ## texk/ac/withenable.ac
 
-## texk/web2c/ac/withenable.ac
+## texk/web2c/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
 ## configure options and TL libraries required for web2c
 # Check whether --enable-web2c was given.
 if test "${enable_web2c+set}" = set; then
@@ -2305,7 +2304,7 @@ test "x$enable_web2c" = xno || {
   need_zlib=yes
 }
 
-## texk/web2c/ac/web2c.ac
+## texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
 ## configure options for TeX and MF
 
 # Check whether --with-editor was given.
@@ -2362,7 +2361,7 @@ case $enable_pdftex in
   *) enable_pdftex=yes ;;
 esac
 
-test "x$enable_pdftex" = xno || {
+test "x$enable_web2c:$enable_pdftex" = xyes:yes && {
   need_xpdf=yes
   need_libpng=yes
   need_obsdcompat=yes
@@ -2376,7 +2375,7 @@ case $enable_luatex in
   *) enable_luatex=yes ;;
 esac
 
-test "x$enable_luatex" = xno || {
+test "x$enable_web2c:$enable_luatex" = xyes:yes && {
   need_xpdf=yes
   need_libpng=yes
   need_obsdcompat=yes
@@ -2387,13 +2386,16 @@ if test "${enable_xetex+set}" = set; then
 fi
 case $enable_xetex in
   yes|no) : ;;
-  *) enable_xetex=no ;;
+  *) enable_xetex=yes ;;
 esac
 
-test "x$enable_xetex" = xno || {
+test "x$enable_web2c:$enable_xetex" = xyes:yes && {
   need_xpdf=yes
   need_libpng=yes
   need_freetype2=yes
+  need_icu=yes
+  need_teckit=yes
+  need_graphite=yes
 }
 ## configure options for MF
 # Check whether --enable-mf was given.
@@ -2453,29 +2455,6 @@ if test "${enable_web_progs+set}" = set; then
 fi
 
 
-## texk/one/ac/withenable.ac
-## configure options and TL libraries required for one
-# Check whether --enable-one was given.
-if test "${enable_one+set}" = set; then
-  enableval=$enable_one;
-fi
-case $enable_one in #(
-  yes|no);; #(
-  *) enable_one=no
-     { $as_echo "$as_me:$LINENO: Assuming \`--enable-one=$enable_one'" >&5
-$as_echo "$as_me: Assuming \`--enable-one=$enable_one'" >&6;}
-     ac_configure_args="$ac_configure_args '--enable-one=$enable_one'";;
-esac
-
-test "x$enable_one" = xno || {
-  need_freetype2=yes
-  need_t1lib=yes
-  need_gd=yes
-  need_teckit=yes
-  need_graphite=yes
-}
-
-
 ## texk/afm2pl/ac/withenable.ac
 ## configure options and TL libraries required for afm2pl
 # Check whether --enable-afm2pl was given.
@@ -3110,7 +3089,7 @@ esac
 
 
 
-## texk/kpathsea/ac/withenable.ac
+## texk/kpathsea/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
 ## configure options and TL libraries required for kpathsea
 
 # Check whether --with-system-kpathsea was given.
@@ -3140,7 +3119,7 @@ $as_echo "$as_me: Assuming installed \`kpathsea' headers and library" >&6;}
   ac_configure_args="$ac_configure_args '--with-system-kpathsea=$with_system_kpathsea'"
 fi
 
-## texk/kpathsea/ac/web2c.ac
+## texk/kpathsea/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
 ## configure options for mktextmf-default & Co
 # Check whether --enable-mktexmf-default was given.
 if test "${enable_mktexmf_default+set}" = set; then
@@ -3202,6 +3181,10 @@ esac
 
 ## libs/ac/withenable.ac
 
+## libs/icu/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/icu/
+## configure options and TL libraries required for icu (modified for XeTeX)
+
+
 ## libs/teckit/ac/withenable.ac
 ## configure options and TL libraries required for teckit
 
diff --git a/Build/source/utils/psutils/Makefile.am b/Build/source/utils/psutils/Makefile.am
index 15b7b4c10dc..754a7878e0c 100644
--- a/Build/source/utils/psutils/Makefile.am
+++ b/Build/source/utils/psutils/Makefile.am
@@ -1,36 +1,10 @@
 ##
 OS = UNIX
 PAPER = a4
-CHMOD = chmod
-BINMODE = +x
 
 AM_CPPFLAGS = -DUNIX -DPAPER=\"$(PAPER)\"
 
 bin_PROGRAMS = epsffit psbook psnup psresize psselect pstops
-bin_SCRIPTS = getafm showchar \
-              extractres fixdlsrps fixfmps fixmacps fixpsditps fixpspps \
-	      fixscribeps fixtpps fixwfwps fixwpps fixwwps includeres psmerge
-CLEANFILES = $(bin_SCRIPTS)
-
-PERL = /usr/bin/env perl
-MAKETEXT = $(PERL) $(srcdir)/maketext
-
-man1_MANS = epsffit.1 psbook.1 psnup.1 psresize.1 psselect.1 pstops.1 \
-            getafm.1 \
-	    extractres.1 fixdlsrps.man fixfmps.man fixmacps.man \
-	    fixpsditps.man fixpspps.man fixscribeps.man fixtpps.man \
-            fixwfwps.man fixwpps.man fixwwps.man includeres.man psmerge.man
-dist_man_MANS = $(man1_MANS)
-
-%: %.pl
-	$(MAKETEXT) OS=$(OS) PERL="$(PERL)" $< >$@
-
-%: %.sh
-	cp $< $@
-	$(CHMOD) $(BINMODE) $@
-
-%.1: %.man
-	$(MAKETEXT) PAPER=$(PAPER) "MAN=$(man1_MANS)" $< >$@
 
 epsffit_SOURCES = \
 	config.h \
@@ -87,23 +61,63 @@ pstops_SOURCES = \
 EXTRA_DIST = \
 	LICENSE
 
-# scripts.
-EXTRA_DIST += \
-	getafm.sh \
-	showchar.sh \
-	extractres.pl \
-	fixdlsrps.pl \
-	fixfmps.pl \
-	fixmacps.pl \
-	fixpsditps.pl \
-	fixpspps.pl \
-	fixscribeps.pl \
-	fixtpps.pl \
-	fixwfwps.pl \
-	fixwpps.pl \
-	fixwwps.pl \
-	includeres.pl \
-	psmerge.pl
+perl_scripts = extractres fixdlsrps fixfmps fixmacps fixpsditps fixpspps \
+	fixscribeps fixtpps fixwfwps fixwpps fixwwps includeres psmerge
+
+shell_scripts = getafm showchar
+
+nodist_bin_SCRIPTS = $(perl_scripts)
+
+install-exec-hook:
+	@for f in $(shell_scripts); do \
+	  echo "$(INSTALL_SCRIPT) '$(srcdir)/$$f.sh' '$(DESTDIR)$(bindir)/$$f'"; \
+	  $(INSTALL_SCRIPT) "$(srcdir)/$$f.sh" "$(DESTDIR)$(bindir)/$$f"; \
+	done
+
+uninstall-hook:
+	@for f in $(shell_scripts); do \
+	  echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+	done
+
+dist_man1_MANS = \
+	fixdlsrps.man \
+	fixfmps.man \
+	fixmacps.man \
+	fixpsditps.man \
+	fixpspps.man \
+	fixscribeps.man \
+	fixtpps.man \
+	fixwfwps.man \
+	fixwpps.man \
+	fixwwps.man \
+	getafm.man \
+	includeres.man \
+	psmerge.man
+
+nodist_man1_MANS = \
+	epsffit.1\
+	extractres.1 \
+	psbook.1 \
+	psnup.1 \
+	psresize.1 \
+	psselect.1 \
+	pstops.1
+
+EXTRA_DIST += $(perl_scripts:=.pl) $(shell_scripts:=.sh) $(nodist_man1_MANS:.1=.man)
+
+CLEANFILES = $(nodist_bin_SCRIPTS) $(nodist_man1_MANS)
+
+PERL = /usr/bin/env perl
+MAKETEXT = $(PERL) $(srcdir)/maketext
+
+EXTRA_DIST += maketext
+
+%: %.pl
+	$(MAKETEXT) OS=$(OS) PERL="$(PERL)" $< >$@
+
+%.1: %.man
+	$(MAKETEXT) PAPER=$(PAPER) "MAN=$(man1_MANS)" $< >$@
 
 ## Not used
 ##
@@ -116,7 +130,6 @@ EXTRA_DIST += \
 	Makefile.unix \
 	Makefile.wat \
 	descrip.mms \
-	maketext \
 	md68_0.ps \
 	md71_0.ps
 
diff --git a/Build/source/utils/psutils/Makefile.in b/Build/source/utils/psutils/Makefile.in
index 21287bfef24..bc6de42cf67 100644
--- a/Build/source/utils/psutils/Makefile.in
+++ b/Build/source/utils/psutils/Makefile.in
@@ -34,7 +34,7 @@ POST_UNINSTALL = :
 bin_PROGRAMS = epsffit$(EXEEXT) psbook$(EXEEXT) psnup$(EXEEXT) \
 	psresize$(EXEEXT) psselect$(EXEEXT) pstops$(EXEEXT)
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
+DIST_COMMON = README $(am__configure_deps) $(dist_man1_MANS) \
 	$(srcdir)/../../build-aux/depcomp \
 	$(srcdir)/../../build-aux/install-sh \
 	$(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \
@@ -53,7 +53,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES = patchlev.h
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(manmdir)"
+	"$(DESTDIR)$(man1dir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_epsffit_OBJECTS = epsffit.$(OBJEXT) pserror.$(OBJEXT)
@@ -79,8 +79,8 @@ am_pstops_OBJECTS = pserror.$(OBJEXT) psspec.$(OBJEXT) \
 	pstops.$(OBJEXT) psutil.$(OBJEXT)
 pstops_OBJECTS = $(am_pstops_OBJECTS)
 pstops_LDADD = $(LDADD)
-binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-SCRIPTS = $(bin_SCRIPTS)
+nodist_binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(nodist_bin_SCRIPTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -93,9 +93,8 @@ SOURCES = $(epsffit_SOURCES) $(psbook_SOURCES) $(psnup_SOURCES) \
 DIST_SOURCES = $(epsffit_SOURCES) $(psbook_SOURCES) $(psnup_SOURCES) \
 	$(psresize_SOURCES) $(psselect_SOURCES) $(pstops_SOURCES)
 man1dir = $(mandir)/man1
-manmdir = $(mandir)/manm
 NROFF = nroff
-MANS = $(dist_man_MANS) $(man1_MANS)
+MANS = $(dist_man1_MANS) $(nodist_man1_MANS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -194,23 +193,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 OS = UNIX
 PAPER = a4
-CHMOD = chmod
-BINMODE = +x
 AM_CPPFLAGS = -DUNIX -DPAPER=\"$(PAPER)\"
-bin_SCRIPTS = getafm showchar \
-              extractres fixdlsrps fixfmps fixmacps fixpsditps fixpspps \
-	      fixscribeps fixtpps fixwfwps fixwpps fixwwps includeres psmerge
-
-CLEANFILES = $(bin_SCRIPTS)
-PERL = /usr/bin/env perl
-MAKETEXT = $(PERL) $(srcdir)/maketext
-man1_MANS = epsffit.1 psbook.1 psnup.1 psresize.1 psselect.1 pstops.1 \
-            getafm.1 \
-	    extractres.1 fixdlsrps.man fixfmps.man fixmacps.man \
-	    fixpsditps.man fixpspps.man fixscribeps.man fixtpps.man \
-            fixwfwps.man fixwpps.man fixwwps.man includeres.man psmerge.man
-
-dist_man_MANS = $(man1_MANS)
 epsffit_SOURCES = \
 	config.h \
 	epsffit.c \
@@ -262,15 +245,43 @@ pstops_SOURCES = \
 	psutil.c \
 	psutil.h
 
-
-# scripts.
-EXTRA_DIST = LICENSE getafm.sh showchar.sh extractres.pl fixdlsrps.pl \
-	fixfmps.pl fixmacps.pl fixpsditps.pl fixpspps.pl \
-	fixscribeps.pl fixtpps.pl fixwfwps.pl fixwpps.pl fixwwps.pl \
-	includeres.pl psmerge.pl Makefile.bcc Makefile.msc Makefile.nt \
-	Makefile.os2 Makefile.sc Makefile.unix Makefile.wat \
-	descrip.mms maketext md68_0.ps md71_0.ps Makefile.in.orig \
+EXTRA_DIST = LICENSE $(perl_scripts:=.pl) $(shell_scripts:=.sh) \
+	$(nodist_man1_MANS:.1=.man) maketext Makefile.bcc Makefile.msc \
+	Makefile.nt Makefile.os2 Makefile.sc Makefile.unix \
+	Makefile.wat descrip.mms md68_0.ps md71_0.ps Makefile.in.orig \
 	configure.in.orig
+perl_scripts = extractres fixdlsrps fixfmps fixmacps fixpsditps fixpspps \
+	fixscribeps fixtpps fixwfwps fixwpps fixwwps includeres psmerge
+
+shell_scripts = getafm showchar
+nodist_bin_SCRIPTS = $(perl_scripts)
+dist_man1_MANS = \
+	fixdlsrps.man \
+	fixfmps.man \
+	fixmacps.man \
+	fixpsditps.man \
+	fixpspps.man \
+	fixscribeps.man \
+	fixtpps.man \
+	fixwfwps.man \
+	fixwpps.man \
+	fixwwps.man \
+	getafm.man \
+	includeres.man \
+	psmerge.man
+
+nodist_man1_MANS = \
+	epsffit.1\
+	extractres.1 \
+	psbook.1 \
+	psnup.1 \
+	psresize.1 \
+	psselect.1 \
+	pstops.1
+
+CLEANFILES = $(nodist_bin_SCRIPTS) $(nodist_man1_MANS)
+PERL = /usr/bin/env perl
+MAKETEXT = $(PERL) $(srcdir)/maketext
 all: all-am
 
 .SUFFIXES:
@@ -351,21 +362,21 @@ psselect$(EXEEXT): $(psselect_OBJECTS) $(psselect_DEPENDENCIES)
 pstops$(EXEEXT): $(pstops_OBJECTS) $(pstops_DEPENDENCIES) 
 	@rm -f pstops$(EXEEXT)
 	$(LINK) $(pstops_OBJECTS) $(pstops_LDADD) $(LIBS)
-install-binSCRIPTS: $(bin_SCRIPTS)
+install-nodist_binSCRIPTS: $(nodist_bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+	@list='$(nodist_bin_SCRIPTS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f $$d$$p; then \
 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	    $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
+	    echo " $(nodist_binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	    $(nodist_binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
 	  else :; fi; \
 	done
 
-uninstall-binSCRIPTS:
+uninstall-nodist_binSCRIPTS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+	@list='$(nodist_bin_SCRIPTS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
 	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
@@ -400,16 +411,10 @@ distclean-compile:
 @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) '$<'`
-install-man1: $(man1_MANS) $(man_MANS)
+install-man1: $(dist_man1_MANS) $(nodist_man1_MANS)
 	@$(NORMAL_INSTALL)
 	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
+	@list='$(dist_man1_MANS) $(nodist_man1_MANS)'; \
 	for i in $$list; do \
 	  if test -f $$i; then file=$$i; \
 	  else file=$(srcdir)/$$i; fi; \
@@ -426,13 +431,7 @@ install-man1: $(man1_MANS) $(man_MANS)
 	done
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
+	@list='$(dist_man1_MANS) $(nodist_man1_MANS)'; \
 	for i in $$list; do \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
 	  case "$$ext" in \
@@ -445,51 +444,6 @@ uninstall-man1:
 	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
 	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
 	done
-install-manm: $(manm_MANS) $(man_MANS)
-	@$(NORMAL_INSTALL)
-	test -z "$(manmdir)" || $(MKDIR_P) "$(DESTDIR)$(manmdir)"
-	@list='$(manm_MANS) $(dist_manm_MANS) $(nodist_manm_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.m*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  if test -f $$i; then file=$$i; \
-	  else file=$(srcdir)/$$i; fi; \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    m*) ;; \
-	    *) ext='m' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(manmdir)/$$inst'"; \
-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(manmdir)/$$inst"; \
-	done
-uninstall-manm:
-	@$(NORMAL_UNINSTALL)
-	@list='$(manm_MANS) $(dist_manm_MANS) $(nodist_manm_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.m*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    m*) ;; \
-	    *) ext='m' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f '$(DESTDIR)$(manmdir)/$$inst'"; \
-	  rm -f "$(DESTDIR)$(manmdir)/$$inst"; \
-	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -673,7 +627,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS)
 installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(manmdir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -726,13 +680,15 @@ install-data-am: install-man
 
 install-dvi: install-dvi-am
 
-install-exec-am: install-binPROGRAMS install-binSCRIPTS
+install-exec-am: install-binPROGRAMS install-nodist_binSCRIPTS
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 
 install-html: install-html-am
 
 install-info: install-info-am
 
-install-man: install-man1 install-manm
+install-man: install-man1
 
 install-pdf: install-pdf-am
 
@@ -759,11 +715,14 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-man
+uninstall-am: uninstall-binPROGRAMS uninstall-man \
+	uninstall-nodist_binSCRIPTS
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 
-uninstall-man: uninstall-man1 uninstall-manm
+uninstall-man: uninstall-man1
 
-.MAKE: install-am install-strip
+.MAKE: install-am install-exec-am install-strip uninstall-am
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
 	clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
@@ -771,25 +730,33 @@ uninstall-man: uninstall-man1 uninstall-manm
 	distclean distclean-compile distclean-generic distclean-tags \
 	distcleancheck distdir distuninstallcheck dvi dvi-am html \
 	html-am info info-am install install-am install-binPROGRAMS \
-	install-binSCRIPTS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-exec-hook install-html \
 	install-html-am install-info install-info-am install-man \
-	install-man1 install-manm install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	install-man1 install-nodist_binSCRIPTS 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 pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \
-	uninstall-man uninstall-man1 uninstall-manm
+	uninstall-am uninstall-binPROGRAMS uninstall-hook \
+	uninstall-man uninstall-man1 uninstall-nodist_binSCRIPTS
+
 
+install-exec-hook:
+	@for f in $(shell_scripts); do \
+	  echo "$(INSTALL_SCRIPT) '$(srcdir)/$$f.sh' '$(DESTDIR)$(bindir)/$$f'"; \
+	  $(INSTALL_SCRIPT) "$(srcdir)/$$f.sh" "$(DESTDIR)$(bindir)/$$f"; \
+	done
+
+uninstall-hook:
+	@for f in $(shell_scripts); do \
+	  echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+	done
 
 %: %.pl
 	$(MAKETEXT) OS=$(OS) PERL="$(PERL)" $< >$@
 
-%: %.sh
-	cp $< $@
-	$(CHMOD) $(BINMODE) $@
-
 %.1: %.man
 	$(MAKETEXT) PAPER=$(PAPER) "MAN=$(man1_MANS)" $< >$@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.