Import cups.org releases

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-1.2b2@4306 a1ca3aef-8c08-0410-bb20-df032aa958be
2013-05-10 18:56:23 +00:00
@@ -1,62 +1,6 @@
-CHANGES.txt - 2006-03-24
+CHANGES.txt - 2006-03-10
 ------------------------

-CHANGES IN CUPS V1.2rc1
-
-	- Documentation updates (STR #1497, STR #1498)
-	- The scheduler now redirects browsers to https: URLs
-	  when encryption is required.
-	- The scheduler would crash when printing with a banner
-	  (STR #1500)
-	- cups-driverd did not use the LanguageEncoding attribute
-	  in PPD files to convert the NickName to UTF-8 (STR
-	  #1503)
-	- The lpadmin command could not set the
-	  printer-error-policy attribute (STR #1504)
-	- The web interface did not show the time and date in the
-	  correct format for the locale (STR #1505)
-	- CUPS no longer accepts print jobs if a printer does not
-	  support the file format (STR #1501)
-	- Cleaned up the PostScript filter (pstops) so that it
-	  properly supports %%IncludeFeature and page scaling
-	  (STR #1453)
-	- Fixed the cupsFileRewind() and cupsFileSeek() functions
-	  to work properly with uncompressed files.
-	- Added cupsFileGetLine(), cupsFileStderr(),
-	  cupsFileStdin(), and cupsFileStdout() functions to the
-	  CUPS library.
-	- Added a new cupstestdsc program to test the DSC
-	  conformance of PostScript files.
-	- Added KDE/GNOME icons and a Manage Printers menu item.
-	- Added --enable-image and --enable-pdftops configure
-	  options to control whether the image and PDF filters
-	  are built and installed (default = yes for all
-	  platforms but MacOS X)
-	- Fixed a minor memory leak in the PPD API.
-	- Fixed transcoding issues (STR #1493)
-	- The scheduler now enforces a minimum job cost of 100
-	  when doing FilterLimit checks.
-	- The scheduler would leak file descriptors when printing
-	  to raw queues (STR #1491)
-	- The IPv6 support did not compile on Tru64 UNIX (STR
-	  #1488)
-	- ppdOpen2() now converts the NickName and all UI text to
-	  UTF-8 (STR #1475)
-	- The Set Allows Users web page did not work (STR #1486)
-	- When the default policy was not set or set to a non-
-	  existing policy, the scheduler did not set the default
-	  policy name to "default" (STR #1484)
-	- The Zebra CPCL driver did not use the correct righthand
-	  margin for the 4" wide label sizes.
-	- Fixed a problem with the parsing of fractional real
-	  numbers in PPD files.
-	- Added Spanish localization files (STR #1480)
-	- Fixed localization of a few scheduler messages (STR
-	  #1478)
-	- Fixed support for HEAD requests in the scheduler (STR
-	  #1481)
-
-
 CHANGES IN CUPS V1.2b2

 	- Updated the CUPS design description.
@@ -1,41 +1,37 @@
-CREDITS.txt - 2006-02-23
+CREDITS.txt - 02/23/2006
 ------------------------

 Few projects are completed by one person, and CUPS is no exception.  We'd
 like to thank the following individuals for their contributions:

-    Nathaniel Barbour              - Lots of testing and feedback.
-    N. Becker                      - setsid().
-    Jean-Eric Cuendet              - GhostScript filters for CUPS.
-    Van Dang                       - HTTP and IPP policeman.
-    L. Peter Deutsch               - MD5 code.
-    Dr. ZP Han                     - setgid()/setuid().
-    Guy Harris                     - *BSD shared libraries and lots of other
-                                     fixes.
-    Bjoern Jacke                   - I18N stuff.
-    Wang Jian                      - CUPS RPM corrections.
-    Roderick Johnstone             - Beta tester of the millenium.
-    Till Kamppeter                 - Bug fixes, beta testing, evangelism.
-    Kenshi Muto                    - Japanese localization, patches, and
-                                     testing.
-    Kiko                           - Bug fixes.
-    Sergey V. Kovalyov             - ESP Print Pro and CUPS beta tester.
-    Mark Lawrence                  - Microsoft interoperability testing.
-    Jeff Licquia                   - Bug fixes, beta testing, evangelism.
-    Jason McMullan                 - Original CUPS RPM distributions.
-    Wes Morgan                     - *BSD fixes.
-    Ulrich Oldendorf               - German locale.
-    Giulio Orsero                  - Bug fixes and testing.
-    Kurt Pfeifle                   - Bug fixes, beta testing, evangelism.
-    Gilles QUERRET                 - French man pages.
-    Petter Reinholdtsen            - HP-UX compiler stuff.
-    Juan Pablo González Riopedre   - Spanish localization
-    Stuart Stevens                 - HP JetDirect IPP information.
-    Andrea Suatoni                 - IRIX desktop integration and testing.
-    Tomohiro Kato                  - Japanese localization.
-    Tim Waugh                      - Lots of patches, testing, and Linux
-                                     integration.
-    Yugami                         - LDAP browsing support.
+    Nathaniel Barbour   - Lots of testing and feedback.
+    N. Becker           - setsid().
+    Jean-Eric Cuendet   - GhostScript filters for CUPS.
+    Van Dang            - HTTP and IPP policeman.
+    L. Peter Deutsch    - MD5 code.
+    Dr. ZP Han          - setgid()/setuid().
+    Guy Harris          - *BSD shared libraries and lots of other fixes.
+    Bjoern Jacke        - I18N stuff.
+    Wang Jian           - CUPS RPM corrections.
+    Roderick Johnstone  - Beta tester of the millenium.
+    Till Kamppeter      - Bug fixes, beta testing, evangelism.
+    Kenshi Muto         - Japanese localization, patches, and testing.
+    Kiko                - Bug fixes.
+    Sergey V. Kovalyov  - ESP Print Pro and CUPS beta tester.
+    Mark Lawrence       - Microsoft interoperability testing.
+    Jeff Licquia        - Bug fixes, beta testing, evangelism.
+    Jason McMullan      - Original CUPS RPM distributions.
+    Wes Morgan          - *BSD fixes.
+    Ulrich Oldendorf    - German locale.
+    Giulio Orsero       - Bug fixes and testing.
+    Kurt Pfeifle        - Bug fixes, beta testing, evangelism.
+    Gilles QUERRET      - French man pages.
+    Petter Reinholdtsen - HP-UX compiler stuff.
+    Stuart Stevens      - HP JetDirect IPP information.
+    Andrea Suatoni      - IRIX desktop integration and testing.
+    Tomohiro Kato       - Japanese localization.
+    Tim Waugh           - Lots of patches, testing, and Linux integration.
+    Yugami              - LDAP browsing support.

 If I've missed someone, please let me know by sending an email to
 "mike@easysw.com".
@@ -1,5 +1,5 @@
-INSTALL - CUPS v1.2rc1 - 2006-03-24
-----------------------------------
+INSTALL - CUPS v1.2b2 - 2006-03-09
+----------------------------------

 This file describes how to compile and install CUPS from source
 code. For more information on CUPS see the file called
@@ -73,12 +73,6 @@ CUPS_PRIMARY_SYSTEM_GROUP =	@CUPS_PRIMARY_SYSTEM_GROUP@
 CUPS_CONFIG_FILE_PERM = @CUPS_CONFIG_FILE_PERM@
 CUPS_LOG_FILE_PERM = @CUPS_LOG_FILE_PERM@

-#
-# Languages to install...
-#
-
-LANGUAGES	=	@LANGUAGES@
-
 #
 # Libraries...
 #
@@ -103,19 +97,11 @@ INSTALLSTATIC	=	@INSTALLSTATIC@
 #
 # Program options...
 #
-# ARCHFLAGS     Defines the default architecture build options, used
-#               when compiling separate 32/64-bit libraries.
-# ARCH32FLAGS   Defines the 32-bit architecture build options, used
-#               when compiling separate 32/64-bit libraries.
-# ARCH64FLAGS   Defines the 64-bit architecture build options, used
-#               when compiling separate 32/64-bit libraries.
-# OPTIM         Defines the common compiler optimization/debugging options
-#               for all architectures.
-# OPTIONS       Defines other compile-time options (currently only -DDEBUG
-#               for extra debug info)
+# OPTIM   defines the common compiler optimization/debugging options.
+# OPTIONS defines other compile-time options (currently only -dDEBUG for
+#         extra debug info)
 #

-ARCHFLAGS	=	@ARCHFLAGS@
 ARFLAGS		=	@ARFLAGS@
 BACKLIBS	=	@BACKLIBS@
 CFLAGS		=	-I.. $(RC_CFLAGS) $(SSLFLAGS) @CPPFLAGS@ @CFLAGS@ \
@@ -128,16 +114,13 @@ CXXLIBS		=	@CXXLIBS@
 DSOFLAGS	=	@DSOFLAGS@
 DSOLIBS		=	@DSOLIBS@ $(COMMONLIBS)
 IMGLIBS		=	@IMGLIBS@ -lm
-IMGFILTERS	=	@IMGFILTERS@
-LDFLAGS		=	-L../cups -L../filter $(RC_CFLAGS) $(ARCHFLAGS) \
-			@LDFLAGS@ $(OPTIM)
+LDFLAGS		=	-L../cups -L../filter $(RC_CFLAGS) @LDFLAGS@ $(OPTIM)
 LINKCUPS	=	@LINKCUPS@ $(SSLLIBS)
 LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
 LIBS		=	$(LINKCUPS) $(COMMONLIBS)
 OPTIM		=	@OPTIM@
 OPTIONS		=
 PAMLIBS		=	@PAMLIBS@
-PDFTOPS		=	@PDFTOPS@
 PHPDIR		=	@PHPDIR@
 SSLFLAGS	=	@SSLFLAGS@
 SSLLIBS		=	@SSLLIBS@
@@ -147,14 +130,14 @@ LAUNCHDLIBS	=	@LAUNCHDLIBS@
 # Separate 32/64-bit library support...
 #

-ARCH32FLAGS	=	@ARCH32FLAGS@
+C32FLAGS	=	@C32FLAGS@
 INSTALL32	=	@INSTALL32@
 LIB32CUPS	=	@LIB32CUPS@
 LIB32CUPSIMAGE	=	@LIB32CUPSIMAGE@
 LIB32DIR	=	$(BUILDROOT)@LIB32DIR@
 UNINSTALL32	=	@UNINSTALL32@

-ARCH64FLAGS	=	@ARCH64FLAGS@
+C64FLAGS	=	@C64FLAGS@
 INSTALL64	=	@INSTALL64@
 LIB64CUPS	=	@LIB64CUPS@
 LIB64CUPSIMAGE	=	@LIB64CUPSIMAGE@
@@ -210,7 +193,6 @@ SBINDIR		=	$(BUILDROOT)@sbindir@
 SERVERBIN	= 	$(BUILDROOT)@CUPS_SERVERBIN@
 SERVERROOT	= 	$(BUILDROOT)@CUPS_SERVERROOT@
 STATEDIR	=	$(BUILDROOT)@CUPS_STATEDIR@
-XINETD		=	@XINETD@

 MAN1EXT		=	@MAN1EXT@
 MAN5EXT		=	@MAN5EXT@
@@ -234,19 +216,19 @@ DBUSDIR		=	@DBUSDIR@

 .c.o:
 	echo Compiling $<...
-	$(CC) $(ARCHFLAGS) $(OPTIM) $(CFLAGS) -c $<
+	$(CC) $(OPTIM) $(CFLAGS) -c $<

 .c.32.o:
 	echo Compiling 32-bit $<...
-	$(CC) $(ARCH32FLAGS) $(OPTIM) $(CFLAGS) -c -o $@ $<
+	$(CC) $(C32FLAGS) $(OPTIM) $(CFLAGS) -c -o $@ $<

 .c.64.o:
 	echo Compiling 64-bit $<...
-	$(CC) $(ARCH64FLAGS) $(OPTIM) $(CFLAGS) -c -o $@ $<
+	$(CC) $(C64FLAGS) $(OPTIM) $(CFLAGS) -c -o $@ $<

 .cxx.o:
 	echo Compiling $<...
-	$(CXX) $(ARCHFLAGS) $(OPTIM) $(CXXFLAGS) -c $<
+	$(CXX) $(OPTIM) $(CXXFLAGS) -c $<

 .man.1 .man.1m .man.5 .man.7 .man.8:
 	echo Linking $<...
@@ -29,7 +29,7 @@ include Makedefs
 #

 DIRS	=	cups backend berkeley cgi-bin filter locale man monitor \
-		notifier $(PDFTOPS) scheduler systemv test \
+		notifier pdftops scheduler systemv test \
 		$(PHPDIR) \
 		conf data doc fonts ppd templates

@@ -81,7 +81,7 @@ install:	installhdrs
 	$(INSTALL_DIR) -m 755 $(BINDIR)
 	$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
 	echo Installing startup script...
-	if test "x$(INITDIR)" != x; then \
+	if test "x$(INITDIR)" != "x"; then \
 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
 		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
@@ -93,7 +93,7 @@ install:	installhdrs
 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc5.d; \
 		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
 	fi
-	if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
+	if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
 		$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
 		if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
 			$(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \
@@ -106,29 +106,11 @@ install:	installhdrs
 			$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
 		fi \
 	fi
-	if test "x$(DBUSDIR)" != x; then \
+	if test "x$(DBUSDIR)" != "x"; then \
 		echo Installing cups.conf in $(DBUSDIR)...;\
 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(DBUSDIR); \
 		$(INSTALL_DATA) packaging/cups-dbus.conf $(BUILDROOT)$(DBUSDIR)/cups.conf; \
 	fi
-	if test "x$(XINETD)" != x; then \
-		echo Installing xinetd configuration file for cups-lpd...; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(XINETD); \
-		$(INSTALL_DATA) init/cups-lpd $(BUILDROOT)$(XINETD)/cups-lpd; \
-	fi
-	if test -d /usr/share/applications; then \
-		echo Installing desktop icons...; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/applications; \
-		$(INSTALL_DATA) desktop/cups.desktop $(BUILDROOT)/usr/share/applications; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps; \
-		$(INSTALL_DATA) desktop/cups-16.png $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps/cups.png; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/32x32/apps; \
-		$(INSTALL_DATA) desktop/cups-32.png $(BUILDROOT)/usr/share/icons/hicolor/32x32/apps/cups.png; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/64x64/apps; \
-		$(INSTALL_DATA) desktop/cups-64.png $(BUILDROOT)/usr/share/icons/hicolor/64x64/apps/cups.png; \
-		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps; \
-		$(INSTALL_DATA) desktop/cups-128.png $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps/cups.png; \
-	fi


 #
@@ -156,7 +138,7 @@ uninstall:
 	$(RM) $(BINDIR)/cups-config
 	-$(RMDIR) $(BINDIR)
 	echo Uninstalling startup script...
-	if test "x$(INITDIR)" != x; then \
+	if test "x$(INITDIR)" != "x"; then \
 		$(RM) $(BUILDROOT)$(INITDIR)/init.d/cups; \
 		$(RMDIR) $(BUILDROOT)$(INITDIR)/init.d; \
 		$(RM)  $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
@@ -168,7 +150,7 @@ uninstall:
 		$(RM) $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
 		$(RMDIR) $(BUILDROOT)$(INITDIR)/rc5.d; \
 	fi
-	if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
+	if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
 		if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
 			$(RM) $(BUILDROOT)$(INITDDIR)/PrintingServices; \
 			$(RM) $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
@@ -181,17 +163,11 @@ uninstall:
 		fi \
 		$(RMDIR) $(BUILDROOT)$(INITDDIR); \
 	fi
-	if test "x$(DBUSDIR)" != x; then \
+	if test "x$(DBUSDIR)" != "x"; then \
 		echo Uninstalling cups.conf in $(DBUSDIR)...;\
 		$(RM) $(BUILDROOT)$(DBUSDIR)/cups.conf; \
 		$(RMDIR) $(BUILDROOT)$(DBUSDIR); \
 	fi
-	$(RM) $(BUILDROOT)/etc/xinetd.d/cups-lpd
-	$(RM) $(BUILDROOT)/usr/share/applications/cups.desktop
-	$(RM) $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps/cups.png
-	$(RM) $(BUILDROOT)/usr/share/icons/hicolor/32x32/apps/cups.png
-	$(RM) $(BUILDROOT)/usr/share/icons/hicolor/64x64/apps/cups.png
-	$(RM) $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps/cups.png


 #
@@ -1,5 +1,5 @@
-README - CUPS v1.2rc1 - 2006-03-24
----------------------------------
+README - CUPS v1.2b2 - 2006-03-09
+---------------------------------

 Looking for compile instructions?  Read the file "INSTALL.txt"
 instead...
@@ -26,8 +26,8 @@ INTRODUCTION
    of GPL Ghostscript for CUPS called ESP Ghostscript is
    available separately to support printing of PostScript files
    within the CUPS driver framework.  Sample drivers for Dymo,
-    EPSON, HP, OKIDATA, and Zebra printers are included that use
-    these filters.
+    EPSON, HP, and OKIDATA printers are included that use these
+    filters.

    Drivers for thousands of printers are provided with our ESP
    Print Pro software, available at:
@@ -108,11 +108,9 @@ SETTING UP PRINTER QUEUES FROM THE COMMAND-LINE
 	EPSON 9-pin Series             epson9.ppd
 	EPSON 24-pin Series            epson24.ppd
 	HP DeskJet Series              deskjet.ppd
-	HP New DeskJet Series          deskjet2.ppd
 	HP LaserJet Series             laserjet.ppd
 	OKIDATA 9-Pin Series           okidata9.ppd
 	OKIDATA 24-Pin Series          okidat24.ppd
-	Zebra CPCL Label Printer       zebracpl.ppd
 	Zebra EPL1 Label Printer       zebraep1.ppd
 	Zebra EPL2 Label Printer       zebraep2.ppd
 	Zebra ZPL Label Printer        zebra.ppd
@@ -2624,11 +2624,11 @@ do_set_allowed_users(http_t *http)	/* I - HTTP connection */
        	 NULL, uri);

    if (num_users == 0)
-      ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_NAME,
+      ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
                   "requesting-user-name-allowed", NULL, "all");
    else
    {
-      attr = ippAddStrings(request, IPP_TAG_PRINTER, IPP_TAG_NAME,
+      attr = ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
                           type, num_users, NULL, NULL);

      for (i = 0, ptr = (char *)users; *ptr; i ++)
@@ -239,12 +239,6 @@ cgiInitialize(void)

  cupsSetPasswordCB(cgi_passwd);

- /*
-  * Set the locale so that times, etc. are formatted properly...
-  */
-
-  setlocale(LC_ALL, "");
-
 #ifdef DEBUG
 /*
  * Disable output buffering to find bugs...
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-common.m4 5288 2006-03-14 02:38:07Z mike $"
+dnl "$Id: cups-common.m4 5229 2006-03-05 16:48:12Z mike $"
 dnl
 dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -63,7 +63,7 @@ AC_PATH_PROG(LD,ld)
 AC_PATH_PROG(LN,ln)
 AC_PATH_PROG(MV,mv)
 AC_PATH_PROG(RM,rm)
-AC_PATH_PROG(RMDIR,rmdir)
+AC_PATH_PROG(RM,rmdir)
 AC_PATH_PROG(SED,sed)
 AC_PATH_PROG(STRIP,strip)

@@ -264,5 +264,5 @@ AC_SUBST(DEFAULT_IPP_PORT)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT)

 dnl
-dnl End of "$Id: cups-common.m4 5288 2006-03-14 02:38:07Z mike $".
+dnl End of "$Id: cups-common.m4 5229 2006-03-05 16:48:12Z mike $".
 dnl
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-compiler.m4 5288 2006-03-14 02:38:07Z mike $"
+dnl "$Id: cups-compiler.m4 5274 2006-03-10 20:57:09Z mike $"
 dnl
 dnl   Compiler stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -24,13 +24,10 @@ dnl

 dnl Clear the debugging and non-shared library options unless the user asks
 dnl for them...
-ARCHFLAGS=""
 OPTIM=""
-AC_SUBST(ARCHFLAGS)
 AC_SUBST(OPTIM)

 AC_ARG_WITH(optim, [  --with-optim="flags"    set optimization flags ])
-AC_ARG_WITH(archflags, [  --with-arch="flags"     set default architecture flags ])

 AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging, default=no],
 	[if test x$enable_debug = xyes; then
@@ -39,16 +36,15 @@ AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging, default=no],

 dnl Setup support for separate 32/64-bit library generation...
 AC_ARG_ENABLE(32bit, [  --enable-32bit          generate 32-bit libraries on 32/64-bit systems, default=no])
-AC_ARG_WITH(arch32flags, [  --with-arch32="flags"   specifies 32-bit architecture flags])

-ARCH32FLAGS=""
+C32FLAGS=""
 INSTALL32=""
 LIB32CUPS=""
 LIB32CUPSIMAGE=""
 LIB32DIR=""
 UNINSTALL32=""

-AC_SUBST(ARCH32FLAGS)
+AC_SUBST(C32FLAGS)
 AC_SUBST(INSTALL32)
 AC_SUBST(LIB32CUPS)
 AC_SUBST(LIB32CUPSIMAGE)
@@ -56,16 +52,15 @@ AC_SUBST(LIB32DIR)
 AC_SUBST(UNINSTALL32)

 AC_ARG_ENABLE(64bit, [  --enable-64bit          generate 64-bit libraries on 32/64-bit systems, default=no])
-AC_ARG_WITH(arch64flags, [  --with-arch64="flags"   specifies 64-bit architecture flags])

-ARCH64FLAGS=""
+C64FLAGS=""
 INSTALL64=""
 LIB64CUPS=""
 LIB64CUPSIMAGE=""
 LIB64DIR=""
 UNINSTALL64=""

-AC_SUBST(ARCH64FLAGS)
+AC_SUBST(C64FLAGS)
 AC_SUBST(INSTALL64)
 AC_SUBST(LIB64CUPS)
 AC_SUBST(LIB64CUPSIMAGE)
@@ -94,6 +89,16 @@ if test -n "$GCC"; then
 	fi

 	case $uname in
+		Darwin*)
+			if test "x$with_optim" = x; then
+				if test "x`uname -m`" = xi386; then
+					# Build universal binaries for OSX on Intel...
+					OPTIM="-arch i386 -arch ppc $OPTIM"
+					DSOFLAGS="-arch i386 -arch ppc $DSOFLAGS"
+				fi
+			fi
+			;;
+
 		Linux*)
 			if test x$enable_pie = xyes; then
 				OPTIM="$OPTIM -fpie"
@@ -110,75 +115,35 @@ if test -n "$GCC"; then
 	fi

 	case "$uname" in
-		Darwin*)
-			if test -z "$with_archflags"; then
-				if test "x`uname -m`" = xi386; then
-					# Build universal binaries for OSX on Intel...
-					ARCHFLAGS="-arch i386 -arch ppc"
-				fi
-			else
-				ARCHFLAGS="$with_archflags"
-			fi
-			;;
-
 		IRIX)
 			if test "x$enable_32bit" = xyes; then
-				# Build 32-bit libraries, 64-bit base...
-				if test -z "$with_arch32flags"; then
-					ARCH32FLAGS="-n32 -mips3"
-				else
-					ARCH32FLAGS="$with_arch32flags"
-				fi
+				# Compiling on an IRIX system, build 32-bit
+				# libraries...
+				C32FLAGS="-n32 -mips3"
 				INSTALL32="install32bit"
 				LIB32CUPS="libcups.32.so.2"
 				LIB32CUPSIMAGE="libcupsimage.32.so.2"
 				LIB32DIR="$prefix/lib32"
 				UNINSTALL32="uninstall32bit"
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch64flags"; then
-						ARCHFLAGS="-64 -mips4"
-					else
-						ARCHFLAGS="$with_arch64flags"
-					fi
-				else
-					ARCHFLAGS="$with_archflags"
-				fi
 			fi

 			if test "x$enable_64bit" = xyes; then
-				# Build 64-bit libraries, 32-bit base...
-				if test -z "$with_arch64flags"; then
-					ARCH64FLAGS="-64 -mips4"
-				else
-					ARCH64FLAGS="$with_arch64flags"
-				fi
+				# Compiling on an IRIX system, build 64-bit
+				# libraries...
+				C64FLAGS="-64 -mips4"
 				INSTALL64="install64bit"
 				LIB64CUPS="libcups.64.so.2"
 				LIB64CUPSIMAGE="libcupsimage.64.so.2"
 				LIB64DIR="$prefix/lib64"
 				UNINSTALL64="uninstall64bit"
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch32flags"; then
-						ARCHFLAGS="-n32 -mips3"
-					else
-						ARCHFLAGS="$with_arch32flags"
-					fi
-				else
-					ARCHFLAGS="$with_archflags"
-				fi
 			fi
 			;;

 		Linux*)
 			if test "x$enable_32bit" = xyes; then
-				# Build 32-bit libraries, 64-bit base...
-				if test -z "$with_arch32flags"; then
-					ARCH32FLAGS="-m32"
-				else
-					ARCH32FLAGS="$with_arch32flags"
-				fi
+				# Compiling on an 64-bit x86 system, build 32-bit
+				# libraries...
+				C32FLAGS="-m32"
 				INSTALL32="install32bit"
 				LIB32CUPS="libcups.32.so.2"
 				LIB32CUPSIMAGE="libcupsimage.32.so.2"
@@ -187,93 +152,30 @@ if test -n "$GCC"; then
 					LIB32DIR="${LIB32DIR}32"
 				fi
 				UNINSTALL32="uninstall32bit"
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch64flags"; then
-						ARCHFLAGS="-m64"
-					else
-						ARCHFLAGS="$with_arch64flags"
-					fi
-				else
-					ARCHFLAGS="$with_archflags"
-				fi
-			fi
-
-			if test "x$enable_64bit" = xyes; then
-				# Build 64-bit libraries, 32-bit base...
-				if test -z "$with_arch64flags"; then
-					ARCH64FLAGS="-m64"
-				else
-					ARCH64FLAGS="$with_arch64flags"
-				fi
-				INSTALL64="install64bit"
-				LIB64CUPS="libcups.64.so.2"
-				LIB64CUPSIMAGE="libcupsimage.64.so.2"
-				LIB64DIR="$exec_prefix/lib"
-				if test -d /usr/lib64; then
-					LIB64DIR="${LIB64DIR}64"
-				fi
-				UNINSTALL64="uninstall64bit"
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch32flags"; then
-						ARCHFLAGS="-m32"
-					else
-						ARCHFLAGS="$with_arch32flags"
-					fi
-				else
-					ARCHFLAGS="$with_archflags"
-				fi
 			fi
 			;;

 		SunOS*)
 			if test "x$enable_32bit" = xyes; then
-				# Build 32-bit libraries, 64-bit base...
-				if test -z "$with_arch32flags"; then
-					ARCH32FLAGS="-m32"
-				else
-					ARCH32FLAGS="$with_arch32flags"
-				fi
+				# Compiling on a Solaris system, build 32-bit
+				# libraries...
+				C32FLAGS="-m32"
 				INSTALL32="install32bit"
 				LIB32CUPS="libcups.32.so.2"
 				LIB32CUPSIMAGE="libcupsimage.32.so.2"
 				LIB32DIR="$exec_prefix/lib/32"
 				UNINSTALL32="uninstall32bit"
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch64flags"; then
-						ARCHFLAGS="-m64"
-					else
-						ARCHFLAGS="$with_arch64flags"
-					fi
-				else
-					ARCHFLAGS="$with_archflags"
-				fi
 			fi

 			if test "x$enable_64bit" = xyes; then
-				# Build 64-bit libraries, 32-bit base...
-				if test -z "$with_arch64flags"; then
-					ARCH64FLAGS="-m64"
-				else
-					ARCH64FLAGS="$with_arch64flags"
-				fi
+				# Compiling on a Solaris system, build 64-bit
+				# libraries...
+				C64FLAGS="-m64"
 				INSTALL64="install64bit"
 				LIB64CUPS="libcups.64.so.2"
 				LIB64CUPSIMAGE="libcupsimage.64.so.2"
 				LIB64DIR="$exec_prefix/lib/64"
 				UNINSTALL64="uninstall64bit"
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch32flags"; then
-						ARCHFLAGS="-m32"
-					else
-						ARCHFLAGS="$with_arch32flags"
-					fi
-				else
-					ARCHFLAGS="$with_archflags"
-				fi
 			fi
 			;;
 	esac
@@ -298,9 +200,6 @@ else
 			fi

 			CFLAGS="-Ae $CFLAGS"
-			# Warning 336 is "empty translation unit"
-			# Warning 829 is passing constant string as char *
-			CXXFLAGS="+W336,829 $CXXFLAGS"

 			if test "x$with_optim" = x; then
 				OPTIM="+DAportable $OPTIM"
@@ -324,51 +223,25 @@ else
 			fi

 			if test "x$enable_32bit" = xyes; then
-				# Build 32-bit libraries, 64-bit base...
-				if test -z "$with_arch32flags"; then
-					ARCH32FLAGS="-n32 -mips3"
-				else
-					ARCH32FLAGS="$with_arch32flags"
-				fi
+				# Compiling on an IRIX system, build 32-bit
+				# libraries...
+				C32FLAGS="-n32 -mips3"
 				INSTALL32="install32bit"
 				LIB32CUPS="libcups.32.so.2"
 				LIB32CUPSIMAGE="libcupsimage.32.so.2"
-				LIB32DIR="$prefix/lib32"
+				LIB32DIR="$exec_prefix/lib32"
 				UNINSTALL32="uninstall32bit"
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch64flags"; then
-						ARCHFLAGS="-64 -mips4"
-					else
-						ARCHFLAGS="$with_arch64flags"
-					fi
-				else
-					ARCHFLAGS="$with_archflags"
-				fi
 			fi

 			if test "x$enable_64bit" = xyes; then
-				# Build 64-bit libraries, 32-bit base...
-				if test -z "$with_arch64flags"; then
-					ARCH64FLAGS="-64 -mips4"
-				else
-					ARCH64FLAGS="$with_arch64flags"
-				fi
+				# Compiling on an IRIX system, build 64-bit
+				# libraries...
+				C64FLAGS="-64 -mips4"
 				INSTALL64="install64bit"
 				LIB64CUPS="libcups.64.so.2"
 				LIB64CUPSIMAGE="libcupsimage.64.so.2"
-				LIB64DIR="$prefix/lib64"
+				LIB64DIR="$exec_prefix/lib64"
 				UNINSTALL64="uninstall64bit"
-
-				if test -z "$with_archflags"; then
-					if test -z "$with_arch32flags"; then
-						ARCHFLAGS="-n32 -mips3"
-					else
-						ARCHFLAGS="$with_arch32flags"
-					fi
-				else
-					ARCHFLAGS="$with_archflags"
-				fi
 			fi
 			;;
 		SunOS*)
@@ -381,53 +254,36 @@ else
 				fi
 			fi

+			if test "x$with_optim" = x; then
+				# Specify "generic" SPARC output and suppress
+				# all of Sun's questionable warning messages...
+				OPTIM="-w $OPTIM -xarch=generic"
+			fi
+
 			if test $PICFLAG = 1; then
 				OPTIM="-KPIC $OPTIM"
 			fi

 			if test "x$enable_32bit" = xyes; then
-				# Compiling on a Solaris system, build 64-bit
-				# binaries with separate 32-bit libraries...
-				ARCH32FLAGS="-xarch=generic"
+				# Compiling on a Solaris system, build 32-bit
+				# libraries...
+				C32FLAGS="-xarch=v8"
 				INSTALL32="install32bit"
 				LIB32CUPS="libcups.32.so.2"
 				LIB32CUPSIMAGE="libcupsimage.32.so.2"
 				LIB32DIR="$exec_prefix/lib/32"
 				UNINSTALL32="uninstall32bit"
+			fi

-				if test "x$with_optim" = x; then
-					# Suppress all of Sun's questionable
-					# warning messages, and default to
-					# 64-bit compiles of everything else...
-					OPTIM="-w $OPTIM"
-					CFLAGS="-xarch=generic64 $CFLAGS"
-				fi
-			else
-				if test "x$enable_64bit" = xyes; then
-					# Build 64-bit libraries...
-					ARCH64FLAGS="-xarch=generic64"
-					INSTALL64="install64bit"
-					LIB64CUPS="libcups.64.so.2"
-					LIB64CUPSIMAGE="libcupsimage.64.so.2"
-					LIB64DIR="$exec_prefix/lib/64"
-					UNINSTALL64="uninstall64bit"
-
-					if test "x$with_optim" = x; then
-						# Suppress all of Sun's questionable
-						# warning messages, and default to
-						# 32-bit compiles of everything else...
-						OPTIM="-w $OPTIM"
-						CFLAGS="-xarch=generic $CFLAGS"
-					fi
-				else
-					if test "x$with_optim" = x; then
-						# Suppress all of Sun's questionable
-						# warning messages, and default to
-						# 32-bit compiles of everything else...
-						OPTIM="-w $OPTIM"
-						CFLAGS="-xarch=generic $CFLAGS"
-					fi
-				fi
+			if test "x$enable_64bit" = xyes; then
+				# Compiling on a Solaris system, build 64-bit
+				# libraries...
+				C64FLAGS="-xarch=v9 -xcode=pic32"
+				INSTALL64="install64bit"
+				LIB64CUPS="libcups.64.so.2"
+				LIB64CUPSIMAGE="libcupsimage.64.so.2"
+				LIB64DIR="$exec_prefix/lib/64"
+				UNINSTALL64="uninstall64bit"
 			fi
 			;;
 		UNIX_SVR*)
@@ -467,5 +323,5 @@ if test $uname = HP-UX; then
 fi

 dnl
-dnl End of "$Id: cups-compiler.m4 5288 2006-03-14 02:38:07Z mike $".
+dnl End of "$Id: cups-compiler.m4 5274 2006-03-10 20:57:09Z mike $".
 dnl
@@ -23,12 +23,6 @@ dnl       EMail: cups-info@cups.org
 dnl         WWW: http://www.cups.org
 dnl

-dnl Default langugages...
-AC_ARG_WITH(languages, [  --with-languages        set installed languages, default="es ja" ],
-	LANGUAGES="$withval",
-	LANGUAGES="es ja")
-AC_SUBST(LANGUAGES)
-
 dnl Default ConfigFilePerm
 AC_ARG_WITH(config_perm, [  --with-config-file-perm set default ConfigFilePerm value, default=0640],
 	CUPS_CONFIG_FILE_PERM="$withval",
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-directories.m4 5314 2006-03-20 19:06:50Z mike $"
+dnl "$Id: cups-directories.m4 5269 2006-03-10 03:33:00Z mike $"
 dnl
 dnl   Directory stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -178,17 +178,6 @@ fi
 AC_SUBST(INITDIR)
 AC_SUBST(INITDDIR)

-dnl Xinetd support...
-XINETD=""
-for dir in /private/etc/xinetd.d /etc/xinetd.d /usr/local/etc/xinetd.d; do
-	if test -d $dir; then
-		XINETD="$dir"
-		break
-	fi
-done
-
-AC_SUBST(XINETD)
-
 dnl Setup default locations...
 # Cache data...
 AC_ARG_WITH(cachedir, [  --with-cachedir         set path for cache files],cachedir="$withval",cachedir="")
@@ -300,5 +289,5 @@ AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$localstatedir/run/cups")
 AC_SUBST(CUPS_STATEDIR)

 dnl
-dnl End of "$Id: cups-directories.m4 5314 2006-03-20 19:06:50Z mike $".
+dnl End of "$Id: cups-directories.m4 5269 2006-03-10 03:33:00Z mike $".
 dnl
@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-image.m4 5311 2006-03-19 13:21:42Z mike $"
+dnl "$Id: cups-image.m4 4644 2005-09-15 18:43:06Z mike $"
 dnl
-dnl   Image library/filter stuff for the Common UNIX Printing System (CUPS).
+dnl   Image library stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
 dnl   property of Easy Software Products and are protected by Federal
@@ -22,22 +22,6 @@ dnl       EMail: cups-info@cups.org
 dnl         WWW: http://www.cups.org
 dnl

-dnl See if we want the image filters included at all...
-AC_ARG_ENABLE(image, [  --enable-image          turn on image filters, default=auto])
-
-IMGFILTERS=""
-if test "x$enable_image" != xno; then
-        AC_MSG_CHECKING(whether to build image filters)
-        if test "x$enable_image" = xyes -o $uname != Darwin; then
-		IMGFILTERS="imagetops imagetoraster"
-                AC_MSG_RESULT(yes)
-        else
-                AC_MSG_RESULT(no)
-        fi
-fi
-
-AC_SUBST(IMGFILTERS)
-
 dnl Save the current libraries since we don't want the image libraries
 dnl included with every program...
 SAVELIBS="$LIBS"
@@ -110,5 +94,5 @@ AC_SUBST(EXPORT_LIBZ)
 AC_CHECK_HEADER(stdlib.h,AC_DEFINE(HAVE_STDLIB_H))

 dnl
-dnl End of "$Id: cups-image.m4 5311 2006-03-19 13:21:42Z mike $".
+dnl End of "$Id: cups-image.m4 4644 2005-09-15 18:43:06Z mike $".
 dnl
@@ -1,43 +0,0 @@
-dnl
-dnl "$Id$"
-dnl
-dnl   PDF filter configuration stuff for the Common UNIX Printing System (CUPS).
-dnl
-dnl   Copyright 2006 by Easy Software Products, all rights reserved.
-dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Easy Software Products and are protected by Federal
-dnl   copyright law.  Distribution and use rights are outlined in the file
-dnl   "LICENSE.txt" which should have been included with this file.  If this
-dnl   file is missing or damaged please contact Easy Software Products
-dnl   at:
-dnl
-dnl       Attn: CUPS Licensing Information
-dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
-dnl       Hollywood, Maryland 20636 USA
-dnl
-dnl       Voice: (301) 373-9600
-dnl       EMail: cups-info@cups.org
-dnl         WWW: http://www.cups.org
-dnl
-
-AC_ARG_ENABLE(pdftops, [  --enable-pdftops        build pdftops filter, default=auto ])
-
-PDFTOPS=""
-
-if test "x$enable_pdftops" != xno; then
-	AC_MSG_CHECKING(whether to build pdftops filter)
-	if test "x$enable_pdftops" = xyes -o $uname != Darwin; then
-		PDFTOPS="pdftops"
-		AC_MSG_RESULT(yes)
-	else
-		AC_MSG_RESULT(no)
-	fi
-fi
-
-AC_SUBST(PDFTOPS)
-
-dnl
-dnl End of "$Id$".
-dnl
@@ -43,18 +43,19 @@ sinclude(config-scripts/cups-pam.m4)
 sinclude(config-scripts/cups-threads.m4)
 sinclude(config-scripts/cups-largefile.m4)
 sinclude(config-scripts/cups-launchd.m4)
-sinclude(config-scripts/cups-pdf.m4)
+
+MAKEDEFS="../Makedefs"
+AC_SUBST(MAKEDEFS)
+
 sinclude(config-scripts/cups-scripting.m4)

-AC_OUTPUT(Makedefs packaging/cups.list init/cups.sh init/cups-lpd cups-config
-	  conf/cupsd.conf conf/pam.std doc/index.html
-	  doc/es/index.html doc/ja/index.html
-	  doc/help/standard.html man/client.conf.man
-	  man/cups-deviced.man man/cups-driverd.man
-	  man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man
-	  man/cupsd.conf.man man/lpoptions.man
+AC_OUTPUT(Makedefs packaging/cups.list init/cups.sh cups-config
+          conf/cupsd.conf conf/pam.std doc/index.html doc/ja/index.html
+	  doc/help/standard.html man/client.conf.man man/cups-deviced.man
+	  man/cups-driverd.man man/cups-lpd.man man/cupsaddsmb.man
+	  man/cupsd.man man/cupsd.conf.man man/lpoptions.man
 	  templates/edit-config.tmpl templates/header.tmpl
-	  templates/es/header.tmpl templates/ja/header.tmpl)
+	  templates/ja/header.tmpl)

 chmod +x cups-config

@@ -1,246 +1,255 @@
 # DO NOT DELETE

 adminutil.o: adminutil.h cups.h ipp.h http.h md5.h ppd.h array.h file.h
-adminutil.o: language.h globals.h string.h ../config.h i18n.h transcode.h
-adminutil.o: debug.h
+adminutil.o: language.h globals.h string.h ../config.h i18n.h normalize.h
+adminutil.o: transcode.h debug.h
 array.o: array.h string.h ../config.h debug.h
 attr.o: ppd.h array.h file.h debug.h string.h ../config.h
 auth.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-auth.o: array.h file.h language.h i18n.h transcode.h debug.h
+auth.o: array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 backchannel.o: cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h
 backend.o: backend.h string.h ../config.h
 custom.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-custom.o: array.h file.h language.h i18n.h transcode.h debug.h
+custom.o: array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 dest.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-dest.o: array.h file.h language.h i18n.h transcode.h
+dest.o: array.h file.h language.h i18n.h normalize.h transcode.h
 dir.o: dir.h string.h ../config.h debug.h
 emit.o: ppd.h array.h file.h string.h ../config.h
 encode.o: cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h
 encode.o: ipp-private.h string.h ../config.h debug.h
-file.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h
-file.o: string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h
-file.o: debug.h
+file.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h string.h
+file.o: ../cups/debug.h file.h
 getputfile.o: cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h
 getputfile.o: string.h ../config.h debug.h
 globals.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
 globals.o: globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h
-globals.o: transcode.h
+globals.o: normalize.h transcode.h
 http.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h
-http.o: string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h
-http.o: debug.h
+http.o: string.h cups.h ppd.h array.h file.h language.h i18n.h normalize.h
+http.o: transcode.h debug.h
 http-addr.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-http-addr.o: array.h file.h language.h i18n.h transcode.h debug.h
+http-addr.o: array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 http-addrlist.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
 http-addrlist.o: globals.h string.h cups.h ppd.h array.h file.h language.h
-http-addrlist.o: i18n.h transcode.h debug.h
+http-addrlist.o: i18n.h normalize.h transcode.h debug.h
 http-support.o: debug.h globals.h string.h ../config.h cups.h ipp.h http.h
-http-support.o: md5.h ppd.h array.h file.h language.h i18n.h transcode.h
+http-support.o: md5.h ppd.h array.h file.h language.h i18n.h normalize.h
+http-support.o: transcode.h
 ipp.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h
-ipp.o: string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h
-ipp.o: debug.h
+ipp.o: string.h cups.h ppd.h array.h file.h language.h i18n.h normalize.h
+ipp.o: transcode.h debug.h
 ipp-support.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-ipp-support.o: array.h file.h language.h i18n.h transcode.h debug.h
+ipp-support.o: array.h file.h language.h i18n.h normalize.h transcode.h
+ipp-support.o: debug.h
 langprintf.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-langprintf.o: array.h file.h language.h i18n.h transcode.h
+langprintf.o: array.h file.h language.h i18n.h normalize.h transcode.h
 language.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-language.o: array.h file.h language.h i18n.h transcode.h debug.h
+language.o: array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 localize.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-localize.o: array.h file.h language.h i18n.h transcode.h debug.h
+localize.o: array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 mark.o: cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h string.h
 mark.o: ../config.h debug.h
 md5.o: md5.h string.h ../config.h
 md5passwd.o: http.h md5.h string.h ../config.h
+normalize.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
+normalize.o: array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 notify.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-notify.o: array.h file.h language.h i18n.h transcode.h
+notify.o: array.h file.h language.h i18n.h normalize.h transcode.h
 options.o: cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h string.h
 options.o: ../config.h debug.h
 page.o: ppd.h array.h file.h string.h ../config.h
 ppd.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h array.h
-ppd.o: file.h language.h i18n.h transcode.h debug.h
+ppd.o: file.h language.h i18n.h normalize.h transcode.h debug.h
 request.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-request.o: array.h file.h language.h i18n.h transcode.h debug.h
+request.o: array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 snprintf.o: string.h ../config.h
 string.o: debug.h string.h ../config.h globals.h cups.h ipp.h http.h md5.h
-string.o: ppd.h array.h file.h language.h i18n.h transcode.h
+string.o: ppd.h array.h file.h language.h i18n.h normalize.h transcode.h
 tempfile.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-tempfile.o: array.h file.h language.h i18n.h transcode.h debug.h
+tempfile.o: array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 transcode.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-transcode.o: array.h file.h language.h i18n.h transcode.h debug.h
+transcode.o: array.h file.h language.h i18n.h normalize.h transcode.h
 usersys.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
 usersys.o: globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h
-usersys.o: transcode.h
+usersys.o: normalize.h transcode.h
 util.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-util.o: array.h file.h language.h i18n.h transcode.h debug.h
+util.o: array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 testadmin.o: adminutil.h cups.h ipp.h http.h md5.h ppd.h array.h file.h
 testadmin.o: language.h string.h ../config.h
 testarray.o: ../cups/string.h ../config.h string.h array.h dir.h debug.h
 testfile.o: string.h ../config.h file.h debug.h
 testhttp.o: http.h md5.h string.h ../config.h
-testi18n.o: i18n.h transcode.h language.h array.h string.h ../config.h
+testi18n.o: language.h array.h string.h ../config.h transcode.h normalize.h
 testipp.o: ../cups/string.h ../config.h string.h ipp.h http.h md5.h
-testlang.o: i18n.h transcode.h language.h array.h
+testlang.o: i18n.h language.h array.h
 testppd.o: ../cups/string.h ../config.h string.h ppd.h array.h file.h
 # DO NOT DELETE

 adminutil.32.o: adminutil.c  adminutil.h cups.h ipp.h http.h md5.h ppd.h array.h file.h
-adminutil.32.o: adminutil.c  language.h globals.h string.h ../config.h i18n.h transcode.h
-adminutil.32.o: adminutil.c  debug.h
+adminutil.32.o: adminutil.c  language.h globals.h string.h ../config.h i18n.h normalize.h
+adminutil.32.o: adminutil.c  transcode.h debug.h
 array.32.o: array.c  array.h string.h ../config.h debug.h
 attr.32.o: attr.c  ppd.h array.h file.h debug.h string.h ../config.h
 auth.32.o: auth.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-auth.32.o: auth.c  array.h file.h language.h i18n.h transcode.h debug.h
+auth.32.o: auth.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 backchannel.32.o: backchannel.c  cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h
 backend.32.o: backend.c  backend.h string.h ../config.h
 custom.32.o: custom.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-custom.32.o: custom.c  array.h file.h language.h i18n.h transcode.h debug.h
+custom.32.o: custom.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 dest.32.o: dest.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-dest.32.o: dest.c  array.h file.h language.h i18n.h transcode.h
+dest.32.o: dest.c  array.h file.h language.h i18n.h normalize.h transcode.h
 dir.32.o: dir.c  dir.h string.h ../config.h debug.h
 emit.32.o: emit.c  ppd.h array.h file.h string.h ../config.h
 encode.32.o: encode.c  cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h
 encode.32.o: encode.c  ipp-private.h string.h ../config.h debug.h
-file.32.o: file.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h
-file.32.o: file.c  string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h
-file.32.o: file.c  debug.h
+file.32.o: file.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h string.h
+file.32.o: file.c  ../cups/debug.h file.h
 getputfile.32.o: getputfile.c  cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h
 getputfile.32.o: getputfile.c  string.h ../config.h debug.h
 globals.32.o: globals.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
 globals.32.o: globals.c  globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h
-globals.32.o: globals.c  transcode.h
+globals.32.o: globals.c  normalize.h transcode.h
 http.32.o: http.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h
-http.32.o: http.c  string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h
-http.32.o: http.c  debug.h
+http.32.o: http.c  string.h cups.h ppd.h array.h file.h language.h i18n.h normalize.h
+http.32.o: http.c  transcode.h debug.h
 http-addr.32.o: http-addr.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-http-addr.32.o: http-addr.c  array.h file.h language.h i18n.h transcode.h debug.h
+http-addr.32.o: http-addr.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 http-addrlist.32.o: http-addrlist.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
 http-addrlist.32.o: http-addrlist.c  globals.h string.h cups.h ppd.h array.h file.h language.h
-http-addrlist.32.o: http-addrlist.c  i18n.h transcode.h debug.h
+http-addrlist.32.o: http-addrlist.c  i18n.h normalize.h transcode.h debug.h
 http-support.32.o: http-support.c  debug.h globals.h string.h ../config.h cups.h ipp.h http.h
-http-support.32.o: http-support.c  md5.h ppd.h array.h file.h language.h i18n.h transcode.h
+http-support.32.o: http-support.c  md5.h ppd.h array.h file.h language.h i18n.h normalize.h
+http-support.32.o: http-support.c  transcode.h
 ipp.32.o: ipp.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h
-ipp.32.o: ipp.c  string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h
-ipp.32.o: ipp.c  debug.h
+ipp.32.o: ipp.c  string.h cups.h ppd.h array.h file.h language.h i18n.h normalize.h
+ipp.32.o: ipp.c  transcode.h debug.h
 ipp-support.32.o: ipp-support.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-ipp-support.32.o: ipp-support.c  array.h file.h language.h i18n.h transcode.h debug.h
+ipp-support.32.o: ipp-support.c  array.h file.h language.h i18n.h normalize.h transcode.h
+ipp-support.32.o: ipp-support.c  debug.h
 langprintf.32.o: langprintf.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-langprintf.32.o: langprintf.c  array.h file.h language.h i18n.h transcode.h
+langprintf.32.o: langprintf.c  array.h file.h language.h i18n.h normalize.h transcode.h
 language.32.o: language.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-language.32.o: language.c  array.h file.h language.h i18n.h transcode.h debug.h
+language.32.o: language.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 localize.32.o: localize.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-localize.32.o: localize.c  array.h file.h language.h i18n.h transcode.h debug.h
+localize.32.o: localize.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 mark.32.o: mark.c  cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h string.h
 mark.32.o: mark.c  ../config.h debug.h
 md5.32.o: md5.c  md5.h string.h ../config.h
 md5passwd.32.o: md5passwd.c  http.h md5.h string.h ../config.h
+normalize.32.o: normalize.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
+normalize.32.o: normalize.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 notify.32.o: notify.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-notify.32.o: notify.c  array.h file.h language.h i18n.h transcode.h
+notify.32.o: notify.c  array.h file.h language.h i18n.h normalize.h transcode.h
 options.32.o: options.c  cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h string.h
 options.32.o: options.c  ../config.h debug.h
 page.32.o: page.c  ppd.h array.h file.h string.h ../config.h
 ppd.32.o: ppd.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h array.h
-ppd.32.o: ppd.c  file.h language.h i18n.h transcode.h debug.h
+ppd.32.o: ppd.c  file.h language.h i18n.h normalize.h transcode.h debug.h
 request.32.o: request.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-request.32.o: request.c  array.h file.h language.h i18n.h transcode.h debug.h
+request.32.o: request.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 snprintf.32.o: snprintf.c  string.h ../config.h
 string.32.o: string.c  debug.h string.h ../config.h globals.h cups.h ipp.h http.h md5.h
-string.32.o: string.c  ppd.h array.h file.h language.h i18n.h transcode.h
+string.32.o: string.c  ppd.h array.h file.h language.h i18n.h normalize.h transcode.h
 tempfile.32.o: tempfile.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-tempfile.32.o: tempfile.c  array.h file.h language.h i18n.h transcode.h debug.h
+tempfile.32.o: tempfile.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 transcode.32.o: transcode.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-transcode.32.o: transcode.c  array.h file.h language.h i18n.h transcode.h debug.h
+transcode.32.o: transcode.c  array.h file.h language.h i18n.h normalize.h transcode.h
 usersys.32.o: usersys.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
 usersys.32.o: usersys.c  globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h
-usersys.32.o: usersys.c  transcode.h
+usersys.32.o: usersys.c  normalize.h transcode.h
 util.32.o: util.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-util.32.o: util.c  array.h file.h language.h i18n.h transcode.h debug.h
+util.32.o: util.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 testadmin.32.o: testadmin.c  adminutil.h cups.h ipp.h http.h md5.h ppd.h array.h file.h
 testadmin.32.o: testadmin.c  language.h string.h ../config.h
 testarray.32.o: testarray.c  ../cups/string.h ../config.h string.h array.h dir.h debug.h
 testfile.32.o: testfile.c  string.h ../config.h file.h debug.h
 testhttp.32.o: testhttp.c  http.h md5.h string.h ../config.h
-testi18n.32.o: testi18n.c  i18n.h transcode.h language.h array.h string.h ../config.h
+testi18n.32.o: testi18n.c  language.h array.h string.h ../config.h transcode.h normalize.h
 testipp.32.o: testipp.c  ../cups/string.h ../config.h string.h ipp.h http.h md5.h
-testlang.32.o: testlang.c  i18n.h transcode.h language.h array.h
+testlang.32.o: testlang.c  i18n.h language.h array.h
 testppd.32.o: testppd.c  ../cups/string.h ../config.h string.h ppd.h array.h file.h
 # DO NOT DELETE

 adminutil.64.o: adminutil.c  adminutil.h cups.h ipp.h http.h md5.h ppd.h array.h file.h
-adminutil.64.o: adminutil.c  language.h globals.h string.h ../config.h i18n.h transcode.h
-adminutil.64.o: adminutil.c  debug.h
+adminutil.64.o: adminutil.c  language.h globals.h string.h ../config.h i18n.h normalize.h
+adminutil.64.o: adminutil.c  transcode.h debug.h
 array.64.o: array.c  array.h string.h ../config.h debug.h
 attr.64.o: attr.c  ppd.h array.h file.h debug.h string.h ../config.h
 auth.64.o: auth.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-auth.64.o: auth.c  array.h file.h language.h i18n.h transcode.h debug.h
+auth.64.o: auth.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 backchannel.64.o: backchannel.c  cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h
 backend.64.o: backend.c  backend.h string.h ../config.h
 custom.64.o: custom.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-custom.64.o: custom.c  array.h file.h language.h i18n.h transcode.h debug.h
+custom.64.o: custom.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 dest.64.o: dest.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-dest.64.o: dest.c  array.h file.h language.h i18n.h transcode.h
+dest.64.o: dest.c  array.h file.h language.h i18n.h normalize.h transcode.h
 dir.64.o: dir.c  dir.h string.h ../config.h debug.h
 emit.64.o: emit.c  ppd.h array.h file.h string.h ../config.h
 encode.64.o: encode.c  cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h
 encode.64.o: encode.c  ipp-private.h string.h ../config.h debug.h
-file.64.o: file.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h
-file.64.o: file.c  string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h
-file.64.o: file.c  debug.h
+file.64.o: file.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h string.h
+file.64.o: file.c  ../cups/debug.h file.h
 getputfile.64.o: getputfile.c  cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h
 getputfile.64.o: getputfile.c  string.h ../config.h debug.h
 globals.64.o: globals.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
 globals.64.o: globals.c  globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h
-globals.64.o: globals.c  transcode.h
+globals.64.o: globals.c  normalize.h transcode.h
 http.64.o: http.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h
-http.64.o: http.c  string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h
-http.64.o: http.c  debug.h
+http.64.o: http.c  string.h cups.h ppd.h array.h file.h language.h i18n.h normalize.h
+http.64.o: http.c  transcode.h debug.h
 http-addr.64.o: http-addr.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-http-addr.64.o: http-addr.c  array.h file.h language.h i18n.h transcode.h debug.h
+http-addr.64.o: http-addr.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 http-addrlist.64.o: http-addrlist.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
 http-addrlist.64.o: http-addrlist.c  globals.h string.h cups.h ppd.h array.h file.h language.h
-http-addrlist.64.o: http-addrlist.c  i18n.h transcode.h debug.h
+http-addrlist.64.o: http-addrlist.c  i18n.h normalize.h transcode.h debug.h
 http-support.64.o: http-support.c  debug.h globals.h string.h ../config.h cups.h ipp.h http.h
-http-support.64.o: http-support.c  md5.h ppd.h array.h file.h language.h i18n.h transcode.h
+http-support.64.o: http-support.c  md5.h ppd.h array.h file.h language.h i18n.h normalize.h
+http-support.64.o: http-support.c  transcode.h
 ipp.64.o: ipp.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h
-ipp.64.o: ipp.c  string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h
-ipp.64.o: ipp.c  debug.h
+ipp.64.o: ipp.c  string.h cups.h ppd.h array.h file.h language.h i18n.h normalize.h
+ipp.64.o: ipp.c  transcode.h debug.h
 ipp-support.64.o: ipp-support.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-ipp-support.64.o: ipp-support.c  array.h file.h language.h i18n.h transcode.h debug.h
+ipp-support.64.o: ipp-support.c  array.h file.h language.h i18n.h normalize.h transcode.h
+ipp-support.64.o: ipp-support.c  debug.h
 langprintf.64.o: langprintf.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-langprintf.64.o: langprintf.c  array.h file.h language.h i18n.h transcode.h
+langprintf.64.o: langprintf.c  array.h file.h language.h i18n.h normalize.h transcode.h
 language.64.o: language.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-language.64.o: language.c  array.h file.h language.h i18n.h transcode.h debug.h
+language.64.o: language.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 localize.64.o: localize.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-localize.64.o: localize.c  array.h file.h language.h i18n.h transcode.h debug.h
+localize.64.o: localize.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 mark.64.o: mark.c  cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h string.h
 mark.64.o: mark.c  ../config.h debug.h
 md5.64.o: md5.c  md5.h string.h ../config.h
 md5passwd.64.o: md5passwd.c  http.h md5.h string.h ../config.h
+normalize.64.o: normalize.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
+normalize.64.o: normalize.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 notify.64.o: notify.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-notify.64.o: notify.c  array.h file.h language.h i18n.h transcode.h
+notify.64.o: notify.c  array.h file.h language.h i18n.h normalize.h transcode.h
 options.64.o: options.c  cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h string.h
 options.64.o: options.c  ../config.h debug.h
 page.64.o: page.c  ppd.h array.h file.h string.h ../config.h
 ppd.64.o: ppd.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h array.h
-ppd.64.o: ppd.c  file.h language.h i18n.h transcode.h debug.h
+ppd.64.o: ppd.c  file.h language.h i18n.h normalize.h transcode.h debug.h
 request.64.o: request.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-request.64.o: request.c  array.h file.h language.h i18n.h transcode.h debug.h
+request.64.o: request.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 snprintf.64.o: snprintf.c  string.h ../config.h
 string.64.o: string.c  debug.h string.h ../config.h globals.h cups.h ipp.h http.h md5.h
-string.64.o: string.c  ppd.h array.h file.h language.h i18n.h transcode.h
+string.64.o: string.c  ppd.h array.h file.h language.h i18n.h normalize.h transcode.h
 tempfile.64.o: tempfile.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-tempfile.64.o: tempfile.c  array.h file.h language.h i18n.h transcode.h debug.h
+tempfile.64.o: tempfile.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 transcode.64.o: transcode.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-transcode.64.o: transcode.c  array.h file.h language.h i18n.h transcode.h debug.h
+transcode.64.o: transcode.c  array.h file.h language.h i18n.h normalize.h transcode.h
 usersys.64.o: usersys.c  http-private.h ../config.h http.h md5.h ipp-private.h ipp.h
 usersys.64.o: usersys.c  globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h
-usersys.64.o: usersys.c  transcode.h
+usersys.64.o: usersys.c  normalize.h transcode.h
 util.64.o: util.c  globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
-util.64.o: util.c  array.h file.h language.h i18n.h transcode.h debug.h
+util.64.o: util.c  array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 testadmin.64.o: testadmin.c  adminutil.h cups.h ipp.h http.h md5.h ppd.h array.h file.h
 testadmin.64.o: testadmin.c  language.h string.h ../config.h
 testarray.64.o: testarray.c  ../cups/string.h ../config.h string.h array.h dir.h debug.h
 testfile.64.o: testfile.c  string.h ../config.h file.h debug.h
 testhttp.64.o: testhttp.c  http.h md5.h string.h ../config.h
-testi18n.64.o: testi18n.c  i18n.h transcode.h language.h array.h string.h ../config.h
+testi18n.64.o: testi18n.c  language.h array.h string.h ../config.h transcode.h normalize.h
 testipp.64.o: testipp.c  ../cups/string.h ../config.h string.h ipp.h http.h md5.h
-testlang.64.o: testlang.c  i18n.h transcode.h language.h array.h
+testlang.64.o: testlang.c  i18n.h language.h array.h
 testppd.64.o: testppd.c  ../cups/string.h ../config.h string.h ppd.h array.h file.h
@@ -57,6 +57,7 @@ LIBOBJS	=	\
 		mark.o \
 		md5.o \
 		md5passwd.o \
+		normalize.o \
 		notify.o \
 		options.o \
 		page.o \
@@ -100,6 +101,7 @@ HEADERS	=	\
 		ipp.h \
 		language.h \
 		md5.h \
+		normalize.h \
 		ppd.h \
 		transcode.h

@@ -230,7 +232,7 @@ uninstall64bit:

 libcups.so.2 libcups.sl.2:	$(LIBOBJS)
 	echo Linking $@...
-	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+	$(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
 	$(RM) `basename $@ .2`
 	$(LN) $@ `basename $@ .2`

@@ -241,7 +243,7 @@ libcups.so.2 libcups.sl.2:	$(LIBOBJS)

 libcups.32.so.2:	$(LIB32OBJS)
 	echo Linking 32-bit $@...
-	$(DSO) $(ARCH32FLAGS) $(DSOFLAGS) -o $@ $(LIB32OBJS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+	$(DSO) $(C32FLAGS) $(DSOFLAGS) -o $@ $(LIB32OBJS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)


 #
@@ -250,7 +252,7 @@ libcups.32.so.2:	$(LIB32OBJS)

 libcups.64.so.2:	$(LIB64OBJS)
 	echo Linking 64-bit $@...
-	$(DSO) $(ARCH64FLAGS) $(DSOFLAGS) -o $@ $(LIB64OBJS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+	$(DSO) $(C64FLAGS) $(DSOFLAGS) -o $@ $(LIB64OBJS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)


 #
@@ -259,7 +261,7 @@ libcups.64.so.2:	$(LIB64OBJS)

 libcups.2.dylib:	$(LIBOBJS)
 	echo Linking $@...
-	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
+	$(DSO) $(DSOFLAGS) -o $@ \
 		-install_name $(libdir)/$@ \
 		-current_version 2.7.0 \
 		-compatibility_version 2.0.0 \
@@ -285,7 +287,7 @@ libcups_s.a:	$(LIBOBJS)

 libcups.la:    $(LIBOBJS)
 	echo Linking $@...
-	$(CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
+	$(CC) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
 		-version-info 2:7 $(SSLLIBS) $(COMMONLIBS) $(LIBZ)


@@ -168,7 +168,7 @@ cupsAdminCreateWindowsPPD(
  * Create a temporary output file using the destination buffer...
  */

-  if ((dstfp = cupsTempFile2(buffer, bufsize)) == NULL)
+  if ((dstfp = cupsTempFile2(buffer, bufsize)) < 0)
  {
    cupsFileClose(srcfp);

@@ -114,13 +114,11 @@ static const _ipp_option_t ipp_options[] =
  { "ppi-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
  { "prettyprint",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
  { "prettyprint-default",	IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
-  { "printer-error-policy",	IPP_TAG_NAME,		IPP_TAG_PRINTER },
  { "printer-info",		IPP_TAG_TEXT,		IPP_TAG_PRINTER },
  { "printer-is-accepting-jobs",IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
  { "printer-is-shared",	IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
  { "printer-make-and-model",	IPP_TAG_TEXT,		IPP_TAG_PRINTER },
  { "printer-more-info",	IPP_TAG_URI,		IPP_TAG_PRINTER },
-  { "printer-op-policy",	IPP_TAG_NAME,		IPP_TAG_PRINTER },
  { "printer-resolution",	IPP_TAG_RESOLUTION,	IPP_TAG_JOB },
  { "printer-state",		IPP_TAG_ENUM,		IPP_TAG_PRINTER },
  { "printer-state-change-time",IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
@@ -35,12 +35,9 @@
 *   cupsFileFlush()       - Flush pending output.
 *   cupsFileGetChar()     - Get a single character from a file.
 *   cupsFileGetConf()     - Get a line from a configuration file...
- *   cupsFileGetLine()     - Get a CR and/or LF-terminated line that may
- *                           contain binary data.
 *   cupsFileGets()        - Get a CR and/or LF-terminated line.
 *   cupsFileLock()        - Temporarily lock access to a file.
- *   cupsFileNumber()      - Return the file descriptor associated with a CUPS
- *                           file.
+ *   cupsFileNumber()      - Return the file descriptor associated with a CUPS file.
 *   cupsFileOpen()        - Open a CUPS file.
 *   cupsFileOpenFd()      - Open a CUPS file using a file descriptor.
 *   cupsFilePeekChar()    - Peek at the next character from a file.
@@ -50,9 +47,6 @@
 *   cupsFileRead()        - Read from a file.
 *   cupsFileRewind()      - Rewind a file.
 *   cupsFileSeek()        - Seek in a file.
- *   cupsFileStderr()      - Return a CUPS file associated with stderr.
- *   cupsFileStdin()       - Return a CUPS file associated with stdin.
- *   cupsFileStdout()      - Return a CUPS file associated with stdout.
 *   cupsFileTell()        - Return the current file position.
 *   cupsFileUnlock()      - Unlock access to a file.
 *   cupsFileWrite()       - Write to a file.
@@ -69,13 +63,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include "http-private.h"
+#include "string.h"
 #include <errno.h>
+#include <cups/debug.h>
 #include <sys/types.h>
 #include <fcntl.h>
-#include "http-private.h"
-#include "globals.h"
-#include "debug.h"

+#include "file.h"
 #ifdef HAVE_LIBZ
 #  include <zlib.h>
 #endif /* HAVE_LIBZ */
@@ -104,7 +99,6 @@ struct _cups_file_s			/**** CUPS file structure... ****/
  int		fd;			/* File descriptor */
  char		mode,			/* Mode ('r' or 'w') */
 		compressed,		/* Compression used? */
-		is_stdio,		/* stdin/out/err? */
 		eof,			/* End of file? */
 		buf[4096],		/* Buffer */
 		*ptr,			/* Pointer into buffer */
@@ -141,7 +135,6 @@ cupsFileClose(cups_file_t *fp)		/* I - CUPS file */
  int	fd;				/* File descriptor */
  char	mode;				/* Open mode */
  int	status;				/* Return status */
-  int	is_stdio;			/* Is a stdio file? */


  DEBUG_printf(("cupsFileClose(fp=%p)\n", fp));
@@ -233,9 +226,8 @@ cupsFileClose(cups_file_t *fp)		/* I - CUPS file */
  * Save the file descriptor we used and free memory...
  */

-  fd       = fp->fd;
-  mode     = fp->mode;
-  is_stdio = fp->is_stdio;
+  fd   = fp->fd;
+  mode = fp->mode;

  free(fp);

@@ -248,7 +240,7 @@ cupsFileClose(cups_file_t *fp)		/* I - CUPS file */
    if (closesocket(fd) < 0)
      status = -1;
  }
-  else if (!is_stdio)
+  else
  {
    if (close(fd) < 0)
      status = -1;
@@ -265,7 +257,7 @@ cupsFileClose(cups_file_t *fp)		/* I - CUPS file */
 int					/* O - CUPS_FILE_NONE or CUPS_FILE_GZIP */
 cupsFileCompression(cups_file_t *fp)	/* I - CUPS file */
 {
-  return (fp ? fp->compressed : CUPS_FILE_NONE);
+  return (fp->compressed);
 }


@@ -276,7 +268,7 @@ cupsFileCompression(cups_file_t *fp)	/* I - CUPS file */
 int					/* O - 1 on EOF, 0 otherwise */
 cupsFileEOF(cups_file_t *fp)		/* I - CUPS file */
 {
-  return (fp ? fp->eof : 1);
+  return (fp->eof);
 }


@@ -568,76 +560,6 @@ cupsFileGetConf(cups_file_t *fp,	/* I  - CUPS file */
 }


-/*
- * 'cupsFileGetLine()' - Get a CR and/or LF-terminated line that may
- *                       contain binary data.
- *
- * This function differs from cupsFileGets() in that the trailing CR and LF
- * are preserved, as is any binary data on the line. The buffer is nul-
- * terminated, however you should use the returned length to determine
- * the number of bytes on the line.
- */
-
-size_t					/* O - Number of bytes on line or 0 on EOF */
-cupsFileGetLine(cups_file_t *fp,	/* I - File to read from */
-                char        *buf,	/* I - Buffer */
-                size_t      buflen)	/* I - Size of buffer */
-{
-  int		ch;			/* Character from file */
-  char		*ptr,			/* Current position in line buffer */
-		*end;			/* End of line buffer */
-
-
- /*
-  * Range check input...
-  */
-
-  if (!fp || (fp->mode != 'r' && fp->mode != 's') || !buf || buflen < 3)
-    return (0);
-
- /*
-  * Now loop until we have a valid line...
-  */
-
-  for (ptr = buf, end = buf + buflen - 2; ptr < end ;)
-  {
-    if (fp->ptr >= fp->end)
-      if (cups_fill(fp) <= 0)
-        break;
-
-    *ptr++ = ch = *(fp->ptr)++;
-
-    if (ch == '\r')
-    {
-     /*
-      * Check for CR LF...
-      */
-
-      if (fp->ptr >= fp->end)
-	if (cups_fill(fp) <= 0)
-          break;
-
-      if (*(fp->ptr) == '\n')
-        *ptr++ = *(fp->ptr)++;
-
-      break;
-    }
-    else if (ch == '\n')
-    {
-     /*
-      * Line feed ends a line...
-      */
-
-      break;
-    }
-  }
-
-  *ptr = '\0';
-
-  return (ptr - buf);
-}
-
-
 /*
 * 'cupsFileGets()' - Get a CR and/or LF-terminated line.
 */
@@ -1217,51 +1139,7 @@ cupsFileRead(cups_file_t *fp,		/* I - CUPS file */
 off_t					/* O - New file position or -1 */
 cupsFileRewind(cups_file_t *fp)		/* I - CUPS file */
 {
- /*
-  * Range check input...
-  */
-
-  if (!fp || fp->mode != 'r')
-    return (-1);
-
- /*
-  * Handle special cases...
-  */
-
-  if (fp->pos == 0)
-  {
-   /*
-    * No seeking necessary...
-    */
-
-    if (fp->ptr)
-    {
-      fp->ptr = fp->buf;
-      fp->eof = 0;
-    }
-
-    return (0);
-  }
-
- /*
-  * Otherwise, seek in the file and cleanup any compression buffers...
-  */
-
-#ifdef HAVE_LIBZ
-  if (fp->compressed)
-  {
-    inflateEnd(&fp->stream);
-    fp->compressed = 0;
-  }
-#endif /* HAVE_LIBZ */
-
-  lseek(fp->fd, 0, SEEK_SET);
-
-  fp->pos = 0;
-  fp->ptr = NULL;
-  fp->end = NULL;
-
-  return (0);
+  return (cupsFileSeek(fp, 0L));
 }


@@ -1287,13 +1165,6 @@ cupsFileSeek(cups_file_t *fp,		/* I - CUPS file */
  if (!fp || pos < 0 || fp->mode != 'r')
    return (-1);

- /*
-  * Handle special cases...
-  */
-
-  if (pos == 0)
-    return (cupsFileRewind(fp));
-
  if (fp->pos == pos)
  {
   /*
@@ -1309,40 +1180,20 @@ cupsFileSeek(cups_file_t *fp,		/* I - CUPS file */
    return (pos);
  }

-#ifdef HAVE_LIBZ
-  if (!fp->compressed && !fp->ptr)
-  {
-   /*
-    * Preload a buffer to determine whether the file is compressed...
-    */
-
-    if (cups_fill(fp) < 0)
-      return (-1);
-  }
-#endif /* HAVE_LIBZ */
-
 /*
  * Figure out the number of bytes in the current buffer, and then
  * see if we are outside of it...
  */

-  if (fp->ptr)
-    bytes = fp->end - fp->buf;
-  else
-    bytes = 0;
-
+  bytes   = fp->end - fp->buf;
  fp->eof = 0;

-  DEBUG_printf(("    bytes=" CUPS_LLFMT "\n", CUPS_LLCAST bytes));
-
  if (pos < fp->pos)
  {
   /*
    * Need to seek backwards...
    */

-    DEBUG_puts("    SEEK BACKWARDS");
-
 #ifdef HAVE_LIBZ
    if (fp->compressed)
    {
@@ -1359,17 +1210,14 @@ cupsFileSeek(cups_file_t *fp,		/* I - CUPS file */

      if (bytes <= 0)
        return (-1);
-
-      fp->ptr = fp->buf + pos - fp->pos;
    }
    else
 #endif /* HAVE_LIBZ */
    {
      fp->pos = lseek(fp->fd, pos, SEEK_SET);
+      DEBUG_printf(("    lseek() returned %ld...\n", (long)fp->pos));
      fp->ptr = NULL;
      fp->end = NULL;
-
-      DEBUG_printf(("    lseek() returned %ld...\n", (long)fp->pos));
    }
  }
  else if (pos >= (fp->pos + bytes))
@@ -1378,30 +1226,23 @@ cupsFileSeek(cups_file_t *fp,		/* I - CUPS file */
    * Need to seek forwards...
    */

-    DEBUG_puts("    SEEK FORWARDS");
-
 #ifdef HAVE_LIBZ
-    if (fp->compressed)
+    if (fp->compressed || !fp->ptr)
    {
      while ((bytes = cups_fill(fp)) > 0)
-      {
        if (pos >= fp->pos && pos < (fp->pos + bytes))
 	  break;
-      }

      if (bytes <= 0)
        return (-1);
-
-      fp->ptr = fp->buf + pos - fp->pos;
    }
    else
 #endif /* HAVE_LIBZ */
    {
      fp->pos = lseek(fp->fd, pos, SEEK_SET);
+      DEBUG_printf(("    lseek() returned " CUPS_LLFMT "...\n", fp->pos));
      fp->ptr = NULL;
      fp->end = NULL;
-
-      DEBUG_printf(("    lseek() returned " CUPS_LLFMT "...\n", fp->pos));
    }
  }
  else
@@ -1411,111 +1252,14 @@ cupsFileSeek(cups_file_t *fp,		/* I - CUPS file */
    * range...
    */

-    DEBUG_puts("    SEEK INSIDE BUFFER");
-
    fp->ptr = fp->buf + pos - fp->pos;
+    DEBUG_puts(("    seek inside buffer..."));
  }

  return (fp->pos);
 }


-/*
- * 'cupsFileStderr()' - Return a CUPS file associated with stderr.
- */
-
-cups_file_t *
-cupsFileStderr(void)
-{
-  _cups_globals_t *cg = _cupsGlobals();	/* Pointer to library globals... */
-
-
- /*
-  * Open file descriptor 2 as needed...
-  */
-
-  if (!cg->stdio_files[2])
-  {
-   /*
-    * Flush any pending output on the stdio file...
-    */
-
-    fflush(stderr);
-
-   /*
-    * Open file descriptor 2...
-    */
-
-    if ((cg->stdio_files[2] = cupsFileOpenFd(2, "w")) != NULL)
-      cg->stdio_files[2]->is_stdio = 1;
-  }
-
-  return (cg->stdio_files[2]);
-}
-
-
-/*
- * 'cupsFileStdin()' - Return a CUPS file associated with stdin.
- */
-
-cups_file_t *
-cupsFileStdin(void)
-{
-  _cups_globals_t *cg = _cupsGlobals();	/* Pointer to library globals... */
-
-
- /*
-  * Open file descriptor 0 as needed...
-  */
-
-  if (!cg->stdio_files[0])
-  {
-   /*
-    * Open file descriptor 0...
-    */
-
-    if ((cg->stdio_files[0] = cupsFileOpenFd(0, "r")) != NULL)
-      cg->stdio_files[0]->is_stdio = 1;
-  }
-
-  return (cg->stdio_files[0]);
-}
-
-
-/*
- * 'cupsFileStdout()' - Return a CUPS file associated with stdout.
- */
-
-cups_file_t *
-cupsFileStdout(void)
-{
-  _cups_globals_t *cg = _cupsGlobals();	/* Pointer to library globals... */
-
-
- /*
-  * Open file descriptor 1 as needed...
-  */
-
-  if (!cg->stdio_files[1])
-  {
-   /*
-    * Flush any pending output on the stdio file...
-    */
-
-    fflush(stdout);
-
-   /*
-    * Open file descriptor 1...
-    */
-
-    if ((cg->stdio_files[1] = cupsFileOpenFd(1, "w")) != NULL)
-      cg->stdio_files[1]->is_stdio = 1;
-  }
-
-  return (cg->stdio_files[1]);
-}
-
-
 /*
 * 'cupsFileTell()' - Return the current file position.
 */
@@ -1523,7 +1267,7 @@ cupsFileStdout(void)
 off_t					/* O - File position */
 cupsFileTell(cups_file_t *fp)		/* I - CUPS file */
 {
-  return (fp ? fp->pos : 0);
+  return (fp->pos);
 }


@@ -81,8 +81,6 @@ extern int		cupsFileFlush(cups_file_t *fp);
 extern int		cupsFileGetChar(cups_file_t *fp);
 extern char		*cupsFileGetConf(cups_file_t *fp, char *buf, size_t buflen,
 			                 char **value, int *linenum);
-extern size_t		cupsFileGetLine(cups_file_t *fp, char *buf,
-			                size_t buflen);
 extern char		*cupsFileGets(cups_file_t *fp, char *buf, size_t buflen);
 extern int		cupsFileLock(cups_file_t *fp, int block);
 extern int		cupsFileNumber(cups_file_t *fp);
@@ -95,9 +93,6 @@ extern int		cupsFilePuts(cups_file_t *fp, const char *s);
 extern ssize_t		cupsFileRead(cups_file_t *fp, char *buf, size_t bytes);
 extern off_t		cupsFileRewind(cups_file_t *fp);
 extern off_t		cupsFileSeek(cups_file_t *fp, off_t pos);
-extern cups_file_t	*cupsFileStderr(void);
-extern cups_file_t	*cupsFileStdin(void);
-extern cups_file_t	*cupsFileStdout(void);
 extern off_t		cupsFileTell(cups_file_t *fp);
 extern int		cupsFileUnlock(cups_file_t *fp);
 extern ssize_t		cupsFileWrite(cups_file_t *fp, const char *buf, size_t bytes);
@@ -152,20 +152,18 @@ globals_init()
 static void
 globals_destructor(void *value)		/* I - Data to free */
 {
-  int			i;		/* Looping var */
  _cups_globals_t	*cg;		/* Global data */


  cg = (_cups_globals_t *)value;

-  httpClose(cg->http);
-
-  for (i = 0; i < 3; i ++)
-    cupsFileClose(cg->stdio_files[i]);
+  if (cg->http)
+    httpClose(cg->http);

  _cupsStrFlush(cg);
  _cupsLangFlush(cg);
  _cupsCharmapFlush(cg);
+  _cupsNormalizeMapsFlush(cg);

  cupsFreeOptions(cg->cupsd_num_settings, cg->cupsd_settings);

@@ -34,6 +34,8 @@
 #  include "string.h"
 #  include "cups.h"
 #  include "i18n.h"
+#  include "normalize.h"
+#  include "transcode.h"

 #  ifdef HAVE_PTHREAD_H
 #    include <pthread.h>
@@ -72,9 +74,6 @@ typedef struct _cups_globals_s		/**** CUPS global state data ****/
 					/* Number of server settings */
  cups_option_t		*cupsd_settings;/* Server settings */

-  /* file.c */
-  cups_file_t		*stdio_files[3];/* stdin, stdout, stderr */
-
  /* http.c */
  char			http_date[256];	/* Date+time buffer */

@@ -94,6 +93,13 @@ typedef struct _cups_globals_s		/**** CUPS global state data ****/
  char			ipp_unknown[255];
 					/* Unknown error statuses */

+  /* normalize.c */
+  _cups_norm_map_t	*normmap_cache;	/* Normalize Map cache */
+  _cups_fold_map_t	*foldmap_cache;	/* Case Fold cache */
+  _cups_prop_map_t	*propmap_cache;	/* Char Prop Map Cache */
+  _cups_comb_map_t	*combmap_cache;	/* Comb Class Map Cache */
+  _cups_break_map_t	*breakmap_cache;/* Line Break Map Cache */
+
  /* language.c */
  cups_lang_t		*lang_cache;	/* Language string cache */
  cups_lang_t		*lang_default;	/* Default language */
@@ -144,10 +150,11 @@ typedef struct _cups_globals_s		/**** CUPS global state data ****/
 * Prototypes...
 */

-extern void		_cupsCharmapFlush(_cups_globals_t *cg);
 extern const char	*_cupsGetPassword(const char *prompt);
 extern _cups_globals_t	*_cupsGlobals(void);
 extern void		_cupsLangFlush(_cups_globals_t *cg);
+extern void		_cupsCharmapFlush(_cups_globals_t *cg);
+extern void		_cupsNormalizeMapsFlush(_cups_globals_t *cg);
 extern void		_cupsSetError(ipp_status_t status, const char *message);
 extern void		_cupsStrFlush(_cups_globals_t *cg);

@@ -1692,7 +1692,6 @@ httpUpdate(http_t *http)		/* I - HTTP connection */
 	case HTTP_PUT :
 	    http->state ++;
 	case HTTP_POST_SEND :
-	case HTTP_HEAD :
 	    break;

 	default :
@@ -100,8 +100,6 @@ extern "C" {
 #    define s6_addr32	_S6_un._S6_u32
 #  elif defined(__FreeBSD__) || defined(__APPLE__)
 #    define s6_addr32	__u6_addr.__u6_addr32
-#  elif defined(__osf__)
-#    define s6_addr32	s6_un.sa6_laddr
 #  elif defined(WIN32)
 /*
 * Windows only defines byte and 16-bit word members of the union and
@@ -31,7 +31,7 @@
 * Include necessary headers...
 */

-#  include "transcode.h"
+#  include "language.h"

 #  ifdef __cplusplus
 extern "C" {
@@ -55,43 +55,12 @@ typedef struct _cups_message_s		/**** Message catalog entry ****/
 	*str;				/* Localized string */
 } _cups_message_t;

-typedef struct _cups_cmap_s		/**** SBCS Charmap Struct ****/
-{
-  struct _cups_cmap_s	*next;		/* Next charmap in cache */
-  int			used;		/* Number of times entry used */
-  cups_encoding_t	encoding;	/* Legacy charset encoding */
-  cups_ucs2_t		char2uni[256];	/* Map Legacy SBCS -> UCS-2 */
-  cups_sbcs_t		*uni2char[256]; /* Map UCS-2 -> Legacy SBCS */
-} _cups_cmap_t;
-
-typedef struct _cups_wide2uni_s		/**** Wide to Unicode ****/
-{
-  cups_vbcs_t		widechar;	/* VBCS 32-bit Char (EUC) */
-  cups_ucs2_t		unichar;	/* UCS-2 Char */
-} _cups_wide2uni_t;
-
-typedef struct _cups_vmap_s		/**** VBCS Charmap Struct ****/
-{
-  struct _cups_vmap_s	*next;		/* Next charmap in cache */
-  int			used;		/* Number of times entry used */
-  cups_encoding_t	encoding;	/* Legacy charset encoding */
-  cups_ucs2_t		*char2uni[256]; /* Map 16-bit Char -> UCS-2 */
-  int			charcount;	/* Count of 16-bit VBCS Chars */
-  _cups_wide2uni_t	*wide2uni;	/* Map 32-bit Char -> UCS-2 */
-  int			widecount;	/* Count of 32-bit VBCS Chars */
-  cups_vbcs_t		*uni2char[256]; /* Map UCS-2 -> 32-bit VBCS */
-  cups_sbcs_t		lead2char[256]; /* Legacy Lead Char - 2-byte */
-  cups_sbcs_t		lead3char[256]; /* Legacy Lead Char - 3-byte */
-  cups_sbcs_t		lead4char[256]; /* Legacy Lead Char - 4-byte */
-} _cups_vmap_t;
-

 /*
 * Prototypes...
 */

-extern void		_cupsCharmapFree(const cups_encoding_t encoding);
-extern void		*_cupsCharmapGet(const cups_encoding_t encoding);
+/**** New in CUPS 1.2 ****/
 extern const char	*_cupsEncodingName(cups_encoding_t encoding);
 extern int		_cupsLangPrintf(FILE *fp, const char *message, ...)
 #    ifdef __GNUC__
@@ -2404,8 +2404,8 @@ ippWriteIO(void       *dst,		/* I - Destination */
 */

 ipp_attribute_t *			/* O - New attribute */
-_ippAddAttr(ipp_t *ipp,			/* I - IPP message */
-            int   num_values)		/* I - Number of values */
+_ippAddAttr(ipp_t *ipp,		/* I - IPP message */
+              int   num_values)		/* I - Number of values */
 {
  ipp_attribute_t	*attr;		/* New attribute */

@@ -2797,29 +2797,6 @@ ipp_write_file(int         *fd,		/* I - File descriptor */
 }


-#ifdef __linux
-/*
- * The following symbol definitions are provided only for KDE
- * compatibility during the CUPS 1.2 testing period and will be
- * removed in a future release of CUPS.  These are PRIVATE APIs
- * from CUPS 1.1.x that the KDE developers chose to use...
- */
-
-ipp_attribute_t *			/* O - New attribute */
-_ipp_add(ipp_t *ipp,			/* I - IPP message */
-         int   num_values)		/* I - Number of values */
-{
-  return (_ippAddAttr(ipp, num_values));
-}
-
-void
-_ipp_free(ipp_attribute_t *attr)	/* I - Attribute to free */
-{
-  _ippFreeAttr(attr);
-}
-#endif /* __linux */
-
-
 /*
 * End of "$Id$".
 */
@@ -1,8 +1,6 @@
 _cupsAdminGetServerSettings
 _cupsAdminSetServerSettings
 _cupsCharmapFlush
-_cupsCharmapFree
-_cupsCharmapGet
 _cupsEncodingName
 _cupsGetPassword
 _cupsGlobals
@@ -16,16 +14,14 @@ _cupsMD5Init
 _cupsMessageFree
 _cupsMessageLoad
 _cupsMessageLookup
+_cupsNormalizeMapsFlush
 _cupsSetError
 _cupsStrAlloc
-_cupsStrFlush
-_cupsStrFormatd
-_cupsStrFree
-_cupsStrScand
-_cupsStrStatistics
 _cups_strcpy
+_cupsStrFlush
+_cupsStrFree
 _cups_strlcat
 _cups_strlcpy
+_cupsStrStatistics
 _ippAddAttr
 _ippFreeAttr
-_ppdGetEncoding
@@ -0,0 +1,336 @@
+/*
+ * "$Id$"
+ *
+ *   Unicode normalization for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-2005 by Easy Software Products.
+ *
+ *   These coded instructions, statements, and computer programs are
+ *   the property of Easy Software Products and are protected by Federal
+ *   copyright law.  Distribution and use rights are outlined in the
+ *   file "LICENSE.txt" which should have been included with this file.
+ *   If this file is missing or damaged please contact Easy Software
+ *   Products at:
+ *
+ *       Attn: CUPS Licensing Information
+ *       Easy Software Products
+ *       44141 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636 USA
+ *
+ *       Voice: (301) 373-9600
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ */
+
+#ifndef _CUPS_NORMALIZE_H_
+#  define _CUPS_NORMALIZE_H_
+
+/*
+ * Include necessary headers...
+ */
+
+#include "transcode.h"
+
+#  ifdef __cplusplus
+extern "C" {
+#  endif /* __cplusplus */
+
+
+/*
+ * Types...
+ */
+
+typedef enum				/**** Normalizataion Types ****/
+{
+  CUPS_NORM_NFD,			/* Canonical Decomposition */
+  CUPS_NORM_NFKD,			/* Compatibility Decomposition */
+  CUPS_NORM_NFC,			/* NFD, them Canonical Composition */
+  CUPS_NORM_NFKC			/* NFKD, them Canonical Composition */
+} cups_normalize_t;
+
+typedef enum				/**** Case Folding Types ****/
+{
+  CUPS_FOLD_SIMPLE,			/* Simple - no expansion in size */
+  CUPS_FOLD_FULL			/* Full - possible expansion in size */
+} cups_folding_t;
+
+typedef enum				/**** Unicode Char Property Types ****/
+{
+  CUPS_PROP_GENERAL_CATEGORY,		/* See 'cups_gencat_t' enum */
+  CUPS_PROP_BIDI_CATEGORY,		/* See 'cups_bidi_t' enum */
+  CUPS_PROP_COMBINING_CLASS,		/* See '_cups_comb_class_t' type */
+  CUPS_PROP_BREAK_CLASS			/* See 'cups_break_class_t' enum */
+} cups_property_t;
+
+
+/*
+ * Note - Use major classes for logic optimizations (by mask).
+ */
+
+typedef enum				/**** Unicode General Category ****/
+{
+  CUPS_GENCAT_NULL = 0,			/* Terminator */
+  CUPS_GENCAT_L	 = 0x10,		/* Letter major class */
+  CUPS_GENCAT_LU = 0x11,		/* Lu Letter, Uppercase */
+  CUPS_GENCAT_LL = 0x12,		/* Ll Letter, Lowercase */
+  CUPS_GENCAT_LT = 0x13,		/* Lt Letter, Titlecase */
+  CUPS_GENCAT_LM = 0x14,		/* Lm Letter, Modifier */
+  CUPS_GENCAT_LO = 0x15,		/* Lo Letter, Other */
+  CUPS_GENCAT_M	 = 0x20,		/* Mark major class */
+  CUPS_GENCAT_MN = 0x21,		/* Mn Mark, Non-Spacing */
+  CUPS_GENCAT_MC = 0x22,		/* Mc Mark, Spacing Combining */
+  CUPS_GENCAT_ME = 0x23,		/* Me Mark, Enclosing */
+  CUPS_GENCAT_N	 = 0x30,		/* Number major class */
+  CUPS_GENCAT_ND = 0x31,		/* Nd Number, Decimal Digit */
+  CUPS_GENCAT_NL = 0x32,		/* Nl Number, Letter */
+  CUPS_GENCAT_NO = 0x33,		/* No Number, Other */
+  CUPS_GENCAT_P	 = 0x40,		/* Punctuation major class */
+  CUPS_GENCAT_PC = 0x41,		/* Pc Punctuation, Connector */
+  CUPS_GENCAT_PD = 0x42,		/* Pd Punctuation, Dash */
+  CUPS_GENCAT_PS = 0x43,		/* Ps Punctuation, Open (start) */
+  CUPS_GENCAT_PE = 0x44,		/* Pe Punctuation, Close (end) */
+  CUPS_GENCAT_PI = 0x45,		/* Pi Punctuation, Initial Quote */
+  CUPS_GENCAT_PF = 0x46,		/* Pf Punctuation, Final Quote */
+  CUPS_GENCAT_PO = 0x47,		/* Po Punctuation, Other */
+  CUPS_GENCAT_S	 = 0x50,		/* Symbol major class */
+  CUPS_GENCAT_SM = 0x51,		/* Sm Symbol, Math */
+  CUPS_GENCAT_SC = 0x52,		/* Sc Symbol, Currency */
+  CUPS_GENCAT_SK = 0x53,		/* Sk Symbol, Modifier */
+  CUPS_GENCAT_SO = 0x54,		/* So Symbol, Other */
+  CUPS_GENCAT_Z	 = 0x60,		/* Separator major class */
+  CUPS_GENCAT_ZS = 0x61,		/* Zs Separator, Space */
+  CUPS_GENCAT_ZL = 0x62,		/* Zl Separator, Line */
+  CUPS_GENCAT_ZP = 0x63,		/* Zp Separator, Paragraph */
+  CUPS_GENCAT_C	 = 0x70,		/* Other (miscellaneous) major class */
+  CUPS_GENCAT_CC = 0x71,		/* Cc Other, Control */
+  CUPS_GENCAT_CF = 0x72,		/* Cf Other, Format */
+  CUPS_GENCAT_CS = 0x73,		/* Cs Other, Surrogate */
+  CUPS_GENCAT_CO = 0x74,		/* Co Other, Private Use */
+  CUPS_GENCAT_CN = 0x75			/* Cn Other, Not Assigned */
+} cups_gencat_t;
+
+typedef enum				/**** Unicode Bidi Category ****/
+{
+  CUPS_BIDI_L,				/* Left-to-Right (Alpha, Ideographic) */
+  CUPS_BIDI_LRE,			/* Left-to-Right Embedding (explicit) */
+  CUPS_BIDI_LRO,			/* Left-to-Right Override (explicit) */
+  CUPS_BIDI_R,				/* Right-to-Left (Hebrew alpha/punct) */
+  CUPS_BIDI_AL,				/* Right-to-Left Arabic (Arabic, etc) */
+  CUPS_BIDI_RLE,			/* Right-to-Left Embedding (explicit) */
+  CUPS_BIDI_RLO,			/* Right-to-Left Override (explicit) */
+  CUPS_BIDI_PDF,			/* Pop Directional Format */
+  CUPS_BIDI_EN,				/* Euro Number (Euro & Indic digits) */
+  CUPS_BIDI_ES,				/* Euro Number Separator (Slash) */
+  CUPS_BIDI_ET,				/* Euro Number Terminator */
+  CUPS_BIDI_AN,				/* Arabic Number (digits, separators) */
+  CUPS_BIDI_CS,				/* Common Number Separator */
+  CUPS_BIDI_NSM,			/* Non-Spacing Mark (Mn/Me in UCD) */
+  CUPS_BIDI_BN,				/* Boundary Neutral (formatting, etc) */
+  CUPS_BIDI_B,				/* Paragraph Separator */
+  CUPS_BIDI_S,				/* Segment Separator (Tab) */
+  CUPS_BIDI_WS,				/* Whitespace Space (Space, etc) */
+  CUPS_BIDI_ON				/* Other Neutrals */
+} cups_bidi_t;
+
+/*
+ * Note - add state table from UAX-14, section 7.3.
+ * Remember to do BK and SP in outer loop (not in state table).
+ * Consider optimization for CM (combining mark).
+ * See 'LineBreak.txt' (12,875) and 'DerivedLineBreak.txt' (1,350).
+ */
+
+typedef enum				/**** Unicode Line Break Class ****/
+{
+ /*
+  * (A) - Allow Break AFTER
+  * (XA) - Prevent Break AFTER
+  * (B) - Allow Break BEFORE
+  * (XB) - Prevent Break BEFORE
+  * (P) - Allow Break For Pair
+  * (XP) - Prevent Break For Pair
+  */
+  CUPS_BREAK_NULL,			/* Terminator */
+  CUPS_BREAK_AI,			/* Ambiguous Alphabetic or Ideograph */
+  CUPS_BREAK_AL,			/* Ordinary Alpha/Symbol Chars (XP) */
+  CUPS_BREAK_BA,			/* Break Opportunity After Chars (A) */
+  CUPS_BREAK_BB,			/* Break Opportunity Before Chars (B) */
+  CUPS_BREAK_B2,			/* Break Opportunity Either (B/A/XP) */
+  CUPS_BREAK_BK,			/* Mandatory Break (A) (norm) */
+  CUPS_BREAK_CB,			/* Contingent Break (B/A) (norm) */
+  CUPS_BREAK_CL,			/* Closing Punctuation (XB) */
+  CUPS_BREAK_CM,			/* Attached/Combining (XB) (norm) */
+  CUPS_BREAK_CR,			/* Carriage Return (A) (norm) */
+  CUPS_BREAK_EX,			/* Exclamation/Interrogation (XB) */
+  CUPS_BREAK_GL,			/* Non-breaking "Glue" (XB/XA) (norm) */
+  CUPS_BREAK_HY,			/* Hyphen (XA) */
+  CUPS_BREAK_ID,			/* Ideographic (B/A) */
+  CUPS_BREAK_IN,			/* Inseparable chars (XP) */
+  CUPS_BREAK_IS,			/* Numeric Separator (Infix) (XB) */
+  CUPS_BREAK_LF,			/* Line Feed (A) (norm) */
+  CUPS_BREAK_NS,			/* Non-starters (XB) */
+  CUPS_BREAK_NU,			/* Numeric (XP) */
+  CUPS_BREAK_OP,			/* Opening Punctuation (XA) */
+  CUPS_BREAK_PO,			/* Postfix (Numeric) (XB) */
+  CUPS_BREAK_PR,			/* Prefix (Numeric) (XA) */
+  CUPS_BREAK_QU,			/* Ambiguous Quotation (XB/XA) */
+  CUPS_BREAK_SA,			/* Context Dependent (SE Asian) (P) */
+  CUPS_BREAK_SG,			/* Surrogates (XP) (norm) */
+  CUPS_BREAK_SP,			/* Space (A) (norm) */
+  CUPS_BREAK_SY,			/* Symbols Allowing Break After (A) */
+  CUPS_BREAK_XX,			/* Unknown (XP) */
+  CUPS_BREAK_ZW				/* Zero Width Space (A) (norm) */
+} cups_break_class_t;
+
+typedef int _cups_comb_class_t;	  /**** Unicode Combining Class ****/
+				/* 0=base, 1..254=combining char */
+
+/*
+ * Structures...
+ */
+
+typedef struct _cups_normmap_s		/**** Normalize Map Cache Struct ****/
+{
+  struct _cups_normmap_s *next;		/* Next normalize in cache */
+  int			used;		/* Number of times entry used */
+  cups_normalize_t	normalize;	/* Normalization type */
+  int			normcount;	/* Count of Source Chars */
+  cups_ucs2_t		*uni2norm;	/* Char -> Normalization */
+					/* ...only supports UCS-2 */
+} _cups_norm_map_t;
+
+typedef struct _cups_foldmap_s		/**** Case Fold Map Cache Struct ****/
+{
+  struct _cups_foldmap_s *next;		/* Next case fold in cache */
+  int			used;		/* Number of times entry used */
+  cups_folding_t	fold;		/* Case folding type */
+  int			foldcount;	/* Count of Source Chars */
+  cups_ucs2_t		*uni2fold;	/* Char -> Folded Char(s) */
+					/* ...only supports UCS-2 */
+} _cups_fold_map_t;
+
+typedef struct _cups_prop_s		/**** Char Property Struct ****/
+{
+  cups_ucs2_t		ch;		/* Unicode Char as UCS-2 */
+  unsigned char		gencat;		/* General Category */
+  unsigned char		bidicat;	/* Bidirectional Category */
+} _cups_prop_t;
+
+typedef struct _cups_prop_map_s		/**** Char Property Map Struct ****/
+{
+  int			used;		/* Number of times entry used */
+  int			propcount;	/* Count of Source Chars */
+  _cups_prop_t		*uni2prop;	/* Char -> Properties */
+} _cups_prop_map_t;
+
+typedef struct _cups_break_map_s	/**** Line Break Class Map Struct ****/
+{
+  int			used;		/* Number of times entry used */
+  int			breakcount;	/* Count of Source Chars */
+  cups_ucs2_t		*uni2break;	/* Char -> Line Break Class */
+} _cups_break_map_t;
+
+typedef struct _cups_comb_s		/**** Char Combining Class Struct ****/
+{
+  cups_ucs2_t		ch;		/* Unicode Char as UCS-2 */
+  unsigned char		combclass;	/* Combining Class */
+  unsigned char		reserved;	/* Reserved for alignment */
+} _cups_comb_t;
+
+typedef struct _cups_comb_map_s		/**** Combining Class Map Struct ****/
+{
+  int			used;		/* Number of times entry used */
+  int			combcount;	/* Count of Source Chars */
+  _cups_comb_t		*uni2comb;	/* Char -> Combining Class */
+} _cups_comb_map_t;
+
+/*
+ * Prototypes...
+ */
+
+/*
+ * Utility functions for normalization module
+ */
+extern int      cupsNormalizeMapsGet(void);
+extern int      cupsNormalizeMapsFree(void);
+extern void     cupsNormalizeMapsFlush(void);
+
+/*
+ * Normalize UTF-8 string to Unicode UAX-15 Normalization Form
+ * Note - Compatibility Normalization Forms (NFKD/NFKC) are
+ * unsafe for subsequent transcoding to legacy charsets
+ */
+extern int      cupsUTF8Normalize(cups_utf8_t *dest,
+                                  const cups_utf8_t *src,
+                                  const int maxout,
+                                  const cups_normalize_t normalize);
+
+/*
+ * Normalize UTF-32 string to Unicode UAX-15 Normalization Form
+ * Note - Compatibility Normalization Forms (NFKD/NFKC) are
+ * unsafe for subsequent transcoding to legacy charsets
+ */
+extern int      cupsUTF32Normalize(cups_utf32_t *dest,
+                                   const cups_utf32_t *src,
+                                   const int maxout,
+                                   const cups_normalize_t normalize);
+
+/*
+ * Case Fold UTF-8 string per Unicode UAX-21 Section 2.3
+ * Note - Case folding output is
+ * unsafe for subsequent transcoding to legacy charsets
+ */
+extern int      cupsUTF8CaseFold(cups_utf8_t *dest,
+                                 const cups_utf8_t *src,
+                                 const int maxout,
+                                 const cups_folding_t fold);
+
+/*
+ * Case Fold UTF-32 string per Unicode UAX-21 Section 2.3
+ * Note - Case folding output is
+ * unsafe for subsequent transcoding to legacy charsets
+ */
+extern int      cupsUTF32CaseFold(cups_utf32_t *dest,
+                                  const cups_utf32_t *src,
+                                  const int maxout,
+                                  const cups_folding_t fold);
+
+/*
+ * Compare UTF-8 strings after case folding
+ */
+extern int      cupsUTF8CompareCaseless(const cups_utf8_t *s1,
+                                        const cups_utf8_t *s2);
+
+/*
+ * Compare UTF-32 strings after case folding
+ */
+extern int      cupsUTF32CompareCaseless(const cups_utf32_t *s1,
+                                         const cups_utf32_t *s2);
+
+/*
+ * Compare UTF-8 strings after case folding and NFKC normalization
+ */
+extern int      cupsUTF8CompareIdentifier(const cups_utf8_t *s1,
+                                          const cups_utf8_t *s2);
+
+/*
+ * Compare UTF-32 strings after case folding and NFKC normalization
+ */
+extern int      cupsUTF32CompareIdentifier(const cups_utf32_t *s1,
+                                           const cups_utf32_t *s2);
+
+/*
+ * Get UTF-32 character property
+ */
+extern int      cupsUTF32CharacterProperty(const cups_utf32_t ch,
+                                           const cups_property_t prop);
+
+#  ifdef __cplusplus
+}
+#  endif /* __cplusplus */
+
+#endif /* !_CUPS_NORMALIZE_H_ */
+
+
+/*
+ * End of "$Id$"
+ */
@@ -36,8 +36,6 @@
 *
 *   ppdClose()             - Free all memory used by the PPD file.
 *   ppdErrorString()       - Returns the text assocated with a status.
- *   _ppdGetEncoding()      - Get the CUPS encoding value for the given
- *                            LanguageEncoding.
 *   ppdLastError()         - Return the status from the last ppdOpen*().
 *   ppdOpen()              - Read a PPD file into memory.
 *   ppdOpen2()             - Read a PPD file into memory.
@@ -113,8 +111,7 @@ static ppd_cparam_t	*ppd_get_cparam(ppd_coption_t *opt,
 			                const char *param,
 					const char *text);
 static ppd_group_t	*ppd_get_group(ppd_file_t *ppd, const char *name,
-			               const char *text, _cups_globals_t *cg,
-				       cups_encoding_t encoding);
+			               const char *text, _cups_globals_t *cg);
 static ppd_option_t	*ppd_get_option(ppd_group_t *group, const char *name);
 static int		ppd_read(cups_file_t *fp, char *keyword, char *option,
 			         char *text, char **string, int ignoreblank,
@@ -149,8 +146,6 @@ ppdClose(ppd_file_t *ppd)		/* I - PPD file record */
  * Free all strings at the top level...
  */

-  ppd_free(ppd->lang_encoding);
-  ppd_free(ppd->nickname);
  ppd_free(ppd->patches);
  ppd_free(ppd->jcl_begin);
  ppd_free(ppd->jcl_end);
@@ -335,31 +330,6 @@ ppdErrorString(ppd_status_t status)	/* I - PPD status */
 }


-/*
- * '_ppdGetEncoding()' - Get the CUPS encoding value for the given
- *                       LanguageEncoding.
- */
-
-cups_encoding_t				/* O - CUPS encoding value */
-_ppdGetEncoding(const char *name)	/* I - LanguageEncoding string */
-{
-  if (!strcasecmp(name, "ISOLatin1"))
-    return (CUPS_ISO8859_1);
-  else if (!strcasecmp(name, "ISOLatin2"))
-    return (CUPS_ISO8859_2);
-  else if (!strcasecmp(name, "ISOLatin5"))
-    return (CUPS_ISO8859_5);
-  else if (!strcasecmp(name, "JIS83-RKSJ"))
-    return (CUPS_WINDOWS_932);
-  else if (!strcasecmp(name, "MacStandard"))
-    return (CUPS_MAC_ROMAN);
-  else if (!strcasecmp(name, "WindowsANSI"))
-    return (CUPS_WINDOWS_1252);
-  else
-    return (CUPS_UTF8);
-}
-
-
 /*
 * 'ppdLastError()' - Return the status from the last ppdOpen*().
 *
@@ -451,7 +421,6 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */
  cups_lang_t		*language;	/* Default language */
  struct lconv		*loc;		/* Locale data */
  int			ui_keyword;	/* Is this line a UI keyword? */
-  cups_encoding_t	encoding;	/* Encoding of PPD file */
  _cups_globals_t	*cg = _cupsGlobals();
 					/* Global data */
  static const char * const ui_keywords[] =
@@ -596,7 +565,6 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */
  option     = NULL;
  choice     = NULL;
  ui_keyword = 0;
-  encoding   = CUPS_ISO8859_1;

  while ((mask = ppd_read(fp, keyword, name, text, &string, 1, cg)) != 0)
  {
@@ -675,8 +643,7 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */

        if (!group)
 	{
-          if ((group = ppd_get_group(ppd, "General", _("General"), cg,
-	                             encoding)) == NULL)
+          if ((group = ppd_get_group(ppd, "General", _("General"), cg)) == NULL)
 	    goto error;

          DEBUG_printf(("Adding to group %s...\n", group->text));
@@ -739,14 +706,7 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */
    if (!strcmp(keyword, "LanguageLevel"))
      ppd->language_level = atoi(string);
    else if (!strcmp(keyword, "LanguageEncoding"))
-    {
-     /*
-      * Say all PPD files are UTF-8, since we convert to UTF-8...
-      */
-
-      ppd->lang_encoding = strdup("UTF-8");
-      encoding           = _ppdGetEncoding(string);
-    }
+      ppd->lang_encoding = string;
    else if (!strcmp(keyword, "LanguageVersion"))
      ppd->lang_version = string;
    else if (!strcmp(keyword, "Manufacturer"))
@@ -758,18 +718,7 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */
    else if (!strcmp(keyword, "PCFileName"))
      ppd->pcfilename = string;
    else if (!strcmp(keyword, "NickName"))
-    {
-      if (encoding != CUPS_UTF8)
-      {
-        cups_utf8_t	utf8[256];	/* UTF-8 version of NickName */
-
-
-        cupsCharsetToUTF8(utf8, string, sizeof(utf8), encoding);
-	ppd->nickname = strdup((char *)utf8);
-      }
-      else
-        ppd->nickname = strdup(string);
-    }
+      ppd->nickname = string;
    else if (!strcmp(keyword, "Product"))
      ppd->product = string;
    else if (!strcmp(keyword, "ShortNickName"))
@@ -1018,8 +967,7 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */

        DEBUG_printf(("%s option not found for %s...\n", keyword + 6, keyword));

-	if ((gtemp = ppd_get_group(ppd, "General", _("General"), cg,
-	                           encoding)) == NULL)
+	if ((gtemp = ppd_get_group(ppd, "General", _("General"), cg)) == NULL)
 	{
 	  DEBUG_puts("Unable to get general group!");

@@ -1184,8 +1132,7 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */
        option = ppd_get_option(subgroup, name);
      else if (group == NULL)
      {
-	if ((group = ppd_get_group(ppd, "General", _("General"), cg,
-	                           encoding)) == NULL)
+	if ((group = ppd_get_group(ppd, "General", _("General"), cg)) == NULL)
 	  goto error;

        DEBUG_printf(("Adding to group %s...\n", group->text));
@@ -1234,8 +1181,7 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */
 	}

      if (text[0])
-        cupsCharsetToUTF8((cups_utf8_t *)option->text, text,
-	                   sizeof(option->text), encoding);
+        strlcpy(option->text, text, sizeof(option->text));
      else
      {
        if (!strcmp(name, "PageSize"))
@@ -1274,7 +1220,7 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */
      * Find the JCL group, and add if needed...
      */

-      group = ppd_get_group(ppd, "JCL", _("JCL"), cg, encoding);
+      group = ppd_get_group(ppd, "JCL", _("JCL"), cg);

      if (group == NULL)
 	goto error;
@@ -1324,11 +1270,7 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */
 	  break;
 	}

-      if (text[0])
-        cupsCharsetToUTF8((cups_utf8_t *)option->text, text,
-	                   sizeof(option->text), encoding);
-      else
-        strlcpy(option->text, name, sizeof(option->text));
+      strlcpy(option->text, text, sizeof(option->text));

      option->section = PPD_ORDER_JCL;
      group = NULL;
@@ -1382,7 +1324,7 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */
      * Find/add the group...
      */

-      group = ppd_get_group(ppd, string, sptr, cg, encoding);
+      group = ppd_get_group(ppd, string, sptr, cg);

      if (group == NULL)
 	goto error;
@@ -1671,9 +1613,8 @@ ppdOpen2(cups_file_t *fp)		/* I - File to read from */

      choice = ppd_add_choice(option, name);

-      if (text[0])
-        cupsCharsetToUTF8((cups_utf8_t *)choice->text, text,
-	                   sizeof(choice->text), encoding);
+      if (mask & PPD_TEXT)
+        strlcpy(choice->text, text, sizeof(choice->text));
      else if (!strcmp(name, "True"))
        strcpy(choice->text, _("Yes"));
      else if (!strcmp(name, "False"))
@@ -2283,11 +2224,10 @@ ppd_get_cparam(ppd_coption_t *opt,	/* I - PPD file */
 */

 static ppd_group_t *			/* O - Named group */
-ppd_get_group(ppd_file_t      *ppd,	/* I - PPD file */
-              const char      *name,	/* I - Name of group */
-	      const char      *text,	/* I - Text for group */
-              _cups_globals_t *cg,	/* I - Global data */
-	      cups_encoding_t encoding)	/* I - Encoding of text */
+ppd_get_group(ppd_file_t     *ppd,	/* I - PPD file */
+              const char     *name,	/* I - Name of group */
+	      const char     *text,	/* I - Text for group */
+              _cups_globals_t *cg)	/* I - Global data */
 {
  int		i;			/* Looping var */
  ppd_group_t	*group;			/* Group */
@@ -2330,9 +2270,7 @@ ppd_get_group(ppd_file_t      *ppd,	/* I - PPD file */

    memset(group, 0, sizeof(ppd_group_t));
    strlcpy(group->name, name, sizeof(group->name));
-
-    cupsCharsetToUTF8((cups_utf8_t *)group->text, text,
-	               sizeof(group->text), encoding);
+    strlcpy(group->text, text, sizeof(group->text));
  }

  return (group);
@@ -343,12 +343,6 @@ _cupsStrScand(const char   *buf,	/* I - Pointer to number */

  if (*buf == '.')
  {
-   /*
-    * Read fractional portion of number...
-    */
-
-    buf ++;
-
    if (loc && loc->decimal_point)
    {
      strlcpy(tempptr, loc->decimal_point, sizeof(temp) - (tempptr - temp));
@@ -1,7 +1,7 @@
 /*
 * "$Id$"
 *
- *   Transcoding definitions for the Common UNIX Printing System (CUPS).
+ *   Transcoding support for the Common UNIX Printing System (CUPS).
 *
 *   Copyright 1997-2006 by Easy Software Products.
 *
@@ -36,45 +36,116 @@ extern "C" {
 #  endif /* __cplusplus */


-/*
- * Constants...
- */
-
-#  define CUPS_MAX_USTRING	8192	/* Max size of Unicode string */
-
-
 /*
 * Types...
 */

-typedef unsigned char  cups_utf8_t;	/* UTF-8 Unicode/ISO-10646 unit */
-typedef unsigned long  cups_utf32_t;	/* UTF-32 Unicode/ISO-10646 unit */
-typedef unsigned short cups_ucs2_t;	/* UCS-2 Unicode/ISO-10646 unit */
-typedef unsigned long  cups_ucs4_t;	/* UCS-4 Unicode/ISO-10646 unit */
-typedef unsigned char  cups_sbcs_t;	/* SBCS Legacy 8-bit unit */
-typedef unsigned short cups_dbcs_t;	/* DBCS Legacy 16-bit unit */
-typedef unsigned long  cups_vbcs_t;	/* VBCS Legacy 32-bit unit */
-					/* EUC uses 8, 16, 24, 32-bit */
+typedef unsigned char  cups_utf8_t;  /* UTF-8 Unicode/ISO-10646 unit */
+typedef unsigned short cups_utf16_t; /* UTF-16 Unicode/ISO-10646 unit */
+typedef unsigned long  cups_utf32_t; /* UTF-32 Unicode/ISO-10646 unit */
+typedef unsigned short cups_ucs2_t;  /* UCS-2 Unicode/ISO-10646 unit */
+typedef unsigned long  cups_ucs4_t;  /* UCS-4 Unicode/ISO-10646 unit */
+typedef unsigned char  cups_sbcs_t;  /* SBCS Legacy 8-bit unit */
+typedef unsigned short cups_dbcs_t;  /* DBCS Legacy 16-bit unit */
+typedef unsigned long  cups_vbcs_t;  /* VBCS Legacy 32-bit unit */
+                                     /* EUC uses 8, 16, 24, 32-bit */
+
+
+/*
+ * Structures...
+ */
+
+typedef struct _cups_cmap_s		/**** SBCS Charmap Struct ****/
+{
+  struct _cups_cmap_s  *next;          /* Next charmap in cache */
+  int                   used;           /* Number of times entry used */
+  cups_encoding_t       encoding;       /* Legacy charset encoding */
+  cups_ucs2_t           char2uni[256];  /* Map Legacy SBCS -> UCS-2 */
+  cups_sbcs_t           *uni2char[256]; /* Map UCS-2 -> Legacy SBCS */
+} _cups_cmap_t;
+
+typedef struct _cups_wide2uni_s		/**** Wide to Unicode ****/
+{
+  cups_vbcs_t           widechar;       /* VBCS 32-bit Char (EUC) */
+  cups_ucs2_t           unichar;        /* UCS-2 Char */
+} _cups_wide2uni_t;
+
+typedef struct _cups_vmap_s		/**** VBCS Charmap Struct ****/
+{
+  struct _cups_vmap_s  *next;          /* Next charmap in cache */
+  int                   used;           /* Number of times entry used */
+  cups_encoding_t       encoding;       /* Legacy charset encoding */
+  cups_ucs2_t           *char2uni[256]; /* Map 16-bit Char -> UCS-2 */
+  int                   charcount;      /* Count of 16-bit VBCS Chars */
+  _cups_wide2uni_t       *wide2uni;      /* Map 32-bit Char -> UCS-2 */
+  int                   widecount;      /* Count of 32-bit VBCS Chars */
+  cups_vbcs_t           *uni2char[256]; /* Map UCS-2 -> 32-bit VBCS */
+  cups_sbcs_t           lead2char[256]; /* Legacy Lead Char - 2-byte */
+  cups_sbcs_t           lead3char[256]; /* Legacy Lead Char - 3-byte */
+  cups_sbcs_t           lead4char[256]; /* Legacy Lead Char - 4-byte */
+} _cups_vmap_t;
+
+
+/*
+ * Constants...
+ */
+
+#  define CUPS_MAX_USTRING		8192	/* Max size of Unicode string */
+#  define CUPS_MAX_CHARMAP_LINES	100000	/* Max lines in charmap file */


 /*
 * Prototypes...
 */

-extern int	cupsCharsetToUTF8(cups_utf8_t *dest,
-				  const char *src,
-				  const int maxout,
-				  const cups_encoding_t encoding);
-extern int	cupsUTF8ToCharset(char *dest,
-				  const cups_utf8_t *src,
-				  const int maxout,
-				  const cups_encoding_t encoding);
-extern int	cupsUTF8ToUTF32(cups_utf32_t *dest,
-				const cups_utf8_t *src,
-				const int maxout);
-extern int	cupsUTF32ToUTF8(cups_utf8_t *dest,
-				const cups_utf32_t *src,
-				const int maxout);
+/*
+ * Utility functions for character set maps
+ */
+extern void     *cupsCharmapGet(const cups_encoding_t encoding);
+extern void     cupsCharmapFree(const cups_encoding_t encoding);
+extern void     cupsCharmapFlush(void);
+
+/*
+ * Convert UTF-8 to and from legacy character set
+ */
+extern int      cupsUTF8ToCharset(char *dest,
+                                  const cups_utf8_t *src,
+                                  const int maxout,
+                                  const cups_encoding_t encoding);
+extern int      cupsCharsetToUTF8(cups_utf8_t *dest,
+                                  const char *src,
+                                  const int maxout,
+                                  const cups_encoding_t encoding);
+
+/*
+ * Convert UTF-8 to and from UTF-16
+ */
+extern int      cupsUTF8ToUTF16(cups_utf16_t *dest,
+                                const cups_utf8_t *src,
+                                const int maxout);
+extern int      cupsUTF16ToUTF8(cups_utf8_t *dest,
+                                const cups_utf16_t *src,
+                                const int maxout);
+
+/*
+ * Convert UTF-8 to and from UTF-32
+ */
+extern int      cupsUTF8ToUTF32(cups_utf32_t *dest,
+                                const cups_utf8_t *src,
+                                const int maxout);
+extern int      cupsUTF32ToUTF8(cups_utf8_t *dest,
+                                const cups_utf32_t *src,
+                                const int maxout);
+
+/*
+ * Convert UTF-16 to and from UTF-32
+ */
+extern int      cupsUTF16ToUTF32(cups_utf32_t *dest,
+                                 const cups_utf16_t *src,
+                                 const int maxout);
+extern int      cupsUTF32ToUTF16(cups_utf16_t *dest,
+                                 const cups_utf32_t *src,
+                                 const int maxout);

 #  ifdef __cplusplus
 }
@@ -41,6 +41,7 @@ CHARMAPS =	\
 		euc-jp.txt \
 		euc-kr.txt \
 		euc-tw.txt \
+		i18n_sdd.txt \
 		iso-8859-10.txt \
 		iso-8859-11.txt \
 		iso-8859-13.txt \
@@ -59,6 +60,15 @@ CHARMAPS =	\
 		koi8-r.txt \
 		koi8-u.txt \
 		mac-roman.txt \
+		unibreak.txt \
+		uni-comb.txt \
+		uni-fold.txt \
+		uni-full.txt \
+		uni-line.txt \
+		uni-nfc.txt \
+		uni-nfd.txt \
+		uni-nfkd.txt \
+		uni-prop.txt \
 		windows-1250.txt \
 		windows-1251.txt \
 		windows-1252.txt \
@@ -1,28 +0,0 @@
-%!PS-Adobe-3.0
-%%BoundingBox: 36 36 576 756
-%%Pages: 1
-%%LanguageLevel: 2
-%%EndComments
-%%Page: (1) 1
-% Draw a black box around the page
-0 setgray
-1 setlinewidth
-36 36 540 720 rectstroke
-
-% Draw a two inch blue circle in the middle of the page
-0 0 1 setrgbcolor
-306 396 144 0 360 arc closepath fill
-
-% Draw two half inch yellow circles for eyes
-1 1 0 setrgbcolor
-252 432 36 0 360 arc closepath fill
-360 432 36 0 360 arc closepath fill
-
-% Draw the smile
-1 setlinecap
-18 setlinewidth
-306 396 99 200 340 arc stroke
-
-% Print it!
-showpage
-%%EOF
@@ -0,0 +1,299 @@
+# uni-comb.txt - Unicode combining class
+0300;230;NSM;
+0301;230;NSM;
+0302;230;NSM;
+0303;230;NSM;
+0304;230;NSM;
+0305;230;NSM;
+0306;230;NSM;
+0307;230;NSM;
+0308;230;NSM;
+0309;230;NSM;
+030A;230;NSM;
+030B;230;NSM;
+030C;230;NSM;
+030D;230;NSM;
+030E;230;NSM;
+030F;230;NSM;
+0310;230;NSM;
+0311;230;NSM;
+0312;230;NSM;
+0313;230;NSM;
+0314;230;NSM;
+0315;232;NSM;
+0316;220;NSM;
+0317;220;NSM;
+0318;220;NSM;
+0319;220;NSM;
+031A;232;NSM;
+031B;216;NSM;
+031C;220;NSM;
+031D;220;NSM;
+031E;220;NSM;
+031F;220;NSM;
+0320;220;NSM;
+0321;202;NSM;
+0322;202;NSM;
+0323;220;NSM;
+0324;220;NSM;
+0325;220;NSM;
+0326;220;NSM;
+0327;202;NSM;
+0328;202;NSM;
+0329;220;NSM;
+032A;220;NSM;
+032B;220;NSM;
+032C;220;NSM;
+032D;220;NSM;
+032E;220;NSM;
+032F;220;NSM;
+0330;220;NSM;
+0331;220;NSM;
+0332;220;NSM;
+0333;220;NSM;
+0334;1;NSM;
+0335;1;NSM;
+0336;1;NSM;
+0337;1;NSM;
+0338;1;NSM;
+0339;220;NSM;
+033A;220;NSM;
+033B;220;NSM;
+033C;220;NSM;
+033D;230;NSM;
+033E;230;NSM;
+033F;230;NSM;
+0340;230;NSM;
+0341;230;NSM;
+0342;230;NSM;
+0343;230;NSM;
+0344;230;NSM;
+0345;240;NSM;
+0346;230;NSM;
+0347;220;NSM;
+0348;220;NSM;
+0349;220;NSM;
+034A;230;NSM;
+034B;230;NSM;
+034C;230;NSM;
+034D;220;NSM;
+034E;220;NSM;
+0360;234;NSM;
+0361;234;NSM;
+0362;233;NSM;
+0483;230;NSM;
+0484;230;NSM;
+0485;230;NSM;
+0486;230;NSM;
+0591;220;NSM;
+0592;230;NSM;
+0593;230;NSM;
+0594;230;NSM;
+0595;230;NSM;
+0596;220;NSM;
+0597;230;NSM;
+0598;230;NSM;
+0599;230;NSM;
+059A;222;NSM;
+059B;220;NSM;
+059C;230;NSM;
+059D;230;NSM;
+059E;230;NSM;
+059F;230;NSM;
+05A0;230;NSM;
+05A1;230;NSM;
+05A3;220;NSM;
+05A4;220;NSM;
+05A5;220;NSM;
+05A6;220;NSM;
+05A7;220;NSM;
+05A8;230;NSM;
+05A9;230;NSM;
+05AA;220;NSM;
+05AB;230;NSM;
+05AC;230;NSM;
+05AD;222;NSM;
+05AE;228;NSM;
+05AF;230;NSM;
+05B0;10;NSM;
+05B1;11;NSM;
+05B2;12;NSM;
+05B3;13;NSM;
+05B4;14;NSM;
+05B5;15;NSM;
+05B6;16;NSM;
+05B7;17;NSM;
+05B8;18;NSM;
+05B9;19;NSM;
+05BB;20;NSM;
+05BC;21;NSM;
+05BD;22;NSM;
+05BF;23;NSM;
+05C1;24;NSM;
+05C2;25;NSM;
+05C4;230;NSM;
+064B;27;NSM;
+064C;28;NSM;
+064D;29;NSM;
+064E;30;NSM;
+064F;31;NSM;
+0650;32;NSM;
+0651;33;NSM;
+0652;34;NSM;
+0653;230;NSM;
+0654;230;NSM;
+0655;220;NSM;
+0670;35;NSM;
+06D6;230;NSM;
+06D7;230;NSM;
+06D8;230;NSM;
+06D9;230;NSM;
+06DA;230;NSM;
+06DB;230;NSM;
+06DC;230;NSM;
+06DF;230;NSM;
+06E0;230;NSM;
+06E1;230;NSM;
+06E2;230;NSM;
+06E3;220;NSM;
+06E4;230;NSM;
+06E7;230;NSM;
+06E8;230;NSM;
+06EA;220;NSM;
+06EB;230;NSM;
+06EC;230;NSM;
+06ED;220;NSM;
+0711;36;NSM;
+0730;230;NSM;
+0731;220;NSM;
+0732;230;NSM;
+0733;230;NSM;
+0734;220;NSM;
+0735;230;NSM;
+0736;230;NSM;
+0737;220;NSM;
+0738;220;NSM;
+0739;220;NSM;
+073A;230;NSM;
+073B;220;NSM;
+073C;220;NSM;
+073D;230;NSM;
+073E;220;NSM;
+073F;230;NSM;
+0740;230;NSM;
+0741;230;NSM;
+0742;220;NSM;
+0743;230;NSM;
+0744;220;NSM;
+0745;230;NSM;
+0746;220;NSM;
+0747;230;NSM;
+0748;220;NSM;
+0749;230;NSM;
+074A;230;NSM;
+093C;7;NSM;
+094D;9;NSM;
+0951;230;NSM;
+0952;220;NSM;
+0953;230;NSM;
+0954;230;NSM;
+09BC;7;NSM;
+09CD;9;NSM;
+0A3C;7;NSM;
+0A4D;9;NSM;
+0ABC;7;NSM;
+0ACD;9;NSM;
+0B3C;7;NSM;
+0B4D;9;NSM;
+0BCD;9;NSM;
+0C4D;9;NSM;
+0C55;84;NSM;
+0C56;91;NSM;
+0CCD;9;NSM;
+0D4D;9;NSM;
+0DCA;9;NSM;
+0E38;103;NSM;
+0E39;103;NSM;
+0E3A;9;NSM;
+0E48;107;NSM;
+0E49;107;NSM;
+0E4A;107;NSM;
+0E4B;107;NSM;
+0EB8;118;NSM;
+0EB9;118;NSM;
+0EC8;122;NSM;
+0EC9;122;NSM;
+0ECA;122;NSM;
+0ECB;122;NSM;
+0F18;220;NSM;
+0F19;220;NSM;
+0F35;220;NSM;
+0F37;220;NSM;
+0F39;216;NSM;
+0F71;129;NSM;
+0F72;130;NSM;
+0F74;132;NSM;
+0F7A;130;NSM;
+0F7B;130;NSM;
+0F7C;130;NSM;
+0F7D;130;NSM;
+0F80;130;NSM;
+0F82;230;NSM;
+0F83;230;NSM;
+0F84;9;NSM;
+0F86;230;NSM;
+0F87;230;NSM;
+0FC6;220;NSM;
+1037;7;NSM;
+1039;9;NSM;
+17D2;9;NSM;
+18A9;228;NSM;
+20D0;230;NSM;
+20D1;230;NSM;
+20D2;1;NSM;
+20D3;1;NSM;
+20D4;230;NSM;
+20D5;230;NSM;
+20D6;230;NSM;
+20D7;230;NSM;
+20D8;1;NSM;
+20D9;1;NSM;
+20DA;1;NSM;
+20DB;230;NSM;
+20DC;230;NSM;
+20E1;230;NSM;
+302A;218;NSM;
+302B;228;NSM;
+302C;232;NSM;
+302D;222;NSM;
+302E;224;NSM;
+302F;224;NSM;
+3099;8;NSM;
+309A;8;NSM;
+FB1E;26;NSM;
+FE20;230;NSM;
+FE21;230;NSM;
+FE22;230;NSM;
+FE23;230;NSM;
+1D167;1;NSM;
+1D168;1;NSM;
+1D169;1;NSM;
+1D17B;220;NSM;
+1D17C;220;NSM;
+1D17D;220;NSM;
+1D17E;220;NSM;
+1D17F;220;NSM;
+1D180;220;NSM;
+1D181;220;NSM;
+1D182;220;NSM;
+1D185;230;NSM;
+1D186;230;NSM;
+1D187;230;NSM;
+1D188;230;NSM;
+1D189;230;NSM;
+1D18A;220;NSM;
+1D18B;220;NSM;
+1D1AA;230;NSM;
+1D1AB;230;NSM;
+1D1AC;230;NSM;
+1D1AD;230;NSM;
@@ -0,0 +1,713 @@
+# uni-fold.txt - Unicode simple case folding
+0041 0061;C;
+0042 0062;C;
+0043 0063;C;
+0044 0064;C;
+0045 0065;C;
+0046 0066;C;
+0047 0067;C;
+0048 0068;C;
+0049 0069;C;
+004A 006A;C;
+004B 006B;C;
+004C 006C;C;
+004D 006D;C;
+004E 006E;C;
+004F 006F;C;
+0050 0070;C;
+0051 0071;C;
+0052 0072;C;
+0053 0073;C;
+0054 0074;C;
+0055 0075;C;
+0056 0076;C;
+0057 0077;C;
+0058 0078;C;
+0059 0079;C;
+005A 007A;C;
+00B5 03BC;C;
+00C0 00E0;C;
+00C1 00E1;C;
+00C2 00E2;C;
+00C3 00E3;C;
+00C4 00E4;C;
+00C5 00E5;C;
+00C6 00E6;C;
+00C7 00E7;C;
+00C8 00E8;C;
+00C9 00E9;C;
+00CA 00EA;C;
+00CB 00EB;C;
+00CC 00EC;C;
+00CD 00ED;C;
+00CE 00EE;C;
+00CF 00EF;C;
+00D0 00F0;C;
+00D1 00F1;C;
+00D2 00F2;C;
+00D3 00F3;C;
+00D4 00F4;C;
+00D5 00F5;C;
+00D6 00F6;C;
+00D8 00F8;C;
+00D9 00F9;C;
+00DA 00FA;C;
+00DB 00FB;C;
+00DC 00FC;C;
+00DD 00FD;C;
+00DE 00FE;C;
+0100 0101;C;
+0102 0103;C;
+0104 0105;C;
+0106 0107;C;
+0108 0109;C;
+010A 010B;C;
+010C 010D;C;
+010E 010F;C;
+0110 0111;C;
+0112 0113;C;
+0114 0115;C;
+0116 0117;C;
+0118 0119;C;
+011A 011B;C;
+011C 011D;C;
+011E 011F;C;
+0120 0121;C;
+0122 0123;C;
+0124 0125;C;
+0126 0127;C;
+0128 0129;C;
+012A 012B;C;
+012C 012D;C;
+012E 012F;C;
+0130 0069;I;
+0131 0069;I;
+0132 0133;C;
+0134 0135;C;
+0136 0137;C;
+0139 013A;C;
+013B 013C;C;
+013D 013E;C;
+013F 0140;C;
+0141 0142;C;
+0143 0144;C;
+0145 0146;C;
+0147 0148;C;
+014A 014B;C;
+014C 014D;C;
+014E 014F;C;
+0150 0151;C;
+0152 0153;C;
+0154 0155;C;
+0156 0157;C;
+0158 0159;C;
+015A 015B;C;
+015C 015D;C;
+015E 015F;C;
+0160 0161;C;
+0162 0163;C;
+0164 0165;C;
+0166 0167;C;
+0168 0169;C;
+016A 016B;C;
+016C 016D;C;
+016E 016F;C;
+0170 0171;C;
+0172 0173;C;
+0174 0175;C;
+0176 0177;C;
+0178 00FF;C;
+0179 017A;C;
+017B 017C;C;
+017D 017E;C;
+017F 0073;C;
+0181 0253;C;
+0182 0183;C;
+0184 0185;C;
+0186 0254;C;
+0187 0188;C;
+0189 0256;C;
+018A 0257;C;
+018B 018C;C;
+018E 01DD;C;
+018F 0259;C;
+0190 025B;C;
+0191 0192;C;
+0193 0260;C;
+0194 0263;C;
+0196 0269;C;
+0197 0268;C;
+0198 0199;C;
+019C 026F;C;
+019D 0272;C;
+019F 0275;C;
+01A0 01A1;C;
+01A2 01A3;C;
+01A4 01A5;C;
+01A6 0280;C;
+01A7 01A8;C;
+01A9 0283;C;
+01AC 01AD;C;
+01AE 0288;C;
+01AF 01B0;C;
+01B1 028A;C;
+01B2 028B;C;
+01B3 01B4;C;
+01B5 01B6;C;
+01B7 0292;C;
+01B8 01B9;C;
+01BC 01BD;C;
+01C4 01C6;C;
+01C5 01C6;C;
+01C7 01C9;C;
+01C8 01C9;C;
+01CA 01CC;C;
+01CB 01CC;C;
+01CD 01CE;C;
+01CF 01D0;C;
+01D1 01D2;C;
+01D3 01D4;C;
+01D5 01D6;C;
+01D7 01D8;C;
+01D9 01DA;C;
+01DB 01DC;C;
+01DE 01DF;C;
+01E0 01E1;C;
+01E2 01E3;C;
+01E4 01E5;C;
+01E6 01E7;C;
+01E8 01E9;C;
+01EA 01EB;C;
+01EC 01ED;C;
+01EE 01EF;C;
+01F1 01F3;C;
+01F2 01F3;C;
+01F4 01F5;C;
+01F6 0195;C;
+01F7 01BF;C;
+01F8 01F9;C;
+01FA 01FB;C;
+01FC 01FD;C;
+01FE 01FF;C;
+0200 0201;C;
+0202 0203;C;
+0204 0205;C;
+0206 0207;C;
+0208 0209;C;
+020A 020B;C;
+020C 020D;C;
+020E 020F;C;
+0210 0211;C;
+0212 0213;C;
+0214 0215;C;
+0216 0217;C;
+0218 0219;C;
+021A 021B;C;
+021C 021D;C;
+021E 021F;C;
+0222 0223;C;
+0224 0225;C;
+0226 0227;C;
+0228 0229;C;
+022A 022B;C;
+022C 022D;C;
+022E 022F;C;
+0230 0231;C;
+0232 0233;C;
+0345 03B9;C;
+0386 03AC;C;
+0388 03AD;C;
+0389 03AE;C;
+038A 03AF;C;
+038C 03CC;C;
+038E 03CD;C;
+038F 03CE;C;
+0391 03B1;C;
+0392 03B2;C;
+0393 03B3;C;
+0394 03B4;C;
+0395 03B5;C;
+0396 03B6;C;
+0397 03B7;C;
+0398 03B8;C;
+0399 03B9;C;
+039A 03BA;C;
+039B 03BB;C;
+039C 03BC;C;
+039D 03BD;C;
+039E 03BE;C;
+039F 03BF;C;
+03A0 03C0;C;
+03A1 03C1;C;
+03A3 03C3;C;
+03A4 03C4;C;
+03A5 03C5;C;
+03A6 03C6;C;
+03A7 03C7;C;
+03A8 03C8;C;
+03A9 03C9;C;
+03AA 03CA;C;
+03AB 03CB;C;
+03C2 03C3;C;
+03D0 03B2;C;
+03D1 03B8;C;
+03D5 03C6;C;
+03D6 03C0;C;
+03DA 03DB;C;
+03DC 03DD;C;
+03DE 03DF;C;
+03E0 03E1;C;
+03E2 03E3;C;
+03E4 03E5;C;
+03E6 03E7;C;
+03E8 03E9;C;
+03EA 03EB;C;
+03EC 03ED;C;
+03EE 03EF;C;
+03F0 03BA;C;
+03F1 03C1;C;
+03F2 03C3;C;
+03F4 03B8;C;
+03F5 03B5;C;
+0400 0450;C;
+0401 0451;C;
+0402 0452;C;
+0403 0453;C;
+0404 0454;C;
+0405 0455;C;
+0406 0456;C;
+0407 0457;C;
+0408 0458;C;
+0409 0459;C;
+040A 045A;C;
+040B 045B;C;
+040C 045C;C;
+040D 045D;C;
+040E 045E;C;
+040F 045F;C;
+0410 0430;C;
+0411 0431;C;
+0412 0432;C;
+0413 0433;C;
+0414 0434;C;
+0415 0435;C;
+0416 0436;C;
+0417 0437;C;
+0418 0438;C;
+0419 0439;C;
+041A 043A;C;
+041B 043B;C;
+041C 043C;C;
+041D 043D;C;
+041E 043E;C;
+041F 043F;C;
+0420 0440;C;
+0421 0441;C;
+0422 0442;C;
+0423 0443;C;
+0424 0444;C;
+0425 0445;C;
+0426 0446;C;
+0427 0447;C;
+0428 0448;C;
+0429 0449;C;
+042A 044A;C;
+042B 044B;C;
+042C 044C;C;
+042D 044D;C;
+042E 044E;C;
+042F 044F;C;
+0460 0461;C;
+0462 0463;C;
+0464 0465;C;
+0466 0467;C;
+0468 0469;C;
+046A 046B;C;
+046C 046D;C;
+046E 046F;C;
+0470 0471;C;
+0472 0473;C;
+0474 0475;C;
+0476 0477;C;
+0478 0479;C;
+047A 047B;C;
+047C 047D;C;
+047E 047F;C;
+0480 0481;C;
+048C 048D;C;
+048E 048F;C;
+0490 0491;C;
+0492 0493;C;
+0494 0495;C;
+0496 0497;C;
+0498 0499;C;
+049A 049B;C;
+049C 049D;C;
+049E 049F;C;
+04A0 04A1;C;
+04A2 04A3;C;
+04A4 04A5;C;
+04A6 04A7;C;
+04A8 04A9;C;
+04AA 04AB;C;
+04AC 04AD;C;
+04AE 04AF;C;
+04B0 04B1;C;
+04B2 04B3;C;
+04B4 04B5;C;
+04B6 04B7;C;
+04B8 04B9;C;
+04BA 04BB;C;
+04BC 04BD;C;
+04BE 04BF;C;
+04C1 04C2;C;
+04C3 04C4;C;
+04C7 04C8;C;
+04CB 04CC;C;
+04D0 04D1;C;
+04D2 04D3;C;
+04D4 04D5;C;
+04D6 04D7;C;
+04D8 04D9;C;
+04DA 04DB;C;
+04DC 04DD;C;
+04DE 04DF;C;
+04E0 04E1;C;
+04E2 04E3;C;
+04E4 04E5;C;
+04E6 04E7;C;
+04E8 04E9;C;
+04EA 04EB;C;
+04EC 04ED;C;
+04EE 04EF;C;
+04F0 04F1;C;
+04F2 04F3;C;
+04F4 04F5;C;
+04F8 04F9;C;
+0531 0561;C;
+0532 0562;C;
+0533 0563;C;
+0534 0564;C;
+0535 0565;C;
+0536 0566;C;
+0537 0567;C;
+0538 0568;C;
+0539 0569;C;
+053A 056A;C;
+053B 056B;C;
+053C 056C;C;
+053D 056D;C;
+053E 056E;C;
+053F 056F;C;
+0540 0570;C;
+0541 0571;C;
+0542 0572;C;
+0543 0573;C;
+0544 0574;C;
+0545 0575;C;
+0546 0576;C;
+0547 0577;C;
+0548 0578;C;
+0549 0579;C;
+054A 057A;C;
+054B 057B;C;
+054C 057C;C;
+054D 057D;C;
+054E 057E;C;
+054F 057F;C;
+0550 0580;C;
+0551 0581;C;
+0552 0582;C;
+0553 0583;C;
+0554 0584;C;
+0555 0585;C;
+0556 0586;C;
+1E00 1E01;C;
+1E02 1E03;C;
+1E04 1E05;C;
+1E06 1E07;C;
+1E08 1E09;C;
+1E0A 1E0B;C;
+1E0C 1E0D;C;
+1E0E 1E0F;C;
+1E10 1E11;C;
+1E12 1E13;C;
+1E14 1E15;C;
+1E16 1E17;C;
+1E18 1E19;C;
+1E1A 1E1B;C;
+1E1C 1E1D;C;
+1E1E 1E1F;C;
+1E20 1E21;C;
+1E22 1E23;C;
+1E24 1E25;C;
+1E26 1E27;C;
+1E28 1E29;C;
+1E2A 1E2B;C;
+1E2C 1E2D;C;
+1E2E 1E2F;C;
+1E30 1E31;C;
+1E32 1E33;C;
+1E34 1E35;C;
+1E36 1E37;C;
+1E38 1E39;C;
+1E3A 1E3B;C;
+1E3C 1E3D;C;
+1E3E 1E3F;C;
+1E40 1E41;C;
+1E42 1E43;C;
+1E44 1E45;C;
+1E46 1E47;C;
+1E48 1E49;C;
+1E4A 1E4B;C;
+1E4C 1E4D;C;
+1E4E 1E4F;C;
+1E50 1E51;C;
+1E52 1E53;C;
+1E54 1E55;C;
+1E56 1E57;C;
+1E58 1E59;C;
+1E5A 1E5B;C;
+1E5C 1E5D;C;
+1E5E 1E5F;C;
+1E60 1E61;C;
+1E62 1E63;C;
+1E64 1E65;C;
+1E66 1E67;C;
+1E68 1E69;C;
+1E6A 1E6B;C;
+1E6C 1E6D;C;
+1E6E 1E6F;C;
+1E70 1E71;C;
+1E72 1E73;C;
+1E74 1E75;C;
+1E76 1E77;C;
+1E78 1E79;C;
+1E7A 1E7B;C;
+1E7C 1E7D;C;
+1E7E 1E7F;C;
+1E80 1E81;C;
+1E82 1E83;C;
+1E84 1E85;C;
+1E86 1E87;C;
+1E88 1E89;C;
+1E8A 1E8B;C;
+1E8C 1E8D;C;
+1E8E 1E8F;C;
+1E90 1E91;C;
+1E92 1E93;C;
+1E94 1E95;C;
+1E9B 1E61;C;
+1EA0 1EA1;C;
+1EA2 1EA3;C;
+1EA4 1EA5;C;
+1EA6 1EA7;C;
+1EA8 1EA9;C;
+1EAA 1EAB;C;
+1EAC 1EAD;C;
+1EAE 1EAF;C;
+1EB0 1EB1;C;
+1EB2 1EB3;C;
+1EB4 1EB5;C;
+1EB6 1EB7;C;
+1EB8 1EB9;C;
+1EBA 1EBB;C;
+1EBC 1EBD;C;
+1EBE 1EBF;C;
+1EC0 1EC1;C;
+1EC2 1EC3;C;
+1EC4 1EC5;C;
+1EC6 1EC7;C;
+1EC8 1EC9;C;
+1ECA 1ECB;C;
+1ECC 1ECD;C;
+1ECE 1ECF;C;
+1ED0 1ED1;C;
+1ED2 1ED3;C;
+1ED4 1ED5;C;
+1ED6 1ED7;C;
+1ED8 1ED9;C;
+1EDA 1EDB;C;
+1EDC 1EDD;C;
+1EDE 1EDF;C;
+1EE0 1EE1;C;
+1EE2 1EE3;C;
+1EE4 1EE5;C;
+1EE6 1EE7;C;
+1EE8 1EE9;C;
+1EEA 1EEB;C;
+1EEC 1EED;C;
+1EEE 1EEF;C;
+1EF0 1EF1;C;
+1EF2 1EF3;C;
+1EF4 1EF5;C;
+1EF6 1EF7;C;
+1EF8 1EF9;C;
+1F08 1F00;C;
+1F09 1F01;C;
+1F0A 1F02;C;
+1F0B 1F03;C;
+1F0C 1F04;C;
+1F0D 1F05;C;
+1F0E 1F06;C;
+1F0F 1F07;C;
+1F18 1F10;C;
+1F19 1F11;C;
+1F1A 1F12;C;
+1F1B 1F13;C;
+1F1C 1F14;C;
+1F1D 1F15;C;
+1F28 1F20;C;
+1F29 1F21;C;
+1F2A 1F22;C;
+1F2B 1F23;C;
+1F2C 1F24;C;
+1F2D 1F25;C;
+1F2E 1F26;C;
+1F2F 1F27;C;
+1F38 1F30;C;
+1F39 1F31;C;
+1F3A 1F32;C;
+1F3B 1F33;C;
+1F3C 1F34;C;
+1F3D 1F35;C;
+1F3E 1F36;C;
+1F3F 1F37;C;
+1F48 1F40;C;
+1F49 1F41;C;
+1F4A 1F42;C;
+1F4B 1F43;C;
+1F4C 1F44;C;
+1F4D 1F45;C;
+1F59 1F51;C;
+1F5B 1F53;C;
+1F5D 1F55;C;
+1F5F 1F57;C;
+1F68 1F60;C;
+1F69 1F61;C;
+1F6A 1F62;C;
+1F6B 1F63;C;
+1F6C 1F64;C;
+1F6D 1F65;C;
+1F6E 1F66;C;
+1F6F 1F67;C;
+1F88 1F80;S;
+1F89 1F81;S;
+1F8A 1F82;S;
+1F8B 1F83;S;
+1F8C 1F84;S;
+1F8D 1F85;S;
+1F8E 1F86;S;
+1F8F 1F87;S;
+1F98 1F90;S;
+1F99 1F91;S;
+1F9A 1F92;S;
+1F9B 1F93;S;
+1F9C 1F94;S;
+1F9D 1F95;S;
+1F9E 1F96;S;
+1F9F 1F97;S;
+1FA8 1FA0;S;
+1FA9 1FA1;S;
+1FAA 1FA2;S;
+1FAB 1FA3;S;
+1FAC 1FA4;S;
+1FAD 1FA5;S;
+1FAE 1FA6;S;
+1FAF 1FA7;S;
+1FB8 1FB0;C;
+1FB9 1FB1;C;
+1FBA 1F70;C;
+1FBB 1F71;C;
+1FBC 1FB3;S;
+1FBE 03B9;C;
+1FC8 1F72;C;
+1FC9 1F73;C;
+1FCA 1F74;C;
+1FCB 1F75;C;
+1FCC 1FC3;S;
+1FD8 1FD0;C;
+1FD9 1FD1;C;
+1FDA 1F76;C;
+1FDB 1F77;C;
+1FE8 1FE0;C;
+1FE9 1FE1;C;
+1FEA 1F7A;C;
+1FEB 1F7B;C;
+1FEC 1FE5;C;
+1FF8 1F78;C;
+1FF9 1F79;C;
+1FFA 1F7C;C;
+1FFB 1F7D;C;
+1FFC 1FF3;S;
+2126 03C9;C;
+212A 006B;C;
+212B 00E5;C;
+2160 2170;C;
+2161 2171;C;
+2162 2172;C;
+2163 2173;C;
+2164 2174;C;
+2165 2175;C;
+2166 2176;C;
+2167 2177;C;
+2168 2178;C;
+2169 2179;C;
+216A 217A;C;
+216B 217B;C;
+216C 217C;C;
+216D 217D;C;
+216E 217E;C;
+216F 217F;C;
+24B6 24D0;C;
+24B7 24D1;C;
+24B8 24D2;C;
+24B9 24D3;C;
+24BA 24D4;C;
+24BB 24D5;C;
+24BC 24D6;C;
+24BD 24D7;C;
+24BE 24D8;C;
+24BF 24D9;C;
+24C0 24DA;C;
+24C1 24DB;C;
+24C2 24DC;C;
+24C3 24DD;C;
+24C4 24DE;C;
+24C5 24DF;C;
+24C6 24E0;C;
+24C7 24E1;C;
+24C8 24E2;C;
+24C9 24E3;C;
+24CA 24E4;C;
+24CB 24E5;C;
+24CC 24E6;C;
+24CD 24E7;C;
+24CE 24E8;C;
+24CF 24E9;C;
+FF21 FF41;C;
+FF22 FF42;C;
+FF23 FF43;C;
+FF24 FF44;C;
+FF25 FF45;C;
+FF26 FF46;C;
+FF27 FF47;C;
+FF28 FF48;C;
+FF29 FF49;C;
+FF2A FF4A;C;
+FF2B FF4B;C;
+FF2C FF4C;C;
+FF2D FF4D;C;
+FF2E FF4E;C;
+FF2F FF4F;C;
+FF30 FF50;C;
+FF31 FF51;C;
+FF32 FF52;C;
+FF33 FF53;C;
+FF34 FF54;C;
+FF35 FF55;C;
+FF36 FF56;C;
+FF37 FF57;C;
+FF38 FF58;C;
+FF39 FF59;C;
+FF3A FF5A;C;
@@ -0,0 +1,788 @@
+# uni-full.txt - Unicode full case folding
+0041 0061 0000 0000;C;
+0042 0062 0000 0000;C;
+0043 0063 0000 0000;C;
+0044 0064 0000 0000;C;
+0045 0065 0000 0000;C;
+0046 0066 0000 0000;C;
+0047 0067 0000 0000;C;
+0048 0068 0000 0000;C;
+0049 0069 0000 0000;C;
+004A 006A 0000 0000;C;
+004B 006B 0000 0000;C;
+004C 006C 0000 0000;C;
+004D 006D 0000 0000;C;
+004E 006E 0000 0000;C;
+004F 006F 0000 0000;C;
+0050 0070 0000 0000;C;
+0051 0071 0000 0000;C;
+0052 0072 0000 0000;C;
+0053 0073 0000 0000;C;
+0054 0074 0000 0000;C;
+0055 0075 0000 0000;C;
+0056 0076 0000 0000;C;
+0057 0077 0000 0000;C;
+0058 0078 0000 0000;C;
+0059 0079 0000 0000;C;
+005A 007A 0000 0000;C;
+00B5 03BC 0000 0000;C;
+00C0 00E0 0000 0000;C;
+00C1 00E1 0000 0000;C;
+00C2 00E2 0000 0000;C;
+00C3 00E3 0000 0000;C;
+00C4 00E4 0000 0000;C;
+00C5 00E5 0000 0000;C;
+00C6 00E6 0000 0000;C;
+00C7 00E7 0000 0000;C;
+00C8 00E8 0000 0000;C;
+00C9 00E9 0000 0000;C;
+00CA 00EA 0000 0000;C;
+00CB 00EB 0000 0000;C;
+00CC 00EC 0000 0000;C;
+00CD 00ED 0000 0000;C;
+00CE 00EE 0000 0000;C;
+00CF 00EF 0000 0000;C;
+00D0 00F0 0000 0000;C;
+00D1 00F1 0000 0000;C;
+00D2 00F2 0000 0000;C;
+00D3 00F3 0000 0000;C;
+00D4 00F4 0000 0000;C;
+00D5 00F5 0000 0000;C;
+00D6 00F6 0000 0000;C;
+00D8 00F8 0000 0000;C;
+00D9 00F9 0000 0000;C;
+00DA 00FA 0000 0000;C;
+00DB 00FB 0000 0000;C;
+00DC 00FC 0000 0000;C;
+00DD 00FD 0000 0000;C;
+00DE 00FE 0000 0000;C;
+00DF 0073 0073 0000;F;
+0100 0101 0000 0000;C;
+0102 0103 0000 0000;C;
+0104 0105 0000 0000;C;
+0106 0107 0000 0000;C;
+0108 0109 0000 0000;C;
+010A 010B 0000 0000;C;
+010C 010D 0000 0000;C;
+010E 010F 0000 0000;C;
+0110 0111 0000 0000;C;
+0112 0113 0000 0000;C;
+0114 0115 0000 0000;C;
+0116 0117 0000 0000;C;
+0118 0119 0000 0000;C;
+011A 011B 0000 0000;C;
+011C 011D 0000 0000;C;
+011E 011F 0000 0000;C;
+0120 0121 0000 0000;C;
+0122 0123 0000 0000;C;
+0124 0125 0000 0000;C;
+0126 0127 0000 0000;C;
+0128 0129 0000 0000;C;
+012A 012B 0000 0000;C;
+012C 012D 0000 0000;C;
+012E 012F 0000 0000;C;
+0130 0069 0000 0000;I;
+0131 0069 0000 0000;I;
+0132 0133 0000 0000;C;
+0134 0135 0000 0000;C;
+0136 0137 0000 0000;C;
+0139 013A 0000 0000;C;
+013B 013C 0000 0000;C;
+013D 013E 0000 0000;C;
+013F 0140 0000 0000;C;
+0141 0142 0000 0000;C;
+0143 0144 0000 0000;C;
+0145 0146 0000 0000;C;
+0147 0148 0000 0000;C;
+0149 02BC 006E 0000;F;
+014A 014B 0000 0000;C;
+014C 014D 0000 0000;C;
+014E 014F 0000 0000;C;
+0150 0151 0000 0000;C;
+0152 0153 0000 0000;C;
+0154 0155 0000 0000;C;
+0156 0157 0000 0000;C;
+0158 0159 0000 0000;C;
+015A 015B 0000 0000;C;
+015C 015D 0000 0000;C;
+015E 015F 0000 0000;C;
+0160 0161 0000 0000;C;
+0162 0163 0000 0000;C;
+0164 0165 0000 0000;C;
+0166 0167 0000 0000;C;
+0168 0169 0000 0000;C;
+016A 016B 0000 0000;C;
+016C 016D 0000 0000;C;
+016E 016F 0000 0000;C;
+0170 0171 0000 0000;C;
+0172 0173 0000 0000;C;
+0174 0175 0000 0000;C;
+0176 0177 0000 0000;C;
+0178 00FF 0000 0000;C;
+0179 017A 0000 0000;C;
+017B 017C 0000 0000;C;
+017D 017E 0000 0000;C;
+017F 0073 0000 0000;C;
+0181 0253 0000 0000;C;
+0182 0183 0000 0000;C;
+0184 0185 0000 0000;C;
+0186 0254 0000 0000;C;
+0187 0188 0000 0000;C;
+0189 0256 0000 0000;C;
+018A 0257 0000 0000;C;
+018B 018C 0000 0000;C;
+018E 01DD 0000 0000;C;
+018F 0259 0000 0000;C;
+0190 025B 0000 0000;C;
+0191 0192 0000 0000;C;
+0193 0260 0000 0000;C;
+0194 0263 0000 0000;C;
+0196 0269 0000 0000;C;
+0197 0268 0000 0000;C;
+0198 0199 0000 0000;C;
+019C 026F 0000 0000;C;
+019D 0272 0000 0000;C;
+019F 0275 0000 0000;C;
+01A0 01A1 0000 0000;C;
+01A2 01A3 0000 0000;C;
+01A4 01A5 0000 0000;C;
+01A6 0280 0000 0000;C;
+01A7 01A8 0000 0000;C;
+01A9 0283 0000 0000;C;
+01AC 01AD 0000 0000;C;
+01AE 0288 0000 0000;C;
+01AF 01B0 0000 0000;C;
+01B1 028A 0000 0000;C;
+01B2 028B 0000 0000;C;
+01B3 01B4 0000 0000;C;
+01B5 01B6 0000 0000;C;
+01B7 0292 0000 0000;C;
+01B8 01B9 0000 0000;C;
+01BC 01BD 0000 0000;C;
+01C4 01C6 0000 0000;C;
+01C5 01C6 0000 0000;C;
+01C7 01C9 0000 0000;C;
+01C8 01C9 0000 0000;C;
+01CA 01CC 0000 0000;C;
+01CB 01CC 0000 0000;C;
+01CD 01CE 0000 0000;C;
+01CF 01D0 0000 0000;C;
+01D1 01D2 0000 0000;C;
+01D3 01D4 0000 0000;C;
+01D5 01D6 0000 0000;C;
+01D7 01D8 0000 0000;C;
+01D9 01DA 0000 0000;C;
+01DB 01DC 0000 0000;C;
+01DE 01DF 0000 0000;C;
+01E0 01E1 0000 0000;C;
+01E2 01E3 0000 0000;C;
+01E4 01E5 0000 0000;C;
+01E6 01E7 0000 0000;C;
+01E8 01E9 0000 0000;C;
+01EA 01EB 0000 0000;C;
+01EC 01ED 0000 0000;C;
+01EE 01EF 0000 0000;C;
+01F0 006A 030C 0000;F;
+01F1 01F3 0000 0000;C;
+01F2 01F3 0000 0000;C;
+01F4 01F5 0000 0000;C;
+01F6 0195 0000 0000;C;
+01F7 01BF 0000 0000;C;
+01F8 01F9 0000 0000;C;
+01FA 01FB 0000 0000;C;
+01FC 01FD 0000 0000;C;
+01FE 01FF 0000 0000;C;
+0200 0201 0000 0000;C;
+0202 0203 0000 0000;C;
+0204 0205 0000 0000;C;
+0206 0207 0000 0000;C;
+0208 0209 0000 0000;C;
+020A 020B 0000 0000;C;
+020C 020D 0000 0000;C;
+020E 020F 0000 0000;C;
+0210 0211 0000 0000;C;
+0212 0213 0000 0000;C;
+0214 0215 0000 0000;C;
+0216 0217 0000 0000;C;
+0218 0219 0000 0000;C;
+021A 021B 0000 0000;C;
+021C 021D 0000 0000;C;
+021E 021F 0000 0000;C;
+0222 0223 0000 0000;C;
+0224 0225 0000 0000;C;
+0226 0227 0000 0000;C;
+0228 0229 0000 0000;C;
+022A 022B 0000 0000;C;
+022C 022D 0000 0000;C;
+022E 022F 0000 0000;C;
+0230 0231 0000 0000;C;
+0232 0233 0000 0000;C;
+0345 03B9 0000 0000;C;
+0386 03AC 0000 0000;C;
+0388 03AD 0000 0000;C;
+0389 03AE 0000 0000;C;
+038A 03AF 0000 0000;C;
+038C 03CC 0000 0000;C;
+038E 03CD 0000 0000;C;
+038F 03CE 0000 0000;C;
+0390 03B9 0308 0301;F;
+0391 03B1 0000 0000;C;
+0392 03B2 0000 0000;C;
+0393 03B3 0000 0000;C;
+0394 03B4 0000 0000;C;
+0395 03B5 0000 0000;C;
+0396 03B6 0000 0000;C;
+0397 03B7 0000 0000;C;
+0398 03B8 0000 0000;C;
+0399 03B9 0000 0000;C;
+039A 03BA 0000 0000;C;
+039B 03BB 0000 0000;C;
+039C 03BC 0000 0000;C;
+039D 03BD 0000 0000;C;
+039E 03BE 0000 0000;C;
+039F 03BF 0000 0000;C;
+03A0 03C0 0000 0000;C;
+03A1 03C1 0000 0000;C;
+03A3 03C3 0000 0000;C;
+03A4 03C4 0000 0000;C;
+03A5 03C5 0000 0000;C;
+03A6 03C6 0000 0000;C;
+03A7 03C7 0000 0000;C;
+03A8 03C8 0000 0000;C;
+03A9 03C9 0000 0000;C;
+03AA 03CA 0000 0000;C;
+03AB 03CB 0000 0000;C;
+03B0 03C5 0308 0301;F;
+03C2 03C3 0000 0000;C;
+03D0 03B2 0000 0000;C;
+03D1 03B8 0000 0000;C;
+03D5 03C6 0000 0000;C;
+03D6 03C0 0000 0000;C;
+03DA 03DB 0000 0000;C;
+03DC 03DD 0000 0000;C;
+03DE 03DF 0000 0000;C;
+03E0 03E1 0000 0000;C;
+03E2 03E3 0000 0000;C;
+03E4 03E5 0000 0000;C;
+03E6 03E7 0000 0000;C;
+03E8 03E9 0000 0000;C;
+03EA 03EB 0000 0000;C;
+03EC 03ED 0000 0000;C;
+03EE 03EF 0000 0000;C;
+03F0 03BA 0000 0000;C;
+03F1 03C1 0000 0000;C;
+03F2 03C3 0000 0000;C;
+03F4 03B8 0000 0000;C;
+03F5 03B5 0000 0000;C;
+0400 0450 0000 0000;C;
+0401 0451 0000 0000;C;
+0402 0452 0000 0000;C;
+0403 0453 0000 0000;C;
+0404 0454 0000 0000;C;
+0405 0455 0000 0000;C;
+0406 0456 0000 0000;C;
+0407 0457 0000 0000;C;
+0408 0458 0000 0000;C;
+0409 0459 0000 0000;C;
+040A 045A 0000 0000;C;
+040B 045B 0000 0000;C;
+040C 045C 0000 0000;C;
+040D 045D 0000 0000;C;
+040E 045E 0000 0000;C;
+040F 045F 0000 0000;C;
+0410 0430 0000 0000;C;
+0411 0431 0000 0000;C;
+0412 0432 0000 0000;C;
+0413 0433 0000 0000;C;
+0414 0434 0000 0000;C;
+0415 0435 0000 0000;C;
+0416 0436 0000 0000;C;
+0417 0437 0000 0000;C;
+0418 0438 0000 0000;C;
+0419 0439 0000 0000;C;
+041A 043A 0000 0000;C;
+041B 043B 0000 0000;C;
+041C 043C 0000 0000;C;
+041D 043D 0000 0000;C;
+041E 043E 0000 0000;C;
+041F 043F 0000 0000;C;
+0420 0440 0000 0000;C;
+0421 0441 0000 0000;C;
+0422 0442 0000 0000;C;
+0423 0443 0000 0000;C;
+0424 0444 0000 0000;C;
+0425 0445 0000 0000;C;
+0426 0446 0000 0000;C;
+0427 0447 0000 0000;C;
+0428 0448 0000 0000;C;
+0429 0449 0000 0000;C;
+042A 044A 0000 0000;C;
+042B 044B 0000 0000;C;
+042C 044C 0000 0000;C;
+042D 044D 0000 0000;C;
+042E 044E 0000 0000;C;
+042F 044F 0000 0000;C;
+0460 0461 0000 0000;C;
+0462 0463 0000 0000;C;
+0464 0465 0000 0000;C;
+0466 0467 0000 0000;C;
+0468 0469 0000 0000;C;
+046A 046B 0000 0000;C;
+046C 046D 0000 0000;C;
+046E 046F 0000 0000;C;
+0470 0471 0000 0000;C;
+0472 0473 0000 0000;C;
+0474 0475 0000 0000;C;
+0476 0477 0000 0000;C;
+0478 0479 0000 0000;C;
+047A 047B 0000 0000;C;
+047C 047D 0000 0000;C;
+047E 047F 0000 0000;C;
+0480 0481 0000 0000;C;
+048C 048D 0000 0000;C;
+048E 048F 0000 0000;C;
+0490 0491 0000 0000;C;
+0492 0493 0000 0000;C;
+0494 0495 0000 0000;C;
+0496 0497 0000 0000;C;
+0498 0499 0000 0000;C;
+049A 049B 0000 0000;C;
+049C 049D 0000 0000;C;
+049E 049F 0000 0000;C;
+04A0 04A1 0000 0000;C;
+04A2 04A3 0000 0000;C;
+04A4 04A5 0000 0000;C;
+04A6 04A7 0000 0000;C;
+04A8 04A9 0000 0000;C;
+04AA 04AB 0000 0000;C;
+04AC 04AD 0000 0000;C;
+04AE 04AF 0000 0000;C;
+04B0 04B1 0000 0000;C;
+04B2 04B3 0000 0000;C;
+04B4 04B5 0000 0000;C;
+04B6 04B7 0000 0000;C;
+04B8 04B9 0000 0000;C;
+04BA 04BB 0000 0000;C;
+04BC 04BD 0000 0000;C;
+04BE 04BF 0000 0000;C;
+04C1 04C2 0000 0000;C;
+04C3 04C4 0000 0000;C;
+04C7 04C8 0000 0000;C;
+04CB 04CC 0000 0000;C;
+04D0 04D1 0000 0000;C;
+04D2 04D3 0000 0000;C;
+04D4 04D5 0000 0000;C;
+04D6 04D7 0000 0000;C;
+04D8 04D9 0000 0000;C;
+04DA 04DB 0000 0000;C;
+04DC 04DD 0000 0000;C;
+04DE 04DF 0000 0000;C;
+04E0 04E1 0000 0000;C;
+04E2 04E3 0000 0000;C;
+04E4 04E5 0000 0000;C;
+04E6 04E7 0000 0000;C;
+04E8 04E9 0000 0000;C;
+04EA 04EB 0000 0000;C;
+04EC 04ED 0000 0000;C;
+04EE 04EF 0000 0000;C;
+04F0 04F1 0000 0000;C;
+04F2 04F3 0000 0000;C;
+04F4 04F5 0000 0000;C;
+04F8 04F9 0000 0000;C;
+0531 0561 0000 0000;C;
+0532 0562 0000 0000;C;
+0533 0563 0000 0000;C;
+0534 0564 0000 0000;C;
+0535 0565 0000 0000;C;
+0536 0566 0000 0000;C;
+0537 0567 0000 0000;C;
+0538 0568 0000 0000;C;
+0539 0569 0000 0000;C;
+053A 056A 0000 0000;C;
+053B 056B 0000 0000;C;
+053C 056C 0000 0000;C;
+053D 056D 0000 0000;C;
+053E 056E 0000 0000;C;
+053F 056F 0000 0000;C;
+0540 0570 0000 0000;C;
+0541 0571 0000 0000;C;
+0542 0572 0000 0000;C;
+0543 0573 0000 0000;C;
+0544 0574 0000 0000;C;
+0545 0575 0000 0000;C;
+0546 0576 0000 0000;C;
+0547 0577 0000 0000;C;
+0548 0578 0000 0000;C;
+0549 0579 0000 0000;C;
+054A 057A 0000 0000;C;
+054B 057B 0000 0000;C;
+054C 057C 0000 0000;C;
+054D 057D 0000 0000;C;
+054E 057E 0000 0000;C;
+054F 057F 0000 0000;C;
+0550 0580 0000 0000;C;
+0551 0581 0000 0000;C;
+0552 0582 0000 0000;C;
+0553 0583 0000 0000;C;
+0554 0584 0000 0000;C;
+0555 0585 0000 0000;C;
+0556 0586 0000 0000;C;
+0587 0565 0582 0000;F;
+1E00 1E01 0000 0000;C;
+1E02 1E03 0000 0000;C;
+1E04 1E05 0000 0000;C;
+1E06 1E07 0000 0000;C;
+1E08 1E09 0000 0000;C;
+1E0A 1E0B 0000 0000;C;
+1E0C 1E0D 0000 0000;C;
+1E0E 1E0F 0000 0000;C;
+1E10 1E11 0000 0000;C;
+1E12 1E13 0000 0000;C;
+1E14 1E15 0000 0000;C;
+1E16 1E17 0000 0000;C;
+1E18 1E19 0000 0000;C;
+1E1A 1E1B 0000 0000;C;
+1E1C 1E1D 0000 0000;C;
+1E1E 1E1F 0000 0000;C;
+1E20 1E21 0000 0000;C;
+1E22 1E23 0000 0000;C;
+1E24 1E25 0000 0000;C;
+1E26 1E27 0000 0000;C;
+1E28 1E29 0000 0000;C;
+1E2A 1E2B 0000 0000;C;
+1E2C 1E2D 0000 0000;C;
+1E2E 1E2F 0000 0000;C;
+1E30 1E31 0000 0000;C;
+1E32 1E33 0000 0000;C;
+1E34 1E35 0000 0000;C;
+1E36 1E37 0000 0000;C;
+1E38 1E39 0000 0000;C;
+1E3A 1E3B 0000 0000;C;
+1E3C 1E3D 0000 0000;C;
+1E3E 1E3F 0000 0000;C;
+1E40 1E41 0000 0000;C;
+1E42 1E43 0000 0000;C;
+1E44 1E45 0000 0000;C;
+1E46 1E47 0000 0000;C;
+1E48 1E49 0000 0000;C;
+1E4A 1E4B 0000 0000;C;
+1E4C 1E4D 0000 0000;C;
+1E4E 1E4F 0000 0000;C;
+1E50 1E51 0000 0000;C;
+1E52 1E53 0000 0000;C;
+1E54 1E55 0000 0000;C;
+1E56 1E57 0000 0000;C;
+1E58 1E59 0000 0000;C;
+1E5A 1E5B 0000 0000;C;
+1E5C 1E5D 0000 0000;C;
+1E5E 1E5F 0000 0000;C;
+1E60 1E61 0000 0000;C;
+1E62 1E63 0000 0000;C;
+1E64 1E65 0000 0000;C;
+1E66 1E67 0000 0000;C;
+1E68 1E69 0000 0000;C;
+1E6A 1E6B 0000 0000;C;
+1E6C 1E6D 0000 0000;C;
+1E6E 1E6F 0000 0000;C;
+1E70 1E71 0000 0000;C;
+1E72 1E73 0000 0000;C;
+1E74 1E75 0000 0000;C;
+1E76 1E77 0000 0000;C;
+1E78 1E79 0000 0000;C;
+1E7A 1E7B 0000 0000;C;
+1E7C 1E7D 0000 0000;C;
+1E7E 1E7F 0000 0000;C;
+1E80 1E81 0000 0000;C;
+1E82 1E83 0000 0000;C;
+1E84 1E85 0000 0000;C;
+1E86 1E87 0000 0000;C;
+1E88 1E89 0000 0000;C;
+1E8A 1E8B 0000 0000;C;
+1E8C 1E8D 0000 0000;C;
+1E8E 1E8F 0000 0000;C;
+1E90 1E91 0000 0000;C;
+1E92 1E93 0000 0000;C;
+1E94 1E95 0000 0000;C;
+1E96 0068 0331 0000;F;
+1E97 0074 0308 0000;F;
+1E98 0077 030A 0000;F;
+1E99 0079 030A 0000;F;
+1E9A 0061 02BE 0000;F;
+1E9B 1E61 0000 0000;C;
+1EA0 1EA1 0000 0000;C;
+1EA2 1EA3 0000 0000;C;
+1EA4 1EA5 0000 0000;C;
+1EA6 1EA7 0000 0000;C;
+1EA8 1EA9 0000 0000;C;
+1EAA 1EAB 0000 0000;C;
+1EAC 1EAD 0000 0000;C;
+1EAE 1EAF 0000 0000;C;
+1EB0 1EB1 0000 0000;C;
+1EB2 1EB3 0000 0000;C;
+1EB4 1EB5 0000 0000;C;
+1EB6 1EB7 0000 0000;C;
+1EB8 1EB9 0000 0000;C;
+1EBA 1EBB 0000 0000;C;
+1EBC 1EBD 0000 0000;C;
+1EBE 1EBF 0000 0000;C;
+1EC0 1EC1 0000 0000;C;
+1EC2 1EC3 0000 0000;C;
+1EC4 1EC5 0000 0000;C;
+1EC6 1EC7 0000 0000;C;
+1EC8 1EC9 0000 0000;C;
+1ECA 1ECB 0000 0000;C;
+1ECC 1ECD 0000 0000;C;
+1ECE 1ECF 0000 0000;C;
+1ED0 1ED1 0000 0000;C;
+1ED2 1ED3 0000 0000;C;
+1ED4 1ED5 0000 0000;C;
+1ED6 1ED7 0000 0000;C;
+1ED8 1ED9 0000 0000;C;
+1EDA 1EDB 0000 0000;C;
+1EDC 1EDD 0000 0000;C;
+1EDE 1EDF 0000 0000;C;
+1EE0 1EE1 0000 0000;C;
+1EE2 1EE3 0000 0000;C;
+1EE4 1EE5 0000 0000;C;
+1EE6 1EE7 0000 0000;C;
+1EE8 1EE9 0000 0000;C;
+1EEA 1EEB 0000 0000;C;
+1EEC 1EED 0000 0000;C;
+1EEE 1EEF 0000 0000;C;
+1EF0 1EF1 0000 0000;C;
+1EF2 1EF3 0000 0000;C;
+1EF4 1EF5 0000 0000;C;
+1EF6 1EF7 0000 0000;C;
+1EF8 1EF9 0000 0000;C;
+1F08 1F00 0000 0000;C;
+1F09 1F01 0000 0000;C;
+1F0A 1F02 0000 0000;C;
+1F0B 1F03 0000 0000;C;
+1F0C 1F04 0000 0000;C;
+1F0D 1F05 0000 0000;C;
+1F0E 1F06 0000 0000;C;
+1F0F 1F07 0000 0000;C;
+1F18 1F10 0000 0000;C;
+1F19 1F11 0000 0000;C;
+1F1A 1F12 0000 0000;C;
+1F1B 1F13 0000 0000;C;
+1F1C 1F14 0000 0000;C;
+1F1D 1F15 0000 0000;C;
+1F28 1F20 0000 0000;C;
+1F29 1F21 0000 0000;C;
+1F2A 1F22 0000 0000;C;
+1F2B 1F23 0000 0000;C;
+1F2C 1F24 0000 0000;C;
+1F2D 1F25 0000 0000;C;
+1F2E 1F26 0000 0000;C;
+1F2F 1F27 0000 0000;C;
+1F38 1F30 0000 0000;C;
+1F39 1F31 0000 0000;C;
+1F3A 1F32 0000 0000;C;
+1F3B 1F33 0000 0000;C;
+1F3C 1F34 0000 0000;C;
+1F3D 1F35 0000 0000;C;
+1F3E 1F36 0000 0000;C;
+1F3F 1F37 0000 0000;C;
+1F48 1F40 0000 0000;C;
+1F49 1F41 0000 0000;C;
+1F4A 1F42 0000 0000;C;
+1F4B 1F43 0000 0000;C;
+1F4C 1F44 0000 0000;C;
+1F4D 1F45 0000 0000;C;
+1F50 03C5 0313 0000;F;
+1F52 03C5 0313 0300;F;
+1F54 03C5 0313 0301;F;
+1F56 03C5 0313 0342;F;
+1F59 1F51 0000 0000;C;
+1F5B 1F53 0000 0000;C;
+1F5D 1F55 0000 0000;C;
+1F5F 1F57 0000 0000;C;
+1F68 1F60 0000 0000;C;
+1F69 1F61 0000 0000;C;
+1F6A 1F62 0000 0000;C;
+1F6B 1F63 0000 0000;C;
+1F6C 1F64 0000 0000;C;
+1F6D 1F65 0000 0000;C;
+1F6E 1F66 0000 0000;C;
+1F6F 1F67 0000 0000;C;
+1F80 1F00 03B9 0000;F;
+1F81 1F01 03B9 0000;F;
+1F82 1F02 03B9 0000;F;
+1F83 1F03 03B9 0000;F;
+1F84 1F04 03B9 0000;F;
+1F85 1F05 03B9 0000;F;
+1F86 1F06 03B9 0000;F;
+1F87 1F07 03B9 0000;F;
+1F88 1F00 03B9 0000;F;
+1F89 1F01 03B9 0000;F;
+1F8A 1F02 03B9 0000;F;
+1F8B 1F03 03B9 0000;F;
+1F8C 1F04 03B9 0000;F;
+1F8D 1F05 03B9 0000;F;
+1F8E 1F06 03B9 0000;F;
+1F8F 1F07 03B9 0000;F;
+1F90 1F20 03B9 0000;F;
+1F91 1F21 03B9 0000;F;
+1F92 1F22 03B9 0000;F;
+1F93 1F23 03B9 0000;F;
+1F94 1F24 03B9 0000;F;
+1F95 1F25 03B9 0000;F;
+1F96 1F26 03B9 0000;F;
+1F97 1F27 03B9 0000;F;
+1F98 1F20 03B9 0000;F;
+1F99 1F21 03B9 0000;F;
+1F9A 1F22 03B9 0000;F;
+1F9B 1F23 03B9 0000;F;
+1F9C 1F24 03B9 0000;F;
+1F9D 1F25 03B9 0000;F;
+1F9E 1F26 03B9 0000;F;
+1F9F 1F27 03B9 0000;F;
+1FA0 1F60 03B9 0000;F;
+1FA1 1F61 03B9 0000;F;
+1FA2 1F62 03B9 0000;F;
+1FA3 1F63 03B9 0000;F;
+1FA4 1F64 03B9 0000;F;
+1FA5 1F65 03B9 0000;F;
+1FA6 1F66 03B9 0000;F;
+1FA7 1F67 03B9 0000;F;
+1FA8 1F60 03B9 0000;F;
+1FA9 1F61 03B9 0000;F;
+1FAA 1F62 03B9 0000;F;
+1FAB 1F63 03B9 0000;F;
+1FAC 1F64 03B9 0000;F;
+1FAD 1F65 03B9 0000;F;
+1FAE 1F66 03B9 0000;F;
+1FAF 1F67 03B9 0000;F;
+1FB2 1F70 03B9 0000;F;
+1FB3 03B1 03B9 0000;F;
+1FB4 03AC 03B9 0000;F;
+1FB6 03B1 0342 0000;F;
+1FB7 03B1 0342 03B9;F;
+1FB8 1FB0 0000 0000;C;
+1FB9 1FB1 0000 0000;C;
+1FBA 1F70 0000 0000;C;
+1FBB 1F71 0000 0000;C;
+1FBC 03B1 03B9 0000;F;
+1FBE 03B9 0000 0000;C;
+1FC2 1F74 03B9 0000;F;
+1FC3 03B7 03B9 0000;F;
+1FC4 03AE 03B9 0000;F;
+1FC6 03B7 0342 0000;F;
+1FC7 03B7 0342 03B9;F;
+1FC8 1F72 0000 0000;C;
+1FC9 1F73 0000 0000;C;
+1FCA 1F74 0000 0000;C;
+1FCB 1F75 0000 0000;C;
+1FCC 03B7 03B9 0000;F;
+1FD2 03B9 0308 0300;F;
+1FD3 03B9 0308 0301;F;
+1FD6 03B9 0342 0000;F;
+1FD7 03B9 0308 0342;F;
+1FD8 1FD0 0000 0000;C;
+1FD9 1FD1 0000 0000;C;
+1FDA 1F76 0000 0000;C;
+1FDB 1F77 0000 0000;C;
+1FE2 03C5 0308 0300;F;
+1FE3 03C5 0308 0301;F;
+1FE4 03C1 0313 0000;F;
+1FE6 03C5 0342 0000;F;
+1FE7 03C5 0308 0342;F;
+1FE8 1FE0 0000 0000;C;
+1FE9 1FE1 0000 0000;C;
+1FEA 1F7A 0000 0000;C;
+1FEB 1F7B 0000 0000;C;
+1FEC 1FE5 0000 0000;C;
+1FF2 1F7C 03B9 0000;F;
+1FF3 03C9 03B9 0000;F;
+1FF4 03CE 03B9 0000;F;
+1FF6 03C9 0342 0000;F;
+1FF7 03C9 0342 03B9;F;
+1FF8 1F78 0000 0000;C;
+1FF9 1F79 0000 0000;C;
+1FFA 1F7C 0000 0000;C;
+1FFB 1F7D 0000 0000;C;
+1FFC 03C9 03B9 0000;F;
+2126 03C9 0000 0000;C;
+212A 006B 0000 0000;C;
+212B 00E5 0000 0000;C;
+2160 2170 0000 0000;C;
+2161 2171 0000 0000;C;
+2162 2172 0000 0000;C;
+2163 2173 0000 0000;C;
+2164 2174 0000 0000;C;
+2165 2175 0000 0000;C;
+2166 2176 0000 0000;C;
+2167 2177 0000 0000;C;
+2168 2178 0000 0000;C;
+2169 2179 0000 0000;C;
+216A 217A 0000 0000;C;
+216B 217B 0000 0000;C;
+216C 217C 0000 0000;C;
+216D 217D 0000 0000;C;
+216E 217E 0000 0000;C;
+216F 217F 0000 0000;C;
+24B6 24D0 0000 0000;C;
+24B7 24D1 0000 0000;C;
+24B8 24D2 0000 0000;C;
+24B9 24D3 0000 0000;C;
+24BA 24D4 0000 0000;C;
+24BB 24D5 0000 0000;C;
+24BC 24D6 0000 0000;C;
+24BD 24D7 0000 0000;C;
+24BE 24D8 0000 0000;C;
+24BF 24D9 0000 0000;C;
+24C0 24DA 0000 0000;C;
+24C1 24DB 0000 0000;C;
+24C2 24DC 0000 0000;C;
+24C3 24DD 0000 0000;C;
+24C4 24DE 0000 0000;C;
+24C5 24DF 0000 0000;C;
+24C6 24E0 0000 0000;C;
+24C7 24E1 0000 0000;C;
+24C8 24E2 0000 0000;C;
+24C9 24E3 0000 0000;C;
+24CA 24E4 0000 0000;C;
+24CB 24E5 0000 0000;C;
+24CC 24E6 0000 0000;C;
+24CD 24E7 0000 0000;C;
+24CE 24E8 0000 0000;C;
+24CF 24E9 0000 0000;C;
+FB00 0066 0066 0000;F;
+FB01 0066 0069 0000;F;
+FB02 0066 006C 0000;F;
+FB03 0066 0066 0069;F;
+FB04 0066 0066 006C;F;
+FB05 0073 0074 0000;F;
+FB06 0073 0074 0000;F;
+FB13 0574 0576 0000;F;
+FB14 0574 0565 0000;F;
+FB15 0574 056B 0000;F;
+FB16 057E 0576 0000;F;
+FB17 0574 056D 0000;F;
+FF21 FF41 0000 0000;C;
+FF22 FF42 0000 0000;C;
+FF23 FF43 0000 0000;C;
+FF24 FF44 0000 0000;C;
+FF25 FF45 0000 0000;C;
+FF26 FF46 0000 0000;C;
+FF27 FF47 0000 0000;C;
+FF28 FF48 0000 0000;C;
+FF29 FF49 0000 0000;C;
+FF2A FF4A 0000 0000;C;
+FF2B FF4B 0000 0000;C;
+FF2C FF4C 0000 0000;C;
+FF2D FF4D 0000 0000;C;
+FF2E FF4E 0000 0000;C;
+FF2F FF4F 0000 0000;C;
+FF30 FF50 0000 0000;C;
+FF31 FF51 0000 0000;C;
+FF32 FF52 0000 0000;C;
+FF33 FF53 0000 0000;C;
+FF34 FF54 0000 0000;C;
+FF35 FF55 0000 0000;C;
+FF36 FF56 0000 0000;C;
+FF37 FF57 0000 0000;C;
+FF38 FF58 0000 0000;C;
+FF39 FF59 0000 0000;C;
+FF3A FF5A 0000 0000;C;
@@ -0,0 +1,989 @@
+# uni-nfc.txt - Unicode composition mapping
+003C 0338 226E;
+003D 0338 2260;
+003E 0338 226F;
+0041 0300 00C0;
+0041 0301 00C1;
+0041 0302 00C2;
+0041 0303 00C3;
+0041 0304 0100;
+0041 0306 0102;
+0041 0307 0226;
+0041 0308 00C4;
+0041 0309 1EA2;
+0041 030A 00C5;
+0041 030C 01CD;
+0041 030F 0200;
+0041 0311 0202;
+0041 0323 1EA0;
+0041 0325 1E00;
+0041 0328 0104;
+0042 0307 1E02;
+0042 0323 1E04;
+0042 0331 1E06;
+0043 0301 0106;
+0043 0302 0108;
+0043 0307 010A;
+0043 030C 010C;
+0043 0327 00C7;
+0044 0307 1E0A;
+0044 030C 010E;
+0044 0323 1E0C;
+0044 0327 1E10;
+0044 032D 1E12;
+0044 0331 1E0E;
+0045 0300 00C8;
+0045 0301 00C9;
+0045 0302 00CA;
+0045 0303 1EBC;
+0045 0304 0112;
+0045 0306 0114;
+0045 0307 0116;
+0045 0308 00CB;
+0045 0309 1EBA;
+0045 030C 011A;
+0045 030F 0204;
+0045 0311 0206;
+0045 0323 1EB8;
+0045 0327 0228;
+0045 0328 0118;
+0045 032D 1E18;
+0045 0330 1E1A;
+0046 0307 1E1E;
+0047 0301 01F4;
+0047 0302 011C;
+0047 0304 1E20;
+0047 0306 011E;
+0047 0307 0120;
+0047 030C 01E6;
+0047 0327 0122;
+0048 0302 0124;
+0048 0307 1E22;
+0048 0308 1E26;
+0048 030C 021E;
+0048 0323 1E24;
+0048 0327 1E28;
+0048 032E 1E2A;
+0049 0300 00CC;
+0049 0301 00CD;
+0049 0302 00CE;
+0049 0303 0128;
+0049 0304 012A;
+0049 0306 012C;
+0049 0307 0130;
+0049 0308 00CF;
+0049 0309 1EC8;
+0049 030C 01CF;
+0049 030F 0208;
+0049 0311 020A;
+0049 0323 1ECA;
+0049 0328 012E;
+0049 0330 1E2C;
+004A 0302 0134;
+004B 0301 1E30;
+004B 030C 01E8;
+004B 0323 1E32;
+004B 0327 0136;
+004B 0331 1E34;
+004C 0301 0139;
+004C 030C 013D;
+004C 0323 1E36;
+004C 0327 013B;
+004C 032D 1E3C;
+004C 0331 1E3A;
+004D 0301 1E3E;
+004D 0307 1E40;
+004D 0323 1E42;
+004E 0300 01F8;
+004E 0301 0143;
+004E 0303 00D1;
+004E 0307 1E44;
+004E 030C 0147;
+004E 0323 1E46;
+004E 0327 0145;
+004E 032D 1E4A;
+004E 0331 1E48;
+004F 0300 00D2;
+004F 0301 00D3;
+004F 0302 00D4;
+004F 0303 00D5;
+004F 0304 014C;
+004F 0306 014E;
+004F 0307 022E;
+004F 0308 00D6;
+004F 0309 1ECE;
+004F 030B 0150;
+004F 030C 01D1;
+004F 030F 020C;
+004F 0311 020E;
+004F 031B 01A0;
+004F 0323 1ECC;
+004F 0328 01EA;
+0050 0301 1E54;
+0050 0307 1E56;
+0052 0301 0154;
+0052 0307 1E58;
+0052 030C 0158;
+0052 030F 0210;
+0052 0311 0212;
+0052 0323 1E5A;
+0052 0327 0156;
+0052 0331 1E5E;
+0053 0301 015A;
+0053 0302 015C;
+0053 0307 1E60;
+0053 030C 0160;
+0053 0323 1E62;
+0053 0326 0218;
+0053 0327 015E;
+0054 0307 1E6A;
+0054 030C 0164;
+0054 0323 1E6C;
+0054 0326 021A;
+0054 0327 0162;
+0054 032D 1E70;
+0054 0331 1E6E;
+0055 0300 00D9;
+0055 0301 00DA;
+0055 0302 00DB;
+0055 0303 0168;
+0055 0304 016A;
+0055 0306 016C;
+0055 0308 00DC;
+0055 0309 1EE6;
+0055 030A 016E;
+0055 030B 0170;
+0055 030C 01D3;
+0055 030F 0214;
+0055 0311 0216;
+0055 031B 01AF;
+0055 0323 1EE4;
+0055 0324 1E72;
+0055 0328 0172;
+0055 032D 1E76;
+0055 0330 1E74;
+0056 0303 1E7C;
+0056 0323 1E7E;
+0057 0300 1E80;
+0057 0301 1E82;
+0057 0302 0174;
+0057 0307 1E86;
+0057 0308 1E84;
+0057 0323 1E88;
+0058 0307 1E8A;
+0058 0308 1E8C;
+0059 0300 1EF2;
+0059 0301 00DD;
+0059 0302 0176;
+0059 0303 1EF8;
+0059 0304 0232;
+0059 0307 1E8E;
+0059 0308 0178;
+0059 0309 1EF6;
+0059 0323 1EF4;
+005A 0301 0179;
+005A 0302 1E90;
+005A 0307 017B;
+005A 030C 017D;
+005A 0323 1E92;
+005A 0331 1E94;
+0061 0300 00E0;
+0061 0301 00E1;
+0061 0302 00E2;
+0061 0303 00E3;
+0061 0304 0101;
+0061 0306 0103;
+0061 0307 0227;
+0061 0308 00E4;
+0061 0309 1EA3;
+0061 030A 00E5;
+0061 030C 01CE;
+0061 030F 0201;
+0061 0311 0203;
+0061 0323 1EA1;
+0061 0325 1E01;
+0061 0328 0105;
+0062 0307 1E03;
+0062 0323 1E05;
+0062 0331 1E07;
+0063 0301 0107;
+0063 0302 0109;
+0063 0307 010B;
+0063 030C 010D;
+0063 0327 00E7;
+0064 0307 1E0B;
+0064 030C 010F;
+0064 0323 1E0D;
+0064 0327 1E11;
+0064 032D 1E13;
+0064 0331 1E0F;
+0065 0300 00E8;
+0065 0301 00E9;
+0065 0302 00EA;
+0065 0303 1EBD;
+0065 0304 0113;
+0065 0306 0115;
+0065 0307 0117;
+0065 0308 00EB;
+0065 0309 1EBB;
+0065 030C 011B;
+0065 030F 0205;
+0065 0311 0207;
+0065 0323 1EB9;
+0065 0327 0229;
+0065 0328 0119;
+0065 032D 1E19;
+0065 0330 1E1B;
+0066 0307 1E1F;
+0067 0301 01F5;
+0067 0302 011D;
+0067 0304 1E21;
+0067 0306 011F;
+0067 0307 0121;
+0067 030C 01E7;
+0067 0327 0123;
+0068 0302 0125;
+0068 0307 1E23;
+0068 0308 1E27;
+0068 030C 021F;
+0068 0323 1E25;
+0068 0327 1E29;
+0068 032E 1E2B;
+0068 0331 1E96;
+0069 0300 00EC;
+0069 0301 00ED;
+0069 0302 00EE;
+0069 0303 0129;
+0069 0304 012B;
+0069 0306 012D;
+0069 0308 00EF;
+0069 0309 1EC9;
+0069 030C 01D0;
+0069 030F 0209;
+0069 0311 020B;
+0069 0323 1ECB;
+0069 0328 012F;
+0069 0330 1E2D;
+006A 0302 0135;
+006A 030C 01F0;
+006B 0301 1E31;
+006B 030C 01E9;
+006B 0323 1E33;
+006B 0327 0137;
+006B 0331 1E35;
+006C 0301 013A;
+006C 030C 013E;
+006C 0323 1E37;
+006C 0327 013C;
+006C 032D 1E3D;
+006C 0331 1E3B;
+006D 0301 1E3F;
+006D 0307 1E41;
+006D 0323 1E43;
+006E 0300 01F9;
+006E 0301 0144;
+006E 0303 00F1;
+006E 0307 1E45;
+006E 030C 0148;
+006E 0323 1E47;
+006E 0327 0146;
+006E 032D 1E4B;
+006E 0331 1E49;
+006F 0300 00F2;
+006F 0301 00F3;
+006F 0302 00F4;
+006F 0303 00F5;
+006F 0304 014D;
+006F 0306 014F;
+006F 0307 022F;
+006F 0308 00F6;
+006F 0309 1ECF;
+006F 030B 0151;
+006F 030C 01D2;
+006F 030F 020D;
+006F 0311 020F;
+006F 031B 01A1;
+006F 0323 1ECD;
+006F 0328 01EB;
+0070 0301 1E55;
+0070 0307 1E57;
+0072 0301 0155;
+0072 0307 1E59;
+0072 030C 0159;
+0072 030F 0211;
+0072 0311 0213;
+0072 0323 1E5B;
+0072 0327 0157;
+0072 0331 1E5F;
+0073 0301 015B;
+0073 0302 015D;
+0073 0307 1E61;
+0073 030C 0161;
+0073 0323 1E63;
+0073 0326 0219;
+0073 0327 015F;
+0074 0307 1E6B;
+0074 0308 1E97;
+0074 030C 0165;
+0074 0323 1E6D;
+0074 0326 021B;
+0074 0327 0163;
+0074 032D 1E71;
+0074 0331 1E6F;
+0075 0300 00F9;
+0075 0301 00FA;
+0075 0302 00FB;
+0075 0303 0169;
+0075 0304 016B;
+0075 0306 016D;
+0075 0308 00FC;
+0075 0309 1EE7;
+0075 030A 016F;
+0075 030B 0171;
+0075 030C 01D4;
+0075 030F 0215;
+0075 0311 0217;
+0075 031B 01B0;
+0075 0323 1EE5;
+0075 0324 1E73;
+0075 0328 0173;
+0075 032D 1E77;
+0075 0330 1E75;
+0076 0303 1E7D;
+0076 0323 1E7F;
+0077 0300 1E81;
+0077 0301 1E83;
+0077 0302 0175;
+0077 0307 1E87;
+0077 0308 1E85;
+0077 030A 1E98;
+0077 0323 1E89;
+0078 0307 1E8B;
+0078 0308 1E8D;
+0079 0300 1EF3;
+0079 0301 00FD;
+0079 0302 0177;
+0079 0303 1EF9;
+0079 0304 0233;
+0079 0307 1E8F;
+0079 0308 00FF;
+0079 0309 1EF7;
+0079 030A 1E99;
+0079 0323 1EF5;
+007A 0301 017A;
+007A 0302 1E91;
+007A 0307 017C;
+007A 030C 017E;
+007A 0323 1E93;
+007A 0331 1E95;
+00A8 0300 1FED;
+00A8 0301 0385;
+00A8 0342 1FC1;
+00C2 0300 1EA6;
+00C2 0301 1EA4;
+00C2 0303 1EAA;
+00C2 0309 1EA8;
+00C4 0304 01DE;
+00C5 0301 01FA;
+00C6 0301 01FC;
+00C6 0304 01E2;
+00C7 0301 1E08;
+00CA 0300 1EC0;
+00CA 0301 1EBE;
+00CA 0303 1EC4;
+00CA 0309 1EC2;
+00CF 0301 1E2E;
+00D4 0300 1ED2;
+00D4 0301 1ED0;
+00D4 0303 1ED6;
+00D4 0309 1ED4;
+00D5 0301 1E4C;
+00D5 0304 022C;
+00D5 0308 1E4E;
+00D6 0304 022A;
+00D8 0301 01FE;
+00DC 0300 01DB;
+00DC 0301 01D7;
+00DC 0304 01D5;
+00DC 030C 01D9;
+00E2 0300 1EA7;
+00E2 0301 1EA5;
+00E2 0303 1EAB;
+00E2 0309 1EA9;
+00E4 0304 01DF;
+00E5 0301 01FB;
+00E6 0301 01FD;
+00E6 0304 01E3;
+00E7 0301 1E09;
+00EA 0300 1EC1;
+00EA 0301 1EBF;
+00EA 0303 1EC5;
+00EA 0309 1EC3;
+00EF 0301 1E2F;
+00F4 0300 1ED3;
+00F4 0301 1ED1;
+00F4 0303 1ED7;
+00F4 0309 1ED5;
+00F5 0301 1E4D;
+00F5 0304 022D;
+00F5 0308 1E4F;
+00F6 0304 022B;
+00F8 0301 01FF;
+00FC 0300 01DC;
+00FC 0301 01D8;
+00FC 0304 01D6;
+00FC 030C 01DA;
+0102 0300 1EB0;
+0102 0301 1EAE;
+0102 0303 1EB4;
+0102 0309 1EB2;
+0103 0300 1EB1;
+0103 0301 1EAF;
+0103 0303 1EB5;
+0103 0309 1EB3;
+0112 0300 1E14;
+0112 0301 1E16;
+0113 0300 1E15;
+0113 0301 1E17;
+014C 0300 1E50;
+014C 0301 1E52;
+014D 0300 1E51;
+014D 0301 1E53;
+015A 0307 1E64;
+015B 0307 1E65;
+0160 0307 1E66;
+0161 0307 1E67;
+0168 0301 1E78;
+0169 0301 1E79;
+016A 0308 1E7A;
+016B 0308 1E7B;
+017F 0307 1E9B;
+01A0 0300 1EDC;
+01A0 0301 1EDA;
+01A0 0303 1EE0;
+01A0 0309 1EDE;
+01A0 0323 1EE2;
+01A1 0300 1EDD;
+01A1 0301 1EDB;
+01A1 0303 1EE1;
+01A1 0309 1EDF;
+01A1 0323 1EE3;
+01AF 0300 1EEA;
+01AF 0301 1EE8;
+01AF 0303 1EEE;
+01AF 0309 1EEC;
+01AF 0323 1EF0;
+01B0 0300 1EEB;
+01B0 0301 1EE9;
+01B0 0303 1EEF;
+01B0 0309 1EED;
+01B0 0323 1EF1;
+01B7 030C 01EE;
+01EA 0304 01EC;
+01EB 0304 01ED;
+0226 0304 01E0;
+0227 0304 01E1;
+0228 0306 1E1C;
+0229 0306 1E1D;
+022E 0304 0230;
+022F 0304 0231;
+0292 030C 01EF;
+0308 0301 0344;
+0391 0300 1FBA;
+0391 0301 0386;
+0391 0304 1FB9;
+0391 0306 1FB8;
+0391 0313 1F08;
+0391 0314 1F09;
+0391 0345 1FBC;
+0395 0300 1FC8;
+0395 0301 0388;
+0395 0313 1F18;
+0395 0314 1F19;
+0397 0300 1FCA;
+0397 0301 0389;
+0397 0313 1F28;
+0397 0314 1F29;
+0397 0345 1FCC;
+0399 0300 1FDA;
+0399 0301 038A;
+0399 0304 1FD9;
+0399 0306 1FD8;
+0399 0308 03AA;
+0399 0313 1F38;
+0399 0314 1F39;
+039F 0300 1FF8;
+039F 0301 038C;
+039F 0313 1F48;
+039F 0314 1F49;
+03A1 0314 1FEC;
+03A5 0300 1FEA;
+03A5 0301 038E;
+03A5 0304 1FE9;
+03A5 0306 1FE8;
+03A5 0308 03AB;
+03A5 0314 1F59;
+03A9 0300 1FFA;
+03A9 0301 038F;
+03A9 0313 1F68;
+03A9 0314 1F69;
+03A9 0345 1FFC;
+03AC 0345 1FB4;
+03AE 0345 1FC4;
+03B1 0300 1F70;
+03B1 0301 03AC;
+03B1 0304 1FB1;
+03B1 0306 1FB0;
+03B1 0313 1F00;
+03B1 0314 1F01;
+03B1 0342 1FB6;
+03B1 0345 1FB3;
+03B5 0300 1F72;
+03B5 0301 03AD;
+03B5 0313 1F10;
+03B5 0314 1F11;
+03B7 0300 1F74;
+03B7 0301 03AE;
+03B7 0313 1F20;
+03B7 0314 1F21;
+03B7 0342 1FC6;
+03B7 0345 1FC3;
+03B9 0300 1F76;
+03B9 0301 03AF;
+03B9 0304 1FD1;
+03B9 0306 1FD0;
+03B9 0308 03CA;
+03B9 0313 1F30;
+03B9 0314 1F31;
+03B9 0342 1FD6;
+03BF 0300 1F78;
+03BF 0301 03CC;
+03BF 0313 1F40;
+03BF 0314 1F41;
+03C1 0313 1FE4;
+03C1 0314 1FE5;
+03C5 0300 1F7A;
+03C5 0301 03CD;
+03C5 0304 1FE1;
+03C5 0306 1FE0;
+03C5 0308 03CB;
+03C5 0313 1F50;
+03C5 0314 1F51;
+03C5 0342 1FE6;
+03C9 0300 1F7C;
+03C9 0301 03CE;
+03C9 0313 1F60;
+03C9 0314 1F61;
+03C9 0342 1FF6;
+03C9 0345 1FF3;
+03CA 0300 1FD2;
+03CA 0301 0390;
+03CA 0342 1FD7;
+03CB 0300 1FE2;
+03CB 0301 03B0;
+03CB 0342 1FE7;
+03CE 0345 1FF4;
+03D2 0301 03D3;
+03D2 0308 03D4;
+0406 0308 0407;
+0410 0306 04D0;
+0410 0308 04D2;
+0413 0301 0403;
+0415 0300 0400;
+0415 0306 04D6;
+0415 0308 0401;
+0416 0306 04C1;
+0416 0308 04DC;
+0417 0308 04DE;
+0418 0300 040D;
+0418 0304 04E2;
+0418 0306 0419;
+0418 0308 04E4;
+041A 0301 040C;
+041E 0308 04E6;
+0423 0304 04EE;
+0423 0306 040E;
+0423 0308 04F0;
+0423 030B 04F2;
+0427 0308 04F4;
+042B 0308 04F8;
+042D 0308 04EC;
+0430 0306 04D1;
+0430 0308 04D3;
+0433 0301 0453;
+0435 0300 0450;
+0435 0306 04D7;
+0435 0308 0451;
+0436 0306 04C2;
+0436 0308 04DD;
+0437 0308 04DF;
+0438 0300 045D;
+0438 0304 04E3;
+0438 0306 0439;
+0438 0308 04E5;
+043A 0301 045C;
+043E 0308 04E7;
+0443 0304 04EF;
+0443 0306 045E;
+0443 0308 04F1;
+0443 030B 04F3;
+0447 0308 04F5;
+044B 0308 04F9;
+044D 0308 04ED;
+0456 0308 0457;
+0474 030F 0476;
+0475 030F 0477;
+04D8 0308 04DA;
+04D9 0308 04DB;
+04E8 0308 04EA;
+04E9 0308 04EB;
+05D0 05B7 FB2E;
+05D0 05B8 FB2F;
+05D0 05BC FB30;
+05D1 05BC FB31;
+05D1 05BF FB4C;
+05D2 05BC FB32;
+05D3 05BC FB33;
+05D4 05BC FB34;
+05D5 05B9 FB4B;
+05D5 05BC FB35;
+05D6 05BC FB36;
+05D8 05BC FB38;
+05D9 05B4 FB1D;
+05D9 05BC FB39;
+05DA 05BC FB3A;
+05DB 05BC FB3B;
+05DB 05BF FB4D;
+05DC 05BC FB3C;
+05DE 05BC FB3E;
+05E0 05BC FB40;
+05E1 05BC FB41;
+05E3 05BC FB43;
+05E4 05BC FB44;
+05E4 05BF FB4E;
+05E6 05BC FB46;
+05E7 05BC FB47;
+05E8 05BC FB48;
+05E9 05BC FB49;
+05E9 05C1 FB2A;
+05E9 05C2 FB2B;
+05EA 05BC FB4A;
+05F2 05B7 FB1F;
+0627 0653 0622;
+0627 0654 0623;
+0627 0655 0625;
+0648 0654 0624;
+064A 0654 0626;
+06C1 0654 06C2;
+06D2 0654 06D3;
+06D5 0654 06C0;
+0915 093C 0958;
+0916 093C 0959;
+0917 093C 095A;
+091C 093C 095B;
+0921 093C 095C;
+0922 093C 095D;
+0928 093C 0929;
+092B 093C 095E;
+092F 093C 095F;
+0930 093C 0931;
+0933 093C 0934;
+09A1 09BC 09DC;
+09A2 09BC 09DD;
+09AF 09BC 09DF;
+09C7 09BE 09CB;
+09C7 09D7 09CC;
+0A16 0A3C 0A59;
+0A17 0A3C 0A5A;
+0A1C 0A3C 0A5B;
+0A2B 0A3C 0A5E;
+0A32 0A3C 0A33;
+0A38 0A3C 0A36;
+0B21 0B3C 0B5C;
+0B22 0B3C 0B5D;
+0B47 0B3E 0B4B;
+0B47 0B56 0B48;
+0B47 0B57 0B4C;
+0B92 0BD7 0B94;
+0BC6 0BBE 0BCA;
+0BC6 0BD7 0BCC;
+0BC7 0BBE 0BCB;
+0C46 0C56 0C48;
+0CBF 0CD5 0CC0;
+0CC6 0CC2 0CCA;
+0CC6 0CD5 0CC7;
+0CC6 0CD6 0CC8;
+0CCA 0CD5 0CCB;
+0D46 0D3E 0D4A;
+0D46 0D57 0D4C;
+0D47 0D3E 0D4B;
+0DD9 0DCA 0DDA;
+0DD9 0DCF 0DDC;
+0DD9 0DDF 0DDE;
+0DDC 0DCA 0DDD;
+0F40 0FB5 0F69;
+0F42 0FB7 0F43;
+0F4C 0FB7 0F4D;
+0F51 0FB7 0F52;
+0F56 0FB7 0F57;
+0F5B 0FB7 0F5C;
+0F71 0F72 0F73;
+0F71 0F74 0F75;
+0F71 0F80 0F81;
+0F90 0FB5 0FB9;
+0F92 0FB7 0F93;
+0F9C 0FB7 0F9D;
+0FA1 0FB7 0FA2;
+0FA6 0FB7 0FA7;
+0FAB 0FB7 0FAC;
+0FB2 0F80 0F76;
+0FB3 0F80 0F78;
+1025 102E 1026;
+1E36 0304 1E38;
+1E37 0304 1E39;
+1E5A 0304 1E5C;
+1E5B 0304 1E5D;
+1E62 0307 1E68;
+1E63 0307 1E69;
+1EA0 0302 1EAC;
+1EA0 0306 1EB6;
+1EA1 0302 1EAD;
+1EA1 0306 1EB7;
+1EB8 0302 1EC6;
+1EB9 0302 1EC7;
+1ECC 0302 1ED8;
+1ECD 0302 1ED9;
+1F00 0300 1F02;
+1F00 0301 1F04;
+1F00 0342 1F06;
+1F00 0345 1F80;
+1F01 0300 1F03;
+1F01 0301 1F05;
+1F01 0342 1F07;
+1F01 0345 1F81;
+1F02 0345 1F82;
+1F03 0345 1F83;
+1F04 0345 1F84;
+1F05 0345 1F85;
+1F06 0345 1F86;
+1F07 0345 1F87;
+1F08 0300 1F0A;
+1F08 0301 1F0C;
+1F08 0342 1F0E;
+1F08 0345 1F88;
+1F09 0300 1F0B;
+1F09 0301 1F0D;
+1F09 0342 1F0F;
+1F09 0345 1F89;
+1F0A 0345 1F8A;
+1F0B 0345 1F8B;
+1F0C 0345 1F8C;
+1F0D 0345 1F8D;
+1F0E 0345 1F8E;
+1F0F 0345 1F8F;
+1F10 0300 1F12;
+1F10 0301 1F14;
+1F11 0300 1F13;
+1F11 0301 1F15;
+1F18 0300 1F1A;
+1F18 0301 1F1C;
+1F19 0300 1F1B;
+1F19 0301 1F1D;
+1F20 0300 1F22;
+1F20 0301 1F24;
+1F20 0342 1F26;
+1F20 0345 1F90;
+1F21 0300 1F23;
+1F21 0301 1F25;
+1F21 0342 1F27;
+1F21 0345 1F91;
+1F22 0345 1F92;
+1F23 0345 1F93;
+1F24 0345 1F94;
+1F25 0345 1F95;
+1F26 0345 1F96;
+1F27 0345 1F97;
+1F28 0300 1F2A;
+1F28 0301 1F2C;
+1F28 0342 1F2E;
+1F28 0345 1F98;
+1F29 0300 1F2B;
+1F29 0301 1F2D;
+1F29 0342 1F2F;
+1F29 0345 1F99;
+1F2A 0345 1F9A;
+1F2B 0345 1F9B;
+1F2C 0345 1F9C;
+1F2D 0345 1F9D;
+1F2E 0345 1F9E;
+1F2F 0345 1F9F;
+1F30 0300 1F32;
+1F30 0301 1F34;
+1F30 0342 1F36;
+1F31 0300 1F33;
+1F31 0301 1F35;
+1F31 0342 1F37;
+1F38 0300 1F3A;
+1F38 0301 1F3C;
+1F38 0342 1F3E;
+1F39 0300 1F3B;
+1F39 0301 1F3D;
+1F39 0342 1F3F;
+1F40 0300 1F42;
+1F40 0301 1F44;
+1F41 0300 1F43;
+1F41 0301 1F45;
+1F48 0300 1F4A;
+1F48 0301 1F4C;
+1F49 0300 1F4B;
+1F49 0301 1F4D;
+1F50 0300 1F52;
+1F50 0301 1F54;
+1F50 0342 1F56;
+1F51 0300 1F53;
+1F51 0301 1F55;
+1F51 0342 1F57;
+1F59 0300 1F5B;
+1F59 0301 1F5D;
+1F59 0342 1F5F;
+1F60 0300 1F62;
+1F60 0301 1F64;
+1F60 0342 1F66;
+1F60 0345 1FA0;
+1F61 0300 1F63;
+1F61 0301 1F65;
+1F61 0342 1F67;
+1F61 0345 1FA1;
+1F62 0345 1FA2;
+1F63 0345 1FA3;
+1F64 0345 1FA4;
+1F65 0345 1FA5;
+1F66 0345 1FA6;
+1F67 0345 1FA7;
+1F68 0300 1F6A;
+1F68 0301 1F6C;
+1F68 0342 1F6E;
+1F68 0345 1FA8;
+1F69 0300 1F6B;
+1F69 0301 1F6D;
+1F69 0342 1F6F;
+1F69 0345 1FA9;
+1F6A 0345 1FAA;
+1F6B 0345 1FAB;
+1F6C 0345 1FAC;
+1F6D 0345 1FAD;
+1F6E 0345 1FAE;
+1F6F 0345 1FAF;
+1F70 0345 1FB2;
+1F74 0345 1FC2;
+1F7C 0345 1FF2;
+1FB6 0345 1FB7;
+1FBF 0300 1FCD;
+1FBF 0301 1FCE;
+1FBF 0342 1FCF;
+1FC6 0345 1FC7;
+1FF6 0345 1FF7;
+1FFE 0300 1FDD;
+1FFE 0301 1FDE;
+1FFE 0342 1FDF;
+2190 0338 219A;
+2192 0338 219B;
+2194 0338 21AE;
+21D0 0338 21CD;
+21D2 0338 21CF;
+21D4 0338 21CE;
+2203 0338 2204;
+2208 0338 2209;
+220B 0338 220C;
+2223 0338 2224;
+2225 0338 2226;
+223C 0338 2241;
+2243 0338 2244;
+2245 0338 2247;
+2248 0338 2249;
+224D 0338 226D;
+2261 0338 2262;
+2264 0338 2270;
+2265 0338 2271;
+2272 0338 2274;
+2273 0338 2275;
+2276 0338 2278;
+2277 0338 2279;
+227A 0338 2280;
+227B 0338 2281;
+227C 0338 22E0;
+227D 0338 22E1;
+2282 0338 2284;
+2283 0338 2285;
+2286 0338 2288;
+2287 0338 2289;
+2291 0338 22E2;
+2292 0338 22E3;
+22A2 0338 22AC;
+22A8 0338 22AD;
+22A9 0338 22AE;
+22AB 0338 22AF;
+22B2 0338 22EA;
+22B3 0338 22EB;
+22B4 0338 22EC;
+22B5 0338 22ED;
+3046 3099 3094;
+304B 3099 304C;
+304D 3099 304E;
+304F 3099 3050;
+3051 3099 3052;
+3053 3099 3054;
+3055 3099 3056;
+3057 3099 3058;
+3059 3099 305A;
+305B 3099 305C;
+305D 3099 305E;
+305F 3099 3060;
+3061 3099 3062;
+3064 3099 3065;
+3066 3099 3067;
+3068 3099 3069;
+306F 3099 3070;
+306F 309A 3071;
+3072 3099 3073;
+3072 309A 3074;
+3075 3099 3076;
+3075 309A 3077;
+3078 3099 3079;
+3078 309A 307A;
+307B 3099 307C;
+307B 309A 307D;
+309D 3099 309E;
+30A6 3099 30F4;
+30AB 3099 30AC;
+30AD 3099 30AE;
+30AF 3099 30B0;
+30B1 3099 30B2;
+30B3 3099 30B4;
+30B5 3099 30B6;
+30B7 3099 30B8;
+30B9 3099 30BA;
+30BB 3099 30BC;
+30BD 3099 30BE;
+30BF 3099 30C0;
+30C1 3099 30C2;
+30C4 3099 30C5;
+30C6 3099 30C7;
+30C8 3099 30C9;
+30CF 3099 30D0;
+30CF 309A 30D1;
+30D2 3099 30D3;
+30D2 309A 30D4;
+30D5 3099 30D6;
+30D5 309A 30D7;
+30D8 3099 30D9;
+30D8 309A 30DA;
+30DB 3099 30DC;
+30DB 309A 30DD;
+30EF 3099 30F7;
+30F0 3099 30F8;
+30F1 3099 30F9;
+30F2 3099 30FA;
+30FD 3099 30FE;
+FB49 05C1 FB2C;
+FB49 05C2 FB2D;
@@ -1,19 +0,0 @@
-[Desktop Entry]
-Categories=Application;System;X-Red-Hat-Base;
-Comment=CUPS Web Interface
-Comment[en_US]=CUPS Web Interface
-Encoding=UTF-8
-Exec=htmlview http://localhost:631/
-GenericName=
-GenericName[en_US]=
-Icon=cups
-MimeType=
-Name=Manage Printing
-Path=
-StartupNotify=false
-Terminal=false
-TerminalOptions=
-Type=Application
-X-DCOP-ServiceType=
-X-KDE-SubstituteUID=false
-X-KDE-Username=
@@ -28,6 +28,7 @@ include ../Makedefs
 # Document files...
 #

+LANGUAGES	=	ja
 WEBPAGES	=	\
 			cups.css \
 			cups-printable.css \
@@ -98,7 +99,6 @@ WEBIMAGES	=	\
 			images/printer-idle.gif \
 			images/printer-processing.gif \
 			images/printer-stopped.gif \
-			images/smiley.jpg \
 			images/tab-left.gif \
 			images/tab-right.gif \
 			images/top-left.gif \
@@ -133,7 +133,6 @@ HELPFILES	=	\
 			help/man-cupsd.conf.html \
 			help/man-cupsd.html \
 			help/man-cupsenable.html \
-			help/man-cupstestdsc.html \
 			help/man-cupstestppd.html \
 			help/man-filter.html \
 			help/man-lp.html \
@@ -166,7 +165,6 @@ HELPFILES	=	\
 			help/spec-command.html \
 			help/spec-design.html \
 			help/spec-ipp.html \
-			help/spec-postscript.html \
 			help/spec-ppd.html \
 			help/spec-raster.html \
 			help/spec-stp.html \
--- a/Mostrar Mais
+++ b/Mostrar Mais