New upstream version 0.9.7upstream/0.9.7

author: Jörg Frings-Fürst <debian@jff-webhosting.net> 2017-03-27 21:41:36 +0200
committer: Jörg Frings-Fürst <debian@jff-webhosting.net> 2017-03-27 21:41:36 +0200
commit: 6b73edd95d603e27d55d4905134ac1327d426534 (patch)
tree: e0b9334e2637f17696c796ac13b2c39294bf9233 /lib/uninorm
parent: 0250cb64565a7d5238bbc751225d4b0236ef8316 (diff)
33 files changed, 1389 insertions, 1101 deletions
diff --git a/lib/uninorm/canonical-decomposition.c b/lib/uninorm/canonical-decomposition.c
index 0d11aa1b..7cedd871 100644
--- a/lib/uninorm/canonical-decomposition.c
+++ b/lib/uninorm/canonical-decomposition.c
@@ -1,12 +1,21 @@
 /* Canonical decomposition of Unicode characters.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/compat-decomposition.c b/lib/uninorm/compat-decomposition.c
index 7b708e4b..b05153b9 100644
--- a/lib/uninorm/compat-decomposition.c
+++ b/lib/uninorm/compat-decomposition.c
@@ -1,12 +1,21 @@
 /* Compatibility decomposition of Unicode characters.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/composition-table.gperf b/lib/uninorm/composition-table.gperf
index ce1d182b..dd9c955c 100644
--- a/lib/uninorm/composition-table.gperf
+++ b/lib/uninorm/composition-table.gperf
@@ -4,17 +4,26 @@
 
 /* Copyright (C) 2009 Free Software Foundation, Inc.
 
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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 Lesser General Public License for more details.
+   GNU General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
+   You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 struct composition_rule { char codes[6]; };
diff --git a/lib/uninorm/composition-table.h b/lib/uninorm/composition-table.h
index dcf293d2..1723a88c 100644
--- a/lib/uninorm/composition-table.h
+++ b/lib/uninorm/composition-table.h
@@ -180,1929 +180,1929 @@ gl_uninorm_compose_lookup (register const char *str, register unsigned int len)
   static const struct composition_rule wordlist[] =
     {
       {""},
-#line 572 "./uninorm/composition-table.gperf"
+#line 581 "./uninorm/composition-table.gperf"
       {"\000\001\002\000\003\001", 0x1eae},
-#line 574 "./uninorm/composition-table.gperf"
+#line 583 "./uninorm/composition-table.gperf"
       {"\000\001\002\000\003\000", 0x1eb0},
       {""},
-#line 573 "./uninorm/composition-table.gperf"
+#line 582 "./uninorm/composition-table.gperf"
       {"\000\001\003\000\003\001", 0x1eaf},
-#line 575 "./uninorm/composition-table.gperf"
+#line 584 "./uninorm/composition-table.gperf"
       {"\000\001\003\000\003\000", 0x1eb1},
-#line 557 "./uninorm/composition-table.gperf"
+#line 566 "./uninorm/composition-table.gperf"
       {"\000\001\177\000\003\007", 0x1e9b},
-#line 238 "./uninorm/composition-table.gperf"
+#line 247 "./uninorm/composition-table.gperf"
       {"\000\000\370\000\003\001", 0x01ff},
-#line 412 "./uninorm/composition-table.gperf"
+#line 421 "./uninorm/composition-table.gperf"
       {"\000\000\347\000\003\001", 0x1e09},
-#line 90 "./uninorm/composition-table.gperf"
+#line 99 "./uninorm/composition-table.gperf"
       {"\000\000C\000\003\001", 0x0106},
-#line 450 "./uninorm/composition-table.gperf"
+#line 459 "./uninorm/composition-table.gperf"
       {"\000\000\357\000\003\001", 0x1e2f},
-#line 234 "./uninorm/composition-table.gperf"
+#line 243 "./uninorm/composition-table.gperf"
       {"\000\000\345\000\003\001", 0x01fb},
-#line 92 "./uninorm/composition-table.gperf"
+#line 101 "./uninorm/composition-table.gperf"
       {"\000\000C\000\003\002", 0x0108},
-#line 94 "./uninorm/composition-table.gperf"
+#line 103 "./uninorm/composition-table.gperf"
       {"\000\000C\000\003\007", 0x010a},
-#line 653 "./uninorm/composition-table.gperf"
+#line 662 "./uninorm/composition-table.gperf"
       {"\000\037\001\000\003\001", 0x1f05},
-#line 651 "./uninorm/composition-table.gperf"
+#line 660 "./uninorm/composition-table.gperf"
       {"\000\037\001\000\003\000", 0x1f03},
-#line 655 "./uninorm/composition-table.gperf"
+#line 664 "./uninorm/composition-table.gperf"
       {"\000\037\001\000\003B", 0x1f07},
-#line 660 "./uninorm/composition-table.gperf"
+#line 669 "./uninorm/composition-table.gperf"
       {"\000\037\010\000\003\001", 0x1f0c},
-#line 658 "./uninorm/composition-table.gperf"
+#line 667 "./uninorm/composition-table.gperf"
       {"\000\037\010\000\003\000", 0x1f0a},
-#line 662 "./uninorm/composition-table.gperf"
+#line 671 "./uninorm/composition-table.gperf"
       {"\000\037\010\000\003B", 0x1f0e},
-#line 652 "./uninorm/composition-table.gperf"
+#line 661 "./uninorm/composition-table.gperf"
       {"\000\037\000\000\003\001", 0x1f04},
-#line 650 "./uninorm/composition-table.gperf"
+#line 659 "./uninorm/composition-table.gperf"
       {"\000\037\000\000\003\000", 0x1f02},
-#line 654 "./uninorm/composition-table.gperf"
+#line 663 "./uninorm/composition-table.gperf"
       {"\000\037\000\000\003B", 0x1f06},
-#line 433 "./uninorm/composition-table.gperf"
+#line 442 "./uninorm/composition-table.gperf"
       {"\000\000F\000\003\007", 0x1e1e},
-#line 851 "./uninorm/composition-table.gperf"
+#line 860 "./uninorm/composition-table.gperf"
       {"\000\003\316\000\003E", 0x1ff4},
-#line 757 "./uninorm/composition-table.gperf"
+#line 766 "./uninorm/composition-table.gperf"
       {"\000\037\002\000\003E", 0x1f82},
-#line 756 "./uninorm/composition-table.gperf"
+#line 765 "./uninorm/composition-table.gperf"
       {"\000\037\001\000\003E", 0x1f81},
-#line 480 "./uninorm/composition-table.gperf"
+#line 489 "./uninorm/composition-table.gperf"
       {"\000\000\365\000\003\001", 0x1e4d},
-#line 758 "./uninorm/composition-table.gperf"
+#line 767 "./uninorm/composition-table.gperf"
       {"\000\037\003\000\003E", 0x1f83},
-#line 763 "./uninorm/composition-table.gperf"
+#line 772 "./uninorm/composition-table.gperf"
       {"\000\037\010\000\003E", 0x1f88},
-#line 236 "./uninorm/composition-table.gperf"
+#line 245 "./uninorm/composition-table.gperf"
       {"\000\000\346\000\003\001", 0x01fd},
-#line 506 "./uninorm/composition-table.gperf"
+#line 515 "./uninorm/composition-table.gperf"
       {"\000\001a\000\003\007", 0x1e67},
-#line 755 "./uninorm/composition-table.gperf"
+#line 764 "./uninorm/composition-table.gperf"
       {"\000\037\000\000\003E", 0x1f80},
-#line 58 "./uninorm/composition-table.gperf"
+#line 67 "./uninorm/composition-table.gperf"
       {"\000\000a\000\003\001", 0x00e1},
-#line 57 "./uninorm/composition-table.gperf"
+#line 66 "./uninorm/composition-table.gperf"
       {"\000\000a\000\003\000", 0x00e0},
-#line 809 "./uninorm/composition-table.gperf"
+#line 818 "./uninorm/composition-table.gperf"
       {"\000\037\266\000\003E", 0x1fb7},
-#line 59 "./uninorm/composition-table.gperf"
+#line 68 "./uninorm/composition-table.gperf"
       {"\000\000a\000\003\002", 0x00e2},
-#line 270 "./uninorm/composition-table.gperf"
+#line 279 "./uninorm/composition-table.gperf"
       {"\000\000a\000\003\007", 0x0227},
-#line 778 "./uninorm/composition-table.gperf"
+#line 787 "./uninorm/composition-table.gperf"
       {"\000\037'\000\003E", 0x1f97},
-#line 737 "./uninorm/composition-table.gperf"
+#line 746 "./uninorm/composition-table.gperf"
       {"\000\037a\000\003\001", 0x1f65},
-#line 735 "./uninorm/composition-table.gperf"
+#line 744 "./uninorm/composition-table.gperf"
       {"\000\037a\000\003\000", 0x1f63},
-#line 739 "./uninorm/composition-table.gperf"
+#line 748 "./uninorm/composition-table.gperf"
       {"\000\037a\000\003B", 0x1f67},
-#line 853 "./uninorm/composition-table.gperf"
+#line 862 "./uninorm/composition-table.gperf"
       {"\000\037\366\000\003E", 0x1ff7},
-#line 524 "./uninorm/composition-table.gperf"
+#line 533 "./uninorm/composition-table.gperf"
       {"\000\001i\000\003\001", 0x1e79},
-#line 206 "./uninorm/composition-table.gperf"
+#line 215 "./uninorm/composition-table.gperf"
       {"\000\000\334\000\003\001", 0x01d7},
-#line 210 "./uninorm/composition-table.gperf"
+#line 219 "./uninorm/composition-table.gperf"
       {"\000\000\334\000\003\000", 0x01db},
-#line 661 "./uninorm/composition-table.gperf"
+#line 670 "./uninorm/composition-table.gperf"
       {"\000\037\011\000\003\001", 0x1f0d},
-#line 659 "./uninorm/composition-table.gperf"
+#line 668 "./uninorm/composition-table.gperf"
       {"\000\037\011\000\003\000", 0x1f0b},
-#line 663 "./uninorm/composition-table.gperf"
+#line 672 "./uninorm/composition-table.gperf"
       {"\000\037\011\000\003B", 0x1f0f},
-#line 69 "./uninorm/composition-table.gperf"
+#line 78 "./uninorm/composition-table.gperf"
       {"\000\000i\000\003\001", 0x00ed},
-#line 68 "./uninorm/composition-table.gperf"
+#line 77 "./uninorm/composition-table.gperf"
       {"\000\000i\000\003\000", 0x00ec},
-#line 788 "./uninorm/composition-table.gperf"
+#line 797 "./uninorm/composition-table.gperf"
       {"\000\037a\000\003E", 0x1fa1},
-#line 70 "./uninorm/composition-table.gperf"
+#line 79 "./uninorm/composition-table.gperf"
       {"\000\000i\000\003\002", 0x00ee},
-#line 784 "./uninorm/composition-table.gperf"
+#line 793 "./uninorm/composition-table.gperf"
       {"\000\037-\000\003E", 0x1f9d},
-#line 129 "./uninorm/composition-table.gperf"
+#line 138 "./uninorm/composition-table.gperf"
       {"\000\000J\000\003\002", 0x0134},
-#line 745 "./uninorm/composition-table.gperf"
+#line 754 "./uninorm/composition-table.gperf"
       {"\000\037i\000\003\001", 0x1f6d},
-#line 743 "./uninorm/composition-table.gperf"
+#line 752 "./uninorm/composition-table.gperf"
       {"\000\037i\000\003\000", 0x1f6b},
-#line 747 "./uninorm/composition-table.gperf"
+#line 756 "./uninorm/composition-table.gperf"
       {"\000\037i\000\003B", 0x1f6f},
-#line 764 "./uninorm/composition-table.gperf"
+#line 773 "./uninorm/composition-table.gperf"
       {"\000\037\011\000\003E", 0x1f89},
-#line 578 "./uninorm/composition-table.gperf"
+#line 587 "./uninorm/composition-table.gperf"
       {"\000\001\002\000\003\003", 0x1eb4},
-#line 482 "./uninorm/composition-table.gperf"
+#line 491 "./uninorm/composition-table.gperf"
       {"\000\000\365\000\003\010", 0x1e4f},
-#line 615 "./uninorm/composition-table.gperf"
+#line 624 "./uninorm/composition-table.gperf"
       {"\000\036\315\000\003\002", 0x1ed9},
-#line 579 "./uninorm/composition-table.gperf"
+#line 588 "./uninorm/composition-table.gperf"
       {"\000\001\003\000\003\003", 0x1eb5},
-#line 705 "./uninorm/composition-table.gperf"
+#line 714 "./uninorm/composition-table.gperf"
       {"\000\0379\000\003\001", 0x1f3d},
-#line 703 "./uninorm/composition-table.gperf"
+#line 712 "./uninorm/composition-table.gperf"
       {"\000\0379\000\003\000", 0x1f3b},
-#line 707 "./uninorm/composition-table.gperf"
+#line 716 "./uninorm/composition-table.gperf"
       {"\000\0379\000\003B", 0x1f3f},
-#line 61 "./uninorm/composition-table.gperf"
+#line 70 "./uninorm/composition-table.gperf"
       {"\000\000a\000\003\010", 0x00e4},
-#line 796 "./uninorm/composition-table.gperf"
+#line 805 "./uninorm/composition-table.gperf"
       {"\000\037i\000\003E", 0x1fa9},
-#line 43 "./uninorm/composition-table.gperf"
+#line 52 "./uninorm/composition-table.gperf"
       {"\000\000I\000\003\001", 0x00cd},
-#line 42 "./uninorm/composition-table.gperf"
+#line 51 "./uninorm/composition-table.gperf"
       {"\000\000I\000\003\000", 0x00cc},
-#line 614 "./uninorm/composition-table.gperf"
+#line 623 "./uninorm/composition-table.gperf"
       {"\000\036\314\000\003\002", 0x1ed8},
-#line 44 "./uninorm/composition-table.gperf"
+#line 53 "./uninorm/composition-table.gperf"
       {"\000\000I\000\003\002", 0x00ce},
-#line 128 "./uninorm/composition-table.gperf"
+#line 137 "./uninorm/composition-table.gperf"
       {"\000\000I\000\003\007", 0x0130},
-#line 875 "./uninorm/composition-table.gperf"
+#line 884 "./uninorm/composition-table.gperf"
       {"\000\000<\000\0038", 0x226e},
-#line 719 "./uninorm/composition-table.gperf"
+#line 728 "./uninorm/composition-table.gperf"
       {"\000\037I\000\003\001", 0x1f4d},
-#line 717 "./uninorm/composition-table.gperf"
+#line 726 "./uninorm/composition-table.gperf"
       {"\000\037I\000\003\000", 0x1f4b},
-#line 712 "./uninorm/composition-table.gperf"
+#line 721 "./uninorm/composition-table.gperf"
       {"\000\037@\000\003\001", 0x1f44},
-#line 710 "./uninorm/composition-table.gperf"
+#line 719 "./uninorm/composition-table.gperf"
       {"\000\037@\000\003\000", 0x1f42},
-#line 689 "./uninorm/composition-table.gperf"
+#line 698 "./uninorm/composition-table.gperf"
       {"\000\037)\000\003\001", 0x1f2d},
-#line 687 "./uninorm/composition-table.gperf"
+#line 696 "./uninorm/composition-table.gperf"
       {"\000\037)\000\003\000", 0x1f2b},
-#line 691 "./uninorm/composition-table.gperf"
+#line 700 "./uninorm/composition-table.gperf"
       {"\000\037)\000\003B", 0x1f2f},
-#line 849 "./uninorm/composition-table.gperf"
+#line 858 "./uninorm/composition-table.gperf"
       {"\000\037|\000\003E", 0x1ff2},
-#line 71 "./uninorm/composition-table.gperf"
+#line 80 "./uninorm/composition-table.gperf"
       {"\000\000i\000\003\010", 0x00ef},
-#line 759 "./uninorm/composition-table.gperf"
+#line 768 "./uninorm/composition-table.gperf"
       {"\000\037\004\000\003E", 0x1f84},
-#line 207 "./uninorm/composition-table.gperf"
+#line 216 "./uninorm/composition-table.gperf"
       {"\000\000\374\000\003\001", 0x01d8},
-#line 211 "./uninorm/composition-table.gperf"
+#line 220 "./uninorm/composition-table.gperf"
       {"\000\000\374\000\003\000", 0x01dc},
-#line 817 "./uninorm/composition-table.gperf"
+#line 826 "./uninorm/composition-table.gperf"
       {"\000\003\256\000\003E", 0x1fc4},
-#line 762 "./uninorm/composition-table.gperf"
+#line 771 "./uninorm/composition-table.gperf"
       {"\000\037\007\000\003E", 0x1f87},
-#line 807 "./uninorm/composition-table.gperf"
+#line 816 "./uninorm/composition-table.gperf"
       {"\000\003\254\000\003E", 0x1fb4},
-#line 319 "./uninorm/composition-table.gperf"
+#line 328 "./uninorm/composition-table.gperf"
       {"\000\004:\000\003\001", 0x045c},
-#line 780 "./uninorm/composition-table.gperf"
+#line 789 "./uninorm/composition-table.gperf"
       {"\000\037)\000\003E", 0x1f99},
-#line 60 "./uninorm/composition-table.gperf"
+#line 69 "./uninorm/composition-table.gperf"
       {"\000\000a\000\003\003", 0x00e3},
-#line 872 "./uninorm/composition-table.gperf"
+#line 881 "./uninorm/composition-table.gperf"
       {"\000\000=\000\0038", 0x2260},
-#line 351 "./uninorm/composition-table.gperf"
+#line 360 "./uninorm/composition-table.gperf"
       {"\000\004C\000\003\010", 0x04f1},
-#line 333 "./uninorm/composition-table.gperf"
+#line 342 "./uninorm/composition-table.gperf"
       {"\000\004\331\000\003\010", 0x04db},
-#line 87 "./uninorm/composition-table.gperf"
+#line 96 "./uninorm/composition-table.gperf"
       {"\000\000a\000\003\006", 0x0103},
-#line 32 "./uninorm/composition-table.gperf"
+#line 41 "./uninorm/composition-table.gperf"
       {"\000\000A\000\003\001", 0x00c1},
-#line 31 "./uninorm/composition-table.gperf"
+#line 40 "./uninorm/composition-table.gperf"
       {"\000\000A\000\003\000", 0x00c0},
-#line 89 "./uninorm/composition-table.gperf"
+#line 98 "./uninorm/composition-table.gperf"
       {"\000\000a\000\003(", 0x0105},
-#line 33 "./uninorm/composition-table.gperf"
+#line 42 "./uninorm/composition-table.gperf"
       {"\000\000A\000\003\002", 0x00c2},
-#line 269 "./uninorm/composition-table.gperf"
+#line 278 "./uninorm/composition-table.gperf"
       {"\000\000A\000\003\007", 0x0226},
-#line 45 "./uninorm/composition-table.gperf"
+#line 54 "./uninorm/composition-table.gperf"
       {"\000\000I\000\003\010", 0x00cf},
-#line 713 "./uninorm/composition-table.gperf"
+#line 722 "./uninorm/composition-table.gperf"
       {"\000\037A\000\003\001", 0x1f45},
-#line 711 "./uninorm/composition-table.gperf"
+#line 720 "./uninorm/composition-table.gperf"
       {"\000\037A\000\003\000", 0x1f43},
-#line 354 "./uninorm/composition-table.gperf"
+#line 363 "./uninorm/composition-table.gperf"
       {"\000\004'\000\003\010", 0x04f4},
-#line 65 "./uninorm/composition-table.gperf"
+#line 74 "./uninorm/composition-table.gperf"
       {"\000\000e\000\003\001", 0x00e9},
-#line 64 "./uninorm/composition-table.gperf"
+#line 73 "./uninorm/composition-table.gperf"
       {"\000\000e\000\003\000", 0x00e8},
-#line 121 "./uninorm/composition-table.gperf"
+#line 130 "./uninorm/composition-table.gperf"
       {"\000\000i\000\003\003", 0x0129},
-#line 66 "./uninorm/composition-table.gperf"
+#line 75 "./uninorm/composition-table.gperf"
       {"\000\000e\000\003\002", 0x00ea},
-#line 105 "./uninorm/composition-table.gperf"
+#line 114 "./uninorm/composition-table.gperf"
       {"\000\000e\000\003\007", 0x0117},
-#line 317 "./uninorm/composition-table.gperf"
+#line 326 "./uninorm/composition-table.gperf"
       {"\000\0043\000\003\001", 0x0453},
-#line 125 "./uninorm/composition-table.gperf"
+#line 134 "./uninorm/composition-table.gperf"
       {"\000\000i\000\003\006", 0x012d},
-#line 528 "./uninorm/composition-table.gperf"
+#line 537 "./uninorm/composition-table.gperf"
       {"\000\000v\000\003\003", 0x1e7d},
-#line 596 "./uninorm/composition-table.gperf"
+#line 605 "./uninorm/composition-table.gperf"
       {"\000\036\270\000\003\002", 0x1ec6},
-#line 127 "./uninorm/composition-table.gperf"
+#line 136 "./uninorm/composition-table.gperf"
       {"\000\000i\000\003(", 0x012f},
-#line 345 "./uninorm/composition-table.gperf"
+#line 354 "./uninorm/composition-table.gperf"
       {"\000\004\351\000\003\010", 0x04eb},
-#line 668 "./uninorm/composition-table.gperf"
+#line 677 "./uninorm/composition-table.gperf"
       {"\000\037\020\000\003\001", 0x1f14},
-#line 666 "./uninorm/composition-table.gperf"
+#line 675 "./uninorm/composition-table.gperf"
       {"\000\037\020\000\003\000", 0x1f12},
-#line 576 "./uninorm/composition-table.gperf"
+#line 585 "./uninorm/composition-table.gperf"
       {"\000\001\002\000\003\011", 0x1eb2},
-#line 346 "./uninorm/composition-table.gperf"
+#line 355 "./uninorm/composition-table.gperf"
       {"\000\004-\000\003\010", 0x04ec},
-#line 368 "./uninorm/composition-table.gperf"
+#line 377 "./uninorm/composition-table.gperf"
       {"\000\0113\000\011<", 0x0934},
-#line 577 "./uninorm/composition-table.gperf"
+#line 586 "./uninorm/composition-table.gperf"
       {"\000\001\003\000\003\011", 0x1eb3},
-#line 321 "./uninorm/composition-table.gperf"
+#line 330 "./uninorm/composition-table.gperf"
       {"\000\004C\000\003\006", 0x045e},
-#line 792 "./uninorm/composition-table.gperf"
+#line 801 "./uninorm/composition-table.gperf"
       {"\000\037e\000\003E", 0x1fa5},
-#line 344 "./uninorm/composition-table.gperf"
+#line 353 "./uninorm/composition-table.gperf"
       {"\000\004\350\000\003\010", 0x04ea},
-#line 337 "./uninorm/composition-table.gperf"
+#line 346 "./uninorm/composition-table.gperf"
       {"\000\0047\000\003\010", 0x04df},
-#line 120 "./uninorm/composition-table.gperf"
+#line 129 "./uninorm/composition-table.gperf"
       {"\000\000I\000\003\003", 0x0128},
-#line 432 "./uninorm/composition-table.gperf"
+#line 441 "./uninorm/composition-table.gperf"
       {"\000\002)\000\003\006", 0x1e1d},
-#line 783 "./uninorm/composition-table.gperf"
+#line 792 "./uninorm/composition-table.gperf"
       {"\000\037,\000\003E", 0x1f9c},
-#line 35 "./uninorm/composition-table.gperf"
+#line 44 "./uninorm/composition-table.gperf"
       {"\000\000A\000\003\010", 0x00c4},
-#line 124 "./uninorm/composition-table.gperf"
+#line 133 "./uninorm/composition-table.gperf"
       {"\000\000I\000\003\006", 0x012c},
-#line 74 "./uninorm/composition-table.gperf"
+#line 83 "./uninorm/composition-table.gperf"
       {"\000\000o\000\003\001", 0x00f3},
-#line 73 "./uninorm/composition-table.gperf"
+#line 82 "./uninorm/composition-table.gperf"
       {"\000\000o\000\003\000", 0x00f2},
-#line 126 "./uninorm/composition-table.gperf"
+#line 135 "./uninorm/composition-table.gperf"
       {"\000\000I\000\003(", 0x012e},
-#line 75 "./uninorm/composition-table.gperf"
+#line 84 "./uninorm/composition-table.gperf"
       {"\000\000o\000\003\002", 0x00f4},
-#line 278 "./uninorm/composition-table.gperf"
+#line 287 "./uninorm/composition-table.gperf"
       {"\000\000o\000\003\007", 0x022f},
-#line 240 "./uninorm/composition-table.gperf"
+#line 249 "./uninorm/composition-table.gperf"
       {"\000\000a\000\003\017", 0x0201},
-#line 225 "./uninorm/composition-table.gperf"
+#line 234 "./uninorm/composition-table.gperf"
       {"\000\001\353\000\003\004", 0x01ed},
-#line 67 "./uninorm/composition-table.gperf"
+#line 76 "./uninorm/composition-table.gperf"
       {"\000\000e\000\003\010", 0x00eb},
-#line 342 "./uninorm/composition-table.gperf"
+#line 351 "./uninorm/composition-table.gperf"
       {"\000\004\036\000\003\010", 0x04e6},
-#line 79 "./uninorm/composition-table.gperf"
+#line 88 "./uninorm/composition-table.gperf"
       {"\000\000u\000\003\001", 0x00fa},
-#line 78 "./uninorm/composition-table.gperf"
+#line 87 "./uninorm/composition-table.gperf"
       {"\000\000u\000\003\000", 0x00f9},
-#line 765 "./uninorm/composition-table.gperf"
+#line 774 "./uninorm/composition-table.gperf"
       {"\000\037\012\000\003E", 0x1f8a},
-#line 80 "./uninorm/composition-table.gperf"
+#line 89 "./uninorm/composition-table.gperf"
       {"\000\000u\000\003\002", 0x00fb},
-#line 96 "./uninorm/composition-table.gperf"
+#line 105 "./uninorm/composition-table.gperf"
       {"\000\000C\000\003\014", 0x010c},
-#line 215 "./uninorm/composition-table.gperf"
+#line 224 "./uninorm/composition-table.gperf"
       {"\000\002'\000\003\004", 0x01e1},
-#line 696 "./uninorm/composition-table.gperf"
+#line 705 "./uninorm/composition-table.gperf"
       {"\000\0370\000\003\001", 0x1f34},
-#line 694 "./uninorm/composition-table.gperf"
+#line 703 "./uninorm/composition-table.gperf"
       {"\000\0370\000\003\000", 0x1f32},
-#line 698 "./uninorm/composition-table.gperf"
+#line 707 "./uninorm/composition-table.gperf"
       {"\000\0370\000\003B", 0x1f36},
-#line 802 "./uninorm/composition-table.gperf"
+#line 811 "./uninorm/composition-table.gperf"
       {"\000\037o\000\003E", 0x1faf},
-#line 561 "./uninorm/composition-table.gperf"
+#line 570 "./uninorm/composition-table.gperf"
       {"\000\000a\000\003\011", 0x1ea3},
-#line 273 "./uninorm/composition-table.gperf"
+#line 282 "./uninorm/composition-table.gperf"
       {"\000\000\326\000\003\004", 0x022a},
-#line 248 "./uninorm/composition-table.gperf"
+#line 257 "./uninorm/composition-table.gperf"
       {"\000\000i\000\003\017", 0x0209},
-#line 227 "./uninorm/composition-table.gperf"
+#line 236 "./uninorm/composition-table.gperf"
       {"\000\002\222\000\003\014", 0x01ef},
-#line 34 "./uninorm/composition-table.gperf"
+#line 43 "./uninorm/composition-table.gperf"
       {"\000\000A\000\003\003", 0x00c3},
-#line 782 "./uninorm/composition-table.gperf"
+#line 791 "./uninorm/composition-table.gperf"
       {"\000\037+\000\003E", 0x1f9b},
-#line 274 "./uninorm/composition-table.gperf"
+#line 283 "./uninorm/composition-table.gperf"
       {"\000\000\366\000\003\004", 0x022b},
-#line 760 "./uninorm/composition-table.gperf"
+#line 769 "./uninorm/composition-table.gperf"
       {"\000\037\005\000\003E", 0x1f85},
-#line 86 "./uninorm/composition-table.gperf"
+#line 95 "./uninorm/composition-table.gperf"
       {"\000\000A\000\003\006", 0x0102},
-#line 276 "./uninorm/composition-table.gperf"
+#line 285 "./uninorm/composition-table.gperf"
       {"\000\000\365\000\003\004", 0x022d},
-#line 768 "./uninorm/composition-table.gperf"
+#line 777 "./uninorm/composition-table.gperf"
       {"\000\037\015\000\003E", 0x1f8d},
-#line 88 "./uninorm/composition-table.gperf"
+#line 97 "./uninorm/composition-table.gperf"
       {"\000\000A\000\003(", 0x0104},
-#line 217 "./uninorm/composition-table.gperf"
+#line 226 "./uninorm/composition-table.gperf"
       {"\000\000\346\000\003\004", 0x01e3},
-#line 587 "./uninorm/composition-table.gperf"
+#line 596 "./uninorm/composition-table.gperf"
       {"\000\000e\000\003\003", 0x1ebd},
-#line 77 "./uninorm/composition-table.gperf"
+#line 86 "./uninorm/composition-table.gperf"
       {"\000\000o\000\003\010", 0x00f6},
-#line 85 "./uninorm/composition-table.gperf"
+#line 94 "./uninorm/composition-table.gperf"
       {"\000\000a\000\003\004", 0x0101},
-#line 599 "./uninorm/composition-table.gperf"
+#line 608 "./uninorm/composition-table.gperf"
       {"\000\000i\000\003\011", 0x1ec9},
-#line 103 "./uninorm/composition-table.gperf"
+#line 112 "./uninorm/composition-table.gperf"
       {"\000\000e\000\003\006", 0x0115},
-#line 197 "./uninorm/composition-table.gperf"
+#line 206 "./uninorm/composition-table.gperf"
       {"\000\000a\000\003\014", 0x01ce},
-#line 388 "./uninorm/composition-table.gperf"
+#line 397 "./uninorm/composition-table.gperf"
       {"\000\015\331\000\015\317", 0x0ddc},
-#line 107 "./uninorm/composition-table.gperf"
+#line 116 "./uninorm/composition-table.gperf"
       {"\000\000e\000\003(", 0x0119},
-#line 247 "./uninorm/composition-table.gperf"
+#line 256 "./uninorm/composition-table.gperf"
       {"\000\000I\000\003\017", 0x0208},
-#line 213 "./uninorm/composition-table.gperf"
+#line 222 "./uninorm/composition-table.gperf"
       {"\000\000\344\000\003\004", 0x01df},
-#line 81 "./uninorm/composition-table.gperf"
+#line 90 "./uninorm/composition-table.gperf"
       {"\000\000u\000\003\010", 0x00fc},
-#line 39 "./uninorm/composition-table.gperf"
+#line 48 "./uninorm/composition-table.gperf"
       {"\000\000E\000\003\001", 0x00c9},
-#line 38 "./uninorm/composition-table.gperf"
+#line 47 "./uninorm/composition-table.gperf"
       {"\000\000E\000\003\000", 0x00c8},
-#line 204 "./uninorm/composition-table.gperf"
+#line 213 "./uninorm/composition-table.gperf"
       {"\000\000\334\000\003\004", 0x01d5},
-#line 40 "./uninorm/composition-table.gperf"
+#line 49 "./uninorm/composition-table.gperf"
       {"\000\000E\000\003\002", 0x00ca},
-#line 104 "./uninorm/composition-table.gperf"
+#line 113 "./uninorm/composition-table.gperf"
       {"\000\000E\000\003\007", 0x0116},
-#line 208 "./uninorm/composition-table.gperf"
+#line 217 "./uninorm/composition-table.gperf"
       {"\000\000\334\000\003\014", 0x01d9},
-#line 212 "./uninorm/composition-table.gperf"
+#line 221 "./uninorm/composition-table.gperf"
       {"\000\000\304\000\003\004", 0x01de},
-#line 123 "./uninorm/composition-table.gperf"
+#line 132 "./uninorm/composition-table.gperf"
       {"\000\000i\000\003\004", 0x012b},
-#line 390 "./uninorm/composition-table.gperf"
+#line 399 "./uninorm/composition-table.gperf"
       {"\000\015\331\000\015\337", 0x0dde},
-#line 306 "./uninorm/composition-table.gperf"
+#line 315 "./uninorm/composition-table.gperf"
       {"\000\004\025\000\003\000", 0x0400},
-#line 199 "./uninorm/composition-table.gperf"
+#line 208 "./uninorm/composition-table.gperf"
       {"\000\000i\000\003\014", 0x01d0},
-#line 598 "./uninorm/composition-table.gperf"
+#line 607 "./uninorm/composition-table.gperf"
       {"\000\000I\000\003\011", 0x1ec8},
-#line 781 "./uninorm/composition-table.gperf"
+#line 790 "./uninorm/composition-table.gperf"
       {"\000\037*\000\003E", 0x1f9a},
-#line 48 "./uninorm/composition-table.gperf"
+#line 57 "./uninorm/composition-table.gperf"
       {"\000\000O\000\003\001", 0x00d3},
-#line 47 "./uninorm/composition-table.gperf"
+#line 56 "./uninorm/composition-table.gperf"
       {"\000\000O\000\003\000", 0x00d2},
-#line 76 "./uninorm/composition-table.gperf"
+#line 85 "./uninorm/composition-table.gperf"
       {"\000\000o\000\003\003", 0x00f5},
-#line 49 "./uninorm/composition-table.gperf"
+#line 58 "./uninorm/composition-table.gperf"
       {"\000\000O\000\003\002", 0x00d4},
-#line 277 "./uninorm/composition-table.gperf"
+#line 286 "./uninorm/composition-table.gperf"
       {"\000\000O\000\003\007", 0x022e},
-#line 349 "./uninorm/composition-table.gperf"
+#line 358 "./uninorm/composition-table.gperf"
       {"\000\004C\000\003\004", 0x04ef},
-#line 148 "./uninorm/composition-table.gperf"
+#line 157 "./uninorm/composition-table.gperf"
       {"\000\000o\000\003\006", 0x014f},
-#line 328 "./uninorm/composition-table.gperf"
+#line 337 "./uninorm/composition-table.gperf"
       {"\000\004\020\000\003\010", 0x04d2},
-#line 954 "./uninorm/composition-table.gperf"
+#line 963 "./uninorm/composition-table.gperf"
       {"\0000\357\0000\231", 0x30f7},
-#line 223 "./uninorm/composition-table.gperf"
+#line 232 "./uninorm/composition-table.gperf"
       {"\000\000o\000\003(", 0x01eb},
-#line 924 "./uninorm/composition-table.gperf"
+#line 933 "./uninorm/composition-table.gperf"
       {"\0000{\0000\231", 0x307c},
-#line 170 "./uninorm/composition-table.gperf"
+#line 179 "./uninorm/composition-table.gperf"
       {"\000\000u\000\003\003", 0x0169},
-#line 239 "./uninorm/composition-table.gperf"
+#line 248 "./uninorm/composition-table.gperf"
       {"\000\000A\000\003\017", 0x0200},
-#line 122 "./uninorm/composition-table.gperf"
+#line 131 "./uninorm/composition-table.gperf"
       {"\000\000I\000\003\004", 0x012a},
-#line 367 "./uninorm/composition-table.gperf"
+#line 376 "./uninorm/composition-table.gperf"
       {"\000\0110\000\011<", 0x0931},
-#line 174 "./uninorm/composition-table.gperf"
+#line 183 "./uninorm/composition-table.gperf"
       {"\000\000u\000\003\006", 0x016d},
-#line 198 "./uninorm/composition-table.gperf"
+#line 207 "./uninorm/composition-table.gperf"
       {"\000\000I\000\003\014", 0x01cf},
-#line 926 "./uninorm/composition-table.gperf"
+#line 935 "./uninorm/composition-table.gperf"
       {"\0000F\0000\231", 0x3094},
-#line 180 "./uninorm/composition-table.gperf"
+#line 189 "./uninorm/composition-table.gperf"
       {"\000\000u\000\003(", 0x0173},
-#line 541 "./uninorm/composition-table.gperf"
+#line 550 "./uninorm/composition-table.gperf"
       {"\000\000X\000\003\007", 0x1e8a},
-#line 41 "./uninorm/composition-table.gperf"
+#line 50 "./uninorm/composition-table.gperf"
       {"\000\000E\000\003\010", 0x00cb},
-#line 244 "./uninorm/composition-table.gperf"
+#line 253 "./uninorm/composition-table.gperf"
       {"\000\000e\000\003\017", 0x0205},
-#line 53 "./uninorm/composition-table.gperf"
+#line 62 "./uninorm/composition-table.gperf"
       {"\000\000U\000\003\001", 0x00da},
-#line 52 "./uninorm/composition-table.gperf"
+#line 61 "./uninorm/composition-table.gperf"
       {"\000\000U\000\003\000", 0x00d9},
-#line 925 "./uninorm/composition-table.gperf"
+#line 934 "./uninorm/composition-table.gperf"
       {"\0000{\0000\232", 0x307d},
-#line 54 "./uninorm/composition-table.gperf"
+#line 63 "./uninorm/composition-table.gperf"
       {"\000\000U\000\003\002", 0x00db},
-#line 560 "./uninorm/composition-table.gperf"
+#line 569 "./uninorm/composition-table.gperf"
       {"\000\000A\000\003\011", 0x1ea2},
-#line 460 "./uninorm/composition-table.gperf"
+#line 469 "./uninorm/composition-table.gperf"
       {"\000\0367\000\003\004", 0x1e39},
-#line 307 "./uninorm/composition-table.gperf"
+#line 316 "./uninorm/composition-table.gperf"
       {"\000\004\025\000\003\010", 0x0401},
-#line 205 "./uninorm/composition-table.gperf"
+#line 214 "./uninorm/composition-table.gperf"
       {"\000\000\374\000\003\004", 0x01d6},
-#line 775 "./uninorm/composition-table.gperf"
+#line 784 "./uninorm/composition-table.gperf"
       {"\000\037$\000\003E", 0x1f94},
-#line 912 "./uninorm/composition-table.gperf"
+#line 921 "./uninorm/composition-table.gperf"
       {"\0000a\0000\231", 0x3062},
-#line 209 "./uninorm/composition-table.gperf"
+#line 218 "./uninorm/composition-table.gperf"
       {"\000\000\374\000\003\014", 0x01da},
-#line 51 "./uninorm/composition-table.gperf"
+#line 60 "./uninorm/composition-table.gperf"
       {"\000\000O\000\003\010", 0x00d6},
-#line 356 "./uninorm/composition-table.gperf"
+#line 365 "./uninorm/composition-table.gperf"
       {"\000\004+\000\003\010", 0x04f8},
-#line 585 "./uninorm/composition-table.gperf"
+#line 594 "./uninorm/composition-table.gperf"
       {"\000\000e\000\003\011", 0x1ebb},
-#line 326 "./uninorm/composition-table.gperf"
+#line 335 "./uninorm/composition-table.gperf"
       {"\000\004\020\000\003\006", 0x04d0},
-#line 329 "./uninorm/composition-table.gperf"
+#line 338 "./uninorm/composition-table.gperf"
       {"\000\0040\000\003\010", 0x04d3},
-#line 559 "./uninorm/composition-table.gperf"
+#line 568 "./uninorm/composition-table.gperf"
       {"\000\000a\000\003#", 0x1ea1},
-#line 82 "./uninorm/composition-table.gperf"
+#line 91 "./uninorm/composition-table.gperf"
       {"\000\000y\000\003\001", 0x00fd},
-#line 641 "./uninorm/composition-table.gperf"
+#line 650 "./uninorm/composition-table.gperf"
       {"\000\000y\000\003\000", 0x1ef3},
-#line 84 "./uninorm/composition-table.gperf"
+#line 93 "./uninorm/composition-table.gperf"
       {"\000\000A\000\003\004", 0x0100},
-#line 184 "./uninorm/composition-table.gperf"
+#line 193 "./uninorm/composition-table.gperf"
       {"\000\000y\000\003\002", 0x0177},
-#line 546 "./uninorm/composition-table.gperf"
+#line 555 "./uninorm/composition-table.gperf"
       {"\000\000y\000\003\007", 0x1e8f},
-#line 196 "./uninorm/composition-table.gperf"
+#line 205 "./uninorm/composition-table.gperf"
       {"\000\000A\000\003\014", 0x01cd},
-#line 586 "./uninorm/composition-table.gperf"
+#line 595 "./uninorm/composition-table.gperf"
       {"\000\000E\000\003\003", 0x1ebc},
-#line 940 "./uninorm/composition-table.gperf"
+#line 949 "./uninorm/composition-table.gperf"
       {"\0000\304\0000\231", 0x30c5},
-#line 252 "./uninorm/composition-table.gperf"
+#line 261 "./uninorm/composition-table.gperf"
       {"\000\000o\000\003\017", 0x020d},
-#line 543 "./uninorm/composition-table.gperf"
+#line 552 "./uninorm/composition-table.gperf"
       {"\000\000X\000\003\010", 0x1e8c},
-#line 102 "./uninorm/composition-table.gperf"
+#line 111 "./uninorm/composition-table.gperf"
       {"\000\000E\000\003\006", 0x0114},
-#line 101 "./uninorm/composition-table.gperf"
+#line 110 "./uninorm/composition-table.gperf"
       {"\000\000e\000\003\004", 0x0113},
-#line 958 "./uninorm/composition-table.gperf"
+#line 967 "./uninorm/composition-table.gperf"
       {"\0000\375\0000\231", 0x30fe},
-#line 106 "./uninorm/composition-table.gperf"
+#line 115 "./uninorm/composition-table.gperf"
       {"\000\000E\000\003(", 0x0118},
-#line 109 "./uninorm/composition-table.gperf"
+#line 118 "./uninorm/composition-table.gperf"
       {"\000\000e\000\003\014", 0x011b},
-#line 601 "./uninorm/composition-table.gperf"
+#line 610 "./uninorm/composition-table.gperf"
       {"\000\000i\000\003#", 0x1ecb},
-#line 55 "./uninorm/composition-table.gperf"
+#line 64 "./uninorm/composition-table.gperf"
       {"\000\000U\000\003\010", 0x00dc},
-#line 260 "./uninorm/composition-table.gperf"
+#line 269 "./uninorm/composition-table.gperf"
       {"\000\000u\000\003\017", 0x0215},
-#line 330 "./uninorm/composition-table.gperf"
+#line 339 "./uninorm/composition-table.gperf"
       {"\000\004\025\000\003\006", 0x04d6},
-#line 50 "./uninorm/composition-table.gperf"
+#line 59 "./uninorm/composition-table.gperf"
       {"\000\000O\000\003\003", 0x00d5},
-#line 530 "./uninorm/composition-table.gperf"
+#line 539 "./uninorm/composition-table.gperf"
       {"\000\000v\000\003#", 0x1e7f},
-#line 510 "./uninorm/composition-table.gperf"
+#line 519 "./uninorm/composition-table.gperf"
       {"\000\000t\000\003\007", 0x1e6b},
-#line 605 "./uninorm/composition-table.gperf"
+#line 614 "./uninorm/composition-table.gperf"
       {"\000\000o\000\003\011", 0x1ecf},
-#line 147 "./uninorm/composition-table.gperf"
+#line 156 "./uninorm/composition-table.gperf"
       {"\000\000O\000\003\006", 0x014e},
-#line 425 "./uninorm/composition-table.gperf"
+#line 434 "./uninorm/composition-table.gperf"
       {"\000\001\022\000\003\001", 0x1e16},
-#line 423 "./uninorm/composition-table.gperf"
+#line 432 "./uninorm/composition-table.gperf"
       {"\000\001\022\000\003\000", 0x1e14},
-#line 222 "./uninorm/composition-table.gperf"
+#line 231 "./uninorm/composition-table.gperf"
       {"\000\000O\000\003(", 0x01ea},
-#line 327 "./uninorm/composition-table.gperf"
+#line 336 "./uninorm/composition-table.gperf"
       {"\000\0040\000\003\006", 0x04d1},
-#line 675 "./uninorm/composition-table.gperf"
+#line 684 "./uninorm/composition-table.gperf"
       {"\000\037\031\000\003\001", 0x1f1d},
-#line 673 "./uninorm/composition-table.gperf"
+#line 682 "./uninorm/composition-table.gperf"
       {"\000\037\031\000\003\000", 0x1f1b},
-#line 266 "./uninorm/composition-table.gperf"
+#line 275 "./uninorm/composition-table.gperf"
       {"\000\000t\000\003&", 0x021b},
-#line 629 "./uninorm/composition-table.gperf"
+#line 638 "./uninorm/composition-table.gperf"
       {"\000\000u\000\003\011", 0x1ee7},
-#line 152 "./uninorm/composition-table.gperf"
+#line 161 "./uninorm/composition-table.gperf"
       {"\000\000r\000\003\001", 0x0155},
-#line 83 "./uninorm/composition-table.gperf"
+#line 92 "./uninorm/composition-table.gperf"
       {"\000\000y\000\003\010", 0x00ff},
-#line 600 "./uninorm/composition-table.gperf"
+#line 609 "./uninorm/composition-table.gperf"
       {"\000\000I\000\003#", 0x1eca},
-#line 815 "./uninorm/composition-table.gperf"
+#line 824 "./uninorm/composition-table.gperf"
       {"\000\037t\000\003E", 0x1fc2},
-#line 492 "./uninorm/composition-table.gperf"
+#line 501 "./uninorm/composition-table.gperf"
       {"\000\000r\000\003\007", 0x1e59},
-#line 146 "./uninorm/composition-table.gperf"
+#line 155 "./uninorm/composition-table.gperf"
       {"\000\000o\000\003\004", 0x014d},
-#line 957 "./uninorm/composition-table.gperf"
+#line 966 "./uninorm/composition-table.gperf"
       {"\0000\362\0000\231", 0x30fa},
-#line 956 "./uninorm/composition-table.gperf"
+#line 965 "./uninorm/composition-table.gperf"
       {"\0000\361\0000\231", 0x30f9},
-#line 201 "./uninorm/composition-table.gperf"
+#line 210 "./uninorm/composition-table.gperf"
       {"\000\000o\000\003\014", 0x01d2},
-#line 169 "./uninorm/composition-table.gperf"
+#line 178 "./uninorm/composition-table.gperf"
       {"\000\000U\000\003\003", 0x0168},
-#line 411 "./uninorm/composition-table.gperf"
+#line 420 "./uninorm/composition-table.gperf"
       {"\000\000\307\000\003\001", 0x1e08},
-#line 140 "./uninorm/composition-table.gperf"
+#line 149 "./uninorm/composition-table.gperf"
       {"\000\000n\000\003\001", 0x0144},
-#line 232 "./uninorm/composition-table.gperf"
+#line 241 "./uninorm/composition-table.gperf"
       {"\000\000n\000\003\000", 0x01f9},
-#line 173 "./uninorm/composition-table.gperf"
+#line 182 "./uninorm/composition-table.gperf"
       {"\000\000U\000\003\006", 0x016c},
-#line 172 "./uninorm/composition-table.gperf"
+#line 181 "./uninorm/composition-table.gperf"
       {"\000\000u\000\003\004", 0x016b},
-#line 472 "./uninorm/composition-table.gperf"
+#line 481 "./uninorm/composition-table.gperf"
       {"\000\000n\000\003\007", 0x1e45},
-#line 179 "./uninorm/composition-table.gperf"
+#line 188 "./uninorm/composition-table.gperf"
       {"\000\000U\000\003(", 0x0172},
-#line 203 "./uninorm/composition-table.gperf"
+#line 212 "./uninorm/composition-table.gperf"
       {"\000\000u\000\003\014", 0x01d4},
-#line 554 "./uninorm/composition-table.gperf"
+#line 563 "./uninorm/composition-table.gperf"
       {"\000\000t\000\003\010", 0x1e97},
-#line 243 "./uninorm/composition-table.gperf"
+#line 252 "./uninorm/composition-table.gperf"
       {"\000\000E\000\003\017", 0x0204},
-#line 669 "./uninorm/composition-table.gperf"
+#line 678 "./uninorm/composition-table.gperf"
       {"\000\037\021\000\003\001", 0x1f15},
-#line 667 "./uninorm/composition-table.gperf"
+#line 676 "./uninorm/composition-table.gperf"
       {"\000\037\021\000\003\000", 0x1f13},
-#line 785 "./uninorm/composition-table.gperf"
+#line 794 "./uninorm/composition-table.gperf"
       {"\000\037.\000\003E", 0x1f9e},
-#line 414 "./uninorm/composition-table.gperf"
+#line 423 "./uninorm/composition-table.gperf"
       {"\000\000d\000\003\007", 0x1e0b},
-#line 242 "./uninorm/composition-table.gperf"
+#line 251 "./uninorm/composition-table.gperf"
       {"\000\000a\000\003\021", 0x0203},
-#line 405 "./uninorm/composition-table.gperf"
+#line 414 "./uninorm/composition-table.gperf"
       {"\000\000B\000\003\007", 0x1e02},
-#line 647 "./uninorm/composition-table.gperf"
+#line 656 "./uninorm/composition-table.gperf"
       {"\000\000y\000\003\003", 0x1ef9},
-#line 955 "./uninorm/composition-table.gperf"
+#line 964 "./uninorm/composition-table.gperf"
       {"\0000\360\0000\231", 0x30f8},
-#line 384 "./uninorm/composition-table.gperf"
+#line 393 "./uninorm/composition-table.gperf"
       {"\000\015F\000\015>", 0x0d4a},
-#line 801 "./uninorm/composition-table.gperf"
+#line 810 "./uninorm/composition-table.gperf"
       {"\000\037n\000\003E", 0x1fae},
-#line 558 "./uninorm/composition-table.gperf"
+#line 567 "./uninorm/composition-table.gperf"
       {"\000\000A\000\003#", 0x1ea0},
-#line 960 "./uninorm/composition-table.gperf"
+#line 969 "./uninorm/composition-table.gperf"
       {"\001\020\233\001\020\272", 0x1109c},
-#line 251 "./uninorm/composition-table.gperf"
+#line 260 "./uninorm/composition-table.gperf"
       {"\000\000O\000\003\017", 0x020c},
-#line 584 "./uninorm/composition-table.gperf"
+#line 593 "./uninorm/composition-table.gperf"
       {"\000\000E\000\003\011", 0x1eba},
-#line 335 "./uninorm/composition-table.gperf"
+#line 344 "./uninorm/composition-table.gperf"
       {"\000\0046\000\003\010", 0x04dd},
-#line 766 "./uninorm/composition-table.gperf"
+#line 775 "./uninorm/composition-table.gperf"
       {"\000\037\013\000\003E", 0x1f8b},
-#line 323 "./uninorm/composition-table.gperf"
+#line 332 "./uninorm/composition-table.gperf"
       {"\000\004u\000\003\017", 0x0477},
-#line 791 "./uninorm/composition-table.gperf"
+#line 800 "./uninorm/composition-table.gperf"
       {"\000\037d\000\003E", 0x1fa4},
-#line 942 "./uninorm/composition-table.gperf"
+#line 951 "./uninorm/composition-table.gperf"
       {"\0000\310\0000\231", 0x30c9},
-#line 583 "./uninorm/composition-table.gperf"
+#line 592 "./uninorm/composition-table.gperf"
       {"\000\000e\000\003#", 0x1eb9},
-#line 250 "./uninorm/composition-table.gperf"
+#line 259 "./uninorm/composition-table.gperf"
       {"\000\000i\000\003\021", 0x020b},
-#line 118 "./uninorm/composition-table.gperf"
+#line 127 "./uninorm/composition-table.gperf"
       {"\000\000H\000\003\002", 0x0124},
-#line 437 "./uninorm/composition-table.gperf"
+#line 446 "./uninorm/composition-table.gperf"
       {"\000\000H\000\003\007", 0x1e22},
-#line 62 "./uninorm/composition-table.gperf"
+#line 71 "./uninorm/composition-table.gperf"
       {"\000\000a\000\003\012", 0x00e5},
-#line 718 "./uninorm/composition-table.gperf"
+#line 727 "./uninorm/composition-table.gperf"
       {"\000\037H\000\003\001", 0x1f4c},
-#line 716 "./uninorm/composition-table.gperf"
+#line 725 "./uninorm/composition-table.gperf"
       {"\000\037H\000\003\000", 0x1f4a},
-#line 604 "./uninorm/composition-table.gperf"
+#line 613 "./uninorm/composition-table.gperf"
       {"\000\000O\000\003\011", 0x1ece},
-#line 936 "./uninorm/composition-table.gperf"
+#line 945 "./uninorm/composition-table.gperf"
       {"\0000\273\0000\231", 0x30bc},
-#line 100 "./uninorm/composition-table.gperf"
+#line 109 "./uninorm/composition-table.gperf"
       {"\000\000E\000\003\004", 0x0112},
-#line 56 "./uninorm/composition-table.gperf"
+#line 65 "./uninorm/composition-table.gperf"
       {"\000\000Y\000\003\001", 0x00dd},
-#line 640 "./uninorm/composition-table.gperf"
+#line 649 "./uninorm/composition-table.gperf"
       {"\000\000Y\000\003\000", 0x1ef2},
-#line 108 "./uninorm/composition-table.gperf"
+#line 117 "./uninorm/composition-table.gperf"
       {"\000\000E\000\003\014", 0x011a},
-#line 183 "./uninorm/composition-table.gperf"
+#line 192 "./uninorm/composition-table.gperf"
       {"\000\000Y\000\003\002", 0x0176},
-#line 545 "./uninorm/composition-table.gperf"
+#line 554 "./uninorm/composition-table.gperf"
       {"\000\000Y\000\003\007", 0x1e8e},
-#line 259 "./uninorm/composition-table.gperf"
+#line 268 "./uninorm/composition-table.gperf"
       {"\000\000U\000\003\017", 0x0214},
-#line 730 "./uninorm/composition-table.gperf"
+#line 739 "./uninorm/composition-table.gperf"
       {"\000\037Y\000\003\001", 0x1f5d},
-#line 729 "./uninorm/composition-table.gperf"
+#line 738 "./uninorm/composition-table.gperf"
       {"\000\037Y\000\003\000", 0x1f5b},
-#line 731 "./uninorm/composition-table.gperf"
+#line 740 "./uninorm/composition-table.gperf"
       {"\000\037Y\000\003B", 0x1f5f},
-#line 916 "./uninorm/composition-table.gperf"
+#line 925 "./uninorm/composition-table.gperf"
       {"\0000o\0000\231", 0x3070},
-#line 249 "./uninorm/composition-table.gperf"
+#line 258 "./uninorm/composition-table.gperf"
       {"\000\000I\000\003\021", 0x020a},
-#line 937 "./uninorm/composition-table.gperf"
+#line 946 "./uninorm/composition-table.gperf"
       {"\0000\275\0000\231", 0x30be},
-#line 145 "./uninorm/composition-table.gperf"
+#line 154 "./uninorm/composition-table.gperf"
       {"\000\000O\000\003\004", 0x014c},
-#line 479 "./uninorm/composition-table.gperf"
+#line 488 "./uninorm/composition-table.gperf"
       {"\000\000\325\000\003\001", 0x1e4c},
-#line 325 "./uninorm/composition-table.gperf"
+#line 334 "./uninorm/composition-table.gperf"
       {"\000\0046\000\003\006", 0x04c2},
-#line 200 "./uninorm/composition-table.gperf"
+#line 209 "./uninorm/composition-table.gperf"
       {"\000\000O\000\003\014", 0x01d1},
-#line 603 "./uninorm/composition-table.gperf"
+#line 612 "./uninorm/composition-table.gperf"
       {"\000\000o\000\003#", 0x1ecd},
-#line 523 "./uninorm/composition-table.gperf"
+#line 532 "./uninorm/composition-table.gperf"
       {"\000\001h\000\003\001", 0x1e78},
-#line 920 "./uninorm/composition-table.gperf"
+#line 929 "./uninorm/composition-table.gperf"
       {"\0000u\0000\231", 0x3076},
-#line 628 "./uninorm/composition-table.gperf"
+#line 637 "./uninorm/composition-table.gperf"
       {"\000\000U\000\003\011", 0x1ee6},
-#line 72 "./uninorm/composition-table.gperf"
+#line 81 "./uninorm/composition-table.gperf"
       {"\000\000n\000\003\003", 0x00f1},
-#line 929 "./uninorm/composition-table.gperf"
+#line 938 "./uninorm/composition-table.gperf"
       {"\0000\255\0000\231", 0x30ae},
-#line 441 "./uninorm/composition-table.gperf"
+#line 450 "./uninorm/composition-table.gperf"
       {"\000\000H\000\003\010", 0x1e26},
-#line 917 "./uninorm/composition-table.gperf"
+#line 926 "./uninorm/composition-table.gperf"
       {"\0000o\0000\232", 0x3071},
-#line 466 "./uninorm/composition-table.gperf"
+#line 475 "./uninorm/composition-table.gperf"
       {"\000\000m\000\003\001", 0x1e3f},
-#line 627 "./uninorm/composition-table.gperf"
+#line 636 "./uninorm/composition-table.gperf"
       {"\000\000u\000\003#", 0x1ee5},
-#line 119 "./uninorm/composition-table.gperf"
+#line 128 "./uninorm/composition-table.gperf"
       {"\000\000h\000\003\002", 0x0125},
-#line 438 "./uninorm/composition-table.gperf"
+#line 447 "./uninorm/composition-table.gperf"
       {"\000\000h\000\003\007", 0x1e23},
-#line 468 "./uninorm/composition-table.gperf"
+#line 477 "./uninorm/composition-table.gperf"
       {"\000\000m\000\003\007", 0x1e41},
-#line 744 "./uninorm/composition-table.gperf"
+#line 753 "./uninorm/composition-table.gperf"
       {"\000\037h\000\003\001", 0x1f6c},
-#line 742 "./uninorm/composition-table.gperf"
+#line 751 "./uninorm/composition-table.gperf"
       {"\000\037h\000\003\000", 0x1f6a},
-#line 746 "./uninorm/composition-table.gperf"
+#line 755 "./uninorm/composition-table.gperf"
       {"\000\037h\000\003B", 0x1f6e},
-#line 921 "./uninorm/composition-table.gperf"
+#line 930 "./uninorm/composition-table.gperf"
       {"\0000u\0000\232", 0x3077},
-#line 185 "./uninorm/composition-table.gperf"
+#line 194 "./uninorm/composition-table.gperf"
       {"\000\000Y\000\003\010", 0x0178},
-#line 171 "./uninorm/composition-table.gperf"
+#line 180 "./uninorm/composition-table.gperf"
       {"\000\000U\000\003\004", 0x016a},
-#line 386 "./uninorm/composition-table.gperf"
+#line 395 "./uninorm/composition-table.gperf"
       {"\000\015F\000\015W", 0x0d4c},
-#line 645 "./uninorm/composition-table.gperf"
+#line 654 "./uninorm/composition-table.gperf"
       {"\000\000y\000\003\011", 0x1ef7},
-#line 202 "./uninorm/composition-table.gperf"
+#line 211 "./uninorm/composition-table.gperf"
       {"\000\000U\000\003\014", 0x01d3},
-#line 241 "./uninorm/composition-table.gperf"
+#line 250 "./uninorm/composition-table.gperf"
       {"\000\000A\000\003\021", 0x0202},
-#line 37 "./uninorm/composition-table.gperf"
+#line 46 "./uninorm/composition-table.gperf"
       {"\000\000C\000\003'", 0x00c7},
-#line 773 "./uninorm/composition-table.gperf"
+#line 782 "./uninorm/composition-table.gperf"
       {"\000\037\"\000\003E", 0x1f92},
-#line 795 "./uninorm/composition-table.gperf"
+#line 804 "./uninorm/composition-table.gperf"
       {"\000\037h\000\003E", 0x1fa8},
-#line 800 "./uninorm/composition-table.gperf"
+#line 809 "./uninorm/composition-table.gperf"
       {"\000\037m\000\003E", 0x1fad},
-#line 688 "./uninorm/composition-table.gperf"
+#line 697 "./uninorm/composition-table.gperf"
       {"\000\037(\000\003\001", 0x1f2c},
-#line 686 "./uninorm/composition-table.gperf"
+#line 695 "./uninorm/composition-table.gperf"
       {"\000\037(\000\003\000", 0x1f2a},
-#line 690 "./uninorm/composition-table.gperf"
+#line 699 "./uninorm/composition-table.gperf"
       {"\000\037(\000\003B", 0x1f2e},
-#line 481 "./uninorm/composition-table.gperf"
+#line 490 "./uninorm/composition-table.gperf"
       {"\000\000\325\000\003\010", 0x1e4e},
-#line 246 "./uninorm/composition-table.gperf"
+#line 255 "./uninorm/composition-table.gperf"
       {"\000\000e\000\003\021", 0x0207},
-#line 697 "./uninorm/composition-table.gperf"
+#line 706 "./uninorm/composition-table.gperf"
       {"\000\0371\000\003\001", 0x1f35},
-#line 695 "./uninorm/composition-table.gperf"
+#line 704 "./uninorm/composition-table.gperf"
       {"\000\0371\000\003\000", 0x1f33},
-#line 699 "./uninorm/composition-table.gperf"
+#line 708 "./uninorm/composition-table.gperf"
       {"\000\0371\000\003B", 0x1f37},
-#line 282 "./uninorm/composition-table.gperf"
+#line 291 "./uninorm/composition-table.gperf"
       {"\000\000y\000\003\004", 0x0233},
-#line 953 "./uninorm/composition-table.gperf"
+#line 962 "./uninorm/composition-table.gperf"
       {"\0000\246\0000\231", 0x30f4},
-#line 428 "./uninorm/composition-table.gperf"
+#line 437 "./uninorm/composition-table.gperf"
       {"\000\000e\000\003-", 0x1e19},
-#line 256 "./uninorm/composition-table.gperf"
+#line 265 "./uninorm/composition-table.gperf"
       {"\000\000r\000\003\017", 0x0211},
-#line 779 "./uninorm/composition-table.gperf"
+#line 788 "./uninorm/composition-table.gperf"
       {"\000\037(\000\003E", 0x1f98},
-#line 442 "./uninorm/composition-table.gperf"
+#line 451 "./uninorm/composition-table.gperf"
       {"\000\000h\000\003\010", 0x1e27},
-#line 36 "./uninorm/composition-table.gperf"
+#line 45 "./uninorm/composition-table.gperf"
       {"\000\000A\000\003\012", 0x00c5},
-#line 646 "./uninorm/composition-table.gperf"
+#line 655 "./uninorm/composition-table.gperf"
       {"\000\000Y\000\003\003", 0x1ef8},
-#line 582 "./uninorm/composition-table.gperf"
+#line 591 "./uninorm/composition-table.gperf"
       {"\000\000E\000\003#", 0x1eb8},
-#line 533 "./uninorm/composition-table.gperf"
+#line 542 "./uninorm/composition-table.gperf"
       {"\000\000W\000\003\001", 0x1e82},
-#line 531 "./uninorm/composition-table.gperf"
+#line 540 "./uninorm/composition-table.gperf"
       {"\000\000W\000\003\000", 0x1e80},
-#line 151 "./uninorm/composition-table.gperf"
+#line 160 "./uninorm/composition-table.gperf"
       {"\000\000R\000\003\001", 0x0154},
-#line 181 "./uninorm/composition-table.gperf"
+#line 190 "./uninorm/composition-table.gperf"
       {"\000\000W\000\003\002", 0x0174},
-#line 537 "./uninorm/composition-table.gperf"
+#line 546 "./uninorm/composition-table.gperf"
       {"\000\000W\000\003\007", 0x1e86},
-#line 903 "./uninorm/composition-table.gperf"
+#line 912 "./uninorm/composition-table.gperf"
       {"\0000O\0000\231", 0x3050},
-#line 491 "./uninorm/composition-table.gperf"
+#line 500 "./uninorm/composition-table.gperf"
       {"\000\000R\000\003\007", 0x1e58},
-#line 869 "./uninorm/composition-table.gperf"
+#line 878 "./uninorm/composition-table.gperf"
       {"\000\"C\000\0038", 0x2244},
-#line 863 "./uninorm/composition-table.gperf"
+#line 872 "./uninorm/composition-table.gperf"
       {"\000\"\003\000\0038", 0x2204},
-#line 864 "./uninorm/composition-table.gperf"
+#line 873 "./uninorm/composition-table.gperf"
       {"\000\"\010\000\0038", 0x2209},
-#line 884 "./uninorm/composition-table.gperf"
+#line 893 "./uninorm/composition-table.gperf"
       {"\000\"{\000\0038", 0x2281},
-#line 168 "./uninorm/composition-table.gperf"
+#line 177 "./uninorm/composition-table.gperf"
       {"\000\000t\000\003\014", 0x0165},
-#line 602 "./uninorm/composition-table.gperf"
+#line 611 "./uninorm/composition-table.gperf"
       {"\000\000O\000\003#", 0x1ecc},
-#line 254 "./uninorm/composition-table.gperf"
+#line 263 "./uninorm/composition-table.gperf"
       {"\000\000o\000\003\021", 0x020f},
-#line 459 "./uninorm/composition-table.gperf"
+#line 468 "./uninorm/composition-table.gperf"
       {"\000\0366\000\003\004", 0x1e38},
-#line 229 "./uninorm/composition-table.gperf"
+#line 238 "./uninorm/composition-table.gperf"
       {"\000\000G\000\003\001", 0x01f4},
-#line 899 "./uninorm/composition-table.gperf"
+#line 908 "./uninorm/composition-table.gperf"
       {"\000\"\264\000\0038", 0x22ec},
-#line 897 "./uninorm/composition-table.gperf"
+#line 906 "./uninorm/composition-table.gperf"
       {"\000\"\262\000\0038", 0x22ea},
-#line 110 "./uninorm/composition-table.gperf"
+#line 119 "./uninorm/composition-table.gperf"
       {"\000\000G\000\003\002", 0x011c},
-#line 114 "./uninorm/composition-table.gperf"
+#line 123 "./uninorm/composition-table.gperf"
       {"\000\000G\000\003\007", 0x0120},
-#line 279 "./uninorm/composition-table.gperf"
+#line 288 "./uninorm/composition-table.gperf"
       {"\000\002.\000\003\004", 0x0230},
-#line 868 "./uninorm/composition-table.gperf"
+#line 877 "./uninorm/composition-table.gperf"
       {"\000\"<\000\0038", 0x2241},
-#line 262 "./uninorm/composition-table.gperf"
+#line 271 "./uninorm/composition-table.gperf"
       {"\000\000u\000\003\021", 0x0217},
-#line 896 "./uninorm/composition-table.gperf"
+#line 905 "./uninorm/composition-table.gperf"
       {"\000\"\222\000\0038", 0x22e3},
-#line 448 "./uninorm/composition-table.gperf"
+#line 457 "./uninorm/composition-table.gperf"
       {"\000\000i\000\0030", 0x1e2d},
-#line 889 "./uninorm/composition-table.gperf"
+#line 898 "./uninorm/composition-table.gperf"
       {"\000\"\242\000\0038", 0x22ac},
-#line 156 "./uninorm/composition-table.gperf"
+#line 165 "./uninorm/composition-table.gperf"
       {"\000\000r\000\003\014", 0x0159},
-#line 906 "./uninorm/composition-table.gperf"
+#line 915 "./uninorm/composition-table.gperf"
       {"\0000U\0000\231", 0x3056},
-#line 522 "./uninorm/composition-table.gperf"
+#line 531 "./uninorm/composition-table.gperf"
       {"\000\000u\000\003-", 0x1e77},
-#line 927 "./uninorm/composition-table.gperf"
+#line 936 "./uninorm/composition-table.gperf"
       {"\0000\235\0000\231", 0x309e},
-#line 322 "./uninorm/composition-table.gperf"
+#line 331 "./uninorm/composition-table.gperf"
       {"\000\004t\000\003\017", 0x0476},
-#line 873 "./uninorm/composition-table.gperf"
+#line 882 "./uninorm/composition-table.gperf"
       {"\000\"a\000\0038", 0x2262},
-#line 431 "./uninorm/composition-table.gperf"
+#line 440 "./uninorm/composition-table.gperf"
       {"\000\002(\000\003\006", 0x1e1c},
-#line 535 "./uninorm/composition-table.gperf"
+#line 544 "./uninorm/composition-table.gperf"
       {"\000\000W\000\003\010", 0x1e84},
-#line 626 "./uninorm/composition-table.gperf"
+#line 635 "./uninorm/composition-table.gperf"
       {"\000\000U\000\003#", 0x1ee4},
-#line 139 "./uninorm/composition-table.gperf"
+#line 148 "./uninorm/composition-table.gperf"
       {"\000\000N\000\003\001", 0x0143},
-#line 231 "./uninorm/composition-table.gperf"
+#line 240 "./uninorm/composition-table.gperf"
       {"\000\000N\000\003\000", 0x01f8},
-#line 144 "./uninorm/composition-table.gperf"
+#line 153 "./uninorm/composition-table.gperf"
       {"\000\000n\000\003\014", 0x0148},
-#line 366 "./uninorm/composition-table.gperf"
+#line 375 "./uninorm/composition-table.gperf"
       {"\000\011(\000\011<", 0x0929},
-#line 471 "./uninorm/composition-table.gperf"
+#line 480 "./uninorm/composition-table.gperf"
       {"\000\000N\000\003\007", 0x1e44},
-#line 888 "./uninorm/composition-table.gperf"
+#line 897 "./uninorm/composition-table.gperf"
       {"\000\"\207\000\0038", 0x2289},
-#line 176 "./uninorm/composition-table.gperf"
+#line 185 "./uninorm/composition-table.gperf"
       {"\000\000u\000\003\012", 0x016f},
-#line 887 "./uninorm/composition-table.gperf"
+#line 896 "./uninorm/composition-table.gperf"
       {"\000\"\206\000\0038", 0x2288},
-#line 447 "./uninorm/composition-table.gperf"
+#line 456 "./uninorm/composition-table.gperf"
       {"\000\000I\000\0030", 0x1e2c},
-#line 886 "./uninorm/composition-table.gperf"
+#line 895 "./uninorm/composition-table.gperf"
       {"\000\"\203\000\0038", 0x2285},
-#line 99 "./uninorm/composition-table.gperf"
+#line 108 "./uninorm/composition-table.gperf"
       {"\000\000d\000\003\014", 0x010f},
-#line 534 "./uninorm/composition-table.gperf"
+#line 543 "./uninorm/composition-table.gperf"
       {"\000\000w\000\003\001", 0x1e83},
-#line 532 "./uninorm/composition-table.gperf"
+#line 541 "./uninorm/composition-table.gperf"
       {"\000\000w\000\003\000", 0x1e81},
-#line 514 "./uninorm/composition-table.gperf"
+#line 523 "./uninorm/composition-table.gperf"
       {"\000\000t\000\0031", 0x1e6f},
-#line 182 "./uninorm/composition-table.gperf"
+#line 191 "./uninorm/composition-table.gperf"
       {"\000\000w\000\003\002", 0x0175},
-#line 538 "./uninorm/composition-table.gperf"
+#line 547 "./uninorm/composition-table.gperf"
       {"\000\000w\000\003\007", 0x1e87},
-#line 643 "./uninorm/composition-table.gperf"
+#line 652 "./uninorm/composition-table.gperf"
       {"\000\000y\000\003#", 0x1ef5},
-#line 881 "./uninorm/composition-table.gperf"
+#line 890 "./uninorm/composition-table.gperf"
       {"\000\"v\000\0038", 0x2278},
-#line 288 "./uninorm/composition-table.gperf"
+#line 297 "./uninorm/composition-table.gperf"
       {"\000\003\237\000\003\001", 0x038c},
-#line 854 "./uninorm/composition-table.gperf"
+#line 863 "./uninorm/composition-table.gperf"
       {"\000\003\237\000\003\000", 0x1ff8},
-#line 230 "./uninorm/composition-table.gperf"
+#line 239 "./uninorm/composition-table.gperf"
       {"\000\000g\000\003\001", 0x01f5},
-#line 245 "./uninorm/composition-table.gperf"
+#line 254 "./uninorm/composition-table.gperf"
       {"\000\000E\000\003\021", 0x0206},
-#line 644 "./uninorm/composition-table.gperf"
+#line 653 "./uninorm/composition-table.gperf"
       {"\000\000Y\000\003\011", 0x1ef6},
-#line 111 "./uninorm/composition-table.gperf"
+#line 120 "./uninorm/composition-table.gperf"
       {"\000\000g\000\003\002", 0x011d},
-#line 115 "./uninorm/composition-table.gperf"
+#line 124 "./uninorm/composition-table.gperf"
       {"\000\000g\000\003\007", 0x0121},
-#line 334 "./uninorm/composition-table.gperf"
+#line 343 "./uninorm/composition-table.gperf"
       {"\000\004\026\000\003\010", 0x04dc},
-#line 893 "./uninorm/composition-table.gperf"
+#line 902 "./uninorm/composition-table.gperf"
       {"\000\"|\000\0038", 0x22e0},
-#line 427 "./uninorm/composition-table.gperf"
+#line 436 "./uninorm/composition-table.gperf"
       {"\000\000E\000\003-", 0x1e18},
-#line 498 "./uninorm/composition-table.gperf"
+#line 507 "./uninorm/composition-table.gperf"
       {"\000\000r\000\0031", 0x1e5f},
-#line 267 "./uninorm/composition-table.gperf"
+#line 276 "./uninorm/composition-table.gperf"
       {"\000\000H\000\003\014", 0x021e},
-#line 485 "./uninorm/composition-table.gperf"
+#line 494 "./uninorm/composition-table.gperf"
       {"\000\001L\000\003\001", 0x1e52},
-#line 483 "./uninorm/composition-table.gperf"
+#line 492 "./uninorm/composition-table.gperf"
       {"\000\001L\000\003\000", 0x1e50},
-#line 434 "./uninorm/composition-table.gperf"
+#line 443 "./uninorm/composition-table.gperf"
       {"\000\000f\000\003\007", 0x1e1f},
-#line 512 "./uninorm/composition-table.gperf"
+#line 521 "./uninorm/composition-table.gperf"
       {"\000\000t\000\003#", 0x1e6d},
-#line 253 "./uninorm/composition-table.gperf"
+#line 262 "./uninorm/composition-table.gperf"
       {"\000\000O\000\003\021", 0x020e},
-#line 885 "./uninorm/composition-table.gperf"
+#line 894 "./uninorm/composition-table.gperf"
       {"\000\"\202\000\0038", 0x2284},
-#line 133 "./uninorm/composition-table.gperf"
+#line 142 "./uninorm/composition-table.gperf"
       {"\000\000L\000\003\001", 0x0139},
-#line 281 "./uninorm/composition-table.gperf"
+#line 290 "./uninorm/composition-table.gperf"
       {"\000\000Y\000\003\004", 0x0232},
-#line 794 "./uninorm/composition-table.gperf"
+#line 803 "./uninorm/composition-table.gperf"
       {"\000\037g\000\003E", 0x1fa7},
-#line 476 "./uninorm/composition-table.gperf"
+#line 485 "./uninorm/composition-table.gperf"
       {"\000\000n\000\0031", 0x1e49},
-#line 272 "./uninorm/composition-table.gperf"
+#line 281 "./uninorm/composition-table.gperf"
       {"\000\000e\000\003'", 0x0229},
-#line 918 "./uninorm/composition-table.gperf"
+#line 927 "./uninorm/composition-table.gperf"
       {"\0000r\0000\231", 0x3073},
-#line 112 "./uninorm/composition-table.gperf"
+#line 121 "./uninorm/composition-table.gperf"
       {"\000\000G\000\003\006", 0x011e},
-#line 304 "./uninorm/composition-table.gperf"
+#line 313 "./uninorm/composition-table.gperf"
       {"\000\003\322\000\003\001", 0x03d3},
-#line 536 "./uninorm/composition-table.gperf"
+#line 545 "./uninorm/composition-table.gperf"
       {"\000\000w\000\003\010", 0x1e85},
-#line 430 "./uninorm/composition-table.gperf"
+#line 439 "./uninorm/composition-table.gperf"
       {"\000\000e\000\0030", 0x1e1b},
-#line 793 "./uninorm/composition-table.gperf"
+#line 802 "./uninorm/composition-table.gperf"
       {"\000\037f\000\003E", 0x1fa6},
-#line 418 "./uninorm/composition-table.gperf"
+#line 427 "./uninorm/composition-table.gperf"
       {"\000\000d\000\0031", 0x1e0f},
-#line 494 "./uninorm/composition-table.gperf"
+#line 503 "./uninorm/composition-table.gperf"
       {"\000\000r\000\003#", 0x1e5b},
-#line 409 "./uninorm/composition-table.gperf"
+#line 418 "./uninorm/composition-table.gperf"
       {"\000\000B\000\0031", 0x1e06},
-#line 275 "./uninorm/composition-table.gperf"
+#line 284 "./uninorm/composition-table.gperf"
       {"\000\000\325\000\003\004", 0x022c},
-#line 486 "./uninorm/composition-table.gperf"
+#line 495 "./uninorm/composition-table.gperf"
       {"\000\001M\000\003\001", 0x1e53},
-#line 484 "./uninorm/composition-table.gperf"
+#line 493 "./uninorm/composition-table.gperf"
       {"\000\001M\000\003\000", 0x1e51},
-#line 894 "./uninorm/composition-table.gperf"
+#line 903 "./uninorm/composition-table.gperf"
       {"\000\"}\000\0038", 0x22e1},
-#line 324 "./uninorm/composition-table.gperf"
+#line 333 "./uninorm/composition-table.gperf"
       {"\000\004\026\000\003\006", 0x04c1},
-#line 919 "./uninorm/composition-table.gperf"
+#line 928 "./uninorm/composition-table.gperf"
       {"\0000r\0000\232", 0x3074},
-#line 261 "./uninorm/composition-table.gperf"
+#line 270 "./uninorm/composition-table.gperf"
       {"\000\000U\000\003\021", 0x0216},
-#line 465 "./uninorm/composition-table.gperf"
+#line 474 "./uninorm/composition-table.gperf"
       {"\000\000M\000\003\001", 0x1e3e},
-#line 46 "./uninorm/composition-table.gperf"
+#line 55 "./uninorm/composition-table.gperf"
       {"\000\000N\000\003\003", 0x00d1},
-#line 474 "./uninorm/composition-table.gperf"
+#line 483 "./uninorm/composition-table.gperf"
       {"\000\000n\000\003#", 0x1e47},
-#line 913 "./uninorm/composition-table.gperf"
+#line 922 "./uninorm/composition-table.gperf"
       {"\0000d\0000\231", 0x3065},
-#line 467 "./uninorm/composition-table.gperf"
+#line 476 "./uninorm/composition-table.gperf"
       {"\000\000M\000\003\007", 0x1e40},
-#line 521 "./uninorm/composition-table.gperf"
+#line 530 "./uninorm/composition-table.gperf"
       {"\000\000U\000\003-", 0x1e76},
-#line 268 "./uninorm/composition-table.gperf"
+#line 277 "./uninorm/composition-table.gperf"
       {"\000\000h\000\003\014", 0x021f},
-#line 355 "./uninorm/composition-table.gperf"
+#line 364 "./uninorm/composition-table.gperf"
       {"\000\004G\000\003\010", 0x04f5},
-#line 509 "./uninorm/composition-table.gperf"
+#line 518 "./uninorm/composition-table.gperf"
       {"\000\000T\000\003\007", 0x1e6a},
-#line 911 "./uninorm/composition-table.gperf"
+#line 920 "./uninorm/composition-table.gperf"
       {"\0000_\0000\231", 0x3060},
-#line 416 "./uninorm/composition-table.gperf"
+#line 425 "./uninorm/composition-table.gperf"
       {"\000\000d\000\003#", 0x1e0d},
-#line 878 "./uninorm/composition-table.gperf"
+#line 887 "./uninorm/composition-table.gperf"
       {"\000\"e\000\0038", 0x2271},
-#line 407 "./uninorm/composition-table.gperf"
+#line 416 "./uninorm/composition-table.gperf"
       {"\000\000B\000\003#", 0x1e04},
-#line 255 "./uninorm/composition-table.gperf"
+#line 264 "./uninorm/composition-table.gperf"
       {"\000\000R\000\003\017", 0x0210},
-#line 835 "./uninorm/composition-table.gperf"
+#line 844 "./uninorm/composition-table.gperf"
       {"\000\037\376\000\003\001", 0x1fde},
-#line 834 "./uninorm/composition-table.gperf"
+#line 843 "./uninorm/composition-table.gperf"
       {"\000\037\376\000\003\000", 0x1fdd},
-#line 836 "./uninorm/composition-table.gperf"
+#line 845 "./uninorm/composition-table.gperf"
       {"\000\037\376\000\003B", 0x1fdf},
-#line 265 "./uninorm/composition-table.gperf"
+#line 274 "./uninorm/composition-table.gperf"
       {"\000\000T\000\003&", 0x021a},
-#line 175 "./uninorm/composition-table.gperf"
+#line 184 "./uninorm/composition-table.gperf"
       {"\000\000U\000\003\012", 0x016e},
-#line 305 "./uninorm/composition-table.gperf"
+#line 314 "./uninorm/composition-table.gperf"
       {"\000\003\322\000\003\010", 0x03d4},
-#line 301 "./uninorm/composition-table.gperf"
+#line 310 "./uninorm/composition-table.gperf"
       {"\000\003\277\000\003\001", 0x03cc},
-#line 752 "./uninorm/composition-table.gperf"
+#line 761 "./uninorm/composition-table.gperf"
       {"\000\003\277\000\003\000", 0x1f78},
-#line 714 "./uninorm/composition-table.gperf"
+#line 723 "./uninorm/composition-table.gperf"
       {"\000\003\237\000\003\023", 0x1f48},
-#line 520 "./uninorm/composition-table.gperf"
+#line 529 "./uninorm/composition-table.gperf"
       {"\000\000u\000\0030", 0x1e75},
-#line 910 "./uninorm/composition-table.gperf"
+#line 919 "./uninorm/composition-table.gperf"
       {"\0000]\0000\231", 0x305e},
-#line 113 "./uninorm/composition-table.gperf"
+#line 122 "./uninorm/composition-table.gperf"
       {"\000\000g\000\003\006", 0x011f},
-#line 297 "./uninorm/composition-table.gperf"
+#line 306 "./uninorm/composition-table.gperf"
       {"\000\003\271\000\003\001", 0x03af},
-#line 751 "./uninorm/composition-table.gperf"
+#line 760 "./uninorm/composition-table.gperf"
       {"\000\003\271\000\003\000", 0x1f76},
-#line 829 "./uninorm/composition-table.gperf"
+#line 838 "./uninorm/composition-table.gperf"
       {"\000\003\271\000\003B", 0x1fd6},
-#line 439 "./uninorm/composition-table.gperf"
+#line 448 "./uninorm/composition-table.gperf"
       {"\000\000H\000\003#", 0x1e24},
-#line 824 "./uninorm/composition-table.gperf"
+#line 833 "./uninorm/composition-table.gperf"
       {"\000\037\277\000\003\001", 0x1fce},
-#line 823 "./uninorm/composition-table.gperf"
+#line 832 "./uninorm/composition-table.gperf"
       {"\000\037\277\000\003\000", 0x1fcd},
-#line 825 "./uninorm/composition-table.gperf"
+#line 834 "./uninorm/composition-table.gperf"
       {"\000\037\277\000\003B", 0x1fcf},
-#line 908 "./uninorm/composition-table.gperf"
+#line 917 "./uninorm/composition-table.gperf"
       {"\0000Y\0000\231", 0x305a},
-#line 310 "./uninorm/composition-table.gperf"
+#line 319 "./uninorm/composition-table.gperf"
       {"\000\004\032\000\003\001", 0x040c},
-#line 556 "./uninorm/composition-table.gperf"
+#line 565 "./uninorm/composition-table.gperf"
       {"\000\000y\000\003\012", 0x1e99},
-#line 876 "./uninorm/composition-table.gperf"
+#line 885 "./uninorm/composition-table.gperf"
       {"\000\000>\000\0038", 0x226f},
-#line 426 "./uninorm/composition-table.gperf"
+#line 435 "./uninorm/composition-table.gperf"
       {"\000\001\023\000\003\001", 0x1e17},
-#line 424 "./uninorm/composition-table.gperf"
+#line 433 "./uninorm/composition-table.gperf"
       {"\000\001\023\000\003\000", 0x1e15},
-#line 516 "./uninorm/composition-table.gperf"
+#line 525 "./uninorm/composition-table.gperf"
       {"\000\000t\000\003-", 0x1e71},
-#line 642 "./uninorm/composition-table.gperf"
+#line 651 "./uninorm/composition-table.gperf"
       {"\000\000Y\000\003#", 0x1ef4},
-#line 336 "./uninorm/composition-table.gperf"
+#line 345 "./uninorm/composition-table.gperf"
       {"\000\004\027\000\003\010", 0x04de},
-#line 767 "./uninorm/composition-table.gperf"
+#line 776 "./uninorm/composition-table.gperf"
       {"\000\037\014\000\003E", 0x1f8c},
-#line 553 "./uninorm/composition-table.gperf"
+#line 562 "./uninorm/composition-table.gperf"
       {"\000\000h\000\0031", 0x1e96},
-#line 932 "./uninorm/composition-table.gperf"
+#line 941 "./uninorm/composition-table.gperf"
       {"\0000\263\0000\231", 0x30b4},
-#line 155 "./uninorm/composition-table.gperf"
+#line 164 "./uninorm/composition-table.gperf"
       {"\000\000R\000\003\014", 0x0158},
-#line 947 "./uninorm/composition-table.gperf"
+#line 956 "./uninorm/composition-table.gperf"
       {"\0000\325\0000\231", 0x30d6},
-#line 770 "./uninorm/composition-table.gperf"
+#line 779 "./uninorm/composition-table.gperf"
       {"\000\037\017\000\003E", 0x1f8f},
-#line 258 "./uninorm/composition-table.gperf"
+#line 267 "./uninorm/composition-table.gperf"
       {"\000\000r\000\003\021", 0x0213},
-#line 296 "./uninorm/composition-table.gperf"
+#line 305 "./uninorm/composition-table.gperf"
       {"\000\003\267\000\003\001", 0x03ae},
-#line 750 "./uninorm/composition-table.gperf"
+#line 759 "./uninorm/composition-table.gperf"
       {"\000\003\267\000\003\000", 0x1f74},
-#line 818 "./uninorm/composition-table.gperf"
+#line 827 "./uninorm/composition-table.gperf"
       {"\000\003\267\000\003B", 0x1fc6},
-#line 271 "./uninorm/composition-table.gperf"
+#line 280 "./uninorm/composition-table.gperf"
       {"\000\000E\000\003'", 0x0228},
-#line 617 "./uninorm/composition-table.gperf"
+#line 626 "./uninorm/composition-table.gperf"
       {"\000\001\241\000\003\001", 0x1edb},
-#line 619 "./uninorm/composition-table.gperf"
+#line 628 "./uninorm/composition-table.gperf"
       {"\000\001\241\000\003\000", 0x1edd},
-#line 435 "./uninorm/composition-table.gperf"
+#line 444 "./uninorm/composition-table.gperf"
       {"\000\000G\000\003\004", 0x1e20},
-#line 915 "./uninorm/composition-table.gperf"
+#line 924 "./uninorm/composition-table.gperf"
       {"\0000h\0000\231", 0x3069},
-#line 429 "./uninorm/composition-table.gperf"
+#line 438 "./uninorm/composition-table.gperf"
       {"\000\000E\000\0030", 0x1e1a},
-#line 218 "./uninorm/composition-table.gperf"
+#line 227 "./uninorm/composition-table.gperf"
       {"\000\000G\000\003\014", 0x01e6},
-#line 299 "./uninorm/composition-table.gperf"
+#line 308 "./uninorm/composition-table.gperf"
       {"\000\003\271\000\003\010", 0x03ca},
-#line 948 "./uninorm/composition-table.gperf"
+#line 957 "./uninorm/composition-table.gperf"
       {"\0000\325\0000\232", 0x30d7},
-#line 816 "./uninorm/composition-table.gperf"
+#line 825 "./uninorm/composition-table.gperf"
       {"\000\003\267\000\003E", 0x1fc3},
-#line 951 "./uninorm/composition-table.gperf"
+#line 960 "./uninorm/composition-table.gperf"
       {"\0000\333\0000\231", 0x30dc},
-#line 440 "./uninorm/composition-table.gperf"
+#line 449 "./uninorm/composition-table.gperf"
       {"\000\000h\000\003#", 0x1e25},
-#line 470 "./uninorm/composition-table.gperf"
+#line 479 "./uninorm/composition-table.gperf"
       {"\000\000m\000\003#", 0x1e43},
-#line 478 "./uninorm/composition-table.gperf"
+#line 487 "./uninorm/composition-table.gperf"
       {"\000\000n\000\003-", 0x1e4b},
-#line 928 "./uninorm/composition-table.gperf"
+#line 937 "./uninorm/composition-table.gperf"
       {"\0000\253\0000\231", 0x30ac},
-#line 294 "./uninorm/composition-table.gperf"
+#line 303 "./uninorm/composition-table.gperf"
       {"\000\003\261\000\003\001", 0x03ac},
-#line 748 "./uninorm/composition-table.gperf"
+#line 757 "./uninorm/composition-table.gperf"
       {"\000\003\261\000\003\000", 0x1f70},
-#line 808 "./uninorm/composition-table.gperf"
+#line 817 "./uninorm/composition-table.gperf"
       {"\000\003\261\000\003B", 0x1fb6},
-#line 343 "./uninorm/composition-table.gperf"
+#line 352 "./uninorm/composition-table.gperf"
       {"\000\004>\000\003\010", 0x04e7},
-#line 284 "./uninorm/composition-table.gperf"
+#line 293 "./uninorm/composition-table.gperf"
       {"\000\003\221\000\003\001", 0x0386},
-#line 812 "./uninorm/composition-table.gperf"
+#line 821 "./uninorm/composition-table.gperf"
       {"\000\003\221\000\003\000", 0x1fba},
-#line 422 "./uninorm/composition-table.gperf"
+#line 431 "./uninorm/composition-table.gperf"
       {"\000\000d\000\003-", 0x1e13},
-#line 597 "./uninorm/composition-table.gperf"
+#line 606 "./uninorm/composition-table.gperf"
       {"\000\036\271\000\003\002", 0x1ec7},
-#line 769 "./uninorm/composition-table.gperf"
+#line 778 "./uninorm/composition-table.gperf"
       {"\000\037\016\000\003E", 0x1f8e},
-#line 952 "./uninorm/composition-table.gperf"
+#line 961 "./uninorm/composition-table.gperf"
       {"\0000\333\0000\232", 0x30dd},
-#line 353 "./uninorm/composition-table.gperf"
+#line 362 "./uninorm/composition-table.gperf"
       {"\000\004C\000\003\013", 0x04f3},
-#line 143 "./uninorm/composition-table.gperf"
+#line 152 "./uninorm/composition-table.gperf"
       {"\000\000N\000\003\014", 0x0147},
-#line 806 "./uninorm/composition-table.gperf"
+#line 815 "./uninorm/composition-table.gperf"
       {"\000\003\261\000\003E", 0x1fb3},
-#line 870 "./uninorm/composition-table.gperf"
+#line 879 "./uninorm/composition-table.gperf"
       {"\000\"E\000\0038", 0x2247},
-#line 708 "./uninorm/composition-table.gperf"
+#line 717 "./uninorm/composition-table.gperf"
       {"\000\003\277\000\003\023", 0x1f40},
-#line 497 "./uninorm/composition-table.gperf"
+#line 506 "./uninorm/composition-table.gperf"
       {"\000\000R\000\0031", 0x1e5e},
-#line 813 "./uninorm/composition-table.gperf"
+#line 822 "./uninorm/composition-table.gperf"
       {"\000\003\221\000\003E", 0x1fbc},
-#line 347 "./uninorm/composition-table.gperf"
+#line 356 "./uninorm/composition-table.gperf"
       {"\000\004M\000\003\010", 0x04ed},
-#line 715 "./uninorm/composition-table.gperf"
+#line 724 "./uninorm/composition-table.gperf"
       {"\000\003\237\000\003\024", 0x1f49},
-#line 158 "./uninorm/composition-table.gperf"
+#line 167 "./uninorm/composition-table.gperf"
       {"\000\000s\000\003\001", 0x015b},
-#line 692 "./uninorm/composition-table.gperf"
+#line 701 "./uninorm/composition-table.gperf"
       {"\000\003\271\000\003\023", 0x1f30},
-#line 826 "./uninorm/composition-table.gperf"
+#line 835 "./uninorm/composition-table.gperf"
       {"\000\003\271\000\003\006", 0x1fd0},
-#line 160 "./uninorm/composition-table.gperf"
+#line 169 "./uninorm/composition-table.gperf"
       {"\000\000s\000\003\002", 0x015d},
-#line 500 "./uninorm/composition-table.gperf"
+#line 509 "./uninorm/composition-table.gperf"
       {"\000\000s\000\003\007", 0x1e61},
-#line 968 "./uninorm/composition-table.gperf"
+#line 977 "./uninorm/composition-table.gperf"
       {"\001\024\271\001\024\275", 0x114be},
-#line 519 "./uninorm/composition-table.gperf"
+#line 528 "./uninorm/composition-table.gperf"
       {"\000\000U\000\0030", 0x1e74},
-#line 907 "./uninorm/composition-table.gperf"
+#line 916 "./uninorm/composition-table.gperf"
       {"\0000W\0000\231", 0x3058},
-#line 308 "./uninorm/composition-table.gperf"
+#line 317 "./uninorm/composition-table.gperf"
       {"\000\004\023\000\003\001", 0x0403},
-#line 436 "./uninorm/composition-table.gperf"
+#line 445 "./uninorm/composition-table.gperf"
       {"\000\000g\000\003\004", 0x1e21},
-#line 451 "./uninorm/composition-table.gperf"
+#line 460 "./uninorm/composition-table.gperf"
       {"\000\000K\000\003\001", 0x1e30},
-#line 761 "./uninorm/composition-table.gperf"
+#line 770 "./uninorm/composition-table.gperf"
       {"\000\037\006\000\003E", 0x1f86},
-#line 219 "./uninorm/composition-table.gperf"
+#line 228 "./uninorm/composition-table.gperf"
       {"\000\000g\000\003\014", 0x01e7},
-#line 264 "./uninorm/composition-table.gperf"
+#line 273 "./uninorm/composition-table.gperf"
       {"\000\000s\000\003&", 0x0219},
-#line 539 "./uninorm/composition-table.gperf"
+#line 548 "./uninorm/composition-table.gperf"
       {"\000\000W\000\003#", 0x1e88},
-#line 235 "./uninorm/composition-table.gperf"
+#line 244 "./uninorm/composition-table.gperf"
       {"\000\000\306\000\003\001", 0x01fc},
-#line 493 "./uninorm/composition-table.gperf"
+#line 502 "./uninorm/composition-table.gperf"
       {"\000\000R\000\003#", 0x1e5a},
-#line 571 "./uninorm/composition-table.gperf"
+#line 580 "./uninorm/composition-table.gperf"
       {"\000\036\241\000\003\002", 0x1ead},
-#line 302 "./uninorm/composition-table.gperf"
+#line 311 "./uninorm/composition-table.gperf"
       {"\000\003\305\000\003\001", 0x03cd},
-#line 753 "./uninorm/composition-table.gperf"
+#line 762 "./uninorm/composition-table.gperf"
       {"\000\003\305\000\003\000", 0x1f7a},
-#line 842 "./uninorm/composition-table.gperf"
+#line 851 "./uninorm/composition-table.gperf"
       {"\000\003\305\000\003B", 0x1fe6},
-#line 134 "./uninorm/composition-table.gperf"
+#line 143 "./uninorm/composition-table.gperf"
       {"\000\000l\000\003\001", 0x013a},
-#line 233 "./uninorm/composition-table.gperf"
+#line 242 "./uninorm/composition-table.gperf"
       {"\000\000\305\000\003\001", 0x01fa},
-#line 157 "./uninorm/composition-table.gperf"
+#line 166 "./uninorm/composition-table.gperf"
       {"\000\000S\000\003\001", 0x015a},
-#line 676 "./uninorm/composition-table.gperf"
+#line 685 "./uninorm/composition-table.gperf"
       {"\000\003\267\000\003\023", 0x1f20},
-#line 623 "./uninorm/composition-table.gperf"
+#line 632 "./uninorm/composition-table.gperf"
       {"\000\001\241\000\003\003", 0x1ee1},
-#line 159 "./uninorm/composition-table.gperf"
+#line 168 "./uninorm/composition-table.gperf"
       {"\000\000S\000\003\002", 0x015c},
-#line 499 "./uninorm/composition-table.gperf"
+#line 508 "./uninorm/composition-table.gperf"
       {"\000\000S\000\003\007", 0x1e60},
-#line 137 "./uninorm/composition-table.gperf"
+#line 146 "./uninorm/composition-table.gperf"
       {"\000\000L\000\003\014", 0x013d},
-#line 475 "./uninorm/composition-table.gperf"
+#line 484 "./uninorm/composition-table.gperf"
       {"\000\000N\000\0031", 0x1e48},
-#line 287 "./uninorm/composition-table.gperf"
+#line 296 "./uninorm/composition-table.gperf"
       {"\000\003\231\000\003\001", 0x038a},
-#line 833 "./uninorm/composition-table.gperf"
+#line 842 "./uninorm/composition-table.gperf"
       {"\000\003\231\000\003\000", 0x1fda},
-#line 503 "./uninorm/composition-table.gperf"
+#line 512 "./uninorm/composition-table.gperf"
       {"\000\001Z\000\003\007", 0x1e64},
-#line 819 "./uninorm/composition-table.gperf"
+#line 828 "./uninorm/composition-table.gperf"
       {"\000\037\306\000\003E", 0x1fc7},
-#line 186 "./uninorm/composition-table.gperf"
+#line 195 "./uninorm/composition-table.gperf"
       {"\000\000Z\000\003\001", 0x0179},
-#line 166 "./uninorm/composition-table.gperf"
+#line 175 "./uninorm/composition-table.gperf"
       {"\000\000t\000\003'", 0x0163},
-#line 263 "./uninorm/composition-table.gperf"
+#line 272 "./uninorm/composition-table.gperf"
       {"\000\000S\000\003&", 0x0218},
-#line 547 "./uninorm/composition-table.gperf"
+#line 556 "./uninorm/composition-table.gperf"
       {"\000\000Z\000\003\002", 0x1e90},
-#line 188 "./uninorm/composition-table.gperf"
+#line 197 "./uninorm/composition-table.gperf"
       {"\000\000Z\000\003\007", 0x017b},
-#line 799 "./uninorm/composition-table.gperf"
+#line 808 "./uninorm/composition-table.gperf"
       {"\000\037l\000\003E", 0x1fac},
       {""},
-#line 91 "./uninorm/composition-table.gperf"
+#line 100 "./uninorm/composition-table.gperf"
       {"\000\000c\000\003\001", 0x0107},
-#line 648 "./uninorm/composition-table.gperf"
+#line 657 "./uninorm/composition-table.gperf"
       {"\000\003\261\000\003\023", 0x1f00},
-#line 803 "./uninorm/composition-table.gperf"
+#line 812 "./uninorm/composition-table.gperf"
       {"\000\003\261\000\003\006", 0x1fb0},
-#line 93 "./uninorm/composition-table.gperf"
+#line 102 "./uninorm/composition-table.gperf"
       {"\000\000c\000\003\002", 0x0109},
-#line 95 "./uninorm/composition-table.gperf"
+#line 104 "./uninorm/composition-table.gperf"
       {"\000\000c\000\003\007", 0x010b},
-#line 656 "./uninorm/composition-table.gperf"
+#line 665 "./uninorm/composition-table.gperf"
       {"\000\003\221\000\003\023", 0x1f08},
-#line 810 "./uninorm/composition-table.gperf"
+#line 819 "./uninorm/composition-table.gperf"
       {"\000\003\221\000\003\006", 0x1fb8},
       {""},
-#line 473 "./uninorm/composition-table.gperf"
+#line 482 "./uninorm/composition-table.gperf"
       {"\000\000N\000\003#", 0x1e46},
-#line 154 "./uninorm/composition-table.gperf"
+#line 163 "./uninorm/composition-table.gperf"
       {"\000\000r\000\003'", 0x0157},
-#line 300 "./uninorm/composition-table.gperf"
+#line 309 "./uninorm/composition-table.gperf"
       {"\000\003\305\000\003\010", 0x03cb},
-#line 187 "./uninorm/composition-table.gperf"
+#line 196 "./uninorm/composition-table.gperf"
       {"\000\000z\000\003\001", 0x017a},
-#line 167 "./uninorm/composition-table.gperf"
+#line 176 "./uninorm/composition-table.gperf"
       {"\000\000T\000\003\014", 0x0164},
-#line 413 "./uninorm/composition-table.gperf"
+#line 422 "./uninorm/composition-table.gperf"
       {"\000\000D\000\003\007", 0x1e0a},
-#line 548 "./uninorm/composition-table.gperf"
+#line 557 "./uninorm/composition-table.gperf"
       {"\000\000z\000\003\002", 0x1e91},
-#line 189 "./uninorm/composition-table.gperf"
+#line 198 "./uninorm/composition-table.gperf"
       {"\000\000z\000\003\007", 0x017c},
       {""},
-#line 709 "./uninorm/composition-table.gperf"
+#line 718 "./uninorm/composition-table.gperf"
       {"\000\003\277\000\003\024", 0x1f41},
-#line 790 "./uninorm/composition-table.gperf"
+#line 799 "./uninorm/composition-table.gperf"
       {"\000\037c\000\003E", 0x1fa3},
-#line 540 "./uninorm/composition-table.gperf"
+#line 549 "./uninorm/composition-table.gperf"
       {"\000\000w\000\003#", 0x1e89},
-#line 142 "./uninorm/composition-table.gperf"
+#line 151 "./uninorm/composition-table.gperf"
       {"\000\000n\000\003'", 0x0146},
-#line 150 "./uninorm/composition-table.gperf"
+#line 159 "./uninorm/composition-table.gperf"
       {"\000\000o\000\003\013", 0x0151},
-#line 292 "./uninorm/composition-table.gperf"
+#line 301 "./uninorm/composition-table.gperf"
       {"\000\003\231\000\003\010", 0x03aa},
-#line 693 "./uninorm/composition-table.gperf"
+#line 702 "./uninorm/composition-table.gperf"
       {"\000\003\271\000\003\024", 0x1f31},
-#line 461 "./uninorm/composition-table.gperf"
+#line 470 "./uninorm/composition-table.gperf"
       {"\000\000L\000\0031", 0x1e3a},
       {""},
-#line 631 "./uninorm/composition-table.gperf"
+#line 640 "./uninorm/composition-table.gperf"
       {"\000\001\260\000\003\001", 0x1ee9},
-#line 633 "./uninorm/composition-table.gperf"
+#line 642 "./uninorm/composition-table.gperf"
       {"\000\001\260\000\003\000", 0x1eeb},
-#line 420 "./uninorm/composition-table.gperf"
+#line 429 "./uninorm/composition-table.gperf"
       {"\000\000d\000\003'", 0x1e11},
-#line 914 "./uninorm/composition-table.gperf"
+#line 923 "./uninorm/composition-table.gperf"
       {"\0000f\0000\231", 0x3067},
-#line 178 "./uninorm/composition-table.gperf"
+#line 187 "./uninorm/composition-table.gperf"
       {"\000\000u\000\003\013", 0x0171},
-#line 827 "./uninorm/composition-table.gperf"
+#line 836 "./uninorm/composition-table.gperf"
       {"\000\003\271\000\003\004", 0x1fd1},
-#line 257 "./uninorm/composition-table.gperf"
+#line 266 "./uninorm/composition-table.gperf"
       {"\000\000R\000\003\021", 0x0212},
-#line 616 "./uninorm/composition-table.gperf"
+#line 625 "./uninorm/composition-table.gperf"
       {"\000\001\240\000\003\001", 0x1eda},
-#line 618 "./uninorm/composition-table.gperf"
+#line 627 "./uninorm/composition-table.gperf"
       {"\000\001\240\000\003\000", 0x1edc},
-#line 581 "./uninorm/composition-table.gperf"
+#line 590 "./uninorm/composition-table.gperf"
       {"\000\036\241\000\003\006", 0x1eb7},
-#line 309 "./uninorm/composition-table.gperf"
+#line 318 "./uninorm/composition-table.gperf"
       {"\000\004\006\000\003\010", 0x0407},
-#line 879 "./uninorm/composition-table.gperf"
+#line 888 "./uninorm/composition-table.gperf"
       {"\000\"r\000\0038", 0x2274},
-#line 720 "./uninorm/composition-table.gperf"
+#line 729 "./uninorm/composition-table.gperf"
       {"\000\003\305\000\003\023", 0x1f50},
-#line 837 "./uninorm/composition-table.gperf"
+#line 846 "./uninorm/composition-table.gperf"
       {"\000\003\305\000\003\006", 0x1fe0},
-#line 630 "./uninorm/composition-table.gperf"
+#line 639 "./uninorm/composition-table.gperf"
       {"\000\001\257\000\003\001", 0x1ee8},
-#line 632 "./uninorm/composition-table.gperf"
+#line 641 "./uninorm/composition-table.gperf"
       {"\000\001\257\000\003\000", 0x1eea},
       {""},
-#line 621 "./uninorm/composition-table.gperf"
+#line 630 "./uninorm/composition-table.gperf"
       {"\000\001\241\000\003\011", 0x1edf},
-#line 457 "./uninorm/composition-table.gperf"
+#line 466 "./uninorm/composition-table.gperf"
       {"\000\000L\000\003#", 0x1e36},
-#line 508 "./uninorm/composition-table.gperf"
+#line 517 "./uninorm/composition-table.gperf"
       {"\000\036c\000\003\007", 0x1e69},
-#line 677 "./uninorm/composition-table.gperf"
+#line 686 "./uninorm/composition-table.gperf"
       {"\000\003\267\000\003\024", 0x1f21},
-#line 443 "./uninorm/composition-table.gperf"
+#line 452 "./uninorm/composition-table.gperf"
       {"\000\000H\000\003'", 0x1e28},
-#line 945 "./uninorm/composition-table.gperf"
+#line 954 "./uninorm/composition-table.gperf"
       {"\0000\322\0000\231", 0x30d3},
-#line 513 "./uninorm/composition-table.gperf"
+#line 522 "./uninorm/composition-table.gperf"
       {"\000\000T\000\0031", 0x1e6e},
-#line 700 "./uninorm/composition-table.gperf"
+#line 709 "./uninorm/composition-table.gperf"
       {"\000\003\231\000\003\023", 0x1f38},
-#line 831 "./uninorm/composition-table.gperf"
+#line 840 "./uninorm/composition-table.gperf"
       {"\000\003\231\000\003\006", 0x1fd8},
-#line 847 "./uninorm/composition-table.gperf"
+#line 856 "./uninorm/composition-table.gperf"
       {"\000\003\241\000\003\024", 0x1fec},
-#line 357 "./uninorm/composition-table.gperf"
+#line 366 "./uninorm/composition-table.gperf"
       {"\000\004K\000\003\010", 0x04f9},
-#line 865 "./uninorm/composition-table.gperf"
+#line 874 "./uninorm/composition-table.gperf"
       {"\000\"\013\000\0038", 0x220c},
-#line 226 "./uninorm/composition-table.gperf"
+#line 235 "./uninorm/composition-table.gperf"
       {"\000\001\267\000\003\014", 0x01ee},
-#line 877 "./uninorm/composition-table.gperf"
+#line 886 "./uninorm/composition-table.gperf"
       {"\000\"d\000\0038", 0x2270},
       {""},
-#line 902 "./uninorm/composition-table.gperf"
+#line 911 "./uninorm/composition-table.gperf"
       {"\0000M\0000\231", 0x304e},
-#line 406 "./uninorm/composition-table.gperf"
+#line 415 "./uninorm/composition-table.gperf"
       {"\000\000b\000\003\007", 0x1e03},
-#line 776 "./uninorm/composition-table.gperf"
+#line 785 "./uninorm/composition-table.gperf"
       {"\000\037%\000\003E", 0x1f95},
       {""},
-#line 946 "./uninorm/composition-table.gperf"
+#line 955 "./uninorm/composition-table.gperf"
       {"\0000\322\0000\232", 0x30d4},
-#line 385 "./uninorm/composition-table.gperf"
+#line 394 "./uninorm/composition-table.gperf"
       {"\000\015G\000\015>", 0x0d4b},
-#line 649 "./uninorm/composition-table.gperf"
+#line 658 "./uninorm/composition-table.gperf"
       {"\000\003\261\000\003\024", 0x1f01},
-#line 469 "./uninorm/composition-table.gperf"
+#line 478 "./uninorm/composition-table.gperf"
       {"\000\000M\000\003#", 0x1e42},
-#line 295 "./uninorm/composition-table.gperf"
+#line 304 "./uninorm/composition-table.gperf"
       {"\000\003\265\000\003\001", 0x03ad},
-#line 749 "./uninorm/composition-table.gperf"
+#line 758 "./uninorm/composition-table.gperf"
       {"\000\003\265\000\003\000", 0x1f72},
-#line 657 "./uninorm/composition-table.gperf"
+#line 666 "./uninorm/composition-table.gperf"
       {"\000\003\221\000\003\024", 0x1f09},
-#line 511 "./uninorm/composition-table.gperf"
+#line 520 "./uninorm/composition-table.gperf"
       {"\000\000T\000\003#", 0x1e6c},
-#line 966 "./uninorm/composition-table.gperf"
+#line 975 "./uninorm/composition-table.gperf"
       {"\001\024\271\001\024\272", 0x114bb},
-#line 477 "./uninorm/composition-table.gperf"
+#line 486 "./uninorm/composition-table.gperf"
       {"\000\000N\000\003-", 0x1e4a},
-#line 804 "./uninorm/composition-table.gperf"
+#line 813 "./uninorm/composition-table.gperf"
       {"\000\003\261\000\003\004", 0x1fb1},
-#line 789 "./uninorm/composition-table.gperf"
+#line 798 "./uninorm/composition-table.gperf"
       {"\000\037b\000\003E", 0x1fa2},
-#line 774 "./uninorm/composition-table.gperf"
+#line 783 "./uninorm/composition-table.gperf"
       {"\000\037#\000\003E", 0x1f93},
-#line 871 "./uninorm/composition-table.gperf"
+#line 880 "./uninorm/composition-table.gperf"
       {"\000\"H\000\0038", 0x2249},
-#line 811 "./uninorm/composition-table.gperf"
+#line 820 "./uninorm/composition-table.gperf"
       {"\000\003\221\000\003\004", 0x1fb9},
-#line 149 "./uninorm/composition-table.gperf"
+#line 158 "./uninorm/composition-table.gperf"
       {"\000\000O\000\003\013", 0x0150},
-#line 452 "./uninorm/composition-table.gperf"
+#line 461 "./uninorm/composition-table.gperf"
       {"\000\000k\000\003\001", 0x1e31},
-#line 786 "./uninorm/composition-table.gperf"
+#line 795 "./uninorm/composition-table.gperf"
       {"\000\037/\000\003E", 0x1f9f},
-#line 237 "./uninorm/composition-table.gperf"
+#line 246 "./uninorm/composition-table.gperf"
       {"\000\000\330\000\003\001", 0x01fe},
-#line 444 "./uninorm/composition-table.gperf"
+#line 453 "./uninorm/composition-table.gperf"
       {"\000\000h\000\003'", 0x1e29},
-#line 938 "./uninorm/composition-table.gperf"
+#line 947 "./uninorm/composition-table.gperf"
       {"\0000\277\0000\231", 0x30c0},
-#line 570 "./uninorm/composition-table.gperf"
+#line 579 "./uninorm/composition-table.gperf"
       {"\000\036\240\000\003\002", 0x1eac},
-#line 637 "./uninorm/composition-table.gperf"
+#line 646 "./uninorm/composition-table.gperf"
       {"\000\001\260\000\003\003", 0x1eef},
-#line 291 "./uninorm/composition-table.gperf"
+#line 300 "./uninorm/composition-table.gperf"
       {"\000\003\312\000\003\001", 0x0390},
-#line 828 "./uninorm/composition-table.gperf"
+#line 837 "./uninorm/composition-table.gperf"
       {"\000\003\312\000\003\000", 0x1fd2},
-#line 830 "./uninorm/composition-table.gperf"
+#line 839 "./uninorm/composition-table.gperf"
       {"\000\003\312\000\003B", 0x1fd7},
-#line 935 "./uninorm/composition-table.gperf"
+#line 944 "./uninorm/composition-table.gperf"
       {"\0000\271\0000\231", 0x30ba},
-#line 588 "./uninorm/composition-table.gperf"
+#line 597 "./uninorm/composition-table.gperf"
       {"\000\000\312\000\003\001", 0x1ebe},
-#line 590 "./uninorm/composition-table.gperf"
+#line 599 "./uninorm/composition-table.gperf"
       {"\000\000\312\000\003\000", 0x1ec0},
-#line 622 "./uninorm/composition-table.gperf"
+#line 631 "./uninorm/composition-table.gperf"
       {"\000\001\240\000\003\003", 0x1ee0},
-#line 840 "./uninorm/composition-table.gperf"
+#line 849 "./uninorm/composition-table.gperf"
       {"\000\003\301\000\003\023", 0x1fe4},
-#line 399 "./uninorm/composition-table.gperf"
+#line 408 "./uninorm/composition-table.gperf"
       {"\000\033<\000\0335", 0x1b3d},
-#line 164 "./uninorm/composition-table.gperf"
+#line 173 "./uninorm/composition-table.gperf"
       {"\000\000s\000\003\014", 0x0161},
-#line 555 "./uninorm/composition-table.gperf"
+#line 564 "./uninorm/composition-table.gperf"
       {"\000\000w\000\003\012", 0x1e98},
-#line 798 "./uninorm/composition-table.gperf"
+#line 807 "./uninorm/composition-table.gperf"
       {"\000\037k\000\003E", 0x1fab},
-#line 898 "./uninorm/composition-table.gperf"
+#line 907 "./uninorm/composition-table.gperf"
       {"\000\"\263\000\0038", 0x22eb},
-#line 636 "./uninorm/composition-table.gperf"
+#line 645 "./uninorm/composition-table.gperf"
       {"\000\001\257\000\003\003", 0x1eee},
-#line 177 "./uninorm/composition-table.gperf"
+#line 186 "./uninorm/composition-table.gperf"
       {"\000\000U\000\003\013", 0x0170},
-#line 507 "./uninorm/composition-table.gperf"
+#line 516 "./uninorm/composition-table.gperf"
       {"\000\036b\000\003\007", 0x1e68},
-#line 721 "./uninorm/composition-table.gperf"
+#line 730 "./uninorm/composition-table.gperf"
       {"\000\003\305\000\003\024", 0x1f51},
-#line 290 "./uninorm/composition-table.gperf"
+#line 299 "./uninorm/composition-table.gperf"
       {"\000\003\251\000\003\001", 0x038f},
-#line 855 "./uninorm/composition-table.gperf"
+#line 864 "./uninorm/composition-table.gperf"
       {"\000\003\251\000\003\000", 0x1ffa},
-#line 220 "./uninorm/composition-table.gperf"
+#line 229 "./uninorm/composition-table.gperf"
       {"\000\000K\000\003\014", 0x01e8},
-#line 526 "./uninorm/composition-table.gperf"
+#line 535 "./uninorm/composition-table.gperf"
       {"\000\001k\000\003\010", 0x1e7b},
-#line 216 "./uninorm/composition-table.gperf"
+#line 225 "./uninorm/composition-table.gperf"
       {"\000\000\306\000\003\004", 0x01e2},
-#line 463 "./uninorm/composition-table.gperf"
+#line 472 "./uninorm/composition-table.gperf"
       {"\000\000L\000\003-", 0x1e3c},
-#line 398 "./uninorm/composition-table.gperf"
+#line 407 "./uninorm/composition-table.gperf"
       {"\000\033:\000\0335", 0x1b3b},
-#line 838 "./uninorm/composition-table.gperf"
+#line 847 "./uninorm/composition-table.gperf"
       {"\000\003\305\000\003\004", 0x1fe1},
-#line 394 "./uninorm/composition-table.gperf"
+#line 403 "./uninorm/composition-table.gperf"
       {"\000\033\011\000\0335", 0x1b0a},
-#line 934 "./uninorm/composition-table.gperf"
+#line 943 "./uninorm/composition-table.gperf"
       {"\0000\267\0000\231", 0x30b8},
       {""},
-#line 701 "./uninorm/composition-table.gperf"
+#line 710 "./uninorm/composition-table.gperf"
       {"\000\003\231\000\003\024", 0x1f39},
-#line 856 "./uninorm/composition-table.gperf"
+#line 865 "./uninorm/composition-table.gperf"
       {"\000\003\251\000\003E", 0x1ffc},
-#line 138 "./uninorm/composition-table.gperf"
+#line 147 "./uninorm/composition-table.gperf"
       {"\000\000l\000\003\014", 0x013e},
-#line 542 "./uninorm/composition-table.gperf"
+#line 551 "./uninorm/composition-table.gperf"
       {"\000\000x\000\003\007", 0x1e8b},
-#line 163 "./uninorm/composition-table.gperf"
+#line 172 "./uninorm/composition-table.gperf"
       {"\000\000S\000\003\014", 0x0160},
-#line 625 "./uninorm/composition-table.gperf"
+#line 634 "./uninorm/composition-table.gperf"
       {"\000\001\241\000\003#", 0x1ee3},
-#line 892 "./uninorm/composition-table.gperf"
+#line 901 "./uninorm/composition-table.gperf"
       {"\000\"\253\000\0038", 0x22af},
-#line 153 "./uninorm/composition-table.gperf"
+#line 162 "./uninorm/composition-table.gperf"
       {"\000\000R\000\003'", 0x0156},
-#line 832 "./uninorm/composition-table.gperf"
+#line 841 "./uninorm/composition-table.gperf"
       {"\000\003\231\000\003\004", 0x1fd9},
-#line 704 "./uninorm/composition-table.gperf"
+#line 713 "./uninorm/composition-table.gperf"
       {"\000\0378\000\003\001", 0x1f3c},
-#line 702 "./uninorm/composition-table.gperf"
+#line 711 "./uninorm/composition-table.gperf"
       {"\000\0378\000\003\000", 0x1f3a},
-#line 706 "./uninorm/composition-table.gperf"
+#line 715 "./uninorm/composition-table.gperf"
       {"\000\0378\000\003B", 0x1f3e},
-#line 289 "./uninorm/composition-table.gperf"
+#line 298 "./uninorm/composition-table.gperf"
       {"\000\003\245\000\003\001", 0x038e},
-#line 846 "./uninorm/composition-table.gperf"
+#line 855 "./uninorm/composition-table.gperf"
       {"\000\003\245\000\003\000", 0x1fea},
-#line 664 "./uninorm/composition-table.gperf"
+#line 673 "./uninorm/composition-table.gperf"
       {"\000\003\265\000\003\023", 0x1f10},
-#line 190 "./uninorm/composition-table.gperf"
+#line 199 "./uninorm/composition-table.gperf"
       {"\000\000Z\000\003\014", 0x017d},
-#line 931 "./uninorm/composition-table.gperf"
+#line 940 "./uninorm/composition-table.gperf"
       {"\0000\261\0000\231", 0x30b2},
-#line 674 "./uninorm/composition-table.gperf"
+#line 683 "./uninorm/composition-table.gperf"
       {"\000\037\030\000\003\001", 0x1f1c},
-#line 672 "./uninorm/composition-table.gperf"
+#line 681 "./uninorm/composition-table.gperf"
       {"\000\037\030\000\003\000", 0x1f1a},
-#line 515 "./uninorm/composition-table.gperf"
+#line 524 "./uninorm/composition-table.gperf"
       {"\000\000T\000\003-", 0x1e70},
-#line 116 "./uninorm/composition-table.gperf"
+#line 125 "./uninorm/composition-table.gperf"
       {"\000\000G\000\003'", 0x0122},
-#line 504 "./uninorm/composition-table.gperf"
+#line 513 "./uninorm/composition-table.gperf"
       {"\000\001[\000\003\007", 0x1e65},
-#line 97 "./uninorm/composition-table.gperf"
+#line 106 "./uninorm/composition-table.gperf"
       {"\000\000c\000\003\014", 0x010d},
-#line 303 "./uninorm/composition-table.gperf"
+#line 312 "./uninorm/composition-table.gperf"
       {"\000\003\311\000\003\001", 0x03ce},
-#line 754 "./uninorm/composition-table.gperf"
+#line 763 "./uninorm/composition-table.gperf"
       {"\000\003\311\000\003\000", 0x1f7c},
-#line 852 "./uninorm/composition-table.gperf"
+#line 861 "./uninorm/composition-table.gperf"
       {"\000\003\311\000\003B", 0x1ff6},
-#line 393 "./uninorm/composition-table.gperf"
+#line 402 "./uninorm/composition-table.gperf"
       {"\000\033\007\000\0335", 0x1b08},
-#line 350 "./uninorm/composition-table.gperf"
+#line 359 "./uninorm/composition-table.gperf"
       {"\000\004#\000\003\010", 0x04f0},
-#line 455 "./uninorm/composition-table.gperf"
+#line 464 "./uninorm/composition-table.gperf"
       {"\000\000K\000\0031", 0x1e34},
-#line 580 "./uninorm/composition-table.gperf"
+#line 589 "./uninorm/composition-table.gperf"
       {"\000\036\240\000\003\006", 0x1eb6},
-#line 635 "./uninorm/composition-table.gperf"
+#line 644 "./uninorm/composition-table.gperf"
       {"\000\001\260\000\003\011", 0x1eed},
-#line 98 "./uninorm/composition-table.gperf"
+#line 107 "./uninorm/composition-table.gperf"
       {"\000\000D\000\003\014", 0x010e},
-#line 544 "./uninorm/composition-table.gperf"
+#line 553 "./uninorm/composition-table.gperf"
       {"\000\000x\000\003\010", 0x1e8d},
-#line 191 "./uninorm/composition-table.gperf"
+#line 200 "./uninorm/composition-table.gperf"
       {"\000\000z\000\003\014", 0x017e},
-#line 594 "./uninorm/composition-table.gperf"
+#line 603 "./uninorm/composition-table.gperf"
       {"\000\000\312\000\003\003", 0x1ec4},
-#line 850 "./uninorm/composition-table.gperf"
+#line 859 "./uninorm/composition-table.gperf"
       {"\000\003\311\000\003E", 0x1ff3},
-#line 449 "./uninorm/composition-table.gperf"
+#line 458 "./uninorm/composition-table.gperf"
       {"\000\000\317\000\003\001", 0x1e2e},
-#line 620 "./uninorm/composition-table.gperf"
+#line 629 "./uninorm/composition-table.gperf"
       {"\000\001\240\000\003\011", 0x1ede},
-#line 502 "./uninorm/composition-table.gperf"
+#line 511 "./uninorm/composition-table.gperf"
       {"\000\000s\000\003#", 0x1e63},
-#line 462 "./uninorm/composition-table.gperf"
+#line 471 "./uninorm/composition-table.gperf"
       {"\000\000l\000\0031", 0x1e3b},
-#line 141 "./uninorm/composition-table.gperf"
+#line 150 "./uninorm/composition-table.gperf"
       {"\000\000N\000\003'", 0x0145},
-#line 901 "./uninorm/composition-table.gperf"
+#line 910 "./uninorm/composition-table.gperf"
       {"\0000K\0000\231", 0x304c},
-#line 841 "./uninorm/composition-table.gperf"
+#line 850 "./uninorm/composition-table.gperf"
       {"\000\003\301\000\003\024", 0x1fe5},
-#line 527 "./uninorm/composition-table.gperf"
+#line 536 "./uninorm/composition-table.gperf"
       {"\000\000V\000\003\003", 0x1e7c},
-#line 634 "./uninorm/composition-table.gperf"
+#line 643 "./uninorm/composition-table.gperf"
       {"\000\001\257\000\003\011", 0x1eec},
-#line 293 "./uninorm/composition-table.gperf"
+#line 302 "./uninorm/composition-table.gperf"
       {"\000\003\245\000\003\010", 0x03ab},
-#line 941 "./uninorm/composition-table.gperf"
+#line 950 "./uninorm/composition-table.gperf"
       {"\0000\306\0000\231", 0x30c7},
-#line 359 "./uninorm/composition-table.gperf"
+#line 368 "./uninorm/composition-table.gperf"
       {"\000\006'\000\006T", 0x0623},
-#line 453 "./uninorm/composition-table.gperf"
+#line 462 "./uninorm/composition-table.gperf"
       {"\000\000K\000\003#", 0x1e32},
       {""},
-#line 740 "./uninorm/composition-table.gperf"
+#line 749 "./uninorm/composition-table.gperf"
       {"\000\003\251\000\003\023", 0x1f68},
-#line 332 "./uninorm/composition-table.gperf"
+#line 341 "./uninorm/composition-table.gperf"
       {"\000\004\330\000\003\010", 0x04da},
-#line 551 "./uninorm/composition-table.gperf"
+#line 560 "./uninorm/composition-table.gperf"
       {"\000\000Z\000\0031", 0x1e94},
-#line 495 "./uninorm/composition-table.gperf"
+#line 504 "./uninorm/composition-table.gperf"
       {"\000\036Z\000\003\004", 0x1e5c},
-#line 905 "./uninorm/composition-table.gperf"
+#line 914 "./uninorm/composition-table.gperf"
       {"\0000S\0000\231", 0x3054},
-#line 320 "./uninorm/composition-table.gperf"
+#line 329 "./uninorm/composition-table.gperf"
       {"\000\0048\000\003\000", 0x045d},
-#line 312 "./uninorm/composition-table.gperf"
+#line 321 "./uninorm/composition-table.gperf"
       {"\000\004#\000\003\006", 0x040e},
-#line 606 "./uninorm/composition-table.gperf"
+#line 615 "./uninorm/composition-table.gperf"
       {"\000\000\324\000\003\001", 0x1ed0},
-#line 608 "./uninorm/composition-table.gperf"
+#line 617 "./uninorm/composition-table.gperf"
       {"\000\000\324\000\003\000", 0x1ed2},
-#line 458 "./uninorm/composition-table.gperf"
+#line 467 "./uninorm/composition-table.gperf"
       {"\000\000l\000\003#", 0x1e37},
-#line 117 "./uninorm/composition-table.gperf"
+#line 126 "./uninorm/composition-table.gperf"
       {"\000\000g\000\003'", 0x0123},
-#line 501 "./uninorm/composition-table.gperf"
+#line 510 "./uninorm/composition-table.gperf"
       {"\000\000S\000\003#", 0x1e62},
-#line 518 "./uninorm/composition-table.gperf"
+#line 527 "./uninorm/composition-table.gperf"
       {"\000\000u\000\003$", 0x1e73},
-#line 311 "./uninorm/composition-table.gperf"
+#line 320 "./uninorm/composition-table.gperf"
       {"\000\004\030\000\003\000", 0x040d},
       {""},
-#line 589 "./uninorm/composition-table.gperf"
+#line 598 "./uninorm/composition-table.gperf"
       {"\000\000\352\000\003\001", 0x1ebf},
-#line 591 "./uninorm/composition-table.gperf"
+#line 600 "./uninorm/composition-table.gperf"
       {"\000\000\352\000\003\000", 0x1ec1},
       {""},
-#line 417 "./uninorm/composition-table.gperf"
+#line 426 "./uninorm/composition-table.gperf"
       {"\000\000D\000\0031", 0x1e0e},
-#line 318 "./uninorm/composition-table.gperf"
+#line 327 "./uninorm/composition-table.gperf"
       {"\000\004V\000\003\010", 0x0457},
-#line 552 "./uninorm/composition-table.gperf"
+#line 561 "./uninorm/composition-table.gperf"
       {"\000\000z\000\0031", 0x1e95},
-#line 369 "./uninorm/composition-table.gperf"
+#line 378 "./uninorm/composition-table.gperf"
       {"\000\011\307\000\011\276", 0x09cb},
-#line 549 "./uninorm/composition-table.gperf"
+#line 558 "./uninorm/composition-table.gperf"
       {"\000\000Z\000\003#", 0x1e92},
-#line 280 "./uninorm/composition-table.gperf"
+#line 289 "./uninorm/composition-table.gperf"
       {"\000\002/\000\003\004", 0x0231},
-#line 844 "./uninorm/composition-table.gperf"
+#line 853 "./uninorm/composition-table.gperf"
       {"\000\003\245\000\003\006", 0x1fe8},
-#line 963 "./uninorm/composition-table.gperf"
+#line 972 "./uninorm/composition-table.gperf"
       {"\001\0212\001\021'", 0x1112f},
-#line 135 "./uninorm/composition-table.gperf"
+#line 144 "./uninorm/composition-table.gperf"
       {"\000\000L\000\003'", 0x013b},
-#line 665 "./uninorm/composition-table.gperf"
+#line 674 "./uninorm/composition-table.gperf"
       {"\000\003\265\000\003\024", 0x1f11},
-#line 362 "./uninorm/composition-table.gperf"
+#line 371 "./uninorm/composition-table.gperf"
       {"\000\006J\000\006T", 0x0626},
-#line 882 "./uninorm/composition-table.gperf"
+#line 891 "./uninorm/composition-table.gperf"
       {"\000\"w\000\0038", 0x2279},
-#line 681 "./uninorm/composition-table.gperf"
+#line 690 "./uninorm/composition-table.gperf"
       {"\000\037!\000\003\001", 0x1f25},
-#line 679 "./uninorm/composition-table.gperf"
+#line 688 "./uninorm/composition-table.gperf"
       {"\000\037!\000\003\000", 0x1f23},
-#line 683 "./uninorm/composition-table.gperf"
+#line 692 "./uninorm/composition-table.gperf"
       {"\000\037!\000\003B", 0x1f27},
-#line 372 "./uninorm/composition-table.gperf"
+#line 381 "./uninorm/composition-table.gperf"
       {"\000\013G\000\013>", 0x0b4b},
-#line 732 "./uninorm/composition-table.gperf"
+#line 741 "./uninorm/composition-table.gperf"
       {"\000\003\311\000\003\023", 0x1f60},
-#line 286 "./uninorm/composition-table.gperf"
+#line 295 "./uninorm/composition-table.gperf"
       {"\000\003\227\000\003\001", 0x0389},
-#line 821 "./uninorm/composition-table.gperf"
+#line 830 "./uninorm/composition-table.gperf"
       {"\000\003\227\000\003\000", 0x1fca},
-#line 341 "./uninorm/composition-table.gperf"
+#line 350 "./uninorm/composition-table.gperf"
       {"\000\0048\000\003\010", 0x04e5},
-#line 415 "./uninorm/composition-table.gperf"
+#line 424 "./uninorm/composition-table.gperf"
       {"\000\000D\000\003#", 0x1e0c},
-#line 959 "./uninorm/composition-table.gperf"
+#line 968 "./uninorm/composition-table.gperf"
       {"\001\020\231\001\020\272", 0x1109a},
-#line 550 "./uninorm/composition-table.gperf"
+#line 559 "./uninorm/composition-table.gperf"
       {"\000\000z\000\003#", 0x1e93},
       {""},
-#line 772 "./uninorm/composition-table.gperf"
+#line 781 "./uninorm/composition-table.gperf"
       {"\000\037!\000\003E", 0x1f91},
-#line 592 "./uninorm/composition-table.gperf"
+#line 601 "./uninorm/composition-table.gperf"
       {"\000\000\312\000\003\011", 0x1ec2},
       {""},
-#line 340 "./uninorm/composition-table.gperf"
+#line 349 "./uninorm/composition-table.gperf"
       {"\000\004\030\000\003\010", 0x04e4},
-#line 392 "./uninorm/composition-table.gperf"
+#line 401 "./uninorm/composition-table.gperf"
       {"\000\033\005\000\0335", 0x1b06},
-#line 822 "./uninorm/composition-table.gperf"
+#line 831 "./uninorm/composition-table.gperf"
       {"\000\003\227\000\003E", 0x1fcc},
-#line 969 "./uninorm/composition-table.gperf"
+#line 978 "./uninorm/composition-table.gperf"
       {"\001\025\270\001\025\257", 0x115ba},
-#line 396 "./uninorm/composition-table.gperf"
+#line 405 "./uninorm/composition-table.gperf"
       {"\000\033\015\000\0335", 0x1b0e},
-#line 221 "./uninorm/composition-table.gperf"
+#line 230 "./uninorm/composition-table.gperf"
       {"\000\000k\000\003\014", 0x01e9},
-#line 165 "./uninorm/composition-table.gperf"
+#line 174 "./uninorm/composition-table.gperf"
       {"\000\000T\000\003'", 0x0162},
-#line 487 "./uninorm/composition-table.gperf"
+#line 496 "./uninorm/composition-table.gperf"
       {"\000\000P\000\003\001", 0x1e54},
-#line 401 "./uninorm/composition-table.gperf"
+#line 410 "./uninorm/composition-table.gperf"
       {"\000\033?\000\0335", 0x1b41},
       {""},
-#line 639 "./uninorm/composition-table.gperf"
+#line 648 "./uninorm/composition-table.gperf"
       {"\000\001\260\000\003#", 0x1ef1},
-#line 489 "./uninorm/composition-table.gperf"
+#line 498 "./uninorm/composition-table.gperf"
       {"\000\000P\000\003\007", 0x1e56},
-#line 939 "./uninorm/composition-table.gperf"
+#line 948 "./uninorm/composition-table.gperf"
       {"\0000\301\0000\231", 0x30c2},
-#line 724 "./uninorm/composition-table.gperf"
+#line 733 "./uninorm/composition-table.gperf"
       {"\000\037P\000\003\001", 0x1f54},
-#line 722 "./uninorm/composition-table.gperf"
+#line 731 "./uninorm/composition-table.gperf"
       {"\000\037P\000\003\000", 0x1f52},
-#line 726 "./uninorm/composition-table.gperf"
+#line 735 "./uninorm/composition-table.gperf"
       {"\000\037P\000\003B", 0x1f56},
       {""},
-#line 624 "./uninorm/composition-table.gperf"
+#line 633 "./uninorm/composition-table.gperf"
       {"\000\001\240\000\003#", 0x1ee2},
-#line 741 "./uninorm/composition-table.gperf"
+#line 750 "./uninorm/composition-table.gperf"
       {"\000\003\251\000\003\024", 0x1f69},
-#line 410 "./uninorm/composition-table.gperf"
+#line 419 "./uninorm/composition-table.gperf"
       {"\000\000b\000\0031", 0x1e07},
-#line 612 "./uninorm/composition-table.gperf"
+#line 621 "./uninorm/composition-table.gperf"
       {"\000\000\324\000\003\003", 0x1ed6},
-#line 314 "./uninorm/composition-table.gperf"
+#line 323 "./uninorm/composition-table.gperf"
       {"\000\0048\000\003\006", 0x0439},
-#line 859 "./uninorm/composition-table.gperf"
+#line 868 "./uninorm/composition-table.gperf"
       {"\000!\224\000\0038", 0x21ae},
-#line 930 "./uninorm/composition-table.gperf"
+#line 939 "./uninorm/composition-table.gperf"
       {"\0000\257\0000\231", 0x30b0},
-#line 638 "./uninorm/composition-table.gperf"
+#line 647 "./uninorm/composition-table.gperf"
       {"\000\001\257\000\003#", 0x1ef0},
-#line 505 "./uninorm/composition-table.gperf"
+#line 514 "./uninorm/composition-table.gperf"
       {"\000\001`\000\003\007", 0x1e66},
-#line 857 "./uninorm/composition-table.gperf"
+#line 866 "./uninorm/composition-table.gperf"
       {"\000!\220\000\0038", 0x219a},
-#line 464 "./uninorm/composition-table.gperf"
+#line 473 "./uninorm/composition-table.gperf"
       {"\000\000l\000\003-", 0x1e3d},
-#line 595 "./uninorm/composition-table.gperf"
+#line 604 "./uninorm/composition-table.gperf"
       {"\000\000\352\000\003\003", 0x1ec5},
-#line 313 "./uninorm/composition-table.gperf"
+#line 322 "./uninorm/composition-table.gperf"
       {"\000\004\030\000\003\006", 0x0419},
-#line 874 "./uninorm/composition-table.gperf"
+#line 883 "./uninorm/composition-table.gperf"
       {"\000\"M\000\0038", 0x226d},
-#line 348 "./uninorm/composition-table.gperf"
+#line 357 "./uninorm/composition-table.gperf"
       {"\000\004#\000\003\004", 0x04ee},
       {""},
-#line 736 "./uninorm/composition-table.gperf"
+#line 745 "./uninorm/composition-table.gperf"
       {"\000\037`\000\003\001", 0x1f64},
-#line 734 "./uninorm/composition-table.gperf"
+#line 743 "./uninorm/composition-table.gperf"
       {"\000\037`\000\003\000", 0x1f62},
-#line 738 "./uninorm/composition-table.gperf"
+#line 747 "./uninorm/composition-table.gperf"
       {"\000\037`\000\003B", 0x1f66},
-#line 517 "./uninorm/composition-table.gperf"
+#line 526 "./uninorm/composition-table.gperf"
       {"\000\000U\000\003$", 0x1e72},
-#line 607 "./uninorm/composition-table.gperf"
+#line 616 "./uninorm/composition-table.gperf"
       {"\000\000\364\000\003\001", 0x1ed1},
-#line 609 "./uninorm/composition-table.gperf"
+#line 618 "./uninorm/composition-table.gperf"
       {"\000\000\364\000\003\000", 0x1ed3},
-#line 408 "./uninorm/composition-table.gperf"
+#line 417 "./uninorm/composition-table.gperf"
       {"\000\000b\000\003#", 0x1e05},
-#line 858 "./uninorm/composition-table.gperf"
+#line 867 "./uninorm/composition-table.gperf"
       {"\000!\222\000\0038", 0x219b},
-#line 728 "./uninorm/composition-table.gperf"
+#line 737 "./uninorm/composition-table.gperf"
       {"\000\003\245\000\003\024", 0x1f59},
-#line 456 "./uninorm/composition-table.gperf"
+#line 465 "./uninorm/composition-table.gperf"
       {"\000\000k\000\0031", 0x1e35},
       {""},
-#line 373 "./uninorm/composition-table.gperf"
+#line 382 "./uninorm/composition-table.gperf"
       {"\000\013G\000\013W", 0x0b4c},
-#line 787 "./uninorm/composition-table.gperf"
+#line 796 "./uninorm/composition-table.gperf"
       {"\000\037`\000\003E", 0x1fa0},
       {""},
-#line 933 "./uninorm/composition-table.gperf"
+#line 942 "./uninorm/composition-table.gperf"
       {"\0000\265\0000\231", 0x30b6},
       {""},
-#line 845 "./uninorm/composition-table.gperf"
+#line 854 "./uninorm/composition-table.gperf"
       {"\000\003\245\000\003\004", 0x1fe9},
       {""},
-#line 684 "./uninorm/composition-table.gperf"
+#line 693 "./uninorm/composition-table.gperf"
       {"\000\003\227\000\003\023", 0x1f28},
-#line 733 "./uninorm/composition-table.gperf"
+#line 742 "./uninorm/composition-table.gperf"
       {"\000\003\311\000\003\024", 0x1f61},
-#line 860 "./uninorm/composition-table.gperf"
+#line 869 "./uninorm/composition-table.gperf"
       {"\000!\320\000\0038", 0x21cd},
-#line 378 "./uninorm/composition-table.gperf"
+#line 387 "./uninorm/composition-table.gperf"
       {"\000\014F\000\014V", 0x0c48},
       {""},
-#line 421 "./uninorm/composition-table.gperf"
+#line 430 "./uninorm/composition-table.gperf"
       {"\000\000D\000\003-", 0x1e12},
-#line 949 "./uninorm/composition-table.gperf"
+#line 958 "./uninorm/composition-table.gperf"
       {"\0000\330\0000\231", 0x30d9},
-#line 285 "./uninorm/composition-table.gperf"
+#line 294 "./uninorm/composition-table.gperf"
       {"\000\003\225\000\003\001", 0x0388},
-#line 820 "./uninorm/composition-table.gperf"
+#line 829 "./uninorm/composition-table.gperf"
       {"\000\003\225\000\003\000", 0x1fc8},
-#line 563 "./uninorm/composition-table.gperf"
+#line 572 "./uninorm/composition-table.gperf"
       {"\000\000\342\000\003\001", 0x1ea5},
-#line 565 "./uninorm/composition-table.gperf"
+#line 574 "./uninorm/composition-table.gperf"
       {"\000\000\342\000\003\000", 0x1ea7},
-#line 454 "./uninorm/composition-table.gperf"
+#line 463 "./uninorm/composition-table.gperf"
       {"\000\000k\000\003#", 0x1e33},
-#line 298 "./uninorm/composition-table.gperf"
+#line 307 "./uninorm/composition-table.gperf"
       {"\000\003\313\000\003\001", 0x03b0},
-#line 839 "./uninorm/composition-table.gperf"
+#line 848 "./uninorm/composition-table.gperf"
       {"\000\003\313\000\003\000", 0x1fe2},
-#line 843 "./uninorm/composition-table.gperf"
+#line 852 "./uninorm/composition-table.gperf"
       {"\000\003\313\000\003B", 0x1fe7},
-#line 562 "./uninorm/composition-table.gperf"
+#line 571 "./uninorm/composition-table.gperf"
       {"\000\000\302\000\003\001", 0x1ea4},
-#line 564 "./uninorm/composition-table.gperf"
+#line 573 "./uninorm/composition-table.gperf"
       {"\000\000\302\000\003\000", 0x1ea6},
-#line 283 "./uninorm/composition-table.gperf"
+#line 292 "./uninorm/composition-table.gperf"
       {"\000\000\250\000\003\001", 0x0385},
-#line 848 "./uninorm/composition-table.gperf"
+#line 857 "./uninorm/composition-table.gperf"
       {"\000\000\250\000\003\000", 0x1fed},
-#line 814 "./uninorm/composition-table.gperf"
+#line 823 "./uninorm/composition-table.gperf"
       {"\000\000\250\000\003B", 0x1fc1},
-#line 950 "./uninorm/composition-table.gperf"
+#line 959 "./uninorm/composition-table.gperf"
       {"\0000\330\0000\232", 0x30da},
-#line 725 "./uninorm/composition-table.gperf"
+#line 734 "./uninorm/composition-table.gperf"
       {"\000\037Q\000\003\001", 0x1f55},
-#line 723 "./uninorm/composition-table.gperf"
+#line 732 "./uninorm/composition-table.gperf"
       {"\000\037Q\000\003\000", 0x1f53},
-#line 727 "./uninorm/composition-table.gperf"
+#line 736 "./uninorm/composition-table.gperf"
       {"\000\037Q\000\003B", 0x1f57},
-#line 193 "./uninorm/composition-table.gperf"
+#line 202 "./uninorm/composition-table.gperf"
       {"\000\000o\000\003\033", 0x01a1},
-#line 488 "./uninorm/composition-table.gperf"
+#line 497 "./uninorm/composition-table.gperf"
       {"\000\000p\000\003\001", 0x1e55},
-#line 777 "./uninorm/composition-table.gperf"
+#line 786 "./uninorm/composition-table.gperf"
       {"\000\037&\000\003E", 0x1f96},
-#line 130 "./uninorm/composition-table.gperf"
+#line 139 "./uninorm/composition-table.gperf"
       {"\000\000j\000\003\002", 0x0135},
-#line 610 "./uninorm/composition-table.gperf"
+#line 619 "./uninorm/composition-table.gperf"
       {"\000\000\324\000\003\011", 0x1ed4},
-#line 490 "./uninorm/composition-table.gperf"
+#line 499 "./uninorm/composition-table.gperf"
       {"\000\000p\000\003\007", 0x1e57},
       {""},
-#line 529 "./uninorm/composition-table.gperf"
+#line 538 "./uninorm/composition-table.gperf"
       {"\000\000V\000\003#", 0x1e7e},
-#line 315 "./uninorm/composition-table.gperf"
+#line 324 "./uninorm/composition-table.gperf"
       {"\000\0045\000\003\000", 0x0450},
-#line 195 "./uninorm/composition-table.gperf"
+#line 204 "./uninorm/composition-table.gperf"
       {"\000\000u\000\003\033", 0x01b0},
-#line 404 "./uninorm/composition-table.gperf"
+#line 413 "./uninorm/composition-table.gperf"
       {"\000\000a\000\003%", 0x1e01},
       {""},
-#line 593 "./uninorm/composition-table.gperf"
+#line 602 "./uninorm/composition-table.gperf"
       {"\000\000\352\000\003\011", 0x1ec3},
-#line 162 "./uninorm/composition-table.gperf"
+#line 171 "./uninorm/composition-table.gperf"
       {"\000\000s\000\003'", 0x015f},
-#line 922 "./uninorm/composition-table.gperf"
+#line 931 "./uninorm/composition-table.gperf"
       {"\0000x\0000\231", 0x3079},
       {""},
-#line 339 "./uninorm/composition-table.gperf"
+#line 348 "./uninorm/composition-table.gperf"
       {"\000\0048\000\003\004", 0x04e3},
       {""},
-#line 797 "./uninorm/composition-table.gperf"
+#line 806 "./uninorm/composition-table.gperf"
       {"\000\037j\000\003E", 0x1faa},
-#line 805 "./uninorm/composition-table.gperf"
+#line 814 "./uninorm/composition-table.gperf"
       {"\000\037p\000\003E", 0x1fb2},
-#line 613 "./uninorm/composition-table.gperf"
+#line 622 "./uninorm/composition-table.gperf"
       {"\000\000\364\000\003\003", 0x1ed7},
-#line 224 "./uninorm/composition-table.gperf"
+#line 233 "./uninorm/composition-table.gperf"
       {"\000\001\352\000\003\004", 0x01ec},
       {""},
-#line 131 "./uninorm/composition-table.gperf"
+#line 140 "./uninorm/composition-table.gperf"
       {"\000\000K\000\003'", 0x0136},
-#line 338 "./uninorm/composition-table.gperf"
+#line 347 "./uninorm/composition-table.gperf"
       {"\000\004\030\000\003\004", 0x04e2},
       {""},
-#line 496 "./uninorm/composition-table.gperf"
+#line 505 "./uninorm/composition-table.gperf"
       {"\000\036[\000\003\004", 0x1e5d},
-#line 525 "./uninorm/composition-table.gperf"
+#line 534 "./uninorm/composition-table.gperf"
       {"\000\001j\000\003\010", 0x1e7a},
-#line 923 "./uninorm/composition-table.gperf"
+#line 932 "./uninorm/composition-table.gperf"
       {"\0000x\0000\232", 0x307a},
       {""},
-#line 895 "./uninorm/composition-table.gperf"
+#line 904 "./uninorm/composition-table.gperf"
       {"\000\"\221\000\0038", 0x22e2},
       {""}, {""}, {""},
-#line 136 "./uninorm/composition-table.gperf"
+#line 145 "./uninorm/composition-table.gperf"
       {"\000\000l\000\003'", 0x013c},
       {""},
-#line 161 "./uninorm/composition-table.gperf"
+#line 170 "./uninorm/composition-table.gperf"
       {"\000\000S\000\003'", 0x015e},
       {""},
-#line 909 "./uninorm/composition-table.gperf"
+#line 918 "./uninorm/composition-table.gperf"
       {"\0000[\0000\231", 0x305c},
-#line 685 "./uninorm/composition-table.gperf"
+#line 694 "./uninorm/composition-table.gperf"
       {"\000\003\227\000\003\024", 0x1f29},
-#line 316 "./uninorm/composition-table.gperf"
+#line 325 "./uninorm/composition-table.gperf"
       {"\000\0045\000\003\010", 0x0451},
-#line 880 "./uninorm/composition-table.gperf"
+#line 889 "./uninorm/composition-table.gperf"
       {"\000\"s\000\0038", 0x2275},
       {""},
-#line 569 "./uninorm/composition-table.gperf"
+#line 578 "./uninorm/composition-table.gperf"
       {"\000\000\342\000\003\003", 0x1eab},
-#line 670 "./uninorm/composition-table.gperf"
+#line 679 "./uninorm/composition-table.gperf"
       {"\000\003\225\000\003\023", 0x1f18},
-#line 680 "./uninorm/composition-table.gperf"
+#line 689 "./uninorm/composition-table.gperf"
       {"\000\037 \000\003\001", 0x1f24},
-#line 678 "./uninorm/composition-table.gperf"
+#line 687 "./uninorm/composition-table.gperf"
       {"\000\037 \000\003\000", 0x1f22},
-#line 682 "./uninorm/composition-table.gperf"
+#line 691 "./uninorm/composition-table.gperf"
       {"\000\037 \000\003B", 0x1f26},
       {""},
-#line 568 "./uninorm/composition-table.gperf"
+#line 577 "./uninorm/composition-table.gperf"
       {"\000\000\302\000\003\003", 0x1eaa},
       {""},
-#line 943 "./uninorm/composition-table.gperf"
+#line 952 "./uninorm/composition-table.gperf"
       {"\0000\317\0000\231", 0x30d0},
       {""}, {""},
-#line 63 "./uninorm/composition-table.gperf"
+#line 72 "./uninorm/composition-table.gperf"
       {"\000\000c\000\003'", 0x00e7},
-#line 961 "./uninorm/composition-table.gperf"
+#line 970 "./uninorm/composition-table.gperf"
       {"\001\020\245\001\020\272", 0x110ab},
-#line 192 "./uninorm/composition-table.gperf"
+#line 201 "./uninorm/composition-table.gperf"
       {"\000\000O\000\003\033", 0x01a0},
-#line 771 "./uninorm/composition-table.gperf"
+#line 780 "./uninorm/composition-table.gperf"
       {"\000\037 \000\003E", 0x1f90},
       {""},
-#line 397 "./uninorm/composition-table.gperf"
+#line 406 "./uninorm/composition-table.gperf"
       {"\000\033\021\000\0335", 0x1b12},
       {""}, {""},
-#line 395 "./uninorm/composition-table.gperf"
+#line 404 "./uninorm/composition-table.gperf"
       {"\000\033\013\000\0335", 0x1b0c},
-#line 419 "./uninorm/composition-table.gperf"
+#line 428 "./uninorm/composition-table.gperf"
       {"\000\000D\000\003'", 0x1e10},
       {""},
-#line 944 "./uninorm/composition-table.gperf"
+#line 953 "./uninorm/composition-table.gperf"
       {"\0000\317\0000\232", 0x30d1},
-#line 402 "./uninorm/composition-table.gperf"
+#line 411 "./uninorm/composition-table.gperf"
       {"\000\033B\000\0335", 0x1b43},
-#line 445 "./uninorm/composition-table.gperf"
+#line 454 "./uninorm/composition-table.gperf"
       {"\000\000H\000\003.", 0x1e2a},
       {""},
-#line 331 "./uninorm/composition-table.gperf"
+#line 340 "./uninorm/composition-table.gperf"
       {"\000\0045\000\003\006", 0x04d7},
       {""}, {""}, {""},
-#line 403 "./uninorm/composition-table.gperf"
+#line 412 "./uninorm/composition-table.gperf"
       {"\000\000A\000\003%", 0x1e00},
       {""},
-#line 962 "./uninorm/composition-table.gperf"
+#line 971 "./uninorm/composition-table.gperf"
       {"\001\0211\001\021'", 0x1112e},
-#line 374 "./uninorm/composition-table.gperf"
+#line 383 "./uninorm/composition-table.gperf"
       {"\000\013\222\000\013\327", 0x0b94},
       {""},
-#line 194 "./uninorm/composition-table.gperf"
+#line 203 "./uninorm/composition-table.gperf"
       {"\000\000U\000\003\033", 0x01af},
-#line 611 "./uninorm/composition-table.gperf"
+#line 620 "./uninorm/composition-table.gperf"
       {"\000\000\364\000\003\011", 0x1ed5},
       {""}, {""}, {""}, {""},
-#line 370 "./uninorm/composition-table.gperf"
+#line 379 "./uninorm/composition-table.gperf"
       {"\000\011\307\000\011\327", 0x09cc},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 883 "./uninorm/composition-table.gperf"
+#line 892 "./uninorm/composition-table.gperf"
       {"\000\"z\000\0038", 0x2280},
       {""},
-#line 379 "./uninorm/composition-table.gperf"
+#line 388 "./uninorm/composition-table.gperf"
       {"\000\014\277\000\014\325", 0x0cc0},
       {""}, {""}, {""}, {""}, {""},
-#line 446 "./uninorm/composition-table.gperf"
+#line 455 "./uninorm/composition-table.gperf"
       {"\000\000h\000\003.", 0x1e2b},
-#line 567 "./uninorm/composition-table.gperf"
+#line 576 "./uninorm/composition-table.gperf"
       {"\000\000\342\000\003\011", 0x1ea9},
       {""}, {""}, {""}, {""},
-#line 671 "./uninorm/composition-table.gperf"
+#line 680 "./uninorm/composition-table.gperf"
       {"\000\003\225\000\003\024", 0x1f19},
-#line 566 "./uninorm/composition-table.gperf"
+#line 575 "./uninorm/composition-table.gperf"
       {"\000\000\302\000\003\011", 0x1ea8},
-#line 214 "./uninorm/composition-table.gperf"
+#line 223 "./uninorm/composition-table.gperf"
       {"\000\002&\000\003\004", 0x01e0},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""},
-#line 387 "./uninorm/composition-table.gperf"
+#line 396 "./uninorm/composition-table.gperf"
       {"\000\015\331\000\015\312", 0x0dda},
-#line 867 "./uninorm/composition-table.gperf"
+#line 876 "./uninorm/composition-table.gperf"
       {"\000\"%\000\0038", 0x2226},
       {""}, {""}, {""}, {""}, {""}, {""},
-#line 358 "./uninorm/composition-table.gperf"
+#line 367 "./uninorm/composition-table.gperf"
       {"\000\006'\000\006S", 0x0622},
-#line 132 "./uninorm/composition-table.gperf"
+#line 141 "./uninorm/composition-table.gperf"
       {"\000\000k\000\003'", 0x0137},
       {""},
-#line 371 "./uninorm/composition-table.gperf"
+#line 380 "./uninorm/composition-table.gperf"
       {"\000\013G\000\013V", 0x0b48},
-#line 228 "./uninorm/composition-table.gperf"
+#line 237 "./uninorm/composition-table.gperf"
       {"\000\000j\000\003\014", 0x01f0},
-#line 376 "./uninorm/composition-table.gperf"
+#line 385 "./uninorm/composition-table.gperf"
       {"\000\013\307\000\013\276", 0x0bcb},
       {""},
-#line 866 "./uninorm/composition-table.gperf"
+#line 875 "./uninorm/composition-table.gperf"
       {"\000\"#\000\0038", 0x2224},
       {""},
-#line 964 "./uninorm/composition-table.gperf"
+#line 973 "./uninorm/composition-table.gperf"
       {"\001\023G\001\023>", 0x1134b},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""},
-#line 900 "./uninorm/composition-table.gperf"
+#line 909 "./uninorm/composition-table.gperf"
       {"\000\"\265\000\0038", 0x22ed},
-#line 360 "./uninorm/composition-table.gperf"
+#line 369 "./uninorm/composition-table.gperf"
       {"\000\006H\000\006T", 0x0624},
       {""}, {""}, {""},
-#line 389 "./uninorm/composition-table.gperf"
+#line 398 "./uninorm/composition-table.gperf"
       {"\000\015\334\000\015\312", 0x0ddd},
       {""}, {""},
-#line 381 "./uninorm/composition-table.gperf"
+#line 390 "./uninorm/composition-table.gperf"
       {"\000\014\306\000\014\326", 0x0cc8},
-#line 382 "./uninorm/composition-table.gperf"
+#line 391 "./uninorm/composition-table.gperf"
       {"\000\014\306\000\014\302", 0x0cca},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""},
-#line 380 "./uninorm/composition-table.gperf"
+#line 389 "./uninorm/composition-table.gperf"
       {"\000\014\306\000\014\325", 0x0cc7},
       {""}, {""}, {""},
-#line 904 "./uninorm/composition-table.gperf"
+#line 913 "./uninorm/composition-table.gperf"
       {"\0000Q\0000\231", 0x3052},
-#line 363 "./uninorm/composition-table.gperf"
+#line 372 "./uninorm/composition-table.gperf"
       {"\000\006\325\000\006T", 0x06c0},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""},
-#line 891 "./uninorm/composition-table.gperf"
+#line 900 "./uninorm/composition-table.gperf"
       {"\000\"\251\000\0038", 0x22ae},
       {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 965 "./uninorm/composition-table.gperf"
+#line 974 "./uninorm/composition-table.gperf"
       {"\001\023G\001\023W", 0x1134c},
-#line 967 "./uninorm/composition-table.gperf"
+#line 976 "./uninorm/composition-table.gperf"
       {"\001\024\271\001\024\260", 0x114bc},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 400 "./uninorm/composition-table.gperf"
+#line 409 "./uninorm/composition-table.gperf"
       {"\000\033>\000\0335", 0x1b40},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
@@ -2110,40 +2110,40 @@ gl_uninorm_compose_lookup (register const char *str, register unsigned int len)
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 383 "./uninorm/composition-table.gperf"
+#line 392 "./uninorm/composition-table.gperf"
       {"\000\014\312\000\014\325", 0x0ccb},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""},
-#line 352 "./uninorm/composition-table.gperf"
+#line 361 "./uninorm/composition-table.gperf"
       {"\000\004#\000\003\013", 0x04f2},
       {""}, {""}, {""}, {""}, {""},
-#line 365 "./uninorm/composition-table.gperf"
+#line 374 "./uninorm/composition-table.gperf"
       {"\000\006\322\000\006T", 0x06d3},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""},
-#line 970 "./uninorm/composition-table.gperf"
+#line 979 "./uninorm/composition-table.gperf"
       {"\001\025\271\001\025\257", 0x115bb},
       {""}, {""}, {""},
-#line 361 "./uninorm/composition-table.gperf"
+#line 370 "./uninorm/composition-table.gperf"
       {"\000\006'\000\006U", 0x0625},
       {""}, {""}, {""}, {""}, {""},
-#line 890 "./uninorm/composition-table.gperf"
+#line 899 "./uninorm/composition-table.gperf"
       {"\000\"\250\000\0038", 0x22ad},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""},
-#line 862 "./uninorm/composition-table.gperf"
+#line 871 "./uninorm/composition-table.gperf"
       {"\000!\322\000\0038", 0x21cf},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""},
-#line 375 "./uninorm/composition-table.gperf"
+#line 384 "./uninorm/composition-table.gperf"
       {"\000\013\306\000\013\276", 0x0bca},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
@@ -2151,11 +2151,11 @@ gl_uninorm_compose_lookup (register const char *str, register unsigned int len)
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""},
-#line 364 "./uninorm/composition-table.gperf"
+#line 373 "./uninorm/composition-table.gperf"
       {"\000\006\301\000\006T", 0x06c2},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 391 "./uninorm/composition-table.gperf"
+#line 400 "./uninorm/composition-table.gperf"
       {"\000\020%\000\020.", 0x1026},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
@@ -2170,7 +2170,7 @@ gl_uninorm_compose_lookup (register const char *str, register unsigned int len)
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 377 "./uninorm/composition-table.gperf"
+#line 386 "./uninorm/composition-table.gperf"
       {"\000\013\306\000\013\327", 0x0bcc},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
@@ -2182,7 +2182,7 @@ gl_uninorm_compose_lookup (register const char *str, register unsigned int len)
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
       {""}, {""}, {""},
-#line 861 "./uninorm/composition-table.gperf"
+#line 870 "./uninorm/composition-table.gperf"
       {"\000!\324\000\0038", 0x21ce}
     };
 
diff --git a/lib/uninorm/composition.c b/lib/uninorm/composition.c
index f98d698d..2ed8cb45 100644
--- a/lib/uninorm/composition.c
+++ b/lib/uninorm/composition.c
@@ -1,12 +1,21 @@
 /* Canonical composition of Unicode characters.
-   Copyright (C) 2002, 2006, 2009, 2011-2015 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2009, 2011-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/decompose-internal.c b/lib/uninorm/decompose-internal.c
index 78c1445e..dd306ee7 100644
--- a/lib/uninorm/decompose-internal.c
+++ b/lib/uninorm/decompose-internal.c
@@ -1,12 +1,21 @@
 /* Decomposition of Unicode strings.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/decompose-internal.h b/lib/uninorm/decompose-internal.h
index b8bc3539..f933ca9f 100644
--- a/lib/uninorm/decompose-internal.h
+++ b/lib/uninorm/decompose-internal.h
@@ -1,12 +1,21 @@
 /* Decomposition of Unicode strings.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/decomposing-form.c b/lib/uninorm/decomposing-form.c
index bd43541b..63df44c2 100644
--- a/lib/uninorm/decomposing-form.c
+++ b/lib/uninorm/decomposing-form.c
@@ -1,12 +1,21 @@
 /* Decomposing variant of a normalization form.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/decomposition-table.c b/lib/uninorm/decomposition-table.c
index e734f108..a77cff25 100644
--- a/lib/uninorm/decomposition-table.c
+++ b/lib/uninorm/decomposition-table.c
@@ -1,12 +1,21 @@
 /* Decomposition of Unicode characters.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/decomposition-table.h b/lib/uninorm/decomposition-table.h
index b0c981e4..8125c5f1 100644
--- a/lib/uninorm/decomposition-table.h
+++ b/lib/uninorm/decomposition-table.h
@@ -1,12 +1,21 @@
 /* Decomposition of Unicode characters.
-   Copyright (C) 2001-2003, 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/decomposition.c b/lib/uninorm/decomposition.c
index b448575d..a5646323 100644
--- a/lib/uninorm/decomposition.c
+++ b/lib/uninorm/decomposition.c
@@ -1,12 +1,21 @@
 /* Decomposition of Unicode characters.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/nfc.c b/lib/uninorm/nfc.c
index 20b49257..43afd7c7 100644
--- a/lib/uninorm/nfc.c
+++ b/lib/uninorm/nfc.c
@@ -1,12 +1,21 @@
 /* Unicode Normalization Form C.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/nfd.c b/lib/uninorm/nfd.c
index c6284e1a..6d8d5c46 100644
--- a/lib/uninorm/nfd.c
+++ b/lib/uninorm/nfd.c
@@ -1,12 +1,21 @@
 /* Unicode Normalization Form D.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/nfkc.c b/lib/uninorm/nfkc.c
index 61b6348a..41c4e0ca 100644
--- a/lib/uninorm/nfkc.c
+++ b/lib/uninorm/nfkc.c
@@ -1,12 +1,21 @@
 /* Unicode Normalization Form KC.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/nfkd.c b/lib/uninorm/nfkd.c
index bbb62f64..b3c6769c 100644
--- a/lib/uninorm/nfkd.c
+++ b/lib/uninorm/nfkd.c
@@ -1,12 +1,21 @@
 /* Unicode Normalization Form KD.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/normalize-internal.h b/lib/uninorm/normalize-internal.h
index b3f8ea32..48c49250 100644
--- a/lib/uninorm/normalize-internal.h
+++ b/lib/uninorm/normalize-internal.h
@@ -1,12 +1,21 @@
 /* Normalization of Unicode strings.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/u-normalize-internal.h b/lib/uninorm/u-normalize-internal.h
index 85ed843d..1feaeaf8 100644
--- a/lib/uninorm/u-normalize-internal.h
+++ b/lib/uninorm/u-normalize-internal.h
@@ -1,12 +1,21 @@
 /* Decomposition and composition of Unicode strings.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/u-normcmp.h b/lib/uninorm/u-normcmp.h
index fe0d2cbe..5c8cdf1a 100644
--- a/lib/uninorm/u-normcmp.h
+++ b/lib/uninorm/u-normcmp.h
@@ -1,12 +1,21 @@
 /* Normalization insensitive comparison of Unicode strings.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/u-normcoll.h b/lib/uninorm/u-normcoll.h
index 814444a7..dd6b1b99 100644
--- a/lib/uninorm/u-normcoll.h
+++ b/lib/uninorm/u-normcoll.h
@@ -1,12 +1,21 @@
 /* Locale dependent, normalization insensitive comparison of Unicode strings.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/u-normxfrm.h b/lib/uninorm/u-normxfrm.h
index 8f32a119..1ece64aa 100644
--- a/lib/uninorm/u-normxfrm.h
+++ b/lib/uninorm/u-normxfrm.h
@@ -1,12 +1,21 @@
 /* Locale dependent transformation for comparison of Unicode strings.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/u16-normalize.c b/lib/uninorm/u16-normalize.c
index 0ad14c0f..4e1d78a1 100644
--- a/lib/uninorm/u16-normalize.c
+++ b/lib/uninorm/u16-normalize.c
@@ -1,12 +1,21 @@
 /* Normalization of UTF-16 strings.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/u16-normcmp.c b/lib/uninorm/u16-normcmp.c
index b4488b13..1e67d5f5 100644
--- a/lib/uninorm/u16-normcmp.c
+++ b/lib/uninorm/u16-normcmp.c
@@ -1,12 +1,21 @@
 /* Normalization insensitive comparison of UTF-16 strings.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/u16-normcoll.c b/lib/uninorm/u16-normcoll.c
index 3fc07eee..983a538d 100644
--- a/lib/uninorm/u16-normcoll.c
+++ b/lib/uninorm/u16-normcoll.c
@@ -1,12 +1,21 @@
 /* Locale dependent, normalization insensitive comparison of UTF-16 strings.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/u16-normxfrm.c b/lib/uninorm/u16-normxfrm.c
index 6d685590..dfc770a2 100644
--- a/lib/uninorm/u16-normxfrm.c
+++ b/lib/uninorm/u16-normxfrm.c
@@ -1,12 +1,21 @@
 /* Locale dependent transformation for comparison of UTF-16 strings.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/u32-normalize.c b/lib/uninorm/u32-normalize.c
index 843a3867..9d7aff28 100644
--- a/lib/uninorm/u32-normalize.c
+++ b/lib/uninorm/u32-normalize.c
@@ -1,12 +1,21 @@
 /* Normalization of UTF-32 strings.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/u32-normcmp.c b/lib/uninorm/u32-normcmp.c
index d9e1a732..674880fa 100644
--- a/lib/uninorm/u32-normcmp.c
+++ b/lib/uninorm/u32-normcmp.c
@@ -1,12 +1,21 @@
 /* Normalization insensitive comparison of UTF-32 strings.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/u32-normcoll.c b/lib/uninorm/u32-normcoll.c
index 124054f3..2f47c41a 100644
--- a/lib/uninorm/u32-normcoll.c
+++ b/lib/uninorm/u32-normcoll.c
@@ -1,12 +1,21 @@
 /* Locale dependent, normalization insensitive comparison of UTF-32 strings.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/u32-normxfrm.c b/lib/uninorm/u32-normxfrm.c
index ca38e16f..1bcfae19 100644
--- a/lib/uninorm/u32-normxfrm.c
+++ b/lib/uninorm/u32-normxfrm.c
@@ -1,12 +1,21 @@
 /* Locale dependent transformation for comparison of UTF-32 strings.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/u8-normalize.c b/lib/uninorm/u8-normalize.c
index cb245058..eeceaf4e 100644
--- a/lib/uninorm/u8-normalize.c
+++ b/lib/uninorm/u8-normalize.c
@@ -1,12 +1,21 @@
 /* Normalization of UTF-8 strings.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/u8-normcmp.c b/lib/uninorm/u8-normcmp.c
index f6dda41e..5389cfa9 100644
--- a/lib/uninorm/u8-normcmp.c
+++ b/lib/uninorm/u8-normcmp.c
@@ -1,12 +1,21 @@
 /* Normalization insensitive comparison of UTF-8 strings.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/u8-normcoll.c b/lib/uninorm/u8-normcoll.c
index ca15dcb6..fc6ceea4 100644
--- a/lib/uninorm/u8-normcoll.c
+++ b/lib/uninorm/u8-normcoll.c
@@ -1,12 +1,21 @@
 /* Locale dependent, normalization insensitive comparison of UTF-8 strings.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/u8-normxfrm.c b/lib/uninorm/u8-normxfrm.c
index 7a62d0fb..ecc45a54 100644
--- a/lib/uninorm/u8-normxfrm.c
+++ b/lib/uninorm/u8-normxfrm.c
@@ -1,12 +1,21 @@
 /* Locale dependent transformation for comparison of UTF-8 strings.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
diff --git a/lib/uninorm/uninorm-filter.c b/lib/uninorm/uninorm-filter.c
index 4adfa789..c6db051e 100644
--- a/lib/uninorm/uninorm-filter.c
+++ b/lib/uninorm/uninorm-filter.c
@@ -1,12 +1,21 @@
 /* Stream-based normalization of Unicode strings.
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser 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 free software: you can redistribute it and/or
+   modify it under the terms of either:
 
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at your
+       option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
+
+   or both in parallel, as here.
    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
author	Jörg Frings-Fürst <debian@jff-webhosting.net>	2017-03-27 21:41:36 +0200
committer	Jörg Frings-Fürst <debian@jff-webhosting.net>	2017-03-27 21:41:36 +0200
commit	6b73edd95d603e27d55d4905134ac1327d426534 (patch)
tree	e0b9334e2637f17696c796ac13b2c39294bf9233 /lib/uninorm
parent	0250cb64565a7d5238bbc751225d4b0236ef8316 (diff)