changeset 9472:7e73893994b7

Tests for Unicode character classification functions.
author Bruno Haible <bruno@clisp.org>
date Tue, 13 Nov 2007 00:25:37 +0100
parents 6dc73c76eced
children 8c3f82d802ec
files ChangeLog modules/unictype/bidicategory-byname-tests modules/unictype/bidicategory-name-tests modules/unictype/bidicategory-of-tests modules/unictype/bidicategory-test-tests modules/unictype/block-list-tests modules/unictype/block-of-tests modules/unictype/block-test-tests modules/unictype/category-C-tests modules/unictype/category-Cc-tests modules/unictype/category-Cf-tests modules/unictype/category-Cn-tests modules/unictype/category-Co-tests modules/unictype/category-Cs-tests modules/unictype/category-L-tests modules/unictype/category-Ll-tests modules/unictype/category-Lm-tests modules/unictype/category-Lo-tests modules/unictype/category-Lt-tests modules/unictype/category-Lu-tests modules/unictype/category-M-tests modules/unictype/category-Mc-tests modules/unictype/category-Me-tests modules/unictype/category-Mn-tests modules/unictype/category-N-tests modules/unictype/category-Nd-tests modules/unictype/category-Nl-tests modules/unictype/category-No-tests modules/unictype/category-P-tests modules/unictype/category-Pc-tests modules/unictype/category-Pd-tests modules/unictype/category-Pe-tests modules/unictype/category-Pf-tests modules/unictype/category-Pi-tests modules/unictype/category-Po-tests modules/unictype/category-Ps-tests modules/unictype/category-S-tests modules/unictype/category-Sc-tests modules/unictype/category-Sk-tests modules/unictype/category-Sm-tests modules/unictype/category-So-tests modules/unictype/category-Z-tests modules/unictype/category-Zl-tests modules/unictype/category-Zp-tests modules/unictype/category-Zs-tests modules/unictype/category-and-not-tests modules/unictype/category-and-tests modules/unictype/category-byname-tests modules/unictype/category-name-tests modules/unictype/category-none-tests modules/unictype/category-of-tests modules/unictype/category-or-tests modules/unictype/category-test-withtable-tests modules/unictype/combining-class-tests modules/unictype/ctype-alnum-tests modules/unictype/ctype-alpha-tests modules/unictype/ctype-blank-tests modules/unictype/ctype-cntrl-tests modules/unictype/ctype-digit-tests modules/unictype/ctype-graph-tests modules/unictype/ctype-lower-tests modules/unictype/ctype-print-tests modules/unictype/ctype-punct-tests modules/unictype/ctype-space-tests modules/unictype/ctype-upper-tests modules/unictype/ctype-xdigit-tests modules/unictype/decimal-digit-tests modules/unictype/digit-tests modules/unictype/mirror-tests modules/unictype/numeric-tests modules/unictype/property-alphabetic-tests modules/unictype/property-ascii-hex-digit-tests modules/unictype/property-bidi-arabic-digit-tests modules/unictype/property-bidi-arabic-right-to-left-tests modules/unictype/property-bidi-block-separator-tests modules/unictype/property-bidi-boundary-neutral-tests modules/unictype/property-bidi-common-separator-tests modules/unictype/property-bidi-control-tests modules/unictype/property-bidi-embedding-or-override-tests modules/unictype/property-bidi-eur-num-separator-tests modules/unictype/property-bidi-eur-num-terminator-tests modules/unictype/property-bidi-european-digit-tests modules/unictype/property-bidi-hebrew-right-to-left-tests modules/unictype/property-bidi-left-to-right-tests modules/unictype/property-bidi-non-spacing-mark-tests modules/unictype/property-bidi-other-neutral-tests modules/unictype/property-bidi-pdf-tests modules/unictype/property-bidi-segment-separator-tests modules/unictype/property-bidi-whitespace-tests modules/unictype/property-byname-tests modules/unictype/property-combining-tests modules/unictype/property-composite-tests modules/unictype/property-currency-symbol-tests modules/unictype/property-dash-tests modules/unictype/property-decimal-digit-tests modules/unictype/property-default-ignorable-code-point-tests modules/unictype/property-deprecated-tests modules/unictype/property-diacritic-tests modules/unictype/property-extender-tests modules/unictype/property-format-control-tests modules/unictype/property-grapheme-base-tests modules/unictype/property-grapheme-extend-tests modules/unictype/property-grapheme-link-tests modules/unictype/property-hex-digit-tests modules/unictype/property-hyphen-tests modules/unictype/property-id-continue-tests modules/unictype/property-id-start-tests modules/unictype/property-ideographic-tests modules/unictype/property-ids-binary-operator-tests modules/unictype/property-ids-trinary-operator-tests modules/unictype/property-ignorable-control-tests modules/unictype/property-iso-control-tests modules/unictype/property-join-control-tests modules/unictype/property-left-of-pair-tests modules/unictype/property-line-separator-tests modules/unictype/property-logical-order-exception-tests modules/unictype/property-lowercase-tests modules/unictype/property-math-tests modules/unictype/property-non-break-tests modules/unictype/property-not-a-character-tests modules/unictype/property-numeric-tests modules/unictype/property-other-alphabetic-tests modules/unictype/property-other-default-ignorable-code-point-tests modules/unictype/property-other-grapheme-extend-tests modules/unictype/property-other-id-continue-tests modules/unictype/property-other-id-start-tests modules/unictype/property-other-lowercase-tests modules/unictype/property-other-math-tests modules/unictype/property-other-uppercase-tests modules/unictype/property-paired-punctuation-tests modules/unictype/property-paragraph-separator-tests modules/unictype/property-pattern-syntax-tests modules/unictype/property-pattern-white-space-tests modules/unictype/property-private-use-tests modules/unictype/property-punctuation-tests modules/unictype/property-quotation-mark-tests modules/unictype/property-radical-tests modules/unictype/property-sentence-terminal-tests modules/unictype/property-soft-dotted-tests modules/unictype/property-space-tests modules/unictype/property-terminal-punctuation-tests modules/unictype/property-test-tests modules/unictype/property-titlecase-tests modules/unictype/property-unassigned-code-value-tests modules/unictype/property-unified-ideograph-tests modules/unictype/property-uppercase-tests modules/unictype/property-variation-selector-tests modules/unictype/property-white-space-tests modules/unictype/property-xid-continue-tests modules/unictype/property-xid-start-tests modules/unictype/property-zero-width-tests modules/unictype/scripts-tests modules/unictype/syntax-c-ident-tests modules/unictype/syntax-c-whitespace-tests modules/unictype/syntax-java-ident-tests modules/unictype/syntax-java-whitespace-tests tests/unictype/test-bidi_byname.c tests/unictype/test-bidi_name.c tests/unictype/test-bidi_of.c tests/unictype/test-bidi_test.c tests/unictype/test-block_list.c tests/unictype/test-block_of.c tests/unictype/test-block_test.c tests/unictype/test-categ_C.c tests/unictype/test-categ_Cc.c tests/unictype/test-categ_Cf.c tests/unictype/test-categ_Cn.c tests/unictype/test-categ_Co.c tests/unictype/test-categ_Cs.c tests/unictype/test-categ_L.c tests/unictype/test-categ_Ll.c tests/unictype/test-categ_Lm.c tests/unictype/test-categ_Lo.c tests/unictype/test-categ_Lt.c tests/unictype/test-categ_Lu.c tests/unictype/test-categ_M.c tests/unictype/test-categ_Mc.c tests/unictype/test-categ_Me.c tests/unictype/test-categ_Mn.c tests/unictype/test-categ_N.c tests/unictype/test-categ_Nd.c tests/unictype/test-categ_Nl.c tests/unictype/test-categ_No.c tests/unictype/test-categ_P.c tests/unictype/test-categ_Pc.c tests/unictype/test-categ_Pd.c tests/unictype/test-categ_Pe.c tests/unictype/test-categ_Pf.c tests/unictype/test-categ_Pi.c tests/unictype/test-categ_Po.c tests/unictype/test-categ_Ps.c tests/unictype/test-categ_S.c tests/unictype/test-categ_Sc.c tests/unictype/test-categ_Sk.c tests/unictype/test-categ_Sm.c tests/unictype/test-categ_So.c tests/unictype/test-categ_Z.c tests/unictype/test-categ_Zl.c tests/unictype/test-categ_Zp.c tests/unictype/test-categ_Zs.c tests/unictype/test-categ_and.c tests/unictype/test-categ_and_not.c tests/unictype/test-categ_byname.c tests/unictype/test-categ_name.c tests/unictype/test-categ_none.c tests/unictype/test-categ_of.c tests/unictype/test-categ_or.c tests/unictype/test-categ_test_withtable.c tests/unictype/test-combining.c tests/unictype/test-ctype_alnum.c tests/unictype/test-ctype_alpha.c tests/unictype/test-ctype_blank.c tests/unictype/test-ctype_cntrl.c tests/unictype/test-ctype_digit.c tests/unictype/test-ctype_graph.c tests/unictype/test-ctype_lower.c tests/unictype/test-ctype_print.c tests/unictype/test-ctype_punct.c tests/unictype/test-ctype_space.c tests/unictype/test-ctype_upper.c tests/unictype/test-ctype_xdigit.c tests/unictype/test-decdigit.c tests/unictype/test-decdigit.h tests/unictype/test-digit.c tests/unictype/test-digit.h tests/unictype/test-mirror.c tests/unictype/test-numeric.c tests/unictype/test-numeric.h tests/unictype/test-pr_alphabetic.c tests/unictype/test-pr_ascii_hex_digit.c tests/unictype/test-pr_bidi_arabic_digit.c tests/unictype/test-pr_bidi_arabic_right_to_left.c tests/unictype/test-pr_bidi_block_separator.c tests/unictype/test-pr_bidi_boundary_neutral.c tests/unictype/test-pr_bidi_common_separator.c tests/unictype/test-pr_bidi_control.c tests/unictype/test-pr_bidi_embedding_or_override.c tests/unictype/test-pr_bidi_eur_num_separator.c tests/unictype/test-pr_bidi_eur_num_terminator.c tests/unictype/test-pr_bidi_european_digit.c tests/unictype/test-pr_bidi_hebrew_right_to_left.c tests/unictype/test-pr_bidi_left_to_right.c tests/unictype/test-pr_bidi_non_spacing_mark.c tests/unictype/test-pr_bidi_other_neutral.c tests/unictype/test-pr_bidi_pdf.c tests/unictype/test-pr_bidi_segment_separator.c tests/unictype/test-pr_bidi_whitespace.c tests/unictype/test-pr_byname.c tests/unictype/test-pr_combining.c tests/unictype/test-pr_composite.c tests/unictype/test-pr_currency_symbol.c tests/unictype/test-pr_dash.c tests/unictype/test-pr_decimal_digit.c tests/unictype/test-pr_default_ignorable_code_point.c tests/unictype/test-pr_deprecated.c tests/unictype/test-pr_diacritic.c tests/unictype/test-pr_extender.c tests/unictype/test-pr_format_control.c tests/unictype/test-pr_grapheme_base.c tests/unictype/test-pr_grapheme_extend.c tests/unictype/test-pr_grapheme_link.c tests/unictype/test-pr_hex_digit.c tests/unictype/test-pr_hyphen.c tests/unictype/test-pr_id_continue.c tests/unictype/test-pr_id_start.c tests/unictype/test-pr_ideographic.c tests/unictype/test-pr_ids_binary_operator.c tests/unictype/test-pr_ids_trinary_operator.c tests/unictype/test-pr_ignorable_control.c tests/unictype/test-pr_iso_control.c tests/unictype/test-pr_join_control.c tests/unictype/test-pr_left_of_pair.c tests/unictype/test-pr_line_separator.c tests/unictype/test-pr_logical_order_exception.c tests/unictype/test-pr_lowercase.c tests/unictype/test-pr_math.c tests/unictype/test-pr_non_break.c tests/unictype/test-pr_not_a_character.c tests/unictype/test-pr_numeric.c tests/unictype/test-pr_other_alphabetic.c tests/unictype/test-pr_other_default_ignorable_code_point.c tests/unictype/test-pr_other_grapheme_extend.c tests/unictype/test-pr_other_id_continue.c tests/unictype/test-pr_other_id_start.c tests/unictype/test-pr_other_lowercase.c tests/unictype/test-pr_other_math.c tests/unictype/test-pr_other_uppercase.c tests/unictype/test-pr_paired_punctuation.c tests/unictype/test-pr_paragraph_separator.c tests/unictype/test-pr_pattern_syntax.c tests/unictype/test-pr_pattern_white_space.c tests/unictype/test-pr_private_use.c tests/unictype/test-pr_punctuation.c tests/unictype/test-pr_quotation_mark.c tests/unictype/test-pr_radical.c tests/unictype/test-pr_sentence_terminal.c tests/unictype/test-pr_soft_dotted.c tests/unictype/test-pr_space.c tests/unictype/test-pr_terminal_punctuation.c tests/unictype/test-pr_test.c tests/unictype/test-pr_titlecase.c tests/unictype/test-pr_unassigned_code_value.c tests/unictype/test-pr_unified_ideograph.c tests/unictype/test-pr_uppercase.c tests/unictype/test-pr_variation_selector.c tests/unictype/test-pr_white_space.c tests/unictype/test-pr_xid_continue.c tests/unictype/test-pr_xid_start.c tests/unictype/test-pr_zero_width.c tests/unictype/test-predicate-part1.h tests/unictype/test-predicate-part2.h tests/unictype/test-scripts.c tests/unictype/test-sy_c_ident.c tests/unictype/test-sy_c_whitespace.c tests/unictype/test-sy_java_ident.c tests/unictype/test-sy_java_whitespace.c
diffstat 316 files changed, 21210 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,325 @@
+2007-11-12  Bruno Haible  <bruno@clisp.org>
+
+	Tests for Unicode character classification functions.
+
+	* modules/unictype/bidicategory-byname-tests: New file.
+	* modules/unictype/bidicategory-name-tests: New file.
+	* modules/unictype/bidicategory-of-tests: New file.
+	* modules/unictype/bidicategory-test-tests: New file.
+	* modules/unictype/block-list-tests: New file.
+	* modules/unictype/block-of-tests: New file.
+	* modules/unictype/block-test-tests: New file.
+	* modules/unictype/category-C-tests: New file.
+	* modules/unictype/category-Cc-tests: New file.
+	* modules/unictype/category-Cf-tests: New file.
+	* modules/unictype/category-Cn-tests: New file.
+	* modules/unictype/category-Co-tests: New file.
+	* modules/unictype/category-Cs-tests: New file.
+	* modules/unictype/category-L-tests: New file.
+	* modules/unictype/category-Ll-tests: New file.
+	* modules/unictype/category-Lm-tests: New file.
+	* modules/unictype/category-Lo-tests: New file.
+	* modules/unictype/category-Lt-tests: New file.
+	* modules/unictype/category-Lu-tests: New file.
+	* modules/unictype/category-M-tests: New file.
+	* modules/unictype/category-Mc-tests: New file.
+	* modules/unictype/category-Me-tests: New file.
+	* modules/unictype/category-Mn-tests: New file.
+	* modules/unictype/category-N-tests: New file.
+	* modules/unictype/category-Nd-tests: New file.
+	* modules/unictype/category-Nl-tests: New file.
+	* modules/unictype/category-No-tests: New file.
+	* modules/unictype/category-P-tests: New file.
+	* modules/unictype/category-Pc-tests: New file.
+	* modules/unictype/category-Pd-tests: New file.
+	* modules/unictype/category-Pe-tests: New file.
+	* modules/unictype/category-Pf-tests: New file.
+	* modules/unictype/category-Pi-tests: New file.
+	* modules/unictype/category-Po-tests: New file.
+	* modules/unictype/category-Ps-tests: New file.
+	* modules/unictype/category-S-tests: New file.
+	* modules/unictype/category-Sc-tests: New file.
+	* modules/unictype/category-Sk-tests: New file.
+	* modules/unictype/category-Sm-tests: New file.
+	* modules/unictype/category-So-tests: New file.
+	* modules/unictype/category-Z-tests: New file.
+	* modules/unictype/category-Zl-tests: New file.
+	* modules/unictype/category-Zp-tests: New file.
+	* modules/unictype/category-Zs-tests: New file.
+	* modules/unictype/category-and-not-tests: New file.
+	* modules/unictype/category-and-tests: New file.
+	* modules/unictype/category-byname-tests: New file.
+	* modules/unictype/category-name-tests: New file.
+	* modules/unictype/category-none-tests: New file.
+	* modules/unictype/category-of-tests: New file.
+	* modules/unictype/category-or-tests: New file.
+	* modules/unictype/category-test-withtable-tests: New file.
+	* modules/unictype/combining-class-tests: New file.
+	* modules/unictype/ctype-alnum-tests: New file.
+	* modules/unictype/ctype-alpha-tests: New file.
+	* modules/unictype/ctype-blank-tests: New file.
+	* modules/unictype/ctype-cntrl-tests: New file.
+	* modules/unictype/ctype-digit-tests: New file.
+	* modules/unictype/ctype-graph-tests: New file.
+	* modules/unictype/ctype-lower-tests: New file.
+	* modules/unictype/ctype-print-tests: New file.
+	* modules/unictype/ctype-punct-tests: New file.
+	* modules/unictype/ctype-space-tests: New file.
+	* modules/unictype/ctype-upper-tests: New file.
+	* modules/unictype/ctype-xdigit-tests: New file.
+	* modules/unictype/decimal-digit-tests: New file.
+	* modules/unictype/digit-tests: New file.
+	* modules/unictype/mirror-tests: New file.
+	* modules/unictype/numeric-tests: New file.
+	* modules/unictype/property-alphabetic-tests: New file.
+	* modules/unictype/property-ascii-hex-digit-tests: New file.
+	* modules/unictype/property-bidi-arabic-digit-tests: New file.
+	* modules/unictype/property-bidi-arabic-right-to-left-tests: New file.
+	* modules/unictype/property-bidi-block-separator-tests: New file.
+	* modules/unictype/property-bidi-boundary-neutral-tests: New file.
+	* modules/unictype/property-bidi-common-separator-tests: New file.
+	* modules/unictype/property-bidi-control-tests: New file.
+	* modules/unictype/property-bidi-embedding-or-override-tests: New file.
+	* modules/unictype/property-bidi-eur-num-separator-tests: New file.
+	* modules/unictype/property-bidi-eur-num-terminator-tests: New file.
+	* modules/unictype/property-bidi-european-digit-tests: New file.
+	* modules/unictype/property-bidi-hebrew-right-to-left-tests: New file.
+	* modules/unictype/property-bidi-left-to-right-tests: New file.
+	* modules/unictype/property-bidi-non-spacing-mark-tests: New file.
+	* modules/unictype/property-bidi-other-neutral-tests: New file.
+	* modules/unictype/property-bidi-pdf-tests: New file.
+	* modules/unictype/property-bidi-segment-separator-tests: New file.
+	* modules/unictype/property-bidi-whitespace-tests: New file.
+	* modules/unictype/property-byname-tests: New file.
+	* modules/unictype/property-combining-tests: New file.
+	* modules/unictype/property-composite-tests: New file.
+	* modules/unictype/property-currency-symbol-tests: New file.
+	* modules/unictype/property-dash-tests: New file.
+	* modules/unictype/property-decimal-digit-tests: New file.
+	* modules/unictype/property-default-ignorable-code-point-tests: New file.
+	* modules/unictype/property-deprecated-tests: New file.
+	* modules/unictype/property-diacritic-tests: New file.
+	* modules/unictype/property-extender-tests: New file.
+	* modules/unictype/property-format-control-tests: New file.
+	* modules/unictype/property-grapheme-base-tests: New file.
+	* modules/unictype/property-grapheme-extend-tests: New file.
+	* modules/unictype/property-grapheme-link-tests: New file.
+	* modules/unictype/property-hex-digit-tests: New file.
+	* modules/unictype/property-hyphen-tests: New file.
+	* modules/unictype/property-id-continue-tests: New file.
+	* modules/unictype/property-id-start-tests: New file.
+	* modules/unictype/property-ideographic-tests: New file.
+	* modules/unictype/property-ids-binary-operator-tests: New file.
+	* modules/unictype/property-ids-trinary-operator-tests: New file.
+	* modules/unictype/property-ignorable-control-tests: New file.
+	* modules/unictype/property-iso-control-tests: New file.
+	* modules/unictype/property-join-control-tests: New file.
+	* modules/unictype/property-left-of-pair-tests: New file.
+	* modules/unictype/property-line-separator-tests: New file.
+	* modules/unictype/property-logical-order-exception-tests: New file.
+	* modules/unictype/property-lowercase-tests: New file.
+	* modules/unictype/property-math-tests: New file.
+	* modules/unictype/property-non-break-tests: New file.
+	* modules/unictype/property-not-a-character-tests: New file.
+	* modules/unictype/property-numeric-tests: New file.
+	* modules/unictype/property-other-alphabetic-tests: New file.
+	* modules/unictype/property-other-default-ignorable-code-point-tests: New file.
+	* modules/unictype/property-other-grapheme-extend-tests: New file.
+	* modules/unictype/property-other-id-continue-tests: New file.
+	* modules/unictype/property-other-id-start-tests: New file.
+	* modules/unictype/property-other-lowercase-tests: New file.
+	* modules/unictype/property-other-math-tests: New file.
+	* modules/unictype/property-other-uppercase-tests: New file.
+	* modules/unictype/property-paired-punctuation-tests: New file.
+	* modules/unictype/property-paragraph-separator-tests: New file.
+	* modules/unictype/property-pattern-syntax-tests: New file.
+	* modules/unictype/property-pattern-white-space-tests: New file.
+	* modules/unictype/property-private-use-tests: New file.
+	* modules/unictype/property-punctuation-tests: New file.
+	* modules/unictype/property-quotation-mark-tests: New file.
+	* modules/unictype/property-radical-tests: New file.
+	* modules/unictype/property-sentence-terminal-tests: New file.
+	* modules/unictype/property-soft-dotted-tests: New file.
+	* modules/unictype/property-space-tests: New file.
+	* modules/unictype/property-terminal-punctuation-tests: New file.
+	* modules/unictype/property-test-tests: New file.
+	* modules/unictype/property-titlecase-tests: New file.
+	* modules/unictype/property-unassigned-code-value-tests: New file.
+	* modules/unictype/property-unified-ideograph-tests: New file.
+	* modules/unictype/property-uppercase-tests: New file.
+	* modules/unictype/property-variation-selector-tests: New file.
+	* modules/unictype/property-white-space-tests: New file.
+	* modules/unictype/property-xid-continue-tests: New file.
+	* modules/unictype/property-xid-start-tests: New file.
+	* modules/unictype/property-zero-width-tests: New file.
+	* modules/unictype/scripts-tests: New file.
+	* modules/unictype/syntax-c-ident-tests: New file.
+	* modules/unictype/syntax-c-whitespace-tests: New file.
+	* modules/unictype/syntax-java-ident-tests: New file.
+	* modules/unictype/syntax-java-whitespace-tests: New file.
+	* tests/unictype/test-bidi_byname.c: New file.
+	* tests/unictype/test-bidi_name.c: New file.
+	* tests/unictype/test-bidi_of.c: New file.
+	* tests/unictype/test-bidi_test.c: New file.
+	* tests/unictype/test-block_list.c: New file.
+	* tests/unictype/test-block_of.c: New file.
+	* tests/unictype/test-block_test.c: New file.
+	* tests/unictype/test-categ_and.c: New file.
+	* tests/unictype/test-categ_and_not.c: New file.
+	* tests/unictype/test-categ_byname.c: New file.
+	* tests/unictype/test-categ_name.c: New file.
+	* tests/unictype/test-categ_none.c: New file.
+	* tests/unictype/test-categ_of.c: New file.
+	* tests/unictype/test-categ_or.c: New file.
+	* tests/unictype/test-categ_test_withtable.c: New file.
+	* tests/unictype/test-combining.c: New file.
+	* tests/unictype/test-decdigit.c: New file.
+	* tests/unictype/test-digit.c: New file.
+	* tests/unictype/test-mirror.c: New file.
+	* tests/unictype/test-numeric.c: New file.
+	* tests/unictype/test-pr_byname.c: New file.
+	* tests/unictype/test-pr_test.c: New file.
+	* tests/unictype/test-predicate-part1.h: New file.
+	* tests/unictype/test-predicate-part2.h: New file.
+	* tests/unictype/test-scripts.c: New file.
+	* tests/unictype/test-sy_c_ident.c: New file.
+	* tests/unictype/test-sy_java_ident.c: New file.
+
+	* tests/unictype/test-categ_C.c: New file, generated by gen-ctype.c
+	for Unicode 5.0.0.
+	* tests/unictype/test-categ_Cc.c: Likewise.
+	* tests/unictype/test-categ_Cf.c: Likewise.
+	* tests/unictype/test-categ_Cn.c: Likewise.
+	* tests/unictype/test-categ_Co.c: Likewise.
+	* tests/unictype/test-categ_Cs.c: Likewise.
+	* tests/unictype/test-categ_L.c: Likewise.
+	* tests/unictype/test-categ_Ll.c: Likewise.
+	* tests/unictype/test-categ_Lm.c: Likewise.
+	* tests/unictype/test-categ_Lo.c: Likewise.
+	* tests/unictype/test-categ_Lt.c: Likewise.
+	* tests/unictype/test-categ_Lu.c: Likewise.
+	* tests/unictype/test-categ_M.c: Likewise.
+	* tests/unictype/test-categ_Mc.c: Likewise.
+	* tests/unictype/test-categ_Me.c: Likewise.
+	* tests/unictype/test-categ_Mn.c: Likewise.
+	* tests/unictype/test-categ_N.c: Likewise.
+	* tests/unictype/test-categ_Nd.c: Likewise.
+	* tests/unictype/test-categ_Nl.c: Likewise.
+	* tests/unictype/test-categ_No.c: Likewise.
+	* tests/unictype/test-categ_P.c: Likewise.
+	* tests/unictype/test-categ_Pc.c: Likewise.
+	* tests/unictype/test-categ_Pd.c: Likewise.
+	* tests/unictype/test-categ_Pe.c: Likewise.
+	* tests/unictype/test-categ_Pf.c: Likewise.
+	* tests/unictype/test-categ_Pi.c: Likewise.
+	* tests/unictype/test-categ_Po.c: Likewise.
+	* tests/unictype/test-categ_Ps.c: Likewise.
+	* tests/unictype/test-categ_S.c: Likewise.
+	* tests/unictype/test-categ_Sc.c: Likewise.
+	* tests/unictype/test-categ_Sk.c: Likewise.
+	* tests/unictype/test-categ_Sm.c: Likewise.
+	* tests/unictype/test-categ_So.c: Likewise.
+	* tests/unictype/test-categ_Z.c: Likewise.
+	* tests/unictype/test-categ_Zl.c: Likewise.
+	* tests/unictype/test-categ_Zp.c: Likewise.
+	* tests/unictype/test-categ_Zs.c: Likewise.
+	* tests/unictype/test-ctype_alnum.c: Likewise.
+	* tests/unictype/test-ctype_alpha.c: Likewise.
+	* tests/unictype/test-ctype_blank.c: Likewise.
+	* tests/unictype/test-ctype_cntrl.c: Likewise.
+	* tests/unictype/test-ctype_digit.c: Likewise.
+	* tests/unictype/test-ctype_graph.c: Likewise.
+	* tests/unictype/test-ctype_lower.c: Likewise.
+	* tests/unictype/test-ctype_print.c: Likewise.
+	* tests/unictype/test-ctype_punct.c: Likewise.
+	* tests/unictype/test-ctype_space.c: Likewise.
+	* tests/unictype/test-ctype_upper.c: Likewise.
+	* tests/unictype/test-ctype_xdigit.c: Likewise.
+	* tests/unictype/test-decdigit.h: Likewise.
+	* tests/unictype/test-digit.h: Likewise.
+	* tests/unictype/test-numeric.h: Likewise.
+	* tests/unictype/test-pr_alphabetic.c: Likewise.
+	* tests/unictype/test-pr_ascii_hex_digit.c: Likewise.
+	* tests/unictype/test-pr_bidi_arabic_digit.c: Likewise.
+	* tests/unictype/test-pr_bidi_arabic_right_to_left.c: Likewise.
+	* tests/unictype/test-pr_bidi_block_separator.c: Likewise.
+	* tests/unictype/test-pr_bidi_boundary_neutral.c: Likewise.
+	* tests/unictype/test-pr_bidi_common_separator.c: Likewise.
+	* tests/unictype/test-pr_bidi_control.c: Likewise.
+	* tests/unictype/test-pr_bidi_embedding_or_override.c: Likewise.
+	* tests/unictype/test-pr_bidi_eur_num_separator.c: Likewise.
+	* tests/unictype/test-pr_bidi_eur_num_terminator.c: Likewise.
+	* tests/unictype/test-pr_bidi_european_digit.c: Likewise.
+	* tests/unictype/test-pr_bidi_hebrew_right_to_left.c: Likewise.
+	* tests/unictype/test-pr_bidi_left_to_right.c: Likewise.
+	* tests/unictype/test-pr_bidi_non_spacing_mark.c: Likewise.
+	* tests/unictype/test-pr_bidi_other_neutral.c: Likewise.
+	* tests/unictype/test-pr_bidi_pdf.c: Likewise.
+	* tests/unictype/test-pr_bidi_segment_separator.c: Likewise.
+	* tests/unictype/test-pr_bidi_whitespace.c: Likewise.
+	* tests/unictype/test-pr_combining.c: Likewise.
+	* tests/unictype/test-pr_composite.c: Likewise.
+	* tests/unictype/test-pr_currency_symbol.c: Likewise.
+	* tests/unictype/test-pr_dash.c: Likewise.
+	* tests/unictype/test-pr_decimal_digit.c: Likewise.
+	* tests/unictype/test-pr_default_ignorable_code_point.c: Likewise.
+	* tests/unictype/test-pr_deprecated.c: Likewise.
+	* tests/unictype/test-pr_diacritic.c: Likewise.
+	* tests/unictype/test-pr_extender.c: Likewise.
+	* tests/unictype/test-pr_format_control.c: Likewise.
+	* tests/unictype/test-pr_grapheme_base.c: Likewise.
+	* tests/unictype/test-pr_grapheme_extend.c: Likewise.
+	* tests/unictype/test-pr_grapheme_link.c: Likewise.
+	* tests/unictype/test-pr_hex_digit.c: Likewise.
+	* tests/unictype/test-pr_hyphen.c: Likewise.
+	* tests/unictype/test-pr_id_continue.c: Likewise.
+	* tests/unictype/test-pr_id_start.c: Likewise.
+	* tests/unictype/test-pr_ideographic.c: Likewise.
+	* tests/unictype/test-pr_ids_binary_operator.c: Likewise.
+	* tests/unictype/test-pr_ids_trinary_operator.c: Likewise.
+	* tests/unictype/test-pr_ignorable_control.c: Likewise.
+	* tests/unictype/test-pr_iso_control.c: Likewise.
+	* tests/unictype/test-pr_join_control.c: Likewise.
+	* tests/unictype/test-pr_left_of_pair.c: Likewise.
+	* tests/unictype/test-pr_line_separator.c: Likewise.
+	* tests/unictype/test-pr_logical_order_exception.c: Likewise.
+	* tests/unictype/test-pr_lowercase.c: Likewise.
+	* tests/unictype/test-pr_math.c: Likewise.
+	* tests/unictype/test-pr_non_break.c: Likewise.
+	* tests/unictype/test-pr_not_a_character.c: Likewise.
+	* tests/unictype/test-pr_numeric.c: Likewise.
+	* tests/unictype/test-pr_other_alphabetic.c: Likewise.
+	* tests/unictype/test-pr_other_default_ignorable_code_point.c: Likewise.
+	* tests/unictype/test-pr_other_grapheme_extend.c: Likewise.
+	* tests/unictype/test-pr_other_id_continue.c: Likewise.
+	* tests/unictype/test-pr_other_id_start.c: Likewise.
+	* tests/unictype/test-pr_other_lowercase.c: Likewise.
+	* tests/unictype/test-pr_other_math.c: Likewise.
+	* tests/unictype/test-pr_other_uppercase.c: Likewise.
+	* tests/unictype/test-pr_paired_punctuation.c: Likewise.
+	* tests/unictype/test-pr_paragraph_separator.c: Likewise.
+	* tests/unictype/test-pr_pattern_syntax.c: Likewise.
+	* tests/unictype/test-pr_pattern_white_space.c: Likewise.
+	* tests/unictype/test-pr_private_use.c: Likewise.
+	* tests/unictype/test-pr_punctuation.c: Likewise.
+	* tests/unictype/test-pr_quotation_mark.c: Likewise.
+	* tests/unictype/test-pr_radical.c: Likewise.
+	* tests/unictype/test-pr_sentence_terminal.c: Likewise.
+	* tests/unictype/test-pr_soft_dotted.c: Likewise.
+	* tests/unictype/test-pr_space.c: Likewise.
+	* tests/unictype/test-pr_terminal_punctuation.c: Likewise.
+	* tests/unictype/test-pr_titlecase.c: Likewise.
+	* tests/unictype/test-pr_unassigned_code_value.c: Likewise.
+	* tests/unictype/test-pr_unified_ideograph.c: Likewise.
+	* tests/unictype/test-pr_uppercase.c: Likewise.
+	* tests/unictype/test-pr_variation_selector.c: Likewise.
+	* tests/unictype/test-pr_white_space.c: Likewise.
+	* tests/unictype/test-pr_xid_continue.c: Likewise.
+	* tests/unictype/test-pr_xid_start.c: Likewise.
+	* tests/unictype/test-pr_zero_width.c: Likewise.
+	* tests/unictype/test-sy_c_whitespace.c: Likewise.
+	* tests/unictype/test-sy_java_whitespace.c: Likewise.
+
 2007-11-12  Bruno Haible  <bruno@clisp.org>
 
 	Unicode character classification functions.
@@ -323,7 +645,7 @@
 	* lib/unictype/sy_java_ident.c: New file.
 	* lib/unictype/sy_java_whitespace.c: New file.
 
-	* lib/unictype/bidi_of.h: New file, generated from gen-ctype.c for
+	* lib/unictype/bidi_of.h: New file, generated by gen-ctype.c for
 	Unicode 5.0.0.
 	* lib/unictype/blocks.h: Likewise.
 	* lib/unictype/categ_C.h: Likewise.
new file mode 100644
--- /dev/null
+++ b/modules/unictype/bidicategory-byname-tests
@@ -0,0 +1,12 @@
+Files:
+tests/unictype/test-bidi_byname.c
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-bidi_byname
+check_PROGRAMS += test-bidi_byname
+test_bidi_byname_SOURCES = unictype/test-bidi_byname.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/bidicategory-name-tests
@@ -0,0 +1,12 @@
+Files:
+tests/unictype/test-bidi_name.c
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-bidi_name
+check_PROGRAMS += test-bidi_name
+test_bidi_name_SOURCES = unictype/test-bidi_name.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/bidicategory-of-tests
@@ -0,0 +1,12 @@
+Files:
+tests/unictype/test-bidi_of.c
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-bidi_of
+check_PROGRAMS += test-bidi_of
+test_bidi_of_SOURCES = unictype/test-bidi_of.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/bidicategory-test-tests
@@ -0,0 +1,13 @@
+Files:
+tests/unictype/test-bidi_test.c
+
+Depends-on:
+unictype/bidicategory-of
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-bidi_test
+check_PROGRAMS += test-bidi_test
+test_bidi_test_SOURCES = unictype/test-bidi_test.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/block-list-tests
@@ -0,0 +1,12 @@
+Files:
+tests/unictype/test-block_list.c
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-block_list
+check_PROGRAMS += test-block_list
+test_block_list_SOURCES = unictype/test-block_list.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/block-of-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-block_of.c
+
+Depends-on:
+unictype/block-list
+unictype/block-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-block_of
+check_PROGRAMS += test-block_of
+test_block_of_SOURCES = unictype/test-block_of.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/block-test-tests
@@ -0,0 +1,12 @@
+Files:
+tests/unictype/test-block_test.c
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-block_test
+check_PROGRAMS += test-block_test
+test_block_test_SOURCES = unictype/test-block_test.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-C-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_C.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_C
+check_PROGRAMS += test-categ_C
+test_categ_C_SOURCES = unictype/test-categ_C.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Cc-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Cc.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Cc
+check_PROGRAMS += test-categ_Cc
+test_categ_Cc_SOURCES = unictype/test-categ_Cc.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Cf-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Cf.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Cf
+check_PROGRAMS += test-categ_Cf
+test_categ_Cf_SOURCES = unictype/test-categ_Cf.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Cn-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Cn.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Cn
+check_PROGRAMS += test-categ_Cn
+test_categ_Cn_SOURCES = unictype/test-categ_Cn.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Co-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Co.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Co
+check_PROGRAMS += test-categ_Co
+test_categ_Co_SOURCES = unictype/test-categ_Co.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Cs-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Cs.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Cs
+check_PROGRAMS += test-categ_Cs
+test_categ_Cs_SOURCES = unictype/test-categ_Cs.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-L-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_L.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_L
+check_PROGRAMS += test-categ_L
+test_categ_L_SOURCES = unictype/test-categ_L.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Ll-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Ll.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Ll
+check_PROGRAMS += test-categ_Ll
+test_categ_Ll_SOURCES = unictype/test-categ_Ll.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Lm-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Lm.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Lm
+check_PROGRAMS += test-categ_Lm
+test_categ_Lm_SOURCES = unictype/test-categ_Lm.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Lo-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Lo.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Lo
+check_PROGRAMS += test-categ_Lo
+test_categ_Lo_SOURCES = unictype/test-categ_Lo.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Lt-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Lt.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Lt
+check_PROGRAMS += test-categ_Lt
+test_categ_Lt_SOURCES = unictype/test-categ_Lt.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Lu-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Lu.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Lu
+check_PROGRAMS += test-categ_Lu
+test_categ_Lu_SOURCES = unictype/test-categ_Lu.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-M-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_M.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_M
+check_PROGRAMS += test-categ_M
+test_categ_M_SOURCES = unictype/test-categ_M.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Mc-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Mc.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Mc
+check_PROGRAMS += test-categ_Mc
+test_categ_Mc_SOURCES = unictype/test-categ_Mc.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Me-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Me.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Me
+check_PROGRAMS += test-categ_Me
+test_categ_Me_SOURCES = unictype/test-categ_Me.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Mn-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Mn.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Mn
+check_PROGRAMS += test-categ_Mn
+test_categ_Mn_SOURCES = unictype/test-categ_Mn.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-N-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_N.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_N
+check_PROGRAMS += test-categ_N
+test_categ_N_SOURCES = unictype/test-categ_N.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Nd-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Nd.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Nd
+check_PROGRAMS += test-categ_Nd
+test_categ_Nd_SOURCES = unictype/test-categ_Nd.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Nl-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Nl.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Nl
+check_PROGRAMS += test-categ_Nl
+test_categ_Nl_SOURCES = unictype/test-categ_Nl.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-No-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_No.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_No
+check_PROGRAMS += test-categ_No
+test_categ_No_SOURCES = unictype/test-categ_No.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-P-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_P.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_P
+check_PROGRAMS += test-categ_P
+test_categ_P_SOURCES = unictype/test-categ_P.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Pc-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Pc.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Pc
+check_PROGRAMS += test-categ_Pc
+test_categ_Pc_SOURCES = unictype/test-categ_Pc.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Pd-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Pd.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Pd
+check_PROGRAMS += test-categ_Pd
+test_categ_Pd_SOURCES = unictype/test-categ_Pd.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Pe-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Pe.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Pe
+check_PROGRAMS += test-categ_Pe
+test_categ_Pe_SOURCES = unictype/test-categ_Pe.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Pf-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Pf.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Pf
+check_PROGRAMS += test-categ_Pf
+test_categ_Pf_SOURCES = unictype/test-categ_Pf.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Pi-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Pi.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Pi
+check_PROGRAMS += test-categ_Pi
+test_categ_Pi_SOURCES = unictype/test-categ_Pi.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Po-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Po.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Po
+check_PROGRAMS += test-categ_Po
+test_categ_Po_SOURCES = unictype/test-categ_Po.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Ps-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Ps.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Ps
+check_PROGRAMS += test-categ_Ps
+test_categ_Ps_SOURCES = unictype/test-categ_Ps.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-S-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_S.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_S
+check_PROGRAMS += test-categ_S
+test_categ_S_SOURCES = unictype/test-categ_S.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Sc-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Sc.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Sc
+check_PROGRAMS += test-categ_Sc
+test_categ_Sc_SOURCES = unictype/test-categ_Sc.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Sk-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Sk.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Sk
+check_PROGRAMS += test-categ_Sk
+test_categ_Sk_SOURCES = unictype/test-categ_Sk.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Sm-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Sm.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Sm
+check_PROGRAMS += test-categ_Sm
+test_categ_Sm_SOURCES = unictype/test-categ_Sm.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-So-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_So.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_So
+check_PROGRAMS += test-categ_So
+test_categ_So_SOURCES = unictype/test-categ_So.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Z-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Z.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Z
+check_PROGRAMS += test-categ_Z
+test_categ_Z_SOURCES = unictype/test-categ_Z.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Zl-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Zl.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Zl
+check_PROGRAMS += test-categ_Zl
+test_categ_Zl_SOURCES = unictype/test-categ_Zl.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Zp-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Zp.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Zp
+check_PROGRAMS += test-categ_Zp
+test_categ_Zp_SOURCES = unictype/test-categ_Zp.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-Zs-tests
@@ -0,0 +1,15 @@
+Files:
+tests/unictype/test-categ_Zs.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_Zs
+check_PROGRAMS += test-categ_Zs
+test_categ_Zs_SOURCES = unictype/test-categ_Zs.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-and-not-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-categ_and_not.c
+
+Depends-on:
+unictype/category-or
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_and_not
+check_PROGRAMS += test-categ_and_not
+test_categ_and_not_SOURCES = unictype/test-categ_and_not.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-and-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-categ_and.c
+
+Depends-on:
+unictype/category-or
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_and
+check_PROGRAMS += test-categ_and
+test_categ_and_SOURCES = unictype/test-categ_and.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-byname-tests
@@ -0,0 +1,13 @@
+Files:
+tests/unictype/test-categ_byname.c
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_byname
+check_PROGRAMS += test-categ_byname
+test_categ_byname_SOURCES = unictype/test-categ_byname.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-name-tests
@@ -0,0 +1,13 @@
+Files:
+tests/unictype/test-categ_name.c
+
+Depends-on:
+unictype/category-or
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_name
+check_PROGRAMS += test-categ_name
+test_categ_name_SOURCES = unictype/test-categ_name.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-none-tests
@@ -0,0 +1,13 @@
+Files:
+tests/unictype/test-categ_none.c
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_none
+check_PROGRAMS += test-categ_none
+test_categ_none_SOURCES = unictype/test-categ_none.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-of-tests
@@ -0,0 +1,13 @@
+Files:
+tests/unictype/test-categ_of.c
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_of
+check_PROGRAMS += test-categ_of
+test_categ_of_SOURCES = unictype/test-categ_of.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-or-tests
@@ -0,0 +1,13 @@
+Files:
+tests/unictype/test-categ_or.c
+
+Depends-on:
+unictype/category-test
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_or
+check_PROGRAMS += test-categ_or
+test_categ_or_SOURCES = unictype/test-categ_or.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/category-test-withtable-tests
@@ -0,0 +1,12 @@
+Files:
+tests/unictype/test-categ_test_withtable.c
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-categ_test_withtable
+check_PROGRAMS += test-categ_test_withtable
+test_categ_test_withtable_SOURCES = unictype/test-categ_test_withtable.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/combining-class-tests
@@ -0,0 +1,12 @@
+Files:
+tests/unictype/test-combining.c
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-combining
+check_PROGRAMS += test-combining
+test_combining_SOURCES = unictype/test-combining.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/ctype-alnum-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-ctype_alnum.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-ctype_alnum
+check_PROGRAMS += test-ctype_alnum
+test_ctype_alnum_SOURCES = unictype/test-ctype_alnum.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/ctype-alpha-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-ctype_alpha.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-ctype_alpha
+check_PROGRAMS += test-ctype_alpha
+test_ctype_alpha_SOURCES = unictype/test-ctype_alpha.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/ctype-blank-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-ctype_blank.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-ctype_blank
+check_PROGRAMS += test-ctype_blank
+test_ctype_blank_SOURCES = unictype/test-ctype_blank.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/ctype-cntrl-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-ctype_cntrl.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-ctype_cntrl
+check_PROGRAMS += test-ctype_cntrl
+test_ctype_cntrl_SOURCES = unictype/test-ctype_cntrl.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/ctype-digit-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-ctype_digit.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-ctype_digit
+check_PROGRAMS += test-ctype_digit
+test_ctype_digit_SOURCES = unictype/test-ctype_digit.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/ctype-graph-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-ctype_graph.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-ctype_graph
+check_PROGRAMS += test-ctype_graph
+test_ctype_graph_SOURCES = unictype/test-ctype_graph.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/ctype-lower-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-ctype_lower.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-ctype_lower
+check_PROGRAMS += test-ctype_lower
+test_ctype_lower_SOURCES = unictype/test-ctype_lower.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/ctype-print-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-ctype_print.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-ctype_print
+check_PROGRAMS += test-ctype_print
+test_ctype_print_SOURCES = unictype/test-ctype_print.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/ctype-punct-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-ctype_punct.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-ctype_punct
+check_PROGRAMS += test-ctype_punct
+test_ctype_punct_SOURCES = unictype/test-ctype_punct.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/ctype-space-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-ctype_space.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-ctype_space
+check_PROGRAMS += test-ctype_space
+test_ctype_space_SOURCES = unictype/test-ctype_space.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/ctype-upper-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-ctype_upper.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-ctype_upper
+check_PROGRAMS += test-ctype_upper
+test_ctype_upper_SOURCES = unictype/test-ctype_upper.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/ctype-xdigit-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-ctype_xdigit.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-ctype_xdigit
+check_PROGRAMS += test-ctype_xdigit
+test_ctype_xdigit_SOURCES = unictype/test-ctype_xdigit.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/decimal-digit-tests
@@ -0,0 +1,13 @@
+Files:
+tests/unictype/test-decdigit.c
+tests/unictype/test-decdigit.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-decdigit
+check_PROGRAMS += test-decdigit
+test_decdigit_SOURCES = unictype/test-decdigit.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/digit-tests
@@ -0,0 +1,13 @@
+Files:
+tests/unictype/test-digit.c
+tests/unictype/test-digit.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-digit
+check_PROGRAMS += test-digit
+test_digit_SOURCES = unictype/test-digit.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/mirror-tests
@@ -0,0 +1,12 @@
+Files:
+tests/unictype/test-mirror.c
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-mirror
+check_PROGRAMS += test-mirror
+test_mirror_SOURCES = unictype/test-mirror.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/numeric-tests
@@ -0,0 +1,13 @@
+Files:
+tests/unictype/test-numeric.c
+tests/unictype/test-numeric.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-numeric
+check_PROGRAMS += test-numeric
+test_numeric_SOURCES = unictype/test-numeric.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-alphabetic-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_alphabetic.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_alphabetic
+check_PROGRAMS += test-pr_alphabetic
+test_pr_alphabetic_SOURCES = unictype/test-pr_alphabetic.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-ascii-hex-digit-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_ascii_hex_digit.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_ascii_hex_digit
+check_PROGRAMS += test-pr_ascii_hex_digit
+test_pr_ascii_hex_digit_SOURCES = unictype/test-pr_ascii_hex_digit.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-bidi-arabic-digit-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_bidi_arabic_digit.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_bidi_arabic_digit
+check_PROGRAMS += test-pr_bidi_arabic_digit
+test_pr_bidi_arabic_digit_SOURCES = unictype/test-pr_bidi_arabic_digit.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-bidi-arabic-right-to-left-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_bidi_arabic_right_to_left.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_bidi_arabic_right_to_left
+check_PROGRAMS += test-pr_bidi_arabic_right_to_left
+test_pr_bidi_arabic_right_to_left_SOURCES = unictype/test-pr_bidi_arabic_right_to_left.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-bidi-block-separator-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_bidi_block_separator.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_bidi_block_separator
+check_PROGRAMS += test-pr_bidi_block_separator
+test_pr_bidi_block_separator_SOURCES = unictype/test-pr_bidi_block_separator.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-bidi-boundary-neutral-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_bidi_boundary_neutral.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_bidi_boundary_neutral
+check_PROGRAMS += test-pr_bidi_boundary_neutral
+test_pr_bidi_boundary_neutral_SOURCES = unictype/test-pr_bidi_boundary_neutral.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-bidi-common-separator-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_bidi_common_separator.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_bidi_common_separator
+check_PROGRAMS += test-pr_bidi_common_separator
+test_pr_bidi_common_separator_SOURCES = unictype/test-pr_bidi_common_separator.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-bidi-control-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_bidi_control.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_bidi_control
+check_PROGRAMS += test-pr_bidi_control
+test_pr_bidi_control_SOURCES = unictype/test-pr_bidi_control.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-bidi-embedding-or-override-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_bidi_embedding_or_override.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_bidi_embedding_or_override
+check_PROGRAMS += test-pr_bidi_embedding_or_override
+test_pr_bidi_embedding_or_override_SOURCES = unictype/test-pr_bidi_embedding_or_override.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-bidi-eur-num-separator-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_bidi_eur_num_separator.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_bidi_eur_num_separator
+check_PROGRAMS += test-pr_bidi_eur_num_separator
+test_pr_bidi_eur_num_separator_SOURCES = unictype/test-pr_bidi_eur_num_separator.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-bidi-eur-num-terminator-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_bidi_eur_num_terminator.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_bidi_eur_num_terminator
+check_PROGRAMS += test-pr_bidi_eur_num_terminator
+test_pr_bidi_eur_num_terminator_SOURCES = unictype/test-pr_bidi_eur_num_terminator.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-bidi-european-digit-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_bidi_european_digit.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_bidi_european_digit
+check_PROGRAMS += test-pr_bidi_european_digit
+test_pr_bidi_european_digit_SOURCES = unictype/test-pr_bidi_european_digit.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-bidi-hebrew-right-to-left-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_bidi_hebrew_right_to_left.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_bidi_hebrew_right_to_left
+check_PROGRAMS += test-pr_bidi_hebrew_right_to_left
+test_pr_bidi_hebrew_right_to_left_SOURCES = unictype/test-pr_bidi_hebrew_right_to_left.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-bidi-left-to-right-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_bidi_left_to_right.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_bidi_left_to_right
+check_PROGRAMS += test-pr_bidi_left_to_right
+test_pr_bidi_left_to_right_SOURCES = unictype/test-pr_bidi_left_to_right.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-bidi-non-spacing-mark-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_bidi_non_spacing_mark.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_bidi_non_spacing_mark
+check_PROGRAMS += test-pr_bidi_non_spacing_mark
+test_pr_bidi_non_spacing_mark_SOURCES = unictype/test-pr_bidi_non_spacing_mark.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-bidi-other-neutral-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_bidi_other_neutral.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_bidi_other_neutral
+check_PROGRAMS += test-pr_bidi_other_neutral
+test_pr_bidi_other_neutral_SOURCES = unictype/test-pr_bidi_other_neutral.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-bidi-pdf-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_bidi_pdf.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_bidi_pdf
+check_PROGRAMS += test-pr_bidi_pdf
+test_pr_bidi_pdf_SOURCES = unictype/test-pr_bidi_pdf.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-bidi-segment-separator-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_bidi_segment_separator.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_bidi_segment_separator
+check_PROGRAMS += test-pr_bidi_segment_separator
+test_pr_bidi_segment_separator_SOURCES = unictype/test-pr_bidi_segment_separator.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-bidi-whitespace-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_bidi_whitespace.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_bidi_whitespace
+check_PROGRAMS += test-pr_bidi_whitespace
+test_pr_bidi_whitespace_SOURCES = unictype/test-pr_bidi_whitespace.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-byname-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_byname.c
+
+Depends-on:
+unictype/property-test
+unictype/property-composite
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_byname
+check_PROGRAMS += test-pr_byname
+test_pr_byname_SOURCES = unictype/test-pr_byname.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-combining-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_combining.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_combining
+check_PROGRAMS += test-pr_combining
+test_pr_combining_SOURCES = unictype/test-pr_combining.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-composite-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_composite.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_composite
+check_PROGRAMS += test-pr_composite
+test_pr_composite_SOURCES = unictype/test-pr_composite.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-currency-symbol-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_currency_symbol.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_currency_symbol
+check_PROGRAMS += test-pr_currency_symbol
+test_pr_currency_symbol_SOURCES = unictype/test-pr_currency_symbol.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-dash-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_dash.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_dash
+check_PROGRAMS += test-pr_dash
+test_pr_dash_SOURCES = unictype/test-pr_dash.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-decimal-digit-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_decimal_digit.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_decimal_digit
+check_PROGRAMS += test-pr_decimal_digit
+test_pr_decimal_digit_SOURCES = unictype/test-pr_decimal_digit.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-default-ignorable-code-point-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_default_ignorable_code_point.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_default_ignorable_code_point
+check_PROGRAMS += test-pr_default_ignorable_code_point
+test_pr_default_ignorable_code_point_SOURCES = unictype/test-pr_default_ignorable_code_point.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-deprecated-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_deprecated.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_deprecated
+check_PROGRAMS += test-pr_deprecated
+test_pr_deprecated_SOURCES = unictype/test-pr_deprecated.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-diacritic-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_diacritic.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_diacritic
+check_PROGRAMS += test-pr_diacritic
+test_pr_diacritic_SOURCES = unictype/test-pr_diacritic.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-extender-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_extender.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_extender
+check_PROGRAMS += test-pr_extender
+test_pr_extender_SOURCES = unictype/test-pr_extender.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-format-control-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_format_control.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_format_control
+check_PROGRAMS += test-pr_format_control
+test_pr_format_control_SOURCES = unictype/test-pr_format_control.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-grapheme-base-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_grapheme_base.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_grapheme_base
+check_PROGRAMS += test-pr_grapheme_base
+test_pr_grapheme_base_SOURCES = unictype/test-pr_grapheme_base.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-grapheme-extend-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_grapheme_extend.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_grapheme_extend
+check_PROGRAMS += test-pr_grapheme_extend
+test_pr_grapheme_extend_SOURCES = unictype/test-pr_grapheme_extend.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-grapheme-link-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_grapheme_link.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_grapheme_link
+check_PROGRAMS += test-pr_grapheme_link
+test_pr_grapheme_link_SOURCES = unictype/test-pr_grapheme_link.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-hex-digit-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_hex_digit.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_hex_digit
+check_PROGRAMS += test-pr_hex_digit
+test_pr_hex_digit_SOURCES = unictype/test-pr_hex_digit.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-hyphen-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_hyphen.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_hyphen
+check_PROGRAMS += test-pr_hyphen
+test_pr_hyphen_SOURCES = unictype/test-pr_hyphen.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-id-continue-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_id_continue.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_id_continue
+check_PROGRAMS += test-pr_id_continue
+test_pr_id_continue_SOURCES = unictype/test-pr_id_continue.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-id-start-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_id_start.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_id_start
+check_PROGRAMS += test-pr_id_start
+test_pr_id_start_SOURCES = unictype/test-pr_id_start.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-ideographic-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_ideographic.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_ideographic
+check_PROGRAMS += test-pr_ideographic
+test_pr_ideographic_SOURCES = unictype/test-pr_ideographic.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-ids-binary-operator-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_ids_binary_operator.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_ids_binary_operator
+check_PROGRAMS += test-pr_ids_binary_operator
+test_pr_ids_binary_operator_SOURCES = unictype/test-pr_ids_binary_operator.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-ids-trinary-operator-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_ids_trinary_operator.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_ids_trinary_operator
+check_PROGRAMS += test-pr_ids_trinary_operator
+test_pr_ids_trinary_operator_SOURCES = unictype/test-pr_ids_trinary_operator.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-ignorable-control-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_ignorable_control.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_ignorable_control
+check_PROGRAMS += test-pr_ignorable_control
+test_pr_ignorable_control_SOURCES = unictype/test-pr_ignorable_control.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-iso-control-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_iso_control.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_iso_control
+check_PROGRAMS += test-pr_iso_control
+test_pr_iso_control_SOURCES = unictype/test-pr_iso_control.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-join-control-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_join_control.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_join_control
+check_PROGRAMS += test-pr_join_control
+test_pr_join_control_SOURCES = unictype/test-pr_join_control.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-left-of-pair-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_left_of_pair.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_left_of_pair
+check_PROGRAMS += test-pr_left_of_pair
+test_pr_left_of_pair_SOURCES = unictype/test-pr_left_of_pair.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-line-separator-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_line_separator.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_line_separator
+check_PROGRAMS += test-pr_line_separator
+test_pr_line_separator_SOURCES = unictype/test-pr_line_separator.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-logical-order-exception-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_logical_order_exception.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_logical_order_exception
+check_PROGRAMS += test-pr_logical_order_exception
+test_pr_logical_order_exception_SOURCES = unictype/test-pr_logical_order_exception.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-lowercase-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_lowercase.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_lowercase
+check_PROGRAMS += test-pr_lowercase
+test_pr_lowercase_SOURCES = unictype/test-pr_lowercase.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-math-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_math.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_math
+check_PROGRAMS += test-pr_math
+test_pr_math_SOURCES = unictype/test-pr_math.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-non-break-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_non_break.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_non_break
+check_PROGRAMS += test-pr_non_break
+test_pr_non_break_SOURCES = unictype/test-pr_non_break.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-not-a-character-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_not_a_character.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_not_a_character
+check_PROGRAMS += test-pr_not_a_character
+test_pr_not_a_character_SOURCES = unictype/test-pr_not_a_character.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-numeric-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_numeric.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_numeric
+check_PROGRAMS += test-pr_numeric
+test_pr_numeric_SOURCES = unictype/test-pr_numeric.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-other-alphabetic-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_other_alphabetic.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_other_alphabetic
+check_PROGRAMS += test-pr_other_alphabetic
+test_pr_other_alphabetic_SOURCES = unictype/test-pr_other_alphabetic.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-other-default-ignorable-code-point-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_other_default_ignorable_code_point.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_other_default_ignorable_code_point
+check_PROGRAMS += test-pr_other_default_ignorable_code_point
+test_pr_other_default_ignorable_code_point_SOURCES = unictype/test-pr_other_default_ignorable_code_point.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-other-grapheme-extend-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_other_grapheme_extend.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_other_grapheme_extend
+check_PROGRAMS += test-pr_other_grapheme_extend
+test_pr_other_grapheme_extend_SOURCES = unictype/test-pr_other_grapheme_extend.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-other-id-continue-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_other_id_continue.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_other_id_continue
+check_PROGRAMS += test-pr_other_id_continue
+test_pr_other_id_continue_SOURCES = unictype/test-pr_other_id_continue.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-other-id-start-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_other_id_start.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_other_id_start
+check_PROGRAMS += test-pr_other_id_start
+test_pr_other_id_start_SOURCES = unictype/test-pr_other_id_start.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-other-lowercase-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_other_lowercase.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_other_lowercase
+check_PROGRAMS += test-pr_other_lowercase
+test_pr_other_lowercase_SOURCES = unictype/test-pr_other_lowercase.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-other-math-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_other_math.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_other_math
+check_PROGRAMS += test-pr_other_math
+test_pr_other_math_SOURCES = unictype/test-pr_other_math.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-other-uppercase-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_other_uppercase.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_other_uppercase
+check_PROGRAMS += test-pr_other_uppercase
+test_pr_other_uppercase_SOURCES = unictype/test-pr_other_uppercase.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-paired-punctuation-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_paired_punctuation.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_paired_punctuation
+check_PROGRAMS += test-pr_paired_punctuation
+test_pr_paired_punctuation_SOURCES = unictype/test-pr_paired_punctuation.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-paragraph-separator-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_paragraph_separator.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_paragraph_separator
+check_PROGRAMS += test-pr_paragraph_separator
+test_pr_paragraph_separator_SOURCES = unictype/test-pr_paragraph_separator.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-pattern-syntax-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_pattern_syntax.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_pattern_syntax
+check_PROGRAMS += test-pr_pattern_syntax
+test_pr_pattern_syntax_SOURCES = unictype/test-pr_pattern_syntax.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-pattern-white-space-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_pattern_white_space.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_pattern_white_space
+check_PROGRAMS += test-pr_pattern_white_space
+test_pr_pattern_white_space_SOURCES = unictype/test-pr_pattern_white_space.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-private-use-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_private_use.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_private_use
+check_PROGRAMS += test-pr_private_use
+test_pr_private_use_SOURCES = unictype/test-pr_private_use.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-punctuation-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_punctuation.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_punctuation
+check_PROGRAMS += test-pr_punctuation
+test_pr_punctuation_SOURCES = unictype/test-pr_punctuation.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-quotation-mark-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_quotation_mark.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_quotation_mark
+check_PROGRAMS += test-pr_quotation_mark
+test_pr_quotation_mark_SOURCES = unictype/test-pr_quotation_mark.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-radical-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_radical.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_radical
+check_PROGRAMS += test-pr_radical
+test_pr_radical_SOURCES = unictype/test-pr_radical.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-sentence-terminal-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_sentence_terminal.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_sentence_terminal
+check_PROGRAMS += test-pr_sentence_terminal
+test_pr_sentence_terminal_SOURCES = unictype/test-pr_sentence_terminal.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-soft-dotted-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_soft_dotted.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_soft_dotted
+check_PROGRAMS += test-pr_soft_dotted
+test_pr_soft_dotted_SOURCES = unictype/test-pr_soft_dotted.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-space-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_space.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_space
+check_PROGRAMS += test-pr_space
+test_pr_space_SOURCES = unictype/test-pr_space.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-terminal-punctuation-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_terminal_punctuation.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_terminal_punctuation
+check_PROGRAMS += test-pr_terminal_punctuation
+test_pr_terminal_punctuation_SOURCES = unictype/test-pr_terminal_punctuation.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-test-tests
@@ -0,0 +1,13 @@
+Files:
+tests/unictype/test-pr_test.c
+
+Depends-on:
+unictype/property-composite
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_test
+check_PROGRAMS += test-pr_test
+test_pr_test_SOURCES = unictype/test-pr_test.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-titlecase-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_titlecase.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_titlecase
+check_PROGRAMS += test-pr_titlecase
+test_pr_titlecase_SOURCES = unictype/test-pr_titlecase.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-unassigned-code-value-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_unassigned_code_value.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_unassigned_code_value
+check_PROGRAMS += test-pr_unassigned_code_value
+test_pr_unassigned_code_value_SOURCES = unictype/test-pr_unassigned_code_value.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-unified-ideograph-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_unified_ideograph.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_unified_ideograph
+check_PROGRAMS += test-pr_unified_ideograph
+test_pr_unified_ideograph_SOURCES = unictype/test-pr_unified_ideograph.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-uppercase-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_uppercase.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_uppercase
+check_PROGRAMS += test-pr_uppercase
+test_pr_uppercase_SOURCES = unictype/test-pr_uppercase.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-variation-selector-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_variation_selector.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_variation_selector
+check_PROGRAMS += test-pr_variation_selector
+test_pr_variation_selector_SOURCES = unictype/test-pr_variation_selector.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-white-space-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_white_space.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_white_space
+check_PROGRAMS += test-pr_white_space
+test_pr_white_space_SOURCES = unictype/test-pr_white_space.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-xid-continue-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_xid_continue.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_xid_continue
+check_PROGRAMS += test-pr_xid_continue
+test_pr_xid_continue_SOURCES = unictype/test-pr_xid_continue.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-xid-start-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_xid_start.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_xid_start
+check_PROGRAMS += test-pr_xid_start
+test_pr_xid_start_SOURCES = unictype/test-pr_xid_start.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/property-zero-width-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-pr_zero_width.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-pr_zero_width
+check_PROGRAMS += test-pr_zero_width
+test_pr_zero_width_SOURCES = unictype/test-pr_zero_width.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/scripts-tests
@@ -0,0 +1,12 @@
+Files:
+tests/unictype/test-scripts.c
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-scripts
+check_PROGRAMS += test-scripts
+test_scripts_SOURCES = unictype/test-scripts.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/syntax-c-ident-tests
@@ -0,0 +1,12 @@
+Files:
+tests/unictype/test-sy_c_ident.c
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-sy_c_ident
+check_PROGRAMS += test-sy_c_ident
+test_sy_c_ident_SOURCES = unictype/test-sy_c_ident.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/syntax-c-whitespace-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-sy_c_whitespace.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-sy_c_whitespace
+check_PROGRAMS += test-sy_c_whitespace
+test_sy_c_whitespace_SOURCES = unictype/test-sy_c_whitespace.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/syntax-java-ident-tests
@@ -0,0 +1,12 @@
+Files:
+tests/unictype/test-sy_java_ident.c
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-sy_java_ident
+check_PROGRAMS += test-sy_java_ident
+test_sy_java_ident_SOURCES = unictype/test-sy_java_ident.c
+
new file mode 100644
--- /dev/null
+++ b/modules/unictype/syntax-java-whitespace-tests
@@ -0,0 +1,14 @@
+Files:
+tests/unictype/test-sy_java_whitespace.c
+tests/unictype/test-predicate-part1.h
+tests/unictype/test-predicate-part2.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-sy_java_whitespace
+check_PROGRAMS += test-sy_java_whitespace
+test_sy_java_whitespace_SOURCES = unictype/test-sy_java_whitespace.c
+
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-bidi_byname.c
@@ -0,0 +1,43 @@
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "unictype.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+
+int
+main ()
+{
+  ASSERT (uc_bidi_category_byname ("NSM") == UC_BIDI_NSM);
+  ASSERT (uc_bidi_category_byname ("X") < 0);
+
+  return 0;
+}
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-bidi_name.c
@@ -0,0 +1,43 @@
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "unictype.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+
+int
+main ()
+{
+  ASSERT (strcmp (uc_bidi_category_name (UC_BIDI_NSM), "NSM") == 0);
+  ASSERT (uc_bidi_category_name (-1) == NULL);
+
+  return 0;
+}
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-bidi_of.c
@@ -0,0 +1,44 @@
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "unictype.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+
+int
+main ()
+{
+  ASSERT (uc_bidi_category ('x') == UC_BIDI_L);
+  ASSERT (uc_bidi_category (0x05D7) == UC_BIDI_R);
+  ASSERT (uc_bidi_category ('7') == UC_BIDI_EN);
+
+  return 0;
+}
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-bidi_test.c
@@ -0,0 +1,59 @@
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "unictype.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+
+int
+main ()
+{
+  ASSERT (uc_is_bidi_category ('x', UC_BIDI_L));
+  ASSERT (!uc_is_bidi_category ('x', UC_BIDI_R));
+  ASSERT (!uc_is_bidi_category ('x', UC_BIDI_EN));
+
+  ASSERT (uc_is_bidi_category (0x05D7, UC_BIDI_R));
+  ASSERT (!uc_is_bidi_category (0x05D7, UC_BIDI_L));
+  ASSERT (!uc_is_bidi_category (0x05D7, UC_BIDI_EN));
+
+  ASSERT (uc_is_bidi_category ('7', UC_BIDI_EN));
+  ASSERT (!uc_is_bidi_category ('7', UC_BIDI_L));
+  ASSERT (!uc_is_bidi_category ('7', UC_BIDI_R));
+
+  {
+    unsigned int c;
+
+    for (c = 0; c < 0x110000; c++)
+      ASSERT (uc_is_bidi_category (c, uc_bidi_category (c)));
+  }
+
+  return 0;
+}
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-block_list.c
@@ -0,0 +1,61 @@
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "unictype.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+
+int
+main ()
+{
+  const uc_block_t *blocks;
+  size_t nblocks;
+
+  uc_all_blocks (&blocks, &nblocks);
+
+  {
+    const uc_block_t *latin_block = NULL;
+    const uc_block_t *hebrew_block = NULL;
+    size_t i;
+
+    for (i = 0; i < nblocks; i++)
+      {
+	if (strcmp (blocks[i].name, "Latin") == 0)
+	  latin_block = &blocks[i];
+	if (strcmp (blocks[i].name, "Hebrew") == 0)
+	  hebrew_block = &blocks[i];
+      }
+    ASSERT (latin_block == NULL);
+    ASSERT (hebrew_block != NULL);
+  }
+
+  return 0;
+}
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-block_of.c
@@ -0,0 +1,78 @@
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "unictype.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+
+int
+main ()
+{
+  ASSERT (strcmp (uc_block ('x')->name, "Basic Latin") == 0);
+  ASSERT (strcmp (uc_block (0x20AC)->name, "Currency Symbols") == 0);
+
+  {
+    unsigned int c;
+
+    for (c = 0; c < 0x110000; c++)
+      {
+	const uc_block_t *block = uc_block (c);
+	ASSERT (block == NULL || uc_is_block (c, block));
+      }
+  }
+
+  {
+    const uc_block_t *blocks;
+    size_t nblocks;
+    size_t i;
+
+    uc_all_blocks (&blocks, &nblocks);
+
+    for (i = 0; i < nblocks; i++)
+      {
+	if (strcmp (blocks[i].name, "Hebrew") == 0)
+	  {
+	    ASSERT (uc_block (0x05DE) == &blocks[i]);
+	    ASSERT (uc_is_block (0x05DE, &blocks[i]));
+	  }
+      }
+
+    for (i = 0; i < nblocks; i++)
+      {
+	unsigned int c;
+
+	for (c = blocks[i].start; c <= blocks[i].end; c++)
+	  ASSERT (uc_block (c) == &blocks[i]);
+      }
+  }
+
+  return 0;
+}
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-block_test.c
@@ -0,0 +1,53 @@
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "unictype.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+
+int
+main ()
+{
+  uc_block_t b;
+
+  b.start = 0x20000;
+  b.end = 0x2A6D6;
+  b.name = "CJK Supplemental Area";
+
+  ASSERT (!uc_is_block (0x5678, &b));
+  ASSERT (!uc_is_block (0x1FFFF, &b));
+  ASSERT (uc_is_block (0x20000, &b));
+  ASSERT (uc_is_block (0x25678, &b));
+  ASSERT (uc_is_block (0x2A6D6, &b));
+  ASSERT (!uc_is_block (0x2A6D7, &b));
+
+  return 0;
+}
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_C.c
@@ -0,0 +1,454 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0000, 0x001F },
+    { 0x007F, 0x009F },
+    { 0x00AD, 0x00AD },
+    { 0x0370, 0x0373 },
+    { 0x0376, 0x0379 },
+    { 0x037F, 0x0383 },
+    { 0x038B, 0x038B },
+    { 0x038D, 0x038D },
+    { 0x03A2, 0x03A2 },
+    { 0x03CF, 0x03CF },
+    { 0x0487, 0x0487 },
+    { 0x0514, 0x0530 },
+    { 0x0557, 0x0558 },
+    { 0x0560, 0x0560 },
+    { 0x0588, 0x0588 },
+    { 0x058B, 0x0590 },
+    { 0x05C8, 0x05CF },
+    { 0x05EB, 0x05EF },
+    { 0x05F5, 0x060A },
+    { 0x0616, 0x061A },
+    { 0x061C, 0x061D },
+    { 0x0620, 0x0620 },
+    { 0x063B, 0x063F },
+    { 0x065F, 0x065F },
+    { 0x06DD, 0x06DD },
+    { 0x070E, 0x070F },
+    { 0x074B, 0x074C },
+    { 0x076E, 0x077F },
+    { 0x07B2, 0x07BF },
+    { 0x07FB, 0x0900 },
+    { 0x093A, 0x093B },
+    { 0x094E, 0x094F },
+    { 0x0955, 0x0957 },
+    { 0x0971, 0x097A },
+    { 0x0980, 0x0980 },
+    { 0x0984, 0x0984 },
+    { 0x098D, 0x098E },
+    { 0x0991, 0x0992 },
+    { 0x09A9, 0x09A9 },
+    { 0x09B1, 0x09B1 },
+    { 0x09B3, 0x09B5 },
+    { 0x09BA, 0x09BB },
+    { 0x09C5, 0x09C6 },
+    { 0x09C9, 0x09CA },
+    { 0x09CF, 0x09D6 },
+    { 0x09D8, 0x09DB },
+    { 0x09DE, 0x09DE },
+    { 0x09E4, 0x09E5 },
+    { 0x09FB, 0x0A00 },
+    { 0x0A04, 0x0A04 },
+    { 0x0A0B, 0x0A0E },
+    { 0x0A11, 0x0A12 },
+    { 0x0A29, 0x0A29 },
+    { 0x0A31, 0x0A31 },
+    { 0x0A34, 0x0A34 },
+    { 0x0A37, 0x0A37 },
+    { 0x0A3A, 0x0A3B },
+    { 0x0A3D, 0x0A3D },
+    { 0x0A43, 0x0A46 },
+    { 0x0A49, 0x0A4A },
+    { 0x0A4E, 0x0A58 },
+    { 0x0A5D, 0x0A5D },
+    { 0x0A5F, 0x0A65 },
+    { 0x0A75, 0x0A80 },
+    { 0x0A84, 0x0A84 },
+    { 0x0A8E, 0x0A8E },
+    { 0x0A92, 0x0A92 },
+    { 0x0AA9, 0x0AA9 },
+    { 0x0AB1, 0x0AB1 },
+    { 0x0AB4, 0x0AB4 },
+    { 0x0ABA, 0x0ABB },
+    { 0x0AC6, 0x0AC6 },
+    { 0x0ACA, 0x0ACA },
+    { 0x0ACE, 0x0ACF },
+    { 0x0AD1, 0x0ADF },
+    { 0x0AE4, 0x0AE5 },
+    { 0x0AF0, 0x0AF0 },
+    { 0x0AF2, 0x0B00 },
+    { 0x0B04, 0x0B04 },
+    { 0x0B0D, 0x0B0E },
+    { 0x0B11, 0x0B12 },
+    { 0x0B29, 0x0B29 },
+    { 0x0B31, 0x0B31 },
+    { 0x0B34, 0x0B34 },
+    { 0x0B3A, 0x0B3B },
+    { 0x0B44, 0x0B46 },
+    { 0x0B49, 0x0B4A },
+    { 0x0B4E, 0x0B55 },
+    { 0x0B58, 0x0B5B },
+    { 0x0B5E, 0x0B5E },
+    { 0x0B62, 0x0B65 },
+    { 0x0B72, 0x0B81 },
+    { 0x0B84, 0x0B84 },
+    { 0x0B8B, 0x0B8D },
+    { 0x0B91, 0x0B91 },
+    { 0x0B96, 0x0B98 },
+    { 0x0B9B, 0x0B9B },
+    { 0x0B9D, 0x0B9D },
+    { 0x0BA0, 0x0BA2 },
+    { 0x0BA5, 0x0BA7 },
+    { 0x0BAB, 0x0BAD },
+    { 0x0BBA, 0x0BBD },
+    { 0x0BC3, 0x0BC5 },
+    { 0x0BC9, 0x0BC9 },
+    { 0x0BCE, 0x0BD6 },
+    { 0x0BD8, 0x0BE5 },
+    { 0x0BFB, 0x0C00 },
+    { 0x0C04, 0x0C04 },
+    { 0x0C0D, 0x0C0D },
+    { 0x0C11, 0x0C11 },
+    { 0x0C29, 0x0C29 },
+    { 0x0C34, 0x0C34 },
+    { 0x0C3A, 0x0C3D },
+    { 0x0C45, 0x0C45 },
+    { 0x0C49, 0x0C49 },
+    { 0x0C4E, 0x0C54 },
+    { 0x0C57, 0x0C5F },
+    { 0x0C62, 0x0C65 },
+    { 0x0C70, 0x0C81 },
+    { 0x0C84, 0x0C84 },
+    { 0x0C8D, 0x0C8D },
+    { 0x0C91, 0x0C91 },
+    { 0x0CA9, 0x0CA9 },
+    { 0x0CB4, 0x0CB4 },
+    { 0x0CBA, 0x0CBB },
+    { 0x0CC5, 0x0CC5 },
+    { 0x0CC9, 0x0CC9 },
+    { 0x0CCE, 0x0CD4 },
+    { 0x0CD7, 0x0CDD },
+    { 0x0CDF, 0x0CDF },
+    { 0x0CE4, 0x0CE5 },
+    { 0x0CF0, 0x0CF0 },
+    { 0x0CF3, 0x0D01 },
+    { 0x0D04, 0x0D04 },
+    { 0x0D0D, 0x0D0D },
+    { 0x0D11, 0x0D11 },
+    { 0x0D29, 0x0D29 },
+    { 0x0D3A, 0x0D3D },
+    { 0x0D44, 0x0D45 },
+    { 0x0D49, 0x0D49 },
+    { 0x0D4E, 0x0D56 },
+    { 0x0D58, 0x0D5F },
+    { 0x0D62, 0x0D65 },
+    { 0x0D70, 0x0D81 },
+    { 0x0D84, 0x0D84 },
+    { 0x0D97, 0x0D99 },
+    { 0x0DB2, 0x0DB2 },
+    { 0x0DBC, 0x0DBC },
+    { 0x0DBE, 0x0DBF },
+    { 0x0DC7, 0x0DC9 },
+    { 0x0DCB, 0x0DCE },
+    { 0x0DD5, 0x0DD5 },
+    { 0x0DD7, 0x0DD7 },
+    { 0x0DE0, 0x0DF1 },
+    { 0x0DF5, 0x0E00 },
+    { 0x0E3B, 0x0E3E },
+    { 0x0E5C, 0x0E80 },
+    { 0x0E83, 0x0E83 },
+    { 0x0E85, 0x0E86 },
+    { 0x0E89, 0x0E89 },
+    { 0x0E8B, 0x0E8C },
+    { 0x0E8E, 0x0E93 },
+    { 0x0E98, 0x0E98 },
+    { 0x0EA0, 0x0EA0 },
+    { 0x0EA4, 0x0EA4 },
+    { 0x0EA6, 0x0EA6 },
+    { 0x0EA8, 0x0EA9 },
+    { 0x0EAC, 0x0EAC },
+    { 0x0EBA, 0x0EBA },
+    { 0x0EBE, 0x0EBF },
+    { 0x0EC5, 0x0EC5 },
+    { 0x0EC7, 0x0EC7 },
+    { 0x0ECE, 0x0ECF },
+    { 0x0EDA, 0x0EDB },
+    { 0x0EDE, 0x0EFF },
+    { 0x0F48, 0x0F48 },
+    { 0x0F6B, 0x0F70 },
+    { 0x0F8C, 0x0F8F },
+    { 0x0F98, 0x0F98 },
+    { 0x0FBD, 0x0FBD },
+    { 0x0FCD, 0x0FCE },
+    { 0x0FD2, 0x0FFF },
+    { 0x1022, 0x1022 },
+    { 0x1028, 0x1028 },
+    { 0x102B, 0x102B },
+    { 0x1033, 0x1035 },
+    { 0x103A, 0x103F },
+    { 0x105A, 0x109F },
+    { 0x10C6, 0x10CF },
+    { 0x10FD, 0x10FF },
+    { 0x115A, 0x115E },
+    { 0x11A3, 0x11A7 },
+    { 0x11FA, 0x11FF },
+    { 0x1249, 0x1249 },
+    { 0x124E, 0x124F },
+    { 0x1257, 0x1257 },
+    { 0x1259, 0x1259 },
+    { 0x125E, 0x125F },
+    { 0x1289, 0x1289 },
+    { 0x128E, 0x128F },
+    { 0x12B1, 0x12B1 },
+    { 0x12B6, 0x12B7 },
+    { 0x12BF, 0x12BF },
+    { 0x12C1, 0x12C1 },
+    { 0x12C6, 0x12C7 },
+    { 0x12D7, 0x12D7 },
+    { 0x1311, 0x1311 },
+    { 0x1316, 0x1317 },
+    { 0x135B, 0x135E },
+    { 0x137D, 0x137F },
+    { 0x139A, 0x139F },
+    { 0x13F5, 0x1400 },
+    { 0x1677, 0x167F },
+    { 0x169D, 0x169F },
+    { 0x16F1, 0x16FF },
+    { 0x170D, 0x170D },
+    { 0x1715, 0x171F },
+    { 0x1737, 0x173F },
+    { 0x1754, 0x175F },
+    { 0x176D, 0x176D },
+    { 0x1771, 0x1771 },
+    { 0x1774, 0x177F },
+    { 0x17B4, 0x17B5 },
+    { 0x17DE, 0x17DF },
+    { 0x17EA, 0x17EF },
+    { 0x17FA, 0x17FF },
+    { 0x180F, 0x180F },
+    { 0x181A, 0x181F },
+    { 0x1878, 0x187F },
+    { 0x18AA, 0x18FF },
+    { 0x191D, 0x191F },
+    { 0x192C, 0x192F },
+    { 0x193C, 0x193F },
+    { 0x1941, 0x1943 },
+    { 0x196E, 0x196F },
+    { 0x1975, 0x197F },
+    { 0x19AA, 0x19AF },
+    { 0x19CA, 0x19CF },
+    { 0x19DA, 0x19DD },
+    { 0x1A1C, 0x1A1D },
+    { 0x1A20, 0x1AFF },
+    { 0x1B4C, 0x1B4F },
+    { 0x1B7D, 0x1CFF },
+    { 0x1DCB, 0x1DFD },
+    { 0x1E9C, 0x1E9F },
+    { 0x1EFA, 0x1EFF },
+    { 0x1F16, 0x1F17 },
+    { 0x1F1E, 0x1F1F },
+    { 0x1F46, 0x1F47 },
+    { 0x1F4E, 0x1F4F },
+    { 0x1F58, 0x1F58 },
+    { 0x1F5A, 0x1F5A },
+    { 0x1F5C, 0x1F5C },
+    { 0x1F5E, 0x1F5E },
+    { 0x1F7E, 0x1F7F },
+    { 0x1FB5, 0x1FB5 },
+    { 0x1FC5, 0x1FC5 },
+    { 0x1FD4, 0x1FD5 },
+    { 0x1FDC, 0x1FDC },
+    { 0x1FF0, 0x1FF1 },
+    { 0x1FF5, 0x1FF5 },
+    { 0x1FFF, 0x1FFF },
+    { 0x200B, 0x200F },
+    { 0x202A, 0x202E },
+    { 0x2060, 0x206F },
+    { 0x2072, 0x2073 },
+    { 0x208F, 0x208F },
+    { 0x2095, 0x209F },
+    { 0x20B6, 0x20CF },
+    { 0x20F0, 0x20FF },
+    { 0x214F, 0x2152 },
+    { 0x2185, 0x218F },
+    { 0x23E8, 0x23FF },
+    { 0x2427, 0x243F },
+    { 0x244B, 0x245F },
+    { 0x269D, 0x269F },
+    { 0x26B3, 0x2700 },
+    { 0x2705, 0x2705 },
+    { 0x270A, 0x270B },
+    { 0x2728, 0x2728 },
+    { 0x274C, 0x274C },
+    { 0x274E, 0x274E },
+    { 0x2753, 0x2755 },
+    { 0x2757, 0x2757 },
+    { 0x275F, 0x2760 },
+    { 0x2795, 0x2797 },
+    { 0x27B0, 0x27B0 },
+    { 0x27BF, 0x27BF },
+    { 0x27CB, 0x27CF },
+    { 0x27EC, 0x27EF },
+    { 0x2B1B, 0x2B1F },
+    { 0x2B24, 0x2BFF },
+    { 0x2C2F, 0x2C2F },
+    { 0x2C5F, 0x2C5F },
+    { 0x2C6D, 0x2C73 },
+    { 0x2C78, 0x2C7F },
+    { 0x2CEB, 0x2CF8 },
+    { 0x2D26, 0x2D2F },
+    { 0x2D66, 0x2D6E },
+    { 0x2D70, 0x2D7F },
+    { 0x2D97, 0x2D9F },
+    { 0x2DA7, 0x2DA7 },
+    { 0x2DAF, 0x2DAF },
+    { 0x2DB7, 0x2DB7 },
+    { 0x2DBF, 0x2DBF },
+    { 0x2DC7, 0x2DC7 },
+    { 0x2DCF, 0x2DCF },
+    { 0x2DD7, 0x2DD7 },
+    { 0x2DDF, 0x2DFF },
+    { 0x2E18, 0x2E1B },
+    { 0x2E1E, 0x2E7F },
+    { 0x2E9A, 0x2E9A },
+    { 0x2EF4, 0x2EFF },
+    { 0x2FD6, 0x2FEF },
+    { 0x2FFC, 0x2FFF },
+    { 0x3040, 0x3040 },
+    { 0x3097, 0x3098 },
+    { 0x3100, 0x3104 },
+    { 0x312D, 0x3130 },
+    { 0x318F, 0x318F },
+    { 0x31B8, 0x31BF },
+    { 0x31D0, 0x31EF },
+    { 0x321F, 0x321F },
+    { 0x3244, 0x324F },
+    { 0x32FF, 0x32FF },
+    { 0x4DB6, 0x4DBF },
+    { 0x9FBC, 0x9FFF },
+    { 0xA48D, 0xA48F },
+    { 0xA4C7, 0xA6FF },
+    { 0xA71B, 0xA71F },
+    { 0xA722, 0xA7FF },
+    { 0xA82C, 0xA83F },
+    { 0xA878, 0xABFF },
+    { 0xD7A4, 0xF8FF },
+    { 0xFA2E, 0xFA2F },
+    { 0xFA6B, 0xFA6F },
+    { 0xFADA, 0xFAFF },
+    { 0xFB07, 0xFB12 },
+    { 0xFB18, 0xFB1C },
+    { 0xFB37, 0xFB37 },
+    { 0xFB3D, 0xFB3D },
+    { 0xFB3F, 0xFB3F },
+    { 0xFB42, 0xFB42 },
+    { 0xFB45, 0xFB45 },
+    { 0xFBB2, 0xFBD2 },
+    { 0xFD40, 0xFD4F },
+    { 0xFD90, 0xFD91 },
+    { 0xFDC8, 0xFDEF },
+    { 0xFDFE, 0xFDFF },
+    { 0xFE1A, 0xFE1F },
+    { 0xFE24, 0xFE2F },
+    { 0xFE53, 0xFE53 },
+    { 0xFE67, 0xFE67 },
+    { 0xFE6C, 0xFE6F },
+    { 0xFE75, 0xFE75 },
+    { 0xFEFD, 0xFF00 },
+    { 0xFFBF, 0xFFC1 },
+    { 0xFFC8, 0xFFC9 },
+    { 0xFFD0, 0xFFD1 },
+    { 0xFFD8, 0xFFD9 },
+    { 0xFFDD, 0xFFDF },
+    { 0xFFE7, 0xFFE7 },
+    { 0xFFEF, 0xFFFB },
+    { 0xFFFE, 0xFFFF },
+    { 0x1000C, 0x1000C },
+    { 0x10027, 0x10027 },
+    { 0x1003B, 0x1003B },
+    { 0x1003E, 0x1003E },
+    { 0x1004E, 0x1004F },
+    { 0x1005E, 0x1007F },
+    { 0x100FB, 0x100FF },
+    { 0x10103, 0x10106 },
+    { 0x10134, 0x10136 },
+    { 0x1018B, 0x102FF },
+    { 0x1031F, 0x1031F },
+    { 0x10324, 0x1032F },
+    { 0x1034B, 0x1037F },
+    { 0x1039E, 0x1039E },
+    { 0x103C4, 0x103C7 },
+    { 0x103D6, 0x103FF },
+    { 0x1049E, 0x1049F },
+    { 0x104AA, 0x107FF },
+    { 0x10806, 0x10807 },
+    { 0x10809, 0x10809 },
+    { 0x10836, 0x10836 },
+    { 0x10839, 0x1083B },
+    { 0x1083D, 0x1083E },
+    { 0x10840, 0x108FF },
+    { 0x1091A, 0x1091E },
+    { 0x10920, 0x109FF },
+    { 0x10A04, 0x10A04 },
+    { 0x10A07, 0x10A0B },
+    { 0x10A14, 0x10A14 },
+    { 0x10A18, 0x10A18 },
+    { 0x10A34, 0x10A37 },
+    { 0x10A3B, 0x10A3E },
+    { 0x10A48, 0x10A4F },
+    { 0x10A59, 0x11FFF },
+    { 0x1236F, 0x123FF },
+    { 0x12463, 0x1246F },
+    { 0x12474, 0x1CFFF },
+    { 0x1D0F6, 0x1D0FF },
+    { 0x1D127, 0x1D129 },
+    { 0x1D173, 0x1D17A },
+    { 0x1D1DE, 0x1D1FF },
+    { 0x1D246, 0x1D2FF },
+    { 0x1D357, 0x1D35F },
+    { 0x1D372, 0x1D3FF },
+    { 0x1D455, 0x1D455 },
+    { 0x1D49D, 0x1D49D },
+    { 0x1D4A0, 0x1D4A1 },
+    { 0x1D4A3, 0x1D4A4 },
+    { 0x1D4A7, 0x1D4A8 },
+    { 0x1D4AD, 0x1D4AD },
+    { 0x1D4BA, 0x1D4BA },
+    { 0x1D4BC, 0x1D4BC },
+    { 0x1D4C4, 0x1D4C4 },
+    { 0x1D506, 0x1D506 },
+    { 0x1D50B, 0x1D50C },
+    { 0x1D515, 0x1D515 },
+    { 0x1D51D, 0x1D51D },
+    { 0x1D53A, 0x1D53A },
+    { 0x1D53F, 0x1D53F },
+    { 0x1D545, 0x1D545 },
+    { 0x1D547, 0x1D549 },
+    { 0x1D551, 0x1D551 },
+    { 0x1D6A6, 0x1D6A7 },
+    { 0x1D7CC, 0x1D7CD },
+    { 0x1D800, 0x1FFFF },
+    { 0x2A6D7, 0x2F7FF },
+    { 0x2FA1E, 0xE00FF },
+    { 0xE01F0, 0x10FFFF }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_C)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Cc.c
@@ -0,0 +1,24 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0000, 0x001F },
+    { 0x007F, 0x009F }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Cc)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Cf.c
@@ -0,0 +1,36 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x00AD, 0x00AD },
+    { 0x0600, 0x0603 },
+    { 0x06DD, 0x06DD },
+    { 0x070F, 0x070F },
+    { 0x17B4, 0x17B5 },
+    { 0x200B, 0x200F },
+    { 0x202A, 0x202E },
+    { 0x2060, 0x2063 },
+    { 0x206A, 0x206F },
+    { 0xFEFF, 0xFEFF },
+    { 0xFFF9, 0xFFFB },
+    { 0x1D173, 0x1D17A },
+    { 0xE0001, 0xE0001 },
+    { 0xE0020, 0xE007F }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Cf)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Cn.c
@@ -0,0 +1,452 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0370, 0x0373 },
+    { 0x0376, 0x0379 },
+    { 0x037F, 0x0383 },
+    { 0x038B, 0x038B },
+    { 0x038D, 0x038D },
+    { 0x03A2, 0x03A2 },
+    { 0x03CF, 0x03CF },
+    { 0x0487, 0x0487 },
+    { 0x0514, 0x0530 },
+    { 0x0557, 0x0558 },
+    { 0x0560, 0x0560 },
+    { 0x0588, 0x0588 },
+    { 0x058B, 0x0590 },
+    { 0x05C8, 0x05CF },
+    { 0x05EB, 0x05EF },
+    { 0x05F5, 0x05FF },
+    { 0x0604, 0x060A },
+    { 0x0616, 0x061A },
+    { 0x061C, 0x061D },
+    { 0x0620, 0x0620 },
+    { 0x063B, 0x063F },
+    { 0x065F, 0x065F },
+    { 0x070E, 0x070E },
+    { 0x074B, 0x074C },
+    { 0x076E, 0x077F },
+    { 0x07B2, 0x07BF },
+    { 0x07FB, 0x0900 },
+    { 0x093A, 0x093B },
+    { 0x094E, 0x094F },
+    { 0x0955, 0x0957 },
+    { 0x0971, 0x097A },
+    { 0x0980, 0x0980 },
+    { 0x0984, 0x0984 },
+    { 0x098D, 0x098E },
+    { 0x0991, 0x0992 },
+    { 0x09A9, 0x09A9 },
+    { 0x09B1, 0x09B1 },
+    { 0x09B3, 0x09B5 },
+    { 0x09BA, 0x09BB },
+    { 0x09C5, 0x09C6 },
+    { 0x09C9, 0x09CA },
+    { 0x09CF, 0x09D6 },
+    { 0x09D8, 0x09DB },
+    { 0x09DE, 0x09DE },
+    { 0x09E4, 0x09E5 },
+    { 0x09FB, 0x0A00 },
+    { 0x0A04, 0x0A04 },
+    { 0x0A0B, 0x0A0E },
+    { 0x0A11, 0x0A12 },
+    { 0x0A29, 0x0A29 },
+    { 0x0A31, 0x0A31 },
+    { 0x0A34, 0x0A34 },
+    { 0x0A37, 0x0A37 },
+    { 0x0A3A, 0x0A3B },
+    { 0x0A3D, 0x0A3D },
+    { 0x0A43, 0x0A46 },
+    { 0x0A49, 0x0A4A },
+    { 0x0A4E, 0x0A58 },
+    { 0x0A5D, 0x0A5D },
+    { 0x0A5F, 0x0A65 },
+    { 0x0A75, 0x0A80 },
+    { 0x0A84, 0x0A84 },
+    { 0x0A8E, 0x0A8E },
+    { 0x0A92, 0x0A92 },
+    { 0x0AA9, 0x0AA9 },
+    { 0x0AB1, 0x0AB1 },
+    { 0x0AB4, 0x0AB4 },
+    { 0x0ABA, 0x0ABB },
+    { 0x0AC6, 0x0AC6 },
+    { 0x0ACA, 0x0ACA },
+    { 0x0ACE, 0x0ACF },
+    { 0x0AD1, 0x0ADF },
+    { 0x0AE4, 0x0AE5 },
+    { 0x0AF0, 0x0AF0 },
+    { 0x0AF2, 0x0B00 },
+    { 0x0B04, 0x0B04 },
+    { 0x0B0D, 0x0B0E },
+    { 0x0B11, 0x0B12 },
+    { 0x0B29, 0x0B29 },
+    { 0x0B31, 0x0B31 },
+    { 0x0B34, 0x0B34 },
+    { 0x0B3A, 0x0B3B },
+    { 0x0B44, 0x0B46 },
+    { 0x0B49, 0x0B4A },
+    { 0x0B4E, 0x0B55 },
+    { 0x0B58, 0x0B5B },
+    { 0x0B5E, 0x0B5E },
+    { 0x0B62, 0x0B65 },
+    { 0x0B72, 0x0B81 },
+    { 0x0B84, 0x0B84 },
+    { 0x0B8B, 0x0B8D },
+    { 0x0B91, 0x0B91 },
+    { 0x0B96, 0x0B98 },
+    { 0x0B9B, 0x0B9B },
+    { 0x0B9D, 0x0B9D },
+    { 0x0BA0, 0x0BA2 },
+    { 0x0BA5, 0x0BA7 },
+    { 0x0BAB, 0x0BAD },
+    { 0x0BBA, 0x0BBD },
+    { 0x0BC3, 0x0BC5 },
+    { 0x0BC9, 0x0BC9 },
+    { 0x0BCE, 0x0BD6 },
+    { 0x0BD8, 0x0BE5 },
+    { 0x0BFB, 0x0C00 },
+    { 0x0C04, 0x0C04 },
+    { 0x0C0D, 0x0C0D },
+    { 0x0C11, 0x0C11 },
+    { 0x0C29, 0x0C29 },
+    { 0x0C34, 0x0C34 },
+    { 0x0C3A, 0x0C3D },
+    { 0x0C45, 0x0C45 },
+    { 0x0C49, 0x0C49 },
+    { 0x0C4E, 0x0C54 },
+    { 0x0C57, 0x0C5F },
+    { 0x0C62, 0x0C65 },
+    { 0x0C70, 0x0C81 },
+    { 0x0C84, 0x0C84 },
+    { 0x0C8D, 0x0C8D },
+    { 0x0C91, 0x0C91 },
+    { 0x0CA9, 0x0CA9 },
+    { 0x0CB4, 0x0CB4 },
+    { 0x0CBA, 0x0CBB },
+    { 0x0CC5, 0x0CC5 },
+    { 0x0CC9, 0x0CC9 },
+    { 0x0CCE, 0x0CD4 },
+    { 0x0CD7, 0x0CDD },
+    { 0x0CDF, 0x0CDF },
+    { 0x0CE4, 0x0CE5 },
+    { 0x0CF0, 0x0CF0 },
+    { 0x0CF3, 0x0D01 },
+    { 0x0D04, 0x0D04 },
+    { 0x0D0D, 0x0D0D },
+    { 0x0D11, 0x0D11 },
+    { 0x0D29, 0x0D29 },
+    { 0x0D3A, 0x0D3D },
+    { 0x0D44, 0x0D45 },
+    { 0x0D49, 0x0D49 },
+    { 0x0D4E, 0x0D56 },
+    { 0x0D58, 0x0D5F },
+    { 0x0D62, 0x0D65 },
+    { 0x0D70, 0x0D81 },
+    { 0x0D84, 0x0D84 },
+    { 0x0D97, 0x0D99 },
+    { 0x0DB2, 0x0DB2 },
+    { 0x0DBC, 0x0DBC },
+    { 0x0DBE, 0x0DBF },
+    { 0x0DC7, 0x0DC9 },
+    { 0x0DCB, 0x0DCE },
+    { 0x0DD5, 0x0DD5 },
+    { 0x0DD7, 0x0DD7 },
+    { 0x0DE0, 0x0DF1 },
+    { 0x0DF5, 0x0E00 },
+    { 0x0E3B, 0x0E3E },
+    { 0x0E5C, 0x0E80 },
+    { 0x0E83, 0x0E83 },
+    { 0x0E85, 0x0E86 },
+    { 0x0E89, 0x0E89 },
+    { 0x0E8B, 0x0E8C },
+    { 0x0E8E, 0x0E93 },
+    { 0x0E98, 0x0E98 },
+    { 0x0EA0, 0x0EA0 },
+    { 0x0EA4, 0x0EA4 },
+    { 0x0EA6, 0x0EA6 },
+    { 0x0EA8, 0x0EA9 },
+    { 0x0EAC, 0x0EAC },
+    { 0x0EBA, 0x0EBA },
+    { 0x0EBE, 0x0EBF },
+    { 0x0EC5, 0x0EC5 },
+    { 0x0EC7, 0x0EC7 },
+    { 0x0ECE, 0x0ECF },
+    { 0x0EDA, 0x0EDB },
+    { 0x0EDE, 0x0EFF },
+    { 0x0F48, 0x0F48 },
+    { 0x0F6B, 0x0F70 },
+    { 0x0F8C, 0x0F8F },
+    { 0x0F98, 0x0F98 },
+    { 0x0FBD, 0x0FBD },
+    { 0x0FCD, 0x0FCE },
+    { 0x0FD2, 0x0FFF },
+    { 0x1022, 0x1022 },
+    { 0x1028, 0x1028 },
+    { 0x102B, 0x102B },
+    { 0x1033, 0x1035 },
+    { 0x103A, 0x103F },
+    { 0x105A, 0x109F },
+    { 0x10C6, 0x10CF },
+    { 0x10FD, 0x10FF },
+    { 0x115A, 0x115E },
+    { 0x11A3, 0x11A7 },
+    { 0x11FA, 0x11FF },
+    { 0x1249, 0x1249 },
+    { 0x124E, 0x124F },
+    { 0x1257, 0x1257 },
+    { 0x1259, 0x1259 },
+    { 0x125E, 0x125F },
+    { 0x1289, 0x1289 },
+    { 0x128E, 0x128F },
+    { 0x12B1, 0x12B1 },
+    { 0x12B6, 0x12B7 },
+    { 0x12BF, 0x12BF },
+    { 0x12C1, 0x12C1 },
+    { 0x12C6, 0x12C7 },
+    { 0x12D7, 0x12D7 },
+    { 0x1311, 0x1311 },
+    { 0x1316, 0x1317 },
+    { 0x135B, 0x135E },
+    { 0x137D, 0x137F },
+    { 0x139A, 0x139F },
+    { 0x13F5, 0x1400 },
+    { 0x1677, 0x167F },
+    { 0x169D, 0x169F },
+    { 0x16F1, 0x16FF },
+    { 0x170D, 0x170D },
+    { 0x1715, 0x171F },
+    { 0x1737, 0x173F },
+    { 0x1754, 0x175F },
+    { 0x176D, 0x176D },
+    { 0x1771, 0x1771 },
+    { 0x1774, 0x177F },
+    { 0x17DE, 0x17DF },
+    { 0x17EA, 0x17EF },
+    { 0x17FA, 0x17FF },
+    { 0x180F, 0x180F },
+    { 0x181A, 0x181F },
+    { 0x1878, 0x187F },
+    { 0x18AA, 0x18FF },
+    { 0x191D, 0x191F },
+    { 0x192C, 0x192F },
+    { 0x193C, 0x193F },
+    { 0x1941, 0x1943 },
+    { 0x196E, 0x196F },
+    { 0x1975, 0x197F },
+    { 0x19AA, 0x19AF },
+    { 0x19CA, 0x19CF },
+    { 0x19DA, 0x19DD },
+    { 0x1A1C, 0x1A1D },
+    { 0x1A20, 0x1AFF },
+    { 0x1B4C, 0x1B4F },
+    { 0x1B7D, 0x1CFF },
+    { 0x1DCB, 0x1DFD },
+    { 0x1E9C, 0x1E9F },
+    { 0x1EFA, 0x1EFF },
+    { 0x1F16, 0x1F17 },
+    { 0x1F1E, 0x1F1F },
+    { 0x1F46, 0x1F47 },
+    { 0x1F4E, 0x1F4F },
+    { 0x1F58, 0x1F58 },
+    { 0x1F5A, 0x1F5A },
+    { 0x1F5C, 0x1F5C },
+    { 0x1F5E, 0x1F5E },
+    { 0x1F7E, 0x1F7F },
+    { 0x1FB5, 0x1FB5 },
+    { 0x1FC5, 0x1FC5 },
+    { 0x1FD4, 0x1FD5 },
+    { 0x1FDC, 0x1FDC },
+    { 0x1FF0, 0x1FF1 },
+    { 0x1FF5, 0x1FF5 },
+    { 0x1FFF, 0x1FFF },
+    { 0x2064, 0x2069 },
+    { 0x2072, 0x2073 },
+    { 0x208F, 0x208F },
+    { 0x2095, 0x209F },
+    { 0x20B6, 0x20CF },
+    { 0x20F0, 0x20FF },
+    { 0x214F, 0x2152 },
+    { 0x2185, 0x218F },
+    { 0x23E8, 0x23FF },
+    { 0x2427, 0x243F },
+    { 0x244B, 0x245F },
+    { 0x269D, 0x269F },
+    { 0x26B3, 0x2700 },
+    { 0x2705, 0x2705 },
+    { 0x270A, 0x270B },
+    { 0x2728, 0x2728 },
+    { 0x274C, 0x274C },
+    { 0x274E, 0x274E },
+    { 0x2753, 0x2755 },
+    { 0x2757, 0x2757 },
+    { 0x275F, 0x2760 },
+    { 0x2795, 0x2797 },
+    { 0x27B0, 0x27B0 },
+    { 0x27BF, 0x27BF },
+    { 0x27CB, 0x27CF },
+    { 0x27EC, 0x27EF },
+    { 0x2B1B, 0x2B1F },
+    { 0x2B24, 0x2BFF },
+    { 0x2C2F, 0x2C2F },
+    { 0x2C5F, 0x2C5F },
+    { 0x2C6D, 0x2C73 },
+    { 0x2C78, 0x2C7F },
+    { 0x2CEB, 0x2CF8 },
+    { 0x2D26, 0x2D2F },
+    { 0x2D66, 0x2D6E },
+    { 0x2D70, 0x2D7F },
+    { 0x2D97, 0x2D9F },
+    { 0x2DA7, 0x2DA7 },
+    { 0x2DAF, 0x2DAF },
+    { 0x2DB7, 0x2DB7 },
+    { 0x2DBF, 0x2DBF },
+    { 0x2DC7, 0x2DC7 },
+    { 0x2DCF, 0x2DCF },
+    { 0x2DD7, 0x2DD7 },
+    { 0x2DDF, 0x2DFF },
+    { 0x2E18, 0x2E1B },
+    { 0x2E1E, 0x2E7F },
+    { 0x2E9A, 0x2E9A },
+    { 0x2EF4, 0x2EFF },
+    { 0x2FD6, 0x2FEF },
+    { 0x2FFC, 0x2FFF },
+    { 0x3040, 0x3040 },
+    { 0x3097, 0x3098 },
+    { 0x3100, 0x3104 },
+    { 0x312D, 0x3130 },
+    { 0x318F, 0x318F },
+    { 0x31B8, 0x31BF },
+    { 0x31D0, 0x31EF },
+    { 0x321F, 0x321F },
+    { 0x3244, 0x324F },
+    { 0x32FF, 0x32FF },
+    { 0x4DB6, 0x4DBF },
+    { 0x9FBC, 0x9FFF },
+    { 0xA48D, 0xA48F },
+    { 0xA4C7, 0xA6FF },
+    { 0xA71B, 0xA71F },
+    { 0xA722, 0xA7FF },
+    { 0xA82C, 0xA83F },
+    { 0xA878, 0xABFF },
+    { 0xD7A4, 0xD7FF },
+    { 0xFA2E, 0xFA2F },
+    { 0xFA6B, 0xFA6F },
+    { 0xFADA, 0xFAFF },
+    { 0xFB07, 0xFB12 },
+    { 0xFB18, 0xFB1C },
+    { 0xFB37, 0xFB37 },
+    { 0xFB3D, 0xFB3D },
+    { 0xFB3F, 0xFB3F },
+    { 0xFB42, 0xFB42 },
+    { 0xFB45, 0xFB45 },
+    { 0xFBB2, 0xFBD2 },
+    { 0xFD40, 0xFD4F },
+    { 0xFD90, 0xFD91 },
+    { 0xFDC8, 0xFDEF },
+    { 0xFDFE, 0xFDFF },
+    { 0xFE1A, 0xFE1F },
+    { 0xFE24, 0xFE2F },
+    { 0xFE53, 0xFE53 },
+    { 0xFE67, 0xFE67 },
+    { 0xFE6C, 0xFE6F },
+    { 0xFE75, 0xFE75 },
+    { 0xFEFD, 0xFEFE },
+    { 0xFF00, 0xFF00 },
+    { 0xFFBF, 0xFFC1 },
+    { 0xFFC8, 0xFFC9 },
+    { 0xFFD0, 0xFFD1 },
+    { 0xFFD8, 0xFFD9 },
+    { 0xFFDD, 0xFFDF },
+    { 0xFFE7, 0xFFE7 },
+    { 0xFFEF, 0xFFF8 },
+    { 0xFFFE, 0xFFFF },
+    { 0x1000C, 0x1000C },
+    { 0x10027, 0x10027 },
+    { 0x1003B, 0x1003B },
+    { 0x1003E, 0x1003E },
+    { 0x1004E, 0x1004F },
+    { 0x1005E, 0x1007F },
+    { 0x100FB, 0x100FF },
+    { 0x10103, 0x10106 },
+    { 0x10134, 0x10136 },
+    { 0x1018B, 0x102FF },
+    { 0x1031F, 0x1031F },
+    { 0x10324, 0x1032F },
+    { 0x1034B, 0x1037F },
+    { 0x1039E, 0x1039E },
+    { 0x103C4, 0x103C7 },
+    { 0x103D6, 0x103FF },
+    { 0x1049E, 0x1049F },
+    { 0x104AA, 0x107FF },
+    { 0x10806, 0x10807 },
+    { 0x10809, 0x10809 },
+    { 0x10836, 0x10836 },
+    { 0x10839, 0x1083B },
+    { 0x1083D, 0x1083E },
+    { 0x10840, 0x108FF },
+    { 0x1091A, 0x1091E },
+    { 0x10920, 0x109FF },
+    { 0x10A04, 0x10A04 },
+    { 0x10A07, 0x10A0B },
+    { 0x10A14, 0x10A14 },
+    { 0x10A18, 0x10A18 },
+    { 0x10A34, 0x10A37 },
+    { 0x10A3B, 0x10A3E },
+    { 0x10A48, 0x10A4F },
+    { 0x10A59, 0x11FFF },
+    { 0x1236F, 0x123FF },
+    { 0x12463, 0x1246F },
+    { 0x12474, 0x1CFFF },
+    { 0x1D0F6, 0x1D0FF },
+    { 0x1D127, 0x1D129 },
+    { 0x1D1DE, 0x1D1FF },
+    { 0x1D246, 0x1D2FF },
+    { 0x1D357, 0x1D35F },
+    { 0x1D372, 0x1D3FF },
+    { 0x1D455, 0x1D455 },
+    { 0x1D49D, 0x1D49D },
+    { 0x1D4A0, 0x1D4A1 },
+    { 0x1D4A3, 0x1D4A4 },
+    { 0x1D4A7, 0x1D4A8 },
+    { 0x1D4AD, 0x1D4AD },
+    { 0x1D4BA, 0x1D4BA },
+    { 0x1D4BC, 0x1D4BC },
+    { 0x1D4C4, 0x1D4C4 },
+    { 0x1D506, 0x1D506 },
+    { 0x1D50B, 0x1D50C },
+    { 0x1D515, 0x1D515 },
+    { 0x1D51D, 0x1D51D },
+    { 0x1D53A, 0x1D53A },
+    { 0x1D53F, 0x1D53F },
+    { 0x1D545, 0x1D545 },
+    { 0x1D547, 0x1D549 },
+    { 0x1D551, 0x1D551 },
+    { 0x1D6A6, 0x1D6A7 },
+    { 0x1D7CC, 0x1D7CD },
+    { 0x1D800, 0x1FFFF },
+    { 0x2A6D7, 0x2F7FF },
+    { 0x2FA1E, 0xE0000 },
+    { 0xE0002, 0xE001F },
+    { 0xE0080, 0xE00FF },
+    { 0xE01F0, 0xEFFFF },
+    { 0xFFFFE, 0xFFFFF },
+    { 0x10FFFE, 0x10FFFF }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Cn)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Co.c
@@ -0,0 +1,25 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0xE000, 0xF8FF },
+    { 0xF0000, 0xFFFFD },
+    { 0x100000, 0x10FFFD }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Co)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Cs.c
@@ -0,0 +1,23 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0xD800, 0xDFFF }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Cs)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_L.c
@@ -0,0 +1,379 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0041, 0x005A },
+    { 0x0061, 0x007A },
+    { 0x00AA, 0x00AA },
+    { 0x00B5, 0x00B5 },
+    { 0x00BA, 0x00BA },
+    { 0x00C0, 0x00D6 },
+    { 0x00D8, 0x00F6 },
+    { 0x00F8, 0x02C1 },
+    { 0x02C6, 0x02D1 },
+    { 0x02E0, 0x02E4 },
+    { 0x02EE, 0x02EE },
+    { 0x037A, 0x037D },
+    { 0x0386, 0x0386 },
+    { 0x0388, 0x038A },
+    { 0x038C, 0x038C },
+    { 0x038E, 0x03A1 },
+    { 0x03A3, 0x03CE },
+    { 0x03D0, 0x03F5 },
+    { 0x03F7, 0x0481 },
+    { 0x048A, 0x0513 },
+    { 0x0531, 0x0556 },
+    { 0x0559, 0x0559 },
+    { 0x0561, 0x0587 },
+    { 0x05D0, 0x05EA },
+    { 0x05F0, 0x05F2 },
+    { 0x0621, 0x063A },
+    { 0x0640, 0x064A },
+    { 0x066E, 0x066F },
+    { 0x0671, 0x06D3 },
+    { 0x06D5, 0x06D5 },
+    { 0x06E5, 0x06E6 },
+    { 0x06EE, 0x06EF },
+    { 0x06FA, 0x06FC },
+    { 0x06FF, 0x06FF },
+    { 0x0710, 0x0710 },
+    { 0x0712, 0x072F },
+    { 0x074D, 0x076D },
+    { 0x0780, 0x07A5 },
+    { 0x07B1, 0x07B1 },
+    { 0x07CA, 0x07EA },
+    { 0x07F4, 0x07F5 },
+    { 0x07FA, 0x07FA },
+    { 0x0904, 0x0939 },
+    { 0x093D, 0x093D },
+    { 0x0950, 0x0950 },
+    { 0x0958, 0x0961 },
+    { 0x097B, 0x097F },
+    { 0x0985, 0x098C },
+    { 0x098F, 0x0990 },
+    { 0x0993, 0x09A8 },
+    { 0x09AA, 0x09B0 },
+    { 0x09B2, 0x09B2 },
+    { 0x09B6, 0x09B9 },
+    { 0x09BD, 0x09BD },
+    { 0x09CE, 0x09CE },
+    { 0x09DC, 0x09DD },
+    { 0x09DF, 0x09E1 },
+    { 0x09F0, 0x09F1 },
+    { 0x0A05, 0x0A0A },
+    { 0x0A0F, 0x0A10 },
+    { 0x0A13, 0x0A28 },
+    { 0x0A2A, 0x0A30 },
+    { 0x0A32, 0x0A33 },
+    { 0x0A35, 0x0A36 },
+    { 0x0A38, 0x0A39 },
+    { 0x0A59, 0x0A5C },
+    { 0x0A5E, 0x0A5E },
+    { 0x0A72, 0x0A74 },
+    { 0x0A85, 0x0A8D },
+    { 0x0A8F, 0x0A91 },
+    { 0x0A93, 0x0AA8 },
+    { 0x0AAA, 0x0AB0 },
+    { 0x0AB2, 0x0AB3 },
+    { 0x0AB5, 0x0AB9 },
+    { 0x0ABD, 0x0ABD },
+    { 0x0AD0, 0x0AD0 },
+    { 0x0AE0, 0x0AE1 },
+    { 0x0B05, 0x0B0C },
+    { 0x0B0F, 0x0B10 },
+    { 0x0B13, 0x0B28 },
+    { 0x0B2A, 0x0B30 },
+    { 0x0B32, 0x0B33 },
+    { 0x0B35, 0x0B39 },
+    { 0x0B3D, 0x0B3D },
+    { 0x0B5C, 0x0B5D },
+    { 0x0B5F, 0x0B61 },
+    { 0x0B71, 0x0B71 },
+    { 0x0B83, 0x0B83 },
+    { 0x0B85, 0x0B8A },
+    { 0x0B8E, 0x0B90 },
+    { 0x0B92, 0x0B95 },
+    { 0x0B99, 0x0B9A },
+    { 0x0B9C, 0x0B9C },
+    { 0x0B9E, 0x0B9F },
+    { 0x0BA3, 0x0BA4 },
+    { 0x0BA8, 0x0BAA },
+    { 0x0BAE, 0x0BB9 },
+    { 0x0C05, 0x0C0C },
+    { 0x0C0E, 0x0C10 },
+    { 0x0C12, 0x0C28 },
+    { 0x0C2A, 0x0C33 },
+    { 0x0C35, 0x0C39 },
+    { 0x0C60, 0x0C61 },
+    { 0x0C85, 0x0C8C },
+    { 0x0C8E, 0x0C90 },
+    { 0x0C92, 0x0CA8 },
+    { 0x0CAA, 0x0CB3 },
+    { 0x0CB5, 0x0CB9 },
+    { 0x0CBD, 0x0CBD },
+    { 0x0CDE, 0x0CDE },
+    { 0x0CE0, 0x0CE1 },
+    { 0x0D05, 0x0D0C },
+    { 0x0D0E, 0x0D10 },
+    { 0x0D12, 0x0D28 },
+    { 0x0D2A, 0x0D39 },
+    { 0x0D60, 0x0D61 },
+    { 0x0D85, 0x0D96 },
+    { 0x0D9A, 0x0DB1 },
+    { 0x0DB3, 0x0DBB },
+    { 0x0DBD, 0x0DBD },
+    { 0x0DC0, 0x0DC6 },
+    { 0x0E01, 0x0E30 },
+    { 0x0E32, 0x0E33 },
+    { 0x0E40, 0x0E46 },
+    { 0x0E81, 0x0E82 },
+    { 0x0E84, 0x0E84 },
+    { 0x0E87, 0x0E88 },
+    { 0x0E8A, 0x0E8A },
+    { 0x0E8D, 0x0E8D },
+    { 0x0E94, 0x0E97 },
+    { 0x0E99, 0x0E9F },
+    { 0x0EA1, 0x0EA3 },
+    { 0x0EA5, 0x0EA5 },
+    { 0x0EA7, 0x0EA7 },
+    { 0x0EAA, 0x0EAB },
+    { 0x0EAD, 0x0EB0 },
+    { 0x0EB2, 0x0EB3 },
+    { 0x0EBD, 0x0EBD },
+    { 0x0EC0, 0x0EC4 },
+    { 0x0EC6, 0x0EC6 },
+    { 0x0EDC, 0x0EDD },
+    { 0x0F00, 0x0F00 },
+    { 0x0F40, 0x0F47 },
+    { 0x0F49, 0x0F6A },
+    { 0x0F88, 0x0F8B },
+    { 0x1000, 0x1021 },
+    { 0x1023, 0x1027 },
+    { 0x1029, 0x102A },
+    { 0x1050, 0x1055 },
+    { 0x10A0, 0x10C5 },
+    { 0x10D0, 0x10FA },
+    { 0x10FC, 0x10FC },
+    { 0x1100, 0x1159 },
+    { 0x115F, 0x11A2 },
+    { 0x11A8, 0x11F9 },
+    { 0x1200, 0x1248 },
+    { 0x124A, 0x124D },
+    { 0x1250, 0x1256 },
+    { 0x1258, 0x1258 },
+    { 0x125A, 0x125D },
+    { 0x1260, 0x1288 },
+    { 0x128A, 0x128D },
+    { 0x1290, 0x12B0 },
+    { 0x12B2, 0x12B5 },
+    { 0x12B8, 0x12BE },
+    { 0x12C0, 0x12C0 },
+    { 0x12C2, 0x12C5 },
+    { 0x12C8, 0x12D6 },
+    { 0x12D8, 0x1310 },
+    { 0x1312, 0x1315 },
+    { 0x1318, 0x135A },
+    { 0x1380, 0x138F },
+    { 0x13A0, 0x13F4 },
+    { 0x1401, 0x166C },
+    { 0x166F, 0x1676 },
+    { 0x1681, 0x169A },
+    { 0x16A0, 0x16EA },
+    { 0x1700, 0x170C },
+    { 0x170E, 0x1711 },
+    { 0x1720, 0x1731 },
+    { 0x1740, 0x1751 },
+    { 0x1760, 0x176C },
+    { 0x176E, 0x1770 },
+    { 0x1780, 0x17B3 },
+    { 0x17D7, 0x17D7 },
+    { 0x17DC, 0x17DC },
+    { 0x1820, 0x1877 },
+    { 0x1880, 0x18A8 },
+    { 0x1900, 0x191C },
+    { 0x1950, 0x196D },
+    { 0x1970, 0x1974 },
+    { 0x1980, 0x19A9 },
+    { 0x19C1, 0x19C7 },
+    { 0x1A00, 0x1A16 },
+    { 0x1B05, 0x1B33 },
+    { 0x1B45, 0x1B4B },
+    { 0x1D00, 0x1DBF },
+    { 0x1E00, 0x1E9B },
+    { 0x1EA0, 0x1EF9 },
+    { 0x1F00, 0x1F15 },
+    { 0x1F18, 0x1F1D },
+    { 0x1F20, 0x1F45 },
+    { 0x1F48, 0x1F4D },
+    { 0x1F50, 0x1F57 },
+    { 0x1F59, 0x1F59 },
+    { 0x1F5B, 0x1F5B },
+    { 0x1F5D, 0x1F5D },
+    { 0x1F5F, 0x1F7D },
+    { 0x1F80, 0x1FB4 },
+    { 0x1FB6, 0x1FBC },
+    { 0x1FBE, 0x1FBE },
+    { 0x1FC2, 0x1FC4 },
+    { 0x1FC6, 0x1FCC },
+    { 0x1FD0, 0x1FD3 },
+    { 0x1FD6, 0x1FDB },
+    { 0x1FE0, 0x1FEC },
+    { 0x1FF2, 0x1FF4 },
+    { 0x1FF6, 0x1FFC },
+    { 0x2071, 0x2071 },
+    { 0x207F, 0x207F },
+    { 0x2090, 0x2094 },
+    { 0x2102, 0x2102 },
+    { 0x2107, 0x2107 },
+    { 0x210A, 0x2113 },
+    { 0x2115, 0x2115 },
+    { 0x2119, 0x211D },
+    { 0x2124, 0x2124 },
+    { 0x2126, 0x2126 },
+    { 0x2128, 0x2128 },
+    { 0x212A, 0x212D },
+    { 0x212F, 0x2139 },
+    { 0x213C, 0x213F },
+    { 0x2145, 0x2149 },
+    { 0x214E, 0x214E },
+    { 0x2183, 0x2184 },
+    { 0x2C00, 0x2C2E },
+    { 0x2C30, 0x2C5E },
+    { 0x2C60, 0x2C6C },
+    { 0x2C74, 0x2C77 },
+    { 0x2C80, 0x2CE4 },
+    { 0x2D00, 0x2D25 },
+    { 0x2D30, 0x2D65 },
+    { 0x2D6F, 0x2D6F },
+    { 0x2D80, 0x2D96 },
+    { 0x2DA0, 0x2DA6 },
+    { 0x2DA8, 0x2DAE },
+    { 0x2DB0, 0x2DB6 },
+    { 0x2DB8, 0x2DBE },
+    { 0x2DC0, 0x2DC6 },
+    { 0x2DC8, 0x2DCE },
+    { 0x2DD0, 0x2DD6 },
+    { 0x2DD8, 0x2DDE },
+    { 0x3005, 0x3006 },
+    { 0x3031, 0x3035 },
+    { 0x303B, 0x303C },
+    { 0x3041, 0x3096 },
+    { 0x309D, 0x309F },
+    { 0x30A1, 0x30FA },
+    { 0x30FC, 0x30FF },
+    { 0x3105, 0x312C },
+    { 0x3131, 0x318E },
+    { 0x31A0, 0x31B7 },
+    { 0x31F0, 0x31FF },
+    { 0x3400, 0x4DB5 },
+    { 0x4E00, 0x9FBB },
+    { 0xA000, 0xA48C },
+    { 0xA717, 0xA71A },
+    { 0xA800, 0xA801 },
+    { 0xA803, 0xA805 },
+    { 0xA807, 0xA80A },
+    { 0xA80C, 0xA822 },
+    { 0xA840, 0xA873 },
+    { 0xAC00, 0xD7A3 },
+    { 0xF900, 0xFA2D },
+    { 0xFA30, 0xFA6A },
+    { 0xFA70, 0xFAD9 },
+    { 0xFB00, 0xFB06 },
+    { 0xFB13, 0xFB17 },
+    { 0xFB1D, 0xFB1D },
+    { 0xFB1F, 0xFB28 },
+    { 0xFB2A, 0xFB36 },
+    { 0xFB38, 0xFB3C },
+    { 0xFB3E, 0xFB3E },
+    { 0xFB40, 0xFB41 },
+    { 0xFB43, 0xFB44 },
+    { 0xFB46, 0xFBB1 },
+    { 0xFBD3, 0xFD3D },
+    { 0xFD50, 0xFD8F },
+    { 0xFD92, 0xFDC7 },
+    { 0xFDF0, 0xFDFB },
+    { 0xFE70, 0xFE74 },
+    { 0xFE76, 0xFEFC },
+    { 0xFF21, 0xFF3A },
+    { 0xFF41, 0xFF5A },
+    { 0xFF66, 0xFFBE },
+    { 0xFFC2, 0xFFC7 },
+    { 0xFFCA, 0xFFCF },
+    { 0xFFD2, 0xFFD7 },
+    { 0xFFDA, 0xFFDC },
+    { 0x10000, 0x1000B },
+    { 0x1000D, 0x10026 },
+    { 0x10028, 0x1003A },
+    { 0x1003C, 0x1003D },
+    { 0x1003F, 0x1004D },
+    { 0x10050, 0x1005D },
+    { 0x10080, 0x100FA },
+    { 0x10300, 0x1031E },
+    { 0x10330, 0x10340 },
+    { 0x10342, 0x10349 },
+    { 0x10380, 0x1039D },
+    { 0x103A0, 0x103C3 },
+    { 0x103C8, 0x103CF },
+    { 0x10400, 0x1049D },
+    { 0x10800, 0x10805 },
+    { 0x10808, 0x10808 },
+    { 0x1080A, 0x10835 },
+    { 0x10837, 0x10838 },
+    { 0x1083C, 0x1083C },
+    { 0x1083F, 0x1083F },
+    { 0x10900, 0x10915 },
+    { 0x10A00, 0x10A00 },
+    { 0x10A10, 0x10A13 },
+    { 0x10A15, 0x10A17 },
+    { 0x10A19, 0x10A33 },
+    { 0x12000, 0x1236E },
+    { 0x1D400, 0x1D454 },
+    { 0x1D456, 0x1D49C },
+    { 0x1D49E, 0x1D49F },
+    { 0x1D4A2, 0x1D4A2 },
+    { 0x1D4A5, 0x1D4A6 },
+    { 0x1D4A9, 0x1D4AC },
+    { 0x1D4AE, 0x1D4B9 },
+    { 0x1D4BB, 0x1D4BB },
+    { 0x1D4BD, 0x1D4C3 },
+    { 0x1D4C5, 0x1D505 },
+    { 0x1D507, 0x1D50A },
+    { 0x1D50D, 0x1D514 },
+    { 0x1D516, 0x1D51C },
+    { 0x1D51E, 0x1D539 },
+    { 0x1D53B, 0x1D53E },
+    { 0x1D540, 0x1D544 },
+    { 0x1D546, 0x1D546 },
+    { 0x1D54A, 0x1D550 },
+    { 0x1D552, 0x1D6A5 },
+    { 0x1D6A8, 0x1D6C0 },
+    { 0x1D6C2, 0x1D6DA },
+    { 0x1D6DC, 0x1D6FA },
+    { 0x1D6FC, 0x1D714 },
+    { 0x1D716, 0x1D734 },
+    { 0x1D736, 0x1D74E },
+    { 0x1D750, 0x1D76E },
+    { 0x1D770, 0x1D788 },
+    { 0x1D78A, 0x1D7A8 },
+    { 0x1D7AA, 0x1D7C2 },
+    { 0x1D7C4, 0x1D7CB },
+    { 0x20000, 0x2A6D6 },
+    { 0x2F800, 0x2FA1D }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_L)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Ll.c
@@ -0,0 +1,524 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0061, 0x007A },
+    { 0x00AA, 0x00AA },
+    { 0x00B5, 0x00B5 },
+    { 0x00BA, 0x00BA },
+    { 0x00DF, 0x00F6 },
+    { 0x00F8, 0x00FF },
+    { 0x0101, 0x0101 },
+    { 0x0103, 0x0103 },
+    { 0x0105, 0x0105 },
+    { 0x0107, 0x0107 },
+    { 0x0109, 0x0109 },
+    { 0x010B, 0x010B },
+    { 0x010D, 0x010D },
+    { 0x010F, 0x010F },
+    { 0x0111, 0x0111 },
+    { 0x0113, 0x0113 },
+    { 0x0115, 0x0115 },
+    { 0x0117, 0x0117 },
+    { 0x0119, 0x0119 },
+    { 0x011B, 0x011B },
+    { 0x011D, 0x011D },
+    { 0x011F, 0x011F },
+    { 0x0121, 0x0121 },
+    { 0x0123, 0x0123 },
+    { 0x0125, 0x0125 },
+    { 0x0127, 0x0127 },
+    { 0x0129, 0x0129 },
+    { 0x012B, 0x012B },
+    { 0x012D, 0x012D },
+    { 0x012F, 0x012F },
+    { 0x0131, 0x0131 },
+    { 0x0133, 0x0133 },
+    { 0x0135, 0x0135 },
+    { 0x0137, 0x0138 },
+    { 0x013A, 0x013A },
+    { 0x013C, 0x013C },
+    { 0x013E, 0x013E },
+    { 0x0140, 0x0140 },
+    { 0x0142, 0x0142 },
+    { 0x0144, 0x0144 },
+    { 0x0146, 0x0146 },
+    { 0x0148, 0x0149 },
+    { 0x014B, 0x014B },
+    { 0x014D, 0x014D },
+    { 0x014F, 0x014F },
+    { 0x0151, 0x0151 },
+    { 0x0153, 0x0153 },
+    { 0x0155, 0x0155 },
+    { 0x0157, 0x0157 },
+    { 0x0159, 0x0159 },
+    { 0x015B, 0x015B },
+    { 0x015D, 0x015D },
+    { 0x015F, 0x015F },
+    { 0x0161, 0x0161 },
+    { 0x0163, 0x0163 },
+    { 0x0165, 0x0165 },
+    { 0x0167, 0x0167 },
+    { 0x0169, 0x0169 },
+    { 0x016B, 0x016B },
+    { 0x016D, 0x016D },
+    { 0x016F, 0x016F },
+    { 0x0171, 0x0171 },
+    { 0x0173, 0x0173 },
+    { 0x0175, 0x0175 },
+    { 0x0177, 0x0177 },
+    { 0x017A, 0x017A },
+    { 0x017C, 0x017C },
+    { 0x017E, 0x0180 },
+    { 0x0183, 0x0183 },
+    { 0x0185, 0x0185 },
+    { 0x0188, 0x0188 },
+    { 0x018C, 0x018D },
+    { 0x0192, 0x0192 },
+    { 0x0195, 0x0195 },
+    { 0x0199, 0x019B },
+    { 0x019E, 0x019E },
+    { 0x01A1, 0x01A1 },
+    { 0x01A3, 0x01A3 },
+    { 0x01A5, 0x01A5 },
+    { 0x01A8, 0x01A8 },
+    { 0x01AA, 0x01AB },
+    { 0x01AD, 0x01AD },
+    { 0x01B0, 0x01B0 },
+    { 0x01B4, 0x01B4 },
+    { 0x01B6, 0x01B6 },
+    { 0x01B9, 0x01BA },
+    { 0x01BD, 0x01BF },
+    { 0x01C6, 0x01C6 },
+    { 0x01C9, 0x01C9 },
+    { 0x01CC, 0x01CC },
+    { 0x01CE, 0x01CE },
+    { 0x01D0, 0x01D0 },
+    { 0x01D2, 0x01D2 },
+    { 0x01D4, 0x01D4 },
+    { 0x01D6, 0x01D6 },
+    { 0x01D8, 0x01D8 },
+    { 0x01DA, 0x01DA },
+    { 0x01DC, 0x01DD },
+    { 0x01DF, 0x01DF },
+    { 0x01E1, 0x01E1 },
+    { 0x01E3, 0x01E3 },
+    { 0x01E5, 0x01E5 },
+    { 0x01E7, 0x01E7 },
+    { 0x01E9, 0x01E9 },
+    { 0x01EB, 0x01EB },
+    { 0x01ED, 0x01ED },
+    { 0x01EF, 0x01F0 },
+    { 0x01F3, 0x01F3 },
+    { 0x01F5, 0x01F5 },
+    { 0x01F9, 0x01F9 },
+    { 0x01FB, 0x01FB },
+    { 0x01FD, 0x01FD },
+    { 0x01FF, 0x01FF },
+    { 0x0201, 0x0201 },
+    { 0x0203, 0x0203 },
+    { 0x0205, 0x0205 },
+    { 0x0207, 0x0207 },
+    { 0x0209, 0x0209 },
+    { 0x020B, 0x020B },
+    { 0x020D, 0x020D },
+    { 0x020F, 0x020F },
+    { 0x0211, 0x0211 },
+    { 0x0213, 0x0213 },
+    { 0x0215, 0x0215 },
+    { 0x0217, 0x0217 },
+    { 0x0219, 0x0219 },
+    { 0x021B, 0x021B },
+    { 0x021D, 0x021D },
+    { 0x021F, 0x021F },
+    { 0x0221, 0x0221 },
+    { 0x0223, 0x0223 },
+    { 0x0225, 0x0225 },
+    { 0x0227, 0x0227 },
+    { 0x0229, 0x0229 },
+    { 0x022B, 0x022B },
+    { 0x022D, 0x022D },
+    { 0x022F, 0x022F },
+    { 0x0231, 0x0231 },
+    { 0x0233, 0x0239 },
+    { 0x023C, 0x023C },
+    { 0x023F, 0x0240 },
+    { 0x0242, 0x0242 },
+    { 0x0247, 0x0247 },
+    { 0x0249, 0x0249 },
+    { 0x024B, 0x024B },
+    { 0x024D, 0x024D },
+    { 0x024F, 0x0293 },
+    { 0x0295, 0x02AF },
+    { 0x037B, 0x037D },
+    { 0x0390, 0x0390 },
+    { 0x03AC, 0x03CE },
+    { 0x03D0, 0x03D1 },
+    { 0x03D5, 0x03D7 },
+    { 0x03D9, 0x03D9 },
+    { 0x03DB, 0x03DB },
+    { 0x03DD, 0x03DD },
+    { 0x03DF, 0x03DF },
+    { 0x03E1, 0x03E1 },
+    { 0x03E3, 0x03E3 },
+    { 0x03E5, 0x03E5 },
+    { 0x03E7, 0x03E7 },
+    { 0x03E9, 0x03E9 },
+    { 0x03EB, 0x03EB },
+    { 0x03ED, 0x03ED },
+    { 0x03EF, 0x03F3 },
+    { 0x03F5, 0x03F5 },
+    { 0x03F8, 0x03F8 },
+    { 0x03FB, 0x03FC },
+    { 0x0430, 0x045F },
+    { 0x0461, 0x0461 },
+    { 0x0463, 0x0463 },
+    { 0x0465, 0x0465 },
+    { 0x0467, 0x0467 },
+    { 0x0469, 0x0469 },
+    { 0x046B, 0x046B },
+    { 0x046D, 0x046D },
+    { 0x046F, 0x046F },
+    { 0x0471, 0x0471 },
+    { 0x0473, 0x0473 },
+    { 0x0475, 0x0475 },
+    { 0x0477, 0x0477 },
+    { 0x0479, 0x0479 },
+    { 0x047B, 0x047B },
+    { 0x047D, 0x047D },
+    { 0x047F, 0x047F },
+    { 0x0481, 0x0481 },
+    { 0x048B, 0x048B },
+    { 0x048D, 0x048D },
+    { 0x048F, 0x048F },
+    { 0x0491, 0x0491 },
+    { 0x0493, 0x0493 },
+    { 0x0495, 0x0495 },
+    { 0x0497, 0x0497 },
+    { 0x0499, 0x0499 },
+    { 0x049B, 0x049B },
+    { 0x049D, 0x049D },
+    { 0x049F, 0x049F },
+    { 0x04A1, 0x04A1 },
+    { 0x04A3, 0x04A3 },
+    { 0x04A5, 0x04A5 },
+    { 0x04A7, 0x04A7 },
+    { 0x04A9, 0x04A9 },
+    { 0x04AB, 0x04AB },
+    { 0x04AD, 0x04AD },
+    { 0x04AF, 0x04AF },
+    { 0x04B1, 0x04B1 },
+    { 0x04B3, 0x04B3 },
+    { 0x04B5, 0x04B5 },
+    { 0x04B7, 0x04B7 },
+    { 0x04B9, 0x04B9 },
+    { 0x04BB, 0x04BB },
+    { 0x04BD, 0x04BD },
+    { 0x04BF, 0x04BF },
+    { 0x04C2, 0x04C2 },
+    { 0x04C4, 0x04C4 },
+    { 0x04C6, 0x04C6 },
+    { 0x04C8, 0x04C8 },
+    { 0x04CA, 0x04CA },
+    { 0x04CC, 0x04CC },
+    { 0x04CE, 0x04CF },
+    { 0x04D1, 0x04D1 },
+    { 0x04D3, 0x04D3 },
+    { 0x04D5, 0x04D5 },
+    { 0x04D7, 0x04D7 },
+    { 0x04D9, 0x04D9 },
+    { 0x04DB, 0x04DB },
+    { 0x04DD, 0x04DD },
+    { 0x04DF, 0x04DF },
+    { 0x04E1, 0x04E1 },
+    { 0x04E3, 0x04E3 },
+    { 0x04E5, 0x04E5 },
+    { 0x04E7, 0x04E7 },
+    { 0x04E9, 0x04E9 },
+    { 0x04EB, 0x04EB },
+    { 0x04ED, 0x04ED },
+    { 0x04EF, 0x04EF },
+    { 0x04F1, 0x04F1 },
+    { 0x04F3, 0x04F3 },
+    { 0x04F5, 0x04F5 },
+    { 0x04F7, 0x04F7 },
+    { 0x04F9, 0x04F9 },
+    { 0x04FB, 0x04FB },
+    { 0x04FD, 0x04FD },
+    { 0x04FF, 0x04FF },
+    { 0x0501, 0x0501 },
+    { 0x0503, 0x0503 },
+    { 0x0505, 0x0505 },
+    { 0x0507, 0x0507 },
+    { 0x0509, 0x0509 },
+    { 0x050B, 0x050B },
+    { 0x050D, 0x050D },
+    { 0x050F, 0x050F },
+    { 0x0511, 0x0511 },
+    { 0x0513, 0x0513 },
+    { 0x0561, 0x0587 },
+    { 0x1D00, 0x1D2B },
+    { 0x1D62, 0x1D77 },
+    { 0x1D79, 0x1D9A },
+    { 0x1E01, 0x1E01 },
+    { 0x1E03, 0x1E03 },
+    { 0x1E05, 0x1E05 },
+    { 0x1E07, 0x1E07 },
+    { 0x1E09, 0x1E09 },
+    { 0x1E0B, 0x1E0B },
+    { 0x1E0D, 0x1E0D },
+    { 0x1E0F, 0x1E0F },
+    { 0x1E11, 0x1E11 },
+    { 0x1E13, 0x1E13 },
+    { 0x1E15, 0x1E15 },
+    { 0x1E17, 0x1E17 },
+    { 0x1E19, 0x1E19 },
+    { 0x1E1B, 0x1E1B },
+    { 0x1E1D, 0x1E1D },
+    { 0x1E1F, 0x1E1F },
+    { 0x1E21, 0x1E21 },
+    { 0x1E23, 0x1E23 },
+    { 0x1E25, 0x1E25 },
+    { 0x1E27, 0x1E27 },
+    { 0x1E29, 0x1E29 },
+    { 0x1E2B, 0x1E2B },
+    { 0x1E2D, 0x1E2D },
+    { 0x1E2F, 0x1E2F },
+    { 0x1E31, 0x1E31 },
+    { 0x1E33, 0x1E33 },
+    { 0x1E35, 0x1E35 },
+    { 0x1E37, 0x1E37 },
+    { 0x1E39, 0x1E39 },
+    { 0x1E3B, 0x1E3B },
+    { 0x1E3D, 0x1E3D },
+    { 0x1E3F, 0x1E3F },
+    { 0x1E41, 0x1E41 },
+    { 0x1E43, 0x1E43 },
+    { 0x1E45, 0x1E45 },
+    { 0x1E47, 0x1E47 },
+    { 0x1E49, 0x1E49 },
+    { 0x1E4B, 0x1E4B },
+    { 0x1E4D, 0x1E4D },
+    { 0x1E4F, 0x1E4F },
+    { 0x1E51, 0x1E51 },
+    { 0x1E53, 0x1E53 },
+    { 0x1E55, 0x1E55 },
+    { 0x1E57, 0x1E57 },
+    { 0x1E59, 0x1E59 },
+    { 0x1E5B, 0x1E5B },
+    { 0x1E5D, 0x1E5D },
+    { 0x1E5F, 0x1E5F },
+    { 0x1E61, 0x1E61 },
+    { 0x1E63, 0x1E63 },
+    { 0x1E65, 0x1E65 },
+    { 0x1E67, 0x1E67 },
+    { 0x1E69, 0x1E69 },
+    { 0x1E6B, 0x1E6B },
+    { 0x1E6D, 0x1E6D },
+    { 0x1E6F, 0x1E6F },
+    { 0x1E71, 0x1E71 },
+    { 0x1E73, 0x1E73 },
+    { 0x1E75, 0x1E75 },
+    { 0x1E77, 0x1E77 },
+    { 0x1E79, 0x1E79 },
+    { 0x1E7B, 0x1E7B },
+    { 0x1E7D, 0x1E7D },
+    { 0x1E7F, 0x1E7F },
+    { 0x1E81, 0x1E81 },
+    { 0x1E83, 0x1E83 },
+    { 0x1E85, 0x1E85 },
+    { 0x1E87, 0x1E87 },
+    { 0x1E89, 0x1E89 },
+    { 0x1E8B, 0x1E8B },
+    { 0x1E8D, 0x1E8D },
+    { 0x1E8F, 0x1E8F },
+    { 0x1E91, 0x1E91 },
+    { 0x1E93, 0x1E93 },
+    { 0x1E95, 0x1E9B },
+    { 0x1EA1, 0x1EA1 },
+    { 0x1EA3, 0x1EA3 },
+    { 0x1EA5, 0x1EA5 },
+    { 0x1EA7, 0x1EA7 },
+    { 0x1EA9, 0x1EA9 },
+    { 0x1EAB, 0x1EAB },
+    { 0x1EAD, 0x1EAD },
+    { 0x1EAF, 0x1EAF },
+    { 0x1EB1, 0x1EB1 },
+    { 0x1EB3, 0x1EB3 },
+    { 0x1EB5, 0x1EB5 },
+    { 0x1EB7, 0x1EB7 },
+    { 0x1EB9, 0x1EB9 },
+    { 0x1EBB, 0x1EBB },
+    { 0x1EBD, 0x1EBD },
+    { 0x1EBF, 0x1EBF },
+    { 0x1EC1, 0x1EC1 },
+    { 0x1EC3, 0x1EC3 },
+    { 0x1EC5, 0x1EC5 },
+    { 0x1EC7, 0x1EC7 },
+    { 0x1EC9, 0x1EC9 },
+    { 0x1ECB, 0x1ECB },
+    { 0x1ECD, 0x1ECD },
+    { 0x1ECF, 0x1ECF },
+    { 0x1ED1, 0x1ED1 },
+    { 0x1ED3, 0x1ED3 },
+    { 0x1ED5, 0x1ED5 },
+    { 0x1ED7, 0x1ED7 },
+    { 0x1ED9, 0x1ED9 },
+    { 0x1EDB, 0x1EDB },
+    { 0x1EDD, 0x1EDD },
+    { 0x1EDF, 0x1EDF },
+    { 0x1EE1, 0x1EE1 },
+    { 0x1EE3, 0x1EE3 },
+    { 0x1EE5, 0x1EE5 },
+    { 0x1EE7, 0x1EE7 },
+    { 0x1EE9, 0x1EE9 },
+    { 0x1EEB, 0x1EEB },
+    { 0x1EED, 0x1EED },
+    { 0x1EEF, 0x1EEF },
+    { 0x1EF1, 0x1EF1 },
+    { 0x1EF3, 0x1EF3 },
+    { 0x1EF5, 0x1EF5 },
+    { 0x1EF7, 0x1EF7 },
+    { 0x1EF9, 0x1EF9 },
+    { 0x1F00, 0x1F07 },
+    { 0x1F10, 0x1F15 },
+    { 0x1F20, 0x1F27 },
+    { 0x1F30, 0x1F37 },
+    { 0x1F40, 0x1F45 },
+    { 0x1F50, 0x1F57 },
+    { 0x1F60, 0x1F67 },
+    { 0x1F70, 0x1F7D },
+    { 0x1F80, 0x1F87 },
+    { 0x1F90, 0x1F97 },
+    { 0x1FA0, 0x1FA7 },
+    { 0x1FB0, 0x1FB4 },
+    { 0x1FB6, 0x1FB7 },
+    { 0x1FBE, 0x1FBE },
+    { 0x1FC2, 0x1FC4 },
+    { 0x1FC6, 0x1FC7 },
+    { 0x1FD0, 0x1FD3 },
+    { 0x1FD6, 0x1FD7 },
+    { 0x1FE0, 0x1FE7 },
+    { 0x1FF2, 0x1FF4 },
+    { 0x1FF6, 0x1FF7 },
+    { 0x2071, 0x2071 },
+    { 0x207F, 0x207F },
+    { 0x210A, 0x210A },
+    { 0x210E, 0x210F },
+    { 0x2113, 0x2113 },
+    { 0x212F, 0x212F },
+    { 0x2134, 0x2134 },
+    { 0x2139, 0x2139 },
+    { 0x213C, 0x213D },
+    { 0x2146, 0x2149 },
+    { 0x214E, 0x214E },
+    { 0x2184, 0x2184 },
+    { 0x2C30, 0x2C5E },
+    { 0x2C61, 0x2C61 },
+    { 0x2C65, 0x2C66 },
+    { 0x2C68, 0x2C68 },
+    { 0x2C6A, 0x2C6A },
+    { 0x2C6C, 0x2C6C },
+    { 0x2C74, 0x2C74 },
+    { 0x2C76, 0x2C77 },
+    { 0x2C81, 0x2C81 },
+    { 0x2C83, 0x2C83 },
+    { 0x2C85, 0x2C85 },
+    { 0x2C87, 0x2C87 },
+    { 0x2C89, 0x2C89 },
+    { 0x2C8B, 0x2C8B },
+    { 0x2C8D, 0x2C8D },
+    { 0x2C8F, 0x2C8F },
+    { 0x2C91, 0x2C91 },
+    { 0x2C93, 0x2C93 },
+    { 0x2C95, 0x2C95 },
+    { 0x2C97, 0x2C97 },
+    { 0x2C99, 0x2C99 },
+    { 0x2C9B, 0x2C9B },
+    { 0x2C9D, 0x2C9D },
+    { 0x2C9F, 0x2C9F },
+    { 0x2CA1, 0x2CA1 },
+    { 0x2CA3, 0x2CA3 },
+    { 0x2CA5, 0x2CA5 },
+    { 0x2CA7, 0x2CA7 },
+    { 0x2CA9, 0x2CA9 },
+    { 0x2CAB, 0x2CAB },
+    { 0x2CAD, 0x2CAD },
+    { 0x2CAF, 0x2CAF },
+    { 0x2CB1, 0x2CB1 },
+    { 0x2CB3, 0x2CB3 },
+    { 0x2CB5, 0x2CB5 },
+    { 0x2CB7, 0x2CB7 },
+    { 0x2CB9, 0x2CB9 },
+    { 0x2CBB, 0x2CBB },
+    { 0x2CBD, 0x2CBD },
+    { 0x2CBF, 0x2CBF },
+    { 0x2CC1, 0x2CC1 },
+    { 0x2CC3, 0x2CC3 },
+    { 0x2CC5, 0x2CC5 },
+    { 0x2CC7, 0x2CC7 },
+    { 0x2CC9, 0x2CC9 },
+    { 0x2CCB, 0x2CCB },
+    { 0x2CCD, 0x2CCD },
+    { 0x2CCF, 0x2CCF },
+    { 0x2CD1, 0x2CD1 },
+    { 0x2CD3, 0x2CD3 },
+    { 0x2CD5, 0x2CD5 },
+    { 0x2CD7, 0x2CD7 },
+    { 0x2CD9, 0x2CD9 },
+    { 0x2CDB, 0x2CDB },
+    { 0x2CDD, 0x2CDD },
+    { 0x2CDF, 0x2CDF },
+    { 0x2CE1, 0x2CE1 },
+    { 0x2CE3, 0x2CE4 },
+    { 0x2D00, 0x2D25 },
+    { 0xFB00, 0xFB06 },
+    { 0xFB13, 0xFB17 },
+    { 0xFF41, 0xFF5A },
+    { 0x10428, 0x1044F },
+    { 0x1D41A, 0x1D433 },
+    { 0x1D44E, 0x1D454 },
+    { 0x1D456, 0x1D467 },
+    { 0x1D482, 0x1D49B },
+    { 0x1D4B6, 0x1D4B9 },
+    { 0x1D4BB, 0x1D4BB },
+    { 0x1D4BD, 0x1D4C3 },
+    { 0x1D4C5, 0x1D4CF },
+    { 0x1D4EA, 0x1D503 },
+    { 0x1D51E, 0x1D537 },
+    { 0x1D552, 0x1D56B },
+    { 0x1D586, 0x1D59F },
+    { 0x1D5BA, 0x1D5D3 },
+    { 0x1D5EE, 0x1D607 },
+    { 0x1D622, 0x1D63B },
+    { 0x1D656, 0x1D66F },
+    { 0x1D68A, 0x1D6A5 },
+    { 0x1D6C2, 0x1D6DA },
+    { 0x1D6DC, 0x1D6E1 },
+    { 0x1D6FC, 0x1D714 },
+    { 0x1D716, 0x1D71B },
+    { 0x1D736, 0x1D74E },
+    { 0x1D750, 0x1D755 },
+    { 0x1D770, 0x1D788 },
+    { 0x1D78A, 0x1D78F },
+    { 0x1D7AA, 0x1D7C2 },
+    { 0x1D7C4, 0x1D7C9 },
+    { 0x1D7CB, 0x1D7CB }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Ll)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Lm.c
@@ -0,0 +1,51 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x02B0, 0x02C1 },
+    { 0x02C6, 0x02D1 },
+    { 0x02E0, 0x02E4 },
+    { 0x02EE, 0x02EE },
+    { 0x037A, 0x037A },
+    { 0x0559, 0x0559 },
+    { 0x0640, 0x0640 },
+    { 0x06E5, 0x06E6 },
+    { 0x07F4, 0x07F5 },
+    { 0x07FA, 0x07FA },
+    { 0x0E46, 0x0E46 },
+    { 0x0EC6, 0x0EC6 },
+    { 0x10FC, 0x10FC },
+    { 0x17D7, 0x17D7 },
+    { 0x1843, 0x1843 },
+    { 0x1D2C, 0x1D61 },
+    { 0x1D78, 0x1D78 },
+    { 0x1D9B, 0x1DBF },
+    { 0x2090, 0x2094 },
+    { 0x2D6F, 0x2D6F },
+    { 0x3005, 0x3005 },
+    { 0x3031, 0x3035 },
+    { 0x303B, 0x303B },
+    { 0x309D, 0x309E },
+    { 0x30FC, 0x30FE },
+    { 0xA015, 0xA015 },
+    { 0xA717, 0xA71A },
+    { 0xFF70, 0xFF70 },
+    { 0xFF9E, 0xFF9F }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Lm)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Lo.c
@@ -0,0 +1,275 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x01BB, 0x01BB },
+    { 0x01C0, 0x01C3 },
+    { 0x0294, 0x0294 },
+    { 0x05D0, 0x05EA },
+    { 0x05F0, 0x05F2 },
+    { 0x0621, 0x063A },
+    { 0x0641, 0x064A },
+    { 0x066E, 0x066F },
+    { 0x0671, 0x06D3 },
+    { 0x06D5, 0x06D5 },
+    { 0x06EE, 0x06EF },
+    { 0x06FA, 0x06FC },
+    { 0x06FF, 0x06FF },
+    { 0x0710, 0x0710 },
+    { 0x0712, 0x072F },
+    { 0x074D, 0x076D },
+    { 0x0780, 0x07A5 },
+    { 0x07B1, 0x07B1 },
+    { 0x07CA, 0x07EA },
+    { 0x0904, 0x0939 },
+    { 0x093D, 0x093D },
+    { 0x0950, 0x0950 },
+    { 0x0958, 0x0961 },
+    { 0x097B, 0x097F },
+    { 0x0985, 0x098C },
+    { 0x098F, 0x0990 },
+    { 0x0993, 0x09A8 },
+    { 0x09AA, 0x09B0 },
+    { 0x09B2, 0x09B2 },
+    { 0x09B6, 0x09B9 },
+    { 0x09BD, 0x09BD },
+    { 0x09CE, 0x09CE },
+    { 0x09DC, 0x09DD },
+    { 0x09DF, 0x09E1 },
+    { 0x09F0, 0x09F1 },
+    { 0x0A05, 0x0A0A },
+    { 0x0A0F, 0x0A10 },
+    { 0x0A13, 0x0A28 },
+    { 0x0A2A, 0x0A30 },
+    { 0x0A32, 0x0A33 },
+    { 0x0A35, 0x0A36 },
+    { 0x0A38, 0x0A39 },
+    { 0x0A59, 0x0A5C },
+    { 0x0A5E, 0x0A5E },
+    { 0x0A72, 0x0A74 },
+    { 0x0A85, 0x0A8D },
+    { 0x0A8F, 0x0A91 },
+    { 0x0A93, 0x0AA8 },
+    { 0x0AAA, 0x0AB0 },
+    { 0x0AB2, 0x0AB3 },
+    { 0x0AB5, 0x0AB9 },
+    { 0x0ABD, 0x0ABD },
+    { 0x0AD0, 0x0AD0 },
+    { 0x0AE0, 0x0AE1 },
+    { 0x0B05, 0x0B0C },
+    { 0x0B0F, 0x0B10 },
+    { 0x0B13, 0x0B28 },
+    { 0x0B2A, 0x0B30 },
+    { 0x0B32, 0x0B33 },
+    { 0x0B35, 0x0B39 },
+    { 0x0B3D, 0x0B3D },
+    { 0x0B5C, 0x0B5D },
+    { 0x0B5F, 0x0B61 },
+    { 0x0B71, 0x0B71 },
+    { 0x0B83, 0x0B83 },
+    { 0x0B85, 0x0B8A },
+    { 0x0B8E, 0x0B90 },
+    { 0x0B92, 0x0B95 },
+    { 0x0B99, 0x0B9A },
+    { 0x0B9C, 0x0B9C },
+    { 0x0B9E, 0x0B9F },
+    { 0x0BA3, 0x0BA4 },
+    { 0x0BA8, 0x0BAA },
+    { 0x0BAE, 0x0BB9 },
+    { 0x0C05, 0x0C0C },
+    { 0x0C0E, 0x0C10 },
+    { 0x0C12, 0x0C28 },
+    { 0x0C2A, 0x0C33 },
+    { 0x0C35, 0x0C39 },
+    { 0x0C60, 0x0C61 },
+    { 0x0C85, 0x0C8C },
+    { 0x0C8E, 0x0C90 },
+    { 0x0C92, 0x0CA8 },
+    { 0x0CAA, 0x0CB3 },
+    { 0x0CB5, 0x0CB9 },
+    { 0x0CBD, 0x0CBD },
+    { 0x0CDE, 0x0CDE },
+    { 0x0CE0, 0x0CE1 },
+    { 0x0D05, 0x0D0C },
+    { 0x0D0E, 0x0D10 },
+    { 0x0D12, 0x0D28 },
+    { 0x0D2A, 0x0D39 },
+    { 0x0D60, 0x0D61 },
+    { 0x0D85, 0x0D96 },
+    { 0x0D9A, 0x0DB1 },
+    { 0x0DB3, 0x0DBB },
+    { 0x0DBD, 0x0DBD },
+    { 0x0DC0, 0x0DC6 },
+    { 0x0E01, 0x0E30 },
+    { 0x0E32, 0x0E33 },
+    { 0x0E40, 0x0E45 },
+    { 0x0E81, 0x0E82 },
+    { 0x0E84, 0x0E84 },
+    { 0x0E87, 0x0E88 },
+    { 0x0E8A, 0x0E8A },
+    { 0x0E8D, 0x0E8D },
+    { 0x0E94, 0x0E97 },
+    { 0x0E99, 0x0E9F },
+    { 0x0EA1, 0x0EA3 },
+    { 0x0EA5, 0x0EA5 },
+    { 0x0EA7, 0x0EA7 },
+    { 0x0EAA, 0x0EAB },
+    { 0x0EAD, 0x0EB0 },
+    { 0x0EB2, 0x0EB3 },
+    { 0x0EBD, 0x0EBD },
+    { 0x0EC0, 0x0EC4 },
+    { 0x0EDC, 0x0EDD },
+    { 0x0F00, 0x0F00 },
+    { 0x0F40, 0x0F47 },
+    { 0x0F49, 0x0F6A },
+    { 0x0F88, 0x0F8B },
+    { 0x1000, 0x1021 },
+    { 0x1023, 0x1027 },
+    { 0x1029, 0x102A },
+    { 0x1050, 0x1055 },
+    { 0x10D0, 0x10FA },
+    { 0x1100, 0x1159 },
+    { 0x115F, 0x11A2 },
+    { 0x11A8, 0x11F9 },
+    { 0x1200, 0x1248 },
+    { 0x124A, 0x124D },
+    { 0x1250, 0x1256 },
+    { 0x1258, 0x1258 },
+    { 0x125A, 0x125D },
+    { 0x1260, 0x1288 },
+    { 0x128A, 0x128D },
+    { 0x1290, 0x12B0 },
+    { 0x12B2, 0x12B5 },
+    { 0x12B8, 0x12BE },
+    { 0x12C0, 0x12C0 },
+    { 0x12C2, 0x12C5 },
+    { 0x12C8, 0x12D6 },
+    { 0x12D8, 0x1310 },
+    { 0x1312, 0x1315 },
+    { 0x1318, 0x135A },
+    { 0x1380, 0x138F },
+    { 0x13A0, 0x13F4 },
+    { 0x1401, 0x166C },
+    { 0x166F, 0x1676 },
+    { 0x1681, 0x169A },
+    { 0x16A0, 0x16EA },
+    { 0x1700, 0x170C },
+    { 0x170E, 0x1711 },
+    { 0x1720, 0x1731 },
+    { 0x1740, 0x1751 },
+    { 0x1760, 0x176C },
+    { 0x176E, 0x1770 },
+    { 0x1780, 0x17B3 },
+    { 0x17DC, 0x17DC },
+    { 0x1820, 0x1842 },
+    { 0x1844, 0x1877 },
+    { 0x1880, 0x18A8 },
+    { 0x1900, 0x191C },
+    { 0x1950, 0x196D },
+    { 0x1970, 0x1974 },
+    { 0x1980, 0x19A9 },
+    { 0x19C1, 0x19C7 },
+    { 0x1A00, 0x1A16 },
+    { 0x1B05, 0x1B33 },
+    { 0x1B45, 0x1B4B },
+    { 0x2135, 0x2138 },
+    { 0x2D30, 0x2D65 },
+    { 0x2D80, 0x2D96 },
+    { 0x2DA0, 0x2DA6 },
+    { 0x2DA8, 0x2DAE },
+    { 0x2DB0, 0x2DB6 },
+    { 0x2DB8, 0x2DBE },
+    { 0x2DC0, 0x2DC6 },
+    { 0x2DC8, 0x2DCE },
+    { 0x2DD0, 0x2DD6 },
+    { 0x2DD8, 0x2DDE },
+    { 0x3006, 0x3006 },
+    { 0x303C, 0x303C },
+    { 0x3041, 0x3096 },
+    { 0x309F, 0x309F },
+    { 0x30A1, 0x30FA },
+    { 0x30FF, 0x30FF },
+    { 0x3105, 0x312C },
+    { 0x3131, 0x318E },
+    { 0x31A0, 0x31B7 },
+    { 0x31F0, 0x31FF },
+    { 0x3400, 0x4DB5 },
+    { 0x4E00, 0x9FBB },
+    { 0xA000, 0xA014 },
+    { 0xA016, 0xA48C },
+    { 0xA800, 0xA801 },
+    { 0xA803, 0xA805 },
+    { 0xA807, 0xA80A },
+    { 0xA80C, 0xA822 },
+    { 0xA840, 0xA873 },
+    { 0xAC00, 0xD7A3 },
+    { 0xF900, 0xFA2D },
+    { 0xFA30, 0xFA6A },
+    { 0xFA70, 0xFAD9 },
+    { 0xFB1D, 0xFB1D },
+    { 0xFB1F, 0xFB28 },
+    { 0xFB2A, 0xFB36 },
+    { 0xFB38, 0xFB3C },
+    { 0xFB3E, 0xFB3E },
+    { 0xFB40, 0xFB41 },
+    { 0xFB43, 0xFB44 },
+    { 0xFB46, 0xFBB1 },
+    { 0xFBD3, 0xFD3D },
+    { 0xFD50, 0xFD8F },
+    { 0xFD92, 0xFDC7 },
+    { 0xFDF0, 0xFDFB },
+    { 0xFE70, 0xFE74 },
+    { 0xFE76, 0xFEFC },
+    { 0xFF66, 0xFF6F },
+    { 0xFF71, 0xFF9D },
+    { 0xFFA0, 0xFFBE },
+    { 0xFFC2, 0xFFC7 },
+    { 0xFFCA, 0xFFCF },
+    { 0xFFD2, 0xFFD7 },
+    { 0xFFDA, 0xFFDC },
+    { 0x10000, 0x1000B },
+    { 0x1000D, 0x10026 },
+    { 0x10028, 0x1003A },
+    { 0x1003C, 0x1003D },
+    { 0x1003F, 0x1004D },
+    { 0x10050, 0x1005D },
+    { 0x10080, 0x100FA },
+    { 0x10300, 0x1031E },
+    { 0x10330, 0x10340 },
+    { 0x10342, 0x10349 },
+    { 0x10380, 0x1039D },
+    { 0x103A0, 0x103C3 },
+    { 0x103C8, 0x103CF },
+    { 0x10450, 0x1049D },
+    { 0x10800, 0x10805 },
+    { 0x10808, 0x10808 },
+    { 0x1080A, 0x10835 },
+    { 0x10837, 0x10838 },
+    { 0x1083C, 0x1083C },
+    { 0x1083F, 0x1083F },
+    { 0x10900, 0x10915 },
+    { 0x10A00, 0x10A00 },
+    { 0x10A10, 0x10A13 },
+    { 0x10A15, 0x10A17 },
+    { 0x10A19, 0x10A33 },
+    { 0x12000, 0x1236E },
+    { 0x20000, 0x2A6D6 },
+    { 0x2F800, 0x2FA1D }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Lo)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Lt.c
@@ -0,0 +1,32 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x01C5, 0x01C5 },
+    { 0x01C8, 0x01C8 },
+    { 0x01CB, 0x01CB },
+    { 0x01F2, 0x01F2 },
+    { 0x1F88, 0x1F8F },
+    { 0x1F98, 0x1F9F },
+    { 0x1FA8, 0x1FAF },
+    { 0x1FBC, 0x1FBC },
+    { 0x1FCC, 0x1FCC },
+    { 0x1FFC, 0x1FFC }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Lt)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Lu.c
@@ -0,0 +1,515 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0041, 0x005A },
+    { 0x00C0, 0x00D6 },
+    { 0x00D8, 0x00DE },
+    { 0x0100, 0x0100 },
+    { 0x0102, 0x0102 },
+    { 0x0104, 0x0104 },
+    { 0x0106, 0x0106 },
+    { 0x0108, 0x0108 },
+    { 0x010A, 0x010A },
+    { 0x010C, 0x010C },
+    { 0x010E, 0x010E },
+    { 0x0110, 0x0110 },
+    { 0x0112, 0x0112 },
+    { 0x0114, 0x0114 },
+    { 0x0116, 0x0116 },
+    { 0x0118, 0x0118 },
+    { 0x011A, 0x011A },
+    { 0x011C, 0x011C },
+    { 0x011E, 0x011E },
+    { 0x0120, 0x0120 },
+    { 0x0122, 0x0122 },
+    { 0x0124, 0x0124 },
+    { 0x0126, 0x0126 },
+    { 0x0128, 0x0128 },
+    { 0x012A, 0x012A },
+    { 0x012C, 0x012C },
+    { 0x012E, 0x012E },
+    { 0x0130, 0x0130 },
+    { 0x0132, 0x0132 },
+    { 0x0134, 0x0134 },
+    { 0x0136, 0x0136 },
+    { 0x0139, 0x0139 },
+    { 0x013B, 0x013B },
+    { 0x013D, 0x013D },
+    { 0x013F, 0x013F },
+    { 0x0141, 0x0141 },
+    { 0x0143, 0x0143 },
+    { 0x0145, 0x0145 },
+    { 0x0147, 0x0147 },
+    { 0x014A, 0x014A },
+    { 0x014C, 0x014C },
+    { 0x014E, 0x014E },
+    { 0x0150, 0x0150 },
+    { 0x0152, 0x0152 },
+    { 0x0154, 0x0154 },
+    { 0x0156, 0x0156 },
+    { 0x0158, 0x0158 },
+    { 0x015A, 0x015A },
+    { 0x015C, 0x015C },
+    { 0x015E, 0x015E },
+    { 0x0160, 0x0160 },
+    { 0x0162, 0x0162 },
+    { 0x0164, 0x0164 },
+    { 0x0166, 0x0166 },
+    { 0x0168, 0x0168 },
+    { 0x016A, 0x016A },
+    { 0x016C, 0x016C },
+    { 0x016E, 0x016E },
+    { 0x0170, 0x0170 },
+    { 0x0172, 0x0172 },
+    { 0x0174, 0x0174 },
+    { 0x0176, 0x0176 },
+    { 0x0178, 0x0179 },
+    { 0x017B, 0x017B },
+    { 0x017D, 0x017D },
+    { 0x0181, 0x0182 },
+    { 0x0184, 0x0184 },
+    { 0x0186, 0x0187 },
+    { 0x0189, 0x018B },
+    { 0x018E, 0x0191 },
+    { 0x0193, 0x0194 },
+    { 0x0196, 0x0198 },
+    { 0x019C, 0x019D },
+    { 0x019F, 0x01A0 },
+    { 0x01A2, 0x01A2 },
+    { 0x01A4, 0x01A4 },
+    { 0x01A6, 0x01A7 },
+    { 0x01A9, 0x01A9 },
+    { 0x01AC, 0x01AC },
+    { 0x01AE, 0x01AF },
+    { 0x01B1, 0x01B3 },
+    { 0x01B5, 0x01B5 },
+    { 0x01B7, 0x01B8 },
+    { 0x01BC, 0x01BC },
+    { 0x01C4, 0x01C4 },
+    { 0x01C7, 0x01C7 },
+    { 0x01CA, 0x01CA },
+    { 0x01CD, 0x01CD },
+    { 0x01CF, 0x01CF },
+    { 0x01D1, 0x01D1 },
+    { 0x01D3, 0x01D3 },
+    { 0x01D5, 0x01D5 },
+    { 0x01D7, 0x01D7 },
+    { 0x01D9, 0x01D9 },
+    { 0x01DB, 0x01DB },
+    { 0x01DE, 0x01DE },
+    { 0x01E0, 0x01E0 },
+    { 0x01E2, 0x01E2 },
+    { 0x01E4, 0x01E4 },
+    { 0x01E6, 0x01E6 },
+    { 0x01E8, 0x01E8 },
+    { 0x01EA, 0x01EA },
+    { 0x01EC, 0x01EC },
+    { 0x01EE, 0x01EE },
+    { 0x01F1, 0x01F1 },
+    { 0x01F4, 0x01F4 },
+    { 0x01F6, 0x01F8 },
+    { 0x01FA, 0x01FA },
+    { 0x01FC, 0x01FC },
+    { 0x01FE, 0x01FE },
+    { 0x0200, 0x0200 },
+    { 0x0202, 0x0202 },
+    { 0x0204, 0x0204 },
+    { 0x0206, 0x0206 },
+    { 0x0208, 0x0208 },
+    { 0x020A, 0x020A },
+    { 0x020C, 0x020C },
+    { 0x020E, 0x020E },
+    { 0x0210, 0x0210 },
+    { 0x0212, 0x0212 },
+    { 0x0214, 0x0214 },
+    { 0x0216, 0x0216 },
+    { 0x0218, 0x0218 },
+    { 0x021A, 0x021A },
+    { 0x021C, 0x021C },
+    { 0x021E, 0x021E },
+    { 0x0220, 0x0220 },
+    { 0x0222, 0x0222 },
+    { 0x0224, 0x0224 },
+    { 0x0226, 0x0226 },
+    { 0x0228, 0x0228 },
+    { 0x022A, 0x022A },
+    { 0x022C, 0x022C },
+    { 0x022E, 0x022E },
+    { 0x0230, 0x0230 },
+    { 0x0232, 0x0232 },
+    { 0x023A, 0x023B },
+    { 0x023D, 0x023E },
+    { 0x0241, 0x0241 },
+    { 0x0243, 0x0246 },
+    { 0x0248, 0x0248 },
+    { 0x024A, 0x024A },
+    { 0x024C, 0x024C },
+    { 0x024E, 0x024E },
+    { 0x0386, 0x0386 },
+    { 0x0388, 0x038A },
+    { 0x038C, 0x038C },
+    { 0x038E, 0x038F },
+    { 0x0391, 0x03A1 },
+    { 0x03A3, 0x03AB },
+    { 0x03D2, 0x03D4 },
+    { 0x03D8, 0x03D8 },
+    { 0x03DA, 0x03DA },
+    { 0x03DC, 0x03DC },
+    { 0x03DE, 0x03DE },
+    { 0x03E0, 0x03E0 },
+    { 0x03E2, 0x03E2 },
+    { 0x03E4, 0x03E4 },
+    { 0x03E6, 0x03E6 },
+    { 0x03E8, 0x03E8 },
+    { 0x03EA, 0x03EA },
+    { 0x03EC, 0x03EC },
+    { 0x03EE, 0x03EE },
+    { 0x03F4, 0x03F4 },
+    { 0x03F7, 0x03F7 },
+    { 0x03F9, 0x03FA },
+    { 0x03FD, 0x042F },
+    { 0x0460, 0x0460 },
+    { 0x0462, 0x0462 },
+    { 0x0464, 0x0464 },
+    { 0x0466, 0x0466 },
+    { 0x0468, 0x0468 },
+    { 0x046A, 0x046A },
+    { 0x046C, 0x046C },
+    { 0x046E, 0x046E },
+    { 0x0470, 0x0470 },
+    { 0x0472, 0x0472 },
+    { 0x0474, 0x0474 },
+    { 0x0476, 0x0476 },
+    { 0x0478, 0x0478 },
+    { 0x047A, 0x047A },
+    { 0x047C, 0x047C },
+    { 0x047E, 0x047E },
+    { 0x0480, 0x0480 },
+    { 0x048A, 0x048A },
+    { 0x048C, 0x048C },
+    { 0x048E, 0x048E },
+    { 0x0490, 0x0490 },
+    { 0x0492, 0x0492 },
+    { 0x0494, 0x0494 },
+    { 0x0496, 0x0496 },
+    { 0x0498, 0x0498 },
+    { 0x049A, 0x049A },
+    { 0x049C, 0x049C },
+    { 0x049E, 0x049E },
+    { 0x04A0, 0x04A0 },
+    { 0x04A2, 0x04A2 },
+    { 0x04A4, 0x04A4 },
+    { 0x04A6, 0x04A6 },
+    { 0x04A8, 0x04A8 },
+    { 0x04AA, 0x04AA },
+    { 0x04AC, 0x04AC },
+    { 0x04AE, 0x04AE },
+    { 0x04B0, 0x04B0 },
+    { 0x04B2, 0x04B2 },
+    { 0x04B4, 0x04B4 },
+    { 0x04B6, 0x04B6 },
+    { 0x04B8, 0x04B8 },
+    { 0x04BA, 0x04BA },
+    { 0x04BC, 0x04BC },
+    { 0x04BE, 0x04BE },
+    { 0x04C0, 0x04C1 },
+    { 0x04C3, 0x04C3 },
+    { 0x04C5, 0x04C5 },
+    { 0x04C7, 0x04C7 },
+    { 0x04C9, 0x04C9 },
+    { 0x04CB, 0x04CB },
+    { 0x04CD, 0x04CD },
+    { 0x04D0, 0x04D0 },
+    { 0x04D2, 0x04D2 },
+    { 0x04D4, 0x04D4 },
+    { 0x04D6, 0x04D6 },
+    { 0x04D8, 0x04D8 },
+    { 0x04DA, 0x04DA },
+    { 0x04DC, 0x04DC },
+    { 0x04DE, 0x04DE },
+    { 0x04E0, 0x04E0 },
+    { 0x04E2, 0x04E2 },
+    { 0x04E4, 0x04E4 },
+    { 0x04E6, 0x04E6 },
+    { 0x04E8, 0x04E8 },
+    { 0x04EA, 0x04EA },
+    { 0x04EC, 0x04EC },
+    { 0x04EE, 0x04EE },
+    { 0x04F0, 0x04F0 },
+    { 0x04F2, 0x04F2 },
+    { 0x04F4, 0x04F4 },
+    { 0x04F6, 0x04F6 },
+    { 0x04F8, 0x04F8 },
+    { 0x04FA, 0x04FA },
+    { 0x04FC, 0x04FC },
+    { 0x04FE, 0x04FE },
+    { 0x0500, 0x0500 },
+    { 0x0502, 0x0502 },
+    { 0x0504, 0x0504 },
+    { 0x0506, 0x0506 },
+    { 0x0508, 0x0508 },
+    { 0x050A, 0x050A },
+    { 0x050C, 0x050C },
+    { 0x050E, 0x050E },
+    { 0x0510, 0x0510 },
+    { 0x0512, 0x0512 },
+    { 0x0531, 0x0556 },
+    { 0x10A0, 0x10C5 },
+    { 0x1E00, 0x1E00 },
+    { 0x1E02, 0x1E02 },
+    { 0x1E04, 0x1E04 },
+    { 0x1E06, 0x1E06 },
+    { 0x1E08, 0x1E08 },
+    { 0x1E0A, 0x1E0A },
+    { 0x1E0C, 0x1E0C },
+    { 0x1E0E, 0x1E0E },
+    { 0x1E10, 0x1E10 },
+    { 0x1E12, 0x1E12 },
+    { 0x1E14, 0x1E14 },
+    { 0x1E16, 0x1E16 },
+    { 0x1E18, 0x1E18 },
+    { 0x1E1A, 0x1E1A },
+    { 0x1E1C, 0x1E1C },
+    { 0x1E1E, 0x1E1E },
+    { 0x1E20, 0x1E20 },
+    { 0x1E22, 0x1E22 },
+    { 0x1E24, 0x1E24 },
+    { 0x1E26, 0x1E26 },
+    { 0x1E28, 0x1E28 },
+    { 0x1E2A, 0x1E2A },
+    { 0x1E2C, 0x1E2C },
+    { 0x1E2E, 0x1E2E },
+    { 0x1E30, 0x1E30 },
+    { 0x1E32, 0x1E32 },
+    { 0x1E34, 0x1E34 },
+    { 0x1E36, 0x1E36 },
+    { 0x1E38, 0x1E38 },
+    { 0x1E3A, 0x1E3A },
+    { 0x1E3C, 0x1E3C },
+    { 0x1E3E, 0x1E3E },
+    { 0x1E40, 0x1E40 },
+    { 0x1E42, 0x1E42 },
+    { 0x1E44, 0x1E44 },
+    { 0x1E46, 0x1E46 },
+    { 0x1E48, 0x1E48 },
+    { 0x1E4A, 0x1E4A },
+    { 0x1E4C, 0x1E4C },
+    { 0x1E4E, 0x1E4E },
+    { 0x1E50, 0x1E50 },
+    { 0x1E52, 0x1E52 },
+    { 0x1E54, 0x1E54 },
+    { 0x1E56, 0x1E56 },
+    { 0x1E58, 0x1E58 },
+    { 0x1E5A, 0x1E5A },
+    { 0x1E5C, 0x1E5C },
+    { 0x1E5E, 0x1E5E },
+    { 0x1E60, 0x1E60 },
+    { 0x1E62, 0x1E62 },
+    { 0x1E64, 0x1E64 },
+    { 0x1E66, 0x1E66 },
+    { 0x1E68, 0x1E68 },
+    { 0x1E6A, 0x1E6A },
+    { 0x1E6C, 0x1E6C },
+    { 0x1E6E, 0x1E6E },
+    { 0x1E70, 0x1E70 },
+    { 0x1E72, 0x1E72 },
+    { 0x1E74, 0x1E74 },
+    { 0x1E76, 0x1E76 },
+    { 0x1E78, 0x1E78 },
+    { 0x1E7A, 0x1E7A },
+    { 0x1E7C, 0x1E7C },
+    { 0x1E7E, 0x1E7E },
+    { 0x1E80, 0x1E80 },
+    { 0x1E82, 0x1E82 },
+    { 0x1E84, 0x1E84 },
+    { 0x1E86, 0x1E86 },
+    { 0x1E88, 0x1E88 },
+    { 0x1E8A, 0x1E8A },
+    { 0x1E8C, 0x1E8C },
+    { 0x1E8E, 0x1E8E },
+    { 0x1E90, 0x1E90 },
+    { 0x1E92, 0x1E92 },
+    { 0x1E94, 0x1E94 },
+    { 0x1EA0, 0x1EA0 },
+    { 0x1EA2, 0x1EA2 },
+    { 0x1EA4, 0x1EA4 },
+    { 0x1EA6, 0x1EA6 },
+    { 0x1EA8, 0x1EA8 },
+    { 0x1EAA, 0x1EAA },
+    { 0x1EAC, 0x1EAC },
+    { 0x1EAE, 0x1EAE },
+    { 0x1EB0, 0x1EB0 },
+    { 0x1EB2, 0x1EB2 },
+    { 0x1EB4, 0x1EB4 },
+    { 0x1EB6, 0x1EB6 },
+    { 0x1EB8, 0x1EB8 },
+    { 0x1EBA, 0x1EBA },
+    { 0x1EBC, 0x1EBC },
+    { 0x1EBE, 0x1EBE },
+    { 0x1EC0, 0x1EC0 },
+    { 0x1EC2, 0x1EC2 },
+    { 0x1EC4, 0x1EC4 },
+    { 0x1EC6, 0x1EC6 },
+    { 0x1EC8, 0x1EC8 },
+    { 0x1ECA, 0x1ECA },
+    { 0x1ECC, 0x1ECC },
+    { 0x1ECE, 0x1ECE },
+    { 0x1ED0, 0x1ED0 },
+    { 0x1ED2, 0x1ED2 },
+    { 0x1ED4, 0x1ED4 },
+    { 0x1ED6, 0x1ED6 },
+    { 0x1ED8, 0x1ED8 },
+    { 0x1EDA, 0x1EDA },
+    { 0x1EDC, 0x1EDC },
+    { 0x1EDE, 0x1EDE },
+    { 0x1EE0, 0x1EE0 },
+    { 0x1EE2, 0x1EE2 },
+    { 0x1EE4, 0x1EE4 },
+    { 0x1EE6, 0x1EE6 },
+    { 0x1EE8, 0x1EE8 },
+    { 0x1EEA, 0x1EEA },
+    { 0x1EEC, 0x1EEC },
+    { 0x1EEE, 0x1EEE },
+    { 0x1EF0, 0x1EF0 },
+    { 0x1EF2, 0x1EF2 },
+    { 0x1EF4, 0x1EF4 },
+    { 0x1EF6, 0x1EF6 },
+    { 0x1EF8, 0x1EF8 },
+    { 0x1F08, 0x1F0F },
+    { 0x1F18, 0x1F1D },
+    { 0x1F28, 0x1F2F },
+    { 0x1F38, 0x1F3F },
+    { 0x1F48, 0x1F4D },
+    { 0x1F59, 0x1F59 },
+    { 0x1F5B, 0x1F5B },
+    { 0x1F5D, 0x1F5D },
+    { 0x1F5F, 0x1F5F },
+    { 0x1F68, 0x1F6F },
+    { 0x1FB8, 0x1FBB },
+    { 0x1FC8, 0x1FCB },
+    { 0x1FD8, 0x1FDB },
+    { 0x1FE8, 0x1FEC },
+    { 0x1FF8, 0x1FFB },
+    { 0x2102, 0x2102 },
+    { 0x2107, 0x2107 },
+    { 0x210B, 0x210D },
+    { 0x2110, 0x2112 },
+    { 0x2115, 0x2115 },
+    { 0x2119, 0x211D },
+    { 0x2124, 0x2124 },
+    { 0x2126, 0x2126 },
+    { 0x2128, 0x2128 },
+    { 0x212A, 0x212D },
+    { 0x2130, 0x2133 },
+    { 0x213E, 0x213F },
+    { 0x2145, 0x2145 },
+    { 0x2183, 0x2183 },
+    { 0x2C00, 0x2C2E },
+    { 0x2C60, 0x2C60 },
+    { 0x2C62, 0x2C64 },
+    { 0x2C67, 0x2C67 },
+    { 0x2C69, 0x2C69 },
+    { 0x2C6B, 0x2C6B },
+    { 0x2C75, 0x2C75 },
+    { 0x2C80, 0x2C80 },
+    { 0x2C82, 0x2C82 },
+    { 0x2C84, 0x2C84 },
+    { 0x2C86, 0x2C86 },
+    { 0x2C88, 0x2C88 },
+    { 0x2C8A, 0x2C8A },
+    { 0x2C8C, 0x2C8C },
+    { 0x2C8E, 0x2C8E },
+    { 0x2C90, 0x2C90 },
+    { 0x2C92, 0x2C92 },
+    { 0x2C94, 0x2C94 },
+    { 0x2C96, 0x2C96 },
+    { 0x2C98, 0x2C98 },
+    { 0x2C9A, 0x2C9A },
+    { 0x2C9C, 0x2C9C },
+    { 0x2C9E, 0x2C9E },
+    { 0x2CA0, 0x2CA0 },
+    { 0x2CA2, 0x2CA2 },
+    { 0x2CA4, 0x2CA4 },
+    { 0x2CA6, 0x2CA6 },
+    { 0x2CA8, 0x2CA8 },
+    { 0x2CAA, 0x2CAA },
+    { 0x2CAC, 0x2CAC },
+    { 0x2CAE, 0x2CAE },
+    { 0x2CB0, 0x2CB0 },
+    { 0x2CB2, 0x2CB2 },
+    { 0x2CB4, 0x2CB4 },
+    { 0x2CB6, 0x2CB6 },
+    { 0x2CB8, 0x2CB8 },
+    { 0x2CBA, 0x2CBA },
+    { 0x2CBC, 0x2CBC },
+    { 0x2CBE, 0x2CBE },
+    { 0x2CC0, 0x2CC0 },
+    { 0x2CC2, 0x2CC2 },
+    { 0x2CC4, 0x2CC4 },
+    { 0x2CC6, 0x2CC6 },
+    { 0x2CC8, 0x2CC8 },
+    { 0x2CCA, 0x2CCA },
+    { 0x2CCC, 0x2CCC },
+    { 0x2CCE, 0x2CCE },
+    { 0x2CD0, 0x2CD0 },
+    { 0x2CD2, 0x2CD2 },
+    { 0x2CD4, 0x2CD4 },
+    { 0x2CD6, 0x2CD6 },
+    { 0x2CD8, 0x2CD8 },
+    { 0x2CDA, 0x2CDA },
+    { 0x2CDC, 0x2CDC },
+    { 0x2CDE, 0x2CDE },
+    { 0x2CE0, 0x2CE0 },
+    { 0x2CE2, 0x2CE2 },
+    { 0xFF21, 0xFF3A },
+    { 0x10400, 0x10427 },
+    { 0x1D400, 0x1D419 },
+    { 0x1D434, 0x1D44D },
+    { 0x1D468, 0x1D481 },
+    { 0x1D49C, 0x1D49C },
+    { 0x1D49E, 0x1D49F },
+    { 0x1D4A2, 0x1D4A2 },
+    { 0x1D4A5, 0x1D4A6 },
+    { 0x1D4A9, 0x1D4AC },
+    { 0x1D4AE, 0x1D4B5 },
+    { 0x1D4D0, 0x1D4E9 },
+    { 0x1D504, 0x1D505 },
+    { 0x1D507, 0x1D50A },
+    { 0x1D50D, 0x1D514 },
+    { 0x1D516, 0x1D51C },
+    { 0x1D538, 0x1D539 },
+    { 0x1D53B, 0x1D53E },
+    { 0x1D540, 0x1D544 },
+    { 0x1D546, 0x1D546 },
+    { 0x1D54A, 0x1D550 },
+    { 0x1D56C, 0x1D585 },
+    { 0x1D5A0, 0x1D5B9 },
+    { 0x1D5D4, 0x1D5ED },
+    { 0x1D608, 0x1D621 },
+    { 0x1D63C, 0x1D655 },
+    { 0x1D670, 0x1D689 },
+    { 0x1D6A8, 0x1D6C0 },
+    { 0x1D6E2, 0x1D6FA },
+    { 0x1D71C, 0x1D734 },
+    { 0x1D756, 0x1D76E },
+    { 0x1D790, 0x1D7A8 },
+    { 0x1D7CA, 0x1D7CA }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Lu)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_M.c
@@ -0,0 +1,160 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0300, 0x036F },
+    { 0x0483, 0x0486 },
+    { 0x0488, 0x0489 },
+    { 0x0591, 0x05BD },
+    { 0x05BF, 0x05BF },
+    { 0x05C1, 0x05C2 },
+    { 0x05C4, 0x05C5 },
+    { 0x05C7, 0x05C7 },
+    { 0x0610, 0x0615 },
+    { 0x064B, 0x065E },
+    { 0x0670, 0x0670 },
+    { 0x06D6, 0x06DC },
+    { 0x06DE, 0x06E4 },
+    { 0x06E7, 0x06E8 },
+    { 0x06EA, 0x06ED },
+    { 0x0711, 0x0711 },
+    { 0x0730, 0x074A },
+    { 0x07A6, 0x07B0 },
+    { 0x07EB, 0x07F3 },
+    { 0x0901, 0x0903 },
+    { 0x093C, 0x093C },
+    { 0x093E, 0x094D },
+    { 0x0951, 0x0954 },
+    { 0x0962, 0x0963 },
+    { 0x0981, 0x0983 },
+    { 0x09BC, 0x09BC },
+    { 0x09BE, 0x09C4 },
+    { 0x09C7, 0x09C8 },
+    { 0x09CB, 0x09CD },
+    { 0x09D7, 0x09D7 },
+    { 0x09E2, 0x09E3 },
+    { 0x0A01, 0x0A03 },
+    { 0x0A3C, 0x0A3C },
+    { 0x0A3E, 0x0A42 },
+    { 0x0A47, 0x0A48 },
+    { 0x0A4B, 0x0A4D },
+    { 0x0A70, 0x0A71 },
+    { 0x0A81, 0x0A83 },
+    { 0x0ABC, 0x0ABC },
+    { 0x0ABE, 0x0AC5 },
+    { 0x0AC7, 0x0AC9 },
+    { 0x0ACB, 0x0ACD },
+    { 0x0AE2, 0x0AE3 },
+    { 0x0B01, 0x0B03 },
+    { 0x0B3C, 0x0B3C },
+    { 0x0B3E, 0x0B43 },
+    { 0x0B47, 0x0B48 },
+    { 0x0B4B, 0x0B4D },
+    { 0x0B56, 0x0B57 },
+    { 0x0B82, 0x0B82 },
+    { 0x0BBE, 0x0BC2 },
+    { 0x0BC6, 0x0BC8 },
+    { 0x0BCA, 0x0BCD },
+    { 0x0BD7, 0x0BD7 },
+    { 0x0C01, 0x0C03 },
+    { 0x0C3E, 0x0C44 },
+    { 0x0C46, 0x0C48 },
+    { 0x0C4A, 0x0C4D },
+    { 0x0C55, 0x0C56 },
+    { 0x0C82, 0x0C83 },
+    { 0x0CBC, 0x0CBC },
+    { 0x0CBE, 0x0CC4 },
+    { 0x0CC6, 0x0CC8 },
+    { 0x0CCA, 0x0CCD },
+    { 0x0CD5, 0x0CD6 },
+    { 0x0CE2, 0x0CE3 },
+    { 0x0D02, 0x0D03 },
+    { 0x0D3E, 0x0D43 },
+    { 0x0D46, 0x0D48 },
+    { 0x0D4A, 0x0D4D },
+    { 0x0D57, 0x0D57 },
+    { 0x0D82, 0x0D83 },
+    { 0x0DCA, 0x0DCA },
+    { 0x0DCF, 0x0DD4 },
+    { 0x0DD6, 0x0DD6 },
+    { 0x0DD8, 0x0DDF },
+    { 0x0DF2, 0x0DF3 },
+    { 0x0E31, 0x0E31 },
+    { 0x0E34, 0x0E3A },
+    { 0x0E47, 0x0E4E },
+    { 0x0EB1, 0x0EB1 },
+    { 0x0EB4, 0x0EB9 },
+    { 0x0EBB, 0x0EBC },
+    { 0x0EC8, 0x0ECD },
+    { 0x0F18, 0x0F19 },
+    { 0x0F35, 0x0F35 },
+    { 0x0F37, 0x0F37 },
+    { 0x0F39, 0x0F39 },
+    { 0x0F3E, 0x0F3F },
+    { 0x0F71, 0x0F84 },
+    { 0x0F86, 0x0F87 },
+    { 0x0F90, 0x0F97 },
+    { 0x0F99, 0x0FBC },
+    { 0x0FC6, 0x0FC6 },
+    { 0x102C, 0x1032 },
+    { 0x1036, 0x1039 },
+    { 0x1056, 0x1059 },
+    { 0x135F, 0x135F },
+    { 0x1712, 0x1714 },
+    { 0x1732, 0x1734 },
+    { 0x1752, 0x1753 },
+    { 0x1772, 0x1773 },
+    { 0x17B6, 0x17D3 },
+    { 0x17DD, 0x17DD },
+    { 0x180B, 0x180D },
+    { 0x18A9, 0x18A9 },
+    { 0x1920, 0x192B },
+    { 0x1930, 0x193B },
+    { 0x19B0, 0x19C0 },
+    { 0x19C8, 0x19C9 },
+    { 0x1A17, 0x1A1B },
+    { 0x1B00, 0x1B04 },
+    { 0x1B34, 0x1B44 },
+    { 0x1B6B, 0x1B73 },
+    { 0x1DC0, 0x1DCA },
+    { 0x1DFE, 0x1DFF },
+    { 0x20D0, 0x20EF },
+    { 0x302A, 0x302F },
+    { 0x3099, 0x309A },
+    { 0xA802, 0xA802 },
+    { 0xA806, 0xA806 },
+    { 0xA80B, 0xA80B },
+    { 0xA823, 0xA827 },
+    { 0xFB1E, 0xFB1E },
+    { 0xFE00, 0xFE0F },
+    { 0xFE20, 0xFE23 },
+    { 0x10A01, 0x10A03 },
+    { 0x10A05, 0x10A06 },
+    { 0x10A0C, 0x10A0F },
+    { 0x10A38, 0x10A3A },
+    { 0x10A3F, 0x10A3F },
+    { 0x1D165, 0x1D169 },
+    { 0x1D16D, 0x1D172 },
+    { 0x1D17B, 0x1D182 },
+    { 0x1D185, 0x1D18B },
+    { 0x1D1AA, 0x1D1AD },
+    { 0x1D242, 0x1D244 },
+    { 0xE0100, 0xE01EF }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_M)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Mc.c
@@ -0,0 +1,90 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0903, 0x0903 },
+    { 0x093E, 0x0940 },
+    { 0x0949, 0x094C },
+    { 0x0982, 0x0983 },
+    { 0x09BE, 0x09C0 },
+    { 0x09C7, 0x09C8 },
+    { 0x09CB, 0x09CC },
+    { 0x09D7, 0x09D7 },
+    { 0x0A03, 0x0A03 },
+    { 0x0A3E, 0x0A40 },
+    { 0x0A83, 0x0A83 },
+    { 0x0ABE, 0x0AC0 },
+    { 0x0AC9, 0x0AC9 },
+    { 0x0ACB, 0x0ACC },
+    { 0x0B02, 0x0B03 },
+    { 0x0B3E, 0x0B3E },
+    { 0x0B40, 0x0B40 },
+    { 0x0B47, 0x0B48 },
+    { 0x0B4B, 0x0B4C },
+    { 0x0B57, 0x0B57 },
+    { 0x0BBE, 0x0BBF },
+    { 0x0BC1, 0x0BC2 },
+    { 0x0BC6, 0x0BC8 },
+    { 0x0BCA, 0x0BCC },
+    { 0x0BD7, 0x0BD7 },
+    { 0x0C01, 0x0C03 },
+    { 0x0C41, 0x0C44 },
+    { 0x0C82, 0x0C83 },
+    { 0x0CBE, 0x0CBE },
+    { 0x0CC0, 0x0CC4 },
+    { 0x0CC7, 0x0CC8 },
+    { 0x0CCA, 0x0CCB },
+    { 0x0CD5, 0x0CD6 },
+    { 0x0D02, 0x0D03 },
+    { 0x0D3E, 0x0D40 },
+    { 0x0D46, 0x0D48 },
+    { 0x0D4A, 0x0D4C },
+    { 0x0D57, 0x0D57 },
+    { 0x0D82, 0x0D83 },
+    { 0x0DCF, 0x0DD1 },
+    { 0x0DD8, 0x0DDF },
+    { 0x0DF2, 0x0DF3 },
+    { 0x0F3E, 0x0F3F },
+    { 0x0F7F, 0x0F7F },
+    { 0x102C, 0x102C },
+    { 0x1031, 0x1031 },
+    { 0x1038, 0x1038 },
+    { 0x1056, 0x1057 },
+    { 0x17B6, 0x17B6 },
+    { 0x17BE, 0x17C5 },
+    { 0x17C7, 0x17C8 },
+    { 0x1923, 0x1926 },
+    { 0x1929, 0x192B },
+    { 0x1930, 0x1931 },
+    { 0x1933, 0x1938 },
+    { 0x19B0, 0x19C0 },
+    { 0x19C8, 0x19C9 },
+    { 0x1A19, 0x1A1B },
+    { 0x1B04, 0x1B04 },
+    { 0x1B35, 0x1B35 },
+    { 0x1B3B, 0x1B3B },
+    { 0x1B3D, 0x1B41 },
+    { 0x1B43, 0x1B44 },
+    { 0xA802, 0xA802 },
+    { 0xA823, 0xA824 },
+    { 0xA827, 0xA827 },
+    { 0x1D165, 0x1D166 },
+    { 0x1D16D, 0x1D172 }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Mc)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Me.c
@@ -0,0 +1,26 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0488, 0x0489 },
+    { 0x06DE, 0x06DE },
+    { 0x20DD, 0x20E0 },
+    { 0x20E2, 0x20E4 }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Me)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Mn.c
@@ -0,0 +1,154 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0300, 0x036F },
+    { 0x0483, 0x0486 },
+    { 0x0591, 0x05BD },
+    { 0x05BF, 0x05BF },
+    { 0x05C1, 0x05C2 },
+    { 0x05C4, 0x05C5 },
+    { 0x05C7, 0x05C7 },
+    { 0x0610, 0x0615 },
+    { 0x064B, 0x065E },
+    { 0x0670, 0x0670 },
+    { 0x06D6, 0x06DC },
+    { 0x06DF, 0x06E4 },
+    { 0x06E7, 0x06E8 },
+    { 0x06EA, 0x06ED },
+    { 0x0711, 0x0711 },
+    { 0x0730, 0x074A },
+    { 0x07A6, 0x07B0 },
+    { 0x07EB, 0x07F3 },
+    { 0x0901, 0x0902 },
+    { 0x093C, 0x093C },
+    { 0x0941, 0x0948 },
+    { 0x094D, 0x094D },
+    { 0x0951, 0x0954 },
+    { 0x0962, 0x0963 },
+    { 0x0981, 0x0981 },
+    { 0x09BC, 0x09BC },
+    { 0x09C1, 0x09C4 },
+    { 0x09CD, 0x09CD },
+    { 0x09E2, 0x09E3 },
+    { 0x0A01, 0x0A02 },
+    { 0x0A3C, 0x0A3C },
+    { 0x0A41, 0x0A42 },
+    { 0x0A47, 0x0A48 },
+    { 0x0A4B, 0x0A4D },
+    { 0x0A70, 0x0A71 },
+    { 0x0A81, 0x0A82 },
+    { 0x0ABC, 0x0ABC },
+    { 0x0AC1, 0x0AC5 },
+    { 0x0AC7, 0x0AC8 },
+    { 0x0ACD, 0x0ACD },
+    { 0x0AE2, 0x0AE3 },
+    { 0x0B01, 0x0B01 },
+    { 0x0B3C, 0x0B3C },
+    { 0x0B3F, 0x0B3F },
+    { 0x0B41, 0x0B43 },
+    { 0x0B4D, 0x0B4D },
+    { 0x0B56, 0x0B56 },
+    { 0x0B82, 0x0B82 },
+    { 0x0BC0, 0x0BC0 },
+    { 0x0BCD, 0x0BCD },
+    { 0x0C3E, 0x0C40 },
+    { 0x0C46, 0x0C48 },
+    { 0x0C4A, 0x0C4D },
+    { 0x0C55, 0x0C56 },
+    { 0x0CBC, 0x0CBC },
+    { 0x0CBF, 0x0CBF },
+    { 0x0CC6, 0x0CC6 },
+    { 0x0CCC, 0x0CCD },
+    { 0x0CE2, 0x0CE3 },
+    { 0x0D41, 0x0D43 },
+    { 0x0D4D, 0x0D4D },
+    { 0x0DCA, 0x0DCA },
+    { 0x0DD2, 0x0DD4 },
+    { 0x0DD6, 0x0DD6 },
+    { 0x0E31, 0x0E31 },
+    { 0x0E34, 0x0E3A },
+    { 0x0E47, 0x0E4E },
+    { 0x0EB1, 0x0EB1 },
+    { 0x0EB4, 0x0EB9 },
+    { 0x0EBB, 0x0EBC },
+    { 0x0EC8, 0x0ECD },
+    { 0x0F18, 0x0F19 },
+    { 0x0F35, 0x0F35 },
+    { 0x0F37, 0x0F37 },
+    { 0x0F39, 0x0F39 },
+    { 0x0F71, 0x0F7E },
+    { 0x0F80, 0x0F84 },
+    { 0x0F86, 0x0F87 },
+    { 0x0F90, 0x0F97 },
+    { 0x0F99, 0x0FBC },
+    { 0x0FC6, 0x0FC6 },
+    { 0x102D, 0x1030 },
+    { 0x1032, 0x1032 },
+    { 0x1036, 0x1037 },
+    { 0x1039, 0x1039 },
+    { 0x1058, 0x1059 },
+    { 0x135F, 0x135F },
+    { 0x1712, 0x1714 },
+    { 0x1732, 0x1734 },
+    { 0x1752, 0x1753 },
+    { 0x1772, 0x1773 },
+    { 0x17B7, 0x17BD },
+    { 0x17C6, 0x17C6 },
+    { 0x17C9, 0x17D3 },
+    { 0x17DD, 0x17DD },
+    { 0x180B, 0x180D },
+    { 0x18A9, 0x18A9 },
+    { 0x1920, 0x1922 },
+    { 0x1927, 0x1928 },
+    { 0x1932, 0x1932 },
+    { 0x1939, 0x193B },
+    { 0x1A17, 0x1A18 },
+    { 0x1B00, 0x1B03 },
+    { 0x1B34, 0x1B34 },
+    { 0x1B36, 0x1B3A },
+    { 0x1B3C, 0x1B3C },
+    { 0x1B42, 0x1B42 },
+    { 0x1B6B, 0x1B73 },
+    { 0x1DC0, 0x1DCA },
+    { 0x1DFE, 0x1DFF },
+    { 0x20D0, 0x20DC },
+    { 0x20E1, 0x20E1 },
+    { 0x20E5, 0x20EF },
+    { 0x302A, 0x302F },
+    { 0x3099, 0x309A },
+    { 0xA806, 0xA806 },
+    { 0xA80B, 0xA80B },
+    { 0xA825, 0xA826 },
+    { 0xFB1E, 0xFB1E },
+    { 0xFE00, 0xFE0F },
+    { 0xFE20, 0xFE23 },
+    { 0x10A01, 0x10A03 },
+    { 0x10A05, 0x10A06 },
+    { 0x10A0C, 0x10A0F },
+    { 0x10A38, 0x10A3A },
+    { 0x10A3F, 0x10A3F },
+    { 0x1D167, 0x1D169 },
+    { 0x1D17B, 0x1D182 },
+    { 0x1D185, 0x1D18B },
+    { 0x1D1AA, 0x1D1AD },
+    { 0x1D242, 0x1D244 },
+    { 0xE0100, 0xE01EF }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Mn)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_N.c
@@ -0,0 +1,81 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0030, 0x0039 },
+    { 0x00B2, 0x00B3 },
+    { 0x00B9, 0x00B9 },
+    { 0x00BC, 0x00BE },
+    { 0x0660, 0x0669 },
+    { 0x06F0, 0x06F9 },
+    { 0x07C0, 0x07C9 },
+    { 0x0966, 0x096F },
+    { 0x09E6, 0x09EF },
+    { 0x09F4, 0x09F9 },
+    { 0x0A66, 0x0A6F },
+    { 0x0AE6, 0x0AEF },
+    { 0x0B66, 0x0B6F },
+    { 0x0BE6, 0x0BF2 },
+    { 0x0C66, 0x0C6F },
+    { 0x0CE6, 0x0CEF },
+    { 0x0D66, 0x0D6F },
+    { 0x0E50, 0x0E59 },
+    { 0x0ED0, 0x0ED9 },
+    { 0x0F20, 0x0F33 },
+    { 0x1040, 0x1049 },
+    { 0x1369, 0x137C },
+    { 0x16EE, 0x16F0 },
+    { 0x17E0, 0x17E9 },
+    { 0x17F0, 0x17F9 },
+    { 0x1810, 0x1819 },
+    { 0x1946, 0x194F },
+    { 0x19D0, 0x19D9 },
+    { 0x1B50, 0x1B59 },
+    { 0x2070, 0x2070 },
+    { 0x2074, 0x2079 },
+    { 0x2080, 0x2089 },
+    { 0x2153, 0x2182 },
+    { 0x2460, 0x249B },
+    { 0x24EA, 0x24FF },
+    { 0x2776, 0x2793 },
+    { 0x2CFD, 0x2CFD },
+    { 0x3007, 0x3007 },
+    { 0x3021, 0x3029 },
+    { 0x3038, 0x303A },
+    { 0x3192, 0x3195 },
+    { 0x3220, 0x3229 },
+    { 0x3251, 0x325F },
+    { 0x3280, 0x3289 },
+    { 0x32B1, 0x32BF },
+    { 0xFF10, 0xFF19 },
+    { 0x10107, 0x10133 },
+    { 0x10140, 0x10178 },
+    { 0x1018A, 0x1018A },
+    { 0x10320, 0x10323 },
+    { 0x10341, 0x10341 },
+    { 0x1034A, 0x1034A },
+    { 0x103D1, 0x103D5 },
+    { 0x104A0, 0x104A9 },
+    { 0x10916, 0x10919 },
+    { 0x10A40, 0x10A47 },
+    { 0x12400, 0x12462 },
+    { 0x1D360, 0x1D371 },
+    { 0x1D7CE, 0x1D7FF }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_N)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Nd.c
@@ -0,0 +1,47 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0030, 0x0039 },
+    { 0x0660, 0x0669 },
+    { 0x06F0, 0x06F9 },
+    { 0x07C0, 0x07C9 },
+    { 0x0966, 0x096F },
+    { 0x09E6, 0x09EF },
+    { 0x0A66, 0x0A6F },
+    { 0x0AE6, 0x0AEF },
+    { 0x0B66, 0x0B6F },
+    { 0x0BE6, 0x0BEF },
+    { 0x0C66, 0x0C6F },
+    { 0x0CE6, 0x0CEF },
+    { 0x0D66, 0x0D6F },
+    { 0x0E50, 0x0E59 },
+    { 0x0ED0, 0x0ED9 },
+    { 0x0F20, 0x0F29 },
+    { 0x1040, 0x1049 },
+    { 0x17E0, 0x17E9 },
+    { 0x1810, 0x1819 },
+    { 0x1946, 0x194F },
+    { 0x19D0, 0x19D9 },
+    { 0x1B50, 0x1B59 },
+    { 0xFF10, 0xFF19 },
+    { 0x104A0, 0x104A9 },
+    { 0x1D7CE, 0x1D7FF }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Nd)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Nl.c
@@ -0,0 +1,32 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x16EE, 0x16F0 },
+    { 0x2160, 0x2182 },
+    { 0x3007, 0x3007 },
+    { 0x3021, 0x3029 },
+    { 0x3038, 0x303A },
+    { 0x10140, 0x10174 },
+    { 0x10341, 0x10341 },
+    { 0x1034A, 0x1034A },
+    { 0x103D1, 0x103D5 },
+    { 0x12400, 0x12462 }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Nl)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_No.c
@@ -0,0 +1,50 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x00B2, 0x00B3 },
+    { 0x00B9, 0x00B9 },
+    { 0x00BC, 0x00BE },
+    { 0x09F4, 0x09F9 },
+    { 0x0BF0, 0x0BF2 },
+    { 0x0F2A, 0x0F33 },
+    { 0x1369, 0x137C },
+    { 0x17F0, 0x17F9 },
+    { 0x2070, 0x2070 },
+    { 0x2074, 0x2079 },
+    { 0x2080, 0x2089 },
+    { 0x2153, 0x215F },
+    { 0x2460, 0x249B },
+    { 0x24EA, 0x24FF },
+    { 0x2776, 0x2793 },
+    { 0x2CFD, 0x2CFD },
+    { 0x3192, 0x3195 },
+    { 0x3220, 0x3229 },
+    { 0x3251, 0x325F },
+    { 0x3280, 0x3289 },
+    { 0x32B1, 0x32BF },
+    { 0x10107, 0x10133 },
+    { 0x10175, 0x10178 },
+    { 0x1018A, 0x1018A },
+    { 0x10320, 0x10323 },
+    { 0x10916, 0x10919 },
+    { 0x10A40, 0x10A47 },
+    { 0x1D360, 0x1D371 }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_No)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_P.c
@@ -0,0 +1,123 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0021, 0x0023 },
+    { 0x0025, 0x002A },
+    { 0x002C, 0x002F },
+    { 0x003A, 0x003B },
+    { 0x003F, 0x0040 },
+    { 0x005B, 0x005D },
+    { 0x005F, 0x005F },
+    { 0x007B, 0x007B },
+    { 0x007D, 0x007D },
+    { 0x00A1, 0x00A1 },
+    { 0x00AB, 0x00AB },
+    { 0x00B7, 0x00B7 },
+    { 0x00BB, 0x00BB },
+    { 0x00BF, 0x00BF },
+    { 0x037E, 0x037E },
+    { 0x0387, 0x0387 },
+    { 0x055A, 0x055F },
+    { 0x0589, 0x058A },
+    { 0x05BE, 0x05BE },
+    { 0x05C0, 0x05C0 },
+    { 0x05C3, 0x05C3 },
+    { 0x05C6, 0x05C6 },
+    { 0x05F3, 0x05F4 },
+    { 0x060C, 0x060D },
+    { 0x061B, 0x061B },
+    { 0x061E, 0x061F },
+    { 0x066A, 0x066D },
+    { 0x06D4, 0x06D4 },
+    { 0x0700, 0x070D },
+    { 0x07F7, 0x07F9 },
+    { 0x0964, 0x0965 },
+    { 0x0970, 0x0970 },
+    { 0x0DF4, 0x0DF4 },
+    { 0x0E4F, 0x0E4F },
+    { 0x0E5A, 0x0E5B },
+    { 0x0F04, 0x0F12 },
+    { 0x0F3A, 0x0F3D },
+    { 0x0F85, 0x0F85 },
+    { 0x0FD0, 0x0FD1 },
+    { 0x104A, 0x104F },
+    { 0x10FB, 0x10FB },
+    { 0x1361, 0x1368 },
+    { 0x166D, 0x166E },
+    { 0x169B, 0x169C },
+    { 0x16EB, 0x16ED },
+    { 0x1735, 0x1736 },
+    { 0x17D4, 0x17D6 },
+    { 0x17D8, 0x17DA },
+    { 0x1800, 0x180A },
+    { 0x1944, 0x1945 },
+    { 0x19DE, 0x19DF },
+    { 0x1A1E, 0x1A1F },
+    { 0x1B5A, 0x1B60 },
+    { 0x2010, 0x2027 },
+    { 0x2030, 0x2043 },
+    { 0x2045, 0x2051 },
+    { 0x2053, 0x205E },
+    { 0x207D, 0x207E },
+    { 0x208D, 0x208E },
+    { 0x2329, 0x232A },
+    { 0x2768, 0x2775 },
+    { 0x27C5, 0x27C6 },
+    { 0x27E6, 0x27EB },
+    { 0x2983, 0x2998 },
+    { 0x29D8, 0x29DB },
+    { 0x29FC, 0x29FD },
+    { 0x2CF9, 0x2CFC },
+    { 0x2CFE, 0x2CFF },
+    { 0x2E00, 0x2E17 },
+    { 0x2E1C, 0x2E1D },
+    { 0x3001, 0x3003 },
+    { 0x3008, 0x3011 },
+    { 0x3014, 0x301F },
+    { 0x3030, 0x3030 },
+    { 0x303D, 0x303D },
+    { 0x30A0, 0x30A0 },
+    { 0x30FB, 0x30FB },
+    { 0xA874, 0xA877 },
+    { 0xFD3E, 0xFD3F },
+    { 0xFE10, 0xFE19 },
+    { 0xFE30, 0xFE52 },
+    { 0xFE54, 0xFE61 },
+    { 0xFE63, 0xFE63 },
+    { 0xFE68, 0xFE68 },
+    { 0xFE6A, 0xFE6B },
+    { 0xFF01, 0xFF03 },
+    { 0xFF05, 0xFF0A },
+    { 0xFF0C, 0xFF0F },
+    { 0xFF1A, 0xFF1B },
+    { 0xFF1F, 0xFF20 },
+    { 0xFF3B, 0xFF3D },
+    { 0xFF3F, 0xFF3F },
+    { 0xFF5B, 0xFF5B },
+    { 0xFF5D, 0xFF5D },
+    { 0xFF5F, 0xFF65 },
+    { 0x10100, 0x10101 },
+    { 0x1039F, 0x1039F },
+    { 0x103D0, 0x103D0 },
+    { 0x1091F, 0x1091F },
+    { 0x10A50, 0x10A58 },
+    { 0x12470, 0x12473 }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_P)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Pc.c
@@ -0,0 +1,28 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x005F, 0x005F },
+    { 0x203F, 0x2040 },
+    { 0x2054, 0x2054 },
+    { 0xFE33, 0xFE34 },
+    { 0xFE4D, 0xFE4F },
+    { 0xFF3F, 0xFF3F }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Pc)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Pd.c
@@ -0,0 +1,34 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x002D, 0x002D },
+    { 0x058A, 0x058A },
+    { 0x1806, 0x1806 },
+    { 0x2010, 0x2015 },
+    { 0x2E17, 0x2E17 },
+    { 0x301C, 0x301C },
+    { 0x3030, 0x3030 },
+    { 0x30A0, 0x30A0 },
+    { 0xFE31, 0xFE32 },
+    { 0xFE58, 0xFE58 },
+    { 0xFE63, 0xFE63 },
+    { 0xFF0D, 0xFF0D }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Pd)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Pe.c
@@ -0,0 +1,86 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0029, 0x0029 },
+    { 0x005D, 0x005D },
+    { 0x007D, 0x007D },
+    { 0x0F3B, 0x0F3B },
+    { 0x0F3D, 0x0F3D },
+    { 0x169C, 0x169C },
+    { 0x2046, 0x2046 },
+    { 0x207E, 0x207E },
+    { 0x208E, 0x208E },
+    { 0x232A, 0x232A },
+    { 0x2769, 0x2769 },
+    { 0x276B, 0x276B },
+    { 0x276D, 0x276D },
+    { 0x276F, 0x276F },
+    { 0x2771, 0x2771 },
+    { 0x2773, 0x2773 },
+    { 0x2775, 0x2775 },
+    { 0x27C6, 0x27C6 },
+    { 0x27E7, 0x27E7 },
+    { 0x27E9, 0x27E9 },
+    { 0x27EB, 0x27EB },
+    { 0x2984, 0x2984 },
+    { 0x2986, 0x2986 },
+    { 0x2988, 0x2988 },
+    { 0x298A, 0x298A },
+    { 0x298C, 0x298C },
+    { 0x298E, 0x298E },
+    { 0x2990, 0x2990 },
+    { 0x2992, 0x2992 },
+    { 0x2994, 0x2994 },
+    { 0x2996, 0x2996 },
+    { 0x2998, 0x2998 },
+    { 0x29D9, 0x29D9 },
+    { 0x29DB, 0x29DB },
+    { 0x29FD, 0x29FD },
+    { 0x3009, 0x3009 },
+    { 0x300B, 0x300B },
+    { 0x300D, 0x300D },
+    { 0x300F, 0x300F },
+    { 0x3011, 0x3011 },
+    { 0x3015, 0x3015 },
+    { 0x3017, 0x3017 },
+    { 0x3019, 0x3019 },
+    { 0x301B, 0x301B },
+    { 0x301E, 0x301F },
+    { 0xFD3F, 0xFD3F },
+    { 0xFE18, 0xFE18 },
+    { 0xFE36, 0xFE36 },
+    { 0xFE38, 0xFE38 },
+    { 0xFE3A, 0xFE3A },
+    { 0xFE3C, 0xFE3C },
+    { 0xFE3E, 0xFE3E },
+    { 0xFE40, 0xFE40 },
+    { 0xFE42, 0xFE42 },
+    { 0xFE44, 0xFE44 },
+    { 0xFE48, 0xFE48 },
+    { 0xFE5A, 0xFE5A },
+    { 0xFE5C, 0xFE5C },
+    { 0xFE5E, 0xFE5E },
+    { 0xFF09, 0xFF09 },
+    { 0xFF3D, 0xFF3D },
+    { 0xFF5D, 0xFF5D },
+    { 0xFF60, 0xFF60 },
+    { 0xFF63, 0xFF63 }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Pe)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Pf.c
@@ -0,0 +1,31 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x00BB, 0x00BB },
+    { 0x2019, 0x2019 },
+    { 0x201D, 0x201D },
+    { 0x203A, 0x203A },
+    { 0x2E03, 0x2E03 },
+    { 0x2E05, 0x2E05 },
+    { 0x2E0A, 0x2E0A },
+    { 0x2E0D, 0x2E0D },
+    { 0x2E1D, 0x2E1D }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Pf)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Pi.c
@@ -0,0 +1,32 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x00AB, 0x00AB },
+    { 0x2018, 0x2018 },
+    { 0x201B, 0x201C },
+    { 0x201F, 0x201F },
+    { 0x2039, 0x2039 },
+    { 0x2E02, 0x2E02 },
+    { 0x2E04, 0x2E04 },
+    { 0x2E09, 0x2E09 },
+    { 0x2E0C, 0x2E0C },
+    { 0x2E1C, 0x2E1C }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Pi)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Po.c
@@ -0,0 +1,115 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0021, 0x0023 },
+    { 0x0025, 0x0027 },
+    { 0x002A, 0x002A },
+    { 0x002C, 0x002C },
+    { 0x002E, 0x002F },
+    { 0x003A, 0x003B },
+    { 0x003F, 0x0040 },
+    { 0x005C, 0x005C },
+    { 0x00A1, 0x00A1 },
+    { 0x00B7, 0x00B7 },
+    { 0x00BF, 0x00BF },
+    { 0x037E, 0x037E },
+    { 0x0387, 0x0387 },
+    { 0x055A, 0x055F },
+    { 0x0589, 0x0589 },
+    { 0x05BE, 0x05BE },
+    { 0x05C0, 0x05C0 },
+    { 0x05C3, 0x05C3 },
+    { 0x05C6, 0x05C6 },
+    { 0x05F3, 0x05F4 },
+    { 0x060C, 0x060D },
+    { 0x061B, 0x061B },
+    { 0x061E, 0x061F },
+    { 0x066A, 0x066D },
+    { 0x06D4, 0x06D4 },
+    { 0x0700, 0x070D },
+    { 0x07F7, 0x07F9 },
+    { 0x0964, 0x0965 },
+    { 0x0970, 0x0970 },
+    { 0x0DF4, 0x0DF4 },
+    { 0x0E4F, 0x0E4F },
+    { 0x0E5A, 0x0E5B },
+    { 0x0F04, 0x0F12 },
+    { 0x0F85, 0x0F85 },
+    { 0x0FD0, 0x0FD1 },
+    { 0x104A, 0x104F },
+    { 0x10FB, 0x10FB },
+    { 0x1361, 0x1368 },
+    { 0x166D, 0x166E },
+    { 0x16EB, 0x16ED },
+    { 0x1735, 0x1736 },
+    { 0x17D4, 0x17D6 },
+    { 0x17D8, 0x17DA },
+    { 0x1800, 0x1805 },
+    { 0x1807, 0x180A },
+    { 0x1944, 0x1945 },
+    { 0x19DE, 0x19DF },
+    { 0x1A1E, 0x1A1F },
+    { 0x1B5A, 0x1B60 },
+    { 0x2016, 0x2017 },
+    { 0x2020, 0x2027 },
+    { 0x2030, 0x2038 },
+    { 0x203B, 0x203E },
+    { 0x2041, 0x2043 },
+    { 0x2047, 0x2051 },
+    { 0x2053, 0x2053 },
+    { 0x2055, 0x205E },
+    { 0x2CF9, 0x2CFC },
+    { 0x2CFE, 0x2CFF },
+    { 0x2E00, 0x2E01 },
+    { 0x2E06, 0x2E08 },
+    { 0x2E0B, 0x2E0B },
+    { 0x2E0E, 0x2E16 },
+    { 0x3001, 0x3003 },
+    { 0x303D, 0x303D },
+    { 0x30FB, 0x30FB },
+    { 0xA874, 0xA877 },
+    { 0xFE10, 0xFE16 },
+    { 0xFE19, 0xFE19 },
+    { 0xFE30, 0xFE30 },
+    { 0xFE45, 0xFE46 },
+    { 0xFE49, 0xFE4C },
+    { 0xFE50, 0xFE52 },
+    { 0xFE54, 0xFE57 },
+    { 0xFE5F, 0xFE61 },
+    { 0xFE68, 0xFE68 },
+    { 0xFE6A, 0xFE6B },
+    { 0xFF01, 0xFF03 },
+    { 0xFF05, 0xFF07 },
+    { 0xFF0A, 0xFF0A },
+    { 0xFF0C, 0xFF0C },
+    { 0xFF0E, 0xFF0F },
+    { 0xFF1A, 0xFF1B },
+    { 0xFF1F, 0xFF20 },
+    { 0xFF3C, 0xFF3C },
+    { 0xFF61, 0xFF61 },
+    { 0xFF64, 0xFF65 },
+    { 0x10100, 0x10101 },
+    { 0x1039F, 0x1039F },
+    { 0x103D0, 0x103D0 },
+    { 0x1091F, 0x1091F },
+    { 0x10A50, 0x10A58 },
+    { 0x12470, 0x12473 }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Po)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Ps.c
@@ -0,0 +1,88 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0028, 0x0028 },
+    { 0x005B, 0x005B },
+    { 0x007B, 0x007B },
+    { 0x0F3A, 0x0F3A },
+    { 0x0F3C, 0x0F3C },
+    { 0x169B, 0x169B },
+    { 0x201A, 0x201A },
+    { 0x201E, 0x201E },
+    { 0x2045, 0x2045 },
+    { 0x207D, 0x207D },
+    { 0x208D, 0x208D },
+    { 0x2329, 0x2329 },
+    { 0x2768, 0x2768 },
+    { 0x276A, 0x276A },
+    { 0x276C, 0x276C },
+    { 0x276E, 0x276E },
+    { 0x2770, 0x2770 },
+    { 0x2772, 0x2772 },
+    { 0x2774, 0x2774 },
+    { 0x27C5, 0x27C5 },
+    { 0x27E6, 0x27E6 },
+    { 0x27E8, 0x27E8 },
+    { 0x27EA, 0x27EA },
+    { 0x2983, 0x2983 },
+    { 0x2985, 0x2985 },
+    { 0x2987, 0x2987 },
+    { 0x2989, 0x2989 },
+    { 0x298B, 0x298B },
+    { 0x298D, 0x298D },
+    { 0x298F, 0x298F },
+    { 0x2991, 0x2991 },
+    { 0x2993, 0x2993 },
+    { 0x2995, 0x2995 },
+    { 0x2997, 0x2997 },
+    { 0x29D8, 0x29D8 },
+    { 0x29DA, 0x29DA },
+    { 0x29FC, 0x29FC },
+    { 0x3008, 0x3008 },
+    { 0x300A, 0x300A },
+    { 0x300C, 0x300C },
+    { 0x300E, 0x300E },
+    { 0x3010, 0x3010 },
+    { 0x3014, 0x3014 },
+    { 0x3016, 0x3016 },
+    { 0x3018, 0x3018 },
+    { 0x301A, 0x301A },
+    { 0x301D, 0x301D },
+    { 0xFD3E, 0xFD3E },
+    { 0xFE17, 0xFE17 },
+    { 0xFE35, 0xFE35 },
+    { 0xFE37, 0xFE37 },
+    { 0xFE39, 0xFE39 },
+    { 0xFE3B, 0xFE3B },
+    { 0xFE3D, 0xFE3D },
+    { 0xFE3F, 0xFE3F },
+    { 0xFE41, 0xFE41 },
+    { 0xFE43, 0xFE43 },
+    { 0xFE47, 0xFE47 },
+    { 0xFE59, 0xFE59 },
+    { 0xFE5B, 0xFE5B },
+    { 0xFE5D, 0xFE5D },
+    { 0xFF08, 0xFF08 },
+    { 0xFF3B, 0xFF3B },
+    { 0xFF5B, 0xFF5B },
+    { 0xFF5F, 0xFF5F },
+    { 0xFF62, 0xFF62 }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Ps)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_S.c
@@ -0,0 +1,188 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0024, 0x0024 },
+    { 0x002B, 0x002B },
+    { 0x003C, 0x003E },
+    { 0x005E, 0x005E },
+    { 0x0060, 0x0060 },
+    { 0x007C, 0x007C },
+    { 0x007E, 0x007E },
+    { 0x00A2, 0x00A9 },
+    { 0x00AC, 0x00AC },
+    { 0x00AE, 0x00B1 },
+    { 0x00B4, 0x00B4 },
+    { 0x00B6, 0x00B6 },
+    { 0x00B8, 0x00B8 },
+    { 0x00D7, 0x00D7 },
+    { 0x00F7, 0x00F7 },
+    { 0x02C2, 0x02C5 },
+    { 0x02D2, 0x02DF },
+    { 0x02E5, 0x02ED },
+    { 0x02EF, 0x02FF },
+    { 0x0374, 0x0375 },
+    { 0x0384, 0x0385 },
+    { 0x03F6, 0x03F6 },
+    { 0x0482, 0x0482 },
+    { 0x060B, 0x060B },
+    { 0x060E, 0x060F },
+    { 0x06E9, 0x06E9 },
+    { 0x06FD, 0x06FE },
+    { 0x07F6, 0x07F6 },
+    { 0x09F2, 0x09F3 },
+    { 0x09FA, 0x09FA },
+    { 0x0AF1, 0x0AF1 },
+    { 0x0B70, 0x0B70 },
+    { 0x0BF3, 0x0BFA },
+    { 0x0CF1, 0x0CF2 },
+    { 0x0E3F, 0x0E3F },
+    { 0x0F01, 0x0F03 },
+    { 0x0F13, 0x0F17 },
+    { 0x0F1A, 0x0F1F },
+    { 0x0F34, 0x0F34 },
+    { 0x0F36, 0x0F36 },
+    { 0x0F38, 0x0F38 },
+    { 0x0FBE, 0x0FC5 },
+    { 0x0FC7, 0x0FCC },
+    { 0x0FCF, 0x0FCF },
+    { 0x1360, 0x1360 },
+    { 0x1390, 0x1399 },
+    { 0x17DB, 0x17DB },
+    { 0x1940, 0x1940 },
+    { 0x19E0, 0x19FF },
+    { 0x1B61, 0x1B6A },
+    { 0x1B74, 0x1B7C },
+    { 0x1FBD, 0x1FBD },
+    { 0x1FBF, 0x1FC1 },
+    { 0x1FCD, 0x1FCF },
+    { 0x1FDD, 0x1FDF },
+    { 0x1FED, 0x1FEF },
+    { 0x1FFD, 0x1FFE },
+    { 0x2044, 0x2044 },
+    { 0x2052, 0x2052 },
+    { 0x207A, 0x207C },
+    { 0x208A, 0x208C },
+    { 0x20A0, 0x20B5 },
+    { 0x2100, 0x2101 },
+    { 0x2103, 0x2106 },
+    { 0x2108, 0x2109 },
+    { 0x2114, 0x2114 },
+    { 0x2116, 0x2118 },
+    { 0x211E, 0x2123 },
+    { 0x2125, 0x2125 },
+    { 0x2127, 0x2127 },
+    { 0x2129, 0x2129 },
+    { 0x212E, 0x212E },
+    { 0x213A, 0x213B },
+    { 0x2140, 0x2144 },
+    { 0x214A, 0x214D },
+    { 0x2190, 0x2328 },
+    { 0x232B, 0x23E7 },
+    { 0x2400, 0x2426 },
+    { 0x2440, 0x244A },
+    { 0x249C, 0x24E9 },
+    { 0x2500, 0x269C },
+    { 0x26A0, 0x26B2 },
+    { 0x2701, 0x2704 },
+    { 0x2706, 0x2709 },
+    { 0x270C, 0x2727 },
+    { 0x2729, 0x274B },
+    { 0x274D, 0x274D },
+    { 0x274F, 0x2752 },
+    { 0x2756, 0x2756 },
+    { 0x2758, 0x275E },
+    { 0x2761, 0x2767 },
+    { 0x2794, 0x2794 },
+    { 0x2798, 0x27AF },
+    { 0x27B1, 0x27BE },
+    { 0x27C0, 0x27C4 },
+    { 0x27C7, 0x27CA },
+    { 0x27D0, 0x27E5 },
+    { 0x27F0, 0x2982 },
+    { 0x2999, 0x29D7 },
+    { 0x29DC, 0x29FB },
+    { 0x29FE, 0x2B1A },
+    { 0x2B20, 0x2B23 },
+    { 0x2CE5, 0x2CEA },
+    { 0x2E80, 0x2E99 },
+    { 0x2E9B, 0x2EF3 },
+    { 0x2F00, 0x2FD5 },
+    { 0x2FF0, 0x2FFB },
+    { 0x3004, 0x3004 },
+    { 0x3012, 0x3013 },
+    { 0x3020, 0x3020 },
+    { 0x3036, 0x3037 },
+    { 0x303E, 0x303F },
+    { 0x309B, 0x309C },
+    { 0x3190, 0x3191 },
+    { 0x3196, 0x319F },
+    { 0x31C0, 0x31CF },
+    { 0x3200, 0x321E },
+    { 0x322A, 0x3243 },
+    { 0x3250, 0x3250 },
+    { 0x3260, 0x327F },
+    { 0x328A, 0x32B0 },
+    { 0x32C0, 0x32FE },
+    { 0x3300, 0x33FF },
+    { 0x4DC0, 0x4DFF },
+    { 0xA490, 0xA4C6 },
+    { 0xA700, 0xA716 },
+    { 0xA720, 0xA721 },
+    { 0xA828, 0xA82B },
+    { 0xFB29, 0xFB29 },
+    { 0xFDFC, 0xFDFD },
+    { 0xFE62, 0xFE62 },
+    { 0xFE64, 0xFE66 },
+    { 0xFE69, 0xFE69 },
+    { 0xFF04, 0xFF04 },
+    { 0xFF0B, 0xFF0B },
+    { 0xFF1C, 0xFF1E },
+    { 0xFF3E, 0xFF3E },
+    { 0xFF40, 0xFF40 },
+    { 0xFF5C, 0xFF5C },
+    { 0xFF5E, 0xFF5E },
+    { 0xFFE0, 0xFFE6 },
+    { 0xFFE8, 0xFFEE },
+    { 0xFFFC, 0xFFFD },
+    { 0x10102, 0x10102 },
+    { 0x10137, 0x1013F },
+    { 0x10179, 0x10189 },
+    { 0x1D000, 0x1D0F5 },
+    { 0x1D100, 0x1D126 },
+    { 0x1D12A, 0x1D164 },
+    { 0x1D16A, 0x1D16C },
+    { 0x1D183, 0x1D184 },
+    { 0x1D18C, 0x1D1A9 },
+    { 0x1D1AE, 0x1D1DD },
+    { 0x1D200, 0x1D241 },
+    { 0x1D245, 0x1D245 },
+    { 0x1D300, 0x1D356 },
+    { 0x1D6C1, 0x1D6C1 },
+    { 0x1D6DB, 0x1D6DB },
+    { 0x1D6FB, 0x1D6FB },
+    { 0x1D715, 0x1D715 },
+    { 0x1D735, 0x1D735 },
+    { 0x1D74F, 0x1D74F },
+    { 0x1D76F, 0x1D76F },
+    { 0x1D789, 0x1D789 },
+    { 0x1D7A9, 0x1D7A9 },
+    { 0x1D7C3, 0x1D7C3 }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_S)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Sc.c
@@ -0,0 +1,36 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0024, 0x0024 },
+    { 0x00A2, 0x00A5 },
+    { 0x060B, 0x060B },
+    { 0x09F2, 0x09F3 },
+    { 0x0AF1, 0x0AF1 },
+    { 0x0BF9, 0x0BF9 },
+    { 0x0E3F, 0x0E3F },
+    { 0x17DB, 0x17DB },
+    { 0x20A0, 0x20B5 },
+    { 0xFDFC, 0xFDFC },
+    { 0xFE69, 0xFE69 },
+    { 0xFF04, 0xFF04 },
+    { 0xFFE0, 0xFFE1 },
+    { 0xFFE5, 0xFFE6 }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Sc)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Sk.c
@@ -0,0 +1,46 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x005E, 0x005E },
+    { 0x0060, 0x0060 },
+    { 0x00A8, 0x00A8 },
+    { 0x00AF, 0x00AF },
+    { 0x00B4, 0x00B4 },
+    { 0x00B8, 0x00B8 },
+    { 0x02C2, 0x02C5 },
+    { 0x02D2, 0x02DF },
+    { 0x02E5, 0x02ED },
+    { 0x02EF, 0x02FF },
+    { 0x0374, 0x0375 },
+    { 0x0384, 0x0385 },
+    { 0x1FBD, 0x1FBD },
+    { 0x1FBF, 0x1FC1 },
+    { 0x1FCD, 0x1FCF },
+    { 0x1FDD, 0x1FDF },
+    { 0x1FED, 0x1FEF },
+    { 0x1FFD, 0x1FFE },
+    { 0x309B, 0x309C },
+    { 0xA700, 0xA716 },
+    { 0xA720, 0xA721 },
+    { 0xFF3E, 0xFF3E },
+    { 0xFF40, 0xFF40 },
+    { 0xFFE3, 0xFFE3 }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Sk)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Sm.c
@@ -0,0 +1,83 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x002B, 0x002B },
+    { 0x003C, 0x003E },
+    { 0x007C, 0x007C },
+    { 0x007E, 0x007E },
+    { 0x00AC, 0x00AC },
+    { 0x00B1, 0x00B1 },
+    { 0x00D7, 0x00D7 },
+    { 0x00F7, 0x00F7 },
+    { 0x03F6, 0x03F6 },
+    { 0x2044, 0x2044 },
+    { 0x2052, 0x2052 },
+    { 0x207A, 0x207C },
+    { 0x208A, 0x208C },
+    { 0x2140, 0x2144 },
+    { 0x214B, 0x214B },
+    { 0x2190, 0x2194 },
+    { 0x219A, 0x219B },
+    { 0x21A0, 0x21A0 },
+    { 0x21A3, 0x21A3 },
+    { 0x21A6, 0x21A6 },
+    { 0x21AE, 0x21AE },
+    { 0x21CE, 0x21CF },
+    { 0x21D2, 0x21D2 },
+    { 0x21D4, 0x21D4 },
+    { 0x21F4, 0x22FF },
+    { 0x2308, 0x230B },
+    { 0x2320, 0x2321 },
+    { 0x237C, 0x237C },
+    { 0x239B, 0x23B3 },
+    { 0x23DC, 0x23E1 },
+    { 0x25B7, 0x25B7 },
+    { 0x25C1, 0x25C1 },
+    { 0x25F8, 0x25FF },
+    { 0x266F, 0x266F },
+    { 0x27C0, 0x27C4 },
+    { 0x27C7, 0x27CA },
+    { 0x27D0, 0x27E5 },
+    { 0x27F0, 0x27FF },
+    { 0x2900, 0x2982 },
+    { 0x2999, 0x29D7 },
+    { 0x29DC, 0x29FB },
+    { 0x29FE, 0x2AFF },
+    { 0xFB29, 0xFB29 },
+    { 0xFE62, 0xFE62 },
+    { 0xFE64, 0xFE66 },
+    { 0xFF0B, 0xFF0B },
+    { 0xFF1C, 0xFF1E },
+    { 0xFF5C, 0xFF5C },
+    { 0xFF5E, 0xFF5E },
+    { 0xFFE2, 0xFFE2 },
+    { 0xFFE9, 0xFFEC },
+    { 0x1D6C1, 0x1D6C1 },
+    { 0x1D6DB, 0x1D6DB },
+    { 0x1D6FB, 0x1D6FB },
+    { 0x1D715, 0x1D715 },
+    { 0x1D735, 0x1D735 },
+    { 0x1D74F, 0x1D74F },
+    { 0x1D76F, 0x1D76F },
+    { 0x1D789, 0x1D789 },
+    { 0x1D7A9, 0x1D7A9 },
+    { 0x1D7C3, 0x1D7C3 }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Sm)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_So.c
@@ -0,0 +1,146 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x00A6, 0x00A7 },
+    { 0x00A9, 0x00A9 },
+    { 0x00AE, 0x00AE },
+    { 0x00B0, 0x00B0 },
+    { 0x00B6, 0x00B6 },
+    { 0x0482, 0x0482 },
+    { 0x060E, 0x060F },
+    { 0x06E9, 0x06E9 },
+    { 0x06FD, 0x06FE },
+    { 0x07F6, 0x07F6 },
+    { 0x09FA, 0x09FA },
+    { 0x0B70, 0x0B70 },
+    { 0x0BF3, 0x0BF8 },
+    { 0x0BFA, 0x0BFA },
+    { 0x0CF1, 0x0CF2 },
+    { 0x0F01, 0x0F03 },
+    { 0x0F13, 0x0F17 },
+    { 0x0F1A, 0x0F1F },
+    { 0x0F34, 0x0F34 },
+    { 0x0F36, 0x0F36 },
+    { 0x0F38, 0x0F38 },
+    { 0x0FBE, 0x0FC5 },
+    { 0x0FC7, 0x0FCC },
+    { 0x0FCF, 0x0FCF },
+    { 0x1360, 0x1360 },
+    { 0x1390, 0x1399 },
+    { 0x1940, 0x1940 },
+    { 0x19E0, 0x19FF },
+    { 0x1B61, 0x1B6A },
+    { 0x1B74, 0x1B7C },
+    { 0x2100, 0x2101 },
+    { 0x2103, 0x2106 },
+    { 0x2108, 0x2109 },
+    { 0x2114, 0x2114 },
+    { 0x2116, 0x2118 },
+    { 0x211E, 0x2123 },
+    { 0x2125, 0x2125 },
+    { 0x2127, 0x2127 },
+    { 0x2129, 0x2129 },
+    { 0x212E, 0x212E },
+    { 0x213A, 0x213B },
+    { 0x214A, 0x214A },
+    { 0x214C, 0x214D },
+    { 0x2195, 0x2199 },
+    { 0x219C, 0x219F },
+    { 0x21A1, 0x21A2 },
+    { 0x21A4, 0x21A5 },
+    { 0x21A7, 0x21AD },
+    { 0x21AF, 0x21CD },
+    { 0x21D0, 0x21D1 },
+    { 0x21D3, 0x21D3 },
+    { 0x21D5, 0x21F3 },
+    { 0x2300, 0x2307 },
+    { 0x230C, 0x231F },
+    { 0x2322, 0x2328 },
+    { 0x232B, 0x237B },
+    { 0x237D, 0x239A },
+    { 0x23B4, 0x23DB },
+    { 0x23E2, 0x23E7 },
+    { 0x2400, 0x2426 },
+    { 0x2440, 0x244A },
+    { 0x249C, 0x24E9 },
+    { 0x2500, 0x25B6 },
+    { 0x25B8, 0x25C0 },
+    { 0x25C2, 0x25F7 },
+    { 0x2600, 0x266E },
+    { 0x2670, 0x269C },
+    { 0x26A0, 0x26B2 },
+    { 0x2701, 0x2704 },
+    { 0x2706, 0x2709 },
+    { 0x270C, 0x2727 },
+    { 0x2729, 0x274B },
+    { 0x274D, 0x274D },
+    { 0x274F, 0x2752 },
+    { 0x2756, 0x2756 },
+    { 0x2758, 0x275E },
+    { 0x2761, 0x2767 },
+    { 0x2794, 0x2794 },
+    { 0x2798, 0x27AF },
+    { 0x27B1, 0x27BE },
+    { 0x2800, 0x28FF },
+    { 0x2B00, 0x2B1A },
+    { 0x2B20, 0x2B23 },
+    { 0x2CE5, 0x2CEA },
+    { 0x2E80, 0x2E99 },
+    { 0x2E9B, 0x2EF3 },
+    { 0x2F00, 0x2FD5 },
+    { 0x2FF0, 0x2FFB },
+    { 0x3004, 0x3004 },
+    { 0x3012, 0x3013 },
+    { 0x3020, 0x3020 },
+    { 0x3036, 0x3037 },
+    { 0x303E, 0x303F },
+    { 0x3190, 0x3191 },
+    { 0x3196, 0x319F },
+    { 0x31C0, 0x31CF },
+    { 0x3200, 0x321E },
+    { 0x322A, 0x3243 },
+    { 0x3250, 0x3250 },
+    { 0x3260, 0x327F },
+    { 0x328A, 0x32B0 },
+    { 0x32C0, 0x32FE },
+    { 0x3300, 0x33FF },
+    { 0x4DC0, 0x4DFF },
+    { 0xA490, 0xA4C6 },
+    { 0xA828, 0xA82B },
+    { 0xFDFD, 0xFDFD },
+    { 0xFFE4, 0xFFE4 },
+    { 0xFFE8, 0xFFE8 },
+    { 0xFFED, 0xFFEE },
+    { 0xFFFC, 0xFFFD },
+    { 0x10102, 0x10102 },
+    { 0x10137, 0x1013F },
+    { 0x10179, 0x10189 },
+    { 0x1D000, 0x1D0F5 },
+    { 0x1D100, 0x1D126 },
+    { 0x1D12A, 0x1D164 },
+    { 0x1D16A, 0x1D16C },
+    { 0x1D183, 0x1D184 },
+    { 0x1D18C, 0x1D1A9 },
+    { 0x1D1AE, 0x1D1DD },
+    { 0x1D200, 0x1D241 },
+    { 0x1D245, 0x1D245 },
+    { 0x1D300, 0x1D356 }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_So)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Z.c
@@ -0,0 +1,31 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0020, 0x0020 },
+    { 0x00A0, 0x00A0 },
+    { 0x1680, 0x1680 },
+    { 0x180E, 0x180E },
+    { 0x2000, 0x200A },
+    { 0x2028, 0x2029 },
+    { 0x202F, 0x202F },
+    { 0x205F, 0x205F },
+    { 0x3000, 0x3000 }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Z)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Zl.c
@@ -0,0 +1,23 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x2028, 0x2028 }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Zl)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Zp.c
@@ -0,0 +1,23 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x2029, 0x2029 }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Zp)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_Zs.c
@@ -0,0 +1,30 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0020, 0x0020 },
+    { 0x00A0, 0x00A0 },
+    { 0x1680, 0x1680 },
+    { 0x180E, 0x180E },
+    { 0x2000, 0x200A },
+    { 0x202F, 0x202F },
+    { 0x205F, 0x205F },
+    { 0x3000, 0x3000 }
+
+#define PREDICATE(c) uc_is_general_category (c, UC_CATEGORY_Zs)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_and.c
@@ -0,0 +1,50 @@
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "unictype.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+
+int
+main ()
+{
+  uc_general_category_t ct =
+    uc_general_category_and (
+      uc_general_category_or (UC_LETTER, UC_DECIMAL_DIGIT_NUMBER),
+      uc_general_category_or (UC_UPPERCASE_LETTER, UC_NUMBER));
+  
+  ASSERT (uc_is_general_category ('A', ct));
+  ASSERT (!uc_is_general_category ('a', ct));
+  ASSERT (uc_is_general_category ('7', ct));
+  ASSERT (!uc_is_general_category (0x00B2, ct));
+
+  return 0;
+}
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_and_not.c
@@ -0,0 +1,50 @@
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "unictype.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+
+int
+main ()
+{
+  uc_general_category_t ct =
+    uc_general_category_and_not (
+      uc_general_category_or (UC_LETTER, UC_NUMBER),
+      uc_general_category_or (UC_UPPERCASE_LETTER, UC_DECIMAL_DIGIT_NUMBER));
+  
+  ASSERT (!uc_is_general_category ('A', ct));
+  ASSERT (uc_is_general_category ('a', ct));
+  ASSERT (!uc_is_general_category ('7', ct));
+  ASSERT (uc_is_general_category (0x00B2, ct));
+
+  return 0;
+}
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_byname.c
@@ -0,0 +1,61 @@
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "unictype.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+
+int
+main ()
+{
+  uc_general_category_byname ("L");
+  uc_general_category_byname ("Nl");
+
+  {
+    uc_general_category_t ct = uc_general_category_byname ("Nd");
+    unsigned int c;
+
+    for (c = 0x30; c <= 0x39; c++)
+      ASSERT (uc_is_general_category (c, ct));
+    for (c = 0x40; c < 0x80; c++)
+      ASSERT (!uc_is_general_category (c, ct));
+  }
+
+  {
+    uc_general_category_t ct = uc_general_category_byname ("Foo");
+    unsigned int c;
+
+    for (c = 0; c < 0x110000; c++)
+      ASSERT (!uc_is_general_category (c, ct));
+  }
+
+  return 0;
+}
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_name.c
@@ -0,0 +1,44 @@
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "unictype.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+
+int
+main ()
+{
+  ASSERT (strcmp (uc_general_category_name (UC_CATEGORY_Z), "Z") == 0);
+  ASSERT (strcmp (uc_general_category_name (UC_CATEGORY_Nl), "Nl") == 0);
+  ASSERT (uc_general_category_name (uc_general_category_or (UC_CATEGORY_Z, UC_CATEGORY_Nl)) == NULL);
+
+  return 0;
+}
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_none.c
@@ -0,0 +1,46 @@
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "unictype.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+
+int
+main ()
+{
+  uc_general_category_t ct = _UC_CATEGORY_NONE;
+  unsigned int c;
+
+  for (c = 0; c < 0x110000; c++)
+    ASSERT (!uc_is_general_category (c, ct));
+
+  return 0;
+}
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_of.c
@@ -0,0 +1,66 @@
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "unictype.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+
+int
+main ()
+{
+  {
+    unsigned int c;
+    for (c = 0; c < 0x110000; c++)
+      ASSERT (uc_is_general_category (c, uc_general_category (c)));
+  }
+
+  {
+    uc_general_category_t decimal_digits = uc_general_category ('7');
+    unsigned int c;
+
+    for (c = 0x30; c <= 0x39; c++)
+      ASSERT (uc_is_general_category (c, decimal_digits));
+    for (c = 0x40; c < 0x80; c++)
+      ASSERT (!uc_is_general_category (c, decimal_digits));
+  }
+
+  {
+    uc_general_category_t lowercase_letters = uc_general_category ('x');
+    unsigned int c;
+
+    for (c = 0x41; c <= 0x5A; c++)
+      ASSERT (!uc_is_general_category (c, lowercase_letters));
+    for (c = 0x61; c <= 0x7A; c++)
+      ASSERT (uc_is_general_category (c, lowercase_letters));
+  }
+
+  return 0;
+}
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_or.c
@@ -0,0 +1,47 @@
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "unictype.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+
+int
+main ()
+{
+  uc_general_category_t ct =
+    uc_general_category_or (UC_LETTER, UC_NUMBER);
+
+  ASSERT (uc_is_general_category ('a', ct));
+  ASSERT (uc_is_general_category ('7', ct));
+  ASSERT (!uc_is_general_category ('$', ct));
+
+  return 0;
+}
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-categ_test_withtable.c
@@ -0,0 +1,49 @@
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "unictype.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+
+int
+main ()
+{
+  uint32_t ctmask =
+    (UC_CATEGORY_MASK_L | UC_CATEGORY_MASK_N)
+    & ~(UC_CATEGORY_MASK_Lu | UC_CATEGORY_MASK_Nd);
+
+  ASSERT (!uc_is_general_category_withtable ('A', ctmask));
+  ASSERT (uc_is_general_category_withtable ('a', ctmask));
+  ASSERT (!uc_is_general_category_withtable ('7', ctmask));
+  ASSERT (uc_is_general_category_withtable (0x00B2, ctmask));
+
+  return 0;
+}
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-combining.c
@@ -0,0 +1,46 @@
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "unictype.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+
+int
+main ()
+{
+  ASSERT (uc_combining_class ('x') == UC_CCC_NR);
+  ASSERT (uc_combining_class (0x0300) == UC_CCC_A);
+  ASSERT (uc_combining_class (0x0319) == UC_CCC_B);
+  ASSERT (uc_combining_class (0x0327) == UC_CCC_ATB);
+  ASSERT (uc_combining_class (0x093C) == UC_CCC_NK);
+
+  return 0;
+}
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-ctype_alnum.c
@@ -0,0 +1,405 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0030, 0x0039 },
+    { 0x0041, 0x005A },
+    { 0x0061, 0x007A },
+    { 0x00AA, 0x00AA },
+    { 0x00B5, 0x00B5 },
+    { 0x00BA, 0x00BA },
+    { 0x00C0, 0x00D6 },
+    { 0x00D8, 0x00F6 },
+    { 0x00F8, 0x02C1 },
+    { 0x02C6, 0x02D1 },
+    { 0x02E0, 0x02E4 },
+    { 0x02EE, 0x02EE },
+    { 0x0345, 0x0345 },
+    { 0x037A, 0x037D },
+    { 0x0386, 0x0386 },
+    { 0x0388, 0x038A },
+    { 0x038C, 0x038C },
+    { 0x038E, 0x03A1 },
+    { 0x03A3, 0x03CE },
+    { 0x03D0, 0x03F5 },
+    { 0x03F7, 0x0481 },
+    { 0x048A, 0x0513 },
+    { 0x0531, 0x0556 },
+    { 0x0559, 0x0559 },
+    { 0x0561, 0x0587 },
+    { 0x05D0, 0x05EA },
+    { 0x05F0, 0x05F2 },
+    { 0x0621, 0x063A },
+    { 0x0640, 0x064A },
+    { 0x0660, 0x0669 },
+    { 0x066E, 0x066F },
+    { 0x0671, 0x06D3 },
+    { 0x06D5, 0x06D5 },
+    { 0x06E5, 0x06E6 },
+    { 0x06EE, 0x06FC },
+    { 0x06FF, 0x06FF },
+    { 0x0710, 0x0710 },
+    { 0x0712, 0x072F },
+    { 0x074D, 0x076D },
+    { 0x0780, 0x07A5 },
+    { 0x07B1, 0x07B1 },
+    { 0x07C0, 0x07EA },
+    { 0x07F4, 0x07F5 },
+    { 0x07FA, 0x07FA },
+    { 0x0904, 0x0939 },
+    { 0x093D, 0x093D },
+    { 0x0950, 0x0950 },
+    { 0x0958, 0x0961 },
+    { 0x0966, 0x096F },
+    { 0x097B, 0x097F },
+    { 0x0985, 0x098C },
+    { 0x098F, 0x0990 },
+    { 0x0993, 0x09A8 },
+    { 0x09AA, 0x09B0 },
+    { 0x09B2, 0x09B2 },
+    { 0x09B6, 0x09B9 },
+    { 0x09BD, 0x09BD },
+    { 0x09CE, 0x09CE },
+    { 0x09DC, 0x09DD },
+    { 0x09DF, 0x09E1 },
+    { 0x09E6, 0x09F1 },
+    { 0x0A05, 0x0A0A },
+    { 0x0A0F, 0x0A10 },
+    { 0x0A13, 0x0A28 },
+    { 0x0A2A, 0x0A30 },
+    { 0x0A32, 0x0A33 },
+    { 0x0A35, 0x0A36 },
+    { 0x0A38, 0x0A39 },
+    { 0x0A59, 0x0A5C },
+    { 0x0A5E, 0x0A5E },
+    { 0x0A66, 0x0A6F },
+    { 0x0A72, 0x0A74 },
+    { 0x0A85, 0x0A8D },
+    { 0x0A8F, 0x0A91 },
+    { 0x0A93, 0x0AA8 },
+    { 0x0AAA, 0x0AB0 },
+    { 0x0AB2, 0x0AB3 },
+    { 0x0AB5, 0x0AB9 },
+    { 0x0ABD, 0x0ABD },
+    { 0x0AD0, 0x0AD0 },
+    { 0x0AE0, 0x0AE1 },
+    { 0x0AE6, 0x0AEF },
+    { 0x0B05, 0x0B0C },
+    { 0x0B0F, 0x0B10 },
+    { 0x0B13, 0x0B28 },
+    { 0x0B2A, 0x0B30 },
+    { 0x0B32, 0x0B33 },
+    { 0x0B35, 0x0B39 },
+    { 0x0B3D, 0x0B3D },
+    { 0x0B5C, 0x0B5D },
+    { 0x0B5F, 0x0B61 },
+    { 0x0B66, 0x0B6F },
+    { 0x0B71, 0x0B71 },
+    { 0x0B83, 0x0B83 },
+    { 0x0B85, 0x0B8A },
+    { 0x0B8E, 0x0B90 },
+    { 0x0B92, 0x0B95 },
+    { 0x0B99, 0x0B9A },
+    { 0x0B9C, 0x0B9C },
+    { 0x0B9E, 0x0B9F },
+    { 0x0BA3, 0x0BA4 },
+    { 0x0BA8, 0x0BAA },
+    { 0x0BAE, 0x0BB9 },
+    { 0x0BE6, 0x0BEF },
+    { 0x0C05, 0x0C0C },
+    { 0x0C0E, 0x0C10 },
+    { 0x0C12, 0x0C28 },
+    { 0x0C2A, 0x0C33 },
+    { 0x0C35, 0x0C39 },
+    { 0x0C60, 0x0C61 },
+    { 0x0C66, 0x0C6F },
+    { 0x0C85, 0x0C8C },
+    { 0x0C8E, 0x0C90 },
+    { 0x0C92, 0x0CA8 },
+    { 0x0CAA, 0x0CB3 },
+    { 0x0CB5, 0x0CB9 },
+    { 0x0CBD, 0x0CBD },
+    { 0x0CDE, 0x0CDE },
+    { 0x0CE0, 0x0CE1 },
+    { 0x0CE6, 0x0CEF },
+    { 0x0D05, 0x0D0C },
+    { 0x0D0E, 0x0D10 },
+    { 0x0D12, 0x0D28 },
+    { 0x0D2A, 0x0D39 },
+    { 0x0D60, 0x0D61 },
+    { 0x0D66, 0x0D6F },
+    { 0x0D85, 0x0D96 },
+    { 0x0D9A, 0x0DB1 },
+    { 0x0DB3, 0x0DBB },
+    { 0x0DBD, 0x0DBD },
+    { 0x0DC0, 0x0DC6 },
+    { 0x0E01, 0x0E2E },
+    { 0x0E30, 0x0E3A },
+    { 0x0E40, 0x0E45 },
+    { 0x0E47, 0x0E4E },
+    { 0x0E50, 0x0E59 },
+    { 0x0E81, 0x0E82 },
+    { 0x0E84, 0x0E84 },
+    { 0x0E87, 0x0E88 },
+    { 0x0E8A, 0x0E8A },
+    { 0x0E8D, 0x0E8D },
+    { 0x0E94, 0x0E97 },
+    { 0x0E99, 0x0E9F },
+    { 0x0EA1, 0x0EA3 },
+    { 0x0EA5, 0x0EA5 },
+    { 0x0EA7, 0x0EA7 },
+    { 0x0EAA, 0x0EAB },
+    { 0x0EAD, 0x0EB0 },
+    { 0x0EB2, 0x0EB3 },
+    { 0x0EBD, 0x0EBD },
+    { 0x0EC0, 0x0EC4 },
+    { 0x0EC6, 0x0EC6 },
+    { 0x0ED0, 0x0ED9 },
+    { 0x0EDC, 0x0EDD },
+    { 0x0F00, 0x0F00 },
+    { 0x0F20, 0x0F29 },
+    { 0x0F40, 0x0F47 },
+    { 0x0F49, 0x0F6A },
+    { 0x0F88, 0x0F8B },
+    { 0x1000, 0x1021 },
+    { 0x1023, 0x1027 },
+    { 0x1029, 0x102A },
+    { 0x1040, 0x1049 },
+    { 0x1050, 0x1055 },
+    { 0x10A0, 0x10C5 },
+    { 0x10D0, 0x10FA },
+    { 0x10FC, 0x10FC },
+    { 0x1100, 0x1159 },
+    { 0x115F, 0x11A2 },
+    { 0x11A8, 0x11F9 },
+    { 0x1200, 0x1248 },
+    { 0x124A, 0x124D },
+    { 0x1250, 0x1256 },
+    { 0x1258, 0x1258 },
+    { 0x125A, 0x125D },
+    { 0x1260, 0x1288 },
+    { 0x128A, 0x128D },
+    { 0x1290, 0x12B0 },
+    { 0x12B2, 0x12B5 },
+    { 0x12B8, 0x12BE },
+    { 0x12C0, 0x12C0 },
+    { 0x12C2, 0x12C5 },
+    { 0x12C8, 0x12D6 },
+    { 0x12D8, 0x1310 },
+    { 0x1312, 0x1315 },
+    { 0x1318, 0x135A },
+    { 0x1380, 0x138F },
+    { 0x13A0, 0x13F4 },
+    { 0x1401, 0x166C },
+    { 0x166F, 0x1676 },
+    { 0x1681, 0x169A },
+    { 0x16A0, 0x16EA },
+    { 0x16EE, 0x16F0 },
+    { 0x1700, 0x170C },
+    { 0x170E, 0x1711 },
+    { 0x1720, 0x1731 },
+    { 0x1740, 0x1751 },
+    { 0x1760, 0x176C },
+    { 0x176E, 0x1770 },
+    { 0x1780, 0x17B3 },
+    { 0x17D7, 0x17D7 },
+    { 0x17DC, 0x17DC },
+    { 0x17E0, 0x17E9 },
+    { 0x1810, 0x1819 },
+    { 0x1820, 0x1877 },
+    { 0x1880, 0x18A8 },
+    { 0x1900, 0x191C },
+    { 0x1946, 0x196D },
+    { 0x1970, 0x1974 },
+    { 0x1980, 0x19A9 },
+    { 0x19C1, 0x19C7 },
+    { 0x19D0, 0x19D9 },
+    { 0x1A00, 0x1A16 },
+    { 0x1B05, 0x1B33 },
+    { 0x1B45, 0x1B4B },
+    { 0x1B50, 0x1B59 },
+    { 0x1D00, 0x1DBF },
+    { 0x1E00, 0x1E9B },
+    { 0x1EA0, 0x1EF9 },
+    { 0x1F00, 0x1F15 },
+    { 0x1F18, 0x1F1D },
+    { 0x1F20, 0x1F45 },
+    { 0x1F48, 0x1F4D },
+    { 0x1F50, 0x1F57 },
+    { 0x1F59, 0x1F59 },
+    { 0x1F5B, 0x1F5B },
+    { 0x1F5D, 0x1F5D },
+    { 0x1F5F, 0x1F7D },
+    { 0x1F80, 0x1FB4 },
+    { 0x1FB6, 0x1FBC },
+    { 0x1FBE, 0x1FBE },
+    { 0x1FC2, 0x1FC4 },
+    { 0x1FC6, 0x1FCC },
+    { 0x1FD0, 0x1FD3 },
+    { 0x1FD6, 0x1FDB },
+    { 0x1FE0, 0x1FEC },
+    { 0x1FF2, 0x1FF4 },
+    { 0x1FF6, 0x1FFC },
+    { 0x2071, 0x2071 },
+    { 0x207F, 0x207F },
+    { 0x2090, 0x2094 },
+    { 0x2102, 0x2102 },
+    { 0x2107, 0x2107 },
+    { 0x210A, 0x2113 },
+    { 0x2115, 0x2115 },
+    { 0x2119, 0x211D },
+    { 0x2124, 0x2124 },
+    { 0x2126, 0x2126 },
+    { 0x2128, 0x212D },
+    { 0x212F, 0x2139 },
+    { 0x213C, 0x213F },
+    { 0x2145, 0x2149 },
+    { 0x214E, 0x214E },
+    { 0x2160, 0x2184 },
+    { 0x249C, 0x24E9 },
+    { 0x2C00, 0x2C2E },
+    { 0x2C30, 0x2C5E },
+    { 0x2C60, 0x2C6C },
+    { 0x2C74, 0x2C77 },
+    { 0x2C80, 0x2CE4 },
+    { 0x2D00, 0x2D25 },
+    { 0x2D30, 0x2D65 },
+    { 0x2D6F, 0x2D6F },
+    { 0x2D80, 0x2D96 },
+    { 0x2DA0, 0x2DA6 },
+    { 0x2DA8, 0x2DAE },
+    { 0x2DB0, 0x2DB6 },
+    { 0x2DB8, 0x2DBE },
+    { 0x2DC0, 0x2DC6 },
+    { 0x2DC8, 0x2DCE },
+    { 0x2DD0, 0x2DD6 },
+    { 0x2DD8, 0x2DDE },
+    { 0x3005, 0x3007 },
+    { 0x3021, 0x3029 },
+    { 0x3031, 0x3035 },
+    { 0x3038, 0x303C },
+    { 0x3041, 0x3096 },
+    { 0x309D, 0x309F },
+    { 0x30A1, 0x30FA },
+    { 0x30FC, 0x30FF },
+    { 0x3105, 0x312C },
+    { 0x3131, 0x318E },
+    { 0x31A0, 0x31B7 },
+    { 0x31F0, 0x31FF },
+    { 0x3400, 0x4DB5 },
+    { 0x4E00, 0x9FBB },
+    { 0xA000, 0xA48C },
+    { 0xA717, 0xA71A },
+    { 0xA800, 0xA801 },
+    { 0xA803, 0xA805 },
+    { 0xA807, 0xA80A },
+    { 0xA80C, 0xA822 },
+    { 0xA840, 0xA873 },
+    { 0xAC00, 0xD7A3 },
+    { 0xF900, 0xFA2D },
+    { 0xFA30, 0xFA6A },
+    { 0xFA70, 0xFAD9 },
+    { 0xFB00, 0xFB06 },
+    { 0xFB13, 0xFB17 },
+    { 0xFB1D, 0xFB1D },
+    { 0xFB1F, 0xFB28 },
+    { 0xFB2A, 0xFB36 },
+    { 0xFB38, 0xFB3C },
+    { 0xFB3E, 0xFB3E },
+    { 0xFB40, 0xFB41 },
+    { 0xFB43, 0xFB44 },
+    { 0xFB46, 0xFBB1 },
+    { 0xFBD3, 0xFD3D },
+    { 0xFD50, 0xFD8F },
+    { 0xFD92, 0xFDC7 },
+    { 0xFDF0, 0xFDFB },
+    { 0xFE70, 0xFE74 },
+    { 0xFE76, 0xFEFC },
+    { 0xFF10, 0xFF19 },
+    { 0xFF21, 0xFF3A },
+    { 0xFF41, 0xFF5A },
+    { 0xFF66, 0xFFBE },
+    { 0xFFC2, 0xFFC7 },
+    { 0xFFCA, 0xFFCF },
+    { 0xFFD2, 0xFFD7 },
+    { 0xFFDA, 0xFFDC },
+    { 0x10000, 0x1000B },
+    { 0x1000D, 0x10026 },
+    { 0x10028, 0x1003A },
+    { 0x1003C, 0x1003D },
+    { 0x1003F, 0x1004D },
+    { 0x10050, 0x1005D },
+    { 0x10080, 0x100FA },
+    { 0x10140, 0x10174 },
+    { 0x10300, 0x1031E },
+    { 0x10330, 0x1034A },
+    { 0x10380, 0x1039D },
+    { 0x103A0, 0x103C3 },
+    { 0x103C8, 0x103CF },
+    { 0x103D1, 0x103D5 },
+    { 0x10400, 0x1049D },
+    { 0x104A0, 0x104A9 },
+    { 0x10800, 0x10805 },
+    { 0x10808, 0x10808 },
+    { 0x1080A, 0x10835 },
+    { 0x10837, 0x10838 },
+    { 0x1083C, 0x1083C },
+    { 0x1083F, 0x1083F },
+    { 0x10900, 0x10915 },
+    { 0x10A00, 0x10A00 },
+    { 0x10A10, 0x10A13 },
+    { 0x10A15, 0x10A17 },
+    { 0x10A19, 0x10A33 },
+    { 0x12000, 0x1236E },
+    { 0x12400, 0x12462 },
+    { 0x1D400, 0x1D454 },
+    { 0x1D456, 0x1D49C },
+    { 0x1D49E, 0x1D49F },
+    { 0x1D4A2, 0x1D4A2 },
+    { 0x1D4A5, 0x1D4A6 },
+    { 0x1D4A9, 0x1D4AC },
+    { 0x1D4AE, 0x1D4B9 },
+    { 0x1D4BB, 0x1D4BB },
+    { 0x1D4BD, 0x1D4C3 },
+    { 0x1D4C5, 0x1D505 },
+    { 0x1D507, 0x1D50A },
+    { 0x1D50D, 0x1D514 },
+    { 0x1D516, 0x1D51C },
+    { 0x1D51E, 0x1D539 },
+    { 0x1D53B, 0x1D53E },
+    { 0x1D540, 0x1D544 },
+    { 0x1D546, 0x1D546 },
+    { 0x1D54A, 0x1D550 },
+    { 0x1D552, 0x1D6A5 },
+    { 0x1D6A8, 0x1D6C0 },
+    { 0x1D6C2, 0x1D6DA },
+    { 0x1D6DC, 0x1D6FA },
+    { 0x1D6FC, 0x1D714 },
+    { 0x1D716, 0x1D734 },
+    { 0x1D736, 0x1D74E },
+    { 0x1D750, 0x1D76E },
+    { 0x1D770, 0x1D788 },
+    { 0x1D78A, 0x1D7A8 },
+    { 0x1D7AA, 0x1D7C2 },
+    { 0x1D7C4, 0x1D7CB },
+    { 0x1D7CE, 0x1D7FF },
+    { 0x20000, 0x2A6D6 },
+    { 0x2F800, 0x2FA1D }
+
+#define PREDICATE(c) uc_is_alnum (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-ctype_alpha.c
@@ -0,0 +1,404 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0041, 0x005A },
+    { 0x0061, 0x007A },
+    { 0x00AA, 0x00AA },
+    { 0x00B5, 0x00B5 },
+    { 0x00BA, 0x00BA },
+    { 0x00C0, 0x00D6 },
+    { 0x00D8, 0x00F6 },
+    { 0x00F8, 0x02C1 },
+    { 0x02C6, 0x02D1 },
+    { 0x02E0, 0x02E4 },
+    { 0x02EE, 0x02EE },
+    { 0x0345, 0x0345 },
+    { 0x037A, 0x037D },
+    { 0x0386, 0x0386 },
+    { 0x0388, 0x038A },
+    { 0x038C, 0x038C },
+    { 0x038E, 0x03A1 },
+    { 0x03A3, 0x03CE },
+    { 0x03D0, 0x03F5 },
+    { 0x03F7, 0x0481 },
+    { 0x048A, 0x0513 },
+    { 0x0531, 0x0556 },
+    { 0x0559, 0x0559 },
+    { 0x0561, 0x0587 },
+    { 0x05D0, 0x05EA },
+    { 0x05F0, 0x05F2 },
+    { 0x0621, 0x063A },
+    { 0x0640, 0x064A },
+    { 0x0660, 0x0669 },
+    { 0x066E, 0x066F },
+    { 0x0671, 0x06D3 },
+    { 0x06D5, 0x06D5 },
+    { 0x06E5, 0x06E6 },
+    { 0x06EE, 0x06FC },
+    { 0x06FF, 0x06FF },
+    { 0x0710, 0x0710 },
+    { 0x0712, 0x072F },
+    { 0x074D, 0x076D },
+    { 0x0780, 0x07A5 },
+    { 0x07B1, 0x07B1 },
+    { 0x07C0, 0x07EA },
+    { 0x07F4, 0x07F5 },
+    { 0x07FA, 0x07FA },
+    { 0x0904, 0x0939 },
+    { 0x093D, 0x093D },
+    { 0x0950, 0x0950 },
+    { 0x0958, 0x0961 },
+    { 0x0966, 0x096F },
+    { 0x097B, 0x097F },
+    { 0x0985, 0x098C },
+    { 0x098F, 0x0990 },
+    { 0x0993, 0x09A8 },
+    { 0x09AA, 0x09B0 },
+    { 0x09B2, 0x09B2 },
+    { 0x09B6, 0x09B9 },
+    { 0x09BD, 0x09BD },
+    { 0x09CE, 0x09CE },
+    { 0x09DC, 0x09DD },
+    { 0x09DF, 0x09E1 },
+    { 0x09E6, 0x09F1 },
+    { 0x0A05, 0x0A0A },
+    { 0x0A0F, 0x0A10 },
+    { 0x0A13, 0x0A28 },
+    { 0x0A2A, 0x0A30 },
+    { 0x0A32, 0x0A33 },
+    { 0x0A35, 0x0A36 },
+    { 0x0A38, 0x0A39 },
+    { 0x0A59, 0x0A5C },
+    { 0x0A5E, 0x0A5E },
+    { 0x0A66, 0x0A6F },
+    { 0x0A72, 0x0A74 },
+    { 0x0A85, 0x0A8D },
+    { 0x0A8F, 0x0A91 },
+    { 0x0A93, 0x0AA8 },
+    { 0x0AAA, 0x0AB0 },
+    { 0x0AB2, 0x0AB3 },
+    { 0x0AB5, 0x0AB9 },
+    { 0x0ABD, 0x0ABD },
+    { 0x0AD0, 0x0AD0 },
+    { 0x0AE0, 0x0AE1 },
+    { 0x0AE6, 0x0AEF },
+    { 0x0B05, 0x0B0C },
+    { 0x0B0F, 0x0B10 },
+    { 0x0B13, 0x0B28 },
+    { 0x0B2A, 0x0B30 },
+    { 0x0B32, 0x0B33 },
+    { 0x0B35, 0x0B39 },
+    { 0x0B3D, 0x0B3D },
+    { 0x0B5C, 0x0B5D },
+    { 0x0B5F, 0x0B61 },
+    { 0x0B66, 0x0B6F },
+    { 0x0B71, 0x0B71 },
+    { 0x0B83, 0x0B83 },
+    { 0x0B85, 0x0B8A },
+    { 0x0B8E, 0x0B90 },
+    { 0x0B92, 0x0B95 },
+    { 0x0B99, 0x0B9A },
+    { 0x0B9C, 0x0B9C },
+    { 0x0B9E, 0x0B9F },
+    { 0x0BA3, 0x0BA4 },
+    { 0x0BA8, 0x0BAA },
+    { 0x0BAE, 0x0BB9 },
+    { 0x0BE6, 0x0BEF },
+    { 0x0C05, 0x0C0C },
+    { 0x0C0E, 0x0C10 },
+    { 0x0C12, 0x0C28 },
+    { 0x0C2A, 0x0C33 },
+    { 0x0C35, 0x0C39 },
+    { 0x0C60, 0x0C61 },
+    { 0x0C66, 0x0C6F },
+    { 0x0C85, 0x0C8C },
+    { 0x0C8E, 0x0C90 },
+    { 0x0C92, 0x0CA8 },
+    { 0x0CAA, 0x0CB3 },
+    { 0x0CB5, 0x0CB9 },
+    { 0x0CBD, 0x0CBD },
+    { 0x0CDE, 0x0CDE },
+    { 0x0CE0, 0x0CE1 },
+    { 0x0CE6, 0x0CEF },
+    { 0x0D05, 0x0D0C },
+    { 0x0D0E, 0x0D10 },
+    { 0x0D12, 0x0D28 },
+    { 0x0D2A, 0x0D39 },
+    { 0x0D60, 0x0D61 },
+    { 0x0D66, 0x0D6F },
+    { 0x0D85, 0x0D96 },
+    { 0x0D9A, 0x0DB1 },
+    { 0x0DB3, 0x0DBB },
+    { 0x0DBD, 0x0DBD },
+    { 0x0DC0, 0x0DC6 },
+    { 0x0E01, 0x0E2E },
+    { 0x0E30, 0x0E3A },
+    { 0x0E40, 0x0E45 },
+    { 0x0E47, 0x0E4E },
+    { 0x0E50, 0x0E59 },
+    { 0x0E81, 0x0E82 },
+    { 0x0E84, 0x0E84 },
+    { 0x0E87, 0x0E88 },
+    { 0x0E8A, 0x0E8A },
+    { 0x0E8D, 0x0E8D },
+    { 0x0E94, 0x0E97 },
+    { 0x0E99, 0x0E9F },
+    { 0x0EA1, 0x0EA3 },
+    { 0x0EA5, 0x0EA5 },
+    { 0x0EA7, 0x0EA7 },
+    { 0x0EAA, 0x0EAB },
+    { 0x0EAD, 0x0EB0 },
+    { 0x0EB2, 0x0EB3 },
+    { 0x0EBD, 0x0EBD },
+    { 0x0EC0, 0x0EC4 },
+    { 0x0EC6, 0x0EC6 },
+    { 0x0ED0, 0x0ED9 },
+    { 0x0EDC, 0x0EDD },
+    { 0x0F00, 0x0F00 },
+    { 0x0F20, 0x0F29 },
+    { 0x0F40, 0x0F47 },
+    { 0x0F49, 0x0F6A },
+    { 0x0F88, 0x0F8B },
+    { 0x1000, 0x1021 },
+    { 0x1023, 0x1027 },
+    { 0x1029, 0x102A },
+    { 0x1040, 0x1049 },
+    { 0x1050, 0x1055 },
+    { 0x10A0, 0x10C5 },
+    { 0x10D0, 0x10FA },
+    { 0x10FC, 0x10FC },
+    { 0x1100, 0x1159 },
+    { 0x115F, 0x11A2 },
+    { 0x11A8, 0x11F9 },
+    { 0x1200, 0x1248 },
+    { 0x124A, 0x124D },
+    { 0x1250, 0x1256 },
+    { 0x1258, 0x1258 },
+    { 0x125A, 0x125D },
+    { 0x1260, 0x1288 },
+    { 0x128A, 0x128D },
+    { 0x1290, 0x12B0 },
+    { 0x12B2, 0x12B5 },
+    { 0x12B8, 0x12BE },
+    { 0x12C0, 0x12C0 },
+    { 0x12C2, 0x12C5 },
+    { 0x12C8, 0x12D6 },
+    { 0x12D8, 0x1310 },
+    { 0x1312, 0x1315 },
+    { 0x1318, 0x135A },
+    { 0x1380, 0x138F },
+    { 0x13A0, 0x13F4 },
+    { 0x1401, 0x166C },
+    { 0x166F, 0x1676 },
+    { 0x1681, 0x169A },
+    { 0x16A0, 0x16EA },
+    { 0x16EE, 0x16F0 },
+    { 0x1700, 0x170C },
+    { 0x170E, 0x1711 },
+    { 0x1720, 0x1731 },
+    { 0x1740, 0x1751 },
+    { 0x1760, 0x176C },
+    { 0x176E, 0x1770 },
+    { 0x1780, 0x17B3 },
+    { 0x17D7, 0x17D7 },
+    { 0x17DC, 0x17DC },
+    { 0x17E0, 0x17E9 },
+    { 0x1810, 0x1819 },
+    { 0x1820, 0x1877 },
+    { 0x1880, 0x18A8 },
+    { 0x1900, 0x191C },
+    { 0x1946, 0x196D },
+    { 0x1970, 0x1974 },
+    { 0x1980, 0x19A9 },
+    { 0x19C1, 0x19C7 },
+    { 0x19D0, 0x19D9 },
+    { 0x1A00, 0x1A16 },
+    { 0x1B05, 0x1B33 },
+    { 0x1B45, 0x1B4B },
+    { 0x1B50, 0x1B59 },
+    { 0x1D00, 0x1DBF },
+    { 0x1E00, 0x1E9B },
+    { 0x1EA0, 0x1EF9 },
+    { 0x1F00, 0x1F15 },
+    { 0x1F18, 0x1F1D },
+    { 0x1F20, 0x1F45 },
+    { 0x1F48, 0x1F4D },
+    { 0x1F50, 0x1F57 },
+    { 0x1F59, 0x1F59 },
+    { 0x1F5B, 0x1F5B },
+    { 0x1F5D, 0x1F5D },
+    { 0x1F5F, 0x1F7D },
+    { 0x1F80, 0x1FB4 },
+    { 0x1FB6, 0x1FBC },
+    { 0x1FBE, 0x1FBE },
+    { 0x1FC2, 0x1FC4 },
+    { 0x1FC6, 0x1FCC },
+    { 0x1FD0, 0x1FD3 },
+    { 0x1FD6, 0x1FDB },
+    { 0x1FE0, 0x1FEC },
+    { 0x1FF2, 0x1FF4 },
+    { 0x1FF6, 0x1FFC },
+    { 0x2071, 0x2071 },
+    { 0x207F, 0x207F },
+    { 0x2090, 0x2094 },
+    { 0x2102, 0x2102 },
+    { 0x2107, 0x2107 },
+    { 0x210A, 0x2113 },
+    { 0x2115, 0x2115 },
+    { 0x2119, 0x211D },
+    { 0x2124, 0x2124 },
+    { 0x2126, 0x2126 },
+    { 0x2128, 0x212D },
+    { 0x212F, 0x2139 },
+    { 0x213C, 0x213F },
+    { 0x2145, 0x2149 },
+    { 0x214E, 0x214E },
+    { 0x2160, 0x2184 },
+    { 0x249C, 0x24E9 },
+    { 0x2C00, 0x2C2E },
+    { 0x2C30, 0x2C5E },
+    { 0x2C60, 0x2C6C },
+    { 0x2C74, 0x2C77 },
+    { 0x2C80, 0x2CE4 },
+    { 0x2D00, 0x2D25 },
+    { 0x2D30, 0x2D65 },
+    { 0x2D6F, 0x2D6F },
+    { 0x2D80, 0x2D96 },
+    { 0x2DA0, 0x2DA6 },
+    { 0x2DA8, 0x2DAE },
+    { 0x2DB0, 0x2DB6 },
+    { 0x2DB8, 0x2DBE },
+    { 0x2DC0, 0x2DC6 },
+    { 0x2DC8, 0x2DCE },
+    { 0x2DD0, 0x2DD6 },
+    { 0x2DD8, 0x2DDE },
+    { 0x3005, 0x3007 },
+    { 0x3021, 0x3029 },
+    { 0x3031, 0x3035 },
+    { 0x3038, 0x303C },
+    { 0x3041, 0x3096 },
+    { 0x309D, 0x309F },
+    { 0x30A1, 0x30FA },
+    { 0x30FC, 0x30FF },
+    { 0x3105, 0x312C },
+    { 0x3131, 0x318E },
+    { 0x31A0, 0x31B7 },
+    { 0x31F0, 0x31FF },
+    { 0x3400, 0x4DB5 },
+    { 0x4E00, 0x9FBB },
+    { 0xA000, 0xA48C },
+    { 0xA717, 0xA71A },
+    { 0xA800, 0xA801 },
+    { 0xA803, 0xA805 },
+    { 0xA807, 0xA80A },
+    { 0xA80C, 0xA822 },
+    { 0xA840, 0xA873 },
+    { 0xAC00, 0xD7A3 },
+    { 0xF900, 0xFA2D },
+    { 0xFA30, 0xFA6A },
+    { 0xFA70, 0xFAD9 },
+    { 0xFB00, 0xFB06 },
+    { 0xFB13, 0xFB17 },
+    { 0xFB1D, 0xFB1D },
+    { 0xFB1F, 0xFB28 },
+    { 0xFB2A, 0xFB36 },
+    { 0xFB38, 0xFB3C },
+    { 0xFB3E, 0xFB3E },
+    { 0xFB40, 0xFB41 },
+    { 0xFB43, 0xFB44 },
+    { 0xFB46, 0xFBB1 },
+    { 0xFBD3, 0xFD3D },
+    { 0xFD50, 0xFD8F },
+    { 0xFD92, 0xFDC7 },
+    { 0xFDF0, 0xFDFB },
+    { 0xFE70, 0xFE74 },
+    { 0xFE76, 0xFEFC },
+    { 0xFF10, 0xFF19 },
+    { 0xFF21, 0xFF3A },
+    { 0xFF41, 0xFF5A },
+    { 0xFF66, 0xFFBE },
+    { 0xFFC2, 0xFFC7 },
+    { 0xFFCA, 0xFFCF },
+    { 0xFFD2, 0xFFD7 },
+    { 0xFFDA, 0xFFDC },
+    { 0x10000, 0x1000B },
+    { 0x1000D, 0x10026 },
+    { 0x10028, 0x1003A },
+    { 0x1003C, 0x1003D },
+    { 0x1003F, 0x1004D },
+    { 0x10050, 0x1005D },
+    { 0x10080, 0x100FA },
+    { 0x10140, 0x10174 },
+    { 0x10300, 0x1031E },
+    { 0x10330, 0x1034A },
+    { 0x10380, 0x1039D },
+    { 0x103A0, 0x103C3 },
+    { 0x103C8, 0x103CF },
+    { 0x103D1, 0x103D5 },
+    { 0x10400, 0x1049D },
+    { 0x104A0, 0x104A9 },
+    { 0x10800, 0x10805 },
+    { 0x10808, 0x10808 },
+    { 0x1080A, 0x10835 },
+    { 0x10837, 0x10838 },
+    { 0x1083C, 0x1083C },
+    { 0x1083F, 0x1083F },
+    { 0x10900, 0x10915 },
+    { 0x10A00, 0x10A00 },
+    { 0x10A10, 0x10A13 },
+    { 0x10A15, 0x10A17 },
+    { 0x10A19, 0x10A33 },
+    { 0x12000, 0x1236E },
+    { 0x12400, 0x12462 },
+    { 0x1D400, 0x1D454 },
+    { 0x1D456, 0x1D49C },
+    { 0x1D49E, 0x1D49F },
+    { 0x1D4A2, 0x1D4A2 },
+    { 0x1D4A5, 0x1D4A6 },
+    { 0x1D4A9, 0x1D4AC },
+    { 0x1D4AE, 0x1D4B9 },
+    { 0x1D4BB, 0x1D4BB },
+    { 0x1D4BD, 0x1D4C3 },
+    { 0x1D4C5, 0x1D505 },
+    { 0x1D507, 0x1D50A },
+    { 0x1D50D, 0x1D514 },
+    { 0x1D516, 0x1D51C },
+    { 0x1D51E, 0x1D539 },
+    { 0x1D53B, 0x1D53E },
+    { 0x1D540, 0x1D544 },
+    { 0x1D546, 0x1D546 },
+    { 0x1D54A, 0x1D550 },
+    { 0x1D552, 0x1D6A5 },
+    { 0x1D6A8, 0x1D6C0 },
+    { 0x1D6C2, 0x1D6DA },
+    { 0x1D6DC, 0x1D6FA },
+    { 0x1D6FC, 0x1D714 },
+    { 0x1D716, 0x1D734 },
+    { 0x1D736, 0x1D74E },
+    { 0x1D750, 0x1D76E },
+    { 0x1D770, 0x1D788 },
+    { 0x1D78A, 0x1D7A8 },
+    { 0x1D7AA, 0x1D7C2 },
+    { 0x1D7C4, 0x1D7CB },
+    { 0x1D7CE, 0x1D7FF },
+    { 0x20000, 0x2A6D6 },
+    { 0x2F800, 0x2FA1D }
+
+#define PREDICATE(c) uc_is_alpha (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-ctype_blank.c
@@ -0,0 +1,30 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0009, 0x0009 },
+    { 0x0020, 0x0020 },
+    { 0x1680, 0x1680 },
+    { 0x180E, 0x180E },
+    { 0x2000, 0x2006 },
+    { 0x2008, 0x200A },
+    { 0x205F, 0x205F },
+    { 0x3000, 0x3000 }
+
+#define PREDICATE(c) uc_is_blank (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-ctype_cntrl.c
@@ -0,0 +1,25 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0000, 0x001F },
+    { 0x007F, 0x009F },
+    { 0x2028, 0x2029 }
+
+#define PREDICATE(c) uc_is_cntrl (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-ctype_digit.c
@@ -0,0 +1,23 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0030, 0x0039 }
+
+#define PREDICATE(c) uc_is_digit (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-ctype_graph.c
@@ -0,0 +1,456 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0021, 0x007E },
+    { 0x00A0, 0x036F },
+    { 0x0374, 0x0375 },
+    { 0x037A, 0x037E },
+    { 0x0384, 0x038A },
+    { 0x038C, 0x038C },
+    { 0x038E, 0x03A1 },
+    { 0x03A3, 0x03CE },
+    { 0x03D0, 0x0486 },
+    { 0x0488, 0x0513 },
+    { 0x0531, 0x0556 },
+    { 0x0559, 0x055F },
+    { 0x0561, 0x0587 },
+    { 0x0589, 0x058A },
+    { 0x0591, 0x05C7 },
+    { 0x05D0, 0x05EA },
+    { 0x05F0, 0x05F4 },
+    { 0x0600, 0x0603 },
+    { 0x060B, 0x0615 },
+    { 0x061B, 0x061B },
+    { 0x061E, 0x061F },
+    { 0x0621, 0x063A },
+    { 0x0640, 0x065E },
+    { 0x0660, 0x070D },
+    { 0x070F, 0x074A },
+    { 0x074D, 0x076D },
+    { 0x0780, 0x07B1 },
+    { 0x07C0, 0x07FA },
+    { 0x0901, 0x0939 },
+    { 0x093C, 0x094D },
+    { 0x0950, 0x0954 },
+    { 0x0958, 0x0970 },
+    { 0x097B, 0x097F },
+    { 0x0981, 0x0983 },
+    { 0x0985, 0x098C },
+    { 0x098F, 0x0990 },
+    { 0x0993, 0x09A8 },
+    { 0x09AA, 0x09B0 },
+    { 0x09B2, 0x09B2 },
+    { 0x09B6, 0x09B9 },
+    { 0x09BC, 0x09C4 },
+    { 0x09C7, 0x09C8 },
+    { 0x09CB, 0x09CE },
+    { 0x09D7, 0x09D7 },
+    { 0x09DC, 0x09DD },
+    { 0x09DF, 0x09E3 },
+    { 0x09E6, 0x09FA },
+    { 0x0A01, 0x0A03 },
+    { 0x0A05, 0x0A0A },
+    { 0x0A0F, 0x0A10 },
+    { 0x0A13, 0x0A28 },
+    { 0x0A2A, 0x0A30 },
+    { 0x0A32, 0x0A33 },
+    { 0x0A35, 0x0A36 },
+    { 0x0A38, 0x0A39 },
+    { 0x0A3C, 0x0A3C },
+    { 0x0A3E, 0x0A42 },
+    { 0x0A47, 0x0A48 },
+    { 0x0A4B, 0x0A4D },
+    { 0x0A59, 0x0A5C },
+    { 0x0A5E, 0x0A5E },
+    { 0x0A66, 0x0A74 },
+    { 0x0A81, 0x0A83 },
+    { 0x0A85, 0x0A8D },
+    { 0x0A8F, 0x0A91 },
+    { 0x0A93, 0x0AA8 },
+    { 0x0AAA, 0x0AB0 },
+    { 0x0AB2, 0x0AB3 },
+    { 0x0AB5, 0x0AB9 },
+    { 0x0ABC, 0x0AC5 },
+    { 0x0AC7, 0x0AC9 },
+    { 0x0ACB, 0x0ACD },
+    { 0x0AD0, 0x0AD0 },
+    { 0x0AE0, 0x0AE3 },
+    { 0x0AE6, 0x0AEF },
+    { 0x0AF1, 0x0AF1 },
+    { 0x0B01, 0x0B03 },
+    { 0x0B05, 0x0B0C },
+    { 0x0B0F, 0x0B10 },
+    { 0x0B13, 0x0B28 },
+    { 0x0B2A, 0x0B30 },
+    { 0x0B32, 0x0B33 },
+    { 0x0B35, 0x0B39 },
+    { 0x0B3C, 0x0B43 },
+    { 0x0B47, 0x0B48 },
+    { 0x0B4B, 0x0B4D },
+    { 0x0B56, 0x0B57 },
+    { 0x0B5C, 0x0B5D },
+    { 0x0B5F, 0x0B61 },
+    { 0x0B66, 0x0B71 },
+    { 0x0B82, 0x0B83 },
+    { 0x0B85, 0x0B8A },
+    { 0x0B8E, 0x0B90 },
+    { 0x0B92, 0x0B95 },
+    { 0x0B99, 0x0B9A },
+    { 0x0B9C, 0x0B9C },
+    { 0x0B9E, 0x0B9F },
+    { 0x0BA3, 0x0BA4 },
+    { 0x0BA8, 0x0BAA },
+    { 0x0BAE, 0x0BB9 },
+    { 0x0BBE, 0x0BC2 },
+    { 0x0BC6, 0x0BC8 },
+    { 0x0BCA, 0x0BCD },
+    { 0x0BD7, 0x0BD7 },
+    { 0x0BE6, 0x0BFA },
+    { 0x0C01, 0x0C03 },
+    { 0x0C05, 0x0C0C },
+    { 0x0C0E, 0x0C10 },
+    { 0x0C12, 0x0C28 },
+    { 0x0C2A, 0x0C33 },
+    { 0x0C35, 0x0C39 },
+    { 0x0C3E, 0x0C44 },
+    { 0x0C46, 0x0C48 },
+    { 0x0C4A, 0x0C4D },
+    { 0x0C55, 0x0C56 },
+    { 0x0C60, 0x0C61 },
+    { 0x0C66, 0x0C6F },
+    { 0x0C82, 0x0C83 },
+    { 0x0C85, 0x0C8C },
+    { 0x0C8E, 0x0C90 },
+    { 0x0C92, 0x0CA8 },
+    { 0x0CAA, 0x0CB3 },
+    { 0x0CB5, 0x0CB9 },
+    { 0x0CBC, 0x0CC4 },
+    { 0x0CC6, 0x0CC8 },
+    { 0x0CCA, 0x0CCD },
+    { 0x0CD5, 0x0CD6 },
+    { 0x0CDE, 0x0CDE },
+    { 0x0CE0, 0x0CE3 },
+    { 0x0CE6, 0x0CEF },
+    { 0x0CF1, 0x0CF2 },
+    { 0x0D02, 0x0D03 },
+    { 0x0D05, 0x0D0C },
+    { 0x0D0E, 0x0D10 },
+    { 0x0D12, 0x0D28 },
+    { 0x0D2A, 0x0D39 },
+    { 0x0D3E, 0x0D43 },
+    { 0x0D46, 0x0D48 },
+    { 0x0D4A, 0x0D4D },
+    { 0x0D57, 0x0D57 },
+    { 0x0D60, 0x0D61 },
+    { 0x0D66, 0x0D6F },
+    { 0x0D82, 0x0D83 },
+    { 0x0D85, 0x0D96 },
+    { 0x0D9A, 0x0DB1 },
+    { 0x0DB3, 0x0DBB },
+    { 0x0DBD, 0x0DBD },
+    { 0x0DC0, 0x0DC6 },
+    { 0x0DCA, 0x0DCA },
+    { 0x0DCF, 0x0DD4 },
+    { 0x0DD6, 0x0DD6 },
+    { 0x0DD8, 0x0DDF },
+    { 0x0DF2, 0x0DF4 },
+    { 0x0E01, 0x0E3A },
+    { 0x0E3F, 0x0E5B },
+    { 0x0E81, 0x0E82 },
+    { 0x0E84, 0x0E84 },
+    { 0x0E87, 0x0E88 },
+    { 0x0E8A, 0x0E8A },
+    { 0x0E8D, 0x0E8D },
+    { 0x0E94, 0x0E97 },
+    { 0x0E99, 0x0E9F },
+    { 0x0EA1, 0x0EA3 },
+    { 0x0EA5, 0x0EA5 },
+    { 0x0EA7, 0x0EA7 },
+    { 0x0EAA, 0x0EAB },
+    { 0x0EAD, 0x0EB9 },
+    { 0x0EBB, 0x0EBD },
+    { 0x0EC0, 0x0EC4 },
+    { 0x0EC6, 0x0EC6 },
+    { 0x0EC8, 0x0ECD },
+    { 0x0ED0, 0x0ED9 },
+    { 0x0EDC, 0x0EDD },
+    { 0x0F00, 0x0F47 },
+    { 0x0F49, 0x0F6A },
+    { 0x0F71, 0x0F8B },
+    { 0x0F90, 0x0F97 },
+    { 0x0F99, 0x0FBC },
+    { 0x0FBE, 0x0FCC },
+    { 0x0FCF, 0x0FD1 },
+    { 0x1000, 0x1021 },
+    { 0x1023, 0x1027 },
+    { 0x1029, 0x102A },
+    { 0x102C, 0x1032 },
+    { 0x1036, 0x1039 },
+    { 0x1040, 0x1059 },
+    { 0x10A0, 0x10C5 },
+    { 0x10D0, 0x10FC },
+    { 0x1100, 0x1159 },
+    { 0x115F, 0x11A2 },
+    { 0x11A8, 0x11F9 },
+    { 0x1200, 0x1248 },
+    { 0x124A, 0x124D },
+    { 0x1250, 0x1256 },
+    { 0x1258, 0x1258 },
+    { 0x125A, 0x125D },
+    { 0x1260, 0x1288 },
+    { 0x128A, 0x128D },
+    { 0x1290, 0x12B0 },
+    { 0x12B2, 0x12B5 },
+    { 0x12B8, 0x12BE },
+    { 0x12C0, 0x12C0 },
+    { 0x12C2, 0x12C5 },
+    { 0x12C8, 0x12D6 },
+    { 0x12D8, 0x1310 },
+    { 0x1312, 0x1315 },
+    { 0x1318, 0x135A },
+    { 0x135F, 0x137C },
+    { 0x1380, 0x1399 },
+    { 0x13A0, 0x13F4 },
+    { 0x1401, 0x1676 },
+    { 0x1681, 0x169C },
+    { 0x16A0, 0x16F0 },
+    { 0x1700, 0x170C },
+    { 0x170E, 0x1714 },
+    { 0x1720, 0x1736 },
+    { 0x1740, 0x1753 },
+    { 0x1760, 0x176C },
+    { 0x176E, 0x1770 },
+    { 0x1772, 0x1773 },
+    { 0x1780, 0x17DD },
+    { 0x17E0, 0x17E9 },
+    { 0x17F0, 0x17F9 },
+    { 0x1800, 0x180D },
+    { 0x1810, 0x1819 },
+    { 0x1820, 0x1877 },
+    { 0x1880, 0x18A9 },
+    { 0x1900, 0x191C },
+    { 0x1920, 0x192B },
+    { 0x1930, 0x193B },
+    { 0x1940, 0x1940 },
+    { 0x1944, 0x196D },
+    { 0x1970, 0x1974 },
+    { 0x1980, 0x19A9 },
+    { 0x19B0, 0x19C9 },
+    { 0x19D0, 0x19D9 },
+    { 0x19DE, 0x1A1B },
+    { 0x1A1E, 0x1A1F },
+    { 0x1B00, 0x1B4B },
+    { 0x1B50, 0x1B7C },
+    { 0x1D00, 0x1DCA },
+    { 0x1DFE, 0x1E9B },
+    { 0x1EA0, 0x1EF9 },
+    { 0x1F00, 0x1F15 },
+    { 0x1F18, 0x1F1D },
+    { 0x1F20, 0x1F45 },
+    { 0x1F48, 0x1F4D },
+    { 0x1F50, 0x1F57 },
+    { 0x1F59, 0x1F59 },
+    { 0x1F5B, 0x1F5B },
+    { 0x1F5D, 0x1F5D },
+    { 0x1F5F, 0x1F7D },
+    { 0x1F80, 0x1FB4 },
+    { 0x1FB6, 0x1FC4 },
+    { 0x1FC6, 0x1FD3 },
+    { 0x1FD6, 0x1FDB },
+    { 0x1FDD, 0x1FEF },
+    { 0x1FF2, 0x1FF4 },
+    { 0x1FF6, 0x1FFE },
+    { 0x2007, 0x2007 },
+    { 0x200B, 0x2027 },
+    { 0x202A, 0x205E },
+    { 0x2060, 0x2063 },
+    { 0x206A, 0x2071 },
+    { 0x2074, 0x208E },
+    { 0x2090, 0x2094 },
+    { 0x20A0, 0x20B5 },
+    { 0x20D0, 0x20EF },
+    { 0x2100, 0x214E },
+    { 0x2153, 0x2184 },
+    { 0x2190, 0x23E7 },
+    { 0x2400, 0x2426 },
+    { 0x2440, 0x244A },
+    { 0x2460, 0x269C },
+    { 0x26A0, 0x26B2 },
+    { 0x2701, 0x2704 },
+    { 0x2706, 0x2709 },
+    { 0x270C, 0x2727 },
+    { 0x2729, 0x274B },
+    { 0x274D, 0x274D },
+    { 0x274F, 0x2752 },
+    { 0x2756, 0x2756 },
+    { 0x2758, 0x275E },
+    { 0x2761, 0x2794 },
+    { 0x2798, 0x27AF },
+    { 0x27B1, 0x27BE },
+    { 0x27C0, 0x27CA },
+    { 0x27D0, 0x27EB },
+    { 0x27F0, 0x2B1A },
+    { 0x2B20, 0x2B23 },
+    { 0x2C00, 0x2C2E },
+    { 0x2C30, 0x2C5E },
+    { 0x2C60, 0x2C6C },
+    { 0x2C74, 0x2C77 },
+    { 0x2C80, 0x2CEA },
+    { 0x2CF9, 0x2D25 },
+    { 0x2D30, 0x2D65 },
+    { 0x2D6F, 0x2D6F },
+    { 0x2D80, 0x2D96 },
+    { 0x2DA0, 0x2DA6 },
+    { 0x2DA8, 0x2DAE },
+    { 0x2DB0, 0x2DB6 },
+    { 0x2DB8, 0x2DBE },
+    { 0x2DC0, 0x2DC6 },
+    { 0x2DC8, 0x2DCE },
+    { 0x2DD0, 0x2DD6 },
+    { 0x2DD8, 0x2DDE },
+    { 0x2E00, 0x2E17 },
+    { 0x2E1C, 0x2E1D },
+    { 0x2E80, 0x2E99 },
+    { 0x2E9B, 0x2EF3 },
+    { 0x2F00, 0x2FD5 },
+    { 0x2FF0, 0x2FFB },
+    { 0x3001, 0x303F },
+    { 0x3041, 0x3096 },
+    { 0x3099, 0x30FF },
+    { 0x3105, 0x312C },
+    { 0x3131, 0x318E },
+    { 0x3190, 0x31B7 },
+    { 0x31C0, 0x31CF },
+    { 0x31F0, 0x321E },
+    { 0x3220, 0x3243 },
+    { 0x3250, 0x32FE },
+    { 0x3300, 0x4DB5 },
+    { 0x4DC0, 0x9FBB },
+    { 0xA000, 0xA48C },
+    { 0xA490, 0xA4C6 },
+    { 0xA700, 0xA71A },
+    { 0xA720, 0xA721 },
+    { 0xA800, 0xA82B },
+    { 0xA840, 0xA877 },
+    { 0xAC00, 0xD7A3 },
+    { 0xE000, 0xFA2D },
+    { 0xFA30, 0xFA6A },
+    { 0xFA70, 0xFAD9 },
+    { 0xFB00, 0xFB06 },
+    { 0xFB13, 0xFB17 },
+    { 0xFB1D, 0xFB36 },
+    { 0xFB38, 0xFB3C },
+    { 0xFB3E, 0xFB3E },
+    { 0xFB40, 0xFB41 },
+    { 0xFB43, 0xFB44 },
+    { 0xFB46, 0xFBB1 },
+    { 0xFBD3, 0xFD3F },
+    { 0xFD50, 0xFD8F },
+    { 0xFD92, 0xFDC7 },
+    { 0xFDF0, 0xFDFD },
+    { 0xFE00, 0xFE19 },
+    { 0xFE20, 0xFE23 },
+    { 0xFE30, 0xFE52 },
+    { 0xFE54, 0xFE66 },
+    { 0xFE68, 0xFE6B },
+    { 0xFE70, 0xFE74 },
+    { 0xFE76, 0xFEFC },
+    { 0xFEFF, 0xFEFF },
+    { 0xFF01, 0xFFBE },
+    { 0xFFC2, 0xFFC7 },
+    { 0xFFCA, 0xFFCF },
+    { 0xFFD2, 0xFFD7 },
+    { 0xFFDA, 0xFFDC },
+    { 0xFFE0, 0xFFE6 },
+    { 0xFFE8, 0xFFEE },
+    { 0xFFF9, 0xFFFD },
+    { 0x10000, 0x1000B },
+    { 0x1000D, 0x10026 },
+    { 0x10028, 0x1003A },
+    { 0x1003C, 0x1003D },
+    { 0x1003F, 0x1004D },
+    { 0x10050, 0x1005D },
+    { 0x10080, 0x100FA },
+    { 0x10100, 0x10102 },
+    { 0x10107, 0x10133 },
+    { 0x10137, 0x1018A },
+    { 0x10300, 0x1031E },
+    { 0x10320, 0x10323 },
+    { 0x10330, 0x1034A },
+    { 0x10380, 0x1039D },
+    { 0x1039F, 0x103C3 },
+    { 0x103C8, 0x103D5 },
+    { 0x10400, 0x1049D },
+    { 0x104A0, 0x104A9 },
+    { 0x10800, 0x10805 },
+    { 0x10808, 0x10808 },
+    { 0x1080A, 0x10835 },
+    { 0x10837, 0x10838 },
+    { 0x1083C, 0x1083C },
+    { 0x1083F, 0x1083F },
+    { 0x10900, 0x10919 },
+    { 0x1091F, 0x1091F },
+    { 0x10A00, 0x10A03 },
+    { 0x10A05, 0x10A06 },
+    { 0x10A0C, 0x10A13 },
+    { 0x10A15, 0x10A17 },
+    { 0x10A19, 0x10A33 },
+    { 0x10A38, 0x10A3A },
+    { 0x10A3F, 0x10A47 },
+    { 0x10A50, 0x10A58 },
+    { 0x12000, 0x1236E },
+    { 0x12400, 0x12462 },
+    { 0x12470, 0x12473 },
+    { 0x1D000, 0x1D0F5 },
+    { 0x1D100, 0x1D126 },
+    { 0x1D12A, 0x1D1DD },
+    { 0x1D200, 0x1D245 },
+    { 0x1D300, 0x1D356 },
+    { 0x1D360, 0x1D371 },
+    { 0x1D400, 0x1D454 },
+    { 0x1D456, 0x1D49C },
+    { 0x1D49E, 0x1D49F },
+    { 0x1D4A2, 0x1D4A2 },
+    { 0x1D4A5, 0x1D4A6 },
+    { 0x1D4A9, 0x1D4AC },
+    { 0x1D4AE, 0x1D4B9 },
+    { 0x1D4BB, 0x1D4BB },
+    { 0x1D4BD, 0x1D4C3 },
+    { 0x1D4C5, 0x1D505 },
+    { 0x1D507, 0x1D50A },
+    { 0x1D50D, 0x1D514 },
+    { 0x1D516, 0x1D51C },
+    { 0x1D51E, 0x1D539 },
+    { 0x1D53B, 0x1D53E },
+    { 0x1D540, 0x1D544 },
+    { 0x1D546, 0x1D546 },
+    { 0x1D54A, 0x1D550 },
+    { 0x1D552, 0x1D6A5 },
+    { 0x1D6A8, 0x1D7CB },
+    { 0x1D7CE, 0x1D7FF },
+    { 0x20000, 0x2A6D6 },
+    { 0x2F800, 0x2FA1D },
+    { 0xE0001, 0xE0001 },
+    { 0xE0020, 0xE007F },
+    { 0xE0100, 0xE01EF },
+    { 0xF0000, 0xFFFFD },
+    { 0x100000, 0x10FFFD }
+
+#define PREDICATE(c) uc_is_graph (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-ctype_lower.c
@@ -0,0 +1,497 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0061, 0x007A },
+    { 0x00B5, 0x00B5 },
+    { 0x00DF, 0x00F6 },
+    { 0x00F8, 0x00FF },
+    { 0x0101, 0x0101 },
+    { 0x0103, 0x0103 },
+    { 0x0105, 0x0105 },
+    { 0x0107, 0x0107 },
+    { 0x0109, 0x0109 },
+    { 0x010B, 0x010B },
+    { 0x010D, 0x010D },
+    { 0x010F, 0x010F },
+    { 0x0111, 0x0111 },
+    { 0x0113, 0x0113 },
+    { 0x0115, 0x0115 },
+    { 0x0117, 0x0117 },
+    { 0x0119, 0x0119 },
+    { 0x011B, 0x011B },
+    { 0x011D, 0x011D },
+    { 0x011F, 0x011F },
+    { 0x0121, 0x0121 },
+    { 0x0123, 0x0123 },
+    { 0x0125, 0x0125 },
+    { 0x0127, 0x0127 },
+    { 0x0129, 0x0129 },
+    { 0x012B, 0x012B },
+    { 0x012D, 0x012D },
+    { 0x012F, 0x012F },
+    { 0x0131, 0x0131 },
+    { 0x0133, 0x0133 },
+    { 0x0135, 0x0135 },
+    { 0x0137, 0x0137 },
+    { 0x013A, 0x013A },
+    { 0x013C, 0x013C },
+    { 0x013E, 0x013E },
+    { 0x0140, 0x0140 },
+    { 0x0142, 0x0142 },
+    { 0x0144, 0x0144 },
+    { 0x0146, 0x0146 },
+    { 0x0148, 0x0148 },
+    { 0x014B, 0x014B },
+    { 0x014D, 0x014D },
+    { 0x014F, 0x014F },
+    { 0x0151, 0x0151 },
+    { 0x0153, 0x0153 },
+    { 0x0155, 0x0155 },
+    { 0x0157, 0x0157 },
+    { 0x0159, 0x0159 },
+    { 0x015B, 0x015B },
+    { 0x015D, 0x015D },
+    { 0x015F, 0x015F },
+    { 0x0161, 0x0161 },
+    { 0x0163, 0x0163 },
+    { 0x0165, 0x0165 },
+    { 0x0167, 0x0167 },
+    { 0x0169, 0x0169 },
+    { 0x016B, 0x016B },
+    { 0x016D, 0x016D },
+    { 0x016F, 0x016F },
+    { 0x0171, 0x0171 },
+    { 0x0173, 0x0173 },
+    { 0x0175, 0x0175 },
+    { 0x0177, 0x0177 },
+    { 0x017A, 0x017A },
+    { 0x017C, 0x017C },
+    { 0x017E, 0x0180 },
+    { 0x0183, 0x0183 },
+    { 0x0185, 0x0185 },
+    { 0x0188, 0x0188 },
+    { 0x018C, 0x018C },
+    { 0x0192, 0x0192 },
+    { 0x0195, 0x0195 },
+    { 0x0199, 0x019A },
+    { 0x019E, 0x019E },
+    { 0x01A1, 0x01A1 },
+    { 0x01A3, 0x01A3 },
+    { 0x01A5, 0x01A5 },
+    { 0x01A8, 0x01A8 },
+    { 0x01AD, 0x01AD },
+    { 0x01B0, 0x01B0 },
+    { 0x01B4, 0x01B4 },
+    { 0x01B6, 0x01B6 },
+    { 0x01B9, 0x01B9 },
+    { 0x01BD, 0x01BD },
+    { 0x01BF, 0x01BF },
+    { 0x01C5, 0x01C6 },
+    { 0x01C8, 0x01C9 },
+    { 0x01CB, 0x01CC },
+    { 0x01CE, 0x01CE },
+    { 0x01D0, 0x01D0 },
+    { 0x01D2, 0x01D2 },
+    { 0x01D4, 0x01D4 },
+    { 0x01D6, 0x01D6 },
+    { 0x01D8, 0x01D8 },
+    { 0x01DA, 0x01DA },
+    { 0x01DC, 0x01DD },
+    { 0x01DF, 0x01DF },
+    { 0x01E1, 0x01E1 },
+    { 0x01E3, 0x01E3 },
+    { 0x01E5, 0x01E5 },
+    { 0x01E7, 0x01E7 },
+    { 0x01E9, 0x01E9 },
+    { 0x01EB, 0x01EB },
+    { 0x01ED, 0x01ED },
+    { 0x01EF, 0x01EF },
+    { 0x01F2, 0x01F3 },
+    { 0x01F5, 0x01F5 },
+    { 0x01F9, 0x01F9 },
+    { 0x01FB, 0x01FB },
+    { 0x01FD, 0x01FD },
+    { 0x01FF, 0x01FF },
+    { 0x0201, 0x0201 },
+    { 0x0203, 0x0203 },
+    { 0x0205, 0x0205 },
+    { 0x0207, 0x0207 },
+    { 0x0209, 0x0209 },
+    { 0x020B, 0x020B },
+    { 0x020D, 0x020D },
+    { 0x020F, 0x020F },
+    { 0x0211, 0x0211 },
+    { 0x0213, 0x0213 },
+    { 0x0215, 0x0215 },
+    { 0x0217, 0x0217 },
+    { 0x0219, 0x0219 },
+    { 0x021B, 0x021B },
+    { 0x021D, 0x021D },
+    { 0x021F, 0x021F },
+    { 0x0223, 0x0223 },
+    { 0x0225, 0x0225 },
+    { 0x0227, 0x0227 },
+    { 0x0229, 0x0229 },
+    { 0x022B, 0x022B },
+    { 0x022D, 0x022D },
+    { 0x022F, 0x022F },
+    { 0x0231, 0x0231 },
+    { 0x0233, 0x0233 },
+    { 0x023C, 0x023C },
+    { 0x0242, 0x0242 },
+    { 0x0247, 0x0247 },
+    { 0x0249, 0x0249 },
+    { 0x024B, 0x024B },
+    { 0x024D, 0x024D },
+    { 0x024F, 0x024F },
+    { 0x0253, 0x0254 },
+    { 0x0256, 0x0257 },
+    { 0x0259, 0x0259 },
+    { 0x025B, 0x025B },
+    { 0x0260, 0x0260 },
+    { 0x0263, 0x0263 },
+    { 0x0268, 0x0269 },
+    { 0x026B, 0x026B },
+    { 0x026F, 0x026F },
+    { 0x0272, 0x0272 },
+    { 0x0275, 0x0275 },
+    { 0x027D, 0x027D },
+    { 0x0280, 0x0280 },
+    { 0x0283, 0x0283 },
+    { 0x0288, 0x028C },
+    { 0x0292, 0x0292 },
+    { 0x0345, 0x0345 },
+    { 0x037B, 0x037D },
+    { 0x03AC, 0x03AF },
+    { 0x03B1, 0x03CE },
+    { 0x03D0, 0x03D1 },
+    { 0x03D5, 0x03D6 },
+    { 0x03D9, 0x03D9 },
+    { 0x03DB, 0x03DB },
+    { 0x03DD, 0x03DD },
+    { 0x03DF, 0x03DF },
+    { 0x03E1, 0x03E1 },
+    { 0x03E3, 0x03E3 },
+    { 0x03E5, 0x03E5 },
+    { 0x03E7, 0x03E7 },
+    { 0x03E9, 0x03E9 },
+    { 0x03EB, 0x03EB },
+    { 0x03ED, 0x03ED },
+    { 0x03EF, 0x03F2 },
+    { 0x03F5, 0x03F5 },
+    { 0x03F8, 0x03F8 },
+    { 0x03FB, 0x03FB },
+    { 0x0430, 0x045F },
+    { 0x0461, 0x0461 },
+    { 0x0463, 0x0463 },
+    { 0x0465, 0x0465 },
+    { 0x0467, 0x0467 },
+    { 0x0469, 0x0469 },
+    { 0x046B, 0x046B },
+    { 0x046D, 0x046D },
+    { 0x046F, 0x046F },
+    { 0x0471, 0x0471 },
+    { 0x0473, 0x0473 },
+    { 0x0475, 0x0475 },
+    { 0x0477, 0x0477 },
+    { 0x0479, 0x0479 },
+    { 0x047B, 0x047B },
+    { 0x047D, 0x047D },
+    { 0x047F, 0x047F },
+    { 0x0481, 0x0481 },
+    { 0x048B, 0x048B },
+    { 0x048D, 0x048D },
+    { 0x048F, 0x048F },
+    { 0x0491, 0x0491 },
+    { 0x0493, 0x0493 },
+    { 0x0495, 0x0495 },
+    { 0x0497, 0x0497 },
+    { 0x0499, 0x0499 },
+    { 0x049B, 0x049B },
+    { 0x049D, 0x049D },
+    { 0x049F, 0x049F },
+    { 0x04A1, 0x04A1 },
+    { 0x04A3, 0x04A3 },
+    { 0x04A5, 0x04A5 },
+    { 0x04A7, 0x04A7 },
+    { 0x04A9, 0x04A9 },
+    { 0x04AB, 0x04AB },
+    { 0x04AD, 0x04AD },
+    { 0x04AF, 0x04AF },
+    { 0x04B1, 0x04B1 },
+    { 0x04B3, 0x04B3 },
+    { 0x04B5, 0x04B5 },
+    { 0x04B7, 0x04B7 },
+    { 0x04B9, 0x04B9 },
+    { 0x04BB, 0x04BB },
+    { 0x04BD, 0x04BD },
+    { 0x04BF, 0x04BF },
+    { 0x04C2, 0x04C2 },
+    { 0x04C4, 0x04C4 },
+    { 0x04C6, 0x04C6 },
+    { 0x04C8, 0x04C8 },
+    { 0x04CA, 0x04CA },
+    { 0x04CC, 0x04CC },
+    { 0x04CE, 0x04CF },
+    { 0x04D1, 0x04D1 },
+    { 0x04D3, 0x04D3 },
+    { 0x04D5, 0x04D5 },
+    { 0x04D7, 0x04D7 },
+    { 0x04D9, 0x04D9 },
+    { 0x04DB, 0x04DB },
+    { 0x04DD, 0x04DD },
+    { 0x04DF, 0x04DF },
+    { 0x04E1, 0x04E1 },
+    { 0x04E3, 0x04E3 },
+    { 0x04E5, 0x04E5 },
+    { 0x04E7, 0x04E7 },
+    { 0x04E9, 0x04E9 },
+    { 0x04EB, 0x04EB },
+    { 0x04ED, 0x04ED },
+    { 0x04EF, 0x04EF },
+    { 0x04F1, 0x04F1 },
+    { 0x04F3, 0x04F3 },
+    { 0x04F5, 0x04F5 },
+    { 0x04F7, 0x04F7 },
+    { 0x04F9, 0x04F9 },
+    { 0x04FB, 0x04FB },
+    { 0x04FD, 0x04FD },
+    { 0x04FF, 0x04FF },
+    { 0x0501, 0x0501 },
+    { 0x0503, 0x0503 },
+    { 0x0505, 0x0505 },
+    { 0x0507, 0x0507 },
+    { 0x0509, 0x0509 },
+    { 0x050B, 0x050B },
+    { 0x050D, 0x050D },
+    { 0x050F, 0x050F },
+    { 0x0511, 0x0511 },
+    { 0x0513, 0x0513 },
+    { 0x0561, 0x0586 },
+    { 0x1D7D, 0x1D7D },
+    { 0x1E01, 0x1E01 },
+    { 0x1E03, 0x1E03 },
+    { 0x1E05, 0x1E05 },
+    { 0x1E07, 0x1E07 },
+    { 0x1E09, 0x1E09 },
+    { 0x1E0B, 0x1E0B },
+    { 0x1E0D, 0x1E0D },
+    { 0x1E0F, 0x1E0F },
+    { 0x1E11, 0x1E11 },
+    { 0x1E13, 0x1E13 },
+    { 0x1E15, 0x1E15 },
+    { 0x1E17, 0x1E17 },
+    { 0x1E19, 0x1E19 },
+    { 0x1E1B, 0x1E1B },
+    { 0x1E1D, 0x1E1D },
+    { 0x1E1F, 0x1E1F },
+    { 0x1E21, 0x1E21 },
+    { 0x1E23, 0x1E23 },
+    { 0x1E25, 0x1E25 },
+    { 0x1E27, 0x1E27 },
+    { 0x1E29, 0x1E29 },
+    { 0x1E2B, 0x1E2B },
+    { 0x1E2D, 0x1E2D },
+    { 0x1E2F, 0x1E2F },
+    { 0x1E31, 0x1E31 },
+    { 0x1E33, 0x1E33 },
+    { 0x1E35, 0x1E35 },
+    { 0x1E37, 0x1E37 },
+    { 0x1E39, 0x1E39 },
+    { 0x1E3B, 0x1E3B },
+    { 0x1E3D, 0x1E3D },
+    { 0x1E3F, 0x1E3F },
+    { 0x1E41, 0x1E41 },
+    { 0x1E43, 0x1E43 },
+    { 0x1E45, 0x1E45 },
+    { 0x1E47, 0x1E47 },
+    { 0x1E49, 0x1E49 },
+    { 0x1E4B, 0x1E4B },
+    { 0x1E4D, 0x1E4D },
+    { 0x1E4F, 0x1E4F },
+    { 0x1E51, 0x1E51 },
+    { 0x1E53, 0x1E53 },
+    { 0x1E55, 0x1E55 },
+    { 0x1E57, 0x1E57 },
+    { 0x1E59, 0x1E59 },
+    { 0x1E5B, 0x1E5B },
+    { 0x1E5D, 0x1E5D },
+    { 0x1E5F, 0x1E5F },
+    { 0x1E61, 0x1E61 },
+    { 0x1E63, 0x1E63 },
+    { 0x1E65, 0x1E65 },
+    { 0x1E67, 0x1E67 },
+    { 0x1E69, 0x1E69 },
+    { 0x1E6B, 0x1E6B },
+    { 0x1E6D, 0x1E6D },
+    { 0x1E6F, 0x1E6F },
+    { 0x1E71, 0x1E71 },
+    { 0x1E73, 0x1E73 },
+    { 0x1E75, 0x1E75 },
+    { 0x1E77, 0x1E77 },
+    { 0x1E79, 0x1E79 },
+    { 0x1E7B, 0x1E7B },
+    { 0x1E7D, 0x1E7D },
+    { 0x1E7F, 0x1E7F },
+    { 0x1E81, 0x1E81 },
+    { 0x1E83, 0x1E83 },
+    { 0x1E85, 0x1E85 },
+    { 0x1E87, 0x1E87 },
+    { 0x1E89, 0x1E89 },
+    { 0x1E8B, 0x1E8B },
+    { 0x1E8D, 0x1E8D },
+    { 0x1E8F, 0x1E8F },
+    { 0x1E91, 0x1E91 },
+    { 0x1E93, 0x1E93 },
+    { 0x1E95, 0x1E95 },
+    { 0x1E9B, 0x1E9B },
+    { 0x1EA1, 0x1EA1 },
+    { 0x1EA3, 0x1EA3 },
+    { 0x1EA5, 0x1EA5 },
+    { 0x1EA7, 0x1EA7 },
+    { 0x1EA9, 0x1EA9 },
+    { 0x1EAB, 0x1EAB },
+    { 0x1EAD, 0x1EAD },
+    { 0x1EAF, 0x1EAF },
+    { 0x1EB1, 0x1EB1 },
+    { 0x1EB3, 0x1EB3 },
+    { 0x1EB5, 0x1EB5 },
+    { 0x1EB7, 0x1EB7 },
+    { 0x1EB9, 0x1EB9 },
+    { 0x1EBB, 0x1EBB },
+    { 0x1EBD, 0x1EBD },
+    { 0x1EBF, 0x1EBF },
+    { 0x1EC1, 0x1EC1 },
+    { 0x1EC3, 0x1EC3 },
+    { 0x1EC5, 0x1EC5 },
+    { 0x1EC7, 0x1EC7 },
+    { 0x1EC9, 0x1EC9 },
+    { 0x1ECB, 0x1ECB },
+    { 0x1ECD, 0x1ECD },
+    { 0x1ECF, 0x1ECF },
+    { 0x1ED1, 0x1ED1 },
+    { 0x1ED3, 0x1ED3 },
+    { 0x1ED5, 0x1ED5 },
+    { 0x1ED7, 0x1ED7 },
+    { 0x1ED9, 0x1ED9 },
+    { 0x1EDB, 0x1EDB },
+    { 0x1EDD, 0x1EDD },
+    { 0x1EDF, 0x1EDF },
+    { 0x1EE1, 0x1EE1 },
+    { 0x1EE3, 0x1EE3 },
+    { 0x1EE5, 0x1EE5 },
+    { 0x1EE7, 0x1EE7 },
+    { 0x1EE9, 0x1EE9 },
+    { 0x1EEB, 0x1EEB },
+    { 0x1EED, 0x1EED },
+    { 0x1EEF, 0x1EEF },
+    { 0x1EF1, 0x1EF1 },
+    { 0x1EF3, 0x1EF3 },
+    { 0x1EF5, 0x1EF5 },
+    { 0x1EF7, 0x1EF7 },
+    { 0x1EF9, 0x1EF9 },
+    { 0x1F00, 0x1F07 },
+    { 0x1F10, 0x1F15 },
+    { 0x1F20, 0x1F27 },
+    { 0x1F30, 0x1F37 },
+    { 0x1F40, 0x1F45 },
+    { 0x1F51, 0x1F51 },
+    { 0x1F53, 0x1F53 },
+    { 0x1F55, 0x1F55 },
+    { 0x1F57, 0x1F57 },
+    { 0x1F60, 0x1F67 },
+    { 0x1F70, 0x1F7D },
+    { 0x1F80, 0x1F87 },
+    { 0x1F90, 0x1F97 },
+    { 0x1FA0, 0x1FA7 },
+    { 0x1FB0, 0x1FB1 },
+    { 0x1FB3, 0x1FB3 },
+    { 0x1FBE, 0x1FBE },
+    { 0x1FC3, 0x1FC3 },
+    { 0x1FD0, 0x1FD1 },
+    { 0x1FE0, 0x1FE1 },
+    { 0x1FE5, 0x1FE5 },
+    { 0x1FF3, 0x1FF3 },
+    { 0x214E, 0x214E },
+    { 0x2170, 0x217F },
+    { 0x2184, 0x2184 },
+    { 0x24D0, 0x24E9 },
+    { 0x2C30, 0x2C5E },
+    { 0x2C61, 0x2C61 },
+    { 0x2C65, 0x2C66 },
+    { 0x2C68, 0x2C68 },
+    { 0x2C6A, 0x2C6A },
+    { 0x2C6C, 0x2C6C },
+    { 0x2C76, 0x2C76 },
+    { 0x2C81, 0x2C81 },
+    { 0x2C83, 0x2C83 },
+    { 0x2C85, 0x2C85 },
+    { 0x2C87, 0x2C87 },
+    { 0x2C89, 0x2C89 },
+    { 0x2C8B, 0x2C8B },
+    { 0x2C8D, 0x2C8D },
+    { 0x2C8F, 0x2C8F },
+    { 0x2C91, 0x2C91 },
+    { 0x2C93, 0x2C93 },
+    { 0x2C95, 0x2C95 },
+    { 0x2C97, 0x2C97 },
+    { 0x2C99, 0x2C99 },
+    { 0x2C9B, 0x2C9B },
+    { 0x2C9D, 0x2C9D },
+    { 0x2C9F, 0x2C9F },
+    { 0x2CA1, 0x2CA1 },
+    { 0x2CA3, 0x2CA3 },
+    { 0x2CA5, 0x2CA5 },
+    { 0x2CA7, 0x2CA7 },
+    { 0x2CA9, 0x2CA9 },
+    { 0x2CAB, 0x2CAB },
+    { 0x2CAD, 0x2CAD },
+    { 0x2CAF, 0x2CAF },
+    { 0x2CB1, 0x2CB1 },
+    { 0x2CB3, 0x2CB3 },
+    { 0x2CB5, 0x2CB5 },
+    { 0x2CB7, 0x2CB7 },
+    { 0x2CB9, 0x2CB9 },
+    { 0x2CBB, 0x2CBB },
+    { 0x2CBD, 0x2CBD },
+    { 0x2CBF, 0x2CBF },
+    { 0x2CC1, 0x2CC1 },
+    { 0x2CC3, 0x2CC3 },
+    { 0x2CC5, 0x2CC5 },
+    { 0x2CC7, 0x2CC7 },
+    { 0x2CC9, 0x2CC9 },
+    { 0x2CCB, 0x2CCB },
+    { 0x2CCD, 0x2CCD },
+    { 0x2CCF, 0x2CCF },
+    { 0x2CD1, 0x2CD1 },
+    { 0x2CD3, 0x2CD3 },
+    { 0x2CD5, 0x2CD5 },
+    { 0x2CD7, 0x2CD7 },
+    { 0x2CD9, 0x2CD9 },
+    { 0x2CDB, 0x2CDB },
+    { 0x2CDD, 0x2CDD },
+    { 0x2CDF, 0x2CDF },
+    { 0x2CE1, 0x2CE1 },
+    { 0x2CE3, 0x2CE3 },
+    { 0x2D00, 0x2D25 },
+    { 0xFF41, 0xFF5A },
+    { 0x10428, 0x1044F }
+
+#define PREDICATE(c) uc_is_lower (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-ctype_print.c
@@ -0,0 +1,454 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0020, 0x007E },
+    { 0x00A0, 0x036F },
+    { 0x0374, 0x0375 },
+    { 0x037A, 0x037E },
+    { 0x0384, 0x038A },
+    { 0x038C, 0x038C },
+    { 0x038E, 0x03A1 },
+    { 0x03A3, 0x03CE },
+    { 0x03D0, 0x0486 },
+    { 0x0488, 0x0513 },
+    { 0x0531, 0x0556 },
+    { 0x0559, 0x055F },
+    { 0x0561, 0x0587 },
+    { 0x0589, 0x058A },
+    { 0x0591, 0x05C7 },
+    { 0x05D0, 0x05EA },
+    { 0x05F0, 0x05F4 },
+    { 0x0600, 0x0603 },
+    { 0x060B, 0x0615 },
+    { 0x061B, 0x061B },
+    { 0x061E, 0x061F },
+    { 0x0621, 0x063A },
+    { 0x0640, 0x065E },
+    { 0x0660, 0x070D },
+    { 0x070F, 0x074A },
+    { 0x074D, 0x076D },
+    { 0x0780, 0x07B1 },
+    { 0x07C0, 0x07FA },
+    { 0x0901, 0x0939 },
+    { 0x093C, 0x094D },
+    { 0x0950, 0x0954 },
+    { 0x0958, 0x0970 },
+    { 0x097B, 0x097F },
+    { 0x0981, 0x0983 },
+    { 0x0985, 0x098C },
+    { 0x098F, 0x0990 },
+    { 0x0993, 0x09A8 },
+    { 0x09AA, 0x09B0 },
+    { 0x09B2, 0x09B2 },
+    { 0x09B6, 0x09B9 },
+    { 0x09BC, 0x09C4 },
+    { 0x09C7, 0x09C8 },
+    { 0x09CB, 0x09CE },
+    { 0x09D7, 0x09D7 },
+    { 0x09DC, 0x09DD },
+    { 0x09DF, 0x09E3 },
+    { 0x09E6, 0x09FA },
+    { 0x0A01, 0x0A03 },
+    { 0x0A05, 0x0A0A },
+    { 0x0A0F, 0x0A10 },
+    { 0x0A13, 0x0A28 },
+    { 0x0A2A, 0x0A30 },
+    { 0x0A32, 0x0A33 },
+    { 0x0A35, 0x0A36 },
+    { 0x0A38, 0x0A39 },
+    { 0x0A3C, 0x0A3C },
+    { 0x0A3E, 0x0A42 },
+    { 0x0A47, 0x0A48 },
+    { 0x0A4B, 0x0A4D },
+    { 0x0A59, 0x0A5C },
+    { 0x0A5E, 0x0A5E },
+    { 0x0A66, 0x0A74 },
+    { 0x0A81, 0x0A83 },
+    { 0x0A85, 0x0A8D },
+    { 0x0A8F, 0x0A91 },
+    { 0x0A93, 0x0AA8 },
+    { 0x0AAA, 0x0AB0 },
+    { 0x0AB2, 0x0AB3 },
+    { 0x0AB5, 0x0AB9 },
+    { 0x0ABC, 0x0AC5 },
+    { 0x0AC7, 0x0AC9 },
+    { 0x0ACB, 0x0ACD },
+    { 0x0AD0, 0x0AD0 },
+    { 0x0AE0, 0x0AE3 },
+    { 0x0AE6, 0x0AEF },
+    { 0x0AF1, 0x0AF1 },
+    { 0x0B01, 0x0B03 },
+    { 0x0B05, 0x0B0C },
+    { 0x0B0F, 0x0B10 },
+    { 0x0B13, 0x0B28 },
+    { 0x0B2A, 0x0B30 },
+    { 0x0B32, 0x0B33 },
+    { 0x0B35, 0x0B39 },
+    { 0x0B3C, 0x0B43 },
+    { 0x0B47, 0x0B48 },
+    { 0x0B4B, 0x0B4D },
+    { 0x0B56, 0x0B57 },
+    { 0x0B5C, 0x0B5D },
+    { 0x0B5F, 0x0B61 },
+    { 0x0B66, 0x0B71 },
+    { 0x0B82, 0x0B83 },
+    { 0x0B85, 0x0B8A },
+    { 0x0B8E, 0x0B90 },
+    { 0x0B92, 0x0B95 },
+    { 0x0B99, 0x0B9A },
+    { 0x0B9C, 0x0B9C },
+    { 0x0B9E, 0x0B9F },
+    { 0x0BA3, 0x0BA4 },
+    { 0x0BA8, 0x0BAA },
+    { 0x0BAE, 0x0BB9 },
+    { 0x0BBE, 0x0BC2 },
+    { 0x0BC6, 0x0BC8 },
+    { 0x0BCA, 0x0BCD },
+    { 0x0BD7, 0x0BD7 },
+    { 0x0BE6, 0x0BFA },
+    { 0x0C01, 0x0C03 },
+    { 0x0C05, 0x0C0C },
+    { 0x0C0E, 0x0C10 },
+    { 0x0C12, 0x0C28 },
+    { 0x0C2A, 0x0C33 },
+    { 0x0C35, 0x0C39 },
+    { 0x0C3E, 0x0C44 },
+    { 0x0C46, 0x0C48 },
+    { 0x0C4A, 0x0C4D },
+    { 0x0C55, 0x0C56 },
+    { 0x0C60, 0x0C61 },
+    { 0x0C66, 0x0C6F },
+    { 0x0C82, 0x0C83 },
+    { 0x0C85, 0x0C8C },
+    { 0x0C8E, 0x0C90 },
+    { 0x0C92, 0x0CA8 },
+    { 0x0CAA, 0x0CB3 },
+    { 0x0CB5, 0x0CB9 },
+    { 0x0CBC, 0x0CC4 },
+    { 0x0CC6, 0x0CC8 },
+    { 0x0CCA, 0x0CCD },
+    { 0x0CD5, 0x0CD6 },
+    { 0x0CDE, 0x0CDE },
+    { 0x0CE0, 0x0CE3 },
+    { 0x0CE6, 0x0CEF },
+    { 0x0CF1, 0x0CF2 },
+    { 0x0D02, 0x0D03 },
+    { 0x0D05, 0x0D0C },
+    { 0x0D0E, 0x0D10 },
+    { 0x0D12, 0x0D28 },
+    { 0x0D2A, 0x0D39 },
+    { 0x0D3E, 0x0D43 },
+    { 0x0D46, 0x0D48 },
+    { 0x0D4A, 0x0D4D },
+    { 0x0D57, 0x0D57 },
+    { 0x0D60, 0x0D61 },
+    { 0x0D66, 0x0D6F },
+    { 0x0D82, 0x0D83 },
+    { 0x0D85, 0x0D96 },
+    { 0x0D9A, 0x0DB1 },
+    { 0x0DB3, 0x0DBB },
+    { 0x0DBD, 0x0DBD },
+    { 0x0DC0, 0x0DC6 },
+    { 0x0DCA, 0x0DCA },
+    { 0x0DCF, 0x0DD4 },
+    { 0x0DD6, 0x0DD6 },
+    { 0x0DD8, 0x0DDF },
+    { 0x0DF2, 0x0DF4 },
+    { 0x0E01, 0x0E3A },
+    { 0x0E3F, 0x0E5B },
+    { 0x0E81, 0x0E82 },
+    { 0x0E84, 0x0E84 },
+    { 0x0E87, 0x0E88 },
+    { 0x0E8A, 0x0E8A },
+    { 0x0E8D, 0x0E8D },
+    { 0x0E94, 0x0E97 },
+    { 0x0E99, 0x0E9F },
+    { 0x0EA1, 0x0EA3 },
+    { 0x0EA5, 0x0EA5 },
+    { 0x0EA7, 0x0EA7 },
+    { 0x0EAA, 0x0EAB },
+    { 0x0EAD, 0x0EB9 },
+    { 0x0EBB, 0x0EBD },
+    { 0x0EC0, 0x0EC4 },
+    { 0x0EC6, 0x0EC6 },
+    { 0x0EC8, 0x0ECD },
+    { 0x0ED0, 0x0ED9 },
+    { 0x0EDC, 0x0EDD },
+    { 0x0F00, 0x0F47 },
+    { 0x0F49, 0x0F6A },
+    { 0x0F71, 0x0F8B },
+    { 0x0F90, 0x0F97 },
+    { 0x0F99, 0x0FBC },
+    { 0x0FBE, 0x0FCC },
+    { 0x0FCF, 0x0FD1 },
+    { 0x1000, 0x1021 },
+    { 0x1023, 0x1027 },
+    { 0x1029, 0x102A },
+    { 0x102C, 0x1032 },
+    { 0x1036, 0x1039 },
+    { 0x1040, 0x1059 },
+    { 0x10A0, 0x10C5 },
+    { 0x10D0, 0x10FC },
+    { 0x1100, 0x1159 },
+    { 0x115F, 0x11A2 },
+    { 0x11A8, 0x11F9 },
+    { 0x1200, 0x1248 },
+    { 0x124A, 0x124D },
+    { 0x1250, 0x1256 },
+    { 0x1258, 0x1258 },
+    { 0x125A, 0x125D },
+    { 0x1260, 0x1288 },
+    { 0x128A, 0x128D },
+    { 0x1290, 0x12B0 },
+    { 0x12B2, 0x12B5 },
+    { 0x12B8, 0x12BE },
+    { 0x12C0, 0x12C0 },
+    { 0x12C2, 0x12C5 },
+    { 0x12C8, 0x12D6 },
+    { 0x12D8, 0x1310 },
+    { 0x1312, 0x1315 },
+    { 0x1318, 0x135A },
+    { 0x135F, 0x137C },
+    { 0x1380, 0x1399 },
+    { 0x13A0, 0x13F4 },
+    { 0x1401, 0x1676 },
+    { 0x1680, 0x169C },
+    { 0x16A0, 0x16F0 },
+    { 0x1700, 0x170C },
+    { 0x170E, 0x1714 },
+    { 0x1720, 0x1736 },
+    { 0x1740, 0x1753 },
+    { 0x1760, 0x176C },
+    { 0x176E, 0x1770 },
+    { 0x1772, 0x1773 },
+    { 0x1780, 0x17DD },
+    { 0x17E0, 0x17E9 },
+    { 0x17F0, 0x17F9 },
+    { 0x1800, 0x180E },
+    { 0x1810, 0x1819 },
+    { 0x1820, 0x1877 },
+    { 0x1880, 0x18A9 },
+    { 0x1900, 0x191C },
+    { 0x1920, 0x192B },
+    { 0x1930, 0x193B },
+    { 0x1940, 0x1940 },
+    { 0x1944, 0x196D },
+    { 0x1970, 0x1974 },
+    { 0x1980, 0x19A9 },
+    { 0x19B0, 0x19C9 },
+    { 0x19D0, 0x19D9 },
+    { 0x19DE, 0x1A1B },
+    { 0x1A1E, 0x1A1F },
+    { 0x1B00, 0x1B4B },
+    { 0x1B50, 0x1B7C },
+    { 0x1D00, 0x1DCA },
+    { 0x1DFE, 0x1E9B },
+    { 0x1EA0, 0x1EF9 },
+    { 0x1F00, 0x1F15 },
+    { 0x1F18, 0x1F1D },
+    { 0x1F20, 0x1F45 },
+    { 0x1F48, 0x1F4D },
+    { 0x1F50, 0x1F57 },
+    { 0x1F59, 0x1F59 },
+    { 0x1F5B, 0x1F5B },
+    { 0x1F5D, 0x1F5D },
+    { 0x1F5F, 0x1F7D },
+    { 0x1F80, 0x1FB4 },
+    { 0x1FB6, 0x1FC4 },
+    { 0x1FC6, 0x1FD3 },
+    { 0x1FD6, 0x1FDB },
+    { 0x1FDD, 0x1FEF },
+    { 0x1FF2, 0x1FF4 },
+    { 0x1FF6, 0x1FFE },
+    { 0x2000, 0x2027 },
+    { 0x202A, 0x2063 },
+    { 0x206A, 0x2071 },
+    { 0x2074, 0x208E },
+    { 0x2090, 0x2094 },
+    { 0x20A0, 0x20B5 },
+    { 0x20D0, 0x20EF },
+    { 0x2100, 0x214E },
+    { 0x2153, 0x2184 },
+    { 0x2190, 0x23E7 },
+    { 0x2400, 0x2426 },
+    { 0x2440, 0x244A },
+    { 0x2460, 0x269C },
+    { 0x26A0, 0x26B2 },
+    { 0x2701, 0x2704 },
+    { 0x2706, 0x2709 },
+    { 0x270C, 0x2727 },
+    { 0x2729, 0x274B },
+    { 0x274D, 0x274D },
+    { 0x274F, 0x2752 },
+    { 0x2756, 0x2756 },
+    { 0x2758, 0x275E },
+    { 0x2761, 0x2794 },
+    { 0x2798, 0x27AF },
+    { 0x27B1, 0x27BE },
+    { 0x27C0, 0x27CA },
+    { 0x27D0, 0x27EB },
+    { 0x27F0, 0x2B1A },
+    { 0x2B20, 0x2B23 },
+    { 0x2C00, 0x2C2E },
+    { 0x2C30, 0x2C5E },
+    { 0x2C60, 0x2C6C },
+    { 0x2C74, 0x2C77 },
+    { 0x2C80, 0x2CEA },
+    { 0x2CF9, 0x2D25 },
+    { 0x2D30, 0x2D65 },
+    { 0x2D6F, 0x2D6F },
+    { 0x2D80, 0x2D96 },
+    { 0x2DA0, 0x2DA6 },
+    { 0x2DA8, 0x2DAE },
+    { 0x2DB0, 0x2DB6 },
+    { 0x2DB8, 0x2DBE },
+    { 0x2DC0, 0x2DC6 },
+    { 0x2DC8, 0x2DCE },
+    { 0x2DD0, 0x2DD6 },
+    { 0x2DD8, 0x2DDE },
+    { 0x2E00, 0x2E17 },
+    { 0x2E1C, 0x2E1D },
+    { 0x2E80, 0x2E99 },
+    { 0x2E9B, 0x2EF3 },
+    { 0x2F00, 0x2FD5 },
+    { 0x2FF0, 0x2FFB },
+    { 0x3000, 0x303F },
+    { 0x3041, 0x3096 },
+    { 0x3099, 0x30FF },
+    { 0x3105, 0x312C },
+    { 0x3131, 0x318E },
+    { 0x3190, 0x31B7 },
+    { 0x31C0, 0x31CF },
+    { 0x31F0, 0x321E },
+    { 0x3220, 0x3243 },
+    { 0x3250, 0x32FE },
+    { 0x3300, 0x4DB5 },
+    { 0x4DC0, 0x9FBB },
+    { 0xA000, 0xA48C },
+    { 0xA490, 0xA4C6 },
+    { 0xA700, 0xA71A },
+    { 0xA720, 0xA721 },
+    { 0xA800, 0xA82B },
+    { 0xA840, 0xA877 },
+    { 0xAC00, 0xD7A3 },
+    { 0xE000, 0xFA2D },
+    { 0xFA30, 0xFA6A },
+    { 0xFA70, 0xFAD9 },
+    { 0xFB00, 0xFB06 },
+    { 0xFB13, 0xFB17 },
+    { 0xFB1D, 0xFB36 },
+    { 0xFB38, 0xFB3C },
+    { 0xFB3E, 0xFB3E },
+    { 0xFB40, 0xFB41 },
+    { 0xFB43, 0xFB44 },
+    { 0xFB46, 0xFBB1 },
+    { 0xFBD3, 0xFD3F },
+    { 0xFD50, 0xFD8F },
+    { 0xFD92, 0xFDC7 },
+    { 0xFDF0, 0xFDFD },
+    { 0xFE00, 0xFE19 },
+    { 0xFE20, 0xFE23 },
+    { 0xFE30, 0xFE52 },
+    { 0xFE54, 0xFE66 },
+    { 0xFE68, 0xFE6B },
+    { 0xFE70, 0xFE74 },
+    { 0xFE76, 0xFEFC },
+    { 0xFEFF, 0xFEFF },
+    { 0xFF01, 0xFFBE },
+    { 0xFFC2, 0xFFC7 },
+    { 0xFFCA, 0xFFCF },
+    { 0xFFD2, 0xFFD7 },
+    { 0xFFDA, 0xFFDC },
+    { 0xFFE0, 0xFFE6 },
+    { 0xFFE8, 0xFFEE },
+    { 0xFFF9, 0xFFFD },
+    { 0x10000, 0x1000B },
+    { 0x1000D, 0x10026 },
+    { 0x10028, 0x1003A },
+    { 0x1003C, 0x1003D },
+    { 0x1003F, 0x1004D },
+    { 0x10050, 0x1005D },
+    { 0x10080, 0x100FA },
+    { 0x10100, 0x10102 },
+    { 0x10107, 0x10133 },
+    { 0x10137, 0x1018A },
+    { 0x10300, 0x1031E },
+    { 0x10320, 0x10323 },
+    { 0x10330, 0x1034A },
+    { 0x10380, 0x1039D },
+    { 0x1039F, 0x103C3 },
+    { 0x103C8, 0x103D5 },
+    { 0x10400, 0x1049D },
+    { 0x104A0, 0x104A9 },
+    { 0x10800, 0x10805 },
+    { 0x10808, 0x10808 },
+    { 0x1080A, 0x10835 },
+    { 0x10837, 0x10838 },
+    { 0x1083C, 0x1083C },
+    { 0x1083F, 0x1083F },
+    { 0x10900, 0x10919 },
+    { 0x1091F, 0x1091F },
+    { 0x10A00, 0x10A03 },
+    { 0x10A05, 0x10A06 },
+    { 0x10A0C, 0x10A13 },
+    { 0x10A15, 0x10A17 },
+    { 0x10A19, 0x10A33 },
+    { 0x10A38, 0x10A3A },
+    { 0x10A3F, 0x10A47 },
+    { 0x10A50, 0x10A58 },
+    { 0x12000, 0x1236E },
+    { 0x12400, 0x12462 },
+    { 0x12470, 0x12473 },
+    { 0x1D000, 0x1D0F5 },
+    { 0x1D100, 0x1D126 },
+    { 0x1D12A, 0x1D1DD },
+    { 0x1D200, 0x1D245 },
+    { 0x1D300, 0x1D356 },
+    { 0x1D360, 0x1D371 },
+    { 0x1D400, 0x1D454 },
+    { 0x1D456, 0x1D49C },
+    { 0x1D49E, 0x1D49F },
+    { 0x1D4A2, 0x1D4A2 },
+    { 0x1D4A5, 0x1D4A6 },
+    { 0x1D4A9, 0x1D4AC },
+    { 0x1D4AE, 0x1D4B9 },
+    { 0x1D4BB, 0x1D4BB },
+    { 0x1D4BD, 0x1D4C3 },
+    { 0x1D4C5, 0x1D505 },
+    { 0x1D507, 0x1D50A },
+    { 0x1D50D, 0x1D514 },
+    { 0x1D516, 0x1D51C },
+    { 0x1D51E, 0x1D539 },
+    { 0x1D53B, 0x1D53E },
+    { 0x1D540, 0x1D544 },
+    { 0x1D546, 0x1D546 },
+    { 0x1D54A, 0x1D550 },
+    { 0x1D552, 0x1D6A5 },
+    { 0x1D6A8, 0x1D7CB },
+    { 0x1D7CE, 0x1D7FF },
+    { 0x20000, 0x2A6D6 },
+    { 0x2F800, 0x2FA1D },
+    { 0xE0001, 0xE0001 },
+    { 0xE0020, 0xE007F },
+    { 0xE0100, 0xE01EF },
+    { 0xF0000, 0xFFFFD },
+    { 0x100000, 0x10FFFD }
+
+#define PREDICATE(c) uc_is_print (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-ctype_punct.c
@@ -0,0 +1,315 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0021, 0x002F },
+    { 0x003A, 0x0040 },
+    { 0x005B, 0x0060 },
+    { 0x007B, 0x007E },
+    { 0x00A0, 0x00A9 },
+    { 0x00AB, 0x00B4 },
+    { 0x00B6, 0x00B9 },
+    { 0x00BB, 0x00BF },
+    { 0x00D7, 0x00D7 },
+    { 0x00F7, 0x00F7 },
+    { 0x02C2, 0x02C5 },
+    { 0x02D2, 0x02DF },
+    { 0x02E5, 0x02ED },
+    { 0x02EF, 0x0344 },
+    { 0x0346, 0x036F },
+    { 0x0374, 0x0375 },
+    { 0x037E, 0x037E },
+    { 0x0384, 0x0385 },
+    { 0x0387, 0x0387 },
+    { 0x03F6, 0x03F6 },
+    { 0x0482, 0x0486 },
+    { 0x0488, 0x0489 },
+    { 0x055A, 0x055F },
+    { 0x0589, 0x058A },
+    { 0x0591, 0x05C7 },
+    { 0x05F3, 0x05F4 },
+    { 0x0600, 0x0603 },
+    { 0x060B, 0x0615 },
+    { 0x061B, 0x061B },
+    { 0x061E, 0x061F },
+    { 0x064B, 0x065E },
+    { 0x066A, 0x066D },
+    { 0x0670, 0x0670 },
+    { 0x06D4, 0x06D4 },
+    { 0x06D6, 0x06E4 },
+    { 0x06E7, 0x06ED },
+    { 0x06FD, 0x06FE },
+    { 0x0700, 0x070D },
+    { 0x070F, 0x070F },
+    { 0x0711, 0x0711 },
+    { 0x0730, 0x074A },
+    { 0x07A6, 0x07B0 },
+    { 0x07EB, 0x07F3 },
+    { 0x07F6, 0x07F9 },
+    { 0x0901, 0x0903 },
+    { 0x093C, 0x093C },
+    { 0x093E, 0x094D },
+    { 0x0951, 0x0954 },
+    { 0x0962, 0x0965 },
+    { 0x0970, 0x0970 },
+    { 0x0981, 0x0983 },
+    { 0x09BC, 0x09BC },
+    { 0x09BE, 0x09C4 },
+    { 0x09C7, 0x09C8 },
+    { 0x09CB, 0x09CD },
+    { 0x09D7, 0x09D7 },
+    { 0x09E2, 0x09E3 },
+    { 0x09F2, 0x09FA },
+    { 0x0A01, 0x0A03 },
+    { 0x0A3C, 0x0A3C },
+    { 0x0A3E, 0x0A42 },
+    { 0x0A47, 0x0A48 },
+    { 0x0A4B, 0x0A4D },
+    { 0x0A70, 0x0A71 },
+    { 0x0A81, 0x0A83 },
+    { 0x0ABC, 0x0ABC },
+    { 0x0ABE, 0x0AC5 },
+    { 0x0AC7, 0x0AC9 },
+    { 0x0ACB, 0x0ACD },
+    { 0x0AE2, 0x0AE3 },
+    { 0x0AF1, 0x0AF1 },
+    { 0x0B01, 0x0B03 },
+    { 0x0B3C, 0x0B3C },
+    { 0x0B3E, 0x0B43 },
+    { 0x0B47, 0x0B48 },
+    { 0x0B4B, 0x0B4D },
+    { 0x0B56, 0x0B57 },
+    { 0x0B70, 0x0B70 },
+    { 0x0B82, 0x0B82 },
+    { 0x0BBE, 0x0BC2 },
+    { 0x0BC6, 0x0BC8 },
+    { 0x0BCA, 0x0BCD },
+    { 0x0BD7, 0x0BD7 },
+    { 0x0BF0, 0x0BFA },
+    { 0x0C01, 0x0C03 },
+    { 0x0C3E, 0x0C44 },
+    { 0x0C46, 0x0C48 },
+    { 0x0C4A, 0x0C4D },
+    { 0x0C55, 0x0C56 },
+    { 0x0C82, 0x0C83 },
+    { 0x0CBC, 0x0CBC },
+    { 0x0CBE, 0x0CC4 },
+    { 0x0CC6, 0x0CC8 },
+    { 0x0CCA, 0x0CCD },
+    { 0x0CD5, 0x0CD6 },
+    { 0x0CE2, 0x0CE3 },
+    { 0x0CF1, 0x0CF2 },
+    { 0x0D02, 0x0D03 },
+    { 0x0D3E, 0x0D43 },
+    { 0x0D46, 0x0D48 },
+    { 0x0D4A, 0x0D4D },
+    { 0x0D57, 0x0D57 },
+    { 0x0D82, 0x0D83 },
+    { 0x0DCA, 0x0DCA },
+    { 0x0DCF, 0x0DD4 },
+    { 0x0DD6, 0x0DD6 },
+    { 0x0DD8, 0x0DDF },
+    { 0x0DF2, 0x0DF4 },
+    { 0x0E2F, 0x0E2F },
+    { 0x0E3F, 0x0E3F },
+    { 0x0E46, 0x0E46 },
+    { 0x0E4F, 0x0E4F },
+    { 0x0E5A, 0x0E5B },
+    { 0x0EB1, 0x0EB1 },
+    { 0x0EB4, 0x0EB9 },
+    { 0x0EBB, 0x0EBC },
+    { 0x0EC8, 0x0ECD },
+    { 0x0F01, 0x0F1F },
+    { 0x0F2A, 0x0F3F },
+    { 0x0F71, 0x0F87 },
+    { 0x0F90, 0x0F97 },
+    { 0x0F99, 0x0FBC },
+    { 0x0FBE, 0x0FCC },
+    { 0x0FCF, 0x0FD1 },
+    { 0x102C, 0x1032 },
+    { 0x1036, 0x1039 },
+    { 0x104A, 0x104F },
+    { 0x1056, 0x1059 },
+    { 0x10FB, 0x10FB },
+    { 0x135F, 0x137C },
+    { 0x1390, 0x1399 },
+    { 0x166D, 0x166E },
+    { 0x169B, 0x169C },
+    { 0x16EB, 0x16ED },
+    { 0x1712, 0x1714 },
+    { 0x1732, 0x1736 },
+    { 0x1752, 0x1753 },
+    { 0x1772, 0x1773 },
+    { 0x17B4, 0x17D6 },
+    { 0x17D8, 0x17DB },
+    { 0x17DD, 0x17DD },
+    { 0x17F0, 0x17F9 },
+    { 0x1800, 0x180D },
+    { 0x18A9, 0x18A9 },
+    { 0x1920, 0x192B },
+    { 0x1930, 0x193B },
+    { 0x1940, 0x1940 },
+    { 0x1944, 0x1945 },
+    { 0x19B0, 0x19C0 },
+    { 0x19C8, 0x19C9 },
+    { 0x19DE, 0x19FF },
+    { 0x1A17, 0x1A1B },
+    { 0x1A1E, 0x1A1F },
+    { 0x1B00, 0x1B04 },
+    { 0x1B34, 0x1B44 },
+    { 0x1B5A, 0x1B7C },
+    { 0x1DC0, 0x1DCA },
+    { 0x1DFE, 0x1DFF },
+    { 0x1FBD, 0x1FBD },
+    { 0x1FBF, 0x1FC1 },
+    { 0x1FCD, 0x1FCF },
+    { 0x1FDD, 0x1FDF },
+    { 0x1FED, 0x1FEF },
+    { 0x1FFD, 0x1FFE },
+    { 0x2007, 0x2007 },
+    { 0x200B, 0x2027 },
+    { 0x202A, 0x205E },
+    { 0x2060, 0x2063 },
+    { 0x206A, 0x2070 },
+    { 0x2074, 0x207E },
+    { 0x2080, 0x208E },
+    { 0x20A0, 0x20B5 },
+    { 0x20D0, 0x20EF },
+    { 0x2100, 0x2101 },
+    { 0x2103, 0x2106 },
+    { 0x2108, 0x2109 },
+    { 0x2114, 0x2114 },
+    { 0x2116, 0x2118 },
+    { 0x211E, 0x2123 },
+    { 0x2125, 0x2125 },
+    { 0x2127, 0x2127 },
+    { 0x212E, 0x212E },
+    { 0x213A, 0x213B },
+    { 0x2140, 0x2144 },
+    { 0x214A, 0x214D },
+    { 0x2153, 0x215F },
+    { 0x2190, 0x23E7 },
+    { 0x2400, 0x2426 },
+    { 0x2440, 0x244A },
+    { 0x2460, 0x249B },
+    { 0x24EA, 0x269C },
+    { 0x26A0, 0x26B2 },
+    { 0x2701, 0x2704 },
+    { 0x2706, 0x2709 },
+    { 0x270C, 0x2727 },
+    { 0x2729, 0x274B },
+    { 0x274D, 0x274D },
+    { 0x274F, 0x2752 },
+    { 0x2756, 0x2756 },
+    { 0x2758, 0x275E },
+    { 0x2761, 0x2794 },
+    { 0x2798, 0x27AF },
+    { 0x27B1, 0x27BE },
+    { 0x27C0, 0x27CA },
+    { 0x27D0, 0x27EB },
+    { 0x27F0, 0x2B1A },
+    { 0x2B20, 0x2B23 },
+    { 0x2CE5, 0x2CEA },
+    { 0x2CF9, 0x2CFF },
+    { 0x2E00, 0x2E17 },
+    { 0x2E1C, 0x2E1D },
+    { 0x2E80, 0x2E99 },
+    { 0x2E9B, 0x2EF3 },
+    { 0x2F00, 0x2FD5 },
+    { 0x2FF0, 0x2FFB },
+    { 0x3001, 0x3004 },
+    { 0x3008, 0x3020 },
+    { 0x302A, 0x3030 },
+    { 0x3036, 0x3037 },
+    { 0x303D, 0x303F },
+    { 0x3099, 0x309C },
+    { 0x30A0, 0x30A0 },
+    { 0x30FB, 0x30FB },
+    { 0x3190, 0x319F },
+    { 0x31C0, 0x31CF },
+    { 0x3200, 0x321E },
+    { 0x3220, 0x3243 },
+    { 0x3250, 0x32FE },
+    { 0x3300, 0x33FF },
+    { 0x4DC0, 0x4DFF },
+    { 0xA490, 0xA4C6 },
+    { 0xA700, 0xA716 },
+    { 0xA720, 0xA721 },
+    { 0xA802, 0xA802 },
+    { 0xA806, 0xA806 },
+    { 0xA80B, 0xA80B },
+    { 0xA823, 0xA82B },
+    { 0xA874, 0xA877 },
+    { 0xE000, 0xF8FF },
+    { 0xFB1E, 0xFB1E },
+    { 0xFB29, 0xFB29 },
+    { 0xFD3E, 0xFD3F },
+    { 0xFDFC, 0xFDFD },
+    { 0xFE00, 0xFE19 },
+    { 0xFE20, 0xFE23 },
+    { 0xFE30, 0xFE52 },
+    { 0xFE54, 0xFE66 },
+    { 0xFE68, 0xFE6B },
+    { 0xFEFF, 0xFEFF },
+    { 0xFF01, 0xFF0F },
+    { 0xFF1A, 0xFF20 },
+    { 0xFF3B, 0xFF40 },
+    { 0xFF5B, 0xFF65 },
+    { 0xFFE0, 0xFFE6 },
+    { 0xFFE8, 0xFFEE },
+    { 0xFFF9, 0xFFFD },
+    { 0x10100, 0x10102 },
+    { 0x10107, 0x10133 },
+    { 0x10137, 0x1013F },
+    { 0x10175, 0x1018A },
+    { 0x10320, 0x10323 },
+    { 0x1039F, 0x1039F },
+    { 0x103D0, 0x103D0 },
+    { 0x10916, 0x10919 },
+    { 0x1091F, 0x1091F },
+    { 0x10A01, 0x10A03 },
+    { 0x10A05, 0x10A06 },
+    { 0x10A0C, 0x10A0F },
+    { 0x10A38, 0x10A3A },
+    { 0x10A3F, 0x10A47 },
+    { 0x10A50, 0x10A58 },
+    { 0x12470, 0x12473 },
+    { 0x1D000, 0x1D0F5 },
+    { 0x1D100, 0x1D126 },
+    { 0x1D12A, 0x1D1DD },
+    { 0x1D200, 0x1D245 },
+    { 0x1D300, 0x1D356 },
+    { 0x1D360, 0x1D371 },
+    { 0x1D6C1, 0x1D6C1 },
+    { 0x1D6DB, 0x1D6DB },
+    { 0x1D6FB, 0x1D6FB },
+    { 0x1D715, 0x1D715 },
+    { 0x1D735, 0x1D735 },
+    { 0x1D74F, 0x1D74F },
+    { 0x1D76F, 0x1D76F },
+    { 0x1D789, 0x1D789 },
+    { 0x1D7A9, 0x1D7A9 },
+    { 0x1D7C3, 0x1D7C3 },
+    { 0xE0001, 0xE0001 },
+    { 0xE0020, 0xE007F },
+    { 0xE0100, 0xE01EF },
+    { 0xF0000, 0xFFFFD },
+    { 0x100000, 0x10FFFD }
+
+#define PREDICATE(c) uc_is_punct (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-ctype_space.c
@@ -0,0 +1,31 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0009, 0x000D },
+    { 0x0020, 0x0020 },
+    { 0x1680, 0x1680 },
+    { 0x180E, 0x180E },
+    { 0x2000, 0x2006 },
+    { 0x2008, 0x200A },
+    { 0x2028, 0x2029 },
+    { 0x205F, 0x205F },
+    { 0x3000, 0x3000 }
+
+#define PREDICATE(c) uc_is_space (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-ctype_upper.c
@@ -0,0 +1,478 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0041, 0x005A },
+    { 0x00C0, 0x00D6 },
+    { 0x00D8, 0x00DE },
+    { 0x0100, 0x0100 },
+    { 0x0102, 0x0102 },
+    { 0x0104, 0x0104 },
+    { 0x0106, 0x0106 },
+    { 0x0108, 0x0108 },
+    { 0x010A, 0x010A },
+    { 0x010C, 0x010C },
+    { 0x010E, 0x010E },
+    { 0x0110, 0x0110 },
+    { 0x0112, 0x0112 },
+    { 0x0114, 0x0114 },
+    { 0x0116, 0x0116 },
+    { 0x0118, 0x0118 },
+    { 0x011A, 0x011A },
+    { 0x011C, 0x011C },
+    { 0x011E, 0x011E },
+    { 0x0120, 0x0120 },
+    { 0x0122, 0x0122 },
+    { 0x0124, 0x0124 },
+    { 0x0126, 0x0126 },
+    { 0x0128, 0x0128 },
+    { 0x012A, 0x012A },
+    { 0x012C, 0x012C },
+    { 0x012E, 0x012E },
+    { 0x0130, 0x0130 },
+    { 0x0132, 0x0132 },
+    { 0x0134, 0x0134 },
+    { 0x0136, 0x0136 },
+    { 0x0139, 0x0139 },
+    { 0x013B, 0x013B },
+    { 0x013D, 0x013D },
+    { 0x013F, 0x013F },
+    { 0x0141, 0x0141 },
+    { 0x0143, 0x0143 },
+    { 0x0145, 0x0145 },
+    { 0x0147, 0x0147 },
+    { 0x014A, 0x014A },
+    { 0x014C, 0x014C },
+    { 0x014E, 0x014E },
+    { 0x0150, 0x0150 },
+    { 0x0152, 0x0152 },
+    { 0x0154, 0x0154 },
+    { 0x0156, 0x0156 },
+    { 0x0158, 0x0158 },
+    { 0x015A, 0x015A },
+    { 0x015C, 0x015C },
+    { 0x015E, 0x015E },
+    { 0x0160, 0x0160 },
+    { 0x0162, 0x0162 },
+    { 0x0164, 0x0164 },
+    { 0x0166, 0x0166 },
+    { 0x0168, 0x0168 },
+    { 0x016A, 0x016A },
+    { 0x016C, 0x016C },
+    { 0x016E, 0x016E },
+    { 0x0170, 0x0170 },
+    { 0x0172, 0x0172 },
+    { 0x0174, 0x0174 },
+    { 0x0176, 0x0176 },
+    { 0x0178, 0x0179 },
+    { 0x017B, 0x017B },
+    { 0x017D, 0x017D },
+    { 0x0181, 0x0182 },
+    { 0x0184, 0x0184 },
+    { 0x0186, 0x0187 },
+    { 0x0189, 0x018B },
+    { 0x018E, 0x0191 },
+    { 0x0193, 0x0194 },
+    { 0x0196, 0x0198 },
+    { 0x019C, 0x019D },
+    { 0x019F, 0x01A0 },
+    { 0x01A2, 0x01A2 },
+    { 0x01A4, 0x01A4 },
+    { 0x01A6, 0x01A7 },
+    { 0x01A9, 0x01A9 },
+    { 0x01AC, 0x01AC },
+    { 0x01AE, 0x01AF },
+    { 0x01B1, 0x01B3 },
+    { 0x01B5, 0x01B5 },
+    { 0x01B7, 0x01B8 },
+    { 0x01BC, 0x01BC },
+    { 0x01C4, 0x01C5 },
+    { 0x01C7, 0x01C8 },
+    { 0x01CA, 0x01CB },
+    { 0x01CD, 0x01CD },
+    { 0x01CF, 0x01CF },
+    { 0x01D1, 0x01D1 },
+    { 0x01D3, 0x01D3 },
+    { 0x01D5, 0x01D5 },
+    { 0x01D7, 0x01D7 },
+    { 0x01D9, 0x01D9 },
+    { 0x01DB, 0x01DB },
+    { 0x01DE, 0x01DE },
+    { 0x01E0, 0x01E0 },
+    { 0x01E2, 0x01E2 },
+    { 0x01E4, 0x01E4 },
+    { 0x01E6, 0x01E6 },
+    { 0x01E8, 0x01E8 },
+    { 0x01EA, 0x01EA },
+    { 0x01EC, 0x01EC },
+    { 0x01EE, 0x01EE },
+    { 0x01F1, 0x01F2 },
+    { 0x01F4, 0x01F4 },
+    { 0x01F6, 0x01F8 },
+    { 0x01FA, 0x01FA },
+    { 0x01FC, 0x01FC },
+    { 0x01FE, 0x01FE },
+    { 0x0200, 0x0200 },
+    { 0x0202, 0x0202 },
+    { 0x0204, 0x0204 },
+    { 0x0206, 0x0206 },
+    { 0x0208, 0x0208 },
+    { 0x020A, 0x020A },
+    { 0x020C, 0x020C },
+    { 0x020E, 0x020E },
+    { 0x0210, 0x0210 },
+    { 0x0212, 0x0212 },
+    { 0x0214, 0x0214 },
+    { 0x0216, 0x0216 },
+    { 0x0218, 0x0218 },
+    { 0x021A, 0x021A },
+    { 0x021C, 0x021C },
+    { 0x021E, 0x021E },
+    { 0x0220, 0x0220 },
+    { 0x0222, 0x0222 },
+    { 0x0224, 0x0224 },
+    { 0x0226, 0x0226 },
+    { 0x0228, 0x0228 },
+    { 0x022A, 0x022A },
+    { 0x022C, 0x022C },
+    { 0x022E, 0x022E },
+    { 0x0230, 0x0230 },
+    { 0x0232, 0x0232 },
+    { 0x023A, 0x023B },
+    { 0x023D, 0x023E },
+    { 0x0241, 0x0241 },
+    { 0x0243, 0x0246 },
+    { 0x0248, 0x0248 },
+    { 0x024A, 0x024A },
+    { 0x024C, 0x024C },
+    { 0x024E, 0x024E },
+    { 0x0386, 0x0386 },
+    { 0x0388, 0x038A },
+    { 0x038C, 0x038C },
+    { 0x038E, 0x038F },
+    { 0x0391, 0x03A1 },
+    { 0x03A3, 0x03AB },
+    { 0x03D8, 0x03D8 },
+    { 0x03DA, 0x03DA },
+    { 0x03DC, 0x03DC },
+    { 0x03DE, 0x03DE },
+    { 0x03E0, 0x03E0 },
+    { 0x03E2, 0x03E2 },
+    { 0x03E4, 0x03E4 },
+    { 0x03E6, 0x03E6 },
+    { 0x03E8, 0x03E8 },
+    { 0x03EA, 0x03EA },
+    { 0x03EC, 0x03EC },
+    { 0x03EE, 0x03EE },
+    { 0x03F4, 0x03F4 },
+    { 0x03F7, 0x03F7 },
+    { 0x03F9, 0x03FA },
+    { 0x03FD, 0x042F },
+    { 0x0460, 0x0460 },
+    { 0x0462, 0x0462 },
+    { 0x0464, 0x0464 },
+    { 0x0466, 0x0466 },
+    { 0x0468, 0x0468 },
+    { 0x046A, 0x046A },
+    { 0x046C, 0x046C },
+    { 0x046E, 0x046E },
+    { 0x0470, 0x0470 },
+    { 0x0472, 0x0472 },
+    { 0x0474, 0x0474 },
+    { 0x0476, 0x0476 },
+    { 0x0478, 0x0478 },
+    { 0x047A, 0x047A },
+    { 0x047C, 0x047C },
+    { 0x047E, 0x047E },
+    { 0x0480, 0x0480 },
+    { 0x048A, 0x048A },
+    { 0x048C, 0x048C },
+    { 0x048E, 0x048E },
+    { 0x0490, 0x0490 },
+    { 0x0492, 0x0492 },
+    { 0x0494, 0x0494 },
+    { 0x0496, 0x0496 },
+    { 0x0498, 0x0498 },
+    { 0x049A, 0x049A },
+    { 0x049C, 0x049C },
+    { 0x049E, 0x049E },
+    { 0x04A0, 0x04A0 },
+    { 0x04A2, 0x04A2 },
+    { 0x04A4, 0x04A4 },
+    { 0x04A6, 0x04A6 },
+    { 0x04A8, 0x04A8 },
+    { 0x04AA, 0x04AA },
+    { 0x04AC, 0x04AC },
+    { 0x04AE, 0x04AE },
+    { 0x04B0, 0x04B0 },
+    { 0x04B2, 0x04B2 },
+    { 0x04B4, 0x04B4 },
+    { 0x04B6, 0x04B6 },
+    { 0x04B8, 0x04B8 },
+    { 0x04BA, 0x04BA },
+    { 0x04BC, 0x04BC },
+    { 0x04BE, 0x04BE },
+    { 0x04C0, 0x04C1 },
+    { 0x04C3, 0x04C3 },
+    { 0x04C5, 0x04C5 },
+    { 0x04C7, 0x04C7 },
+    { 0x04C9, 0x04C9 },
+    { 0x04CB, 0x04CB },
+    { 0x04CD, 0x04CD },
+    { 0x04D0, 0x04D0 },
+    { 0x04D2, 0x04D2 },
+    { 0x04D4, 0x04D4 },
+    { 0x04D6, 0x04D6 },
+    { 0x04D8, 0x04D8 },
+    { 0x04DA, 0x04DA },
+    { 0x04DC, 0x04DC },
+    { 0x04DE, 0x04DE },
+    { 0x04E0, 0x04E0 },
+    { 0x04E2, 0x04E2 },
+    { 0x04E4, 0x04E4 },
+    { 0x04E6, 0x04E6 },
+    { 0x04E8, 0x04E8 },
+    { 0x04EA, 0x04EA },
+    { 0x04EC, 0x04EC },
+    { 0x04EE, 0x04EE },
+    { 0x04F0, 0x04F0 },
+    { 0x04F2, 0x04F2 },
+    { 0x04F4, 0x04F4 },
+    { 0x04F6, 0x04F6 },
+    { 0x04F8, 0x04F8 },
+    { 0x04FA, 0x04FA },
+    { 0x04FC, 0x04FC },
+    { 0x04FE, 0x04FE },
+    { 0x0500, 0x0500 },
+    { 0x0502, 0x0502 },
+    { 0x0504, 0x0504 },
+    { 0x0506, 0x0506 },
+    { 0x0508, 0x0508 },
+    { 0x050A, 0x050A },
+    { 0x050C, 0x050C },
+    { 0x050E, 0x050E },
+    { 0x0510, 0x0510 },
+    { 0x0512, 0x0512 },
+    { 0x0531, 0x0556 },
+    { 0x10A0, 0x10C5 },
+    { 0x1E00, 0x1E00 },
+    { 0x1E02, 0x1E02 },
+    { 0x1E04, 0x1E04 },
+    { 0x1E06, 0x1E06 },
+    { 0x1E08, 0x1E08 },
+    { 0x1E0A, 0x1E0A },
+    { 0x1E0C, 0x1E0C },
+    { 0x1E0E, 0x1E0E },
+    { 0x1E10, 0x1E10 },
+    { 0x1E12, 0x1E12 },
+    { 0x1E14, 0x1E14 },
+    { 0x1E16, 0x1E16 },
+    { 0x1E18, 0x1E18 },
+    { 0x1E1A, 0x1E1A },
+    { 0x1E1C, 0x1E1C },
+    { 0x1E1E, 0x1E1E },
+    { 0x1E20, 0x1E20 },
+    { 0x1E22, 0x1E22 },
+    { 0x1E24, 0x1E24 },
+    { 0x1E26, 0x1E26 },
+    { 0x1E28, 0x1E28 },
+    { 0x1E2A, 0x1E2A },
+    { 0x1E2C, 0x1E2C },
+    { 0x1E2E, 0x1E2E },
+    { 0x1E30, 0x1E30 },
+    { 0x1E32, 0x1E32 },
+    { 0x1E34, 0x1E34 },
+    { 0x1E36, 0x1E36 },
+    { 0x1E38, 0x1E38 },
+    { 0x1E3A, 0x1E3A },
+    { 0x1E3C, 0x1E3C },
+    { 0x1E3E, 0x1E3E },
+    { 0x1E40, 0x1E40 },
+    { 0x1E42, 0x1E42 },
+    { 0x1E44, 0x1E44 },
+    { 0x1E46, 0x1E46 },
+    { 0x1E48, 0x1E48 },
+    { 0x1E4A, 0x1E4A },
+    { 0x1E4C, 0x1E4C },
+    { 0x1E4E, 0x1E4E },
+    { 0x1E50, 0x1E50 },
+    { 0x1E52, 0x1E52 },
+    { 0x1E54, 0x1E54 },
+    { 0x1E56, 0x1E56 },
+    { 0x1E58, 0x1E58 },
+    { 0x1E5A, 0x1E5A },
+    { 0x1E5C, 0x1E5C },
+    { 0x1E5E, 0x1E5E },
+    { 0x1E60, 0x1E60 },
+    { 0x1E62, 0x1E62 },
+    { 0x1E64, 0x1E64 },
+    { 0x1E66, 0x1E66 },
+    { 0x1E68, 0x1E68 },
+    { 0x1E6A, 0x1E6A },
+    { 0x1E6C, 0x1E6C },
+    { 0x1E6E, 0x1E6E },
+    { 0x1E70, 0x1E70 },
+    { 0x1E72, 0x1E72 },
+    { 0x1E74, 0x1E74 },
+    { 0x1E76, 0x1E76 },
+    { 0x1E78, 0x1E78 },
+    { 0x1E7A, 0x1E7A },
+    { 0x1E7C, 0x1E7C },
+    { 0x1E7E, 0x1E7E },
+    { 0x1E80, 0x1E80 },
+    { 0x1E82, 0x1E82 },
+    { 0x1E84, 0x1E84 },
+    { 0x1E86, 0x1E86 },
+    { 0x1E88, 0x1E88 },
+    { 0x1E8A, 0x1E8A },
+    { 0x1E8C, 0x1E8C },
+    { 0x1E8E, 0x1E8E },
+    { 0x1E90, 0x1E90 },
+    { 0x1E92, 0x1E92 },
+    { 0x1E94, 0x1E94 },
+    { 0x1EA0, 0x1EA0 },
+    { 0x1EA2, 0x1EA2 },
+    { 0x1EA4, 0x1EA4 },
+    { 0x1EA6, 0x1EA6 },
+    { 0x1EA8, 0x1EA8 },
+    { 0x1EAA, 0x1EAA },
+    { 0x1EAC, 0x1EAC },
+    { 0x1EAE, 0x1EAE },
+    { 0x1EB0, 0x1EB0 },
+    { 0x1EB2, 0x1EB2 },
+    { 0x1EB4, 0x1EB4 },
+    { 0x1EB6, 0x1EB6 },
+    { 0x1EB8, 0x1EB8 },
+    { 0x1EBA, 0x1EBA },
+    { 0x1EBC, 0x1EBC },
+    { 0x1EBE, 0x1EBE },
+    { 0x1EC0, 0x1EC0 },
+    { 0x1EC2, 0x1EC2 },
+    { 0x1EC4, 0x1EC4 },
+    { 0x1EC6, 0x1EC6 },
+    { 0x1EC8, 0x1EC8 },
+    { 0x1ECA, 0x1ECA },
+    { 0x1ECC, 0x1ECC },
+    { 0x1ECE, 0x1ECE },
+    { 0x1ED0, 0x1ED0 },
+    { 0x1ED2, 0x1ED2 },
+    { 0x1ED4, 0x1ED4 },
+    { 0x1ED6, 0x1ED6 },
+    { 0x1ED8, 0x1ED8 },
+    { 0x1EDA, 0x1EDA },
+    { 0x1EDC, 0x1EDC },
+    { 0x1EDE, 0x1EDE },
+    { 0x1EE0, 0x1EE0 },
+    { 0x1EE2, 0x1EE2 },
+    { 0x1EE4, 0x1EE4 },
+    { 0x1EE6, 0x1EE6 },
+    { 0x1EE8, 0x1EE8 },
+    { 0x1EEA, 0x1EEA },
+    { 0x1EEC, 0x1EEC },
+    { 0x1EEE, 0x1EEE },
+    { 0x1EF0, 0x1EF0 },
+    { 0x1EF2, 0x1EF2 },
+    { 0x1EF4, 0x1EF4 },
+    { 0x1EF6, 0x1EF6 },
+    { 0x1EF8, 0x1EF8 },
+    { 0x1F08, 0x1F0F },
+    { 0x1F18, 0x1F1D },
+    { 0x1F28, 0x1F2F },
+    { 0x1F38, 0x1F3F },
+    { 0x1F48, 0x1F4D },
+    { 0x1F59, 0x1F59 },
+    { 0x1F5B, 0x1F5B },
+    { 0x1F5D, 0x1F5D },
+    { 0x1F5F, 0x1F5F },
+    { 0x1F68, 0x1F6F },
+    { 0x1F88, 0x1F8F },
+    { 0x1F98, 0x1F9F },
+    { 0x1FA8, 0x1FAF },
+    { 0x1FB8, 0x1FBC },
+    { 0x1FC8, 0x1FCC },
+    { 0x1FD8, 0x1FDB },
+    { 0x1FE8, 0x1FEC },
+    { 0x1FF8, 0x1FFC },
+    { 0x2126, 0x2126 },
+    { 0x212A, 0x212B },
+    { 0x2132, 0x2132 },
+    { 0x2160, 0x216F },
+    { 0x2183, 0x2183 },
+    { 0x24B6, 0x24CF },
+    { 0x2C00, 0x2C2E },
+    { 0x2C60, 0x2C60 },
+    { 0x2C62, 0x2C64 },
+    { 0x2C67, 0x2C67 },
+    { 0x2C69, 0x2C69 },
+    { 0x2C6B, 0x2C6B },
+    { 0x2C75, 0x2C75 },
+    { 0x2C80, 0x2C80 },
+    { 0x2C82, 0x2C82 },
+    { 0x2C84, 0x2C84 },
+    { 0x2C86, 0x2C86 },
+    { 0x2C88, 0x2C88 },
+    { 0x2C8A, 0x2C8A },
+    { 0x2C8C, 0x2C8C },
+    { 0x2C8E, 0x2C8E },
+    { 0x2C90, 0x2C90 },
+    { 0x2C92, 0x2C92 },
+    { 0x2C94, 0x2C94 },
+    { 0x2C96, 0x2C96 },
+    { 0x2C98, 0x2C98 },
+    { 0x2C9A, 0x2C9A },
+    { 0x2C9C, 0x2C9C },
+    { 0x2C9E, 0x2C9E },
+    { 0x2CA0, 0x2CA0 },
+    { 0x2CA2, 0x2CA2 },
+    { 0x2CA4, 0x2CA4 },
+    { 0x2CA6, 0x2CA6 },
+    { 0x2CA8, 0x2CA8 },
+    { 0x2CAA, 0x2CAA },
+    { 0x2CAC, 0x2CAC },
+    { 0x2CAE, 0x2CAE },
+    { 0x2CB0, 0x2CB0 },
+    { 0x2CB2, 0x2CB2 },
+    { 0x2CB4, 0x2CB4 },
+    { 0x2CB6, 0x2CB6 },
+    { 0x2CB8, 0x2CB8 },
+    { 0x2CBA, 0x2CBA },
+    { 0x2CBC, 0x2CBC },
+    { 0x2CBE, 0x2CBE },
+    { 0x2CC0, 0x2CC0 },
+    { 0x2CC2, 0x2CC2 },
+    { 0x2CC4, 0x2CC4 },
+    { 0x2CC6, 0x2CC6 },
+    { 0x2CC8, 0x2CC8 },
+    { 0x2CCA, 0x2CCA },
+    { 0x2CCC, 0x2CCC },
+    { 0x2CCE, 0x2CCE },
+    { 0x2CD0, 0x2CD0 },
+    { 0x2CD2, 0x2CD2 },
+    { 0x2CD4, 0x2CD4 },
+    { 0x2CD6, 0x2CD6 },
+    { 0x2CD8, 0x2CD8 },
+    { 0x2CDA, 0x2CDA },
+    { 0x2CDC, 0x2CDC },
+    { 0x2CDE, 0x2CDE },
+    { 0x2CE0, 0x2CE0 },
+    { 0x2CE2, 0x2CE2 },
+    { 0xFF21, 0xFF3A },
+    { 0x10400, 0x10427 }
+
+#define PREDICATE(c) uc_is_upper (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-ctype_xdigit.c
@@ -0,0 +1,25 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0030, 0x0039 },
+    { 0x0041, 0x0046 },
+    { 0x0061, 0x0066 }
+
+#define PREDICATE(c) uc_is_xdigit (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-decdigit.c
@@ -0,0 +1,61 @@
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "unictype.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+#define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
+
+static const struct { unsigned int ch; int value; } mapping[] =
+  {
+#include "test-decdigit.h"
+  };
+
+int
+main ()
+{
+  unsigned int c;
+  size_t i;
+
+  c = 0;
+  for (i = 0; i < SIZEOF (mapping); i++)
+    {
+      for (; c < mapping[i].ch; c++)
+	ASSERT (uc_decimal_value (c) == -1);
+      /* Here c = mapping[i].ch.  */
+      ASSERT (uc_decimal_value (c) == mapping[i].value);
+      c++;
+    }
+  for (; c < 0x110000; c++)
+    ASSERT (uc_decimal_value (c) == -1);
+
+  return 0;
+}
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-decdigit.h
@@ -0,0 +1,293 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Decimal digit values of Unicode characters.  */
+/* Generated automatically by gen-ctype.c for Unicode 5.0.0.  */
+    { 0x0030, 0 },
+    { 0x0031, 1 },
+    { 0x0032, 2 },
+    { 0x0033, 3 },
+    { 0x0034, 4 },
+    { 0x0035, 5 },
+    { 0x0036, 6 },
+    { 0x0037, 7 },
+    { 0x0038, 8 },
+    { 0x0039, 9 },
+    { 0x0660, 0 },
+    { 0x0661, 1 },
+    { 0x0662, 2 },
+    { 0x0663, 3 },
+    { 0x0664, 4 },
+    { 0x0665, 5 },
+    { 0x0666, 6 },
+    { 0x0667, 7 },
+    { 0x0668, 8 },
+    { 0x0669, 9 },
+    { 0x06F0, 0 },
+    { 0x06F1, 1 },
+    { 0x06F2, 2 },
+    { 0x06F3, 3 },
+    { 0x06F4, 4 },
+    { 0x06F5, 5 },
+    { 0x06F6, 6 },
+    { 0x06F7, 7 },
+    { 0x06F8, 8 },
+    { 0x06F9, 9 },
+    { 0x07C0, 0 },
+    { 0x07C1, 1 },
+    { 0x07C2, 2 },
+    { 0x07C3, 3 },
+    { 0x07C4, 4 },
+    { 0x07C5, 5 },
+    { 0x07C6, 6 },
+    { 0x07C7, 7 },
+    { 0x07C8, 8 },
+    { 0x07C9, 9 },
+    { 0x0966, 0 },
+    { 0x0967, 1 },
+    { 0x0968, 2 },
+    { 0x0969, 3 },
+    { 0x096A, 4 },
+    { 0x096B, 5 },
+    { 0x096C, 6 },
+    { 0x096D, 7 },
+    { 0x096E, 8 },
+    { 0x096F, 9 },
+    { 0x09E6, 0 },
+    { 0x09E7, 1 },
+    { 0x09E8, 2 },
+    { 0x09E9, 3 },
+    { 0x09EA, 4 },
+    { 0x09EB, 5 },
+    { 0x09EC, 6 },
+    { 0x09ED, 7 },
+    { 0x09EE, 8 },
+    { 0x09EF, 9 },
+    { 0x0A66, 0 },
+    { 0x0A67, 1 },
+    { 0x0A68, 2 },
+    { 0x0A69, 3 },
+    { 0x0A6A, 4 },
+    { 0x0A6B, 5 },
+    { 0x0A6C, 6 },
+    { 0x0A6D, 7 },
+    { 0x0A6E, 8 },
+    { 0x0A6F, 9 },
+    { 0x0AE6, 0 },
+    { 0x0AE7, 1 },
+    { 0x0AE8, 2 },
+    { 0x0AE9, 3 },
+    { 0x0AEA, 4 },
+    { 0x0AEB, 5 },
+    { 0x0AEC, 6 },
+    { 0x0AED, 7 },
+    { 0x0AEE, 8 },
+    { 0x0AEF, 9 },
+    { 0x0B66, 0 },
+    { 0x0B67, 1 },
+    { 0x0B68, 2 },
+    { 0x0B69, 3 },
+    { 0x0B6A, 4 },
+    { 0x0B6B, 5 },
+    { 0x0B6C, 6 },
+    { 0x0B6D, 7 },
+    { 0x0B6E, 8 },
+    { 0x0B6F, 9 },
+    { 0x0BE6, 0 },
+    { 0x0BE7, 1 },
+    { 0x0BE8, 2 },
+    { 0x0BE9, 3 },
+    { 0x0BEA, 4 },
+    { 0x0BEB, 5 },
+    { 0x0BEC, 6 },
+    { 0x0BED, 7 },
+    { 0x0BEE, 8 },
+    { 0x0BEF, 9 },
+    { 0x0C66, 0 },
+    { 0x0C67, 1 },
+    { 0x0C68, 2 },
+    { 0x0C69, 3 },
+    { 0x0C6A, 4 },
+    { 0x0C6B, 5 },
+    { 0x0C6C, 6 },
+    { 0x0C6D, 7 },
+    { 0x0C6E, 8 },
+    { 0x0C6F, 9 },
+    { 0x0CE6, 0 },
+    { 0x0CE7, 1 },
+    { 0x0CE8, 2 },
+    { 0x0CE9, 3 },
+    { 0x0CEA, 4 },
+    { 0x0CEB, 5 },
+    { 0x0CEC, 6 },
+    { 0x0CED, 7 },
+    { 0x0CEE, 8 },
+    { 0x0CEF, 9 },
+    { 0x0D66, 0 },
+    { 0x0D67, 1 },
+    { 0x0D68, 2 },
+    { 0x0D69, 3 },
+    { 0x0D6A, 4 },
+    { 0x0D6B, 5 },
+    { 0x0D6C, 6 },
+    { 0x0D6D, 7 },
+    { 0x0D6E, 8 },
+    { 0x0D6F, 9 },
+    { 0x0E50, 0 },
+    { 0x0E51, 1 },
+    { 0x0E52, 2 },
+    { 0x0E53, 3 },
+    { 0x0E54, 4 },
+    { 0x0E55, 5 },
+    { 0x0E56, 6 },
+    { 0x0E57, 7 },
+    { 0x0E58, 8 },
+    { 0x0E59, 9 },
+    { 0x0ED0, 0 },
+    { 0x0ED1, 1 },
+    { 0x0ED2, 2 },
+    { 0x0ED3, 3 },
+    { 0x0ED4, 4 },
+    { 0x0ED5, 5 },
+    { 0x0ED6, 6 },
+    { 0x0ED7, 7 },
+    { 0x0ED8, 8 },
+    { 0x0ED9, 9 },
+    { 0x0F20, 0 },
+    { 0x0F21, 1 },
+    { 0x0F22, 2 },
+    { 0x0F23, 3 },
+    { 0x0F24, 4 },
+    { 0x0F25, 5 },
+    { 0x0F26, 6 },
+    { 0x0F27, 7 },
+    { 0x0F28, 8 },
+    { 0x0F29, 9 },
+    { 0x1040, 0 },
+    { 0x1041, 1 },
+    { 0x1042, 2 },
+    { 0x1043, 3 },
+    { 0x1044, 4 },
+    { 0x1045, 5 },
+    { 0x1046, 6 },
+    { 0x1047, 7 },
+    { 0x1048, 8 },
+    { 0x1049, 9 },
+    { 0x17E0, 0 },
+    { 0x17E1, 1 },
+    { 0x17E2, 2 },
+    { 0x17E3, 3 },
+    { 0x17E4, 4 },
+    { 0x17E5, 5 },
+    { 0x17E6, 6 },
+    { 0x17E7, 7 },
+    { 0x17E8, 8 },
+    { 0x17E9, 9 },
+    { 0x1810, 0 },
+    { 0x1811, 1 },
+    { 0x1812, 2 },
+    { 0x1813, 3 },
+    { 0x1814, 4 },
+    { 0x1815, 5 },
+    { 0x1816, 6 },
+    { 0x1817, 7 },
+    { 0x1818, 8 },
+    { 0x1819, 9 },
+    { 0x1946, 0 },
+    { 0x1947, 1 },
+    { 0x1948, 2 },
+    { 0x1949, 3 },
+    { 0x194A, 4 },
+    { 0x194B, 5 },
+    { 0x194C, 6 },
+    { 0x194D, 7 },
+    { 0x194E, 8 },
+    { 0x194F, 9 },
+    { 0x19D0, 0 },
+    { 0x19D1, 1 },
+    { 0x19D2, 2 },
+    { 0x19D3, 3 },
+    { 0x19D4, 4 },
+    { 0x19D5, 5 },
+    { 0x19D6, 6 },
+    { 0x19D7, 7 },
+    { 0x19D8, 8 },
+    { 0x19D9, 9 },
+    { 0x1B50, 0 },
+    { 0x1B51, 1 },
+    { 0x1B52, 2 },
+    { 0x1B53, 3 },
+    { 0x1B54, 4 },
+    { 0x1B55, 5 },
+    { 0x1B56, 6 },
+    { 0x1B57, 7 },
+    { 0x1B58, 8 },
+    { 0x1B59, 9 },
+    { 0xFF10, 0 },
+    { 0xFF11, 1 },
+    { 0xFF12, 2 },
+    { 0xFF13, 3 },
+    { 0xFF14, 4 },
+    { 0xFF15, 5 },
+    { 0xFF16, 6 },
+    { 0xFF17, 7 },
+    { 0xFF18, 8 },
+    { 0xFF19, 9 },
+    { 0x104A0, 0 },
+    { 0x104A1, 1 },
+    { 0x104A2, 2 },
+    { 0x104A3, 3 },
+    { 0x104A4, 4 },
+    { 0x104A5, 5 },
+    { 0x104A6, 6 },
+    { 0x104A7, 7 },
+    { 0x104A8, 8 },
+    { 0x104A9, 9 },
+    { 0x1D7CE, 0 },
+    { 0x1D7CF, 1 },
+    { 0x1D7D0, 2 },
+    { 0x1D7D1, 3 },
+    { 0x1D7D2, 4 },
+    { 0x1D7D3, 5 },
+    { 0x1D7D4, 6 },
+    { 0x1D7D5, 7 },
+    { 0x1D7D6, 8 },
+    { 0x1D7D7, 9 },
+    { 0x1D7D8, 0 },
+    { 0x1D7D9, 1 },
+    { 0x1D7DA, 2 },
+    { 0x1D7DB, 3 },
+    { 0x1D7DC, 4 },
+    { 0x1D7DD, 5 },
+    { 0x1D7DE, 6 },
+    { 0x1D7DF, 7 },
+    { 0x1D7E0, 8 },
+    { 0x1D7E1, 9 },
+    { 0x1D7E2, 0 },
+    { 0x1D7E3, 1 },
+    { 0x1D7E4, 2 },
+    { 0x1D7E5, 3 },
+    { 0x1D7E6, 4 },
+    { 0x1D7E7, 5 },
+    { 0x1D7E8, 6 },
+    { 0x1D7E9, 7 },
+    { 0x1D7EA, 8 },
+    { 0x1D7EB, 9 },
+    { 0x1D7EC, 0 },
+    { 0x1D7ED, 1 },
+    { 0x1D7EE, 2 },
+    { 0x1D7EF, 3 },
+    { 0x1D7F0, 4 },
+    { 0x1D7F1, 5 },
+    { 0x1D7F2, 6 },
+    { 0x1D7F3, 7 },
+    { 0x1D7F4, 8 },
+    { 0x1D7F5, 9 },
+    { 0x1D7F6, 0 },
+    { 0x1D7F7, 1 },
+    { 0x1D7F8, 2 },
+    { 0x1D7F9, 3 },
+    { 0x1D7FA, 4 },
+    { 0x1D7FB, 5 },
+    { 0x1D7FC, 6 },
+    { 0x1D7FD, 7 },
+    { 0x1D7FE, 8 },
+    { 0x1D7FF, 9 }
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-digit.c
@@ -0,0 +1,61 @@
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "unictype.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+#define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
+
+static const struct { unsigned int ch; int value; } mapping[] =
+  {
+#include "test-digit.h"
+  };
+
+int
+main ()
+{
+  unsigned int c;
+  size_t i;
+
+  c = 0;
+  for (i = 0; i < SIZEOF (mapping); i++)
+    {
+      for (; c < mapping[i].ch; c++)
+	ASSERT (uc_digit_value (c) == -1);
+      /* Here c = mapping[i].ch.  */
+      ASSERT (uc_digit_value (c) == mapping[i].value);
+      c++;
+    }
+  for (; c < 0x110000; c++)
+    ASSERT (uc_digit_value (c) == -1);
+
+  return 0;
+}
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-digit.h
@@ -0,0 +1,391 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Digit values of Unicode characters.  */
+/* Generated automatically by gen-ctype.c for Unicode 5.0.0.  */
+    { 0x0030, 0 },
+    { 0x0031, 1 },
+    { 0x0032, 2 },
+    { 0x0033, 3 },
+    { 0x0034, 4 },
+    { 0x0035, 5 },
+    { 0x0036, 6 },
+    { 0x0037, 7 },
+    { 0x0038, 8 },
+    { 0x0039, 9 },
+    { 0x00B2, 2 },
+    { 0x00B3, 3 },
+    { 0x00B9, 1 },
+    { 0x0660, 0 },
+    { 0x0661, 1 },
+    { 0x0662, 2 },
+    { 0x0663, 3 },
+    { 0x0664, 4 },
+    { 0x0665, 5 },
+    { 0x0666, 6 },
+    { 0x0667, 7 },
+    { 0x0668, 8 },
+    { 0x0669, 9 },
+    { 0x06F0, 0 },
+    { 0x06F1, 1 },
+    { 0x06F2, 2 },
+    { 0x06F3, 3 },
+    { 0x06F4, 4 },
+    { 0x06F5, 5 },
+    { 0x06F6, 6 },
+    { 0x06F7, 7 },
+    { 0x06F8, 8 },
+    { 0x06F9, 9 },
+    { 0x07C0, 0 },
+    { 0x07C1, 1 },
+    { 0x07C2, 2 },
+    { 0x07C3, 3 },
+    { 0x07C4, 4 },
+    { 0x07C5, 5 },
+    { 0x07C6, 6 },
+    { 0x07C7, 7 },
+    { 0x07C8, 8 },
+    { 0x07C9, 9 },
+    { 0x0966, 0 },
+    { 0x0967, 1 },
+    { 0x0968, 2 },
+    { 0x0969, 3 },
+    { 0x096A, 4 },
+    { 0x096B, 5 },
+    { 0x096C, 6 },
+    { 0x096D, 7 },
+    { 0x096E, 8 },
+    { 0x096F, 9 },
+    { 0x09E6, 0 },
+    { 0x09E7, 1 },
+    { 0x09E8, 2 },
+    { 0x09E9, 3 },
+    { 0x09EA, 4 },
+    { 0x09EB, 5 },
+    { 0x09EC, 6 },
+    { 0x09ED, 7 },
+    { 0x09EE, 8 },
+    { 0x09EF, 9 },
+    { 0x0A66, 0 },
+    { 0x0A67, 1 },
+    { 0x0A68, 2 },
+    { 0x0A69, 3 },
+    { 0x0A6A, 4 },
+    { 0x0A6B, 5 },
+    { 0x0A6C, 6 },
+    { 0x0A6D, 7 },
+    { 0x0A6E, 8 },
+    { 0x0A6F, 9 },
+    { 0x0AE6, 0 },
+    { 0x0AE7, 1 },
+    { 0x0AE8, 2 },
+    { 0x0AE9, 3 },
+    { 0x0AEA, 4 },
+    { 0x0AEB, 5 },
+    { 0x0AEC, 6 },
+    { 0x0AED, 7 },
+    { 0x0AEE, 8 },
+    { 0x0AEF, 9 },
+    { 0x0B66, 0 },
+    { 0x0B67, 1 },
+    { 0x0B68, 2 },
+    { 0x0B69, 3 },
+    { 0x0B6A, 4 },
+    { 0x0B6B, 5 },
+    { 0x0B6C, 6 },
+    { 0x0B6D, 7 },
+    { 0x0B6E, 8 },
+    { 0x0B6F, 9 },
+    { 0x0BE6, 0 },
+    { 0x0BE7, 1 },
+    { 0x0BE8, 2 },
+    { 0x0BE9, 3 },
+    { 0x0BEA, 4 },
+    { 0x0BEB, 5 },
+    { 0x0BEC, 6 },
+    { 0x0BED, 7 },
+    { 0x0BEE, 8 },
+    { 0x0BEF, 9 },
+    { 0x0C66, 0 },
+    { 0x0C67, 1 },
+    { 0x0C68, 2 },
+    { 0x0C69, 3 },
+    { 0x0C6A, 4 },
+    { 0x0C6B, 5 },
+    { 0x0C6C, 6 },
+    { 0x0C6D, 7 },
+    { 0x0C6E, 8 },
+    { 0x0C6F, 9 },
+    { 0x0CE6, 0 },
+    { 0x0CE7, 1 },
+    { 0x0CE8, 2 },
+    { 0x0CE9, 3 },
+    { 0x0CEA, 4 },
+    { 0x0CEB, 5 },
+    { 0x0CEC, 6 },
+    { 0x0CED, 7 },
+    { 0x0CEE, 8 },
+    { 0x0CEF, 9 },
+    { 0x0D66, 0 },
+    { 0x0D67, 1 },
+    { 0x0D68, 2 },
+    { 0x0D69, 3 },
+    { 0x0D6A, 4 },
+    { 0x0D6B, 5 },
+    { 0x0D6C, 6 },
+    { 0x0D6D, 7 },
+    { 0x0D6E, 8 },
+    { 0x0D6F, 9 },
+    { 0x0E50, 0 },
+    { 0x0E51, 1 },
+    { 0x0E52, 2 },
+    { 0x0E53, 3 },
+    { 0x0E54, 4 },
+    { 0x0E55, 5 },
+    { 0x0E56, 6 },
+    { 0x0E57, 7 },
+    { 0x0E58, 8 },
+    { 0x0E59, 9 },
+    { 0x0ED0, 0 },
+    { 0x0ED1, 1 },
+    { 0x0ED2, 2 },
+    { 0x0ED3, 3 },
+    { 0x0ED4, 4 },
+    { 0x0ED5, 5 },
+    { 0x0ED6, 6 },
+    { 0x0ED7, 7 },
+    { 0x0ED8, 8 },
+    { 0x0ED9, 9 },
+    { 0x0F20, 0 },
+    { 0x0F21, 1 },
+    { 0x0F22, 2 },
+    { 0x0F23, 3 },
+    { 0x0F24, 4 },
+    { 0x0F25, 5 },
+    { 0x0F26, 6 },
+    { 0x0F27, 7 },
+    { 0x0F28, 8 },
+    { 0x0F29, 9 },
+    { 0x1040, 0 },
+    { 0x1041, 1 },
+    { 0x1042, 2 },
+    { 0x1043, 3 },
+    { 0x1044, 4 },
+    { 0x1045, 5 },
+    { 0x1046, 6 },
+    { 0x1047, 7 },
+    { 0x1048, 8 },
+    { 0x1049, 9 },
+    { 0x1369, 1 },
+    { 0x136A, 2 },
+    { 0x136B, 3 },
+    { 0x136C, 4 },
+    { 0x136D, 5 },
+    { 0x136E, 6 },
+    { 0x136F, 7 },
+    { 0x1370, 8 },
+    { 0x1371, 9 },
+    { 0x17E0, 0 },
+    { 0x17E1, 1 },
+    { 0x17E2, 2 },
+    { 0x17E3, 3 },
+    { 0x17E4, 4 },
+    { 0x17E5, 5 },
+    { 0x17E6, 6 },
+    { 0x17E7, 7 },
+    { 0x17E8, 8 },
+    { 0x17E9, 9 },
+    { 0x1810, 0 },
+    { 0x1811, 1 },
+    { 0x1812, 2 },
+    { 0x1813, 3 },
+    { 0x1814, 4 },
+    { 0x1815, 5 },
+    { 0x1816, 6 },
+    { 0x1817, 7 },
+    { 0x1818, 8 },
+    { 0x1819, 9 },
+    { 0x1946, 0 },
+    { 0x1947, 1 },
+    { 0x1948, 2 },
+    { 0x1949, 3 },
+    { 0x194A, 4 },
+    { 0x194B, 5 },
+    { 0x194C, 6 },
+    { 0x194D, 7 },
+    { 0x194E, 8 },
+    { 0x194F, 9 },
+    { 0x19D0, 0 },
+    { 0x19D1, 1 },
+    { 0x19D2, 2 },
+    { 0x19D3, 3 },
+    { 0x19D4, 4 },
+    { 0x19D5, 5 },
+    { 0x19D6, 6 },
+    { 0x19D7, 7 },
+    { 0x19D8, 8 },
+    { 0x19D9, 9 },
+    { 0x1B50, 0 },
+    { 0x1B51, 1 },
+    { 0x1B52, 2 },
+    { 0x1B53, 3 },
+    { 0x1B54, 4 },
+    { 0x1B55, 5 },
+    { 0x1B56, 6 },
+    { 0x1B57, 7 },
+    { 0x1B58, 8 },
+    { 0x1B59, 9 },
+    { 0x2070, 0 },
+    { 0x2074, 4 },
+    { 0x2075, 5 },
+    { 0x2076, 6 },
+    { 0x2077, 7 },
+    { 0x2078, 8 },
+    { 0x2079, 9 },
+    { 0x2080, 0 },
+    { 0x2081, 1 },
+    { 0x2082, 2 },
+    { 0x2083, 3 },
+    { 0x2084, 4 },
+    { 0x2085, 5 },
+    { 0x2086, 6 },
+    { 0x2087, 7 },
+    { 0x2088, 8 },
+    { 0x2089, 9 },
+    { 0x2460, 1 },
+    { 0x2461, 2 },
+    { 0x2462, 3 },
+    { 0x2463, 4 },
+    { 0x2464, 5 },
+    { 0x2465, 6 },
+    { 0x2466, 7 },
+    { 0x2467, 8 },
+    { 0x2468, 9 },
+    { 0x2474, 1 },
+    { 0x2475, 2 },
+    { 0x2476, 3 },
+    { 0x2477, 4 },
+    { 0x2478, 5 },
+    { 0x2479, 6 },
+    { 0x247A, 7 },
+    { 0x247B, 8 },
+    { 0x247C, 9 },
+    { 0x2488, 1 },
+    { 0x2489, 2 },
+    { 0x248A, 3 },
+    { 0x248B, 4 },
+    { 0x248C, 5 },
+    { 0x248D, 6 },
+    { 0x248E, 7 },
+    { 0x248F, 8 },
+    { 0x2490, 9 },
+    { 0x24EA, 0 },
+    { 0x24F5, 1 },
+    { 0x24F6, 2 },
+    { 0x24F7, 3 },
+    { 0x24F8, 4 },
+    { 0x24F9, 5 },
+    { 0x24FA, 6 },
+    { 0x24FB, 7 },
+    { 0x24FC, 8 },
+    { 0x24FD, 9 },
+    { 0x24FF, 0 },
+    { 0x2776, 1 },
+    { 0x2777, 2 },
+    { 0x2778, 3 },
+    { 0x2779, 4 },
+    { 0x277A, 5 },
+    { 0x277B, 6 },
+    { 0x277C, 7 },
+    { 0x277D, 8 },
+    { 0x277E, 9 },
+    { 0x2780, 1 },
+    { 0x2781, 2 },
+    { 0x2782, 3 },
+    { 0x2783, 4 },
+    { 0x2784, 5 },
+    { 0x2785, 6 },
+    { 0x2786, 7 },
+    { 0x2787, 8 },
+    { 0x2788, 9 },
+    { 0x278A, 1 },
+    { 0x278B, 2 },
+    { 0x278C, 3 },
+    { 0x278D, 4 },
+    { 0x278E, 5 },
+    { 0x278F, 6 },
+    { 0x2790, 7 },
+    { 0x2791, 8 },
+    { 0x2792, 9 },
+    { 0xFF10, 0 },
+    { 0xFF11, 1 },
+    { 0xFF12, 2 },
+    { 0xFF13, 3 },
+    { 0xFF14, 4 },
+    { 0xFF15, 5 },
+    { 0xFF16, 6 },
+    { 0xFF17, 7 },
+    { 0xFF18, 8 },
+    { 0xFF19, 9 },
+    { 0x104A0, 0 },
+    { 0x104A1, 1 },
+    { 0x104A2, 2 },
+    { 0x104A3, 3 },
+    { 0x104A4, 4 },
+    { 0x104A5, 5 },
+    { 0x104A6, 6 },
+    { 0x104A7, 7 },
+    { 0x104A8, 8 },
+    { 0x104A9, 9 },
+    { 0x10A40, 1 },
+    { 0x10A41, 2 },
+    { 0x10A42, 3 },
+    { 0x10A43, 4 },
+    { 0x1D7CE, 0 },
+    { 0x1D7CF, 1 },
+    { 0x1D7D0, 2 },
+    { 0x1D7D1, 3 },
+    { 0x1D7D2, 4 },
+    { 0x1D7D3, 5 },
+    { 0x1D7D4, 6 },
+    { 0x1D7D5, 7 },
+    { 0x1D7D6, 8 },
+    { 0x1D7D7, 9 },
+    { 0x1D7D8, 0 },
+    { 0x1D7D9, 1 },
+    { 0x1D7DA, 2 },
+    { 0x1D7DB, 3 },
+    { 0x1D7DC, 4 },
+    { 0x1D7DD, 5 },
+    { 0x1D7DE, 6 },
+    { 0x1D7DF, 7 },
+    { 0x1D7E0, 8 },
+    { 0x1D7E1, 9 },
+    { 0x1D7E2, 0 },
+    { 0x1D7E3, 1 },
+    { 0x1D7E4, 2 },
+    { 0x1D7E5, 3 },
+    { 0x1D7E6, 4 },
+    { 0x1D7E7, 5 },
+    { 0x1D7E8, 6 },
+    { 0x1D7E9, 7 },
+    { 0x1D7EA, 8 },
+    { 0x1D7EB, 9 },
+    { 0x1D7EC, 0 },
+    { 0x1D7ED, 1 },
+    { 0x1D7EE, 2 },
+    { 0x1D7EF, 3 },
+    { 0x1D7F0, 4 },
+    { 0x1D7F1, 5 },
+    { 0x1D7F2, 6 },
+    { 0x1D7F3, 7 },
+    { 0x1D7F4, 8 },
+    { 0x1D7F5, 9 },
+    { 0x1D7F6, 0 },
+    { 0x1D7F7, 1 },
+    { 0x1D7F8, 2 },
+    { 0x1D7F9, 3 },
+    { 0x1D7FA, 4 },
+    { 0x1D7FB, 5 },
+    { 0x1D7FC, 6 },
+    { 0x1D7FD, 7 },
+    { 0x1D7FE, 8 },
+    { 0x1D7FF, 9 }
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-mirror.c
@@ -0,0 +1,52 @@
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "unictype.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+
+int
+main ()
+{
+  ucs4_t mirrored;
+
+  ASSERT (uc_mirror_char ('(', &mirrored) && mirrored == ')');
+  ASSERT (uc_mirror_char (')', &mirrored) && mirrored == '(');
+  ASSERT (uc_mirror_char ('<', &mirrored) && mirrored == '>');
+  ASSERT (uc_mirror_char ('>', &mirrored) && mirrored == '<');
+  ASSERT (uc_mirror_char ('[', &mirrored) && mirrored == ']');
+  ASSERT (uc_mirror_char (']', &mirrored) && mirrored == '[');
+  ASSERT (uc_mirror_char ('{', &mirrored) && mirrored == '}');
+  ASSERT (uc_mirror_char ('}', &mirrored) && mirrored == '{');
+  ASSERT (!uc_mirror_char ('X', &mirrored));
+
+  return 0;
+}
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-numeric.c
@@ -0,0 +1,71 @@
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "unictype.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+#define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
+
+static const struct { unsigned int ch; int numerator; int denominator; }
+  mapping[] =
+  {
+#include "test-numeric.h"
+  };
+
+int
+main ()
+{
+  unsigned int c;
+  uc_fraction_t value;
+  size_t i;
+
+  c = 0;
+  for (i = 0; i < SIZEOF (mapping); i++)
+    {
+      for (; c < mapping[i].ch; c++)
+	{
+	  value = uc_numeric_value (c);
+	  ASSERT (value.numerator == 0 && value.denominator == 0);
+	}
+      /* Here c = mapping[i].ch.  */
+      value = uc_numeric_value (c);
+      ASSERT (value.numerator == mapping[i].numerator
+	      && value.denominator == mapping[i].denominator);
+      c++;
+    }
+  for (; c < 0x110000; c++)
+    {
+      value = uc_numeric_value (c);
+      ASSERT (value.numerator == 0 && value.denominator == 0);
+    }
+
+  return 0;
+}
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-numeric.h
@@ -0,0 +1,834 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Numeric values of Unicode characters.  */
+/* Generated automatically by gen-ctype.c for Unicode 5.0.0.  */
+    { 0x0030, 0, 1 },
+    { 0x0031, 1, 1 },
+    { 0x0032, 2, 1 },
+    { 0x0033, 3, 1 },
+    { 0x0034, 4, 1 },
+    { 0x0035, 5, 1 },
+    { 0x0036, 6, 1 },
+    { 0x0037, 7, 1 },
+    { 0x0038, 8, 1 },
+    { 0x0039, 9, 1 },
+    { 0x00B2, 2, 1 },
+    { 0x00B3, 3, 1 },
+    { 0x00B9, 1, 1 },
+    { 0x00BC, 1, 4 },
+    { 0x00BD, 1, 2 },
+    { 0x00BE, 3, 4 },
+    { 0x0660, 0, 1 },
+    { 0x0661, 1, 1 },
+    { 0x0662, 2, 1 },
+    { 0x0663, 3, 1 },
+    { 0x0664, 4, 1 },
+    { 0x0665, 5, 1 },
+    { 0x0666, 6, 1 },
+    { 0x0667, 7, 1 },
+    { 0x0668, 8, 1 },
+    { 0x0669, 9, 1 },
+    { 0x06F0, 0, 1 },
+    { 0x06F1, 1, 1 },
+    { 0x06F2, 2, 1 },
+    { 0x06F3, 3, 1 },
+    { 0x06F4, 4, 1 },
+    { 0x06F5, 5, 1 },
+    { 0x06F6, 6, 1 },
+    { 0x06F7, 7, 1 },
+    { 0x06F8, 8, 1 },
+    { 0x06F9, 9, 1 },
+    { 0x07C0, 0, 1 },
+    { 0x07C1, 1, 1 },
+    { 0x07C2, 2, 1 },
+    { 0x07C3, 3, 1 },
+    { 0x07C4, 4, 1 },
+    { 0x07C5, 5, 1 },
+    { 0x07C6, 6, 1 },
+    { 0x07C7, 7, 1 },
+    { 0x07C8, 8, 1 },
+    { 0x07C9, 9, 1 },
+    { 0x0966, 0, 1 },
+    { 0x0967, 1, 1 },
+    { 0x0968, 2, 1 },
+    { 0x0969, 3, 1 },
+    { 0x096A, 4, 1 },
+    { 0x096B, 5, 1 },
+    { 0x096C, 6, 1 },
+    { 0x096D, 7, 1 },
+    { 0x096E, 8, 1 },
+    { 0x096F, 9, 1 },
+    { 0x09E6, 0, 1 },
+    { 0x09E7, 1, 1 },
+    { 0x09E8, 2, 1 },
+    { 0x09E9, 3, 1 },
+    { 0x09EA, 4, 1 },
+    { 0x09EB, 5, 1 },
+    { 0x09EC, 6, 1 },
+    { 0x09ED, 7, 1 },
+    { 0x09EE, 8, 1 },
+    { 0x09EF, 9, 1 },
+    { 0x09F4, 1, 1 },
+    { 0x09F5, 2, 1 },
+    { 0x09F6, 3, 1 },
+    { 0x09F7, 4, 1 },
+    { 0x09F9, 16, 1 },
+    { 0x0A66, 0, 1 },
+    { 0x0A67, 1, 1 },
+    { 0x0A68, 2, 1 },
+    { 0x0A69, 3, 1 },
+    { 0x0A6A, 4, 1 },
+    { 0x0A6B, 5, 1 },
+    { 0x0A6C, 6, 1 },
+    { 0x0A6D, 7, 1 },
+    { 0x0A6E, 8, 1 },
+    { 0x0A6F, 9, 1 },
+    { 0x0AE6, 0, 1 },
+    { 0x0AE7, 1, 1 },
+    { 0x0AE8, 2, 1 },
+    { 0x0AE9, 3, 1 },
+    { 0x0AEA, 4, 1 },
+    { 0x0AEB, 5, 1 },
+    { 0x0AEC, 6, 1 },
+    { 0x0AED, 7, 1 },
+    { 0x0AEE, 8, 1 },
+    { 0x0AEF, 9, 1 },
+    { 0x0B66, 0, 1 },
+    { 0x0B67, 1, 1 },
+    { 0x0B68, 2, 1 },
+    { 0x0B69, 3, 1 },
+    { 0x0B6A, 4, 1 },
+    { 0x0B6B, 5, 1 },
+    { 0x0B6C, 6, 1 },
+    { 0x0B6D, 7, 1 },
+    { 0x0B6E, 8, 1 },
+    { 0x0B6F, 9, 1 },
+    { 0x0BE6, 0, 1 },
+    { 0x0BE7, 1, 1 },
+    { 0x0BE8, 2, 1 },
+    { 0x0BE9, 3, 1 },
+    { 0x0BEA, 4, 1 },
+    { 0x0BEB, 5, 1 },
+    { 0x0BEC, 6, 1 },
+    { 0x0BED, 7, 1 },
+    { 0x0BEE, 8, 1 },
+    { 0x0BEF, 9, 1 },
+    { 0x0BF0, 10, 1 },
+    { 0x0BF1, 100, 1 },
+    { 0x0BF2, 1000, 1 },
+    { 0x0C66, 0, 1 },
+    { 0x0C67, 1, 1 },
+    { 0x0C68, 2, 1 },
+    { 0x0C69, 3, 1 },
+    { 0x0C6A, 4, 1 },
+    { 0x0C6B, 5, 1 },
+    { 0x0C6C, 6, 1 },
+    { 0x0C6D, 7, 1 },
+    { 0x0C6E, 8, 1 },
+    { 0x0C6F, 9, 1 },
+    { 0x0CE6, 0, 1 },
+    { 0x0CE7, 1, 1 },
+    { 0x0CE8, 2, 1 },
+    { 0x0CE9, 3, 1 },
+    { 0x0CEA, 4, 1 },
+    { 0x0CEB, 5, 1 },
+    { 0x0CEC, 6, 1 },
+    { 0x0CED, 7, 1 },
+    { 0x0CEE, 8, 1 },
+    { 0x0CEF, 9, 1 },
+    { 0x0D66, 0, 1 },
+    { 0x0D67, 1, 1 },
+    { 0x0D68, 2, 1 },
+    { 0x0D69, 3, 1 },
+    { 0x0D6A, 4, 1 },
+    { 0x0D6B, 5, 1 },
+    { 0x0D6C, 6, 1 },
+    { 0x0D6D, 7, 1 },
+    { 0x0D6E, 8, 1 },
+    { 0x0D6F, 9, 1 },
+    { 0x0E50, 0, 1 },
+    { 0x0E51, 1, 1 },
+    { 0x0E52, 2, 1 },
+    { 0x0E53, 3, 1 },
+    { 0x0E54, 4, 1 },
+    { 0x0E55, 5, 1 },
+    { 0x0E56, 6, 1 },
+    { 0x0E57, 7, 1 },
+    { 0x0E58, 8, 1 },
+    { 0x0E59, 9, 1 },
+    { 0x0ED0, 0, 1 },
+    { 0x0ED1, 1, 1 },
+    { 0x0ED2, 2, 1 },
+    { 0x0ED3, 3, 1 },
+    { 0x0ED4, 4, 1 },
+    { 0x0ED5, 5, 1 },
+    { 0x0ED6, 6, 1 },
+    { 0x0ED7, 7, 1 },
+    { 0x0ED8, 8, 1 },
+    { 0x0ED9, 9, 1 },
+    { 0x0F20, 0, 1 },
+    { 0x0F21, 1, 1 },
+    { 0x0F22, 2, 1 },
+    { 0x0F23, 3, 1 },
+    { 0x0F24, 4, 1 },
+    { 0x0F25, 5, 1 },
+    { 0x0F26, 6, 1 },
+    { 0x0F27, 7, 1 },
+    { 0x0F28, 8, 1 },
+    { 0x0F29, 9, 1 },
+    { 0x0F2A, 1, 2 },
+    { 0x0F2B, 3, 2 },
+    { 0x0F2C, 5, 2 },
+    { 0x0F2D, 7, 2 },
+    { 0x0F2E, 9, 2 },
+    { 0x0F2F, 11, 2 },
+    { 0x0F30, 13, 2 },
+    { 0x0F31, 15, 2 },
+    { 0x0F32, 17, 2 },
+    { 0x0F33, -1, 2 },
+    { 0x1040, 0, 1 },
+    { 0x1041, 1, 1 },
+    { 0x1042, 2, 1 },
+    { 0x1043, 3, 1 },
+    { 0x1044, 4, 1 },
+    { 0x1045, 5, 1 },
+    { 0x1046, 6, 1 },
+    { 0x1047, 7, 1 },
+    { 0x1048, 8, 1 },
+    { 0x1049, 9, 1 },
+    { 0x1369, 1, 1 },
+    { 0x136A, 2, 1 },
+    { 0x136B, 3, 1 },
+    { 0x136C, 4, 1 },
+    { 0x136D, 5, 1 },
+    { 0x136E, 6, 1 },
+    { 0x136F, 7, 1 },
+    { 0x1370, 8, 1 },
+    { 0x1371, 9, 1 },
+    { 0x1372, 10, 1 },
+    { 0x1373, 20, 1 },
+    { 0x1374, 30, 1 },
+    { 0x1375, 40, 1 },
+    { 0x1376, 50, 1 },
+    { 0x1377, 60, 1 },
+    { 0x1378, 70, 1 },
+    { 0x1379, 80, 1 },
+    { 0x137A, 90, 1 },
+    { 0x137B, 100, 1 },
+    { 0x137C, 10000, 1 },
+    { 0x16EE, 17, 1 },
+    { 0x16EF, 18, 1 },
+    { 0x16F0, 19, 1 },
+    { 0x17E0, 0, 1 },
+    { 0x17E1, 1, 1 },
+    { 0x17E2, 2, 1 },
+    { 0x17E3, 3, 1 },
+    { 0x17E4, 4, 1 },
+    { 0x17E5, 5, 1 },
+    { 0x17E6, 6, 1 },
+    { 0x17E7, 7, 1 },
+    { 0x17E8, 8, 1 },
+    { 0x17E9, 9, 1 },
+    { 0x17F0, 0, 1 },
+    { 0x17F1, 1, 1 },
+    { 0x17F2, 2, 1 },
+    { 0x17F3, 3, 1 },
+    { 0x17F4, 4, 1 },
+    { 0x17F5, 5, 1 },
+    { 0x17F6, 6, 1 },
+    { 0x17F7, 7, 1 },
+    { 0x17F8, 8, 1 },
+    { 0x17F9, 9, 1 },
+    { 0x1810, 0, 1 },
+    { 0x1811, 1, 1 },
+    { 0x1812, 2, 1 },
+    { 0x1813, 3, 1 },
+    { 0x1814, 4, 1 },
+    { 0x1815, 5, 1 },
+    { 0x1816, 6, 1 },
+    { 0x1817, 7, 1 },
+    { 0x1818, 8, 1 },
+    { 0x1819, 9, 1 },
+    { 0x1946, 0, 1 },
+    { 0x1947, 1, 1 },
+    { 0x1948, 2, 1 },
+    { 0x1949, 3, 1 },
+    { 0x194A, 4, 1 },
+    { 0x194B, 5, 1 },
+    { 0x194C, 6, 1 },
+    { 0x194D, 7, 1 },
+    { 0x194E, 8, 1 },
+    { 0x194F, 9, 1 },
+    { 0x19D0, 0, 1 },
+    { 0x19D1, 1, 1 },
+    { 0x19D2, 2, 1 },
+    { 0x19D3, 3, 1 },
+    { 0x19D4, 4, 1 },
+    { 0x19D5, 5, 1 },
+    { 0x19D6, 6, 1 },
+    { 0x19D7, 7, 1 },
+    { 0x19D8, 8, 1 },
+    { 0x19D9, 9, 1 },
+    { 0x1B50, 0, 1 },
+    { 0x1B51, 1, 1 },
+    { 0x1B52, 2, 1 },
+    { 0x1B53, 3, 1 },
+    { 0x1B54, 4, 1 },
+    { 0x1B55, 5, 1 },
+    { 0x1B56, 6, 1 },
+    { 0x1B57, 7, 1 },
+    { 0x1B58, 8, 1 },
+    { 0x1B59, 9, 1 },
+    { 0x2070, 0, 1 },
+    { 0x2074, 4, 1 },
+    { 0x2075, 5, 1 },
+    { 0x2076, 6, 1 },
+    { 0x2077, 7, 1 },
+    { 0x2078, 8, 1 },
+    { 0x2079, 9, 1 },
+    { 0x2080, 0, 1 },
+    { 0x2081, 1, 1 },
+    { 0x2082, 2, 1 },
+    { 0x2083, 3, 1 },
+    { 0x2084, 4, 1 },
+    { 0x2085, 5, 1 },
+    { 0x2086, 6, 1 },
+    { 0x2087, 7, 1 },
+    { 0x2088, 8, 1 },
+    { 0x2089, 9, 1 },
+    { 0x2153, 1, 3 },
+    { 0x2154, 2, 3 },
+    { 0x2155, 1, 5 },
+    { 0x2156, 2, 5 },
+    { 0x2157, 3, 5 },
+    { 0x2158, 4, 5 },
+    { 0x2159, 1, 6 },
+    { 0x215A, 5, 6 },
+    { 0x215B, 1, 8 },
+    { 0x215C, 3, 8 },
+    { 0x215D, 5, 8 },
+    { 0x215E, 7, 8 },
+    { 0x215F, 1, 1 },
+    { 0x2160, 1, 1 },
+    { 0x2161, 2, 1 },
+    { 0x2162, 3, 1 },
+    { 0x2163, 4, 1 },
+    { 0x2164, 5, 1 },
+    { 0x2165, 6, 1 },
+    { 0x2166, 7, 1 },
+    { 0x2167, 8, 1 },
+    { 0x2168, 9, 1 },
+    { 0x2169, 10, 1 },
+    { 0x216A, 11, 1 },
+    { 0x216B, 12, 1 },
+    { 0x216C, 50, 1 },
+    { 0x216D, 100, 1 },
+    { 0x216E, 500, 1 },
+    { 0x216F, 1000, 1 },
+    { 0x2170, 1, 1 },
+    { 0x2171, 2, 1 },
+    { 0x2172, 3, 1 },
+    { 0x2173, 4, 1 },
+    { 0x2174, 5, 1 },
+    { 0x2175, 6, 1 },
+    { 0x2176, 7, 1 },
+    { 0x2177, 8, 1 },
+    { 0x2178, 9, 1 },
+    { 0x2179, 10, 1 },
+    { 0x217A, 11, 1 },
+    { 0x217B, 12, 1 },
+    { 0x217C, 50, 1 },
+    { 0x217D, 100, 1 },
+    { 0x217E, 500, 1 },
+    { 0x217F, 1000, 1 },
+    { 0x2180, 1000, 1 },
+    { 0x2181, 5000, 1 },
+    { 0x2182, 10000, 1 },
+    { 0x2460, 1, 1 },
+    { 0x2461, 2, 1 },
+    { 0x2462, 3, 1 },
+    { 0x2463, 4, 1 },
+    { 0x2464, 5, 1 },
+    { 0x2465, 6, 1 },
+    { 0x2466, 7, 1 },
+    { 0x2467, 8, 1 },
+    { 0x2468, 9, 1 },
+    { 0x2469, 10, 1 },
+    { 0x246A, 11, 1 },
+    { 0x246B, 12, 1 },
+    { 0x246C, 13, 1 },
+    { 0x246D, 14, 1 },
+    { 0x246E, 15, 1 },
+    { 0x246F, 16, 1 },
+    { 0x2470, 17, 1 },
+    { 0x2471, 18, 1 },
+    { 0x2472, 19, 1 },
+    { 0x2473, 20, 1 },
+    { 0x2474, 1, 1 },
+    { 0x2475, 2, 1 },
+    { 0x2476, 3, 1 },
+    { 0x2477, 4, 1 },
+    { 0x2478, 5, 1 },
+    { 0x2479, 6, 1 },
+    { 0x247A, 7, 1 },
+    { 0x247B, 8, 1 },
+    { 0x247C, 9, 1 },
+    { 0x247D, 10, 1 },
+    { 0x247E, 11, 1 },
+    { 0x247F, 12, 1 },
+    { 0x2480, 13, 1 },
+    { 0x2481, 14, 1 },
+    { 0x2482, 15, 1 },
+    { 0x2483, 16, 1 },
+    { 0x2484, 17, 1 },
+    { 0x2485, 18, 1 },
+    { 0x2486, 19, 1 },
+    { 0x2487, 20, 1 },
+    { 0x2488, 1, 1 },
+    { 0x2489, 2, 1 },
+    { 0x248A, 3, 1 },
+    { 0x248B, 4, 1 },
+    { 0x248C, 5, 1 },
+    { 0x248D, 6, 1 },
+    { 0x248E, 7, 1 },
+    { 0x248F, 8, 1 },
+    { 0x2490, 9, 1 },
+    { 0x2491, 10, 1 },
+    { 0x2492, 11, 1 },
+    { 0x2493, 12, 1 },
+    { 0x2494, 13, 1 },
+    { 0x2495, 14, 1 },
+    { 0x2496, 15, 1 },
+    { 0x2497, 16, 1 },
+    { 0x2498, 17, 1 },
+    { 0x2499, 18, 1 },
+    { 0x249A, 19, 1 },
+    { 0x249B, 20, 1 },
+    { 0x24EA, 0, 1 },
+    { 0x24EB, 11, 1 },
+    { 0x24EC, 12, 1 },
+    { 0x24ED, 13, 1 },
+    { 0x24EE, 14, 1 },
+    { 0x24EF, 15, 1 },
+    { 0x24F0, 16, 1 },
+    { 0x24F1, 17, 1 },
+    { 0x24F2, 18, 1 },
+    { 0x24F3, 19, 1 },
+    { 0x24F4, 20, 1 },
+    { 0x24F5, 1, 1 },
+    { 0x24F6, 2, 1 },
+    { 0x24F7, 3, 1 },
+    { 0x24F8, 4, 1 },
+    { 0x24F9, 5, 1 },
+    { 0x24FA, 6, 1 },
+    { 0x24FB, 7, 1 },
+    { 0x24FC, 8, 1 },
+    { 0x24FD, 9, 1 },
+    { 0x24FE, 10, 1 },
+    { 0x24FF, 0, 1 },
+    { 0x2776, 1, 1 },
+    { 0x2777, 2, 1 },
+    { 0x2778, 3, 1 },
+    { 0x2779, 4, 1 },
+    { 0x277A, 5, 1 },
+    { 0x277B, 6, 1 },
+    { 0x277C, 7, 1 },
+    { 0x277D, 8, 1 },
+    { 0x277E, 9, 1 },
+    { 0x277F, 10, 1 },
+    { 0x2780, 1, 1 },
+    { 0x2781, 2, 1 },
+    { 0x2782, 3, 1 },
+    { 0x2783, 4, 1 },
+    { 0x2784, 5, 1 },
+    { 0x2785, 6, 1 },
+    { 0x2786, 7, 1 },
+    { 0x2787, 8, 1 },
+    { 0x2788, 9, 1 },
+    { 0x2789, 10, 1 },
+    { 0x278A, 1, 1 },
+    { 0x278B, 2, 1 },
+    { 0x278C, 3, 1 },
+    { 0x278D, 4, 1 },
+    { 0x278E, 5, 1 },
+    { 0x278F, 6, 1 },
+    { 0x2790, 7, 1 },
+    { 0x2791, 8, 1 },
+    { 0x2792, 9, 1 },
+    { 0x2793, 10, 1 },
+    { 0x2CFD, 1, 2 },
+    { 0x3007, 0, 1 },
+    { 0x3021, 1, 1 },
+    { 0x3022, 2, 1 },
+    { 0x3023, 3, 1 },
+    { 0x3024, 4, 1 },
+    { 0x3025, 5, 1 },
+    { 0x3026, 6, 1 },
+    { 0x3027, 7, 1 },
+    { 0x3028, 8, 1 },
+    { 0x3029, 9, 1 },
+    { 0x3038, 10, 1 },
+    { 0x3039, 20, 1 },
+    { 0x303A, 30, 1 },
+    { 0x3192, 1, 1 },
+    { 0x3193, 2, 1 },
+    { 0x3194, 3, 1 },
+    { 0x3195, 4, 1 },
+    { 0x3220, 1, 1 },
+    { 0x3221, 2, 1 },
+    { 0x3222, 3, 1 },
+    { 0x3223, 4, 1 },
+    { 0x3224, 5, 1 },
+    { 0x3225, 6, 1 },
+    { 0x3226, 7, 1 },
+    { 0x3227, 8, 1 },
+    { 0x3228, 9, 1 },
+    { 0x3229, 10, 1 },
+    { 0x3251, 21, 1 },
+    { 0x3252, 22, 1 },
+    { 0x3253, 23, 1 },
+    { 0x3254, 24, 1 },
+    { 0x3255, 25, 1 },
+    { 0x3256, 26, 1 },
+    { 0x3257, 27, 1 },
+    { 0x3258, 28, 1 },
+    { 0x3259, 29, 1 },
+    { 0x325A, 30, 1 },
+    { 0x325B, 31, 1 },
+    { 0x325C, 32, 1 },
+    { 0x325D, 33, 1 },
+    { 0x325E, 34, 1 },
+    { 0x325F, 35, 1 },
+    { 0x3280, 1, 1 },
+    { 0x3281, 2, 1 },
+    { 0x3282, 3, 1 },
+    { 0x3283, 4, 1 },
+    { 0x3284, 5, 1 },
+    { 0x3285, 6, 1 },
+    { 0x3286, 7, 1 },
+    { 0x3287, 8, 1 },
+    { 0x3288, 9, 1 },
+    { 0x3289, 10, 1 },
+    { 0x32B1, 36, 1 },
+    { 0x32B2, 37, 1 },
+    { 0x32B3, 38, 1 },
+    { 0x32B4, 39, 1 },
+    { 0x32B5, 40, 1 },
+    { 0x32B6, 41, 1 },
+    { 0x32B7, 42, 1 },
+    { 0x32B8, 43, 1 },
+    { 0x32B9, 44, 1 },
+    { 0x32BA, 45, 1 },
+    { 0x32BB, 46, 1 },
+    { 0x32BC, 47, 1 },
+    { 0x32BD, 48, 1 },
+    { 0x32BE, 49, 1 },
+    { 0x32BF, 50, 1 },
+    { 0xFF10, 0, 1 },
+    { 0xFF11, 1, 1 },
+    { 0xFF12, 2, 1 },
+    { 0xFF13, 3, 1 },
+    { 0xFF14, 4, 1 },
+    { 0xFF15, 5, 1 },
+    { 0xFF16, 6, 1 },
+    { 0xFF17, 7, 1 },
+    { 0xFF18, 8, 1 },
+    { 0xFF19, 9, 1 },
+    { 0x10107, 1, 1 },
+    { 0x10108, 2, 1 },
+    { 0x10109, 3, 1 },
+    { 0x1010A, 4, 1 },
+    { 0x1010B, 5, 1 },
+    { 0x1010C, 6, 1 },
+    { 0x1010D, 7, 1 },
+    { 0x1010E, 8, 1 },
+    { 0x1010F, 9, 1 },
+    { 0x10110, 10, 1 },
+    { 0x10111, 20, 1 },
+    { 0x10112, 30, 1 },
+    { 0x10113, 40, 1 },
+    { 0x10114, 50, 1 },
+    { 0x10115, 60, 1 },
+    { 0x10116, 70, 1 },
+    { 0x10117, 80, 1 },
+    { 0x10118, 90, 1 },
+    { 0x10119, 100, 1 },
+    { 0x1011A, 200, 1 },
+    { 0x1011B, 300, 1 },
+    { 0x1011C, 400, 1 },
+    { 0x1011D, 500, 1 },
+    { 0x1011E, 600, 1 },
+    { 0x1011F, 700, 1 },
+    { 0x10120, 800, 1 },
+    { 0x10121, 900, 1 },
+    { 0x10122, 1000, 1 },
+    { 0x10123, 2000, 1 },
+    { 0x10124, 3000, 1 },
+    { 0x10125, 4000, 1 },
+    { 0x10126, 5000, 1 },
+    { 0x10127, 6000, 1 },
+    { 0x10128, 7000, 1 },
+    { 0x10129, 8000, 1 },
+    { 0x1012A, 9000, 1 },
+    { 0x1012B, 10000, 1 },
+    { 0x1012C, 20000, 1 },
+    { 0x1012D, 30000, 1 },
+    { 0x1012E, 40000, 1 },
+    { 0x1012F, 50000, 1 },
+    { 0x10130, 60000, 1 },
+    { 0x10131, 70000, 1 },
+    { 0x10132, 80000, 1 },
+    { 0x10133, 90000, 1 },
+    { 0x10140, 1, 4 },
+    { 0x10141, 1, 2 },
+    { 0x10142, 1, 1 },
+    { 0x10143, 5, 1 },
+    { 0x10144, 50, 1 },
+    { 0x10145, 500, 1 },
+    { 0x10146, 5000, 1 },
+    { 0x10147, 50000, 1 },
+    { 0x10148, 5, 1 },
+    { 0x10149, 10, 1 },
+    { 0x1014A, 50, 1 },
+    { 0x1014B, 100, 1 },
+    { 0x1014C, 500, 1 },
+    { 0x1014D, 1000, 1 },
+    { 0x1014E, 5000, 1 },
+    { 0x1014F, 5, 1 },
+    { 0x10150, 10, 1 },
+    { 0x10151, 50, 1 },
+    { 0x10152, 100, 1 },
+    { 0x10153, 500, 1 },
+    { 0x10154, 1000, 1 },
+    { 0x10155, 10000, 1 },
+    { 0x10156, 50000, 1 },
+    { 0x10157, 10, 1 },
+    { 0x10158, 1, 1 },
+    { 0x10159, 1, 1 },
+    { 0x1015A, 1, 1 },
+    { 0x1015B, 2, 1 },
+    { 0x1015C, 2, 1 },
+    { 0x1015D, 2, 1 },
+    { 0x1015E, 2, 1 },
+    { 0x1015F, 5, 1 },
+    { 0x10160, 10, 1 },
+    { 0x10161, 10, 1 },
+    { 0x10162, 10, 1 },
+    { 0x10163, 10, 1 },
+    { 0x10164, 10, 1 },
+    { 0x10165, 30, 1 },
+    { 0x10166, 50, 1 },
+    { 0x10167, 50, 1 },
+    { 0x10168, 50, 1 },
+    { 0x10169, 50, 1 },
+    { 0x1016A, 100, 1 },
+    { 0x1016B, 300, 1 },
+    { 0x1016C, 500, 1 },
+    { 0x1016D, 500, 1 },
+    { 0x1016E, 500, 1 },
+    { 0x1016F, 500, 1 },
+    { 0x10170, 500, 1 },
+    { 0x10171, 1000, 1 },
+    { 0x10172, 5000, 1 },
+    { 0x10173, 5, 1 },
+    { 0x10174, 50, 1 },
+    { 0x10175, 1, 2 },
+    { 0x10176, 1, 2 },
+    { 0x10177, 2, 3 },
+    { 0x10178, 3, 4 },
+    { 0x1018A, 0, 1 },
+    { 0x10320, 1, 1 },
+    { 0x10321, 5, 1 },
+    { 0x10322, 10, 1 },
+    { 0x10323, 50, 1 },
+    { 0x10341, 90, 1 },
+    { 0x1034A, 900, 1 },
+    { 0x103D1, 1, 1 },
+    { 0x103D2, 2, 1 },
+    { 0x103D3, 10, 1 },
+    { 0x103D4, 20, 1 },
+    { 0x103D5, 100, 1 },
+    { 0x104A0, 0, 1 },
+    { 0x104A1, 1, 1 },
+    { 0x104A2, 2, 1 },
+    { 0x104A3, 3, 1 },
+    { 0x104A4, 4, 1 },
+    { 0x104A5, 5, 1 },
+    { 0x104A6, 6, 1 },
+    { 0x104A7, 7, 1 },
+    { 0x104A8, 8, 1 },
+    { 0x104A9, 9, 1 },
+    { 0x10916, 1, 1 },
+    { 0x10917, 10, 1 },
+    { 0x10918, 20, 1 },
+    { 0x10919, 100, 1 },
+    { 0x10A40, 1, 1 },
+    { 0x10A41, 2, 1 },
+    { 0x10A42, 3, 1 },
+    { 0x10A43, 4, 1 },
+    { 0x10A44, 10, 1 },
+    { 0x10A45, 20, 1 },
+    { 0x10A46, 100, 1 },
+    { 0x10A47, 1000, 1 },
+    { 0x12400, 2, 1 },
+    { 0x12401, 3, 1 },
+    { 0x12402, 4, 1 },
+    { 0x12403, 5, 1 },
+    { 0x12404, 6, 1 },
+    { 0x12405, 7, 1 },
+    { 0x12406, 8, 1 },
+    { 0x12407, 9, 1 },
+    { 0x12408, 3, 1 },
+    { 0x12409, 4, 1 },
+    { 0x1240A, 5, 1 },
+    { 0x1240B, 6, 1 },
+    { 0x1240C, 7, 1 },
+    { 0x1240D, 8, 1 },
+    { 0x1240E, 9, 1 },
+    { 0x1240F, 4, 1 },
+    { 0x12410, 5, 1 },
+    { 0x12411, 6, 1 },
+    { 0x12412, 7, 1 },
+    { 0x12413, 8, 1 },
+    { 0x12414, 9, 1 },
+    { 0x12415, 1, 1 },
+    { 0x12416, 2, 1 },
+    { 0x12417, 3, 1 },
+    { 0x12418, 4, 1 },
+    { 0x12419, 5, 1 },
+    { 0x1241A, 6, 1 },
+    { 0x1241B, 7, 1 },
+    { 0x1241C, 8, 1 },
+    { 0x1241D, 9, 1 },
+    { 0x1241E, 1, 1 },
+    { 0x1241F, 2, 1 },
+    { 0x12420, 3, 1 },
+    { 0x12421, 4, 1 },
+    { 0x12422, 5, 1 },
+    { 0x12423, 2, 1 },
+    { 0x12424, 3, 1 },
+    { 0x12425, 3, 1 },
+    { 0x12426, 4, 1 },
+    { 0x12427, 5, 1 },
+    { 0x12428, 6, 1 },
+    { 0x12429, 7, 1 },
+    { 0x1242A, 8, 1 },
+    { 0x1242B, 9, 1 },
+    { 0x1242C, 1, 1 },
+    { 0x1242D, 2, 1 },
+    { 0x1242E, 3, 1 },
+    { 0x1242F, 3, 1 },
+    { 0x12430, 4, 1 },
+    { 0x12431, 5, 1 },
+    { 0x12434, 1, 1 },
+    { 0x12435, 2, 1 },
+    { 0x12436, 3, 1 },
+    { 0x12437, 3, 1 },
+    { 0x12438, 4, 1 },
+    { 0x12439, 5, 1 },
+    { 0x1243A, 3, 1 },
+    { 0x1243B, 3, 1 },
+    { 0x1243C, 4, 1 },
+    { 0x1243D, 4, 1 },
+    { 0x1243E, 4, 1 },
+    { 0x1243F, 4, 1 },
+    { 0x12440, 6, 1 },
+    { 0x12441, 7, 1 },
+    { 0x12442, 7, 1 },
+    { 0x12443, 7, 1 },
+    { 0x12444, 8, 1 },
+    { 0x12445, 8, 1 },
+    { 0x12446, 9, 1 },
+    { 0x12447, 9, 1 },
+    { 0x12448, 9, 1 },
+    { 0x12449, 9, 1 },
+    { 0x1244A, 2, 1 },
+    { 0x1244B, 3, 1 },
+    { 0x1244C, 4, 1 },
+    { 0x1244D, 5, 1 },
+    { 0x1244E, 6, 1 },
+    { 0x1244F, 1, 1 },
+    { 0x12450, 2, 1 },
+    { 0x12451, 3, 1 },
+    { 0x12452, 4, 1 },
+    { 0x12453, 4, 1 },
+    { 0x12454, 5, 1 },
+    { 0x12455, 5, 1 },
+    { 0x12458, 1, 1 },
+    { 0x12459, 2, 1 },
+    { 0x1245A, 1, 3 },
+    { 0x1245B, 2, 3 },
+    { 0x1245C, 5, 6 },
+    { 0x1245D, 1, 3 },
+    { 0x1245E, 2, 3 },
+    { 0x1245F, 1, 8 },
+    { 0x12460, 1, 4 },
+    { 0x12461, 1, 6 },
+    { 0x12462, 1, 4 },
+    { 0x1D360, 1, 1 },
+    { 0x1D361, 2, 1 },
+    { 0x1D362, 3, 1 },
+    { 0x1D363, 4, 1 },
+    { 0x1D364, 5, 1 },
+    { 0x1D365, 6, 1 },
+    { 0x1D366, 7, 1 },
+    { 0x1D367, 8, 1 },
+    { 0x1D368, 9, 1 },
+    { 0x1D369, 10, 1 },
+    { 0x1D36A, 20, 1 },
+    { 0x1D36B, 30, 1 },
+    { 0x1D36C, 40, 1 },
+    { 0x1D36D, 50, 1 },
+    { 0x1D36E, 60, 1 },
+    { 0x1D36F, 70, 1 },
+    { 0x1D370, 80, 1 },
+    { 0x1D371, 90, 1 },
+    { 0x1D7CE, 0, 1 },
+    { 0x1D7CF, 1, 1 },
+    { 0x1D7D0, 2, 1 },
+    { 0x1D7D1, 3, 1 },
+    { 0x1D7D2, 4, 1 },
+    { 0x1D7D3, 5, 1 },
+    { 0x1D7D4, 6, 1 },
+    { 0x1D7D5, 7, 1 },
+    { 0x1D7D6, 8, 1 },
+    { 0x1D7D7, 9, 1 },
+    { 0x1D7D8, 0, 1 },
+    { 0x1D7D9, 1, 1 },
+    { 0x1D7DA, 2, 1 },
+    { 0x1D7DB, 3, 1 },
+    { 0x1D7DC, 4, 1 },
+    { 0x1D7DD, 5, 1 },
+    { 0x1D7DE, 6, 1 },
+    { 0x1D7DF, 7, 1 },
+    { 0x1D7E0, 8, 1 },
+    { 0x1D7E1, 9, 1 },
+    { 0x1D7E2, 0, 1 },
+    { 0x1D7E3, 1, 1 },
+    { 0x1D7E4, 2, 1 },
+    { 0x1D7E5, 3, 1 },
+    { 0x1D7E6, 4, 1 },
+    { 0x1D7E7, 5, 1 },
+    { 0x1D7E8, 6, 1 },
+    { 0x1D7E9, 7, 1 },
+    { 0x1D7EA, 8, 1 },
+    { 0x1D7EB, 9, 1 },
+    { 0x1D7EC, 0, 1 },
+    { 0x1D7ED, 1, 1 },
+    { 0x1D7EE, 2, 1 },
+    { 0x1D7EF, 3, 1 },
+    { 0x1D7F0, 4, 1 },
+    { 0x1D7F1, 5, 1 },
+    { 0x1D7F2, 6, 1 },
+    { 0x1D7F3, 7, 1 },
+    { 0x1D7F4, 8, 1 },
+    { 0x1D7F5, 9, 1 },
+    { 0x1D7F6, 0, 1 },
+    { 0x1D7F7, 1, 1 },
+    { 0x1D7F8, 2, 1 },
+    { 0x1D7F9, 3, 1 },
+    { 0x1D7FA, 4, 1 },
+    { 0x1D7FB, 5, 1 },
+    { 0x1D7FC, 6, 1 },
+    { 0x1D7FD, 7, 1 },
+    { 0x1D7FE, 8, 1 },
+    { 0x1D7FF, 9, 1 }
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_alphabetic.c
@@ -0,0 +1,439 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0041, 0x005A },
+    { 0x0061, 0x007A },
+    { 0x00AA, 0x00AA },
+    { 0x00B5, 0x00B5 },
+    { 0x00BA, 0x00BA },
+    { 0x00C0, 0x00D6 },
+    { 0x00D8, 0x00F6 },
+    { 0x00F8, 0x02C1 },
+    { 0x02C6, 0x02D1 },
+    { 0x02E0, 0x02E4 },
+    { 0x02EE, 0x02EE },
+    { 0x0345, 0x0345 },
+    { 0x037A, 0x037D },
+    { 0x0386, 0x0386 },
+    { 0x0388, 0x038A },
+    { 0x038C, 0x038C },
+    { 0x038E, 0x03A1 },
+    { 0x03A3, 0x03CE },
+    { 0x03D0, 0x03F5 },
+    { 0x03F7, 0x0481 },
+    { 0x048A, 0x0513 },
+    { 0x0531, 0x0556 },
+    { 0x0559, 0x0559 },
+    { 0x0561, 0x0587 },
+    { 0x05B0, 0x05BD },
+    { 0x05BF, 0x05BF },
+    { 0x05C1, 0x05C2 },
+    { 0x05C4, 0x05C5 },
+    { 0x05C7, 0x05C7 },
+    { 0x05D0, 0x05EA },
+    { 0x05F0, 0x05F2 },
+    { 0x0610, 0x0615 },
+    { 0x0621, 0x063A },
+    { 0x0640, 0x0657 },
+    { 0x0659, 0x065E },
+    { 0x066E, 0x06D3 },
+    { 0x06D5, 0x06DC },
+    { 0x06E1, 0x06E8 },
+    { 0x06ED, 0x06EF },
+    { 0x06FA, 0x06FC },
+    { 0x06FF, 0x06FF },
+    { 0x0710, 0x073F },
+    { 0x074D, 0x076D },
+    { 0x0780, 0x07B1 },
+    { 0x07CA, 0x07EA },
+    { 0x07F4, 0x07F5 },
+    { 0x07FA, 0x07FA },
+    { 0x0901, 0x0939 },
+    { 0x093D, 0x094C },
+    { 0x0950, 0x0950 },
+    { 0x0958, 0x0963 },
+    { 0x097B, 0x097F },
+    { 0x0981, 0x0983 },
+    { 0x0985, 0x098C },
+    { 0x098F, 0x0990 },
+    { 0x0993, 0x09A8 },
+    { 0x09AA, 0x09B0 },
+    { 0x09B2, 0x09B2 },
+    { 0x09B6, 0x09B9 },
+    { 0x09BD, 0x09C4 },
+    { 0x09C7, 0x09C8 },
+    { 0x09CB, 0x09CC },
+    { 0x09CE, 0x09CE },
+    { 0x09D7, 0x09D7 },
+    { 0x09DC, 0x09DD },
+    { 0x09DF, 0x09E3 },
+    { 0x09F0, 0x09F1 },
+    { 0x0A01, 0x0A03 },
+    { 0x0A05, 0x0A0A },
+    { 0x0A0F, 0x0A10 },
+    { 0x0A13, 0x0A28 },
+    { 0x0A2A, 0x0A30 },
+    { 0x0A32, 0x0A33 },
+    { 0x0A35, 0x0A36 },
+    { 0x0A38, 0x0A39 },
+    { 0x0A3E, 0x0A42 },
+    { 0x0A47, 0x0A48 },
+    { 0x0A4B, 0x0A4C },
+    { 0x0A59, 0x0A5C },
+    { 0x0A5E, 0x0A5E },
+    { 0x0A70, 0x0A74 },
+    { 0x0A81, 0x0A83 },
+    { 0x0A85, 0x0A8D },
+    { 0x0A8F, 0x0A91 },
+    { 0x0A93, 0x0AA8 },
+    { 0x0AAA, 0x0AB0 },
+    { 0x0AB2, 0x0AB3 },
+    { 0x0AB5, 0x0AB9 },
+    { 0x0ABD, 0x0AC5 },
+    { 0x0AC7, 0x0AC9 },
+    { 0x0ACB, 0x0ACC },
+    { 0x0AD0, 0x0AD0 },
+    { 0x0AE0, 0x0AE3 },
+    { 0x0B01, 0x0B03 },
+    { 0x0B05, 0x0B0C },
+    { 0x0B0F, 0x0B10 },
+    { 0x0B13, 0x0B28 },
+    { 0x0B2A, 0x0B30 },
+    { 0x0B32, 0x0B33 },
+    { 0x0B35, 0x0B39 },
+    { 0x0B3D, 0x0B43 },
+    { 0x0B47, 0x0B48 },
+    { 0x0B4B, 0x0B4C },
+    { 0x0B56, 0x0B57 },
+    { 0x0B5C, 0x0B5D },
+    { 0x0B5F, 0x0B61 },
+    { 0x0B71, 0x0B71 },
+    { 0x0B82, 0x0B83 },
+    { 0x0B85, 0x0B8A },
+    { 0x0B8E, 0x0B90 },
+    { 0x0B92, 0x0B95 },
+    { 0x0B99, 0x0B9A },
+    { 0x0B9C, 0x0B9C },
+    { 0x0B9E, 0x0B9F },
+    { 0x0BA3, 0x0BA4 },
+    { 0x0BA8, 0x0BAA },
+    { 0x0BAE, 0x0BB9 },
+    { 0x0BBE, 0x0BC2 },
+    { 0x0BC6, 0x0BC8 },
+    { 0x0BCA, 0x0BCC },
+    { 0x0BD7, 0x0BD7 },
+    { 0x0C01, 0x0C03 },
+    { 0x0C05, 0x0C0C },
+    { 0x0C0E, 0x0C10 },
+    { 0x0C12, 0x0C28 },
+    { 0x0C2A, 0x0C33 },
+    { 0x0C35, 0x0C39 },
+    { 0x0C3E, 0x0C44 },
+    { 0x0C46, 0x0C48 },
+    { 0x0C4A, 0x0C4C },
+    { 0x0C55, 0x0C56 },
+    { 0x0C60, 0x0C61 },
+    { 0x0C82, 0x0C83 },
+    { 0x0C85, 0x0C8C },
+    { 0x0C8E, 0x0C90 },
+    { 0x0C92, 0x0CA8 },
+    { 0x0CAA, 0x0CB3 },
+    { 0x0CB5, 0x0CB9 },
+    { 0x0CBD, 0x0CC4 },
+    { 0x0CC6, 0x0CC8 },
+    { 0x0CCA, 0x0CCC },
+    { 0x0CD5, 0x0CD6 },
+    { 0x0CDE, 0x0CDE },
+    { 0x0CE0, 0x0CE3 },
+    { 0x0D02, 0x0D03 },
+    { 0x0D05, 0x0D0C },
+    { 0x0D0E, 0x0D10 },
+    { 0x0D12, 0x0D28 },
+    { 0x0D2A, 0x0D39 },
+    { 0x0D3E, 0x0D43 },
+    { 0x0D46, 0x0D48 },
+    { 0x0D4A, 0x0D4C },
+    { 0x0D57, 0x0D57 },
+    { 0x0D60, 0x0D61 },
+    { 0x0D82, 0x0D83 },
+    { 0x0D85, 0x0D96 },
+    { 0x0D9A, 0x0DB1 },
+    { 0x0DB3, 0x0DBB },
+    { 0x0DBD, 0x0DBD },
+    { 0x0DC0, 0x0DC6 },
+    { 0x0DCF, 0x0DD4 },
+    { 0x0DD6, 0x0DD6 },
+    { 0x0DD8, 0x0DDF },
+    { 0x0DF2, 0x0DF3 },
+    { 0x0E01, 0x0E3A },
+    { 0x0E40, 0x0E46 },
+    { 0x0E4D, 0x0E4D },
+    { 0x0E81, 0x0E82 },
+    { 0x0E84, 0x0E84 },
+    { 0x0E87, 0x0E88 },
+    { 0x0E8A, 0x0E8A },
+    { 0x0E8D, 0x0E8D },
+    { 0x0E94, 0x0E97 },
+    { 0x0E99, 0x0E9F },
+    { 0x0EA1, 0x0EA3 },
+    { 0x0EA5, 0x0EA5 },
+    { 0x0EA7, 0x0EA7 },
+    { 0x0EAA, 0x0EAB },
+    { 0x0EAD, 0x0EB9 },
+    { 0x0EBB, 0x0EBD },
+    { 0x0EC0, 0x0EC4 },
+    { 0x0EC6, 0x0EC6 },
+    { 0x0ECD, 0x0ECD },
+    { 0x0EDC, 0x0EDD },
+    { 0x0F00, 0x0F00 },
+    { 0x0F40, 0x0F47 },
+    { 0x0F49, 0x0F6A },
+    { 0x0F71, 0x0F81 },
+    { 0x0F88, 0x0F8B },
+    { 0x0F90, 0x0F97 },
+    { 0x0F99, 0x0FBC },
+    { 0x1000, 0x1021 },
+    { 0x1023, 0x1027 },
+    { 0x1029, 0x102A },
+    { 0x102C, 0x1032 },
+    { 0x1036, 0x1036 },
+    { 0x1038, 0x1038 },
+    { 0x1050, 0x1059 },
+    { 0x10A0, 0x10C5 },
+    { 0x10D0, 0x10FA },
+    { 0x10FC, 0x10FC },
+    { 0x1100, 0x1159 },
+    { 0x115F, 0x11A2 },
+    { 0x11A8, 0x11F9 },
+    { 0x1200, 0x1248 },
+    { 0x124A, 0x124D },
+    { 0x1250, 0x1256 },
+    { 0x1258, 0x1258 },
+    { 0x125A, 0x125D },
+    { 0x1260, 0x1288 },
+    { 0x128A, 0x128D },
+    { 0x1290, 0x12B0 },
+    { 0x12B2, 0x12B5 },
+    { 0x12B8, 0x12BE },
+    { 0x12C0, 0x12C0 },
+    { 0x12C2, 0x12C5 },
+    { 0x12C8, 0x12D6 },
+    { 0x12D8, 0x1310 },
+    { 0x1312, 0x1315 },
+    { 0x1318, 0x135A },
+    { 0x135F, 0x135F },
+    { 0x1380, 0x138F },
+    { 0x13A0, 0x13F4 },
+    { 0x1401, 0x166C },
+    { 0x166F, 0x1676 },
+    { 0x1681, 0x169A },
+    { 0x16A0, 0x16EA },
+    { 0x16EE, 0x16F0 },
+    { 0x1700, 0x170C },
+    { 0x170E, 0x1713 },
+    { 0x1720, 0x1733 },
+    { 0x1740, 0x1753 },
+    { 0x1760, 0x176C },
+    { 0x176E, 0x1770 },
+    { 0x1772, 0x1773 },
+    { 0x1780, 0x17B3 },
+    { 0x17B6, 0x17C8 },
+    { 0x17D7, 0x17D7 },
+    { 0x17DC, 0x17DC },
+    { 0x1820, 0x1877 },
+    { 0x1880, 0x18A9 },
+    { 0x1900, 0x191C },
+    { 0x1920, 0x192B },
+    { 0x1930, 0x1938 },
+    { 0x1950, 0x196D },
+    { 0x1970, 0x1974 },
+    { 0x1980, 0x19A9 },
+    { 0x19B0, 0x19C9 },
+    { 0x1A00, 0x1A1B },
+    { 0x1B00, 0x1B33 },
+    { 0x1B35, 0x1B43 },
+    { 0x1B45, 0x1B4B },
+    { 0x1D00, 0x1DBF },
+    { 0x1E00, 0x1E9B },
+    { 0x1EA0, 0x1EF9 },
+    { 0x1F00, 0x1F15 },
+    { 0x1F18, 0x1F1D },
+    { 0x1F20, 0x1F45 },
+    { 0x1F48, 0x1F4D },
+    { 0x1F50, 0x1F57 },
+    { 0x1F59, 0x1F59 },
+    { 0x1F5B, 0x1F5B },
+    { 0x1F5D, 0x1F5D },
+    { 0x1F5F, 0x1F7D },
+    { 0x1F80, 0x1FB4 },
+    { 0x1FB6, 0x1FBC },
+    { 0x1FBE, 0x1FBE },
+    { 0x1FC2, 0x1FC4 },
+    { 0x1FC6, 0x1FCC },
+    { 0x1FD0, 0x1FD3 },
+    { 0x1FD6, 0x1FDB },
+    { 0x1FE0, 0x1FEC },
+    { 0x1FF2, 0x1FF4 },
+    { 0x1FF6, 0x1FFC },
+    { 0x2071, 0x2071 },
+    { 0x207F, 0x207F },
+    { 0x2090, 0x2094 },
+    { 0x2102, 0x2102 },
+    { 0x2107, 0x2107 },
+    { 0x210A, 0x2113 },
+    { 0x2115, 0x2115 },
+    { 0x2119, 0x211D },
+    { 0x2124, 0x2124 },
+    { 0x2126, 0x2126 },
+    { 0x2128, 0x2128 },
+    { 0x212A, 0x212D },
+    { 0x212F, 0x2139 },
+    { 0x213C, 0x213F },
+    { 0x2145, 0x2149 },
+    { 0x214E, 0x214E },
+    { 0x2160, 0x2184 },
+    { 0x24B6, 0x24E9 },
+    { 0x2C00, 0x2C2E },
+    { 0x2C30, 0x2C5E },
+    { 0x2C60, 0x2C6C },
+    { 0x2C74, 0x2C77 },
+    { 0x2C80, 0x2CE4 },
+    { 0x2D00, 0x2D25 },
+    { 0x2D30, 0x2D65 },
+    { 0x2D6F, 0x2D6F },
+    { 0x2D80, 0x2D96 },
+    { 0x2DA0, 0x2DA6 },
+    { 0x2DA8, 0x2DAE },
+    { 0x2DB0, 0x2DB6 },
+    { 0x2DB8, 0x2DBE },
+    { 0x2DC0, 0x2DC6 },
+    { 0x2DC8, 0x2DCE },
+    { 0x2DD0, 0x2DD6 },
+    { 0x2DD8, 0x2DDE },
+    { 0x3005, 0x3007 },
+    { 0x3021, 0x3029 },
+    { 0x3031, 0x3035 },
+    { 0x3038, 0x303C },
+    { 0x3041, 0x3096 },
+    { 0x309D, 0x309F },
+    { 0x30A1, 0x30FA },
+    { 0x30FC, 0x30FF },
+    { 0x3105, 0x312C },
+    { 0x3131, 0x318E },
+    { 0x31A0, 0x31B7 },
+    { 0x31F0, 0x31FF },
+    { 0x3400, 0x4DB5 },
+    { 0x4E00, 0x9FBB },
+    { 0xA000, 0xA48C },
+    { 0xA717, 0xA71A },
+    { 0xA800, 0xA801 },
+    { 0xA803, 0xA805 },
+    { 0xA807, 0xA80A },
+    { 0xA80C, 0xA827 },
+    { 0xA840, 0xA873 },
+    { 0xAC00, 0xD7A3 },
+    { 0xF900, 0xFA2D },
+    { 0xFA30, 0xFA6A },
+    { 0xFA70, 0xFAD9 },
+    { 0xFB00, 0xFB06 },
+    { 0xFB13, 0xFB17 },
+    { 0xFB1D, 0xFB28 },
+    { 0xFB2A, 0xFB36 },
+    { 0xFB38, 0xFB3C },
+    { 0xFB3E, 0xFB3E },
+    { 0xFB40, 0xFB41 },
+    { 0xFB43, 0xFB44 },
+    { 0xFB46, 0xFBB1 },
+    { 0xFBD3, 0xFD3D },
+    { 0xFD50, 0xFD8F },
+    { 0xFD92, 0xFDC7 },
+    { 0xFDF0, 0xFDFB },
+    { 0xFE70, 0xFE74 },
+    { 0xFE76, 0xFEFC },
+    { 0xFF21, 0xFF3A },
+    { 0xFF41, 0xFF5A },
+    { 0xFF66, 0xFFBE },
+    { 0xFFC2, 0xFFC7 },
+    { 0xFFCA, 0xFFCF },
+    { 0xFFD2, 0xFFD7 },
+    { 0xFFDA, 0xFFDC },
+    { 0x10000, 0x1000B },
+    { 0x1000D, 0x10026 },
+    { 0x10028, 0x1003A },
+    { 0x1003C, 0x1003D },
+    { 0x1003F, 0x1004D },
+    { 0x10050, 0x1005D },
+    { 0x10080, 0x100FA },
+    { 0x10140, 0x10174 },
+    { 0x10300, 0x1031E },
+    { 0x10330, 0x1034A },
+    { 0x10380, 0x1039D },
+    { 0x103A0, 0x103C3 },
+    { 0x103C8, 0x103CF },
+    { 0x103D1, 0x103D5 },
+    { 0x10400, 0x1049D },
+    { 0x10800, 0x10805 },
+    { 0x10808, 0x10808 },
+    { 0x1080A, 0x10835 },
+    { 0x10837, 0x10838 },
+    { 0x1083C, 0x1083C },
+    { 0x1083F, 0x1083F },
+    { 0x10900, 0x10915 },
+    { 0x10A00, 0x10A03 },
+    { 0x10A05, 0x10A06 },
+    { 0x10A0C, 0x10A13 },
+    { 0x10A15, 0x10A17 },
+    { 0x10A19, 0x10A33 },
+    { 0x12000, 0x1236E },
+    { 0x12400, 0x12462 },
+    { 0x1D400, 0x1D454 },
+    { 0x1D456, 0x1D49C },
+    { 0x1D49E, 0x1D49F },
+    { 0x1D4A2, 0x1D4A2 },
+    { 0x1D4A5, 0x1D4A6 },
+    { 0x1D4A9, 0x1D4AC },
+    { 0x1D4AE, 0x1D4B9 },
+    { 0x1D4BB, 0x1D4BB },
+    { 0x1D4BD, 0x1D4C3 },
+    { 0x1D4C5, 0x1D505 },
+    { 0x1D507, 0x1D50A },
+    { 0x1D50D, 0x1D514 },
+    { 0x1D516, 0x1D51C },
+    { 0x1D51E, 0x1D539 },
+    { 0x1D53B, 0x1D53E },
+    { 0x1D540, 0x1D544 },
+    { 0x1D546, 0x1D546 },
+    { 0x1D54A, 0x1D550 },
+    { 0x1D552, 0x1D6A5 },
+    { 0x1D6A8, 0x1D6C0 },
+    { 0x1D6C2, 0x1D6DA },
+    { 0x1D6DC, 0x1D6FA },
+    { 0x1D6FC, 0x1D714 },
+    { 0x1D716, 0x1D734 },
+    { 0x1D736, 0x1D74E },
+    { 0x1D750, 0x1D76E },
+    { 0x1D770, 0x1D788 },
+    { 0x1D78A, 0x1D7A8 },
+    { 0x1D7AA, 0x1D7C2 },
+    { 0x1D7C4, 0x1D7CB },
+    { 0x20000, 0x2A6D6 },
+    { 0x2F800, 0x2FA1D }
+
+#define PREDICATE(c) uc_is_property_alphabetic (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_ascii_hex_digit.c
@@ -0,0 +1,25 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0030, 0x0039 },
+    { 0x0041, 0x0046 },
+    { 0x0061, 0x0066 }
+
+#define PREDICATE(c) uc_is_property_ascii_hex_digit (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_bidi_arabic_digit.c
@@ -0,0 +1,24 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0660, 0x0669 },
+    { 0x066B, 0x066C }
+
+#define PREDICATE(c) uc_is_property_bidi_arabic_digit (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_bidi_arabic_right_to_left.c
@@ -0,0 +1,46 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0600, 0x060B },
+    { 0x060D, 0x060D },
+    { 0x0616, 0x064A },
+    { 0x065F, 0x065F },
+    { 0x066D, 0x066F },
+    { 0x0671, 0x06D5 },
+    { 0x06DD, 0x06DD },
+    { 0x06E5, 0x06E6 },
+    { 0x06EE, 0x06EF },
+    { 0x06FA, 0x070E },
+    { 0x0710, 0x0710 },
+    { 0x0712, 0x072F },
+    { 0x074B, 0x07A5 },
+    { 0x07B1, 0x07BF },
+    { 0x2064, 0x2069 },
+    { 0xFB50, 0xFD3D },
+    { 0xFD40, 0xFDCF },
+    { 0xFDF0, 0xFDFC },
+    { 0xFDFE, 0xFDFF },
+    { 0xFE1A, 0xFE1F },
+    { 0xFE24, 0xFE2F },
+    { 0xFE53, 0xFE53 },
+    { 0xFE67, 0xFE67 },
+    { 0xFE6C, 0xFEFE }
+
+#define PREDICATE(c) uc_is_property_bidi_arabic_right_to_left (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_bidi_block_separator.c
@@ -0,0 +1,27 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x000A, 0x000A },
+    { 0x000D, 0x000D },
+    { 0x001C, 0x001E },
+    { 0x0085, 0x0085 },
+    { 0x2029, 0x2029 }
+
+#define PREDICATE(c) uc_is_property_bidi_block_separator (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_bidi_boundary_neutral.c
@@ -0,0 +1,53 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0000, 0x0008 },
+    { 0x000E, 0x001B },
+    { 0x007F, 0x0084 },
+    { 0x0086, 0x009F },
+    { 0x00AD, 0x00AD },
+    { 0x070F, 0x070F },
+    { 0x200B, 0x200D },
+    { 0x2060, 0x2063 },
+    { 0x206A, 0x206F },
+    { 0xFDD0, 0xFDEF },
+    { 0xFEFF, 0xFEFF },
+    { 0xFFF0, 0xFFF8 },
+    { 0xFFFE, 0xFFFF },
+    { 0x1D173, 0x1D17A },
+    { 0x1FFFE, 0x1FFFF },
+    { 0x2FFFE, 0x2FFFF },
+    { 0x3FFFE, 0x3FFFF },
+    { 0x4FFFE, 0x4FFFF },
+    { 0x5FFFE, 0x5FFFF },
+    { 0x6FFFE, 0x6FFFF },
+    { 0x7FFFE, 0x7FFFF },
+    { 0x8FFFE, 0x8FFFF },
+    { 0x9FFFE, 0x9FFFF },
+    { 0xAFFFE, 0xAFFFF },
+    { 0xBFFFE, 0xBFFFF },
+    { 0xCFFFE, 0xCFFFF },
+    { 0xDFFFE, 0xE00FF },
+    { 0xE01F0, 0xE0FFF },
+    { 0xEFFFE, 0xEFFFF },
+    { 0xFFFFE, 0xFFFFF },
+    { 0x10FFFE, 0x10FFFF }
+
+#define PREDICATE(c) uc_is_property_bidi_boundary_neutral (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_bidi_common_separator.c
@@ -0,0 +1,35 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x002C, 0x002C },
+    { 0x002E, 0x002F },
+    { 0x003A, 0x003A },
+    { 0x00A0, 0x00A0 },
+    { 0x060C, 0x060C },
+    { 0x202F, 0x202F },
+    { 0x2044, 0x2044 },
+    { 0xFE50, 0xFE50 },
+    { 0xFE52, 0xFE52 },
+    { 0xFE55, 0xFE55 },
+    { 0xFF0C, 0xFF0C },
+    { 0xFF0E, 0xFF0F },
+    { 0xFF1A, 0xFF1A }
+
+#define PREDICATE(c) uc_is_property_bidi_common_separator (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_bidi_control.c
@@ -0,0 +1,24 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x200E, 0x200F },
+    { 0x202A, 0x202E }
+
+#define PREDICATE(c) uc_is_property_bidi_control (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_bidi_embedding_or_override.c
@@ -0,0 +1,24 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x202A, 0x202B },
+    { 0x202D, 0x202E }
+
+#define PREDICATE(c) uc_is_property_bidi_embedding_or_override (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_bidi_eur_num_separator.c
@@ -0,0 +1,31 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x002B, 0x002B },
+    { 0x002D, 0x002D },
+    { 0x207A, 0x207B },
+    { 0x208A, 0x208B },
+    { 0x2212, 0x2212 },
+    { 0xFB29, 0xFB29 },
+    { 0xFE62, 0xFE63 },
+    { 0xFF0B, 0xFF0B },
+    { 0xFF0D, 0xFF0D }
+
+#define PREDICATE(c) uc_is_property_bidi_eur_num_separator (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_bidi_eur_num_terminator.c
@@ -0,0 +1,40 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0023, 0x0025 },
+    { 0x00A2, 0x00A5 },
+    { 0x00B0, 0x00B1 },
+    { 0x066A, 0x066A },
+    { 0x09F2, 0x09F3 },
+    { 0x0AF1, 0x0AF1 },
+    { 0x0BF9, 0x0BF9 },
+    { 0x0E3F, 0x0E3F },
+    { 0x17DB, 0x17DB },
+    { 0x2030, 0x2034 },
+    { 0x20A0, 0x20B5 },
+    { 0x212E, 0x212E },
+    { 0x2213, 0x2213 },
+    { 0xFE5F, 0xFE5F },
+    { 0xFE69, 0xFE6A },
+    { 0xFF03, 0xFF05 },
+    { 0xFFE0, 0xFFE1 },
+    { 0xFFE5, 0xFFE6 }
+
+#define PREDICATE(c) uc_is_property_bidi_eur_num_terminator (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_bidi_european_digit.c
@@ -0,0 +1,32 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0030, 0x0039 },
+    { 0x00B2, 0x00B3 },
+    { 0x00B9, 0x00B9 },
+    { 0x06F0, 0x06F9 },
+    { 0x2070, 0x2070 },
+    { 0x2074, 0x2079 },
+    { 0x2080, 0x2089 },
+    { 0x2488, 0x249B },
+    { 0xFF10, 0xFF19 },
+    { 0x1D7CE, 0x1D7FF }
+
+#define PREDICATE(c) uc_is_property_bidi_european_digit (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_bidi_hebrew_right_to_left.c
@@ -0,0 +1,42 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0590, 0x0590 },
+    { 0x05BE, 0x05BE },
+    { 0x05C0, 0x05C0 },
+    { 0x05C3, 0x05C3 },
+    { 0x05C6, 0x05C6 },
+    { 0x05C8, 0x05FF },
+    { 0x07C0, 0x07EA },
+    { 0x07F4, 0x07F5 },
+    { 0x07FA, 0x08FF },
+    { 0x200F, 0x200F },
+    { 0xFB1D, 0xFB1D },
+    { 0xFB1F, 0xFB28 },
+    { 0xFB2A, 0xFB4F },
+    { 0x10800, 0x1091E },
+    { 0x10920, 0x10A00 },
+    { 0x10A04, 0x10A04 },
+    { 0x10A07, 0x10A0B },
+    { 0x10A10, 0x10A37 },
+    { 0x10A3B, 0x10A3E },
+    { 0x10A40, 0x10FFF }
+
+#define PREDICATE(c) uc_is_property_bidi_hebrew_right_to_left (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_bidi_left_to_right.c
@@ -0,0 +1,265 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0041, 0x005A },
+    { 0x0061, 0x007A },
+    { 0x00AA, 0x00AA },
+    { 0x00B5, 0x00B5 },
+    { 0x00BA, 0x00BA },
+    { 0x00C0, 0x00D6 },
+    { 0x00D8, 0x00F6 },
+    { 0x00F8, 0x02B8 },
+    { 0x02BB, 0x02C1 },
+    { 0x02D0, 0x02D1 },
+    { 0x02E0, 0x02E4 },
+    { 0x02EE, 0x02EE },
+    { 0x0370, 0x0373 },
+    { 0x0376, 0x037D },
+    { 0x037F, 0x0383 },
+    { 0x0386, 0x0386 },
+    { 0x0388, 0x03F5 },
+    { 0x03F7, 0x0482 },
+    { 0x0487, 0x0487 },
+    { 0x048A, 0x0589 },
+    { 0x058B, 0x058F },
+    { 0x0900, 0x0900 },
+    { 0x0903, 0x093B },
+    { 0x093D, 0x0940 },
+    { 0x0949, 0x094C },
+    { 0x094E, 0x0950 },
+    { 0x0955, 0x0961 },
+    { 0x0964, 0x0980 },
+    { 0x0982, 0x09BB },
+    { 0x09BD, 0x09C0 },
+    { 0x09C5, 0x09CC },
+    { 0x09CE, 0x09E1 },
+    { 0x09E4, 0x09F1 },
+    { 0x09F4, 0x0A00 },
+    { 0x0A03, 0x0A3B },
+    { 0x0A3D, 0x0A40 },
+    { 0x0A43, 0x0A46 },
+    { 0x0A49, 0x0A4A },
+    { 0x0A4E, 0x0A6F },
+    { 0x0A72, 0x0A80 },
+    { 0x0A83, 0x0ABB },
+    { 0x0ABD, 0x0AC0 },
+    { 0x0AC6, 0x0AC6 },
+    { 0x0AC9, 0x0ACC },
+    { 0x0ACE, 0x0AE1 },
+    { 0x0AE4, 0x0AF0 },
+    { 0x0AF2, 0x0B00 },
+    { 0x0B02, 0x0B3B },
+    { 0x0B3D, 0x0B3E },
+    { 0x0B40, 0x0B40 },
+    { 0x0B44, 0x0B4C },
+    { 0x0B4E, 0x0B55 },
+    { 0x0B57, 0x0B81 },
+    { 0x0B83, 0x0BBF },
+    { 0x0BC1, 0x0BCC },
+    { 0x0BCE, 0x0BF2 },
+    { 0x0BFB, 0x0C3D },
+    { 0x0C41, 0x0C45 },
+    { 0x0C49, 0x0C49 },
+    { 0x0C4E, 0x0C54 },
+    { 0x0C57, 0x0CBB },
+    { 0x0CBD, 0x0CCB },
+    { 0x0CCE, 0x0CE1 },
+    { 0x0CE4, 0x0CF0 },
+    { 0x0CF3, 0x0D40 },
+    { 0x0D44, 0x0D4C },
+    { 0x0D4E, 0x0DC9 },
+    { 0x0DCB, 0x0DD1 },
+    { 0x0DD5, 0x0DD5 },
+    { 0x0DD7, 0x0E30 },
+    { 0x0E32, 0x0E33 },
+    { 0x0E3B, 0x0E3E },
+    { 0x0E40, 0x0E46 },
+    { 0x0E4F, 0x0EB0 },
+    { 0x0EB2, 0x0EB3 },
+    { 0x0EBA, 0x0EBA },
+    { 0x0EBD, 0x0EC7 },
+    { 0x0ECE, 0x0F17 },
+    { 0x0F1A, 0x0F34 },
+    { 0x0F36, 0x0F36 },
+    { 0x0F38, 0x0F38 },
+    { 0x0F3E, 0x0F70 },
+    { 0x0F7F, 0x0F7F },
+    { 0x0F85, 0x0F85 },
+    { 0x0F88, 0x0F8F },
+    { 0x0F98, 0x0F98 },
+    { 0x0FBD, 0x0FC5 },
+    { 0x0FC7, 0x102C },
+    { 0x1031, 0x1031 },
+    { 0x1033, 0x1035 },
+    { 0x1038, 0x1038 },
+    { 0x103A, 0x1057 },
+    { 0x105A, 0x135E },
+    { 0x1360, 0x138F },
+    { 0x139A, 0x167F },
+    { 0x1681, 0x169A },
+    { 0x169D, 0x1711 },
+    { 0x1715, 0x1731 },
+    { 0x1735, 0x1751 },
+    { 0x1754, 0x1771 },
+    { 0x1774, 0x17B6 },
+    { 0x17BE, 0x17C5 },
+    { 0x17C7, 0x17C8 },
+    { 0x17D4, 0x17DA },
+    { 0x17DC, 0x17DC },
+    { 0x17DE, 0x17EF },
+    { 0x17FA, 0x17FF },
+    { 0x180F, 0x18A8 },
+    { 0x18AA, 0x191F },
+    { 0x1923, 0x1926 },
+    { 0x192C, 0x1931 },
+    { 0x1933, 0x1938 },
+    { 0x193C, 0x193F },
+    { 0x1941, 0x1943 },
+    { 0x1946, 0x19DD },
+    { 0x1A00, 0x1A16 },
+    { 0x1A19, 0x1AFF },
+    { 0x1B04, 0x1B33 },
+    { 0x1B35, 0x1B35 },
+    { 0x1B3B, 0x1B3B },
+    { 0x1B3D, 0x1B41 },
+    { 0x1B43, 0x1B6A },
+    { 0x1B74, 0x1DBF },
+    { 0x1DCB, 0x1DFD },
+    { 0x1E00, 0x1FBC },
+    { 0x1FBE, 0x1FBE },
+    { 0x1FC2, 0x1FCC },
+    { 0x1FD0, 0x1FDC },
+    { 0x1FE0, 0x1FEC },
+    { 0x1FF0, 0x1FFC },
+    { 0x1FFF, 0x1FFF },
+    { 0x200E, 0x200E },
+    { 0x2071, 0x2073 },
+    { 0x207F, 0x207F },
+    { 0x208F, 0x209F },
+    { 0x20B6, 0x20CF },
+    { 0x20F0, 0x20FF },
+    { 0x2102, 0x2102 },
+    { 0x2107, 0x2107 },
+    { 0x210A, 0x2113 },
+    { 0x2115, 0x2115 },
+    { 0x2119, 0x211D },
+    { 0x2124, 0x2124 },
+    { 0x2126, 0x2126 },
+    { 0x2128, 0x2128 },
+    { 0x212A, 0x212D },
+    { 0x212F, 0x2139 },
+    { 0x213C, 0x213F },
+    { 0x2145, 0x2149 },
+    { 0x214E, 0x2152 },
+    { 0x2160, 0x218F },
+    { 0x2336, 0x237A },
+    { 0x2395, 0x2395 },
+    { 0x23E8, 0x23FF },
+    { 0x2427, 0x243F },
+    { 0x244B, 0x245F },
+    { 0x249C, 0x24E9 },
+    { 0x269D, 0x269F },
+    { 0x26AC, 0x26AC },
+    { 0x26B3, 0x2700 },
+    { 0x2705, 0x2705 },
+    { 0x270A, 0x270B },
+    { 0x2728, 0x2728 },
+    { 0x274C, 0x274C },
+    { 0x274E, 0x274E },
+    { 0x2753, 0x2755 },
+    { 0x2757, 0x2757 },
+    { 0x275F, 0x2760 },
+    { 0x2795, 0x2797 },
+    { 0x27B0, 0x27B0 },
+    { 0x27BF, 0x27BF },
+    { 0x27CB, 0x27CF },
+    { 0x27EC, 0x27EF },
+    { 0x2800, 0x28FF },
+    { 0x2B1B, 0x2B1F },
+    { 0x2B24, 0x2CE4 },
+    { 0x2CEB, 0x2CF8 },
+    { 0x2D00, 0x2DFF },
+    { 0x2E18, 0x2E1B },
+    { 0x2E1E, 0x2E7F },
+    { 0x2E9A, 0x2E9A },
+    { 0x2EF4, 0x2EFF },
+    { 0x2FD6, 0x2FEF },
+    { 0x2FFC, 0x2FFF },
+    { 0x3005, 0x3007 },
+    { 0x3021, 0x3029 },
+    { 0x3031, 0x3035 },
+    { 0x3038, 0x303C },
+    { 0x3040, 0x3098 },
+    { 0x309D, 0x309F },
+    { 0x30A1, 0x30FA },
+    { 0x30FC, 0x31BF },
+    { 0x31D0, 0x321C },
+    { 0x321F, 0x324F },
+    { 0x3260, 0x327B },
+    { 0x327F, 0x32B0 },
+    { 0x32C0, 0x32CB },
+    { 0x32D0, 0x3376 },
+    { 0x337B, 0x33DD },
+    { 0x33E0, 0x33FE },
+    { 0x3400, 0x4DBF },
+    { 0x4E00, 0xA48F },
+    { 0xA4C7, 0xA6FF },
+    { 0xA71B, 0xA71F },
+    { 0xA722, 0xA801 },
+    { 0xA803, 0xA805 },
+    { 0xA807, 0xA80A },
+    { 0xA80C, 0xA824 },
+    { 0xA827, 0xA827 },
+    { 0xA82C, 0xA873 },
+    { 0xA878, 0xFB1C },
+    { 0xFF00, 0xFF00 },
+    { 0xFF21, 0xFF3A },
+    { 0xFF41, 0xFF5A },
+    { 0xFF66, 0xFFDF },
+    { 0xFFE7, 0xFFE7 },
+    { 0xFFEF, 0xFFEF },
+    { 0x10000, 0x10100 },
+    { 0x10102, 0x1013F },
+    { 0x1018B, 0x107FF },
+    { 0x11000, 0x1D166 },
+    { 0x1D16A, 0x1D172 },
+    { 0x1D183, 0x1D184 },
+    { 0x1D18C, 0x1D1A9 },
+    { 0x1D1AE, 0x1D1FF },
+    { 0x1D246, 0x1D2FF },
+    { 0x1D357, 0x1D7CD },
+    { 0x1D800, 0x1FFFD },
+    { 0x20000, 0x2FFFD },
+    { 0x30000, 0x3FFFD },
+    { 0x40000, 0x4FFFD },
+    { 0x50000, 0x5FFFD },
+    { 0x60000, 0x6FFFD },
+    { 0x70000, 0x7FFFD },
+    { 0x80000, 0x8FFFD },
+    { 0x90000, 0x9FFFD },
+    { 0xA0000, 0xAFFFD },
+    { 0xB0000, 0xBFFFD },
+    { 0xC0000, 0xCFFFD },
+    { 0xD0000, 0xDFFFD },
+    { 0xE1000, 0xEFFFD },
+    { 0xF0000, 0xFFFFD },
+    { 0x100000, 0x10FFFD }
+
+#define PREDICATE(c) uc_is_property_bidi_left_to_right (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_bidi_non_spacing_mark.c
@@ -0,0 +1,152 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0300, 0x036F },
+    { 0x0483, 0x0486 },
+    { 0x0488, 0x0489 },
+    { 0x0591, 0x05BD },
+    { 0x05BF, 0x05BF },
+    { 0x05C1, 0x05C2 },
+    { 0x05C4, 0x05C5 },
+    { 0x05C7, 0x05C7 },
+    { 0x0610, 0x0615 },
+    { 0x064B, 0x065E },
+    { 0x0670, 0x0670 },
+    { 0x06D6, 0x06DC },
+    { 0x06DE, 0x06E4 },
+    { 0x06E7, 0x06E8 },
+    { 0x06EA, 0x06ED },
+    { 0x0711, 0x0711 },
+    { 0x0730, 0x074A },
+    { 0x07A6, 0x07B0 },
+    { 0x07EB, 0x07F3 },
+    { 0x0901, 0x0902 },
+    { 0x093C, 0x093C },
+    { 0x0941, 0x0948 },
+    { 0x094D, 0x094D },
+    { 0x0951, 0x0954 },
+    { 0x0962, 0x0963 },
+    { 0x0981, 0x0981 },
+    { 0x09BC, 0x09BC },
+    { 0x09C1, 0x09C4 },
+    { 0x09CD, 0x09CD },
+    { 0x09E2, 0x09E3 },
+    { 0x0A01, 0x0A02 },
+    { 0x0A3C, 0x0A3C },
+    { 0x0A41, 0x0A42 },
+    { 0x0A47, 0x0A48 },
+    { 0x0A4B, 0x0A4D },
+    { 0x0A70, 0x0A71 },
+    { 0x0A81, 0x0A82 },
+    { 0x0ABC, 0x0ABC },
+    { 0x0AC1, 0x0AC5 },
+    { 0x0AC7, 0x0AC8 },
+    { 0x0ACD, 0x0ACD },
+    { 0x0AE2, 0x0AE3 },
+    { 0x0B01, 0x0B01 },
+    { 0x0B3C, 0x0B3C },
+    { 0x0B3F, 0x0B3F },
+    { 0x0B41, 0x0B43 },
+    { 0x0B4D, 0x0B4D },
+    { 0x0B56, 0x0B56 },
+    { 0x0B82, 0x0B82 },
+    { 0x0BC0, 0x0BC0 },
+    { 0x0BCD, 0x0BCD },
+    { 0x0C3E, 0x0C40 },
+    { 0x0C46, 0x0C48 },
+    { 0x0C4A, 0x0C4D },
+    { 0x0C55, 0x0C56 },
+    { 0x0CBC, 0x0CBC },
+    { 0x0CCC, 0x0CCD },
+    { 0x0CE2, 0x0CE3 },
+    { 0x0D41, 0x0D43 },
+    { 0x0D4D, 0x0D4D },
+    { 0x0DCA, 0x0DCA },
+    { 0x0DD2, 0x0DD4 },
+    { 0x0DD6, 0x0DD6 },
+    { 0x0E31, 0x0E31 },
+    { 0x0E34, 0x0E3A },
+    { 0x0E47, 0x0E4E },
+    { 0x0EB1, 0x0EB1 },
+    { 0x0EB4, 0x0EB9 },
+    { 0x0EBB, 0x0EBC },
+    { 0x0EC8, 0x0ECD },
+    { 0x0F18, 0x0F19 },
+    { 0x0F35, 0x0F35 },
+    { 0x0F37, 0x0F37 },
+    { 0x0F39, 0x0F39 },
+    { 0x0F71, 0x0F7E },
+    { 0x0F80, 0x0F84 },
+    { 0x0F86, 0x0F87 },
+    { 0x0F90, 0x0F97 },
+    { 0x0F99, 0x0FBC },
+    { 0x0FC6, 0x0FC6 },
+    { 0x102D, 0x1030 },
+    { 0x1032, 0x1032 },
+    { 0x1036, 0x1037 },
+    { 0x1039, 0x1039 },
+    { 0x1058, 0x1059 },
+    { 0x135F, 0x135F },
+    { 0x1712, 0x1714 },
+    { 0x1732, 0x1734 },
+    { 0x1752, 0x1753 },
+    { 0x1772, 0x1773 },
+    { 0x17B7, 0x17BD },
+    { 0x17C6, 0x17C6 },
+    { 0x17C9, 0x17D3 },
+    { 0x17DD, 0x17DD },
+    { 0x180B, 0x180D },
+    { 0x18A9, 0x18A9 },
+    { 0x1920, 0x1922 },
+    { 0x1927, 0x192B },
+    { 0x1932, 0x1932 },
+    { 0x1939, 0x193B },
+    { 0x1A17, 0x1A18 },
+    { 0x1B00, 0x1B03 },
+    { 0x1B34, 0x1B34 },
+    { 0x1B36, 0x1B3A },
+    { 0x1B3C, 0x1B3C },
+    { 0x1B42, 0x1B42 },
+    { 0x1B6B, 0x1B73 },
+    { 0x1DC0, 0x1DCA },
+    { 0x1DFE, 0x1DFF },
+    { 0x20D0, 0x20EF },
+    { 0x302A, 0x302F },
+    { 0x3099, 0x309A },
+    { 0xA802, 0xA802 },
+    { 0xA806, 0xA806 },
+    { 0xA80B, 0xA80B },
+    { 0xA825, 0xA826 },
+    { 0xFB1E, 0xFB1E },
+    { 0xFE00, 0xFE0F },
+    { 0xFE20, 0xFE23 },
+    { 0x10A01, 0x10A03 },
+    { 0x10A05, 0x10A06 },
+    { 0x10A0C, 0x10A0F },
+    { 0x10A38, 0x10A3A },
+    { 0x10A3F, 0x10A3F },
+    { 0x1D167, 0x1D169 },
+    { 0x1D17B, 0x1D182 },
+    { 0x1D185, 0x1D18B },
+    { 0x1D1AA, 0x1D1AD },
+    { 0x1D242, 0x1D244 },
+    { 0xE0100, 0xE01EF }
+
+#define PREDICATE(c) uc_is_property_bidi_non_spacing_mark (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_bidi_other_neutral.c
@@ -0,0 +1,167 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0021, 0x0022 },
+    { 0x0026, 0x002A },
+    { 0x003B, 0x0040 },
+    { 0x005B, 0x0060 },
+    { 0x007B, 0x007E },
+    { 0x00A1, 0x00A1 },
+    { 0x00A6, 0x00A9 },
+    { 0x00AB, 0x00AC },
+    { 0x00AE, 0x00AF },
+    { 0x00B4, 0x00B4 },
+    { 0x00B6, 0x00B8 },
+    { 0x00BB, 0x00BF },
+    { 0x00D7, 0x00D7 },
+    { 0x00F7, 0x00F7 },
+    { 0x02B9, 0x02BA },
+    { 0x02C2, 0x02CF },
+    { 0x02D2, 0x02DF },
+    { 0x02E5, 0x02ED },
+    { 0x02EF, 0x02FF },
+    { 0x0374, 0x0375 },
+    { 0x037E, 0x037E },
+    { 0x0384, 0x0385 },
+    { 0x0387, 0x0387 },
+    { 0x03F6, 0x03F6 },
+    { 0x058A, 0x058A },
+    { 0x060E, 0x060F },
+    { 0x06E9, 0x06E9 },
+    { 0x07F6, 0x07F9 },
+    { 0x0BF3, 0x0BF8 },
+    { 0x0BFA, 0x0BFA },
+    { 0x0CF1, 0x0CF2 },
+    { 0x0F3A, 0x0F3D },
+    { 0x1390, 0x1399 },
+    { 0x169B, 0x169C },
+    { 0x17F0, 0x17F9 },
+    { 0x1800, 0x180A },
+    { 0x1940, 0x1940 },
+    { 0x1944, 0x1945 },
+    { 0x19DE, 0x19FF },
+    { 0x1FBD, 0x1FBD },
+    { 0x1FBF, 0x1FC1 },
+    { 0x1FCD, 0x1FCF },
+    { 0x1FDD, 0x1FDF },
+    { 0x1FED, 0x1FEF },
+    { 0x1FFD, 0x1FFE },
+    { 0x2010, 0x2027 },
+    { 0x2035, 0x2043 },
+    { 0x2045, 0x205E },
+    { 0x207C, 0x207E },
+    { 0x208C, 0x208E },
+    { 0x2100, 0x2101 },
+    { 0x2103, 0x2106 },
+    { 0x2108, 0x2109 },
+    { 0x2114, 0x2114 },
+    { 0x2116, 0x2118 },
+    { 0x211E, 0x2123 },
+    { 0x2125, 0x2125 },
+    { 0x2127, 0x2127 },
+    { 0x2129, 0x2129 },
+    { 0x213A, 0x213B },
+    { 0x2140, 0x2144 },
+    { 0x214A, 0x214D },
+    { 0x2153, 0x215F },
+    { 0x2190, 0x2211 },
+    { 0x2214, 0x2335 },
+    { 0x237B, 0x2394 },
+    { 0x2396, 0x23E7 },
+    { 0x2400, 0x2426 },
+    { 0x2440, 0x244A },
+    { 0x2460, 0x2487 },
+    { 0x24EA, 0x269C },
+    { 0x26A0, 0x26AB },
+    { 0x26AD, 0x26B2 },
+    { 0x2701, 0x2704 },
+    { 0x2706, 0x2709 },
+    { 0x270C, 0x2727 },
+    { 0x2729, 0x274B },
+    { 0x274D, 0x274D },
+    { 0x274F, 0x2752 },
+    { 0x2756, 0x2756 },
+    { 0x2758, 0x275E },
+    { 0x2761, 0x2794 },
+    { 0x2798, 0x27AF },
+    { 0x27B1, 0x27BE },
+    { 0x27C0, 0x27CA },
+    { 0x27D0, 0x27EB },
+    { 0x27F0, 0x27FF },
+    { 0x2900, 0x2B1A },
+    { 0x2B20, 0x2B23 },
+    { 0x2CE5, 0x2CEA },
+    { 0x2CF9, 0x2CFF },
+    { 0x2E00, 0x2E17 },
+    { 0x2E1C, 0x2E1D },
+    { 0x2E80, 0x2E99 },
+    { 0x2E9B, 0x2EF3 },
+    { 0x2F00, 0x2FD5 },
+    { 0x2FF0, 0x2FFB },
+    { 0x3001, 0x3004 },
+    { 0x3008, 0x3020 },
+    { 0x3030, 0x3030 },
+    { 0x3036, 0x3037 },
+    { 0x303D, 0x303F },
+    { 0x309B, 0x309C },
+    { 0x30A0, 0x30A0 },
+    { 0x30FB, 0x30FB },
+    { 0x31C0, 0x31CF },
+    { 0x321D, 0x321E },
+    { 0x3250, 0x325F },
+    { 0x327C, 0x327E },
+    { 0x32B1, 0x32BF },
+    { 0x32CC, 0x32CF },
+    { 0x3377, 0x337A },
+    { 0x33DE, 0x33DF },
+    { 0x33FF, 0x33FF },
+    { 0x4DC0, 0x4DFF },
+    { 0xA490, 0xA4C6 },
+    { 0xA700, 0xA71A },
+    { 0xA720, 0xA721 },
+    { 0xA828, 0xA82B },
+    { 0xA874, 0xA877 },
+    { 0xFD3E, 0xFD3F },
+    { 0xFDFD, 0xFDFD },
+    { 0xFE10, 0xFE19 },
+    { 0xFE30, 0xFE4F },
+    { 0xFE51, 0xFE51 },
+    { 0xFE54, 0xFE54 },
+    { 0xFE56, 0xFE5E },
+    { 0xFE60, 0xFE61 },
+    { 0xFE64, 0xFE66 },
+    { 0xFE68, 0xFE68 },
+    { 0xFE6B, 0xFE6B },
+    { 0xFF01, 0xFF02 },
+    { 0xFF06, 0xFF0A },
+    { 0xFF1B, 0xFF20 },
+    { 0xFF3B, 0xFF40 },
+    { 0xFF5B, 0xFF65 },
+    { 0xFFE2, 0xFFE4 },
+    { 0xFFE8, 0xFFEE },
+    { 0xFFF9, 0xFFFD },
+    { 0x10101, 0x10101 },
+    { 0x10140, 0x1018A },
+    { 0x1091F, 0x1091F },
+    { 0x1D200, 0x1D241 },
+    { 0x1D245, 0x1D245 },
+    { 0x1D300, 0x1D356 }
+
+#define PREDICATE(c) uc_is_property_bidi_other_neutral (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_bidi_pdf.c
@@ -0,0 +1,23 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x202C, 0x202C }
+
+#define PREDICATE(c) uc_is_property_bidi_pdf (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_bidi_segment_separator.c
@@ -0,0 +1,25 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0009, 0x0009 },
+    { 0x000B, 0x000B },
+    { 0x001F, 0x001F }
+
+#define PREDICATE(c) uc_is_property_bidi_segment_separator (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_bidi_whitespace.c
@@ -0,0 +1,30 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x000C, 0x000C },
+    { 0x0020, 0x0020 },
+    { 0x1680, 0x1680 },
+    { 0x180E, 0x180E },
+    { 0x2000, 0x200A },
+    { 0x2028, 0x2028 },
+    { 0x205F, 0x205F },
+    { 0x3000, 0x3000 }
+
+#define PREDICATE(c) uc_is_property_bidi_whitespace (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_byname.c
@@ -0,0 +1,53 @@
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "unictype.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+
+int
+main ()
+{
+  {
+    uc_property_t pr = uc_property_byname ("composite");
+    unsigned int c;
+
+    for (c = 0; c < 0x110000; c++)
+      ASSERT (uc_is_property (c, pr) == uc_is_property_composite (c));
+  }
+
+  {
+    uc_property_t pr = uc_property_byname ("foobar");
+    ASSERT (pr.test_fn == NULL);
+  }
+
+  return 0;
+}
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_combining.c
@@ -0,0 +1,160 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0300, 0x036F },
+    { 0x0483, 0x0486 },
+    { 0x0488, 0x0489 },
+    { 0x0591, 0x05BD },
+    { 0x05BF, 0x05BF },
+    { 0x05C1, 0x05C2 },
+    { 0x05C4, 0x05C5 },
+    { 0x05C7, 0x05C7 },
+    { 0x0610, 0x0615 },
+    { 0x064B, 0x065E },
+    { 0x0670, 0x0670 },
+    { 0x06D6, 0x06DC },
+    { 0x06DE, 0x06E4 },
+    { 0x06E7, 0x06E8 },
+    { 0x06EA, 0x06ED },
+    { 0x0711, 0x0711 },
+    { 0x0730, 0x074A },
+    { 0x07A6, 0x07B0 },
+    { 0x07EB, 0x07F3 },
+    { 0x0901, 0x0903 },
+    { 0x093C, 0x093C },
+    { 0x093E, 0x094D },
+    { 0x0951, 0x0954 },
+    { 0x0962, 0x0963 },
+    { 0x0981, 0x0983 },
+    { 0x09BC, 0x09BC },
+    { 0x09BE, 0x09C4 },
+    { 0x09C7, 0x09C8 },
+    { 0x09CB, 0x09CD },
+    { 0x09D7, 0x09D7 },
+    { 0x09E2, 0x09E3 },
+    { 0x0A01, 0x0A03 },
+    { 0x0A3C, 0x0A3C },
+    { 0x0A3E, 0x0A42 },
+    { 0x0A47, 0x0A48 },
+    { 0x0A4B, 0x0A4D },
+    { 0x0A70, 0x0A71 },
+    { 0x0A81, 0x0A83 },
+    { 0x0ABC, 0x0ABC },
+    { 0x0ABE, 0x0AC5 },
+    { 0x0AC7, 0x0AC9 },
+    { 0x0ACB, 0x0ACD },
+    { 0x0AE2, 0x0AE3 },
+    { 0x0B01, 0x0B03 },
+    { 0x0B3C, 0x0B3C },
+    { 0x0B3E, 0x0B43 },
+    { 0x0B47, 0x0B48 },
+    { 0x0B4B, 0x0B4D },
+    { 0x0B56, 0x0B57 },
+    { 0x0B82, 0x0B82 },
+    { 0x0BBE, 0x0BC2 },
+    { 0x0BC6, 0x0BC8 },
+    { 0x0BCA, 0x0BCD },
+    { 0x0BD7, 0x0BD7 },
+    { 0x0C01, 0x0C03 },
+    { 0x0C3E, 0x0C44 },
+    { 0x0C46, 0x0C48 },
+    { 0x0C4A, 0x0C4D },
+    { 0x0C55, 0x0C56 },
+    { 0x0C82, 0x0C83 },
+    { 0x0CBC, 0x0CBC },
+    { 0x0CBE, 0x0CC4 },
+    { 0x0CC6, 0x0CC8 },
+    { 0x0CCA, 0x0CCD },
+    { 0x0CD5, 0x0CD6 },
+    { 0x0CE2, 0x0CE3 },
+    { 0x0D02, 0x0D03 },
+    { 0x0D3E, 0x0D43 },
+    { 0x0D46, 0x0D48 },
+    { 0x0D4A, 0x0D4D },
+    { 0x0D57, 0x0D57 },
+    { 0x0D82, 0x0D83 },
+    { 0x0DCA, 0x0DCA },
+    { 0x0DCF, 0x0DD4 },
+    { 0x0DD6, 0x0DD6 },
+    { 0x0DD8, 0x0DDF },
+    { 0x0DF2, 0x0DF3 },
+    { 0x0E31, 0x0E31 },
+    { 0x0E34, 0x0E3A },
+    { 0x0E47, 0x0E4E },
+    { 0x0EB1, 0x0EB1 },
+    { 0x0EB4, 0x0EB9 },
+    { 0x0EBB, 0x0EBC },
+    { 0x0EC8, 0x0ECD },
+    { 0x0F18, 0x0F19 },
+    { 0x0F35, 0x0F35 },
+    { 0x0F37, 0x0F37 },
+    { 0x0F39, 0x0F39 },
+    { 0x0F3E, 0x0F3F },
+    { 0x0F71, 0x0F84 },
+    { 0x0F86, 0x0F87 },
+    { 0x0F90, 0x0F97 },
+    { 0x0F99, 0x0FBC },
+    { 0x0FC6, 0x0FC6 },
+    { 0x102C, 0x1032 },
+    { 0x1036, 0x1039 },
+    { 0x1056, 0x1059 },
+    { 0x135F, 0x135F },
+    { 0x1712, 0x1714 },
+    { 0x1732, 0x1734 },
+    { 0x1752, 0x1753 },
+    { 0x1772, 0x1773 },
+    { 0x17B6, 0x17D3 },
+    { 0x17DD, 0x17DD },
+    { 0x180B, 0x180D },
+    { 0x18A9, 0x18A9 },
+    { 0x1920, 0x192B },
+    { 0x1930, 0x193B },
+    { 0x19B0, 0x19C0 },
+    { 0x19C8, 0x19C9 },
+    { 0x1A17, 0x1A1B },
+    { 0x1B00, 0x1B04 },
+    { 0x1B34, 0x1B44 },
+    { 0x1B6B, 0x1B73 },
+    { 0x1DC0, 0x1DCA },
+    { 0x1DFE, 0x1DFF },
+    { 0x20D0, 0x20EF },
+    { 0x302A, 0x302F },
+    { 0x3099, 0x309A },
+    { 0xA802, 0xA802 },
+    { 0xA806, 0xA806 },
+    { 0xA80B, 0xA80B },
+    { 0xA823, 0xA827 },
+    { 0xFB1E, 0xFB1E },
+    { 0xFE00, 0xFE0F },
+    { 0xFE20, 0xFE23 },
+    { 0x10A01, 0x10A03 },
+    { 0x10A05, 0x10A06 },
+    { 0x10A0C, 0x10A0F },
+    { 0x10A38, 0x10A3A },
+    { 0x10A3F, 0x10A3F },
+    { 0x1D165, 0x1D169 },
+    { 0x1D16D, 0x1D172 },
+    { 0x1D17B, 0x1D182 },
+    { 0x1D185, 0x1D18B },
+    { 0x1D1AA, 0x1D1AD },
+    { 0x1D242, 0x1D244 },
+    { 0xE0100, 0xE01EF }
+
+#define PREDICATE(c) uc_is_property_combining (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_composite.c
@@ -0,0 +1,291 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x00BC, 0x00BE },
+    { 0x00C0, 0x00C5 },
+    { 0x00C7, 0x00CF },
+    { 0x00D1, 0x00D6 },
+    { 0x00D9, 0x00DD },
+    { 0x00E0, 0x00E5 },
+    { 0x00E7, 0x00EF },
+    { 0x00F1, 0x00F6 },
+    { 0x00F9, 0x00FD },
+    { 0x00FF, 0x010F },
+    { 0x0112, 0x0125 },
+    { 0x0128, 0x0130 },
+    { 0x0132, 0x0137 },
+    { 0x0139, 0x0140 },
+    { 0x0143, 0x0149 },
+    { 0x014C, 0x0151 },
+    { 0x0154, 0x0165 },
+    { 0x0168, 0x017E },
+    { 0x01A0, 0x01A1 },
+    { 0x01AF, 0x01B0 },
+    { 0x01C4, 0x01DC },
+    { 0x01DE, 0x01E3 },
+    { 0x01E6, 0x01F5 },
+    { 0x01F8, 0x021B },
+    { 0x021E, 0x021F },
+    { 0x0226, 0x0233 },
+    { 0x0344, 0x0344 },
+    { 0x0385, 0x0386 },
+    { 0x0388, 0x038A },
+    { 0x038C, 0x038C },
+    { 0x038E, 0x0390 },
+    { 0x03AA, 0x03B0 },
+    { 0x03CA, 0x03CE },
+    { 0x03D3, 0x03D4 },
+    { 0x0400, 0x0401 },
+    { 0x0403, 0x0403 },
+    { 0x0407, 0x0407 },
+    { 0x040C, 0x040E },
+    { 0x0419, 0x0419 },
+    { 0x0439, 0x0439 },
+    { 0x0450, 0x0451 },
+    { 0x0453, 0x0453 },
+    { 0x0457, 0x0457 },
+    { 0x045C, 0x045E },
+    { 0x0476, 0x0477 },
+    { 0x04C1, 0x04C2 },
+    { 0x04D0, 0x04D3 },
+    { 0x04D6, 0x04D7 },
+    { 0x04DA, 0x04DF },
+    { 0x04E2, 0x04E7 },
+    { 0x04EA, 0x04F5 },
+    { 0x04F8, 0x04F9 },
+    { 0x0587, 0x0587 },
+    { 0x0622, 0x0626 },
+    { 0x0675, 0x0678 },
+    { 0x06C0, 0x06C0 },
+    { 0x06C2, 0x06C2 },
+    { 0x06D3, 0x06D3 },
+    { 0x0929, 0x0929 },
+    { 0x0931, 0x0931 },
+    { 0x0934, 0x0934 },
+    { 0x0958, 0x095F },
+    { 0x09CB, 0x09CC },
+    { 0x09DC, 0x09DD },
+    { 0x09DF, 0x09DF },
+    { 0x0A33, 0x0A33 },
+    { 0x0A36, 0x0A36 },
+    { 0x0A59, 0x0A5B },
+    { 0x0A5E, 0x0A5E },
+    { 0x0B48, 0x0B48 },
+    { 0x0B4B, 0x0B4C },
+    { 0x0B5C, 0x0B5D },
+    { 0x0B94, 0x0B94 },
+    { 0x0BCA, 0x0BCC },
+    { 0x0C48, 0x0C48 },
+    { 0x0CC0, 0x0CC0 },
+    { 0x0CC7, 0x0CC8 },
+    { 0x0CCA, 0x0CCB },
+    { 0x0D4A, 0x0D4C },
+    { 0x0DDA, 0x0DDA },
+    { 0x0DDC, 0x0DDE },
+    { 0x0E33, 0x0E33 },
+    { 0x0EB3, 0x0EB3 },
+    { 0x0EDC, 0x0EDD },
+    { 0x0F43, 0x0F43 },
+    { 0x0F4D, 0x0F4D },
+    { 0x0F52, 0x0F52 },
+    { 0x0F57, 0x0F57 },
+    { 0x0F5C, 0x0F5C },
+    { 0x0F69, 0x0F69 },
+    { 0x0F73, 0x0F73 },
+    { 0x0F75, 0x0F79 },
+    { 0x0F81, 0x0F81 },
+    { 0x0F93, 0x0F93 },
+    { 0x0F9D, 0x0F9D },
+    { 0x0FA2, 0x0FA2 },
+    { 0x0FA7, 0x0FA7 },
+    { 0x0FAC, 0x0FAC },
+    { 0x0FB9, 0x0FB9 },
+    { 0x1026, 0x1026 },
+    { 0x1B06, 0x1B06 },
+    { 0x1B08, 0x1B08 },
+    { 0x1B0A, 0x1B0A },
+    { 0x1B0C, 0x1B0C },
+    { 0x1B0E, 0x1B0E },
+    { 0x1B12, 0x1B12 },
+    { 0x1B3B, 0x1B3B },
+    { 0x1B3D, 0x1B3D },
+    { 0x1B40, 0x1B41 },
+    { 0x1B43, 0x1B43 },
+    { 0x1E00, 0x1E9B },
+    { 0x1EA0, 0x1EF9 },
+    { 0x1F00, 0x1F15 },
+    { 0x1F18, 0x1F1D },
+    { 0x1F20, 0x1F45 },
+    { 0x1F48, 0x1F4D },
+    { 0x1F50, 0x1F57 },
+    { 0x1F59, 0x1F59 },
+    { 0x1F5B, 0x1F5B },
+    { 0x1F5D, 0x1F5D },
+    { 0x1F5F, 0x1F70 },
+    { 0x1F72, 0x1F72 },
+    { 0x1F74, 0x1F74 },
+    { 0x1F76, 0x1F76 },
+    { 0x1F78, 0x1F78 },
+    { 0x1F7A, 0x1F7A },
+    { 0x1F7C, 0x1F7C },
+    { 0x1F80, 0x1FB4 },
+    { 0x1FB6, 0x1FBA },
+    { 0x1FBC, 0x1FBC },
+    { 0x1FC1, 0x1FC4 },
+    { 0x1FC6, 0x1FC8 },
+    { 0x1FCA, 0x1FCA },
+    { 0x1FCC, 0x1FD2 },
+    { 0x1FD6, 0x1FDA },
+    { 0x1FDD, 0x1FE2 },
+    { 0x1FE4, 0x1FEA },
+    { 0x1FEC, 0x1FED },
+    { 0x1FF2, 0x1FF4 },
+    { 0x1FF6, 0x1FF8 },
+    { 0x1FFA, 0x1FFA },
+    { 0x1FFC, 0x1FFC },
+    { 0x2025, 0x2026 },
+    { 0x2033, 0x2034 },
+    { 0x2036, 0x2037 },
+    { 0x203C, 0x203C },
+    { 0x2047, 0x2049 },
+    { 0x2057, 0x2057 },
+    { 0x20A8, 0x20A8 },
+    { 0x2100, 0x2101 },
+    { 0x2103, 0x2103 },
+    { 0x2105, 0x2106 },
+    { 0x2109, 0x2109 },
+    { 0x2116, 0x2116 },
+    { 0x2120, 0x2122 },
+    { 0x213B, 0x213B },
+    { 0x2153, 0x215F },
+    { 0x2161, 0x2163 },
+    { 0x2165, 0x2168 },
+    { 0x216A, 0x216B },
+    { 0x2171, 0x2173 },
+    { 0x2175, 0x2178 },
+    { 0x217A, 0x217B },
+    { 0x219A, 0x219B },
+    { 0x21AE, 0x21AE },
+    { 0x21CD, 0x21CF },
+    { 0x2204, 0x2204 },
+    { 0x2209, 0x2209 },
+    { 0x220C, 0x220C },
+    { 0x2224, 0x2224 },
+    { 0x2226, 0x2226 },
+    { 0x222C, 0x222D },
+    { 0x222F, 0x2230 },
+    { 0x2241, 0x2241 },
+    { 0x2244, 0x2244 },
+    { 0x2247, 0x2247 },
+    { 0x2249, 0x2249 },
+    { 0x2260, 0x2260 },
+    { 0x2262, 0x2262 },
+    { 0x226D, 0x2271 },
+    { 0x2274, 0x2275 },
+    { 0x2278, 0x2279 },
+    { 0x2280, 0x2281 },
+    { 0x2284, 0x2285 },
+    { 0x2288, 0x2289 },
+    { 0x22AC, 0x22AF },
+    { 0x22E0, 0x22E3 },
+    { 0x22EA, 0x22ED },
+    { 0x2469, 0x24B5 },
+    { 0x2A0C, 0x2A0C },
+    { 0x2A74, 0x2A76 },
+    { 0x2ADC, 0x2ADC },
+    { 0x304C, 0x304C },
+    { 0x304E, 0x304E },
+    { 0x3050, 0x3050 },
+    { 0x3052, 0x3052 },
+    { 0x3054, 0x3054 },
+    { 0x3056, 0x3056 },
+    { 0x3058, 0x3058 },
+    { 0x305A, 0x305A },
+    { 0x305C, 0x305C },
+    { 0x305E, 0x305E },
+    { 0x3060, 0x3060 },
+    { 0x3062, 0x3062 },
+    { 0x3065, 0x3065 },
+    { 0x3067, 0x3067 },
+    { 0x3069, 0x3069 },
+    { 0x3070, 0x3071 },
+    { 0x3073, 0x3074 },
+    { 0x3076, 0x3077 },
+    { 0x3079, 0x307A },
+    { 0x307C, 0x307D },
+    { 0x3094, 0x3094 },
+    { 0x309E, 0x309F },
+    { 0x30AC, 0x30AC },
+    { 0x30AE, 0x30AE },
+    { 0x30B0, 0x30B0 },
+    { 0x30B2, 0x30B2 },
+    { 0x30B4, 0x30B4 },
+    { 0x30B6, 0x30B6 },
+    { 0x30B8, 0x30B8 },
+    { 0x30BA, 0x30BA },
+    { 0x30BC, 0x30BC },
+    { 0x30BE, 0x30BE },
+    { 0x30C0, 0x30C0 },
+    { 0x30C2, 0x30C2 },
+    { 0x30C5, 0x30C5 },
+    { 0x30C7, 0x30C7 },
+    { 0x30C9, 0x30C9 },
+    { 0x30D0, 0x30D1 },
+    { 0x30D3, 0x30D4 },
+    { 0x30D6, 0x30D7 },
+    { 0x30D9, 0x30DA },
+    { 0x30DC, 0x30DD },
+    { 0x30F4, 0x30F4 },
+    { 0x30F7, 0x30FA },
+    { 0x30FE, 0x30FF },
+    { 0x3200, 0x321E },
+    { 0x3220, 0x3243 },
+    { 0x3250, 0x325F },
+    { 0x326E, 0x327E },
+    { 0x32B1, 0x32CF },
+    { 0x3300, 0x33FF },
+    { 0xAC00, 0xD7A4 },
+    { 0xFB00, 0xFB06 },
+    { 0xFB13, 0xFB17 },
+    { 0xFB1D, 0xFB1D },
+    { 0xFB1F, 0xFB1F },
+    { 0xFB2A, 0xFB36 },
+    { 0xFB38, 0xFB3C },
+    { 0xFB3E, 0xFB3E },
+    { 0xFB40, 0xFB41 },
+    { 0xFB43, 0xFB44 },
+    { 0xFB46, 0xFB4F },
+    { 0xFBEA, 0xFBFB },
+    { 0xFC00, 0xFC5D },
+    { 0xFC64, 0xFD3D },
+    { 0xFD50, 0xFD8F },
+    { 0xFD92, 0xFDC7 },
+    { 0xFDF0, 0xFDFC },
+    { 0xFE71, 0xFE71 },
+    { 0xFE77, 0xFE77 },
+    { 0xFE79, 0xFE79 },
+    { 0xFE7B, 0xFE7B },
+    { 0xFE7D, 0xFE7D },
+    { 0xFE7F, 0xFE7F },
+    { 0xFEF5, 0xFEFC },
+    { 0x1D15E, 0x1D164 },
+    { 0x1D1BB, 0x1D1C0 }
+
+#define PREDICATE(c) uc_is_property_composite (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_currency_symbol.c
@@ -0,0 +1,36 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0024, 0x0024 },
+    { 0x00A2, 0x00A5 },
+    { 0x060B, 0x060B },
+    { 0x09F2, 0x09F3 },
+    { 0x0AF1, 0x0AF1 },
+    { 0x0BF9, 0x0BF9 },
+    { 0x0E3F, 0x0E3F },
+    { 0x17DB, 0x17DB },
+    { 0x20A0, 0x20B5 },
+    { 0xFDFC, 0xFDFC },
+    { 0xFE69, 0xFE69 },
+    { 0xFF04, 0xFF04 },
+    { 0xFFE0, 0xFFE1 },
+    { 0xFFE5, 0xFFE6 }
+
+#define PREDICATE(c) uc_is_property_currency_symbol (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_dash.c
@@ -0,0 +1,39 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x002D, 0x002D },
+    { 0x058A, 0x058A },
+    { 0x05BE, 0x05BE },
+    { 0x1806, 0x1806 },
+    { 0x2010, 0x2015 },
+    { 0x2053, 0x2053 },
+    { 0x207B, 0x207B },
+    { 0x208B, 0x208B },
+    { 0x2212, 0x2212 },
+    { 0x2E17, 0x2E17 },
+    { 0x301C, 0x301C },
+    { 0x3030, 0x3030 },
+    { 0x30A0, 0x30A0 },
+    { 0xFE31, 0xFE32 },
+    { 0xFE58, 0xFE58 },
+    { 0xFE63, 0xFE63 },
+    { 0xFF0D, 0xFF0D }
+
+#define PREDICATE(c) uc_is_property_dash (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_decimal_digit.c
@@ -0,0 +1,47 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0030, 0x0039 },
+    { 0x0660, 0x0669 },
+    { 0x06F0, 0x06F9 },
+    { 0x07C0, 0x07C9 },
+    { 0x0966, 0x096F },
+    { 0x09E6, 0x09EF },
+    { 0x0A66, 0x0A6F },
+    { 0x0AE6, 0x0AEF },
+    { 0x0B66, 0x0B6F },
+    { 0x0BE6, 0x0BEF },
+    { 0x0C66, 0x0C6F },
+    { 0x0CE6, 0x0CEF },
+    { 0x0D66, 0x0D6F },
+    { 0x0E50, 0x0E59 },
+    { 0x0ED0, 0x0ED9 },
+    { 0x0F20, 0x0F29 },
+    { 0x1040, 0x1049 },
+    { 0x17E0, 0x17E9 },
+    { 0x1810, 0x1819 },
+    { 0x1946, 0x194F },
+    { 0x19D0, 0x19D9 },
+    { 0x1B50, 0x1B59 },
+    { 0xFF10, 0xFF19 },
+    { 0x104A0, 0x104A9 },
+    { 0x1D7CE, 0x1D7FF }
+
+#define PREDICATE(c) uc_is_property_decimal_digit (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_default_ignorable_code_point.c
@@ -0,0 +1,62 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0000, 0x0008 },
+    { 0x000E, 0x001F },
+    { 0x007F, 0x0084 },
+    { 0x0086, 0x009F },
+    { 0x00AD, 0x00AD },
+    { 0x034F, 0x034F },
+    { 0x0600, 0x0603 },
+    { 0x06DD, 0x06DD },
+    { 0x070F, 0x070F },
+    { 0x115F, 0x1160 },
+    { 0x17B4, 0x17B5 },
+    { 0x180B, 0x180D },
+    { 0x200B, 0x200F },
+    { 0x202A, 0x202E },
+    { 0x2060, 0x206F },
+    { 0x3164, 0x3164 },
+    { 0xD800, 0xDFFF },
+    { 0xFDD0, 0xFDEF },
+    { 0xFE00, 0xFE0F },
+    { 0xFEFF, 0xFEFF },
+    { 0xFFA0, 0xFFA0 },
+    { 0xFFF0, 0xFFF8 },
+    { 0xFFFE, 0xFFFF },
+    { 0x1D173, 0x1D17A },
+    { 0x1FFFE, 0x1FFFF },
+    { 0x2FFFE, 0x2FFFF },
+    { 0x3FFFE, 0x3FFFF },
+    { 0x4FFFE, 0x4FFFF },
+    { 0x5FFFE, 0x5FFFF },
+    { 0x6FFFE, 0x6FFFF },
+    { 0x7FFFE, 0x7FFFF },
+    { 0x8FFFE, 0x8FFFF },
+    { 0x9FFFE, 0x9FFFF },
+    { 0xAFFFE, 0xAFFFF },
+    { 0xBFFFE, 0xBFFFF },
+    { 0xCFFFE, 0xCFFFF },
+    { 0xDFFFE, 0xE0FFF },
+    { 0xEFFFE, 0xEFFFF },
+    { 0xFFFFE, 0xFFFFF },
+    { 0x10FFFE, 0x10FFFF }
+
+#define PREDICATE(c) uc_is_property_default_ignorable_code_point (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_deprecated.c
@@ -0,0 +1,26 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0340, 0x0341 },
+    { 0x17A3, 0x17A3 },
+    { 0x17D3, 0x17D3 },
+    { 0x206A, 0x206F }
+
+#define PREDICATE(c) uc_is_property_deprecated (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_diacritic.c
@@ -0,0 +1,111 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x005E, 0x005E },
+    { 0x0060, 0x0060 },
+    { 0x00A8, 0x00A8 },
+    { 0x00AF, 0x00AF },
+    { 0x00B4, 0x00B4 },
+    { 0x00B7, 0x00B8 },
+    { 0x02B0, 0x034E },
+    { 0x0350, 0x0357 },
+    { 0x035D, 0x0362 },
+    { 0x0374, 0x0375 },
+    { 0x037A, 0x037A },
+    { 0x0384, 0x0385 },
+    { 0x0483, 0x0486 },
+    { 0x0559, 0x0559 },
+    { 0x0591, 0x05A1 },
+    { 0x05A3, 0x05BD },
+    { 0x05BF, 0x05BF },
+    { 0x05C1, 0x05C2 },
+    { 0x05C4, 0x05C4 },
+    { 0x064B, 0x0652 },
+    { 0x0657, 0x0658 },
+    { 0x06DF, 0x06E0 },
+    { 0x06E5, 0x06E6 },
+    { 0x06EA, 0x06EC },
+    { 0x0730, 0x074A },
+    { 0x07A6, 0x07B0 },
+    { 0x07EB, 0x07F5 },
+    { 0x093C, 0x093C },
+    { 0x094D, 0x094D },
+    { 0x0951, 0x0954 },
+    { 0x09BC, 0x09BC },
+    { 0x09CD, 0x09CD },
+    { 0x0A3C, 0x0A3C },
+    { 0x0A4D, 0x0A4D },
+    { 0x0ABC, 0x0ABC },
+    { 0x0ACD, 0x0ACD },
+    { 0x0B3C, 0x0B3C },
+    { 0x0B4D, 0x0B4D },
+    { 0x0BCD, 0x0BCD },
+    { 0x0C4D, 0x0C4D },
+    { 0x0CBC, 0x0CBC },
+    { 0x0CCD, 0x0CCD },
+    { 0x0D4D, 0x0D4D },
+    { 0x0DCA, 0x0DCA },
+    { 0x0E47, 0x0E4C },
+    { 0x0E4E, 0x0E4E },
+    { 0x0EC8, 0x0ECC },
+    { 0x0F18, 0x0F19 },
+    { 0x0F35, 0x0F35 },
+    { 0x0F37, 0x0F37 },
+    { 0x0F39, 0x0F39 },
+    { 0x0F3E, 0x0F3F },
+    { 0x0F82, 0x0F84 },
+    { 0x0F86, 0x0F87 },
+    { 0x0FC6, 0x0FC6 },
+    { 0x1037, 0x1037 },
+    { 0x1039, 0x1039 },
+    { 0x17C9, 0x17D3 },
+    { 0x17DD, 0x17DD },
+    { 0x1939, 0x193B },
+    { 0x1B34, 0x1B34 },
+    { 0x1B44, 0x1B44 },
+    { 0x1B6B, 0x1B73 },
+    { 0x1D2C, 0x1D6A },
+    { 0x1DC4, 0x1DCA },
+    { 0x1DFE, 0x1DFF },
+    { 0x1FBD, 0x1FBD },
+    { 0x1FBF, 0x1FC1 },
+    { 0x1FCD, 0x1FCF },
+    { 0x1FDD, 0x1FDF },
+    { 0x1FED, 0x1FEF },
+    { 0x1FFD, 0x1FFE },
+    { 0x302A, 0x302F },
+    { 0x3099, 0x309C },
+    { 0x30FC, 0x30FC },
+    { 0xA717, 0xA71A },
+    { 0xA720, 0xA721 },
+    { 0xFB1E, 0xFB1E },
+    { 0xFE20, 0xFE23 },
+    { 0xFF3E, 0xFF3E },
+    { 0xFF40, 0xFF40 },
+    { 0xFF70, 0xFF70 },
+    { 0xFF9E, 0xFF9F },
+    { 0xFFE3, 0xFFE3 },
+    { 0x1D167, 0x1D169 },
+    { 0x1D16D, 0x1D172 },
+    { 0x1D17B, 0x1D182 },
+    { 0x1D185, 0x1D18B },
+    { 0x1D1AA, 0x1D1AD }
+
+#define PREDICATE(c) uc_is_property_diacritic (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_extender.c
@@ -0,0 +1,35 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x00B7, 0x00B7 },
+    { 0x02D0, 0x02D1 },
+    { 0x0640, 0x0640 },
+    { 0x07FA, 0x07FA },
+    { 0x0E46, 0x0E46 },
+    { 0x0EC6, 0x0EC6 },
+    { 0x1843, 0x1843 },
+    { 0x3005, 0x3005 },
+    { 0x3031, 0x3035 },
+    { 0x309D, 0x309E },
+    { 0x30FC, 0x30FE },
+    { 0xA015, 0xA015 },
+    { 0xFF70, 0xFF70 }
+
+#define PREDICATE(c) uc_is_property_extender (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_format_control.c
@@ -0,0 +1,30 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x00AD, 0x00AD },
+    { 0x070F, 0x070F },
+    { 0x200B, 0x200B },
+    { 0x2060, 0x2063 },
+    { 0x206A, 0x206F },
+    { 0x1D173, 0x1D17A },
+    { 0xE0001, 0xE0001 },
+    { 0xE0020, 0xE007F }
+
+#define PREDICATE(c) uc_is_property_format_control (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_grapheme_base.c
@@ -0,0 +1,483 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0020, 0x007E },
+    { 0x00A0, 0x00AC },
+    { 0x00AE, 0x02FF },
+    { 0x0374, 0x0375 },
+    { 0x037A, 0x037E },
+    { 0x0384, 0x038A },
+    { 0x038C, 0x038C },
+    { 0x038E, 0x03A1 },
+    { 0x03A3, 0x03CE },
+    { 0x03D0, 0x0482 },
+    { 0x048A, 0x0513 },
+    { 0x0531, 0x0556 },
+    { 0x0559, 0x055F },
+    { 0x0561, 0x0587 },
+    { 0x0589, 0x058A },
+    { 0x05BE, 0x05BE },
+    { 0x05C0, 0x05C0 },
+    { 0x05C3, 0x05C3 },
+    { 0x05C6, 0x05C6 },
+    { 0x05D0, 0x05EA },
+    { 0x05F0, 0x05F4 },
+    { 0x060B, 0x060F },
+    { 0x061B, 0x061B },
+    { 0x061E, 0x061F },
+    { 0x0621, 0x063A },
+    { 0x0640, 0x064A },
+    { 0x0660, 0x066F },
+    { 0x0671, 0x06D5 },
+    { 0x06E5, 0x06E6 },
+    { 0x06E9, 0x06E9 },
+    { 0x06EE, 0x070D },
+    { 0x0710, 0x0710 },
+    { 0x0712, 0x072F },
+    { 0x074D, 0x076D },
+    { 0x0780, 0x07A5 },
+    { 0x07B1, 0x07B1 },
+    { 0x07C0, 0x07EA },
+    { 0x07F4, 0x07FA },
+    { 0x0903, 0x0939 },
+    { 0x093D, 0x0940 },
+    { 0x0949, 0x094C },
+    { 0x0950, 0x0950 },
+    { 0x0958, 0x0961 },
+    { 0x0964, 0x0970 },
+    { 0x097B, 0x097F },
+    { 0x0982, 0x0983 },
+    { 0x0985, 0x098C },
+    { 0x098F, 0x0990 },
+    { 0x0993, 0x09A8 },
+    { 0x09AA, 0x09B0 },
+    { 0x09B2, 0x09B2 },
+    { 0x09B6, 0x09B9 },
+    { 0x09BD, 0x09BD },
+    { 0x09BF, 0x09C0 },
+    { 0x09C7, 0x09C8 },
+    { 0x09CB, 0x09CC },
+    { 0x09CE, 0x09CE },
+    { 0x09DC, 0x09DD },
+    { 0x09DF, 0x09E1 },
+    { 0x09E6, 0x09FA },
+    { 0x0A03, 0x0A03 },
+    { 0x0A05, 0x0A0A },
+    { 0x0A0F, 0x0A10 },
+    { 0x0A13, 0x0A28 },
+    { 0x0A2A, 0x0A30 },
+    { 0x0A32, 0x0A33 },
+    { 0x0A35, 0x0A36 },
+    { 0x0A38, 0x0A39 },
+    { 0x0A3E, 0x0A40 },
+    { 0x0A59, 0x0A5C },
+    { 0x0A5E, 0x0A5E },
+    { 0x0A66, 0x0A6F },
+    { 0x0A72, 0x0A74 },
+    { 0x0A83, 0x0A83 },
+    { 0x0A85, 0x0A8D },
+    { 0x0A8F, 0x0A91 },
+    { 0x0A93, 0x0AA8 },
+    { 0x0AAA, 0x0AB0 },
+    { 0x0AB2, 0x0AB3 },
+    { 0x0AB5, 0x0AB9 },
+    { 0x0ABD, 0x0AC0 },
+    { 0x0AC9, 0x0AC9 },
+    { 0x0ACB, 0x0ACC },
+    { 0x0AD0, 0x0AD0 },
+    { 0x0AE0, 0x0AE1 },
+    { 0x0AE6, 0x0AEF },
+    { 0x0AF1, 0x0AF1 },
+    { 0x0B02, 0x0B03 },
+    { 0x0B05, 0x0B0C },
+    { 0x0B0F, 0x0B10 },
+    { 0x0B13, 0x0B28 },
+    { 0x0B2A, 0x0B30 },
+    { 0x0B32, 0x0B33 },
+    { 0x0B35, 0x0B39 },
+    { 0x0B3D, 0x0B3D },
+    { 0x0B40, 0x0B40 },
+    { 0x0B47, 0x0B48 },
+    { 0x0B4B, 0x0B4C },
+    { 0x0B5C, 0x0B5D },
+    { 0x0B5F, 0x0B61 },
+    { 0x0B66, 0x0B71 },
+    { 0x0B83, 0x0B83 },
+    { 0x0B85, 0x0B8A },
+    { 0x0B8E, 0x0B90 },
+    { 0x0B92, 0x0B95 },
+    { 0x0B99, 0x0B9A },
+    { 0x0B9C, 0x0B9C },
+    { 0x0B9E, 0x0B9F },
+    { 0x0BA3, 0x0BA4 },
+    { 0x0BA8, 0x0BAA },
+    { 0x0BAE, 0x0BB9 },
+    { 0x0BBF, 0x0BBF },
+    { 0x0BC1, 0x0BC2 },
+    { 0x0BC6, 0x0BC8 },
+    { 0x0BCA, 0x0BCC },
+    { 0x0BE6, 0x0BFA },
+    { 0x0C01, 0x0C03 },
+    { 0x0C05, 0x0C0C },
+    { 0x0C0E, 0x0C10 },
+    { 0x0C12, 0x0C28 },
+    { 0x0C2A, 0x0C33 },
+    { 0x0C35, 0x0C39 },
+    { 0x0C41, 0x0C44 },
+    { 0x0C60, 0x0C61 },
+    { 0x0C66, 0x0C6F },
+    { 0x0C82, 0x0C83 },
+    { 0x0C85, 0x0C8C },
+    { 0x0C8E, 0x0C90 },
+    { 0x0C92, 0x0CA8 },
+    { 0x0CAA, 0x0CB3 },
+    { 0x0CB5, 0x0CB9 },
+    { 0x0CBD, 0x0CBE },
+    { 0x0CC0, 0x0CC1 },
+    { 0x0CC3, 0x0CC4 },
+    { 0x0CC7, 0x0CC8 },
+    { 0x0CCA, 0x0CCB },
+    { 0x0CDE, 0x0CDE },
+    { 0x0CE0, 0x0CE1 },
+    { 0x0CE6, 0x0CEF },
+    { 0x0CF1, 0x0CF2 },
+    { 0x0D02, 0x0D03 },
+    { 0x0D05, 0x0D0C },
+    { 0x0D0E, 0x0D10 },
+    { 0x0D12, 0x0D28 },
+    { 0x0D2A, 0x0D39 },
+    { 0x0D3F, 0x0D40 },
+    { 0x0D46, 0x0D48 },
+    { 0x0D4A, 0x0D4C },
+    { 0x0D60, 0x0D61 },
+    { 0x0D66, 0x0D6F },
+    { 0x0D82, 0x0D83 },
+    { 0x0D85, 0x0D96 },
+    { 0x0D9A, 0x0DB1 },
+    { 0x0DB3, 0x0DBB },
+    { 0x0DBD, 0x0DBD },
+    { 0x0DC0, 0x0DC6 },
+    { 0x0DD0, 0x0DD1 },
+    { 0x0DD8, 0x0DDE },
+    { 0x0DF2, 0x0DF4 },
+    { 0x0E01, 0x0E30 },
+    { 0x0E32, 0x0E33 },
+    { 0x0E3F, 0x0E46 },
+    { 0x0E4F, 0x0E5B },
+    { 0x0E81, 0x0E82 },
+    { 0x0E84, 0x0E84 },
+    { 0x0E87, 0x0E88 },
+    { 0x0E8A, 0x0E8A },
+    { 0x0E8D, 0x0E8D },
+    { 0x0E94, 0x0E97 },
+    { 0x0E99, 0x0E9F },
+    { 0x0EA1, 0x0EA3 },
+    { 0x0EA5, 0x0EA5 },
+    { 0x0EA7, 0x0EA7 },
+    { 0x0EAA, 0x0EAB },
+    { 0x0EAD, 0x0EB0 },
+    { 0x0EB2, 0x0EB3 },
+    { 0x0EBD, 0x0EBD },
+    { 0x0EC0, 0x0EC4 },
+    { 0x0EC6, 0x0EC6 },
+    { 0x0ED0, 0x0ED9 },
+    { 0x0EDC, 0x0EDD },
+    { 0x0F00, 0x0F17 },
+    { 0x0F1A, 0x0F34 },
+    { 0x0F36, 0x0F36 },
+    { 0x0F38, 0x0F38 },
+    { 0x0F3A, 0x0F47 },
+    { 0x0F49, 0x0F6A },
+    { 0x0F7F, 0x0F7F },
+    { 0x0F85, 0x0F85 },
+    { 0x0F88, 0x0F8B },
+    { 0x0FBE, 0x0FC5 },
+    { 0x0FC7, 0x0FCC },
+    { 0x0FCF, 0x0FD1 },
+    { 0x1000, 0x1021 },
+    { 0x1023, 0x1027 },
+    { 0x1029, 0x102A },
+    { 0x102C, 0x102C },
+    { 0x1031, 0x1031 },
+    { 0x1038, 0x1038 },
+    { 0x1040, 0x1057 },
+    { 0x10A0, 0x10C5 },
+    { 0x10D0, 0x10FC },
+    { 0x1100, 0x1159 },
+    { 0x115F, 0x11A2 },
+    { 0x11A8, 0x11F9 },
+    { 0x1200, 0x1248 },
+    { 0x124A, 0x124D },
+    { 0x1250, 0x1256 },
+    { 0x1258, 0x1258 },
+    { 0x125A, 0x125D },
+    { 0x1260, 0x1288 },
+    { 0x128A, 0x128D },
+    { 0x1290, 0x12B0 },
+    { 0x12B2, 0x12B5 },
+    { 0x12B8, 0x12BE },
+    { 0x12C0, 0x12C0 },
+    { 0x12C2, 0x12C5 },
+    { 0x12C8, 0x12D6 },
+    { 0x12D8, 0x1310 },
+    { 0x1312, 0x1315 },
+    { 0x1318, 0x135A },
+    { 0x1360, 0x137C },
+    { 0x1380, 0x1399 },
+    { 0x13A0, 0x13F4 },
+    { 0x1401, 0x1676 },
+    { 0x1680, 0x169C },
+    { 0x16A0, 0x16F0 },
+    { 0x1700, 0x170C },
+    { 0x170E, 0x1711 },
+    { 0x1720, 0x1731 },
+    { 0x1735, 0x1736 },
+    { 0x1740, 0x1751 },
+    { 0x1760, 0x176C },
+    { 0x176E, 0x1770 },
+    { 0x1780, 0x17B3 },
+    { 0x17B6, 0x17B6 },
+    { 0x17BE, 0x17C5 },
+    { 0x17C7, 0x17C8 },
+    { 0x17D4, 0x17DC },
+    { 0x17E0, 0x17E9 },
+    { 0x17F0, 0x17F9 },
+    { 0x1800, 0x180A },
+    { 0x180E, 0x180E },
+    { 0x1810, 0x1819 },
+    { 0x1820, 0x1877 },
+    { 0x1880, 0x18A8 },
+    { 0x1900, 0x191C },
+    { 0x1923, 0x1926 },
+    { 0x1929, 0x192B },
+    { 0x1930, 0x1931 },
+    { 0x1933, 0x1938 },
+    { 0x1940, 0x1940 },
+    { 0x1944, 0x196D },
+    { 0x1970, 0x1974 },
+    { 0x1980, 0x19A9 },
+    { 0x19B0, 0x19C9 },
+    { 0x19D0, 0x19D9 },
+    { 0x19DE, 0x1A16 },
+    { 0x1A19, 0x1A1B },
+    { 0x1A1E, 0x1A1F },
+    { 0x1B04, 0x1B33 },
+    { 0x1B35, 0x1B35 },
+    { 0x1B3B, 0x1B3B },
+    { 0x1B3D, 0x1B41 },
+    { 0x1B43, 0x1B4B },
+    { 0x1B50, 0x1B6A },
+    { 0x1B74, 0x1B7C },
+    { 0x1D00, 0x1DBF },
+    { 0x1E00, 0x1E9B },
+    { 0x1EA0, 0x1EF9 },
+    { 0x1F00, 0x1F15 },
+    { 0x1F18, 0x1F1D },
+    { 0x1F20, 0x1F45 },
+    { 0x1F48, 0x1F4D },
+    { 0x1F50, 0x1F57 },
+    { 0x1F59, 0x1F59 },
+    { 0x1F5B, 0x1F5B },
+    { 0x1F5D, 0x1F5D },
+    { 0x1F5F, 0x1F7D },
+    { 0x1F80, 0x1FB4 },
+    { 0x1FB6, 0x1FC4 },
+    { 0x1FC6, 0x1FD3 },
+    { 0x1FD6, 0x1FDB },
+    { 0x1FDD, 0x1FEF },
+    { 0x1FF2, 0x1FF4 },
+    { 0x1FF6, 0x1FFE },
+    { 0x2000, 0x200A },
+    { 0x2010, 0x2027 },
+    { 0x202F, 0x205F },
+    { 0x2070, 0x2071 },
+    { 0x2074, 0x208E },
+    { 0x2090, 0x2094 },
+    { 0x20A0, 0x20B5 },
+    { 0x2100, 0x214E },
+    { 0x2153, 0x2184 },
+    { 0x2190, 0x23E7 },
+    { 0x2400, 0x2426 },
+    { 0x2440, 0x244A },
+    { 0x2460, 0x269C },
+    { 0x26A0, 0x26B2 },
+    { 0x2701, 0x2704 },
+    { 0x2706, 0x2709 },
+    { 0x270C, 0x2727 },
+    { 0x2729, 0x274B },
+    { 0x274D, 0x274D },
+    { 0x274F, 0x2752 },
+    { 0x2756, 0x2756 },
+    { 0x2758, 0x275E },
+    { 0x2761, 0x2794 },
+    { 0x2798, 0x27AF },
+    { 0x27B1, 0x27BE },
+    { 0x27C0, 0x27CA },
+    { 0x27D0, 0x27EB },
+    { 0x27F0, 0x2B1A },
+    { 0x2B20, 0x2B23 },
+    { 0x2C00, 0x2C2E },
+    { 0x2C30, 0x2C5E },
+    { 0x2C60, 0x2C6C },
+    { 0x2C74, 0x2C77 },
+    { 0x2C80, 0x2CEA },
+    { 0x2CF9, 0x2D25 },
+    { 0x2D30, 0x2D65 },
+    { 0x2D6F, 0x2D6F },
+    { 0x2D80, 0x2D96 },
+    { 0x2DA0, 0x2DA6 },
+    { 0x2DA8, 0x2DAE },
+    { 0x2DB0, 0x2DB6 },
+    { 0x2DB8, 0x2DBE },
+    { 0x2DC0, 0x2DC6 },
+    { 0x2DC8, 0x2DCE },
+    { 0x2DD0, 0x2DD6 },
+    { 0x2DD8, 0x2DDE },
+    { 0x2E00, 0x2E17 },
+    { 0x2E1C, 0x2E1D },
+    { 0x2E80, 0x2E99 },
+    { 0x2E9B, 0x2EF3 },
+    { 0x2F00, 0x2FD5 },
+    { 0x2FF0, 0x2FFB },
+    { 0x3000, 0x3029 },
+    { 0x3030, 0x303F },
+    { 0x3041, 0x3096 },
+    { 0x309B, 0x30FF },
+    { 0x3105, 0x312C },
+    { 0x3131, 0x318E },
+    { 0x3190, 0x31B7 },
+    { 0x31C0, 0x31CF },
+    { 0x31F0, 0x321E },
+    { 0x3220, 0x3243 },
+    { 0x3250, 0x32FE },
+    { 0x3300, 0x4DB5 },
+    { 0x4DC0, 0x9FBB },
+    { 0xA000, 0xA48C },
+    { 0xA490, 0xA4C6 },
+    { 0xA700, 0xA71A },
+    { 0xA720, 0xA721 },
+    { 0xA800, 0xA805 },
+    { 0xA807, 0xA80A },
+    { 0xA80C, 0xA824 },
+    { 0xA827, 0xA82B },
+    { 0xA840, 0xA877 },
+    { 0xAC00, 0xD7A3 },
+    { 0xF900, 0xFA2D },
+    { 0xFA30, 0xFA6A },
+    { 0xFA70, 0xFAD9 },
+    { 0xFB00, 0xFB06 },
+    { 0xFB13, 0xFB17 },
+    { 0xFB1D, 0xFB1D },
+    { 0xFB1F, 0xFB36 },
+    { 0xFB38, 0xFB3C },
+    { 0xFB3E, 0xFB3E },
+    { 0xFB40, 0xFB41 },
+    { 0xFB43, 0xFB44 },
+    { 0xFB46, 0xFBB1 },
+    { 0xFBD3, 0xFD3F },
+    { 0xFD50, 0xFD8F },
+    { 0xFD92, 0xFDC7 },
+    { 0xFDF0, 0xFDFD },
+    { 0xFE10, 0xFE19 },
+    { 0xFE30, 0xFE52 },
+    { 0xFE54, 0xFE66 },
+    { 0xFE68, 0xFE6B },
+    { 0xFE70, 0xFE74 },
+    { 0xFE76, 0xFEFC },
+    { 0xFF01, 0xFFBE },
+    { 0xFFC2, 0xFFC7 },
+    { 0xFFCA, 0xFFCF },
+    { 0xFFD2, 0xFFD7 },
+    { 0xFFDA, 0xFFDC },
+    { 0xFFE0, 0xFFE6 },
+    { 0xFFE8, 0xFFEE },
+    { 0xFFFC, 0xFFFD },
+    { 0x10000, 0x1000B },
+    { 0x1000D, 0x10026 },
+    { 0x10028, 0x1003A },
+    { 0x1003C, 0x1003D },
+    { 0x1003F, 0x1004D },
+    { 0x10050, 0x1005D },
+    { 0x10080, 0x100FA },
+    { 0x10100, 0x10102 },
+    { 0x10107, 0x10133 },
+    { 0x10137, 0x1018A },
+    { 0x10300, 0x1031E },
+    { 0x10320, 0x10323 },
+    { 0x10330, 0x1034A },
+    { 0x10380, 0x1039D },
+    { 0x1039F, 0x103C3 },
+    { 0x103C8, 0x103D5 },
+    { 0x10400, 0x1049D },
+    { 0x104A0, 0x104A9 },
+    { 0x10800, 0x10805 },
+    { 0x10808, 0x10808 },
+    { 0x1080A, 0x10835 },
+    { 0x10837, 0x10838 },
+    { 0x1083C, 0x1083C },
+    { 0x1083F, 0x1083F },
+    { 0x10900, 0x10919 },
+    { 0x1091F, 0x1091F },
+    { 0x10A00, 0x10A00 },
+    { 0x10A10, 0x10A13 },
+    { 0x10A15, 0x10A17 },
+    { 0x10A19, 0x10A33 },
+    { 0x10A40, 0x10A47 },
+    { 0x10A50, 0x10A58 },
+    { 0x12000, 0x1236E },
+    { 0x12400, 0x12462 },
+    { 0x12470, 0x12473 },
+    { 0x1D000, 0x1D0F5 },
+    { 0x1D100, 0x1D126 },
+    { 0x1D12A, 0x1D164 },
+    { 0x1D166, 0x1D166 },
+    { 0x1D16A, 0x1D16D },
+    { 0x1D183, 0x1D184 },
+    { 0x1D18C, 0x1D1A9 },
+    { 0x1D1AE, 0x1D1DD },
+    { 0x1D200, 0x1D241 },
+    { 0x1D245, 0x1D245 },
+    { 0x1D300, 0x1D356 },
+    { 0x1D360, 0x1D371 },
+    { 0x1D400, 0x1D454 },
+    { 0x1D456, 0x1D49C },
+    { 0x1D49E, 0x1D49F },
+    { 0x1D4A2, 0x1D4A2 },
+    { 0x1D4A5, 0x1D4A6 },
+    { 0x1D4A9, 0x1D4AC },
+    { 0x1D4AE, 0x1D4B9 },
+    { 0x1D4BB, 0x1D4BB },
+    { 0x1D4BD, 0x1D4C3 },
+    { 0x1D4C5, 0x1D505 },
+    { 0x1D507, 0x1D50A },
+    { 0x1D50D, 0x1D514 },
+    { 0x1D516, 0x1D51C },
+    { 0x1D51E, 0x1D539 },
+    { 0x1D53B, 0x1D53E },
+    { 0x1D540, 0x1D544 },
+    { 0x1D546, 0x1D546 },
+    { 0x1D54A, 0x1D550 },
+    { 0x1D552, 0x1D6A5 },
+    { 0x1D6A8, 0x1D7CB },
+    { 0x1D7CE, 0x1D7FF },
+    { 0x20000, 0x2A6D6 },
+    { 0x2F800, 0x2FA1D }
+
+#define PREDICATE(c) uc_is_property_grapheme_base (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_grapheme_extend.c
@@ -0,0 +1,166 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0300, 0x036F },
+    { 0x0483, 0x0486 },
+    { 0x0488, 0x0489 },
+    { 0x0591, 0x05BD },
+    { 0x05BF, 0x05BF },
+    { 0x05C1, 0x05C2 },
+    { 0x05C4, 0x05C5 },
+    { 0x05C7, 0x05C7 },
+    { 0x0610, 0x0615 },
+    { 0x064B, 0x065E },
+    { 0x0670, 0x0670 },
+    { 0x06D6, 0x06DC },
+    { 0x06DE, 0x06E4 },
+    { 0x06E7, 0x06E8 },
+    { 0x06EA, 0x06ED },
+    { 0x0711, 0x0711 },
+    { 0x0730, 0x074A },
+    { 0x07A6, 0x07B0 },
+    { 0x07EB, 0x07F3 },
+    { 0x0901, 0x0902 },
+    { 0x093C, 0x093C },
+    { 0x0941, 0x0948 },
+    { 0x094D, 0x094D },
+    { 0x0951, 0x0954 },
+    { 0x0962, 0x0963 },
+    { 0x0981, 0x0981 },
+    { 0x09BC, 0x09BC },
+    { 0x09BE, 0x09BE },
+    { 0x09C1, 0x09C4 },
+    { 0x09CD, 0x09CD },
+    { 0x09D7, 0x09D7 },
+    { 0x09E2, 0x09E3 },
+    { 0x0A01, 0x0A02 },
+    { 0x0A3C, 0x0A3C },
+    { 0x0A41, 0x0A42 },
+    { 0x0A47, 0x0A48 },
+    { 0x0A4B, 0x0A4D },
+    { 0x0A70, 0x0A71 },
+    { 0x0A81, 0x0A82 },
+    { 0x0ABC, 0x0ABC },
+    { 0x0AC1, 0x0AC5 },
+    { 0x0AC7, 0x0AC8 },
+    { 0x0ACD, 0x0ACD },
+    { 0x0AE2, 0x0AE3 },
+    { 0x0B01, 0x0B01 },
+    { 0x0B3C, 0x0B3C },
+    { 0x0B3E, 0x0B3F },
+    { 0x0B41, 0x0B43 },
+    { 0x0B4D, 0x0B4D },
+    { 0x0B56, 0x0B57 },
+    { 0x0B82, 0x0B82 },
+    { 0x0BBE, 0x0BBE },
+    { 0x0BC0, 0x0BC0 },
+    { 0x0BCD, 0x0BCD },
+    { 0x0BD7, 0x0BD7 },
+    { 0x0C3E, 0x0C40 },
+    { 0x0C46, 0x0C48 },
+    { 0x0C4A, 0x0C4D },
+    { 0x0C55, 0x0C56 },
+    { 0x0CBC, 0x0CBC },
+    { 0x0CBF, 0x0CBF },
+    { 0x0CC2, 0x0CC2 },
+    { 0x0CC6, 0x0CC6 },
+    { 0x0CCC, 0x0CCD },
+    { 0x0CD5, 0x0CD6 },
+    { 0x0CE2, 0x0CE3 },
+    { 0x0D3E, 0x0D3E },
+    { 0x0D41, 0x0D43 },
+    { 0x0D4D, 0x0D4D },
+    { 0x0D57, 0x0D57 },
+    { 0x0DCA, 0x0DCA },
+    { 0x0DCF, 0x0DCF },
+    { 0x0DD2, 0x0DD4 },
+    { 0x0DD6, 0x0DD6 },
+    { 0x0DDF, 0x0DDF },
+    { 0x0E31, 0x0E31 },
+    { 0x0E34, 0x0E3A },
+    { 0x0E47, 0x0E4E },
+    { 0x0EB1, 0x0EB1 },
+    { 0x0EB4, 0x0EB9 },
+    { 0x0EBB, 0x0EBC },
+    { 0x0EC8, 0x0ECD },
+    { 0x0F18, 0x0F19 },
+    { 0x0F35, 0x0F35 },
+    { 0x0F37, 0x0F37 },
+    { 0x0F39, 0x0F39 },
+    { 0x0F71, 0x0F7E },
+    { 0x0F80, 0x0F84 },
+    { 0x0F86, 0x0F87 },
+    { 0x0F90, 0x0F97 },
+    { 0x0F99, 0x0FBC },
+    { 0x0FC6, 0x0FC6 },
+    { 0x102D, 0x1030 },
+    { 0x1032, 0x1032 },
+    { 0x1036, 0x1037 },
+    { 0x1039, 0x1039 },
+    { 0x1058, 0x1059 },
+    { 0x135F, 0x135F },
+    { 0x1712, 0x1714 },
+    { 0x1732, 0x1734 },
+    { 0x1752, 0x1753 },
+    { 0x1772, 0x1773 },
+    { 0x17B7, 0x17BD },
+    { 0x17C6, 0x17C6 },
+    { 0x17C9, 0x17D3 },
+    { 0x17DD, 0x17DD },
+    { 0x180B, 0x180D },
+    { 0x18A9, 0x18A9 },
+    { 0x1920, 0x1922 },
+    { 0x1927, 0x1928 },
+    { 0x1932, 0x1932 },
+    { 0x1939, 0x193B },
+    { 0x1A17, 0x1A18 },
+    { 0x1B00, 0x1B03 },
+    { 0x1B34, 0x1B34 },
+    { 0x1B36, 0x1B3A },
+    { 0x1B3C, 0x1B3C },
+    { 0x1B42, 0x1B42 },
+    { 0x1B6B, 0x1B73 },
+    { 0x1DC0, 0x1DCA },
+    { 0x1DFE, 0x1DFF },
+    { 0x200C, 0x200D },
+    { 0x20D0, 0x20EF },
+    { 0x302A, 0x302F },
+    { 0x3099, 0x309A },
+    { 0xA806, 0xA806 },
+    { 0xA80B, 0xA80B },
+    { 0xA825, 0xA826 },
+    { 0xFB1E, 0xFB1E },
+    { 0xFE00, 0xFE0F },
+    { 0xFE20, 0xFE23 },
+    { 0x10A01, 0x10A03 },
+    { 0x10A05, 0x10A06 },
+    { 0x10A0C, 0x10A0F },
+    { 0x10A38, 0x10A3A },
+    { 0x10A3F, 0x10A3F },
+    { 0x1D165, 0x1D165 },
+    { 0x1D167, 0x1D169 },
+    { 0x1D16E, 0x1D172 },
+    { 0x1D17B, 0x1D182 },
+    { 0x1D185, 0x1D18B },
+    { 0x1D1AA, 0x1D1AD },
+    { 0x1D242, 0x1D244 },
+    { 0xE0100, 0xE01EF }
+
+#define PREDICATE(c) uc_is_property_grapheme_extend (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_grapheme_link.c
@@ -0,0 +1,41 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x094D, 0x094D },
+    { 0x09CD, 0x09CD },
+    { 0x0A4D, 0x0A4D },
+    { 0x0ACD, 0x0ACD },
+    { 0x0B4D, 0x0B4D },
+    { 0x0BCD, 0x0BCD },
+    { 0x0C4D, 0x0C4D },
+    { 0x0CCD, 0x0CCD },
+    { 0x0D4D, 0x0D4D },
+    { 0x0DCA, 0x0DCA },
+    { 0x0E3A, 0x0E3A },
+    { 0x0F84, 0x0F84 },
+    { 0x1039, 0x1039 },
+    { 0x1714, 0x1714 },
+    { 0x1734, 0x1734 },
+    { 0x17D2, 0x17D2 },
+    { 0x1B44, 0x1B44 },
+    { 0xA806, 0xA806 },
+    { 0x10A3F, 0x10A3F }
+
+#define PREDICATE(c) uc_is_property_grapheme_link (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_hex_digit.c
@@ -0,0 +1,28 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0030, 0x0039 },
+    { 0x0041, 0x0046 },
+    { 0x0061, 0x0066 },
+    { 0xFF10, 0xFF19 },
+    { 0xFF21, 0xFF26 },
+    { 0xFF41, 0xFF46 }
+
+#define PREDICATE(c) uc_is_property_hex_digit (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_hyphen.c
@@ -0,0 +1,32 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x002D, 0x002D },
+    { 0x00AD, 0x00AD },
+    { 0x058A, 0x058A },
+    { 0x1806, 0x1806 },
+    { 0x2010, 0x2011 },
+    { 0x2E17, 0x2E17 },
+    { 0x30FB, 0x30FB },
+    { 0xFE63, 0xFE63 },
+    { 0xFF0D, 0xFF0D },
+    { 0xFF65, 0xFF65 }
+
+#define PREDICATE(c) uc_is_property_hyphen (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_id_continue.c
@@ -0,0 +1,477 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0030, 0x0039 },
+    { 0x0041, 0x005A },
+    { 0x005F, 0x005F },
+    { 0x0061, 0x007A },
+    { 0x00AA, 0x00AA },
+    { 0x00B5, 0x00B5 },
+    { 0x00BA, 0x00BA },
+    { 0x00C0, 0x00D6 },
+    { 0x00D8, 0x00F6 },
+    { 0x00F8, 0x02C1 },
+    { 0x02C6, 0x02D1 },
+    { 0x02E0, 0x02E4 },
+    { 0x02EE, 0x02EE },
+    { 0x0300, 0x036F },
+    { 0x037A, 0x037D },
+    { 0x0386, 0x0386 },
+    { 0x0388, 0x038A },
+    { 0x038C, 0x038C },
+    { 0x038E, 0x03A1 },
+    { 0x03A3, 0x03CE },
+    { 0x03D0, 0x03F5 },
+    { 0x03F7, 0x0481 },
+    { 0x0483, 0x0486 },
+    { 0x048A, 0x0513 },
+    { 0x0531, 0x0556 },
+    { 0x0559, 0x0559 },
+    { 0x0561, 0x0587 },
+    { 0x0591, 0x05BD },
+    { 0x05BF, 0x05BF },
+    { 0x05C1, 0x05C2 },
+    { 0x05C4, 0x05C5 },
+    { 0x05C7, 0x05C7 },
+    { 0x05D0, 0x05EA },
+    { 0x05F0, 0x05F2 },
+    { 0x0610, 0x0615 },
+    { 0x0621, 0x063A },
+    { 0x0640, 0x065E },
+    { 0x0660, 0x0669 },
+    { 0x066E, 0x06D3 },
+    { 0x06D5, 0x06DC },
+    { 0x06DF, 0x06E8 },
+    { 0x06EA, 0x06FC },
+    { 0x06FF, 0x06FF },
+    { 0x0710, 0x074A },
+    { 0x074D, 0x076D },
+    { 0x0780, 0x07B1 },
+    { 0x07C0, 0x07F5 },
+    { 0x07FA, 0x07FA },
+    { 0x0901, 0x0939 },
+    { 0x093C, 0x094D },
+    { 0x0950, 0x0954 },
+    { 0x0958, 0x0963 },
+    { 0x0966, 0x096F },
+    { 0x097B, 0x097F },
+    { 0x0981, 0x0983 },
+    { 0x0985, 0x098C },
+    { 0x098F, 0x0990 },
+    { 0x0993, 0x09A8 },
+    { 0x09AA, 0x09B0 },
+    { 0x09B2, 0x09B2 },
+    { 0x09B6, 0x09B9 },
+    { 0x09BC, 0x09C4 },
+    { 0x09C7, 0x09C8 },
+    { 0x09CB, 0x09CE },
+    { 0x09D7, 0x09D7 },
+    { 0x09DC, 0x09DD },
+    { 0x09DF, 0x09E3 },
+    { 0x09E6, 0x09F1 },
+    { 0x0A01, 0x0A03 },
+    { 0x0A05, 0x0A0A },
+    { 0x0A0F, 0x0A10 },
+    { 0x0A13, 0x0A28 },
+    { 0x0A2A, 0x0A30 },
+    { 0x0A32, 0x0A33 },
+    { 0x0A35, 0x0A36 },
+    { 0x0A38, 0x0A39 },
+    { 0x0A3C, 0x0A3C },
+    { 0x0A3E, 0x0A42 },
+    { 0x0A47, 0x0A48 },
+    { 0x0A4B, 0x0A4D },
+    { 0x0A59, 0x0A5C },
+    { 0x0A5E, 0x0A5E },
+    { 0x0A66, 0x0A74 },
+    { 0x0A81, 0x0A83 },
+    { 0x0A85, 0x0A8D },
+    { 0x0A8F, 0x0A91 },
+    { 0x0A93, 0x0AA8 },
+    { 0x0AAA, 0x0AB0 },
+    { 0x0AB2, 0x0AB3 },
+    { 0x0AB5, 0x0AB9 },
+    { 0x0ABC, 0x0AC5 },
+    { 0x0AC7, 0x0AC9 },
+    { 0x0ACB, 0x0ACD },
+    { 0x0AD0, 0x0AD0 },
+    { 0x0AE0, 0x0AE3 },
+    { 0x0AE6, 0x0AEF },
+    { 0x0B01, 0x0B03 },
+    { 0x0B05, 0x0B0C },
+    { 0x0B0F, 0x0B10 },
+    { 0x0B13, 0x0B28 },
+    { 0x0B2A, 0x0B30 },
+    { 0x0B32, 0x0B33 },
+    { 0x0B35, 0x0B39 },
+    { 0x0B3C, 0x0B43 },
+    { 0x0B47, 0x0B48 },
+    { 0x0B4B, 0x0B4D },
+    { 0x0B56, 0x0B57 },
+    { 0x0B5C, 0x0B5D },
+    { 0x0B5F, 0x0B61 },
+    { 0x0B66, 0x0B6F },
+    { 0x0B71, 0x0B71 },
+    { 0x0B82, 0x0B83 },
+    { 0x0B85, 0x0B8A },
+    { 0x0B8E, 0x0B90 },
+    { 0x0B92, 0x0B95 },
+    { 0x0B99, 0x0B9A },
+    { 0x0B9C, 0x0B9C },
+    { 0x0B9E, 0x0B9F },
+    { 0x0BA3, 0x0BA4 },
+    { 0x0BA8, 0x0BAA },
+    { 0x0BAE, 0x0BB9 },
+    { 0x0BBE, 0x0BC2 },
+    { 0x0BC6, 0x0BC8 },
+    { 0x0BCA, 0x0BCD },
+    { 0x0BD7, 0x0BD7 },
+    { 0x0BE6, 0x0BEF },
+    { 0x0C01, 0x0C03 },
+    { 0x0C05, 0x0C0C },
+    { 0x0C0E, 0x0C10 },
+    { 0x0C12, 0x0C28 },
+    { 0x0C2A, 0x0C33 },
+    { 0x0C35, 0x0C39 },
+    { 0x0C3E, 0x0C44 },
+    { 0x0C46, 0x0C48 },
+    { 0x0C4A, 0x0C4D },
+    { 0x0C55, 0x0C56 },
+    { 0x0C60, 0x0C61 },
+    { 0x0C66, 0x0C6F },
+    { 0x0C82, 0x0C83 },
+    { 0x0C85, 0x0C8C },
+    { 0x0C8E, 0x0C90 },
+    { 0x0C92, 0x0CA8 },
+    { 0x0CAA, 0x0CB3 },
+    { 0x0CB5, 0x0CB9 },
+    { 0x0CBC, 0x0CC4 },
+    { 0x0CC6, 0x0CC8 },
+    { 0x0CCA, 0x0CCD },
+    { 0x0CD5, 0x0CD6 },
+    { 0x0CDE, 0x0CDE },
+    { 0x0CE0, 0x0CE3 },
+    { 0x0CE6, 0x0CEF },
+    { 0x0D02, 0x0D03 },
+    { 0x0D05, 0x0D0C },
+    { 0x0D0E, 0x0D10 },
+    { 0x0D12, 0x0D28 },
+    { 0x0D2A, 0x0D39 },
+    { 0x0D3E, 0x0D43 },
+    { 0x0D46, 0x0D48 },
+    { 0x0D4A, 0x0D4D },
+    { 0x0D57, 0x0D57 },
+    { 0x0D60, 0x0D61 },
+    { 0x0D66, 0x0D6F },
+    { 0x0D82, 0x0D83 },
+    { 0x0D85, 0x0D96 },
+    { 0x0D9A, 0x0DB1 },
+    { 0x0DB3, 0x0DBB },
+    { 0x0DBD, 0x0DBD },
+    { 0x0DC0, 0x0DC6 },
+    { 0x0DCA, 0x0DCA },
+    { 0x0DCF, 0x0DD4 },
+    { 0x0DD6, 0x0DD6 },
+    { 0x0DD8, 0x0DDF },
+    { 0x0DF2, 0x0DF3 },
+    { 0x0E01, 0x0E3A },
+    { 0x0E40, 0x0E4E },
+    { 0x0E50, 0x0E59 },
+    { 0x0E81, 0x0E82 },
+    { 0x0E84, 0x0E84 },
+    { 0x0E87, 0x0E88 },
+    { 0x0E8A, 0x0E8A },
+    { 0x0E8D, 0x0E8D },
+    { 0x0E94, 0x0E97 },
+    { 0x0E99, 0x0E9F },
+    { 0x0EA1, 0x0EA3 },
+    { 0x0EA5, 0x0EA5 },
+    { 0x0EA7, 0x0EA7 },
+    { 0x0EAA, 0x0EAB },
+    { 0x0EAD, 0x0EB9 },
+    { 0x0EBB, 0x0EBD },
+    { 0x0EC0, 0x0EC4 },
+    { 0x0EC6, 0x0EC6 },
+    { 0x0EC8, 0x0ECD },
+    { 0x0ED0, 0x0ED9 },
+    { 0x0EDC, 0x0EDD },
+    { 0x0F00, 0x0F00 },
+    { 0x0F18, 0x0F19 },
+    { 0x0F20, 0x0F29 },
+    { 0x0F35, 0x0F35 },
+    { 0x0F37, 0x0F37 },
+    { 0x0F39, 0x0F39 },
+    { 0x0F3E, 0x0F47 },
+    { 0x0F49, 0x0F6A },
+    { 0x0F71, 0x0F84 },
+    { 0x0F86, 0x0F8B },
+    { 0x0F90, 0x0F97 },
+    { 0x0F99, 0x0FBC },
+    { 0x0FC6, 0x0FC6 },
+    { 0x1000, 0x1021 },
+    { 0x1023, 0x1027 },
+    { 0x1029, 0x102A },
+    { 0x102C, 0x1032 },
+    { 0x1036, 0x1039 },
+    { 0x1040, 0x1049 },
+    { 0x1050, 0x1059 },
+    { 0x10A0, 0x10C5 },
+    { 0x10D0, 0x10FA },
+    { 0x10FC, 0x10FC },
+    { 0x1100, 0x1159 },
+    { 0x115F, 0x11A2 },
+    { 0x11A8, 0x11F9 },
+    { 0x1200, 0x1248 },
+    { 0x124A, 0x124D },
+    { 0x1250, 0x1256 },
+    { 0x1258, 0x1258 },
+    { 0x125A, 0x125D },
+    { 0x1260, 0x1288 },
+    { 0x128A, 0x128D },
+    { 0x1290, 0x12B0 },
+    { 0x12B2, 0x12B5 },
+    { 0x12B8, 0x12BE },
+    { 0x12C0, 0x12C0 },
+    { 0x12C2, 0x12C5 },
+    { 0x12C8, 0x12D6 },
+    { 0x12D8, 0x1310 },
+    { 0x1312, 0x1315 },
+    { 0x1318, 0x135A },
+    { 0x135F, 0x135F },
+    { 0x1369, 0x1371 },
+    { 0x1380, 0x138F },
+    { 0x13A0, 0x13F4 },
+    { 0x1401, 0x166C },
+    { 0x166F, 0x1676 },
+    { 0x1681, 0x169A },
+    { 0x16A0, 0x16EA },
+    { 0x16EE, 0x16F0 },
+    { 0x1700, 0x170C },
+    { 0x170E, 0x1714 },
+    { 0x1720, 0x1734 },
+    { 0x1740, 0x1753 },
+    { 0x1760, 0x176C },
+    { 0x176E, 0x1770 },
+    { 0x1772, 0x1773 },
+    { 0x1780, 0x17B3 },
+    { 0x17B6, 0x17D3 },
+    { 0x17D7, 0x17D7 },
+    { 0x17DC, 0x17DD },
+    { 0x17E0, 0x17E9 },
+    { 0x180B, 0x180D },
+    { 0x1810, 0x1819 },
+    { 0x1820, 0x1877 },
+    { 0x1880, 0x18A9 },
+    { 0x1900, 0x191C },
+    { 0x1920, 0x192B },
+    { 0x1930, 0x193B },
+    { 0x1946, 0x196D },
+    { 0x1970, 0x1974 },
+    { 0x1980, 0x19A9 },
+    { 0x19B0, 0x19C9 },
+    { 0x19D0, 0x19D9 },
+    { 0x1A00, 0x1A1B },
+    { 0x1B00, 0x1B4B },
+    { 0x1B50, 0x1B59 },
+    { 0x1B6B, 0x1B73 },
+    { 0x1D00, 0x1DCA },
+    { 0x1DFE, 0x1E9B },
+    { 0x1EA0, 0x1EF9 },
+    { 0x1F00, 0x1F15 },
+    { 0x1F18, 0x1F1D },
+    { 0x1F20, 0x1F45 },
+    { 0x1F48, 0x1F4D },
+    { 0x1F50, 0x1F57 },
+    { 0x1F59, 0x1F59 },
+    { 0x1F5B, 0x1F5B },
+    { 0x1F5D, 0x1F5D },
+    { 0x1F5F, 0x1F7D },
+    { 0x1F80, 0x1FB4 },
+    { 0x1FB6, 0x1FBC },
+    { 0x1FBE, 0x1FBE },
+    { 0x1FC2, 0x1FC4 },
+    { 0x1FC6, 0x1FCC },
+    { 0x1FD0, 0x1FD3 },
+    { 0x1FD6, 0x1FDB },
+    { 0x1FE0, 0x1FEC },
+    { 0x1FF2, 0x1FF4 },
+    { 0x1FF6, 0x1FFC },
+    { 0x203F, 0x2040 },
+    { 0x2054, 0x2054 },
+    { 0x2071, 0x2071 },
+    { 0x207F, 0x207F },
+    { 0x2090, 0x2094 },
+    { 0x20D0, 0x20DC },
+    { 0x20E1, 0x20E1 },
+    { 0x20E5, 0x20EF },
+    { 0x2102, 0x2102 },
+    { 0x2107, 0x2107 },
+    { 0x210A, 0x2113 },
+    { 0x2115, 0x2115 },
+    { 0x2118, 0x211D },
+    { 0x2124, 0x2124 },
+    { 0x2126, 0x2126 },
+    { 0x2128, 0x2128 },
+    { 0x212A, 0x2139 },
+    { 0x213C, 0x213F },
+    { 0x2145, 0x2149 },
+    { 0x214E, 0x214E },
+    { 0x2160, 0x2184 },
+    { 0x2C00, 0x2C2E },
+    { 0x2C30, 0x2C5E },
+    { 0x2C60, 0x2C6C },
+    { 0x2C74, 0x2C77 },
+    { 0x2C80, 0x2CE4 },
+    { 0x2D00, 0x2D25 },
+    { 0x2D30, 0x2D65 },
+    { 0x2D6F, 0x2D6F },
+    { 0x2D80, 0x2D96 },
+    { 0x2DA0, 0x2DA6 },
+    { 0x2DA8, 0x2DAE },
+    { 0x2DB0, 0x2DB6 },
+    { 0x2DB8, 0x2DBE },
+    { 0x2DC0, 0x2DC6 },
+    { 0x2DC8, 0x2DCE },
+    { 0x2DD0, 0x2DD6 },
+    { 0x2DD8, 0x2DDE },
+    { 0x3005, 0x3007 },
+    { 0x3021, 0x302F },
+    { 0x3031, 0x3035 },
+    { 0x3038, 0x303C },
+    { 0x3041, 0x3096 },
+    { 0x3099, 0x309F },
+    { 0x30A1, 0x30FA },
+    { 0x30FC, 0x30FF },
+    { 0x3105, 0x312C },
+    { 0x3131, 0x318E },
+    { 0x31A0, 0x31B7 },
+    { 0x31F0, 0x31FF },
+    { 0x3400, 0x4DB5 },
+    { 0x4E00, 0x9FBB },
+    { 0xA000, 0xA48C },
+    { 0xA717, 0xA71A },
+    { 0xA800, 0xA827 },
+    { 0xA840, 0xA873 },
+    { 0xAC00, 0xD7A3 },
+    { 0xF900, 0xFA2D },
+    { 0xFA30, 0xFA6A },
+    { 0xFA70, 0xFAD9 },
+    { 0xFB00, 0xFB06 },
+    { 0xFB13, 0xFB17 },
+    { 0xFB1D, 0xFB28 },
+    { 0xFB2A, 0xFB36 },
+    { 0xFB38, 0xFB3C },
+    { 0xFB3E, 0xFB3E },
+    { 0xFB40, 0xFB41 },
+    { 0xFB43, 0xFB44 },
+    { 0xFB46, 0xFBB1 },
+    { 0xFBD3, 0xFD3D },
+    { 0xFD50, 0xFD8F },
+    { 0xFD92, 0xFDC7 },
+    { 0xFDF0, 0xFDFB },
+    { 0xFE00, 0xFE0F },
+    { 0xFE20, 0xFE23 },
+    { 0xFE33, 0xFE34 },
+    { 0xFE4D, 0xFE4F },
+    { 0xFE70, 0xFE74 },
+    { 0xFE76, 0xFEFC },
+    { 0xFF10, 0xFF19 },
+    { 0xFF21, 0xFF3A },
+    { 0xFF3F, 0xFF3F },
+    { 0xFF41, 0xFF5A },
+    { 0xFF66, 0xFFBE },
+    { 0xFFC2, 0xFFC7 },
+    { 0xFFCA, 0xFFCF },
+    { 0xFFD2, 0xFFD7 },
+    { 0xFFDA, 0xFFDC },
+    { 0x10000, 0x1000B },
+    { 0x1000D, 0x10026 },
+    { 0x10028, 0x1003A },
+    { 0x1003C, 0x1003D },
+    { 0x1003F, 0x1004D },
+    { 0x10050, 0x1005D },
+    { 0x10080, 0x100FA },
+    { 0x10140, 0x10174 },
+    { 0x10300, 0x1031E },
+    { 0x10330, 0x1034A },
+    { 0x10380, 0x1039D },
+    { 0x103A0, 0x103C3 },
+    { 0x103C8, 0x103CF },
+    { 0x103D1, 0x103D5 },
+    { 0x10400, 0x1049D },
+    { 0x104A0, 0x104A9 },
+    { 0x10800, 0x10805 },
+    { 0x10808, 0x10808 },
+    { 0x1080A, 0x10835 },
+    { 0x10837, 0x10838 },
+    { 0x1083C, 0x1083C },
+    { 0x1083F, 0x1083F },
+    { 0x10900, 0x10915 },
+    { 0x10A00, 0x10A03 },
+    { 0x10A05, 0x10A06 },
+    { 0x10A0C, 0x10A13 },
+    { 0x10A15, 0x10A17 },
+    { 0x10A19, 0x10A33 },
+    { 0x10A38, 0x10A3A },
+    { 0x10A3F, 0x10A3F },
+    { 0x12000, 0x1236E },
+    { 0x12400, 0x12462 },
+    { 0x1D165, 0x1D169 },
+    { 0x1D16D, 0x1D172 },
+    { 0x1D17B, 0x1D182 },
+    { 0x1D185, 0x1D18B },
+    { 0x1D1AA, 0x1D1AD },
+    { 0x1D242, 0x1D244 },
+    { 0x1D400, 0x1D454 },
+    { 0x1D456, 0x1D49C },
+    { 0x1D49E, 0x1D49F },
+    { 0x1D4A2, 0x1D4A2 },
+    { 0x1D4A5, 0x1D4A6 },
+    { 0x1D4A9, 0x1D4AC },
+    { 0x1D4AE, 0x1D4B9 },
+    { 0x1D4BB, 0x1D4BB },
+    { 0x1D4BD, 0x1D4C3 },
+    { 0x1D4C5, 0x1D505 },
+    { 0x1D507, 0x1D50A },
+    { 0x1D50D, 0x1D514 },
+    { 0x1D516, 0x1D51C },
+    { 0x1D51E, 0x1D539 },
+    { 0x1D53B, 0x1D53E },
+    { 0x1D540, 0x1D544 },
+    { 0x1D546, 0x1D546 },
+    { 0x1D54A, 0x1D550 },
+    { 0x1D552, 0x1D6A5 },
+    { 0x1D6A8, 0x1D6C0 },
+    { 0x1D6C2, 0x1D6DA },
+    { 0x1D6DC, 0x1D6FA },
+    { 0x1D6FC, 0x1D714 },
+    { 0x1D716, 0x1D734 },
+    { 0x1D736, 0x1D74E },
+    { 0x1D750, 0x1D76E },
+    { 0x1D770, 0x1D788 },
+    { 0x1D78A, 0x1D7A8 },
+    { 0x1D7AA, 0x1D7C2 },
+    { 0x1D7C4, 0x1D7CB },
+    { 0x1D7CE, 0x1D7FF },
+    { 0x20000, 0x2A6D6 },
+    { 0x2F800, 0x2FA1D },
+    { 0xE0100, 0xE01EF }
+
+#define PREDICATE(c) uc_is_property_id_continue (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_id_start.c
@@ -0,0 +1,382 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0041, 0x005A },
+    { 0x0061, 0x007A },
+    { 0x00AA, 0x00AA },
+    { 0x00B5, 0x00B5 },
+    { 0x00BA, 0x00BA },
+    { 0x00C0, 0x00D6 },
+    { 0x00D8, 0x00F6 },
+    { 0x00F8, 0x02C1 },
+    { 0x02C6, 0x02D1 },
+    { 0x02E0, 0x02E4 },
+    { 0x02EE, 0x02EE },
+    { 0x037A, 0x037D },
+    { 0x0386, 0x0386 },
+    { 0x0388, 0x038A },
+    { 0x038C, 0x038C },
+    { 0x038E, 0x03A1 },
+    { 0x03A3, 0x03CE },
+    { 0x03D0, 0x03F5 },
+    { 0x03F7, 0x0481 },
+    { 0x048A, 0x0513 },
+    { 0x0531, 0x0556 },
+    { 0x0559, 0x0559 },
+    { 0x0561, 0x0587 },
+    { 0x05D0, 0x05EA },
+    { 0x05F0, 0x05F2 },
+    { 0x0621, 0x063A },
+    { 0x0640, 0x064A },
+    { 0x066E, 0x066F },
+    { 0x0671, 0x06D3 },
+    { 0x06D5, 0x06D5 },
+    { 0x06E5, 0x06E6 },
+    { 0x06EE, 0x06EF },
+    { 0x06FA, 0x06FC },
+    { 0x06FF, 0x06FF },
+    { 0x0710, 0x0710 },
+    { 0x0712, 0x072F },
+    { 0x074D, 0x076D },
+    { 0x0780, 0x07A5 },
+    { 0x07B1, 0x07B1 },
+    { 0x07CA, 0x07EA },
+    { 0x07F4, 0x07F5 },
+    { 0x07FA, 0x07FA },
+    { 0x0904, 0x0939 },
+    { 0x093D, 0x093D },
+    { 0x0950, 0x0950 },
+    { 0x0958, 0x0961 },
+    { 0x097B, 0x097F },
+    { 0x0985, 0x098C },
+    { 0x098F, 0x0990 },
+    { 0x0993, 0x09A8 },
+    { 0x09AA, 0x09B0 },
+    { 0x09B2, 0x09B2 },
+    { 0x09B6, 0x09B9 },
+    { 0x09BD, 0x09BD },
+    { 0x09CE, 0x09CE },
+    { 0x09DC, 0x09DD },
+    { 0x09DF, 0x09E1 },
+    { 0x09F0, 0x09F1 },
+    { 0x0A05, 0x0A0A },
+    { 0x0A0F, 0x0A10 },
+    { 0x0A13, 0x0A28 },
+    { 0x0A2A, 0x0A30 },
+    { 0x0A32, 0x0A33 },
+    { 0x0A35, 0x0A36 },
+    { 0x0A38, 0x0A39 },
+    { 0x0A59, 0x0A5C },
+    { 0x0A5E, 0x0A5E },
+    { 0x0A72, 0x0A74 },
+    { 0x0A85, 0x0A8D },
+    { 0x0A8F, 0x0A91 },
+    { 0x0A93, 0x0AA8 },
+    { 0x0AAA, 0x0AB0 },
+    { 0x0AB2, 0x0AB3 },
+    { 0x0AB5, 0x0AB9 },
+    { 0x0ABD, 0x0ABD },
+    { 0x0AD0, 0x0AD0 },
+    { 0x0AE0, 0x0AE1 },
+    { 0x0B05, 0x0B0C },
+    { 0x0B0F, 0x0B10 },
+    { 0x0B13, 0x0B28 },
+    { 0x0B2A, 0x0B30 },
+    { 0x0B32, 0x0B33 },
+    { 0x0B35, 0x0B39 },
+    { 0x0B3D, 0x0B3D },
+    { 0x0B5C, 0x0B5D },
+    { 0x0B5F, 0x0B61 },
+    { 0x0B71, 0x0B71 },
+    { 0x0B83, 0x0B83 },
+    { 0x0B85, 0x0B8A },
+    { 0x0B8E, 0x0B90 },
+    { 0x0B92, 0x0B95 },
+    { 0x0B99, 0x0B9A },
+    { 0x0B9C, 0x0B9C },
+    { 0x0B9E, 0x0B9F },
+    { 0x0BA3, 0x0BA4 },
+    { 0x0BA8, 0x0BAA },
+    { 0x0BAE, 0x0BB9 },
+    { 0x0C05, 0x0C0C },
+    { 0x0C0E, 0x0C10 },
+    { 0x0C12, 0x0C28 },
+    { 0x0C2A, 0x0C33 },
+    { 0x0C35, 0x0C39 },
+    { 0x0C60, 0x0C61 },
+    { 0x0C85, 0x0C8C },
+    { 0x0C8E, 0x0C90 },
+    { 0x0C92, 0x0CA8 },
+    { 0x0CAA, 0x0CB3 },
+    { 0x0CB5, 0x0CB9 },
+    { 0x0CBD, 0x0CBD },
+    { 0x0CDE, 0x0CDE },
+    { 0x0CE0, 0x0CE1 },
+    { 0x0D05, 0x0D0C },
+    { 0x0D0E, 0x0D10 },
+    { 0x0D12, 0x0D28 },
+    { 0x0D2A, 0x0D39 },
+    { 0x0D60, 0x0D61 },
+    { 0x0D85, 0x0D96 },
+    { 0x0D9A, 0x0DB1 },
+    { 0x0DB3, 0x0DBB },
+    { 0x0DBD, 0x0DBD },
+    { 0x0DC0, 0x0DC6 },
+    { 0x0E01, 0x0E30 },
+    { 0x0E32, 0x0E33 },
+    { 0x0E40, 0x0E46 },
+    { 0x0E81, 0x0E82 },
+    { 0x0E84, 0x0E84 },
+    { 0x0E87, 0x0E88 },
+    { 0x0E8A, 0x0E8A },
+    { 0x0E8D, 0x0E8D },
+    { 0x0E94, 0x0E97 },
+    { 0x0E99, 0x0E9F },
+    { 0x0EA1, 0x0EA3 },
+    { 0x0EA5, 0x0EA5 },
+    { 0x0EA7, 0x0EA7 },
+    { 0x0EAA, 0x0EAB },
+    { 0x0EAD, 0x0EB0 },
+    { 0x0EB2, 0x0EB3 },
+    { 0x0EBD, 0x0EBD },
+    { 0x0EC0, 0x0EC4 },
+    { 0x0EC6, 0x0EC6 },
+    { 0x0EDC, 0x0EDD },
+    { 0x0F00, 0x0F00 },
+    { 0x0F40, 0x0F47 },
+    { 0x0F49, 0x0F6A },
+    { 0x0F88, 0x0F8B },
+    { 0x1000, 0x1021 },
+    { 0x1023, 0x1027 },
+    { 0x1029, 0x102A },
+    { 0x1050, 0x1055 },
+    { 0x10A0, 0x10C5 },
+    { 0x10D0, 0x10FA },
+    { 0x10FC, 0x10FC },
+    { 0x1100, 0x1159 },
+    { 0x115F, 0x11A2 },
+    { 0x11A8, 0x11F9 },
+    { 0x1200, 0x1248 },
+    { 0x124A, 0x124D },
+    { 0x1250, 0x1256 },
+    { 0x1258, 0x1258 },
+    { 0x125A, 0x125D },
+    { 0x1260, 0x1288 },
+    { 0x128A, 0x128D },
+    { 0x1290, 0x12B0 },
+    { 0x12B2, 0x12B5 },
+    { 0x12B8, 0x12BE },
+    { 0x12C0, 0x12C0 },
+    { 0x12C2, 0x12C5 },
+    { 0x12C8, 0x12D6 },
+    { 0x12D8, 0x1310 },
+    { 0x1312, 0x1315 },
+    { 0x1318, 0x135A },
+    { 0x1380, 0x138F },
+    { 0x13A0, 0x13F4 },
+    { 0x1401, 0x166C },
+    { 0x166F, 0x1676 },
+    { 0x1681, 0x169A },
+    { 0x16A0, 0x16EA },
+    { 0x16EE, 0x16F0 },
+    { 0x1700, 0x170C },
+    { 0x170E, 0x1711 },
+    { 0x1720, 0x1731 },
+    { 0x1740, 0x1751 },
+    { 0x1760, 0x176C },
+    { 0x176E, 0x1770 },
+    { 0x1780, 0x17B3 },
+    { 0x17D7, 0x17D7 },
+    { 0x17DC, 0x17DC },
+    { 0x1820, 0x1877 },
+    { 0x1880, 0x18A8 },
+    { 0x1900, 0x191C },
+    { 0x1950, 0x196D },
+    { 0x1970, 0x1974 },
+    { 0x1980, 0x19A9 },
+    { 0x19C1, 0x19C7 },
+    { 0x1A00, 0x1A16 },
+    { 0x1B05, 0x1B33 },
+    { 0x1B45, 0x1B4B },
+    { 0x1D00, 0x1DBF },
+    { 0x1E00, 0x1E9B },
+    { 0x1EA0, 0x1EF9 },
+    { 0x1F00, 0x1F15 },
+    { 0x1F18, 0x1F1D },
+    { 0x1F20, 0x1F45 },
+    { 0x1F48, 0x1F4D },
+    { 0x1F50, 0x1F57 },
+    { 0x1F59, 0x1F59 },
+    { 0x1F5B, 0x1F5B },
+    { 0x1F5D, 0x1F5D },
+    { 0x1F5F, 0x1F7D },
+    { 0x1F80, 0x1FB4 },
+    { 0x1FB6, 0x1FBC },
+    { 0x1FBE, 0x1FBE },
+    { 0x1FC2, 0x1FC4 },
+    { 0x1FC6, 0x1FCC },
+    { 0x1FD0, 0x1FD3 },
+    { 0x1FD6, 0x1FDB },
+    { 0x1FE0, 0x1FEC },
+    { 0x1FF2, 0x1FF4 },
+    { 0x1FF6, 0x1FFC },
+    { 0x2071, 0x2071 },
+    { 0x207F, 0x207F },
+    { 0x2090, 0x2094 },
+    { 0x2102, 0x2102 },
+    { 0x2107, 0x2107 },
+    { 0x210A, 0x2113 },
+    { 0x2115, 0x2115 },
+    { 0x2118, 0x211D },
+    { 0x2124, 0x2124 },
+    { 0x2126, 0x2126 },
+    { 0x2128, 0x2128 },
+    { 0x212A, 0x2139 },
+    { 0x213C, 0x213F },
+    { 0x2145, 0x2149 },
+    { 0x214E, 0x214E },
+    { 0x2160, 0x2184 },
+    { 0x2C00, 0x2C2E },
+    { 0x2C30, 0x2C5E },
+    { 0x2C60, 0x2C6C },
+    { 0x2C74, 0x2C77 },
+    { 0x2C80, 0x2CE4 },
+    { 0x2D00, 0x2D25 },
+    { 0x2D30, 0x2D65 },
+    { 0x2D6F, 0x2D6F },
+    { 0x2D80, 0x2D96 },
+    { 0x2DA0, 0x2DA6 },
+    { 0x2DA8, 0x2DAE },
+    { 0x2DB0, 0x2DB6 },
+    { 0x2DB8, 0x2DBE },
+    { 0x2DC0, 0x2DC6 },
+    { 0x2DC8, 0x2DCE },
+    { 0x2DD0, 0x2DD6 },
+    { 0x2DD8, 0x2DDE },
+    { 0x3005, 0x3007 },
+    { 0x3021, 0x3029 },
+    { 0x3031, 0x3035 },
+    { 0x3038, 0x303C },
+    { 0x3041, 0x3096 },
+    { 0x309B, 0x309F },
+    { 0x30A1, 0x30FA },
+    { 0x30FC, 0x30FF },
+    { 0x3105, 0x312C },
+    { 0x3131, 0x318E },
+    { 0x31A0, 0x31B7 },
+    { 0x31F0, 0x31FF },
+    { 0x3400, 0x4DB5 },
+    { 0x4E00, 0x9FBB },
+    { 0xA000, 0xA48C },
+    { 0xA717, 0xA71A },
+    { 0xA800, 0xA801 },
+    { 0xA803, 0xA805 },
+    { 0xA807, 0xA80A },
+    { 0xA80C, 0xA822 },
+    { 0xA840, 0xA873 },
+    { 0xAC00, 0xD7A3 },
+    { 0xF900, 0xFA2D },
+    { 0xFA30, 0xFA6A },
+    { 0xFA70, 0xFAD9 },
+    { 0xFB00, 0xFB06 },
+    { 0xFB13, 0xFB17 },
+    { 0xFB1D, 0xFB1D },
+    { 0xFB1F, 0xFB28 },
+    { 0xFB2A, 0xFB36 },
+    { 0xFB38, 0xFB3C },
+    { 0xFB3E, 0xFB3E },
+    { 0xFB40, 0xFB41 },
+    { 0xFB43, 0xFB44 },
+    { 0xFB46, 0xFBB1 },
+    { 0xFBD3, 0xFD3D },
+    { 0xFD50, 0xFD8F },
+    { 0xFD92, 0xFDC7 },
+    { 0xFDF0, 0xFDFB },
+    { 0xFE70, 0xFE74 },
+    { 0xFE76, 0xFEFC },
+    { 0xFF21, 0xFF3A },
+    { 0xFF41, 0xFF5A },
+    { 0xFF66, 0xFFBE },
+    { 0xFFC2, 0xFFC7 },
+    { 0xFFCA, 0xFFCF },
+    { 0xFFD2, 0xFFD7 },
+    { 0xFFDA, 0xFFDC },
+    { 0x10000, 0x1000B },
+    { 0x1000D, 0x10026 },
+    { 0x10028, 0x1003A },
+    { 0x1003C, 0x1003D },
+    { 0x1003F, 0x1004D },
+    { 0x10050, 0x1005D },
+    { 0x10080, 0x100FA },
+    { 0x10140, 0x10174 },
+    { 0x10300, 0x1031E },
+    { 0x10330, 0x1034A },
+    { 0x10380, 0x1039D },
+    { 0x103A0, 0x103C3 },
+    { 0x103C8, 0x103CF },
+    { 0x103D1, 0x103D5 },
+    { 0x10400, 0x1049D },
+    { 0x10800, 0x10805 },
+    { 0x10808, 0x10808 },
+    { 0x1080A, 0x10835 },
+    { 0x10837, 0x10838 },
+    { 0x1083C, 0x1083C },
+    { 0x1083F, 0x1083F },
+    { 0x10900, 0x10915 },
+    { 0x10A00, 0x10A00 },
+    { 0x10A10, 0x10A13 },
+    { 0x10A15, 0x10A17 },
+    { 0x10A19, 0x10A33 },
+    { 0x12000, 0x1236E },
+    { 0x12400, 0x12462 },
+    { 0x1D400, 0x1D454 },
+    { 0x1D456, 0x1D49C },
+    { 0x1D49E, 0x1D49F },
+    { 0x1D4A2, 0x1D4A2 },
+    { 0x1D4A5, 0x1D4A6 },
+    { 0x1D4A9, 0x1D4AC },
+    { 0x1D4AE, 0x1D4B9 },
+    { 0x1D4BB, 0x1D4BB },
+    { 0x1D4BD, 0x1D4C3 },
+    { 0x1D4C5, 0x1D505 },
+    { 0x1D507, 0x1D50A },
+    { 0x1D50D, 0x1D514 },
+    { 0x1D516, 0x1D51C },
+    { 0x1D51E, 0x1D539 },
+    { 0x1D53B, 0x1D53E },
+    { 0x1D540, 0x1D544 },
+    { 0x1D546, 0x1D546 },
+    { 0x1D54A, 0x1D550 },
+    { 0x1D552, 0x1D6A5 },
+    { 0x1D6A8, 0x1D6C0 },
+    { 0x1D6C2, 0x1D6DA },
+    { 0x1D6DC, 0x1D6FA },
+    { 0x1D6FC, 0x1D714 },
+    { 0x1D716, 0x1D734 },
+    { 0x1D736, 0x1D74E },
+    { 0x1D750, 0x1D76E },
+    { 0x1D770, 0x1D788 },
+    { 0x1D78A, 0x1D7A8 },
+    { 0x1D7AA, 0x1D7C2 },
+    { 0x1D7C4, 0x1D7CB },
+    { 0x20000, 0x2A6D6 },
+    { 0x2F800, 0x2FA1D }
+
+#define PREDICATE(c) uc_is_property_id_start (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_ideographic.c
@@ -0,0 +1,31 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x3006, 0x3007 },
+    { 0x3021, 0x3029 },
+    { 0x3038, 0x303A },
+    { 0x3400, 0x4DB5 },
+    { 0x4E00, 0x9FBB },
+    { 0xF900, 0xFA2D },
+    { 0xFA70, 0xFAD9 },
+    { 0x20000, 0x2A6D6 },
+    { 0x2F800, 0x2FA1D }
+
+#define PREDICATE(c) uc_is_property_ideographic (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_ids_binary_operator.c
@@ -0,0 +1,24 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x2FF0, 0x2FF1 },
+    { 0x2FF4, 0x2FFB }
+
+#define PREDICATE(c) uc_is_property_ids_binary_operator (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_ids_trinary_operator.c
@@ -0,0 +1,23 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x2FF2, 0x2FF3 }
+
+#define PREDICATE(c) uc_is_property_ids_trinary_operator (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_ignorable_control.c
@@ -0,0 +1,40 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0001, 0x0008 },
+    { 0x000E, 0x001B },
+    { 0x007F, 0x0084 },
+    { 0x0086, 0x009F },
+    { 0x00AD, 0x00AD },
+    { 0x0600, 0x0603 },
+    { 0x06DD, 0x06DD },
+    { 0x070F, 0x070F },
+    { 0x17B4, 0x17B5 },
+    { 0x200B, 0x200F },
+    { 0x202A, 0x202E },
+    { 0x2060, 0x2063 },
+    { 0x206A, 0x206F },
+    { 0xFEFF, 0xFEFF },
+    { 0xFFF9, 0xFFFB },
+    { 0x1D173, 0x1D17A },
+    { 0xE0001, 0xE0001 },
+    { 0xE0020, 0xE007F }
+
+#define PREDICATE(c) uc_is_property_ignorable_control (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_iso_control.c
@@ -0,0 +1,24 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0000, 0x001F },
+    { 0x007F, 0x009F }
+
+#define PREDICATE(c) uc_is_property_iso_control (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_join_control.c
@@ -0,0 +1,23 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x200C, 0x200D }
+
+#define PREDICATE(c) uc_is_property_join_control (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_left_of_pair.c
@@ -0,0 +1,63 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0028, 0x0028 },
+    { 0x005B, 0x005B },
+    { 0x007B, 0x007B },
+    { 0x00AB, 0x00AB },
+    { 0x0F3A, 0x0F3A },
+    { 0x0F3C, 0x0F3C },
+    { 0x169B, 0x169B },
+    { 0x2018, 0x2018 },
+    { 0x201A, 0x201C },
+    { 0x201E, 0x201F },
+    { 0x2039, 0x2039 },
+    { 0x2045, 0x2045 },
+    { 0x207D, 0x207D },
+    { 0x208D, 0x208D },
+    { 0x2329, 0x2329 },
+    { 0x3008, 0x3008 },
+    { 0x300A, 0x300A },
+    { 0x300C, 0x300C },
+    { 0x300E, 0x300E },
+    { 0x3010, 0x3010 },
+    { 0x3014, 0x3014 },
+    { 0x3016, 0x3016 },
+    { 0x3018, 0x3018 },
+    { 0x301A, 0x301A },
+    { 0x301D, 0x301D },
+    { 0xFD3E, 0xFD3E },
+    { 0xFE35, 0xFE35 },
+    { 0xFE37, 0xFE37 },
+    { 0xFE39, 0xFE39 },
+    { 0xFE3B, 0xFE3B },
+    { 0xFE3D, 0xFE3D },
+    { 0xFE3F, 0xFE3F },
+    { 0xFE41, 0xFE41 },
+    { 0xFE43, 0xFE43 },
+    { 0xFE59, 0xFE59 },
+    { 0xFE5B, 0xFE5B },
+    { 0xFE5D, 0xFE5D },
+    { 0xFF08, 0xFF08 },
+    { 0xFF3B, 0xFF3B },
+    { 0xFF5B, 0xFF5B },
+    { 0xFF62, 0xFF62 }
+
+#define PREDICATE(c) uc_is_property_left_of_pair (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_line_separator.c
@@ -0,0 +1,23 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x2028, 0x2028 }
+
+#define PREDICATE(c) uc_is_property_line_separator (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_logical_order_exception.c
@@ -0,0 +1,24 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0E40, 0x0E44 },
+    { 0x0EC0, 0x0EC4 }
+
+#define PREDICATE(c) uc_is_property_logical_order_exception (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_lowercase.c
@@ -0,0 +1,528 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0061, 0x007A },
+    { 0x00AA, 0x00AA },
+    { 0x00B5, 0x00B5 },
+    { 0x00BA, 0x00BA },
+    { 0x00DF, 0x00F6 },
+    { 0x00F8, 0x00FF },
+    { 0x0101, 0x0101 },
+    { 0x0103, 0x0103 },
+    { 0x0105, 0x0105 },
+    { 0x0107, 0x0107 },
+    { 0x0109, 0x0109 },
+    { 0x010B, 0x010B },
+    { 0x010D, 0x010D },
+    { 0x010F, 0x010F },
+    { 0x0111, 0x0111 },
+    { 0x0113, 0x0113 },
+    { 0x0115, 0x0115 },
+    { 0x0117, 0x0117 },
+    { 0x0119, 0x0119 },
+    { 0x011B, 0x011B },
+    { 0x011D, 0x011D },
+    { 0x011F, 0x011F },
+    { 0x0121, 0x0121 },
+    { 0x0123, 0x0123 },
+    { 0x0125, 0x0125 },
+    { 0x0127, 0x0127 },
+    { 0x0129, 0x0129 },
+    { 0x012B, 0x012B },
+    { 0x012D, 0x012D },
+    { 0x012F, 0x012F },
+    { 0x0131, 0x0131 },
+    { 0x0133, 0x0133 },
+    { 0x0135, 0x0135 },
+    { 0x0137, 0x0138 },
+    { 0x013A, 0x013A },
+    { 0x013C, 0x013C },
+    { 0x013E, 0x013E },
+    { 0x0140, 0x0140 },
+    { 0x0142, 0x0142 },
+    { 0x0144, 0x0144 },
+    { 0x0146, 0x0146 },
+    { 0x0148, 0x0149 },
+    { 0x014B, 0x014B },
+    { 0x014D, 0x014D },
+    { 0x014F, 0x014F },
+    { 0x0151, 0x0151 },
+    { 0x0153, 0x0153 },
+    { 0x0155, 0x0155 },
+    { 0x0157, 0x0157 },
+    { 0x0159, 0x0159 },
+    { 0x015B, 0x015B },
+    { 0x015D, 0x015D },
+    { 0x015F, 0x015F },
+    { 0x0161, 0x0161 },
+    { 0x0163, 0x0163 },
+    { 0x0165, 0x0165 },
+    { 0x0167, 0x0167 },
+    { 0x0169, 0x0169 },
+    { 0x016B, 0x016B },
+    { 0x016D, 0x016D },
+    { 0x016F, 0x016F },
+    { 0x0171, 0x0171 },
+    { 0x0173, 0x0173 },
+    { 0x0175, 0x0175 },
+    { 0x0177, 0x0177 },
+    { 0x017A, 0x017A },
+    { 0x017C, 0x017C },
+    { 0x017E, 0x0180 },
+    { 0x0183, 0x0183 },
+    { 0x0185, 0x0185 },
+    { 0x0188, 0x0188 },
+    { 0x018C, 0x018D },
+    { 0x0192, 0x0192 },
+    { 0x0195, 0x0195 },
+    { 0x0199, 0x019B },
+    { 0x019E, 0x019E },
+    { 0x01A1, 0x01A1 },
+    { 0x01A3, 0x01A3 },
+    { 0x01A5, 0x01A5 },
+    { 0x01A8, 0x01A8 },
+    { 0x01AA, 0x01AB },
+    { 0x01AD, 0x01AD },
+    { 0x01B0, 0x01B0 },
+    { 0x01B4, 0x01B4 },
+    { 0x01B6, 0x01B6 },
+    { 0x01B9, 0x01BA },
+    { 0x01BD, 0x01BF },
+    { 0x01C6, 0x01C6 },
+    { 0x01C9, 0x01C9 },
+    { 0x01CC, 0x01CC },
+    { 0x01CE, 0x01CE },
+    { 0x01D0, 0x01D0 },
+    { 0x01D2, 0x01D2 },
+    { 0x01D4, 0x01D4 },
+    { 0x01D6, 0x01D6 },
+    { 0x01D8, 0x01D8 },
+    { 0x01DA, 0x01DA },
+    { 0x01DC, 0x01DD },
+    { 0x01DF, 0x01DF },
+    { 0x01E1, 0x01E1 },
+    { 0x01E3, 0x01E3 },
+    { 0x01E5, 0x01E5 },
+    { 0x01E7, 0x01E7 },
+    { 0x01E9, 0x01E9 },
+    { 0x01EB, 0x01EB },
+    { 0x01ED, 0x01ED },
+    { 0x01EF, 0x01F0 },
+    { 0x01F3, 0x01F3 },
+    { 0x01F5, 0x01F5 },
+    { 0x01F9, 0x01F9 },
+    { 0x01FB, 0x01FB },
+    { 0x01FD, 0x01FD },
+    { 0x01FF, 0x01FF },
+    { 0x0201, 0x0201 },
+    { 0x0203, 0x0203 },
+    { 0x0205, 0x0205 },
+    { 0x0207, 0x0207 },
+    { 0x0209, 0x0209 },
+    { 0x020B, 0x020B },
+    { 0x020D, 0x020D },
+    { 0x020F, 0x020F },
+    { 0x0211, 0x0211 },
+    { 0x0213, 0x0213 },
+    { 0x0215, 0x0215 },
+    { 0x0217, 0x0217 },
+    { 0x0219, 0x0219 },
+    { 0x021B, 0x021B },
+    { 0x021D, 0x021D },
+    { 0x021F, 0x021F },
+    { 0x0221, 0x0221 },
+    { 0x0223, 0x0223 },
+    { 0x0225, 0x0225 },
+    { 0x0227, 0x0227 },
+    { 0x0229, 0x0229 },
+    { 0x022B, 0x022B },
+    { 0x022D, 0x022D },
+    { 0x022F, 0x022F },
+    { 0x0231, 0x0231 },
+    { 0x0233, 0x0239 },
+    { 0x023C, 0x023C },
+    { 0x023F, 0x0240 },
+    { 0x0242, 0x0242 },
+    { 0x0247, 0x0247 },
+    { 0x0249, 0x0249 },
+    { 0x024B, 0x024B },
+    { 0x024D, 0x024D },
+    { 0x024F, 0x0293 },
+    { 0x0295, 0x02B8 },
+    { 0x02C0, 0x02C1 },
+    { 0x02E0, 0x02E4 },
+    { 0x0345, 0x0345 },
+    { 0x037A, 0x037D },
+    { 0x0390, 0x0390 },
+    { 0x03AC, 0x03CE },
+    { 0x03D0, 0x03D1 },
+    { 0x03D5, 0x03D7 },
+    { 0x03D9, 0x03D9 },
+    { 0x03DB, 0x03DB },
+    { 0x03DD, 0x03DD },
+    { 0x03DF, 0x03DF },
+    { 0x03E1, 0x03E1 },
+    { 0x03E3, 0x03E3 },
+    { 0x03E5, 0x03E5 },
+    { 0x03E7, 0x03E7 },
+    { 0x03E9, 0x03E9 },
+    { 0x03EB, 0x03EB },
+    { 0x03ED, 0x03ED },
+    { 0x03EF, 0x03F3 },
+    { 0x03F5, 0x03F5 },
+    { 0x03F8, 0x03F8 },
+    { 0x03FB, 0x03FC },
+    { 0x0430, 0x045F },
+    { 0x0461, 0x0461 },
+    { 0x0463, 0x0463 },
+    { 0x0465, 0x0465 },
+    { 0x0467, 0x0467 },
+    { 0x0469, 0x0469 },
+    { 0x046B, 0x046B },
+    { 0x046D, 0x046D },
+    { 0x046F, 0x046F },
+    { 0x0471, 0x0471 },
+    { 0x0473, 0x0473 },
+    { 0x0475, 0x0475 },
+    { 0x0477, 0x0477 },
+    { 0x0479, 0x0479 },
+    { 0x047B, 0x047B },
+    { 0x047D, 0x047D },
+    { 0x047F, 0x047F },
+    { 0x0481, 0x0481 },
+    { 0x048B, 0x048B },
+    { 0x048D, 0x048D },
+    { 0x048F, 0x048F },
+    { 0x0491, 0x0491 },
+    { 0x0493, 0x0493 },
+    { 0x0495, 0x0495 },
+    { 0x0497, 0x0497 },
+    { 0x0499, 0x0499 },
+    { 0x049B, 0x049B },
+    { 0x049D, 0x049D },
+    { 0x049F, 0x049F },
+    { 0x04A1, 0x04A1 },
+    { 0x04A3, 0x04A3 },
+    { 0x04A5, 0x04A5 },
+    { 0x04A7, 0x04A7 },
+    { 0x04A9, 0x04A9 },
+    { 0x04AB, 0x04AB },
+    { 0x04AD, 0x04AD },
+    { 0x04AF, 0x04AF },
+    { 0x04B1, 0x04B1 },
+    { 0x04B3, 0x04B3 },
+    { 0x04B5, 0x04B5 },
+    { 0x04B7, 0x04B7 },
+    { 0x04B9, 0x04B9 },
+    { 0x04BB, 0x04BB },
+    { 0x04BD, 0x04BD },
+    { 0x04BF, 0x04BF },
+    { 0x04C2, 0x04C2 },
+    { 0x04C4, 0x04C4 },
+    { 0x04C6, 0x04C6 },
+    { 0x04C8, 0x04C8 },
+    { 0x04CA, 0x04CA },
+    { 0x04CC, 0x04CC },
+    { 0x04CE, 0x04CF },
+    { 0x04D1, 0x04D1 },
+    { 0x04D3, 0x04D3 },
+    { 0x04D5, 0x04D5 },
+    { 0x04D7, 0x04D7 },
+    { 0x04D9, 0x04D9 },
+    { 0x04DB, 0x04DB },
+    { 0x04DD, 0x04DD },
+    { 0x04DF, 0x04DF },
+    { 0x04E1, 0x04E1 },
+    { 0x04E3, 0x04E3 },
+    { 0x04E5, 0x04E5 },
+    { 0x04E7, 0x04E7 },
+    { 0x04E9, 0x04E9 },
+    { 0x04EB, 0x04EB },
+    { 0x04ED, 0x04ED },
+    { 0x04EF, 0x04EF },
+    { 0x04F1, 0x04F1 },
+    { 0x04F3, 0x04F3 },
+    { 0x04F5, 0x04F5 },
+    { 0x04F7, 0x04F7 },
+    { 0x04F9, 0x04F9 },
+    { 0x04FB, 0x04FB },
+    { 0x04FD, 0x04FD },
+    { 0x04FF, 0x04FF },
+    { 0x0501, 0x0501 },
+    { 0x0503, 0x0503 },
+    { 0x0505, 0x0505 },
+    { 0x0507, 0x0507 },
+    { 0x0509, 0x0509 },
+    { 0x050B, 0x050B },
+    { 0x050D, 0x050D },
+    { 0x050F, 0x050F },
+    { 0x0511, 0x0511 },
+    { 0x0513, 0x0513 },
+    { 0x0561, 0x0587 },
+    { 0x1D00, 0x1DBF },
+    { 0x1E01, 0x1E01 },
+    { 0x1E03, 0x1E03 },
+    { 0x1E05, 0x1E05 },
+    { 0x1E07, 0x1E07 },
+    { 0x1E09, 0x1E09 },
+    { 0x1E0B, 0x1E0B },
+    { 0x1E0D, 0x1E0D },
+    { 0x1E0F, 0x1E0F },
+    { 0x1E11, 0x1E11 },
+    { 0x1E13, 0x1E13 },
+    { 0x1E15, 0x1E15 },
+    { 0x1E17, 0x1E17 },
+    { 0x1E19, 0x1E19 },
+    { 0x1E1B, 0x1E1B },
+    { 0x1E1D, 0x1E1D },
+    { 0x1E1F, 0x1E1F },
+    { 0x1E21, 0x1E21 },
+    { 0x1E23, 0x1E23 },
+    { 0x1E25, 0x1E25 },
+    { 0x1E27, 0x1E27 },
+    { 0x1E29, 0x1E29 },
+    { 0x1E2B, 0x1E2B },
+    { 0x1E2D, 0x1E2D },
+    { 0x1E2F, 0x1E2F },
+    { 0x1E31, 0x1E31 },
+    { 0x1E33, 0x1E33 },
+    { 0x1E35, 0x1E35 },
+    { 0x1E37, 0x1E37 },
+    { 0x1E39, 0x1E39 },
+    { 0x1E3B, 0x1E3B },
+    { 0x1E3D, 0x1E3D },
+    { 0x1E3F, 0x1E3F },
+    { 0x1E41, 0x1E41 },
+    { 0x1E43, 0x1E43 },
+    { 0x1E45, 0x1E45 },
+    { 0x1E47, 0x1E47 },
+    { 0x1E49, 0x1E49 },
+    { 0x1E4B, 0x1E4B },
+    { 0x1E4D, 0x1E4D },
+    { 0x1E4F, 0x1E4F },
+    { 0x1E51, 0x1E51 },
+    { 0x1E53, 0x1E53 },
+    { 0x1E55, 0x1E55 },
+    { 0x1E57, 0x1E57 },
+    { 0x1E59, 0x1E59 },
+    { 0x1E5B, 0x1E5B },
+    { 0x1E5D, 0x1E5D },
+    { 0x1E5F, 0x1E5F },
+    { 0x1E61, 0x1E61 },
+    { 0x1E63, 0x1E63 },
+    { 0x1E65, 0x1E65 },
+    { 0x1E67, 0x1E67 },
+    { 0x1E69, 0x1E69 },
+    { 0x1E6B, 0x1E6B },
+    { 0x1E6D, 0x1E6D },
+    { 0x1E6F, 0x1E6F },
+    { 0x1E71, 0x1E71 },
+    { 0x1E73, 0x1E73 },
+    { 0x1E75, 0x1E75 },
+    { 0x1E77, 0x1E77 },
+    { 0x1E79, 0x1E79 },
+    { 0x1E7B, 0x1E7B },
+    { 0x1E7D, 0x1E7D },
+    { 0x1E7F, 0x1E7F },
+    { 0x1E81, 0x1E81 },
+    { 0x1E83, 0x1E83 },
+    { 0x1E85, 0x1E85 },
+    { 0x1E87, 0x1E87 },
+    { 0x1E89, 0x1E89 },
+    { 0x1E8B, 0x1E8B },
+    { 0x1E8D, 0x1E8D },
+    { 0x1E8F, 0x1E8F },
+    { 0x1E91, 0x1E91 },
+    { 0x1E93, 0x1E93 },
+    { 0x1E95, 0x1E9B },
+    { 0x1EA1, 0x1EA1 },
+    { 0x1EA3, 0x1EA3 },
+    { 0x1EA5, 0x1EA5 },
+    { 0x1EA7, 0x1EA7 },
+    { 0x1EA9, 0x1EA9 },
+    { 0x1EAB, 0x1EAB },
+    { 0x1EAD, 0x1EAD },
+    { 0x1EAF, 0x1EAF },
+    { 0x1EB1, 0x1EB1 },
+    { 0x1EB3, 0x1EB3 },
+    { 0x1EB5, 0x1EB5 },
+    { 0x1EB7, 0x1EB7 },
+    { 0x1EB9, 0x1EB9 },
+    { 0x1EBB, 0x1EBB },
+    { 0x1EBD, 0x1EBD },
+    { 0x1EBF, 0x1EBF },
+    { 0x1EC1, 0x1EC1 },
+    { 0x1EC3, 0x1EC3 },
+    { 0x1EC5, 0x1EC5 },
+    { 0x1EC7, 0x1EC7 },
+    { 0x1EC9, 0x1EC9 },
+    { 0x1ECB, 0x1ECB },
+    { 0x1ECD, 0x1ECD },
+    { 0x1ECF, 0x1ECF },
+    { 0x1ED1, 0x1ED1 },
+    { 0x1ED3, 0x1ED3 },
+    { 0x1ED5, 0x1ED5 },
+    { 0x1ED7, 0x1ED7 },
+    { 0x1ED9, 0x1ED9 },
+    { 0x1EDB, 0x1EDB },
+    { 0x1EDD, 0x1EDD },
+    { 0x1EDF, 0x1EDF },
+    { 0x1EE1, 0x1EE1 },
+    { 0x1EE3, 0x1EE3 },
+    { 0x1EE5, 0x1EE5 },
+    { 0x1EE7, 0x1EE7 },
+    { 0x1EE9, 0x1EE9 },
+    { 0x1EEB, 0x1EEB },
+    { 0x1EED, 0x1EED },
+    { 0x1EEF, 0x1EEF },
+    { 0x1EF1, 0x1EF1 },
+    { 0x1EF3, 0x1EF3 },
+    { 0x1EF5, 0x1EF5 },
+    { 0x1EF7, 0x1EF7 },
+    { 0x1EF9, 0x1EF9 },
+    { 0x1F00, 0x1F07 },
+    { 0x1F10, 0x1F15 },
+    { 0x1F20, 0x1F27 },
+    { 0x1F30, 0x1F37 },
+    { 0x1F40, 0x1F45 },
+    { 0x1F50, 0x1F57 },
+    { 0x1F60, 0x1F67 },
+    { 0x1F70, 0x1F7D },
+    { 0x1F80, 0x1F87 },
+    { 0x1F90, 0x1F97 },
+    { 0x1FA0, 0x1FA7 },
+    { 0x1FB0, 0x1FB4 },
+    { 0x1FB6, 0x1FB7 },
+    { 0x1FBE, 0x1FBE },
+    { 0x1FC2, 0x1FC4 },
+    { 0x1FC6, 0x1FC7 },
+    { 0x1FD0, 0x1FD3 },
+    { 0x1FD6, 0x1FD7 },
+    { 0x1FE0, 0x1FE7 },
+    { 0x1FF2, 0x1FF4 },
+    { 0x1FF6, 0x1FF7 },
+    { 0x2071, 0x2071 },
+    { 0x207F, 0x207F },
+    { 0x2090, 0x2094 },
+    { 0x210A, 0x210A },
+    { 0x210E, 0x210F },
+    { 0x2113, 0x2113 },
+    { 0x212F, 0x212F },
+    { 0x2134, 0x2134 },
+    { 0x2139, 0x2139 },
+    { 0x213C, 0x213D },
+    { 0x2146, 0x2149 },
+    { 0x214E, 0x214E },
+    { 0x2170, 0x217F },
+    { 0x2184, 0x2184 },
+    { 0x24D0, 0x24E9 },
+    { 0x2C30, 0x2C5E },
+    { 0x2C61, 0x2C61 },
+    { 0x2C65, 0x2C66 },
+    { 0x2C68, 0x2C68 },
+    { 0x2C6A, 0x2C6A },
+    { 0x2C6C, 0x2C6C },
+    { 0x2C74, 0x2C74 },
+    { 0x2C76, 0x2C77 },
+    { 0x2C81, 0x2C81 },
+    { 0x2C83, 0x2C83 },
+    { 0x2C85, 0x2C85 },
+    { 0x2C87, 0x2C87 },
+    { 0x2C89, 0x2C89 },
+    { 0x2C8B, 0x2C8B },
+    { 0x2C8D, 0x2C8D },
+    { 0x2C8F, 0x2C8F },
+    { 0x2C91, 0x2C91 },
+    { 0x2C93, 0x2C93 },
+    { 0x2C95, 0x2C95 },
+    { 0x2C97, 0x2C97 },
+    { 0x2C99, 0x2C99 },
+    { 0x2C9B, 0x2C9B },
+    { 0x2C9D, 0x2C9D },
+    { 0x2C9F, 0x2C9F },
+    { 0x2CA1, 0x2CA1 },
+    { 0x2CA3, 0x2CA3 },
+    { 0x2CA5, 0x2CA5 },
+    { 0x2CA7, 0x2CA7 },
+    { 0x2CA9, 0x2CA9 },
+    { 0x2CAB, 0x2CAB },
+    { 0x2CAD, 0x2CAD },
+    { 0x2CAF, 0x2CAF },
+    { 0x2CB1, 0x2CB1 },
+    { 0x2CB3, 0x2CB3 },
+    { 0x2CB5, 0x2CB5 },
+    { 0x2CB7, 0x2CB7 },
+    { 0x2CB9, 0x2CB9 },
+    { 0x2CBB, 0x2CBB },
+    { 0x2CBD, 0x2CBD },
+    { 0x2CBF, 0x2CBF },
+    { 0x2CC1, 0x2CC1 },
+    { 0x2CC3, 0x2CC3 },
+    { 0x2CC5, 0x2CC5 },
+    { 0x2CC7, 0x2CC7 },
+    { 0x2CC9, 0x2CC9 },
+    { 0x2CCB, 0x2CCB },
+    { 0x2CCD, 0x2CCD },
+    { 0x2CCF, 0x2CCF },
+    { 0x2CD1, 0x2CD1 },
+    { 0x2CD3, 0x2CD3 },
+    { 0x2CD5, 0x2CD5 },
+    { 0x2CD7, 0x2CD7 },
+    { 0x2CD9, 0x2CD9 },
+    { 0x2CDB, 0x2CDB },
+    { 0x2CDD, 0x2CDD },
+    { 0x2CDF, 0x2CDF },
+    { 0x2CE1, 0x2CE1 },
+    { 0x2CE3, 0x2CE4 },
+    { 0x2D00, 0x2D25 },
+    { 0xFB00, 0xFB06 },
+    { 0xFB13, 0xFB17 },
+    { 0xFF41, 0xFF5A },
+    { 0x10428, 0x1044F },
+    { 0x1D41A, 0x1D433 },
+    { 0x1D44E, 0x1D454 },
+    { 0x1D456, 0x1D467 },
+    { 0x1D482, 0x1D49B },
+    { 0x1D4B6, 0x1D4B9 },
+    { 0x1D4BB, 0x1D4BB },
+    { 0x1D4BD, 0x1D4C3 },
+    { 0x1D4C5, 0x1D4CF },
+    { 0x1D4EA, 0x1D503 },
+    { 0x1D51E, 0x1D537 },
+    { 0x1D552, 0x1D56B },
+    { 0x1D586, 0x1D59F },
+    { 0x1D5BA, 0x1D5D3 },
+    { 0x1D5EE, 0x1D607 },
+    { 0x1D622, 0x1D63B },
+    { 0x1D656, 0x1D66F },
+    { 0x1D68A, 0x1D6A5 },
+    { 0x1D6C2, 0x1D6DA },
+    { 0x1D6DC, 0x1D6E1 },
+    { 0x1D6FC, 0x1D714 },
+    { 0x1D716, 0x1D71B },
+    { 0x1D736, 0x1D74E },
+    { 0x1D750, 0x1D755 },
+    { 0x1D770, 0x1D788 },
+    { 0x1D78A, 0x1D78F },
+    { 0x1D7AA, 0x1D7C2 },
+    { 0x1D7C4, 0x1D7C9 },
+    { 0x1D7CB, 0x1D7CB }
+
+#define PREDICATE(c) uc_is_property_lowercase (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_math.c
@@ -0,0 +1,115 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x002B, 0x002B },
+    { 0x003C, 0x003E },
+    { 0x005E, 0x005E },
+    { 0x007C, 0x007C },
+    { 0x007E, 0x007E },
+    { 0x00AC, 0x00AC },
+    { 0x00B1, 0x00B1 },
+    { 0x00D7, 0x00D7 },
+    { 0x00F7, 0x00F7 },
+    { 0x03D0, 0x03D2 },
+    { 0x03D5, 0x03D5 },
+    { 0x03F0, 0x03F1 },
+    { 0x03F4, 0x03F6 },
+    { 0x2016, 0x2016 },
+    { 0x2032, 0x2034 },
+    { 0x2040, 0x2040 },
+    { 0x2044, 0x2044 },
+    { 0x2052, 0x2052 },
+    { 0x2061, 0x2063 },
+    { 0x207A, 0x207E },
+    { 0x208A, 0x208E },
+    { 0x20D0, 0x20DC },
+    { 0x20E1, 0x20E1 },
+    { 0x20E5, 0x20E6 },
+    { 0x20EC, 0x20EF },
+    { 0x2102, 0x2102 },
+    { 0x210A, 0x2113 },
+    { 0x2115, 0x2115 },
+    { 0x2119, 0x211D },
+    { 0x2124, 0x2124 },
+    { 0x2128, 0x2129 },
+    { 0x212C, 0x212D },
+    { 0x212F, 0x2131 },
+    { 0x2133, 0x2138 },
+    { 0x213C, 0x2149 },
+    { 0x214B, 0x214B },
+    { 0x2190, 0x2194 },
+    { 0x219A, 0x219B },
+    { 0x21A0, 0x21A0 },
+    { 0x21A3, 0x21A3 },
+    { 0x21A6, 0x21A6 },
+    { 0x21AE, 0x21AE },
+    { 0x21CE, 0x21CF },
+    { 0x21D2, 0x21D2 },
+    { 0x21D4, 0x21D4 },
+    { 0x21F4, 0x22FF },
+    { 0x2308, 0x230B },
+    { 0x2320, 0x2321 },
+    { 0x237C, 0x237C },
+    { 0x239B, 0x23B3 },
+    { 0x23B7, 0x23B7 },
+    { 0x23D0, 0x23D0 },
+    { 0x23DC, 0x23E1 },
+    { 0x25B7, 0x25B7 },
+    { 0x25C1, 0x25C1 },
+    { 0x25F8, 0x25FF },
+    { 0x266F, 0x266F },
+    { 0x27C0, 0x27CA },
+    { 0x27D0, 0x27EB },
+    { 0x27F0, 0x27FF },
+    { 0x2900, 0x2AFF },
+    { 0xFB29, 0xFB29 },
+    { 0xFE61, 0xFE66 },
+    { 0xFE68, 0xFE68 },
+    { 0xFF0B, 0xFF0B },
+    { 0xFF1C, 0xFF1E },
+    { 0xFF3C, 0xFF3C },
+    { 0xFF3E, 0xFF3E },
+    { 0xFF5C, 0xFF5C },
+    { 0xFF5E, 0xFF5E },
+    { 0xFFE2, 0xFFE2 },
+    { 0xFFE9, 0xFFEC },
+    { 0x1D400, 0x1D454 },
+    { 0x1D456, 0x1D49C },
+    { 0x1D49E, 0x1D49F },
+    { 0x1D4A2, 0x1D4A2 },
+    { 0x1D4A5, 0x1D4A6 },
+    { 0x1D4A9, 0x1D4AC },
+    { 0x1D4AE, 0x1D4B9 },
+    { 0x1D4BB, 0x1D4BB },
+    { 0x1D4BD, 0x1D4C3 },
+    { 0x1D4C5, 0x1D505 },
+    { 0x1D507, 0x1D50A },
+    { 0x1D50D, 0x1D514 },
+    { 0x1D516, 0x1D51C },
+    { 0x1D51E, 0x1D539 },
+    { 0x1D53B, 0x1D53E },
+    { 0x1D540, 0x1D544 },
+    { 0x1D546, 0x1D546 },
+    { 0x1D54A, 0x1D550 },
+    { 0x1D552, 0x1D6A5 },
+    { 0x1D6A8, 0x1D7CB },
+    { 0x1D7CE, 0x1D7FF }
+
+#define PREDICATE(c) uc_is_property_math (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_non_break.c
@@ -0,0 +1,32 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x00A0, 0x00A0 },
+    { 0x034F, 0x034F },
+    { 0x035C, 0x0362 },
+    { 0x0F08, 0x0F08 },
+    { 0x0F0C, 0x0F0C },
+    { 0x0F12, 0x0F12 },
+    { 0x180E, 0x180E },
+    { 0x2007, 0x2007 },
+    { 0x2011, 0x2011 },
+    { 0x202F, 0x202F }
+
+#define PREDICATE(c) uc_is_property_non_break (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_not_a_character.c
@@ -0,0 +1,40 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0xFDD0, 0xFDEF },
+    { 0xFFFE, 0xFFFF },
+    { 0x1FFFE, 0x1FFFF },
+    { 0x2FFFE, 0x2FFFF },
+    { 0x3FFFE, 0x3FFFF },
+    { 0x4FFFE, 0x4FFFF },
+    { 0x5FFFE, 0x5FFFF },
+    { 0x6FFFE, 0x6FFFF },
+    { 0x7FFFE, 0x7FFFF },
+    { 0x8FFFE, 0x8FFFF },
+    { 0x9FFFE, 0x9FFFF },
+    { 0xAFFFE, 0xAFFFF },
+    { 0xBFFFE, 0xBFFFF },
+    { 0xCFFFE, 0xCFFFF },
+    { 0xDFFFE, 0xDFFFF },
+    { 0xEFFFE, 0xEFFFF },
+    { 0xFFFFE, 0xFFFFF },
+    { 0x10FFFE, 0x10FFFF }
+
+#define PREDICATE(c) uc_is_property_not_a_character (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_numeric.c
@@ -0,0 +1,83 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0030, 0x0039 },
+    { 0x00B2, 0x00B3 },
+    { 0x00B9, 0x00B9 },
+    { 0x00BC, 0x00BE },
+    { 0x0660, 0x0669 },
+    { 0x06F0, 0x06F9 },
+    { 0x07C0, 0x07C9 },
+    { 0x0966, 0x096F },
+    { 0x09E6, 0x09EF },
+    { 0x09F4, 0x09F9 },
+    { 0x0A66, 0x0A6F },
+    { 0x0AE6, 0x0AEF },
+    { 0x0B66, 0x0B6F },
+    { 0x0BE6, 0x0BF2 },
+    { 0x0C66, 0x0C6F },
+    { 0x0CE6, 0x0CEF },
+    { 0x0D66, 0x0D6F },
+    { 0x0E50, 0x0E59 },
+    { 0x0ED0, 0x0ED9 },
+    { 0x0F20, 0x0F33 },
+    { 0x1040, 0x1049 },
+    { 0x1369, 0x137C },
+    { 0x16EE, 0x16F0 },
+    { 0x17E0, 0x17E9 },
+    { 0x17F0, 0x17F9 },
+    { 0x1810, 0x1819 },
+    { 0x1946, 0x194F },
+    { 0x19D0, 0x19D9 },
+    { 0x1B50, 0x1B59 },
+    { 0x2070, 0x2070 },
+    { 0x2074, 0x2079 },
+    { 0x2080, 0x2089 },
+    { 0x2153, 0x2183 },
+    { 0x2460, 0x249B },
+    { 0x24EA, 0x24FF },
+    { 0x2776, 0x2793 },
+    { 0x2CFD, 0x2CFD },
+    { 0x3007, 0x3007 },
+    { 0x3021, 0x3029 },
+    { 0x3038, 0x303A },
+    { 0x3192, 0x3195 },
+    { 0x3220, 0x3229 },
+    { 0x3251, 0x325F },
+    { 0x3280, 0x3289 },
+    { 0x32B1, 0x32BF },
+    { 0xFF10, 0xFF19 },
+    { 0x10107, 0x10133 },
+    { 0x10140, 0x10178 },
+    { 0x1018A, 0x1018A },
+    { 0x10320, 0x10323 },
+    { 0x10341, 0x10341 },
+    { 0x1034A, 0x1034A },
+    { 0x103D1, 0x103D5 },
+    { 0x104A0, 0x104A9 },
+    { 0x10916, 0x10919 },
+    { 0x10A40, 0x10A47 },
+    { 0x12400, 0x12431 },
+    { 0x12434, 0x12455 },
+    { 0x12458, 0x12462 },
+    { 0x1D360, 0x1D371 },
+    { 0x1D7CE, 0x1D7FF }
+
+#define PREDICATE(c) uc_is_property_numeric (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_other_alphabetic.c
@@ -0,0 +1,123 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0345, 0x0345 },
+    { 0x05B0, 0x05BD },
+    { 0x05BF, 0x05BF },
+    { 0x05C1, 0x05C2 },
+    { 0x05C4, 0x05C5 },
+    { 0x05C7, 0x05C7 },
+    { 0x0610, 0x0615 },
+    { 0x064B, 0x0657 },
+    { 0x0659, 0x065E },
+    { 0x0670, 0x0670 },
+    { 0x06D6, 0x06DC },
+    { 0x06E1, 0x06E4 },
+    { 0x06E7, 0x06E8 },
+    { 0x06ED, 0x06ED },
+    { 0x0711, 0x0711 },
+    { 0x0730, 0x073F },
+    { 0x07A6, 0x07B0 },
+    { 0x0901, 0x0903 },
+    { 0x093E, 0x094C },
+    { 0x0962, 0x0963 },
+    { 0x0981, 0x0983 },
+    { 0x09BE, 0x09C4 },
+    { 0x09C7, 0x09C8 },
+    { 0x09CB, 0x09CC },
+    { 0x09D7, 0x09D7 },
+    { 0x09E2, 0x09E3 },
+    { 0x0A01, 0x0A03 },
+    { 0x0A3E, 0x0A42 },
+    { 0x0A47, 0x0A48 },
+    { 0x0A4B, 0x0A4C },
+    { 0x0A70, 0x0A71 },
+    { 0x0A81, 0x0A83 },
+    { 0x0ABE, 0x0AC5 },
+    { 0x0AC7, 0x0AC9 },
+    { 0x0ACB, 0x0ACC },
+    { 0x0AE2, 0x0AE3 },
+    { 0x0B01, 0x0B03 },
+    { 0x0B3E, 0x0B43 },
+    { 0x0B47, 0x0B48 },
+    { 0x0B4B, 0x0B4C },
+    { 0x0B56, 0x0B57 },
+    { 0x0B82, 0x0B82 },
+    { 0x0BBE, 0x0BC2 },
+    { 0x0BC6, 0x0BC8 },
+    { 0x0BCA, 0x0BCC },
+    { 0x0BD7, 0x0BD7 },
+    { 0x0C01, 0x0C03 },
+    { 0x0C3E, 0x0C44 },
+    { 0x0C46, 0x0C48 },
+    { 0x0C4A, 0x0C4C },
+    { 0x0C55, 0x0C56 },
+    { 0x0C82, 0x0C83 },
+    { 0x0CBE, 0x0CC4 },
+    { 0x0CC6, 0x0CC8 },
+    { 0x0CCA, 0x0CCC },
+    { 0x0CD5, 0x0CD6 },
+    { 0x0CE2, 0x0CE3 },
+    { 0x0D02, 0x0D03 },
+    { 0x0D3E, 0x0D43 },
+    { 0x0D46, 0x0D48 },
+    { 0x0D4A, 0x0D4C },
+    { 0x0D57, 0x0D57 },
+    { 0x0D82, 0x0D83 },
+    { 0x0DCF, 0x0DD4 },
+    { 0x0DD6, 0x0DD6 },
+    { 0x0DD8, 0x0DDF },
+    { 0x0DF2, 0x0DF3 },
+    { 0x0E31, 0x0E31 },
+    { 0x0E34, 0x0E3A },
+    { 0x0E4D, 0x0E4D },
+    { 0x0EB1, 0x0EB1 },
+    { 0x0EB4, 0x0EB9 },
+    { 0x0EBB, 0x0EBC },
+    { 0x0ECD, 0x0ECD },
+    { 0x0F71, 0x0F81 },
+    { 0x0F90, 0x0F97 },
+    { 0x0F99, 0x0FBC },
+    { 0x102C, 0x1032 },
+    { 0x1036, 0x1036 },
+    { 0x1038, 0x1038 },
+    { 0x1056, 0x1059 },
+    { 0x135F, 0x135F },
+    { 0x1712, 0x1713 },
+    { 0x1732, 0x1733 },
+    { 0x1752, 0x1753 },
+    { 0x1772, 0x1773 },
+    { 0x17B6, 0x17C8 },
+    { 0x18A9, 0x18A9 },
+    { 0x1920, 0x192B },
+    { 0x1930, 0x1938 },
+    { 0x19B0, 0x19C0 },
+    { 0x19C8, 0x19C9 },
+    { 0x1A17, 0x1A1B },
+    { 0x1B00, 0x1B04 },
+    { 0x1B35, 0x1B43 },
+    { 0x24B6, 0x24E9 },
+    { 0xA823, 0xA827 },
+    { 0xFB1E, 0xFB1E },
+    { 0x10A01, 0x10A03 },
+    { 0x10A05, 0x10A06 },
+    { 0x10A0C, 0x10A0F }
+
+#define PREDICATE(c) uc_is_property_other_alphabetic (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_other_default_ignorable_code_point.c
@@ -0,0 +1,32 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x034F, 0x034F },
+    { 0x115F, 0x1160 },
+    { 0x2064, 0x2069 },
+    { 0x3164, 0x3164 },
+    { 0xFFA0, 0xFFA0 },
+    { 0xFFF0, 0xFFF8 },
+    { 0xE0000, 0xE0000 },
+    { 0xE0002, 0xE001F },
+    { 0xE0080, 0xE00FF },
+    { 0xE01F0, 0xE0FFF }
+
+#define PREDICATE(c) uc_is_property_other_default_ignorable_code_point (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_other_grapheme_extend.c
@@ -0,0 +1,37 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x09BE, 0x09BE },
+    { 0x09D7, 0x09D7 },
+    { 0x0B3E, 0x0B3E },
+    { 0x0B57, 0x0B57 },
+    { 0x0BBE, 0x0BBE },
+    { 0x0BD7, 0x0BD7 },
+    { 0x0CC2, 0x0CC2 },
+    { 0x0CD5, 0x0CD6 },
+    { 0x0D3E, 0x0D3E },
+    { 0x0D57, 0x0D57 },
+    { 0x0DCF, 0x0DCF },
+    { 0x0DDF, 0x0DDF },
+    { 0x200C, 0x200D },
+    { 0x1D165, 0x1D165 },
+    { 0x1D16E, 0x1D172 }
+
+#define PREDICATE(c) uc_is_property_other_grapheme_extend (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_other_id_continue.c
@@ -0,0 +1,23 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x1369, 0x1371 }
+
+#define PREDICATE(c) uc_is_property_other_id_continue (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_other_id_start.c
@@ -0,0 +1,25 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x2118, 0x2118 },
+    { 0x212E, 0x212E },
+    { 0x309B, 0x309C }
+
+#define PREDICATE(c) uc_is_property_other_id_start (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_other_lowercase.c
@@ -0,0 +1,33 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x02B0, 0x02B8 },
+    { 0x02C0, 0x02C1 },
+    { 0x02E0, 0x02E4 },
+    { 0x0345, 0x0345 },
+    { 0x037A, 0x037A },
+    { 0x1D2C, 0x1D61 },
+    { 0x1D78, 0x1D78 },
+    { 0x1D9B, 0x1DBF },
+    { 0x2090, 0x2094 },
+    { 0x2170, 0x217F },
+    { 0x24D0, 0x24E9 }
+
+#define PREDICATE(c) uc_is_property_other_lowercase (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_other_math.c
@@ -0,0 +1,91 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x005E, 0x005E },
+    { 0x03D0, 0x03D2 },
+    { 0x03D5, 0x03D5 },
+    { 0x03F0, 0x03F1 },
+    { 0x03F4, 0x03F5 },
+    { 0x2016, 0x2016 },
+    { 0x2032, 0x2034 },
+    { 0x2040, 0x2040 },
+    { 0x2061, 0x2063 },
+    { 0x207D, 0x207E },
+    { 0x208D, 0x208E },
+    { 0x20D0, 0x20DC },
+    { 0x20E1, 0x20E1 },
+    { 0x20E5, 0x20E6 },
+    { 0x20EC, 0x20EF },
+    { 0x2102, 0x2102 },
+    { 0x210A, 0x2113 },
+    { 0x2115, 0x2115 },
+    { 0x2119, 0x211D },
+    { 0x2124, 0x2124 },
+    { 0x2128, 0x2129 },
+    { 0x212C, 0x212D },
+    { 0x212F, 0x2131 },
+    { 0x2133, 0x2138 },
+    { 0x213C, 0x213F },
+    { 0x2145, 0x2149 },
+    { 0x23B7, 0x23B7 },
+    { 0x23D0, 0x23D0 },
+    { 0x27C5, 0x27C6 },
+    { 0x27E6, 0x27EB },
+    { 0x2983, 0x2998 },
+    { 0x29D8, 0x29DB },
+    { 0x29FC, 0x29FD },
+    { 0xFE61, 0xFE61 },
+    { 0xFE63, 0xFE63 },
+    { 0xFE68, 0xFE68 },
+    { 0xFF3C, 0xFF3C },
+    { 0xFF3E, 0xFF3E },
+    { 0x1D400, 0x1D454 },
+    { 0x1D456, 0x1D49C },
+    { 0x1D49E, 0x1D49F },
+    { 0x1D4A2, 0x1D4A2 },
+    { 0x1D4A5, 0x1D4A6 },
+    { 0x1D4A9, 0x1D4AC },
+    { 0x1D4AE, 0x1D4B9 },
+    { 0x1D4BB, 0x1D4BB },
+    { 0x1D4BD, 0x1D4C3 },
+    { 0x1D4C5, 0x1D505 },
+    { 0x1D507, 0x1D50A },
+    { 0x1D50D, 0x1D514 },
+    { 0x1D516, 0x1D51C },
+    { 0x1D51E, 0x1D539 },
+    { 0x1D53B, 0x1D53E },
+    { 0x1D540, 0x1D544 },
+    { 0x1D546, 0x1D546 },
+    { 0x1D54A, 0x1D550 },
+    { 0x1D552, 0x1D6A5 },
+    { 0x1D6A8, 0x1D6C0 },
+    { 0x1D6C2, 0x1D6DA },
+    { 0x1D6DC, 0x1D6FA },
+    { 0x1D6FC, 0x1D714 },
+    { 0x1D716, 0x1D734 },
+    { 0x1D736, 0x1D74E },
+    { 0x1D750, 0x1D76E },
+    { 0x1D770, 0x1D788 },
+    { 0x1D78A, 0x1D7A8 },
+    { 0x1D7AA, 0x1D7C2 },
+    { 0x1D7C4, 0x1D7CB },
+    { 0x1D7CE, 0x1D7FF }
+
+#define PREDICATE(c) uc_is_property_other_math (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_other_uppercase.c
@@ -0,0 +1,24 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x2160, 0x216F },
+    { 0x24B6, 0x24CF }
+
+#define PREDICATE(c) uc_is_property_other_uppercase (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_paired_punctuation.c
@@ -0,0 +1,49 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0028, 0x0029 },
+    { 0x005B, 0x005B },
+    { 0x005D, 0x005D },
+    { 0x007B, 0x007B },
+    { 0x007D, 0x007D },
+    { 0x00AB, 0x00AB },
+    { 0x00BB, 0x00BB },
+    { 0x0F3A, 0x0F3D },
+    { 0x169B, 0x169C },
+    { 0x2018, 0x201F },
+    { 0x2039, 0x203A },
+    { 0x2045, 0x2046 },
+    { 0x207D, 0x207E },
+    { 0x208D, 0x208E },
+    { 0x2329, 0x232A },
+    { 0x3008, 0x3011 },
+    { 0x3014, 0x301B },
+    { 0x301D, 0x301F },
+    { 0xFD3E, 0xFD3F },
+    { 0xFE35, 0xFE44 },
+    { 0xFE59, 0xFE5E },
+    { 0xFF08, 0xFF09 },
+    { 0xFF3B, 0xFF3B },
+    { 0xFF3D, 0xFF3D },
+    { 0xFF5B, 0xFF5B },
+    { 0xFF5D, 0xFF5D },
+    { 0xFF62, 0xFF63 }
+
+#define PREDICATE(c) uc_is_property_paired_punctuation (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_paragraph_separator.c
@@ -0,0 +1,23 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x2029, 0x2029 }
+
+#define PREDICATE(c) uc_is_property_paragraph_separator (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_pattern_syntax.c
@@ -0,0 +1,50 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0021, 0x002F },
+    { 0x003A, 0x0040 },
+    { 0x005B, 0x005E },
+    { 0x0060, 0x0060 },
+    { 0x007B, 0x007E },
+    { 0x00A1, 0x00A7 },
+    { 0x00A9, 0x00A9 },
+    { 0x00AB, 0x00AC },
+    { 0x00AE, 0x00AE },
+    { 0x00B0, 0x00B1 },
+    { 0x00B6, 0x00B6 },
+    { 0x00BB, 0x00BB },
+    { 0x00BF, 0x00BF },
+    { 0x00D7, 0x00D7 },
+    { 0x00F7, 0x00F7 },
+    { 0x2010, 0x2027 },
+    { 0x2030, 0x203E },
+    { 0x2041, 0x2053 },
+    { 0x2055, 0x205E },
+    { 0x2190, 0x245F },
+    { 0x2500, 0x2775 },
+    { 0x2794, 0x2BFF },
+    { 0x2E00, 0x2E7F },
+    { 0x3001, 0x3003 },
+    { 0x3008, 0x3020 },
+    { 0x3030, 0x3030 },
+    { 0xFD3E, 0xFD3F },
+    { 0xFE45, 0xFE46 }
+
+#define PREDICATE(c) uc_is_property_pattern_syntax (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_pattern_white_space.c
@@ -0,0 +1,27 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0009, 0x000D },
+    { 0x0020, 0x0020 },
+    { 0x0085, 0x0085 },
+    { 0x200E, 0x200F },
+    { 0x2028, 0x2029 }
+
+#define PREDICATE(c) uc_is_property_pattern_white_space (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_private_use.c
@@ -0,0 +1,25 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0xE000, 0xF8FF },
+    { 0xF0000, 0xFFFFD },
+    { 0x100000, 0x10FFFD }
+
+#define PREDICATE(c) uc_is_property_private_use (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_punctuation.c
@@ -0,0 +1,123 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0021, 0x0023 },
+    { 0x0025, 0x002A },
+    { 0x002C, 0x002F },
+    { 0x003A, 0x003B },
+    { 0x003F, 0x0040 },
+    { 0x005B, 0x005D },
+    { 0x005F, 0x005F },
+    { 0x007B, 0x007B },
+    { 0x007D, 0x007D },
+    { 0x00A1, 0x00A1 },
+    { 0x00AB, 0x00AB },
+    { 0x00B7, 0x00B7 },
+    { 0x00BB, 0x00BB },
+    { 0x00BF, 0x00BF },
+    { 0x037E, 0x037E },
+    { 0x0387, 0x0387 },
+    { 0x055A, 0x055F },
+    { 0x0589, 0x058A },
+    { 0x05BE, 0x05BE },
+    { 0x05C0, 0x05C0 },
+    { 0x05C3, 0x05C3 },
+    { 0x05C6, 0x05C6 },
+    { 0x05F3, 0x05F4 },
+    { 0x060C, 0x060D },
+    { 0x061B, 0x061B },
+    { 0x061E, 0x061F },
+    { 0x066A, 0x066D },
+    { 0x06D4, 0x06D4 },
+    { 0x0700, 0x070D },
+    { 0x07F7, 0x07F9 },
+    { 0x0964, 0x0965 },
+    { 0x0970, 0x0970 },
+    { 0x0DF4, 0x0DF4 },
+    { 0x0E4F, 0x0E4F },
+    { 0x0E5A, 0x0E5B },
+    { 0x0F04, 0x0F12 },
+    { 0x0F3A, 0x0F3D },
+    { 0x0F85, 0x0F85 },
+    { 0x0FD0, 0x0FD1 },
+    { 0x104A, 0x104F },
+    { 0x10FB, 0x10FB },
+    { 0x1361, 0x1368 },
+    { 0x166D, 0x166E },
+    { 0x169B, 0x169C },
+    { 0x16EB, 0x16ED },
+    { 0x1735, 0x1736 },
+    { 0x17D4, 0x17D6 },
+    { 0x17D8, 0x17DA },
+    { 0x1800, 0x180A },
+    { 0x1944, 0x1945 },
+    { 0x19DE, 0x19DF },
+    { 0x1A1E, 0x1A1F },
+    { 0x1B5A, 0x1B60 },
+    { 0x2010, 0x2027 },
+    { 0x2030, 0x2043 },
+    { 0x2045, 0x2051 },
+    { 0x2053, 0x205E },
+    { 0x207D, 0x207E },
+    { 0x208D, 0x208E },
+    { 0x2329, 0x232A },
+    { 0x2768, 0x2775 },
+    { 0x27C5, 0x27C6 },
+    { 0x27E6, 0x27EB },
+    { 0x2983, 0x2998 },
+    { 0x29D8, 0x29DB },
+    { 0x29FC, 0x29FD },
+    { 0x2CF9, 0x2CFC },
+    { 0x2CFE, 0x2CFF },
+    { 0x2E00, 0x2E17 },
+    { 0x2E1C, 0x2E1D },
+    { 0x3001, 0x3003 },
+    { 0x3008, 0x3011 },
+    { 0x3014, 0x301F },
+    { 0x3030, 0x3030 },
+    { 0x303D, 0x303D },
+    { 0x30A0, 0x30A0 },
+    { 0x30FB, 0x30FB },
+    { 0xA874, 0xA877 },
+    { 0xFD3E, 0xFD3F },
+    { 0xFE10, 0xFE19 },
+    { 0xFE30, 0xFE52 },
+    { 0xFE54, 0xFE61 },
+    { 0xFE63, 0xFE63 },
+    { 0xFE68, 0xFE68 },
+    { 0xFE6A, 0xFE6B },
+    { 0xFF01, 0xFF03 },
+    { 0xFF05, 0xFF0A },
+    { 0xFF0C, 0xFF0F },
+    { 0xFF1A, 0xFF1B },
+    { 0xFF1F, 0xFF20 },
+    { 0xFF3B, 0xFF3D },
+    { 0xFF3F, 0xFF3F },
+    { 0xFF5B, 0xFF5B },
+    { 0xFF5D, 0xFF5D },
+    { 0xFF5F, 0xFF65 },
+    { 0x10100, 0x10101 },
+    { 0x1039F, 0x1039F },
+    { 0x103D0, 0x103D0 },
+    { 0x1091F, 0x1091F },
+    { 0x10A50, 0x10A58 },
+    { 0x12470, 0x12473 }
+
+#define PREDICATE(c) uc_is_property_punctuation (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_quotation_mark.c
@@ -0,0 +1,34 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0022, 0x0022 },
+    { 0x0027, 0x0027 },
+    { 0x00AB, 0x00AB },
+    { 0x00BB, 0x00BB },
+    { 0x2018, 0x201F },
+    { 0x2039, 0x203A },
+    { 0x300C, 0x300F },
+    { 0x301D, 0x301F },
+    { 0xFE41, 0xFE44 },
+    { 0xFF02, 0xFF02 },
+    { 0xFF07, 0xFF07 },
+    { 0xFF62, 0xFF63 }
+
+#define PREDICATE(c) uc_is_property_quotation_mark (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_radical.c
@@ -0,0 +1,25 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x2E80, 0x2E99 },
+    { 0x2E9B, 0x2EF3 },
+    { 0x2F00, 0x2FD5 }
+
+#define PREDICATE(c) uc_is_property_radical (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_sentence_terminal.c
@@ -0,0 +1,52 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0021, 0x0021 },
+    { 0x002E, 0x002E },
+    { 0x003F, 0x003F },
+    { 0x055C, 0x055C },
+    { 0x055E, 0x055E },
+    { 0x0589, 0x0589 },
+    { 0x061F, 0x061F },
+    { 0x06D4, 0x06D4 },
+    { 0x0700, 0x0702 },
+    { 0x07F9, 0x07F9 },
+    { 0x0964, 0x0965 },
+    { 0x104A, 0x104B },
+    { 0x1362, 0x1362 },
+    { 0x1367, 0x1368 },
+    { 0x166E, 0x166E },
+    { 0x1803, 0x1803 },
+    { 0x1809, 0x1809 },
+    { 0x1944, 0x1945 },
+    { 0x1B5A, 0x1B5B },
+    { 0x1B5E, 0x1B5F },
+    { 0x203C, 0x203D },
+    { 0x2047, 0x2049 },
+    { 0x3002, 0x3002 },
+    { 0xA876, 0xA877 },
+    { 0xFE52, 0xFE52 },
+    { 0xFE56, 0xFE57 },
+    { 0xFF01, 0xFF01 },
+    { 0xFF0E, 0xFF0E },
+    { 0xFF1F, 0xFF1F },
+    { 0xFF61, 0xFF61 }
+
+#define PREDICATE(c) uc_is_property_sentence_terminal (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_soft_dotted.c
@@ -0,0 +1,52 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0069, 0x006A },
+    { 0x012F, 0x012F },
+    { 0x0249, 0x0249 },
+    { 0x0268, 0x0268 },
+    { 0x029D, 0x029D },
+    { 0x02B2, 0x02B2 },
+    { 0x03F3, 0x03F3 },
+    { 0x0456, 0x0456 },
+    { 0x0458, 0x0458 },
+    { 0x1D62, 0x1D62 },
+    { 0x1D96, 0x1D96 },
+    { 0x1DA4, 0x1DA4 },
+    { 0x1DA8, 0x1DA8 },
+    { 0x1E2D, 0x1E2D },
+    { 0x1ECB, 0x1ECB },
+    { 0x2071, 0x2071 },
+    { 0x2148, 0x2149 },
+    { 0x1D422, 0x1D423 },
+    { 0x1D456, 0x1D457 },
+    { 0x1D48A, 0x1D48B },
+    { 0x1D4BE, 0x1D4BF },
+    { 0x1D4F2, 0x1D4F3 },
+    { 0x1D526, 0x1D527 },
+    { 0x1D55A, 0x1D55B },
+    { 0x1D58E, 0x1D58F },
+    { 0x1D5C2, 0x1D5C3 },
+    { 0x1D5F6, 0x1D5F7 },
+    { 0x1D62A, 0x1D62B },
+    { 0x1D65E, 0x1D65F },
+    { 0x1D692, 0x1D693 }
+
+#define PREDICATE(c) uc_is_property_soft_dotted (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_space.c
@@ -0,0 +1,30 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0020, 0x0020 },
+    { 0x00A0, 0x00A0 },
+    { 0x1680, 0x1680 },
+    { 0x180E, 0x180E },
+    { 0x2000, 0x200A },
+    { 0x202F, 0x202F },
+    { 0x205F, 0x205F },
+    { 0x3000, 0x3000 }
+
+#define PREDICATE(c) uc_is_property_space (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_terminal_punctuation.c
@@ -0,0 +1,70 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0021, 0x0021 },
+    { 0x002C, 0x002C },
+    { 0x002E, 0x002E },
+    { 0x003A, 0x003B },
+    { 0x003F, 0x003F },
+    { 0x037E, 0x037E },
+    { 0x0387, 0x0387 },
+    { 0x0589, 0x0589 },
+    { 0x05C3, 0x05C3 },
+    { 0x060C, 0x060C },
+    { 0x061B, 0x061B },
+    { 0x061F, 0x061F },
+    { 0x06D4, 0x06D4 },
+    { 0x0700, 0x070A },
+    { 0x070C, 0x070C },
+    { 0x07F8, 0x07F9 },
+    { 0x0964, 0x0965 },
+    { 0x0E5A, 0x0E5B },
+    { 0x0F08, 0x0F08 },
+    { 0x0F0D, 0x0F12 },
+    { 0x104A, 0x104B },
+    { 0x1361, 0x1368 },
+    { 0x166D, 0x166E },
+    { 0x16EB, 0x16ED },
+    { 0x17D4, 0x17D6 },
+    { 0x17DA, 0x17DA },
+    { 0x1802, 0x1805 },
+    { 0x1808, 0x1809 },
+    { 0x1944, 0x1945 },
+    { 0x1B5A, 0x1B5B },
+    { 0x1B5D, 0x1B5F },
+    { 0x203C, 0x203D },
+    { 0x2047, 0x2049 },
+    { 0x3001, 0x3002 },
+    { 0xA876, 0xA877 },
+    { 0xFE50, 0xFE52 },
+    { 0xFE54, 0xFE57 },
+    { 0xFF01, 0xFF01 },
+    { 0xFF0C, 0xFF0C },
+    { 0xFF0E, 0xFF0E },
+    { 0xFF1A, 0xFF1B },
+    { 0xFF1F, 0xFF1F },
+    { 0xFF61, 0xFF61 },
+    { 0xFF64, 0xFF64 },
+    { 0x1039F, 0x1039F },
+    { 0x103D0, 0x103D0 },
+    { 0x1091F, 0x1091F },
+    { 0x12470, 0x12473 }
+
+#define PREDICATE(c) uc_is_property_terminal_punctuation (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_test.c
@@ -0,0 +1,46 @@
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "unictype.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+
+int
+main ()
+{
+  uc_property_t pr = UC_PROPERTY_COMPOSITE;
+  unsigned int c;
+
+  for (c = 0; c < 0x110000; c++)
+    ASSERT (uc_is_property (c, pr) == uc_is_property_composite (c));
+
+  return 0;
+}
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_titlecase.c
@@ -0,0 +1,32 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x01C5, 0x01C5 },
+    { 0x01C8, 0x01C8 },
+    { 0x01CB, 0x01CB },
+    { 0x01F2, 0x01F2 },
+    { 0x1F88, 0x1F8F },
+    { 0x1F98, 0x1F9F },
+    { 0x1FA8, 0x1FAF },
+    { 0x1FBC, 0x1FBC },
+    { 0x1FCC, 0x1FCC },
+    { 0x1FFC, 0x1FFC }
+
+#define PREDICATE(c) uc_is_property_titlecase (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_unassigned_code_value.c
@@ -0,0 +1,461 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0370, 0x0373 },
+    { 0x0376, 0x0379 },
+    { 0x037F, 0x0383 },
+    { 0x038B, 0x038B },
+    { 0x038D, 0x038D },
+    { 0x03A2, 0x03A2 },
+    { 0x03CF, 0x03CF },
+    { 0x0487, 0x0487 },
+    { 0x0514, 0x0530 },
+    { 0x0557, 0x0558 },
+    { 0x0560, 0x0560 },
+    { 0x0588, 0x0588 },
+    { 0x058B, 0x0590 },
+    { 0x05C8, 0x05CF },
+    { 0x05EB, 0x05EF },
+    { 0x05F5, 0x05FF },
+    { 0x0604, 0x060A },
+    { 0x0616, 0x061A },
+    { 0x061C, 0x061D },
+    { 0x0620, 0x0620 },
+    { 0x063B, 0x063F },
+    { 0x065F, 0x065F },
+    { 0x070E, 0x070E },
+    { 0x074B, 0x074C },
+    { 0x076E, 0x077F },
+    { 0x07B2, 0x07BF },
+    { 0x07FB, 0x0900 },
+    { 0x093A, 0x093B },
+    { 0x094E, 0x094F },
+    { 0x0955, 0x0957 },
+    { 0x0971, 0x097A },
+    { 0x0980, 0x0980 },
+    { 0x0984, 0x0984 },
+    { 0x098D, 0x098E },
+    { 0x0991, 0x0992 },
+    { 0x09A9, 0x09A9 },
+    { 0x09B1, 0x09B1 },
+    { 0x09B3, 0x09B5 },
+    { 0x09BA, 0x09BB },
+    { 0x09C5, 0x09C6 },
+    { 0x09C9, 0x09CA },
+    { 0x09CF, 0x09D6 },
+    { 0x09D8, 0x09DB },
+    { 0x09DE, 0x09DE },
+    { 0x09E4, 0x09E5 },
+    { 0x09FB, 0x0A00 },
+    { 0x0A04, 0x0A04 },
+    { 0x0A0B, 0x0A0E },
+    { 0x0A11, 0x0A12 },
+    { 0x0A29, 0x0A29 },
+    { 0x0A31, 0x0A31 },
+    { 0x0A34, 0x0A34 },
+    { 0x0A37, 0x0A37 },
+    { 0x0A3A, 0x0A3B },
+    { 0x0A3D, 0x0A3D },
+    { 0x0A43, 0x0A46 },
+    { 0x0A49, 0x0A4A },
+    { 0x0A4E, 0x0A58 },
+    { 0x0A5D, 0x0A5D },
+    { 0x0A5F, 0x0A65 },
+    { 0x0A75, 0x0A80 },
+    { 0x0A84, 0x0A84 },
+    { 0x0A8E, 0x0A8E },
+    { 0x0A92, 0x0A92 },
+    { 0x0AA9, 0x0AA9 },
+    { 0x0AB1, 0x0AB1 },
+    { 0x0AB4, 0x0AB4 },
+    { 0x0ABA, 0x0ABB },
+    { 0x0AC6, 0x0AC6 },
+    { 0x0ACA, 0x0ACA },
+    { 0x0ACE, 0x0ACF },
+    { 0x0AD1, 0x0ADF },
+    { 0x0AE4, 0x0AE5 },
+    { 0x0AF0, 0x0AF0 },
+    { 0x0AF2, 0x0B00 },
+    { 0x0B04, 0x0B04 },
+    { 0x0B0D, 0x0B0E },
+    { 0x0B11, 0x0B12 },
+    { 0x0B29, 0x0B29 },
+    { 0x0B31, 0x0B31 },
+    { 0x0B34, 0x0B34 },
+    { 0x0B3A, 0x0B3B },
+    { 0x0B44, 0x0B46 },
+    { 0x0B49, 0x0B4A },
+    { 0x0B4E, 0x0B55 },
+    { 0x0B58, 0x0B5B },
+    { 0x0B5E, 0x0B5E },
+    { 0x0B62, 0x0B65 },
+    { 0x0B72, 0x0B81 },
+    { 0x0B84, 0x0B84 },
+    { 0x0B8B, 0x0B8D },
+    { 0x0B91, 0x0B91 },
+    { 0x0B96, 0x0B98 },
+    { 0x0B9B, 0x0B9B },
+    { 0x0B9D, 0x0B9D },
+    { 0x0BA0, 0x0BA2 },
+    { 0x0BA5, 0x0BA7 },
+    { 0x0BAB, 0x0BAD },
+    { 0x0BBA, 0x0BBD },
+    { 0x0BC3, 0x0BC5 },
+    { 0x0BC9, 0x0BC9 },
+    { 0x0BCE, 0x0BD6 },
+    { 0x0BD8, 0x0BE5 },
+    { 0x0BFB, 0x0C00 },
+    { 0x0C04, 0x0C04 },
+    { 0x0C0D, 0x0C0D },
+    { 0x0C11, 0x0C11 },
+    { 0x0C29, 0x0C29 },
+    { 0x0C34, 0x0C34 },
+    { 0x0C3A, 0x0C3D },
+    { 0x0C45, 0x0C45 },
+    { 0x0C49, 0x0C49 },
+    { 0x0C4E, 0x0C54 },
+    { 0x0C57, 0x0C5F },
+    { 0x0C62, 0x0C65 },
+    { 0x0C70, 0x0C81 },
+    { 0x0C84, 0x0C84 },
+    { 0x0C8D, 0x0C8D },
+    { 0x0C91, 0x0C91 },
+    { 0x0CA9, 0x0CA9 },
+    { 0x0CB4, 0x0CB4 },
+    { 0x0CBA, 0x0CBB },
+    { 0x0CC5, 0x0CC5 },
+    { 0x0CC9, 0x0CC9 },
+    { 0x0CCE, 0x0CD4 },
+    { 0x0CD7, 0x0CDD },
+    { 0x0CDF, 0x0CDF },
+    { 0x0CE4, 0x0CE5 },
+    { 0x0CF0, 0x0CF0 },
+    { 0x0CF3, 0x0D01 },
+    { 0x0D04, 0x0D04 },
+    { 0x0D0D, 0x0D0D },
+    { 0x0D11, 0x0D11 },
+    { 0x0D29, 0x0D29 },
+    { 0x0D3A, 0x0D3D },
+    { 0x0D44, 0x0D45 },
+    { 0x0D49, 0x0D49 },
+    { 0x0D4E, 0x0D56 },
+    { 0x0D58, 0x0D5F },
+    { 0x0D62, 0x0D65 },
+    { 0x0D70, 0x0D81 },
+    { 0x0D84, 0x0D84 },
+    { 0x0D97, 0x0D99 },
+    { 0x0DB2, 0x0DB2 },
+    { 0x0DBC, 0x0DBC },
+    { 0x0DBE, 0x0DBF },
+    { 0x0DC7, 0x0DC9 },
+    { 0x0DCB, 0x0DCE },
+    { 0x0DD5, 0x0DD5 },
+    { 0x0DD7, 0x0DD7 },
+    { 0x0DE0, 0x0DF1 },
+    { 0x0DF5, 0x0E00 },
+    { 0x0E3B, 0x0E3E },
+    { 0x0E5C, 0x0E80 },
+    { 0x0E83, 0x0E83 },
+    { 0x0E85, 0x0E86 },
+    { 0x0E89, 0x0E89 },
+    { 0x0E8B, 0x0E8C },
+    { 0x0E8E, 0x0E93 },
+    { 0x0E98, 0x0E98 },
+    { 0x0EA0, 0x0EA0 },
+    { 0x0EA4, 0x0EA4 },
+    { 0x0EA6, 0x0EA6 },
+    { 0x0EA8, 0x0EA9 },
+    { 0x0EAC, 0x0EAC },
+    { 0x0EBA, 0x0EBA },
+    { 0x0EBE, 0x0EBF },
+    { 0x0EC5, 0x0EC5 },
+    { 0x0EC7, 0x0EC7 },
+    { 0x0ECE, 0x0ECF },
+    { 0x0EDA, 0x0EDB },
+    { 0x0EDE, 0x0EFF },
+    { 0x0F48, 0x0F48 },
+    { 0x0F6B, 0x0F70 },
+    { 0x0F8C, 0x0F8F },
+    { 0x0F98, 0x0F98 },
+    { 0x0FBD, 0x0FBD },
+    { 0x0FCD, 0x0FCE },
+    { 0x0FD2, 0x0FFF },
+    { 0x1022, 0x1022 },
+    { 0x1028, 0x1028 },
+    { 0x102B, 0x102B },
+    { 0x1033, 0x1035 },
+    { 0x103A, 0x103F },
+    { 0x105A, 0x109F },
+    { 0x10C6, 0x10CF },
+    { 0x10FD, 0x10FF },
+    { 0x115A, 0x115E },
+    { 0x11A3, 0x11A7 },
+    { 0x11FA, 0x11FF },
+    { 0x1249, 0x1249 },
+    { 0x124E, 0x124F },
+    { 0x1257, 0x1257 },
+    { 0x1259, 0x1259 },
+    { 0x125E, 0x125F },
+    { 0x1289, 0x1289 },
+    { 0x128E, 0x128F },
+    { 0x12B1, 0x12B1 },
+    { 0x12B6, 0x12B7 },
+    { 0x12BF, 0x12BF },
+    { 0x12C1, 0x12C1 },
+    { 0x12C6, 0x12C7 },
+    { 0x12D7, 0x12D7 },
+    { 0x1311, 0x1311 },
+    { 0x1316, 0x1317 },
+    { 0x135B, 0x135E },
+    { 0x137D, 0x137F },
+    { 0x139A, 0x139F },
+    { 0x13F5, 0x1400 },
+    { 0x1677, 0x167F },
+    { 0x169D, 0x169F },
+    { 0x16F1, 0x16FF },
+    { 0x170D, 0x170D },
+    { 0x1715, 0x171F },
+    { 0x1737, 0x173F },
+    { 0x1754, 0x175F },
+    { 0x176D, 0x176D },
+    { 0x1771, 0x1771 },
+    { 0x1774, 0x177F },
+    { 0x17DE, 0x17DF },
+    { 0x17EA, 0x17EF },
+    { 0x17FA, 0x17FF },
+    { 0x180F, 0x180F },
+    { 0x181A, 0x181F },
+    { 0x1878, 0x187F },
+    { 0x18AA, 0x18FF },
+    { 0x191D, 0x191F },
+    { 0x192C, 0x192F },
+    { 0x193C, 0x193F },
+    { 0x1941, 0x1943 },
+    { 0x196E, 0x196F },
+    { 0x1975, 0x197F },
+    { 0x19AA, 0x19AF },
+    { 0x19CA, 0x19CF },
+    { 0x19DA, 0x19DD },
+    { 0x1A1C, 0x1A1D },
+    { 0x1A20, 0x1AFF },
+    { 0x1B4C, 0x1B4F },
+    { 0x1B7D, 0x1CFF },
+    { 0x1DCB, 0x1DFD },
+    { 0x1E9C, 0x1E9F },
+    { 0x1EFA, 0x1EFF },
+    { 0x1F16, 0x1F17 },
+    { 0x1F1E, 0x1F1F },
+    { 0x1F46, 0x1F47 },
+    { 0x1F4E, 0x1F4F },
+    { 0x1F58, 0x1F58 },
+    { 0x1F5A, 0x1F5A },
+    { 0x1F5C, 0x1F5C },
+    { 0x1F5E, 0x1F5E },
+    { 0x1F7E, 0x1F7F },
+    { 0x1FB5, 0x1FB5 },
+    { 0x1FC5, 0x1FC5 },
+    { 0x1FD4, 0x1FD5 },
+    { 0x1FDC, 0x1FDC },
+    { 0x1FF0, 0x1FF1 },
+    { 0x1FF5, 0x1FF5 },
+    { 0x1FFF, 0x1FFF },
+    { 0x2064, 0x2069 },
+    { 0x2072, 0x2073 },
+    { 0x208F, 0x208F },
+    { 0x2095, 0x209F },
+    { 0x20B6, 0x20CF },
+    { 0x20F0, 0x20FF },
+    { 0x214F, 0x2152 },
+    { 0x2185, 0x218F },
+    { 0x23E8, 0x23FF },
+    { 0x2427, 0x243F },
+    { 0x244B, 0x245F },
+    { 0x269D, 0x269F },
+    { 0x26B3, 0x2700 },
+    { 0x2705, 0x2705 },
+    { 0x270A, 0x270B },
+    { 0x2728, 0x2728 },
+    { 0x274C, 0x274C },
+    { 0x274E, 0x274E },
+    { 0x2753, 0x2755 },
+    { 0x2757, 0x2757 },
+    { 0x275F, 0x2760 },
+    { 0x2795, 0x2797 },
+    { 0x27B0, 0x27B0 },
+    { 0x27BF, 0x27BF },
+    { 0x27CB, 0x27CF },
+    { 0x27EC, 0x27EF },
+    { 0x2B1B, 0x2B1F },
+    { 0x2B24, 0x2BFF },
+    { 0x2C2F, 0x2C2F },
+    { 0x2C5F, 0x2C5F },
+    { 0x2C6D, 0x2C73 },
+    { 0x2C78, 0x2C7F },
+    { 0x2CEB, 0x2CF8 },
+    { 0x2D26, 0x2D2F },
+    { 0x2D66, 0x2D6E },
+    { 0x2D70, 0x2D7F },
+    { 0x2D97, 0x2D9F },
+    { 0x2DA7, 0x2DA7 },
+    { 0x2DAF, 0x2DAF },
+    { 0x2DB7, 0x2DB7 },
+    { 0x2DBF, 0x2DBF },
+    { 0x2DC7, 0x2DC7 },
+    { 0x2DCF, 0x2DCF },
+    { 0x2DD7, 0x2DD7 },
+    { 0x2DDF, 0x2DFF },
+    { 0x2E18, 0x2E1B },
+    { 0x2E1E, 0x2E7F },
+    { 0x2E9A, 0x2E9A },
+    { 0x2EF4, 0x2EFF },
+    { 0x2FD6, 0x2FEF },
+    { 0x2FFC, 0x2FFF },
+    { 0x3040, 0x3040 },
+    { 0x3097, 0x3098 },
+    { 0x3100, 0x3104 },
+    { 0x312D, 0x3130 },
+    { 0x318F, 0x318F },
+    { 0x31B8, 0x31BF },
+    { 0x31D0, 0x31EF },
+    { 0x321F, 0x321F },
+    { 0x3244, 0x324F },
+    { 0x32FF, 0x32FF },
+    { 0x4DB6, 0x4DBF },
+    { 0x9FBC, 0x9FFF },
+    { 0xA48D, 0xA48F },
+    { 0xA4C7, 0xA6FF },
+    { 0xA71B, 0xA71F },
+    { 0xA722, 0xA7FF },
+    { 0xA82C, 0xA83F },
+    { 0xA878, 0xABFF },
+    { 0xD7A4, 0xD7FF },
+    { 0xFA2E, 0xFA2F },
+    { 0xFA6B, 0xFA6F },
+    { 0xFADA, 0xFAFF },
+    { 0xFB07, 0xFB12 },
+    { 0xFB18, 0xFB1C },
+    { 0xFB37, 0xFB37 },
+    { 0xFB3D, 0xFB3D },
+    { 0xFB3F, 0xFB3F },
+    { 0xFB42, 0xFB42 },
+    { 0xFB45, 0xFB45 },
+    { 0xFBB2, 0xFBD2 },
+    { 0xFD40, 0xFD4F },
+    { 0xFD90, 0xFD91 },
+    { 0xFDC8, 0xFDCF },
+    { 0xFDFE, 0xFDFF },
+    { 0xFE1A, 0xFE1F },
+    { 0xFE24, 0xFE2F },
+    { 0xFE53, 0xFE53 },
+    { 0xFE67, 0xFE67 },
+    { 0xFE6C, 0xFE6F },
+    { 0xFE75, 0xFE75 },
+    { 0xFEFD, 0xFEFE },
+    { 0xFF00, 0xFF00 },
+    { 0xFFBF, 0xFFC1 },
+    { 0xFFC8, 0xFFC9 },
+    { 0xFFD0, 0xFFD1 },
+    { 0xFFD8, 0xFFD9 },
+    { 0xFFDD, 0xFFDF },
+    { 0xFFE7, 0xFFE7 },
+    { 0xFFEF, 0xFFF8 },
+    { 0x1000C, 0x1000C },
+    { 0x10027, 0x10027 },
+    { 0x1003B, 0x1003B },
+    { 0x1003E, 0x1003E },
+    { 0x1004E, 0x1004F },
+    { 0x1005E, 0x1007F },
+    { 0x100FB, 0x100FF },
+    { 0x10103, 0x10106 },
+    { 0x10134, 0x10136 },
+    { 0x1018B, 0x102FF },
+    { 0x1031F, 0x1031F },
+    { 0x10324, 0x1032F },
+    { 0x1034B, 0x1037F },
+    { 0x1039E, 0x1039E },
+    { 0x103C4, 0x103C7 },
+    { 0x103D6, 0x103FF },
+    { 0x1049E, 0x1049F },
+    { 0x104AA, 0x107FF },
+    { 0x10806, 0x10807 },
+    { 0x10809, 0x10809 },
+    { 0x10836, 0x10836 },
+    { 0x10839, 0x1083B },
+    { 0x1083D, 0x1083E },
+    { 0x10840, 0x108FF },
+    { 0x1091A, 0x1091E },
+    { 0x10920, 0x109FF },
+    { 0x10A04, 0x10A04 },
+    { 0x10A07, 0x10A0B },
+    { 0x10A14, 0x10A14 },
+    { 0x10A18, 0x10A18 },
+    { 0x10A34, 0x10A37 },
+    { 0x10A3B, 0x10A3E },
+    { 0x10A48, 0x10A4F },
+    { 0x10A59, 0x11FFF },
+    { 0x1236F, 0x123FF },
+    { 0x12463, 0x1246F },
+    { 0x12474, 0x1CFFF },
+    { 0x1D0F6, 0x1D0FF },
+    { 0x1D127, 0x1D129 },
+    { 0x1D1DE, 0x1D1FF },
+    { 0x1D246, 0x1D2FF },
+    { 0x1D357, 0x1D35F },
+    { 0x1D372, 0x1D3FF },
+    { 0x1D455, 0x1D455 },
+    { 0x1D49D, 0x1D49D },
+    { 0x1D4A0, 0x1D4A1 },
+    { 0x1D4A3, 0x1D4A4 },
+    { 0x1D4A7, 0x1D4A8 },
+    { 0x1D4AD, 0x1D4AD },
+    { 0x1D4BA, 0x1D4BA },
+    { 0x1D4BC, 0x1D4BC },
+    { 0x1D4C4, 0x1D4C4 },
+    { 0x1D506, 0x1D506 },
+    { 0x1D50B, 0x1D50C },
+    { 0x1D515, 0x1D515 },
+    { 0x1D51D, 0x1D51D },
+    { 0x1D53A, 0x1D53A },
+    { 0x1D53F, 0x1D53F },
+    { 0x1D545, 0x1D545 },
+    { 0x1D547, 0x1D549 },
+    { 0x1D551, 0x1D551 },
+    { 0x1D6A6, 0x1D6A7 },
+    { 0x1D7CC, 0x1D7CD },
+    { 0x1D800, 0x1FFFD },
+    { 0x2A6D7, 0x2F7FF },
+    { 0x2FA1E, 0x2FFFD },
+    { 0x30000, 0x3FFFD },
+    { 0x40000, 0x4FFFD },
+    { 0x50000, 0x5FFFD },
+    { 0x60000, 0x6FFFD },
+    { 0x70000, 0x7FFFD },
+    { 0x80000, 0x8FFFD },
+    { 0x90000, 0x9FFFD },
+    { 0xA0000, 0xAFFFD },
+    { 0xB0000, 0xBFFFD },
+    { 0xC0000, 0xCFFFD },
+    { 0xD0000, 0xDFFFD },
+    { 0xE0000, 0xE0000 },
+    { 0xE0002, 0xE001F },
+    { 0xE0080, 0xE00FF },
+    { 0xE01F0, 0xEFFFD }
+
+#define PREDICATE(c) uc_is_property_unassigned_code_value (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_unified_ideograph.c
@@ -0,0 +1,32 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x3400, 0x4DB5 },
+    { 0x4E00, 0x9FBB },
+    { 0xFA0E, 0xFA0F },
+    { 0xFA11, 0xFA11 },
+    { 0xFA13, 0xFA14 },
+    { 0xFA1F, 0xFA1F },
+    { 0xFA21, 0xFA21 },
+    { 0xFA23, 0xFA24 },
+    { 0xFA27, 0xFA29 },
+    { 0x20000, 0x2A6D6 }
+
+#define PREDICATE(c) uc_is_property_unified_ideograph (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_uppercase.c
@@ -0,0 +1,517 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0041, 0x005A },
+    { 0x00C0, 0x00D6 },
+    { 0x00D8, 0x00DE },
+    { 0x0100, 0x0100 },
+    { 0x0102, 0x0102 },
+    { 0x0104, 0x0104 },
+    { 0x0106, 0x0106 },
+    { 0x0108, 0x0108 },
+    { 0x010A, 0x010A },
+    { 0x010C, 0x010C },
+    { 0x010E, 0x010E },
+    { 0x0110, 0x0110 },
+    { 0x0112, 0x0112 },
+    { 0x0114, 0x0114 },
+    { 0x0116, 0x0116 },
+    { 0x0118, 0x0118 },
+    { 0x011A, 0x011A },
+    { 0x011C, 0x011C },
+    { 0x011E, 0x011E },
+    { 0x0120, 0x0120 },
+    { 0x0122, 0x0122 },
+    { 0x0124, 0x0124 },
+    { 0x0126, 0x0126 },
+    { 0x0128, 0x0128 },
+    { 0x012A, 0x012A },
+    { 0x012C, 0x012C },
+    { 0x012E, 0x012E },
+    { 0x0130, 0x0130 },
+    { 0x0132, 0x0132 },
+    { 0x0134, 0x0134 },
+    { 0x0136, 0x0136 },
+    { 0x0139, 0x0139 },
+    { 0x013B, 0x013B },
+    { 0x013D, 0x013D },
+    { 0x013F, 0x013F },
+    { 0x0141, 0x0141 },
+    { 0x0143, 0x0143 },
+    { 0x0145, 0x0145 },
+    { 0x0147, 0x0147 },
+    { 0x014A, 0x014A },
+    { 0x014C, 0x014C },
+    { 0x014E, 0x014E },
+    { 0x0150, 0x0150 },
+    { 0x0152, 0x0152 },
+    { 0x0154, 0x0154 },
+    { 0x0156, 0x0156 },
+    { 0x0158, 0x0158 },
+    { 0x015A, 0x015A },
+    { 0x015C, 0x015C },
+    { 0x015E, 0x015E },
+    { 0x0160, 0x0160 },
+    { 0x0162, 0x0162 },
+    { 0x0164, 0x0164 },
+    { 0x0166, 0x0166 },
+    { 0x0168, 0x0168 },
+    { 0x016A, 0x016A },
+    { 0x016C, 0x016C },
+    { 0x016E, 0x016E },
+    { 0x0170, 0x0170 },
+    { 0x0172, 0x0172 },
+    { 0x0174, 0x0174 },
+    { 0x0176, 0x0176 },
+    { 0x0178, 0x0179 },
+    { 0x017B, 0x017B },
+    { 0x017D, 0x017D },
+    { 0x0181, 0x0182 },
+    { 0x0184, 0x0184 },
+    { 0x0186, 0x0187 },
+    { 0x0189, 0x018B },
+    { 0x018E, 0x0191 },
+    { 0x0193, 0x0194 },
+    { 0x0196, 0x0198 },
+    { 0x019C, 0x019D },
+    { 0x019F, 0x01A0 },
+    { 0x01A2, 0x01A2 },
+    { 0x01A4, 0x01A4 },
+    { 0x01A6, 0x01A7 },
+    { 0x01A9, 0x01A9 },
+    { 0x01AC, 0x01AC },
+    { 0x01AE, 0x01AF },
+    { 0x01B1, 0x01B3 },
+    { 0x01B5, 0x01B5 },
+    { 0x01B7, 0x01B8 },
+    { 0x01BC, 0x01BC },
+    { 0x01C4, 0x01C4 },
+    { 0x01C7, 0x01C7 },
+    { 0x01CA, 0x01CA },
+    { 0x01CD, 0x01CD },
+    { 0x01CF, 0x01CF },
+    { 0x01D1, 0x01D1 },
+    { 0x01D3, 0x01D3 },
+    { 0x01D5, 0x01D5 },
+    { 0x01D7, 0x01D7 },
+    { 0x01D9, 0x01D9 },
+    { 0x01DB, 0x01DB },
+    { 0x01DE, 0x01DE },
+    { 0x01E0, 0x01E0 },
+    { 0x01E2, 0x01E2 },
+    { 0x01E4, 0x01E4 },
+    { 0x01E6, 0x01E6 },
+    { 0x01E8, 0x01E8 },
+    { 0x01EA, 0x01EA },
+    { 0x01EC, 0x01EC },
+    { 0x01EE, 0x01EE },
+    { 0x01F1, 0x01F1 },
+    { 0x01F4, 0x01F4 },
+    { 0x01F6, 0x01F8 },
+    { 0x01FA, 0x01FA },
+    { 0x01FC, 0x01FC },
+    { 0x01FE, 0x01FE },
+    { 0x0200, 0x0200 },
+    { 0x0202, 0x0202 },
+    { 0x0204, 0x0204 },
+    { 0x0206, 0x0206 },
+    { 0x0208, 0x0208 },
+    { 0x020A, 0x020A },
+    { 0x020C, 0x020C },
+    { 0x020E, 0x020E },
+    { 0x0210, 0x0210 },
+    { 0x0212, 0x0212 },
+    { 0x0214, 0x0214 },
+    { 0x0216, 0x0216 },
+    { 0x0218, 0x0218 },
+    { 0x021A, 0x021A },
+    { 0x021C, 0x021C },
+    { 0x021E, 0x021E },
+    { 0x0220, 0x0220 },
+    { 0x0222, 0x0222 },
+    { 0x0224, 0x0224 },
+    { 0x0226, 0x0226 },
+    { 0x0228, 0x0228 },
+    { 0x022A, 0x022A },
+    { 0x022C, 0x022C },
+    { 0x022E, 0x022E },
+    { 0x0230, 0x0230 },
+    { 0x0232, 0x0232 },
+    { 0x023A, 0x023B },
+    { 0x023D, 0x023E },
+    { 0x0241, 0x0241 },
+    { 0x0243, 0x0246 },
+    { 0x0248, 0x0248 },
+    { 0x024A, 0x024A },
+    { 0x024C, 0x024C },
+    { 0x024E, 0x024E },
+    { 0x0386, 0x0386 },
+    { 0x0388, 0x038A },
+    { 0x038C, 0x038C },
+    { 0x038E, 0x038F },
+    { 0x0391, 0x03A1 },
+    { 0x03A3, 0x03AB },
+    { 0x03D2, 0x03D4 },
+    { 0x03D8, 0x03D8 },
+    { 0x03DA, 0x03DA },
+    { 0x03DC, 0x03DC },
+    { 0x03DE, 0x03DE },
+    { 0x03E0, 0x03E0 },
+    { 0x03E2, 0x03E2 },
+    { 0x03E4, 0x03E4 },
+    { 0x03E6, 0x03E6 },
+    { 0x03E8, 0x03E8 },
+    { 0x03EA, 0x03EA },
+    { 0x03EC, 0x03EC },
+    { 0x03EE, 0x03EE },
+    { 0x03F4, 0x03F4 },
+    { 0x03F7, 0x03F7 },
+    { 0x03F9, 0x03FA },
+    { 0x03FD, 0x042F },
+    { 0x0460, 0x0460 },
+    { 0x0462, 0x0462 },
+    { 0x0464, 0x0464 },
+    { 0x0466, 0x0466 },
+    { 0x0468, 0x0468 },
+    { 0x046A, 0x046A },
+    { 0x046C, 0x046C },
+    { 0x046E, 0x046E },
+    { 0x0470, 0x0470 },
+    { 0x0472, 0x0472 },
+    { 0x0474, 0x0474 },
+    { 0x0476, 0x0476 },
+    { 0x0478, 0x0478 },
+    { 0x047A, 0x047A },
+    { 0x047C, 0x047C },
+    { 0x047E, 0x047E },
+    { 0x0480, 0x0480 },
+    { 0x048A, 0x048A },
+    { 0x048C, 0x048C },
+    { 0x048E, 0x048E },
+    { 0x0490, 0x0490 },
+    { 0x0492, 0x0492 },
+    { 0x0494, 0x0494 },
+    { 0x0496, 0x0496 },
+    { 0x0498, 0x0498 },
+    { 0x049A, 0x049A },
+    { 0x049C, 0x049C },
+    { 0x049E, 0x049E },
+    { 0x04A0, 0x04A0 },
+    { 0x04A2, 0x04A2 },
+    { 0x04A4, 0x04A4 },
+    { 0x04A6, 0x04A6 },
+    { 0x04A8, 0x04A8 },
+    { 0x04AA, 0x04AA },
+    { 0x04AC, 0x04AC },
+    { 0x04AE, 0x04AE },
+    { 0x04B0, 0x04B0 },
+    { 0x04B2, 0x04B2 },
+    { 0x04B4, 0x04B4 },
+    { 0x04B6, 0x04B6 },
+    { 0x04B8, 0x04B8 },
+    { 0x04BA, 0x04BA },
+    { 0x04BC, 0x04BC },
+    { 0x04BE, 0x04BE },
+    { 0x04C0, 0x04C1 },
+    { 0x04C3, 0x04C3 },
+    { 0x04C5, 0x04C5 },
+    { 0x04C7, 0x04C7 },
+    { 0x04C9, 0x04C9 },
+    { 0x04CB, 0x04CB },
+    { 0x04CD, 0x04CD },
+    { 0x04D0, 0x04D0 },
+    { 0x04D2, 0x04D2 },
+    { 0x04D4, 0x04D4 },
+    { 0x04D6, 0x04D6 },
+    { 0x04D8, 0x04D8 },
+    { 0x04DA, 0x04DA },
+    { 0x04DC, 0x04DC },
+    { 0x04DE, 0x04DE },
+    { 0x04E0, 0x04E0 },
+    { 0x04E2, 0x04E2 },
+    { 0x04E4, 0x04E4 },
+    { 0x04E6, 0x04E6 },
+    { 0x04E8, 0x04E8 },
+    { 0x04EA, 0x04EA },
+    { 0x04EC, 0x04EC },
+    { 0x04EE, 0x04EE },
+    { 0x04F0, 0x04F0 },
+    { 0x04F2, 0x04F2 },
+    { 0x04F4, 0x04F4 },
+    { 0x04F6, 0x04F6 },
+    { 0x04F8, 0x04F8 },
+    { 0x04FA, 0x04FA },
+    { 0x04FC, 0x04FC },
+    { 0x04FE, 0x04FE },
+    { 0x0500, 0x0500 },
+    { 0x0502, 0x0502 },
+    { 0x0504, 0x0504 },
+    { 0x0506, 0x0506 },
+    { 0x0508, 0x0508 },
+    { 0x050A, 0x050A },
+    { 0x050C, 0x050C },
+    { 0x050E, 0x050E },
+    { 0x0510, 0x0510 },
+    { 0x0512, 0x0512 },
+    { 0x0531, 0x0556 },
+    { 0x10A0, 0x10C5 },
+    { 0x1E00, 0x1E00 },
+    { 0x1E02, 0x1E02 },
+    { 0x1E04, 0x1E04 },
+    { 0x1E06, 0x1E06 },
+    { 0x1E08, 0x1E08 },
+    { 0x1E0A, 0x1E0A },
+    { 0x1E0C, 0x1E0C },
+    { 0x1E0E, 0x1E0E },
+    { 0x1E10, 0x1E10 },
+    { 0x1E12, 0x1E12 },
+    { 0x1E14, 0x1E14 },
+    { 0x1E16, 0x1E16 },
+    { 0x1E18, 0x1E18 },
+    { 0x1E1A, 0x1E1A },
+    { 0x1E1C, 0x1E1C },
+    { 0x1E1E, 0x1E1E },
+    { 0x1E20, 0x1E20 },
+    { 0x1E22, 0x1E22 },
+    { 0x1E24, 0x1E24 },
+    { 0x1E26, 0x1E26 },
+    { 0x1E28, 0x1E28 },
+    { 0x1E2A, 0x1E2A },
+    { 0x1E2C, 0x1E2C },
+    { 0x1E2E, 0x1E2E },
+    { 0x1E30, 0x1E30 },
+    { 0x1E32, 0x1E32 },
+    { 0x1E34, 0x1E34 },
+    { 0x1E36, 0x1E36 },
+    { 0x1E38, 0x1E38 },
+    { 0x1E3A, 0x1E3A },
+    { 0x1E3C, 0x1E3C },
+    { 0x1E3E, 0x1E3E },
+    { 0x1E40, 0x1E40 },
+    { 0x1E42, 0x1E42 },
+    { 0x1E44, 0x1E44 },
+    { 0x1E46, 0x1E46 },
+    { 0x1E48, 0x1E48 },
+    { 0x1E4A, 0x1E4A },
+    { 0x1E4C, 0x1E4C },
+    { 0x1E4E, 0x1E4E },
+    { 0x1E50, 0x1E50 },
+    { 0x1E52, 0x1E52 },
+    { 0x1E54, 0x1E54 },
+    { 0x1E56, 0x1E56 },
+    { 0x1E58, 0x1E58 },
+    { 0x1E5A, 0x1E5A },
+    { 0x1E5C, 0x1E5C },
+    { 0x1E5E, 0x1E5E },
+    { 0x1E60, 0x1E60 },
+    { 0x1E62, 0x1E62 },
+    { 0x1E64, 0x1E64 },
+    { 0x1E66, 0x1E66 },
+    { 0x1E68, 0x1E68 },
+    { 0x1E6A, 0x1E6A },
+    { 0x1E6C, 0x1E6C },
+    { 0x1E6E, 0x1E6E },
+    { 0x1E70, 0x1E70 },
+    { 0x1E72, 0x1E72 },
+    { 0x1E74, 0x1E74 },
+    { 0x1E76, 0x1E76 },
+    { 0x1E78, 0x1E78 },
+    { 0x1E7A, 0x1E7A },
+    { 0x1E7C, 0x1E7C },
+    { 0x1E7E, 0x1E7E },
+    { 0x1E80, 0x1E80 },
+    { 0x1E82, 0x1E82 },
+    { 0x1E84, 0x1E84 },
+    { 0x1E86, 0x1E86 },
+    { 0x1E88, 0x1E88 },
+    { 0x1E8A, 0x1E8A },
+    { 0x1E8C, 0x1E8C },
+    { 0x1E8E, 0x1E8E },
+    { 0x1E90, 0x1E90 },
+    { 0x1E92, 0x1E92 },
+    { 0x1E94, 0x1E94 },
+    { 0x1EA0, 0x1EA0 },
+    { 0x1EA2, 0x1EA2 },
+    { 0x1EA4, 0x1EA4 },
+    { 0x1EA6, 0x1EA6 },
+    { 0x1EA8, 0x1EA8 },
+    { 0x1EAA, 0x1EAA },
+    { 0x1EAC, 0x1EAC },
+    { 0x1EAE, 0x1EAE },
+    { 0x1EB0, 0x1EB0 },
+    { 0x1EB2, 0x1EB2 },
+    { 0x1EB4, 0x1EB4 },
+    { 0x1EB6, 0x1EB6 },
+    { 0x1EB8, 0x1EB8 },
+    { 0x1EBA, 0x1EBA },
+    { 0x1EBC, 0x1EBC },
+    { 0x1EBE, 0x1EBE },
+    { 0x1EC0, 0x1EC0 },
+    { 0x1EC2, 0x1EC2 },
+    { 0x1EC4, 0x1EC4 },
+    { 0x1EC6, 0x1EC6 },
+    { 0x1EC8, 0x1EC8 },
+    { 0x1ECA, 0x1ECA },
+    { 0x1ECC, 0x1ECC },
+    { 0x1ECE, 0x1ECE },
+    { 0x1ED0, 0x1ED0 },
+    { 0x1ED2, 0x1ED2 },
+    { 0x1ED4, 0x1ED4 },
+    { 0x1ED6, 0x1ED6 },
+    { 0x1ED8, 0x1ED8 },
+    { 0x1EDA, 0x1EDA },
+    { 0x1EDC, 0x1EDC },
+    { 0x1EDE, 0x1EDE },
+    { 0x1EE0, 0x1EE0 },
+    { 0x1EE2, 0x1EE2 },
+    { 0x1EE4, 0x1EE4 },
+    { 0x1EE6, 0x1EE6 },
+    { 0x1EE8, 0x1EE8 },
+    { 0x1EEA, 0x1EEA },
+    { 0x1EEC, 0x1EEC },
+    { 0x1EEE, 0x1EEE },
+    { 0x1EF0, 0x1EF0 },
+    { 0x1EF2, 0x1EF2 },
+    { 0x1EF4, 0x1EF4 },
+    { 0x1EF6, 0x1EF6 },
+    { 0x1EF8, 0x1EF8 },
+    { 0x1F08, 0x1F0F },
+    { 0x1F18, 0x1F1D },
+    { 0x1F28, 0x1F2F },
+    { 0x1F38, 0x1F3F },
+    { 0x1F48, 0x1F4D },
+    { 0x1F59, 0x1F59 },
+    { 0x1F5B, 0x1F5B },
+    { 0x1F5D, 0x1F5D },
+    { 0x1F5F, 0x1F5F },
+    { 0x1F68, 0x1F6F },
+    { 0x1FB8, 0x1FBB },
+    { 0x1FC8, 0x1FCB },
+    { 0x1FD8, 0x1FDB },
+    { 0x1FE8, 0x1FEC },
+    { 0x1FF8, 0x1FFB },
+    { 0x2102, 0x2102 },
+    { 0x2107, 0x2107 },
+    { 0x210B, 0x210D },
+    { 0x2110, 0x2112 },
+    { 0x2115, 0x2115 },
+    { 0x2119, 0x211D },
+    { 0x2124, 0x2124 },
+    { 0x2126, 0x2126 },
+    { 0x2128, 0x2128 },
+    { 0x212A, 0x212D },
+    { 0x2130, 0x2133 },
+    { 0x213E, 0x213F },
+    { 0x2145, 0x2145 },
+    { 0x2160, 0x216F },
+    { 0x2183, 0x2183 },
+    { 0x24B6, 0x24CF },
+    { 0x2C00, 0x2C2E },
+    { 0x2C60, 0x2C60 },
+    { 0x2C62, 0x2C64 },
+    { 0x2C67, 0x2C67 },
+    { 0x2C69, 0x2C69 },
+    { 0x2C6B, 0x2C6B },
+    { 0x2C75, 0x2C75 },
+    { 0x2C80, 0x2C80 },
+    { 0x2C82, 0x2C82 },
+    { 0x2C84, 0x2C84 },
+    { 0x2C86, 0x2C86 },
+    { 0x2C88, 0x2C88 },
+    { 0x2C8A, 0x2C8A },
+    { 0x2C8C, 0x2C8C },
+    { 0x2C8E, 0x2C8E },
+    { 0x2C90, 0x2C90 },
+    { 0x2C92, 0x2C92 },
+    { 0x2C94, 0x2C94 },
+    { 0x2C96, 0x2C96 },
+    { 0x2C98, 0x2C98 },
+    { 0x2C9A, 0x2C9A },
+    { 0x2C9C, 0x2C9C },
+    { 0x2C9E, 0x2C9E },
+    { 0x2CA0, 0x2CA0 },
+    { 0x2CA2, 0x2CA2 },
+    { 0x2CA4, 0x2CA4 },
+    { 0x2CA6, 0x2CA6 },
+    { 0x2CA8, 0x2CA8 },
+    { 0x2CAA, 0x2CAA },
+    { 0x2CAC, 0x2CAC },
+    { 0x2CAE, 0x2CAE },
+    { 0x2CB0, 0x2CB0 },
+    { 0x2CB2, 0x2CB2 },
+    { 0x2CB4, 0x2CB4 },
+    { 0x2CB6, 0x2CB6 },
+    { 0x2CB8, 0x2CB8 },
+    { 0x2CBA, 0x2CBA },
+    { 0x2CBC, 0x2CBC },
+    { 0x2CBE, 0x2CBE },
+    { 0x2CC0, 0x2CC0 },
+    { 0x2CC2, 0x2CC2 },
+    { 0x2CC4, 0x2CC4 },
+    { 0x2CC6, 0x2CC6 },
+    { 0x2CC8, 0x2CC8 },
+    { 0x2CCA, 0x2CCA },
+    { 0x2CCC, 0x2CCC },
+    { 0x2CCE, 0x2CCE },
+    { 0x2CD0, 0x2CD0 },
+    { 0x2CD2, 0x2CD2 },
+    { 0x2CD4, 0x2CD4 },
+    { 0x2CD6, 0x2CD6 },
+    { 0x2CD8, 0x2CD8 },
+    { 0x2CDA, 0x2CDA },
+    { 0x2CDC, 0x2CDC },
+    { 0x2CDE, 0x2CDE },
+    { 0x2CE0, 0x2CE0 },
+    { 0x2CE2, 0x2CE2 },
+    { 0xFF21, 0xFF3A },
+    { 0x10400, 0x10427 },
+    { 0x1D400, 0x1D419 },
+    { 0x1D434, 0x1D44D },
+    { 0x1D468, 0x1D481 },
+    { 0x1D49C, 0x1D49C },
+    { 0x1D49E, 0x1D49F },
+    { 0x1D4A2, 0x1D4A2 },
+    { 0x1D4A5, 0x1D4A6 },
+    { 0x1D4A9, 0x1D4AC },
+    { 0x1D4AE, 0x1D4B5 },
+    { 0x1D4D0, 0x1D4E9 },
+    { 0x1D504, 0x1D505 },
+    { 0x1D507, 0x1D50A },
+    { 0x1D50D, 0x1D514 },
+    { 0x1D516, 0x1D51C },
+    { 0x1D538, 0x1D539 },
+    { 0x1D53B, 0x1D53E },
+    { 0x1D540, 0x1D544 },
+    { 0x1D546, 0x1D546 },
+    { 0x1D54A, 0x1D550 },
+    { 0x1D56C, 0x1D585 },
+    { 0x1D5A0, 0x1D5B9 },
+    { 0x1D5D4, 0x1D5ED },
+    { 0x1D608, 0x1D621 },
+    { 0x1D63C, 0x1D655 },
+    { 0x1D670, 0x1D689 },
+    { 0x1D6A8, 0x1D6C0 },
+    { 0x1D6E2, 0x1D6FA },
+    { 0x1D71C, 0x1D734 },
+    { 0x1D756, 0x1D76E },
+    { 0x1D790, 0x1D7A8 },
+    { 0x1D7CA, 0x1D7CA }
+
+#define PREDICATE(c) uc_is_property_uppercase (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_variation_selector.c
@@ -0,0 +1,25 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x180B, 0x180D },
+    { 0xFE00, 0xFE0F },
+    { 0xE0100, 0xE01EF }
+
+#define PREDICATE(c) uc_is_property_variation_selector (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_white_space.c
@@ -0,0 +1,33 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0009, 0x000D },
+    { 0x0020, 0x0020 },
+    { 0x0085, 0x0085 },
+    { 0x00A0, 0x00A0 },
+    { 0x1680, 0x1680 },
+    { 0x180E, 0x180E },
+    { 0x2000, 0x200A },
+    { 0x2028, 0x2029 },
+    { 0x202F, 0x202F },
+    { 0x205F, 0x205F },
+    { 0x3000, 0x3000 }
+
+#define PREDICATE(c) uc_is_property_white_space (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_xid_continue.c
@@ -0,0 +1,485 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0030, 0x0039 },
+    { 0x0041, 0x005A },
+    { 0x005F, 0x005F },
+    { 0x0061, 0x007A },
+    { 0x00AA, 0x00AA },
+    { 0x00B5, 0x00B5 },
+    { 0x00B7, 0x00B7 },
+    { 0x00BA, 0x00BA },
+    { 0x00C0, 0x00D6 },
+    { 0x00D8, 0x00F6 },
+    { 0x00F8, 0x02C1 },
+    { 0x02C6, 0x02D1 },
+    { 0x02E0, 0x02E4 },
+    { 0x02EE, 0x02EE },
+    { 0x0300, 0x036F },
+    { 0x037B, 0x037D },
+    { 0x0386, 0x0386 },
+    { 0x0388, 0x038A },
+    { 0x038C, 0x038C },
+    { 0x038E, 0x03A1 },
+    { 0x03A3, 0x03CE },
+    { 0x03D0, 0x03F5 },
+    { 0x03F7, 0x0481 },
+    { 0x0483, 0x0486 },
+    { 0x048A, 0x0513 },
+    { 0x0531, 0x0556 },
+    { 0x0559, 0x0559 },
+    { 0x0561, 0x0587 },
+    { 0x0591, 0x05BD },
+    { 0x05BF, 0x05BF },
+    { 0x05C1, 0x05C2 },
+    { 0x05C4, 0x05C5 },
+    { 0x05C7, 0x05C7 },
+    { 0x05D0, 0x05EA },
+    { 0x05F0, 0x05F2 },
+    { 0x0610, 0x0615 },
+    { 0x0621, 0x063A },
+    { 0x0640, 0x065E },
+    { 0x0660, 0x0669 },
+    { 0x066E, 0x06D3 },
+    { 0x06D5, 0x06DC },
+    { 0x06DF, 0x06E8 },
+    { 0x06EA, 0x06FC },
+    { 0x06FF, 0x06FF },
+    { 0x0710, 0x074A },
+    { 0x074D, 0x076D },
+    { 0x0780, 0x07B1 },
+    { 0x07C0, 0x07F5 },
+    { 0x07FA, 0x07FA },
+    { 0x0901, 0x0939 },
+    { 0x093C, 0x094D },
+    { 0x0950, 0x0954 },
+    { 0x0958, 0x0963 },
+    { 0x0966, 0x096F },
+    { 0x097B, 0x097F },
+    { 0x0981, 0x0983 },
+    { 0x0985, 0x098C },
+    { 0x098F, 0x0990 },
+    { 0x0993, 0x09A8 },
+    { 0x09AA, 0x09B0 },
+    { 0x09B2, 0x09B2 },
+    { 0x09B6, 0x09B9 },
+    { 0x09BC, 0x09C4 },
+    { 0x09C7, 0x09C8 },
+    { 0x09CB, 0x09CE },
+    { 0x09D7, 0x09D7 },
+    { 0x09DC, 0x09DD },
+    { 0x09DF, 0x09E3 },
+    { 0x09E6, 0x09F1 },
+    { 0x0A01, 0x0A03 },
+    { 0x0A05, 0x0A0A },
+    { 0x0A0F, 0x0A10 },
+    { 0x0A13, 0x0A28 },
+    { 0x0A2A, 0x0A30 },
+    { 0x0A32, 0x0A33 },
+    { 0x0A35, 0x0A36 },
+    { 0x0A38, 0x0A39 },
+    { 0x0A3C, 0x0A3C },
+    { 0x0A3E, 0x0A42 },
+    { 0x0A47, 0x0A48 },
+    { 0x0A4B, 0x0A4D },
+    { 0x0A59, 0x0A5C },
+    { 0x0A5E, 0x0A5E },
+    { 0x0A66, 0x0A74 },
+    { 0x0A81, 0x0A83 },
+    { 0x0A85, 0x0A8D },
+    { 0x0A8F, 0x0A91 },
+    { 0x0A93, 0x0AA8 },
+    { 0x0AAA, 0x0AB0 },
+    { 0x0AB2, 0x0AB3 },
+    { 0x0AB5, 0x0AB9 },
+    { 0x0ABC, 0x0AC5 },
+    { 0x0AC7, 0x0AC9 },
+    { 0x0ACB, 0x0ACD },
+    { 0x0AD0, 0x0AD0 },
+    { 0x0AE0, 0x0AE3 },
+    { 0x0AE6, 0x0AEF },
+    { 0x0B01, 0x0B03 },
+    { 0x0B05, 0x0B0C },
+    { 0x0B0F, 0x0B10 },
+    { 0x0B13, 0x0B28 },
+    { 0x0B2A, 0x0B30 },
+    { 0x0B32, 0x0B33 },
+    { 0x0B35, 0x0B39 },
+    { 0x0B3C, 0x0B43 },
+    { 0x0B47, 0x0B48 },
+    { 0x0B4B, 0x0B4D },
+    { 0x0B56, 0x0B57 },
+    { 0x0B5C, 0x0B5D },
+    { 0x0B5F, 0x0B61 },
+    { 0x0B66, 0x0B6F },
+    { 0x0B71, 0x0B71 },
+    { 0x0B82, 0x0B83 },
+    { 0x0B85, 0x0B8A },
+    { 0x0B8E, 0x0B90 },
+    { 0x0B92, 0x0B95 },
+    { 0x0B99, 0x0B9A },
+    { 0x0B9C, 0x0B9C },
+    { 0x0B9E, 0x0B9F },
+    { 0x0BA3, 0x0BA4 },
+    { 0x0BA8, 0x0BAA },
+    { 0x0BAE, 0x0BB9 },
+    { 0x0BBE, 0x0BC2 },
+    { 0x0BC6, 0x0BC8 },
+    { 0x0BCA, 0x0BCD },
+    { 0x0BD7, 0x0BD7 },
+    { 0x0BE6, 0x0BEF },
+    { 0x0C01, 0x0C03 },
+    { 0x0C05, 0x0C0C },
+    { 0x0C0E, 0x0C10 },
+    { 0x0C12, 0x0C28 },
+    { 0x0C2A, 0x0C33 },
+    { 0x0C35, 0x0C39 },
+    { 0x0C3E, 0x0C44 },
+    { 0x0C46, 0x0C48 },
+    { 0x0C4A, 0x0C4D },
+    { 0x0C55, 0x0C56 },
+    { 0x0C60, 0x0C61 },
+    { 0x0C66, 0x0C6F },
+    { 0x0C82, 0x0C83 },
+    { 0x0C85, 0x0C8C },
+    { 0x0C8E, 0x0C90 },
+    { 0x0C92, 0x0CA8 },
+    { 0x0CAA, 0x0CB3 },
+    { 0x0CB5, 0x0CB9 },
+    { 0x0CBC, 0x0CC4 },
+    { 0x0CC6, 0x0CC8 },
+    { 0x0CCA, 0x0CCD },
+    { 0x0CD5, 0x0CD6 },
+    { 0x0CDE, 0x0CDE },
+    { 0x0CE0, 0x0CE3 },
+    { 0x0CE6, 0x0CEF },
+    { 0x0D02, 0x0D03 },
+    { 0x0D05, 0x0D0C },
+    { 0x0D0E, 0x0D10 },
+    { 0x0D12, 0x0D28 },
+    { 0x0D2A, 0x0D39 },
+    { 0x0D3E, 0x0D43 },
+    { 0x0D46, 0x0D48 },
+    { 0x0D4A, 0x0D4D },
+    { 0x0D57, 0x0D57 },
+    { 0x0D60, 0x0D61 },
+    { 0x0D66, 0x0D6F },
+    { 0x0D82, 0x0D83 },
+    { 0x0D85, 0x0D96 },
+    { 0x0D9A, 0x0DB1 },
+    { 0x0DB3, 0x0DBB },
+    { 0x0DBD, 0x0DBD },
+    { 0x0DC0, 0x0DC6 },
+    { 0x0DCA, 0x0DCA },
+    { 0x0DCF, 0x0DD4 },
+    { 0x0DD6, 0x0DD6 },
+    { 0x0DD8, 0x0DDF },
+    { 0x0DF2, 0x0DF3 },
+    { 0x0E01, 0x0E3A },
+    { 0x0E40, 0x0E4E },
+    { 0x0E50, 0x0E59 },
+    { 0x0E81, 0x0E82 },
+    { 0x0E84, 0x0E84 },
+    { 0x0E87, 0x0E88 },
+    { 0x0E8A, 0x0E8A },
+    { 0x0E8D, 0x0E8D },
+    { 0x0E94, 0x0E97 },
+    { 0x0E99, 0x0E9F },
+    { 0x0EA1, 0x0EA3 },
+    { 0x0EA5, 0x0EA5 },
+    { 0x0EA7, 0x0EA7 },
+    { 0x0EAA, 0x0EAB },
+    { 0x0EAD, 0x0EB9 },
+    { 0x0EBB, 0x0EBD },
+    { 0x0EC0, 0x0EC4 },
+    { 0x0EC6, 0x0EC6 },
+    { 0x0EC8, 0x0ECD },
+    { 0x0ED0, 0x0ED9 },
+    { 0x0EDC, 0x0EDD },
+    { 0x0F00, 0x0F00 },
+    { 0x0F18, 0x0F19 },
+    { 0x0F20, 0x0F29 },
+    { 0x0F35, 0x0F35 },
+    { 0x0F37, 0x0F37 },
+    { 0x0F39, 0x0F39 },
+    { 0x0F3E, 0x0F47 },
+    { 0x0F49, 0x0F6A },
+    { 0x0F71, 0x0F84 },
+    { 0x0F86, 0x0F8B },
+    { 0x0F90, 0x0F97 },
+    { 0x0F99, 0x0FBC },
+    { 0x0FC6, 0x0FC6 },
+    { 0x1000, 0x1021 },
+    { 0x1023, 0x1027 },
+    { 0x1029, 0x102A },
+    { 0x102C, 0x1032 },
+    { 0x1036, 0x1039 },
+    { 0x1040, 0x1049 },
+    { 0x1050, 0x1059 },
+    { 0x10A0, 0x10C5 },
+    { 0x10D0, 0x10FA },
+    { 0x10FC, 0x10FC },
+    { 0x1100, 0x1159 },
+    { 0x115F, 0x11A2 },
+    { 0x11A8, 0x11F9 },
+    { 0x1200, 0x1248 },
+    { 0x124A, 0x124D },
+    { 0x1250, 0x1256 },
+    { 0x1258, 0x1258 },
+    { 0x125A, 0x125D },
+    { 0x1260, 0x1288 },
+    { 0x128A, 0x128D },
+    { 0x1290, 0x12B0 },
+    { 0x12B2, 0x12B5 },
+    { 0x12B8, 0x12BE },
+    { 0x12C0, 0x12C0 },
+    { 0x12C2, 0x12C5 },
+    { 0x12C8, 0x12D6 },
+    { 0x12D8, 0x1310 },
+    { 0x1312, 0x1315 },
+    { 0x1318, 0x135A },
+    { 0x135F, 0x135F },
+    { 0x1369, 0x1371 },
+    { 0x1380, 0x138F },
+    { 0x13A0, 0x13F4 },
+    { 0x1401, 0x166C },
+    { 0x166F, 0x1676 },
+    { 0x1681, 0x169A },
+    { 0x16A0, 0x16EA },
+    { 0x16EE, 0x16F0 },
+    { 0x1700, 0x170C },
+    { 0x170E, 0x1714 },
+    { 0x1720, 0x1734 },
+    { 0x1740, 0x1753 },
+    { 0x1760, 0x176C },
+    { 0x176E, 0x1770 },
+    { 0x1772, 0x1773 },
+    { 0x1780, 0x17B3 },
+    { 0x17B6, 0x17D3 },
+    { 0x17D7, 0x17D7 },
+    { 0x17DC, 0x17DD },
+    { 0x17E0, 0x17E9 },
+    { 0x180B, 0x180D },
+    { 0x1810, 0x1819 },
+    { 0x1820, 0x1877 },
+    { 0x1880, 0x18A9 },
+    { 0x1900, 0x191C },
+    { 0x1920, 0x192B },
+    { 0x1930, 0x193B },
+    { 0x1946, 0x196D },
+    { 0x1970, 0x1974 },
+    { 0x1980, 0x19A9 },
+    { 0x19B0, 0x19C9 },
+    { 0x19D0, 0x19D9 },
+    { 0x1A00, 0x1A1B },
+    { 0x1B00, 0x1B4B },
+    { 0x1B50, 0x1B59 },
+    { 0x1B6B, 0x1B73 },
+    { 0x1D00, 0x1DCA },
+    { 0x1DFE, 0x1E9B },
+    { 0x1EA0, 0x1EF9 },
+    { 0x1F00, 0x1F15 },
+    { 0x1F18, 0x1F1D },
+    { 0x1F20, 0x1F45 },
+    { 0x1F48, 0x1F4D },
+    { 0x1F50, 0x1F57 },
+    { 0x1F59, 0x1F59 },
+    { 0x1F5B, 0x1F5B },
+    { 0x1F5D, 0x1F5D },
+    { 0x1F5F, 0x1F7D },
+    { 0x1F80, 0x1FB4 },
+    { 0x1FB6, 0x1FBC },
+    { 0x1FBE, 0x1FBE },
+    { 0x1FC2, 0x1FC4 },
+    { 0x1FC6, 0x1FCC },
+    { 0x1FD0, 0x1FD3 },
+    { 0x1FD6, 0x1FDB },
+    { 0x1FE0, 0x1FEC },
+    { 0x1FF2, 0x1FF4 },
+    { 0x1FF6, 0x1FFC },
+    { 0x203F, 0x2040 },
+    { 0x2054, 0x2054 },
+    { 0x2071, 0x2071 },
+    { 0x207F, 0x207F },
+    { 0x2090, 0x2094 },
+    { 0x20D0, 0x20DC },
+    { 0x20E1, 0x20E1 },
+    { 0x20E5, 0x20EF },
+    { 0x2102, 0x2102 },
+    { 0x2107, 0x2107 },
+    { 0x210A, 0x2113 },
+    { 0x2115, 0x2115 },
+    { 0x2118, 0x211D },
+    { 0x2124, 0x2124 },
+    { 0x2126, 0x2126 },
+    { 0x2128, 0x2128 },
+    { 0x212A, 0x2139 },
+    { 0x213C, 0x213F },
+    { 0x2145, 0x2149 },
+    { 0x214E, 0x214E },
+    { 0x2160, 0x2184 },
+    { 0x2C00, 0x2C2E },
+    { 0x2C30, 0x2C5E },
+    { 0x2C60, 0x2C6C },
+    { 0x2C74, 0x2C77 },
+    { 0x2C80, 0x2CE4 },
+    { 0x2D00, 0x2D25 },
+    { 0x2D30, 0x2D65 },
+    { 0x2D6F, 0x2D6F },
+    { 0x2D80, 0x2D96 },
+    { 0x2DA0, 0x2DA6 },
+    { 0x2DA8, 0x2DAE },
+    { 0x2DB0, 0x2DB6 },
+    { 0x2DB8, 0x2DBE },
+    { 0x2DC0, 0x2DC6 },
+    { 0x2DC8, 0x2DCE },
+    { 0x2DD0, 0x2DD6 },
+    { 0x2DD8, 0x2DDE },
+    { 0x3005, 0x3007 },
+    { 0x3021, 0x302F },
+    { 0x3031, 0x3035 },
+    { 0x3038, 0x303C },
+    { 0x3041, 0x3096 },
+    { 0x3099, 0x309A },
+    { 0x309D, 0x309F },
+    { 0x30A1, 0x30FA },
+    { 0x30FC, 0x30FF },
+    { 0x3105, 0x312C },
+    { 0x3131, 0x318E },
+    { 0x31A0, 0x31B7 },
+    { 0x31F0, 0x31FF },
+    { 0x3400, 0x4DB5 },
+    { 0x4E00, 0x9FBB },
+    { 0xA000, 0xA48C },
+    { 0xA717, 0xA71A },
+    { 0xA800, 0xA827 },
+    { 0xA840, 0xA873 },
+    { 0xAC00, 0xD7A3 },
+    { 0xF900, 0xFA2D },
+    { 0xFA30, 0xFA6A },
+    { 0xFA70, 0xFAD9 },
+    { 0xFB00, 0xFB06 },
+    { 0xFB13, 0xFB17 },
+    { 0xFB1D, 0xFB28 },
+    { 0xFB2A, 0xFB36 },
+    { 0xFB38, 0xFB3C },
+    { 0xFB3E, 0xFB3E },
+    { 0xFB40, 0xFB41 },
+    { 0xFB43, 0xFB44 },
+    { 0xFB46, 0xFBB1 },
+    { 0xFBD3, 0xFC5D },
+    { 0xFC64, 0xFD3D },
+    { 0xFD50, 0xFD8F },
+    { 0xFD92, 0xFDC7 },
+    { 0xFDF0, 0xFDF9 },
+    { 0xFE00, 0xFE0F },
+    { 0xFE20, 0xFE23 },
+    { 0xFE33, 0xFE34 },
+    { 0xFE4D, 0xFE4F },
+    { 0xFE71, 0xFE71 },
+    { 0xFE73, 0xFE73 },
+    { 0xFE77, 0xFE77 },
+    { 0xFE79, 0xFE79 },
+    { 0xFE7B, 0xFE7B },
+    { 0xFE7D, 0xFE7D },
+    { 0xFE7F, 0xFEFC },
+    { 0xFF10, 0xFF19 },
+    { 0xFF21, 0xFF3A },
+    { 0xFF3F, 0xFF3F },
+    { 0xFF41, 0xFF5A },
+    { 0xFF66, 0xFFBE },
+    { 0xFFC2, 0xFFC7 },
+    { 0xFFCA, 0xFFCF },
+    { 0xFFD2, 0xFFD7 },
+    { 0xFFDA, 0xFFDC },
+    { 0x10000, 0x1000B },
+    { 0x1000D, 0x10026 },
+    { 0x10028, 0x1003A },
+    { 0x1003C, 0x1003D },
+    { 0x1003F, 0x1004D },
+    { 0x10050, 0x1005D },
+    { 0x10080, 0x100FA },
+    { 0x10140, 0x10174 },
+    { 0x10300, 0x1031E },
+    { 0x10330, 0x1034A },
+    { 0x10380, 0x1039D },
+    { 0x103A0, 0x103C3 },
+    { 0x103C8, 0x103CF },
+    { 0x103D1, 0x103D5 },
+    { 0x10400, 0x1049D },
+    { 0x104A0, 0x104A9 },
+    { 0x10800, 0x10805 },
+    { 0x10808, 0x10808 },
+    { 0x1080A, 0x10835 },
+    { 0x10837, 0x10838 },
+    { 0x1083C, 0x1083C },
+    { 0x1083F, 0x1083F },
+    { 0x10900, 0x10915 },
+    { 0x10A00, 0x10A03 },
+    { 0x10A05, 0x10A06 },
+    { 0x10A0C, 0x10A13 },
+    { 0x10A15, 0x10A17 },
+    { 0x10A19, 0x10A33 },
+    { 0x10A38, 0x10A3A },
+    { 0x10A3F, 0x10A3F },
+    { 0x12000, 0x1236E },
+    { 0x12400, 0x12462 },
+    { 0x1D165, 0x1D169 },
+    { 0x1D16D, 0x1D172 },
+    { 0x1D17B, 0x1D182 },
+    { 0x1D185, 0x1D18B },
+    { 0x1D1AA, 0x1D1AD },
+    { 0x1D242, 0x1D244 },
+    { 0x1D400, 0x1D454 },
+    { 0x1D456, 0x1D49C },
+    { 0x1D49E, 0x1D49F },
+    { 0x1D4A2, 0x1D4A2 },
+    { 0x1D4A5, 0x1D4A6 },
+    { 0x1D4A9, 0x1D4AC },
+    { 0x1D4AE, 0x1D4B9 },
+    { 0x1D4BB, 0x1D4BB },
+    { 0x1D4BD, 0x1D4C3 },
+    { 0x1D4C5, 0x1D505 },
+    { 0x1D507, 0x1D50A },
+    { 0x1D50D, 0x1D514 },
+    { 0x1D516, 0x1D51C },
+    { 0x1D51E, 0x1D539 },
+    { 0x1D53B, 0x1D53E },
+    { 0x1D540, 0x1D544 },
+    { 0x1D546, 0x1D546 },
+    { 0x1D54A, 0x1D550 },
+    { 0x1D552, 0x1D6A5 },
+    { 0x1D6A8, 0x1D6C0 },
+    { 0x1D6C2, 0x1D6DA },
+    { 0x1D6DC, 0x1D6FA },
+    { 0x1D6FC, 0x1D714 },
+    { 0x1D716, 0x1D734 },
+    { 0x1D736, 0x1D74E },
+    { 0x1D750, 0x1D76E },
+    { 0x1D770, 0x1D788 },
+    { 0x1D78A, 0x1D7A8 },
+    { 0x1D7AA, 0x1D7C2 },
+    { 0x1D7C4, 0x1D7CB },
+    { 0x1D7CE, 0x1D7FF },
+    { 0x20000, 0x2A6D6 },
+    { 0x2F800, 0x2FA1D },
+    { 0xE0100, 0xE01EF }
+
+#define PREDICATE(c) uc_is_property_xid_continue (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_xid_start.c
@@ -0,0 +1,389 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0041, 0x005A },
+    { 0x0061, 0x007A },
+    { 0x00AA, 0x00AA },
+    { 0x00B5, 0x00B5 },
+    { 0x00BA, 0x00BA },
+    { 0x00C0, 0x00D6 },
+    { 0x00D8, 0x00F6 },
+    { 0x00F8, 0x02C1 },
+    { 0x02C6, 0x02D1 },
+    { 0x02E0, 0x02E4 },
+    { 0x02EE, 0x02EE },
+    { 0x037B, 0x037D },
+    { 0x0386, 0x0386 },
+    { 0x0388, 0x038A },
+    { 0x038C, 0x038C },
+    { 0x038E, 0x03A1 },
+    { 0x03A3, 0x03CE },
+    { 0x03D0, 0x03F5 },
+    { 0x03F7, 0x0481 },
+    { 0x048A, 0x0513 },
+    { 0x0531, 0x0556 },
+    { 0x0559, 0x0559 },
+    { 0x0561, 0x0587 },
+    { 0x05D0, 0x05EA },
+    { 0x05F0, 0x05F2 },
+    { 0x0621, 0x063A },
+    { 0x0640, 0x064A },
+    { 0x066E, 0x066F },
+    { 0x0671, 0x06D3 },
+    { 0x06D5, 0x06D5 },
+    { 0x06E5, 0x06E6 },
+    { 0x06EE, 0x06EF },
+    { 0x06FA, 0x06FC },
+    { 0x06FF, 0x06FF },
+    { 0x0710, 0x0710 },
+    { 0x0712, 0x072F },
+    { 0x074D, 0x076D },
+    { 0x0780, 0x07A5 },
+    { 0x07B1, 0x07B1 },
+    { 0x07CA, 0x07EA },
+    { 0x07F4, 0x07F5 },
+    { 0x07FA, 0x07FA },
+    { 0x0904, 0x0939 },
+    { 0x093D, 0x093D },
+    { 0x0950, 0x0950 },
+    { 0x0958, 0x0961 },
+    { 0x097B, 0x097F },
+    { 0x0985, 0x098C },
+    { 0x098F, 0x0990 },
+    { 0x0993, 0x09A8 },
+    { 0x09AA, 0x09B0 },
+    { 0x09B2, 0x09B2 },
+    { 0x09B6, 0x09B9 },
+    { 0x09BD, 0x09BD },
+    { 0x09CE, 0x09CE },
+    { 0x09DC, 0x09DD },
+    { 0x09DF, 0x09E1 },
+    { 0x09F0, 0x09F1 },
+    { 0x0A05, 0x0A0A },
+    { 0x0A0F, 0x0A10 },
+    { 0x0A13, 0x0A28 },
+    { 0x0A2A, 0x0A30 },
+    { 0x0A32, 0x0A33 },
+    { 0x0A35, 0x0A36 },
+    { 0x0A38, 0x0A39 },
+    { 0x0A59, 0x0A5C },
+    { 0x0A5E, 0x0A5E },
+    { 0x0A72, 0x0A74 },
+    { 0x0A85, 0x0A8D },
+    { 0x0A8F, 0x0A91 },
+    { 0x0A93, 0x0AA8 },
+    { 0x0AAA, 0x0AB0 },
+    { 0x0AB2, 0x0AB3 },
+    { 0x0AB5, 0x0AB9 },
+    { 0x0ABD, 0x0ABD },
+    { 0x0AD0, 0x0AD0 },
+    { 0x0AE0, 0x0AE1 },
+    { 0x0B05, 0x0B0C },
+    { 0x0B0F, 0x0B10 },
+    { 0x0B13, 0x0B28 },
+    { 0x0B2A, 0x0B30 },
+    { 0x0B32, 0x0B33 },
+    { 0x0B35, 0x0B39 },
+    { 0x0B3D, 0x0B3D },
+    { 0x0B5C, 0x0B5D },
+    { 0x0B5F, 0x0B61 },
+    { 0x0B71, 0x0B71 },
+    { 0x0B83, 0x0B83 },
+    { 0x0B85, 0x0B8A },
+    { 0x0B8E, 0x0B90 },
+    { 0x0B92, 0x0B95 },
+    { 0x0B99, 0x0B9A },
+    { 0x0B9C, 0x0B9C },
+    { 0x0B9E, 0x0B9F },
+    { 0x0BA3, 0x0BA4 },
+    { 0x0BA8, 0x0BAA },
+    { 0x0BAE, 0x0BB9 },
+    { 0x0C05, 0x0C0C },
+    { 0x0C0E, 0x0C10 },
+    { 0x0C12, 0x0C28 },
+    { 0x0C2A, 0x0C33 },
+    { 0x0C35, 0x0C39 },
+    { 0x0C60, 0x0C61 },
+    { 0x0C85, 0x0C8C },
+    { 0x0C8E, 0x0C90 },
+    { 0x0C92, 0x0CA8 },
+    { 0x0CAA, 0x0CB3 },
+    { 0x0CB5, 0x0CB9 },
+    { 0x0CBD, 0x0CBD },
+    { 0x0CDE, 0x0CDE },
+    { 0x0CE0, 0x0CE1 },
+    { 0x0D05, 0x0D0C },
+    { 0x0D0E, 0x0D10 },
+    { 0x0D12, 0x0D28 },
+    { 0x0D2A, 0x0D39 },
+    { 0x0D60, 0x0D61 },
+    { 0x0D85, 0x0D96 },
+    { 0x0D9A, 0x0DB1 },
+    { 0x0DB3, 0x0DBB },
+    { 0x0DBD, 0x0DBD },
+    { 0x0DC0, 0x0DC6 },
+    { 0x0E01, 0x0E30 },
+    { 0x0E32, 0x0E32 },
+    { 0x0E40, 0x0E46 },
+    { 0x0E81, 0x0E82 },
+    { 0x0E84, 0x0E84 },
+    { 0x0E87, 0x0E88 },
+    { 0x0E8A, 0x0E8A },
+    { 0x0E8D, 0x0E8D },
+    { 0x0E94, 0x0E97 },
+    { 0x0E99, 0x0E9F },
+    { 0x0EA1, 0x0EA3 },
+    { 0x0EA5, 0x0EA5 },
+    { 0x0EA7, 0x0EA7 },
+    { 0x0EAA, 0x0EAB },
+    { 0x0EAD, 0x0EB0 },
+    { 0x0EB2, 0x0EB2 },
+    { 0x0EBD, 0x0EBD },
+    { 0x0EC0, 0x0EC4 },
+    { 0x0EC6, 0x0EC6 },
+    { 0x0EDC, 0x0EDD },
+    { 0x0F00, 0x0F00 },
+    { 0x0F40, 0x0F47 },
+    { 0x0F49, 0x0F6A },
+    { 0x0F88, 0x0F8B },
+    { 0x1000, 0x1021 },
+    { 0x1023, 0x1027 },
+    { 0x1029, 0x102A },
+    { 0x1050, 0x1055 },
+    { 0x10A0, 0x10C5 },
+    { 0x10D0, 0x10FA },
+    { 0x10FC, 0x10FC },
+    { 0x1100, 0x1159 },
+    { 0x115F, 0x11A2 },
+    { 0x11A8, 0x11F9 },
+    { 0x1200, 0x1248 },
+    { 0x124A, 0x124D },
+    { 0x1250, 0x1256 },
+    { 0x1258, 0x1258 },
+    { 0x125A, 0x125D },
+    { 0x1260, 0x1288 },
+    { 0x128A, 0x128D },
+    { 0x1290, 0x12B0 },
+    { 0x12B2, 0x12B5 },
+    { 0x12B8, 0x12BE },
+    { 0x12C0, 0x12C0 },
+    { 0x12C2, 0x12C5 },
+    { 0x12C8, 0x12D6 },
+    { 0x12D8, 0x1310 },
+    { 0x1312, 0x1315 },
+    { 0x1318, 0x135A },
+    { 0x1380, 0x138F },
+    { 0x13A0, 0x13F4 },
+    { 0x1401, 0x166C },
+    { 0x166F, 0x1676 },
+    { 0x1681, 0x169A },
+    { 0x16A0, 0x16EA },
+    { 0x16EE, 0x16F0 },
+    { 0x1700, 0x170C },
+    { 0x170E, 0x1711 },
+    { 0x1720, 0x1731 },
+    { 0x1740, 0x1751 },
+    { 0x1760, 0x176C },
+    { 0x176E, 0x1770 },
+    { 0x1780, 0x17B3 },
+    { 0x17D7, 0x17D7 },
+    { 0x17DC, 0x17DC },
+    { 0x1820, 0x1877 },
+    { 0x1880, 0x18A8 },
+    { 0x1900, 0x191C },
+    { 0x1950, 0x196D },
+    { 0x1970, 0x1974 },
+    { 0x1980, 0x19A9 },
+    { 0x19C1, 0x19C7 },
+    { 0x1A00, 0x1A16 },
+    { 0x1B05, 0x1B33 },
+    { 0x1B45, 0x1B4B },
+    { 0x1D00, 0x1DBF },
+    { 0x1E00, 0x1E9B },
+    { 0x1EA0, 0x1EF9 },
+    { 0x1F00, 0x1F15 },
+    { 0x1F18, 0x1F1D },
+    { 0x1F20, 0x1F45 },
+    { 0x1F48, 0x1F4D },
+    { 0x1F50, 0x1F57 },
+    { 0x1F59, 0x1F59 },
+    { 0x1F5B, 0x1F5B },
+    { 0x1F5D, 0x1F5D },
+    { 0x1F5F, 0x1F7D },
+    { 0x1F80, 0x1FB4 },
+    { 0x1FB6, 0x1FBC },
+    { 0x1FBE, 0x1FBE },
+    { 0x1FC2, 0x1FC4 },
+    { 0x1FC6, 0x1FCC },
+    { 0x1FD0, 0x1FD3 },
+    { 0x1FD6, 0x1FDB },
+    { 0x1FE0, 0x1FEC },
+    { 0x1FF2, 0x1FF4 },
+    { 0x1FF6, 0x1FFC },
+    { 0x2071, 0x2071 },
+    { 0x207F, 0x207F },
+    { 0x2090, 0x2094 },
+    { 0x2102, 0x2102 },
+    { 0x2107, 0x2107 },
+    { 0x210A, 0x2113 },
+    { 0x2115, 0x2115 },
+    { 0x2118, 0x211D },
+    { 0x2124, 0x2124 },
+    { 0x2126, 0x2126 },
+    { 0x2128, 0x2128 },
+    { 0x212A, 0x2139 },
+    { 0x213C, 0x213F },
+    { 0x2145, 0x2149 },
+    { 0x214E, 0x214E },
+    { 0x2160, 0x2184 },
+    { 0x2C00, 0x2C2E },
+    { 0x2C30, 0x2C5E },
+    { 0x2C60, 0x2C6C },
+    { 0x2C74, 0x2C77 },
+    { 0x2C80, 0x2CE4 },
+    { 0x2D00, 0x2D25 },
+    { 0x2D30, 0x2D65 },
+    { 0x2D6F, 0x2D6F },
+    { 0x2D80, 0x2D96 },
+    { 0x2DA0, 0x2DA6 },
+    { 0x2DA8, 0x2DAE },
+    { 0x2DB0, 0x2DB6 },
+    { 0x2DB8, 0x2DBE },
+    { 0x2DC0, 0x2DC6 },
+    { 0x2DC8, 0x2DCE },
+    { 0x2DD0, 0x2DD6 },
+    { 0x2DD8, 0x2DDE },
+    { 0x3005, 0x3007 },
+    { 0x3021, 0x3029 },
+    { 0x3031, 0x3035 },
+    { 0x3038, 0x303C },
+    { 0x3041, 0x3096 },
+    { 0x309D, 0x309F },
+    { 0x30A1, 0x30FA },
+    { 0x30FC, 0x30FF },
+    { 0x3105, 0x312C },
+    { 0x3131, 0x318E },
+    { 0x31A0, 0x31B7 },
+    { 0x31F0, 0x31FF },
+    { 0x3400, 0x4DB5 },
+    { 0x4E00, 0x9FBB },
+    { 0xA000, 0xA48C },
+    { 0xA717, 0xA71A },
+    { 0xA800, 0xA801 },
+    { 0xA803, 0xA805 },
+    { 0xA807, 0xA80A },
+    { 0xA80C, 0xA822 },
+    { 0xA840, 0xA873 },
+    { 0xAC00, 0xD7A3 },
+    { 0xF900, 0xFA2D },
+    { 0xFA30, 0xFA6A },
+    { 0xFA70, 0xFAD9 },
+    { 0xFB00, 0xFB06 },
+    { 0xFB13, 0xFB17 },
+    { 0xFB1D, 0xFB1D },
+    { 0xFB1F, 0xFB28 },
+    { 0xFB2A, 0xFB36 },
+    { 0xFB38, 0xFB3C },
+    { 0xFB3E, 0xFB3E },
+    { 0xFB40, 0xFB41 },
+    { 0xFB43, 0xFB44 },
+    { 0xFB46, 0xFBB1 },
+    { 0xFBD3, 0xFC5D },
+    { 0xFC64, 0xFD3D },
+    { 0xFD50, 0xFD8F },
+    { 0xFD92, 0xFDC7 },
+    { 0xFDF0, 0xFDF9 },
+    { 0xFE71, 0xFE71 },
+    { 0xFE73, 0xFE73 },
+    { 0xFE77, 0xFE77 },
+    { 0xFE79, 0xFE79 },
+    { 0xFE7B, 0xFE7B },
+    { 0xFE7D, 0xFE7D },
+    { 0xFE7F, 0xFEFC },
+    { 0xFF21, 0xFF3A },
+    { 0xFF41, 0xFF5A },
+    { 0xFF66, 0xFF9D },
+    { 0xFFA0, 0xFFBE },
+    { 0xFFC2, 0xFFC7 },
+    { 0xFFCA, 0xFFCF },
+    { 0xFFD2, 0xFFD7 },
+    { 0xFFDA, 0xFFDC },
+    { 0x10000, 0x1000B },
+    { 0x1000D, 0x10026 },
+    { 0x10028, 0x1003A },
+    { 0x1003C, 0x1003D },
+    { 0x1003F, 0x1004D },
+    { 0x10050, 0x1005D },
+    { 0x10080, 0x100FA },
+    { 0x10140, 0x10174 },
+    { 0x10300, 0x1031E },
+    { 0x10330, 0x1034A },
+    { 0x10380, 0x1039D },
+    { 0x103A0, 0x103C3 },
+    { 0x103C8, 0x103CF },
+    { 0x103D1, 0x103D5 },
+    { 0x10400, 0x1049D },
+    { 0x10800, 0x10805 },
+    { 0x10808, 0x10808 },
+    { 0x1080A, 0x10835 },
+    { 0x10837, 0x10838 },
+    { 0x1083C, 0x1083C },
+    { 0x1083F, 0x1083F },
+    { 0x10900, 0x10915 },
+    { 0x10A00, 0x10A00 },
+    { 0x10A10, 0x10A13 },
+    { 0x10A15, 0x10A17 },
+    { 0x10A19, 0x10A33 },
+    { 0x12000, 0x1236E },
+    { 0x12400, 0x12462 },
+    { 0x1D400, 0x1D454 },
+    { 0x1D456, 0x1D49C },
+    { 0x1D49E, 0x1D49F },
+    { 0x1D4A2, 0x1D4A2 },
+    { 0x1D4A5, 0x1D4A6 },
+    { 0x1D4A9, 0x1D4AC },
+    { 0x1D4AE, 0x1D4B9 },
+    { 0x1D4BB, 0x1D4BB },
+    { 0x1D4BD, 0x1D4C3 },
+    { 0x1D4C5, 0x1D505 },
+    { 0x1D507, 0x1D50A },
+    { 0x1D50D, 0x1D514 },
+    { 0x1D516, 0x1D51C },
+    { 0x1D51E, 0x1D539 },
+    { 0x1D53B, 0x1D53E },
+    { 0x1D540, 0x1D544 },
+    { 0x1D546, 0x1D546 },
+    { 0x1D54A, 0x1D550 },
+    { 0x1D552, 0x1D6A5 },
+    { 0x1D6A8, 0x1D6C0 },
+    { 0x1D6C2, 0x1D6DA },
+    { 0x1D6DC, 0x1D6FA },
+    { 0x1D6FC, 0x1D714 },
+    { 0x1D716, 0x1D734 },
+    { 0x1D736, 0x1D74E },
+    { 0x1D750, 0x1D76E },
+    { 0x1D770, 0x1D788 },
+    { 0x1D78A, 0x1D7A8 },
+    { 0x1D7AA, 0x1D7C2 },
+    { 0x1D7C4, 0x1D7CB },
+    { 0x20000, 0x2A6D6 },
+    { 0x2F800, 0x2FA1D }
+
+#define PREDICATE(c) uc_is_property_xid_start (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-pr_zero_width.c
@@ -0,0 +1,36 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x00AD, 0x00AD },
+    { 0x0600, 0x0603 },
+    { 0x06DD, 0x06DD },
+    { 0x070F, 0x070F },
+    { 0x17B4, 0x17B5 },
+    { 0x200B, 0x200F },
+    { 0x202A, 0x202E },
+    { 0x2060, 0x2063 },
+    { 0x206A, 0x206F },
+    { 0xFEFF, 0xFEFF },
+    { 0xFFF9, 0xFFFB },
+    { 0x1D173, 0x1D17A },
+    { 0xE0001, 0xE0001 },
+    { 0xE0020, 0xE007F }
+
+#define PREDICATE(c) uc_is_property_zero_width (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-predicate-part1.h
@@ -0,0 +1,44 @@
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "unictype.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed for c = 0x%04X\n",	     \
+		   __FILE__, __LINE__, c);				     \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+#define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
+
+/* Interval of Unicode characters.  */
+typedef struct { ucs4_t start; ucs4_t end; } interval_t;
+
+/* Set of Unicode characters, described as list of intervals, in increasing
+   order.  */
+static const interval_t set[] =
+  {
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-predicate-part2.h
@@ -0,0 +1,37 @@
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+  };
+
+int
+main ()
+{
+  unsigned int c;
+  size_t i;
+
+  c = 0;
+  for (i = 0; i < SIZEOF (set); i++)
+    {
+      for (; c < set[i].start; c++)
+	ASSERT (!PREDICATE (c));
+      for (; c <= set[i].end; c++)
+	ASSERT (PREDICATE (c));
+    }
+  for (; c < 0x110000; c++)
+    ASSERT (!PREDICATE (c));
+
+  return 0;
+}
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-scripts.c
@@ -0,0 +1,85 @@
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "unictype.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+
+int
+main ()
+{
+  /* Test the uc_script function.  */
+  ASSERT (strcmp (uc_script ('A')->name, "Latin") == 0);
+  ASSERT (strcmp (uc_script ('%')->name, "Common") == 0);
+  ASSERT (uc_script (0xE0000) == NULL);
+
+  /* Test the uc_script_byname function.  */
+  ASSERT (strcmp (uc_script_byname ("Armenian")->name, "Armenian") == 0);
+  ASSERT (uc_script_byname ("Pekinese") == NULL);
+
+  /* Test the uc_is_script function.  */
+  ASSERT (uc_is_script ('A', uc_script_byname ("Latin")));
+  ASSERT (!uc_is_script ('A', uc_script_byname ("Common")));
+  ASSERT (!uc_is_script (0x05DA, uc_script_byname ("Latin")));
+  ASSERT (uc_is_script (0x05DA, uc_script_byname ("Hebrew")));
+
+  {
+    unsigned int c;
+
+    for (c = 0; c < 0x110000; c++)
+      {
+	const uc_script_t *script = uc_script (c);
+	if (script != NULL)
+	  ASSERT (uc_is_script (c, script));
+      }
+  }
+
+  /* Test the uc_all_scripts function.  */
+  {
+    const uc_script_t *scripts;
+    size_t nscripts;
+    size_t i;
+    bool found;
+
+    uc_all_scripts (&scripts, &nscripts);
+
+    found = false;
+    for (i = 0; i < nscripts; i++)
+      {
+	ASSERT (scripts[i].name != NULL);
+	if (strcmp (scripts[i].name, "Hebrew") == 0)
+	  found = true;
+      }
+    ASSERT (found);
+  }
+
+  return 0;
+}
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-sy_c_ident.c
@@ -0,0 +1,49 @@
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "unictype.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+
+int
+main ()
+{
+  ASSERT (uc_c_ident_category ('0') == UC_IDENTIFIER_VALID);
+  ASSERT (uc_c_ident_category ('X') == UC_IDENTIFIER_START);
+  ASSERT (uc_c_ident_category ('+') == UC_IDENTIFIER_INVALID);
+  ASSERT (uc_c_ident_category (0x00B2) == UC_IDENTIFIER_INVALID);
+  ASSERT (uc_c_ident_category (0x05DA) == UC_IDENTIFIER_START);
+
+  ASSERT (uc_c_ident_category (0x001B) == UC_IDENTIFIER_INVALID);
+  ASSERT (uc_c_ident_category (0xE0001) == UC_IDENTIFIER_INVALID);
+
+  return 0;
+}
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-sy_c_whitespace.c
@@ -0,0 +1,24 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0009, 0x000D },
+    { 0x0020, 0x0020 }
+
+#define PREDICATE(c) uc_is_c_whitespace (c)
+#include "test-predicate-part2.h"
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-sy_java_ident.c
@@ -0,0 +1,49 @@
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "unictype.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
+
+int
+main ()
+{
+  ASSERT (uc_java_ident_category ('0') == UC_IDENTIFIER_VALID);
+  ASSERT (uc_java_ident_category ('X') == UC_IDENTIFIER_START);
+  ASSERT (uc_java_ident_category ('+') == UC_IDENTIFIER_INVALID);
+  ASSERT (uc_java_ident_category (0x00B2) == UC_IDENTIFIER_INVALID);
+  ASSERT (uc_java_ident_category (0x05DA) == UC_IDENTIFIER_START);
+
+  ASSERT (uc_java_ident_category (0x001B) == UC_IDENTIFIER_IGNORABLE);
+  ASSERT (uc_java_ident_category (0xE0001) == UC_IDENTIFIER_IGNORABLE);
+
+  return 0;
+}
new file mode 100644
--- /dev/null
+++ b/tests/unictype/test-sy_java_whitespace.c
@@ -0,0 +1,25 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Test the Unicode character type functions.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "test-predicate-part1.h"
+
+    { 0x0009, 0x000A },
+    { 0x000C, 0x000D },
+    { 0x0020, 0x0020 }
+
+#define PREDICATE(c) uc_is_java_whitespace (c)
+#include "test-predicate-part2.h"