From b4466fdf5c1d982f3ac740ea01fe77ac3d9ff8e5 Mon Sep 17 00:00:00 2001 From: Ritt Konstantin Date: Wed, 24 Feb 2010 20:13:50 +0100 Subject: finish last commit don't skip non-starters in composition exclusions code; warn & exit instead Merge-request: 480 Reviewed-by: Thiago Macieira --- util/unicode/main.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/util/unicode/main.cpp b/util/unicode/main.cpp index c5d04c0..5a2f45e 100644 --- a/util/unicode/main.cpp +++ b/util/unicode/main.cpp @@ -1004,9 +1004,10 @@ static void readDerivedNormalizationProps() uint part1 = d.decomposition.at(0); uint part2 = d.decomposition.at(1); - UnicodeData first = unicodeData.value(part1, UnicodeData(part1)); - if (first.p.combiningClass != 0) - continue; + + // all non-starters are listed in DerivedNormalizationProps.txt + // and already excluded from composition + Q_ASSERT(unicodeData.value(part1, UnicodeData(part1)).p.combiningClass == 0); ++numLigatures; highestLigature = qMax(highestLigature, (int)part1); -- cgit v0.12