summaryrefslogtreecommitdiff
path: root/lib/uninorm/composition.c
diff options
context:
space:
mode:
authorManuel A. Fernandez Montecelo <manuel.montezelo@gmail.com>2016-05-27 14:35:40 +0100
committerManuel A. Fernandez Montecelo <manuel.montezelo@gmail.com>2016-05-27 14:35:40 +0100
commitb1de003dac299705a7f01c997d2b866bafe39926 (patch)
tree1cc16a3877e945116387a380f7f3023f81fa36e4 /lib/uninorm/composition.c
parent752fd7247bc223bcea35bd89cf56d1c08ead9ba6 (diff)
parent3590c846d4c2febbc05b4ad6b14a06edc549e453 (diff)
Merge tag 'upstream/0.9.6+really0.9.6'
Upstream version 0.9.6+really0.9.6
Diffstat (limited to 'lib/uninorm/composition.c')
-rw-r--r--lib/uninorm/composition.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/lib/uninorm/composition.c b/lib/uninorm/composition.c
index c9cddbe..f98d698 100644
--- a/lib/uninorm/composition.c
+++ b/lib/uninorm/composition.c
@@ -1,5 +1,5 @@
/* Canonical composition of Unicode characters.
- Copyright (C) 2002, 2006, 2009-2010 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2006, 2009, 2011-2015 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
@@ -22,14 +22,14 @@
#include <string.h>
-struct composition_rule { char codes[4]; unsigned short combined; };
+struct composition_rule { char codes[6]; unsigned int combined; };
#include "composition-table.h"
ucs4_t
uc_composition (ucs4_t uc1, ucs4_t uc2)
{
- if (uc1 < 0x10000 && uc2 < 0x10000)
+ if (uc1 < 0x12000 && uc2 < 0x12000)
{
if (uc2 >= 0x1161 && uc2 < 0x1161 + 21
&& uc1 >= 0x1100 && uc1 < 0x1100 + 19)
@@ -67,15 +67,17 @@ uc_composition (ucs4_t uc1, ucs4_t uc2)
}
}
#else
- char codes[4];
+ char codes[6];
const struct composition_rule *rule;
- codes[0] = (uc1 >> 8) & 0xff;
- codes[1] = uc1 & 0xff;
- codes[2] = (uc2 >> 8) & 0xff;
- codes[3] = uc2 & 0xff;
+ codes[0] = (uc1 >> 16) & 0xff;
+ codes[1] = (uc1 >> 8) & 0xff;
+ codes[2] = uc1 & 0xff;
+ codes[3] = (uc2 >> 16) & 0xff;
+ codes[4] = (uc2 >> 8) & 0xff;
+ codes[5] = uc2 & 0xff;
- rule = gl_uninorm_compose_lookup (codes, 4);
+ rule = gl_uninorm_compose_lookup (codes, 6);
if (rule != NULL)
return rule->combined;
#endif