Fix aliases adding and Android set rendering.

Author: john-preston

codegen/emoji/data.cpp

@@ -123,6 +123,7 @@ std::map<InputId, InputId> FlagAliases = {
 };
 
 std::map<Id, std::vector<Id>> Aliases; // original -> list of aliased
+std::set<Id> AliasesAdded;
 
 void AddAlias(const Id &original, const Id &aliased) {
 	auto &aliases = Aliases[original];
@@ -211,14 +212,16 @@ void append(Id &id, uint32 code) {
 				return {};
 			}
 			for (const auto color : Colors) {
-				auto sameWithColor = BareIdFromInput(same);
-				sameWithColor[1] = color;
-				auto differentWithColor = BareIdFromInput(different);
-				for (auto &entry : differentWithColor) {
+				auto copy = same;
+				copy[1] = color;
+				auto sameWithColor = BareIdFromInput(copy);
+				copy = different;
+				for (auto &entry : copy) {
 					if (entry == Colors[0] || entry == Colors[1]) {
 						entry = color;
 					}
 				}
+				auto differentWithColor = BareIdFromInput(copy);
 				AddAlias(sameWithColor, differentWithColor);
 			}
 		} else {
@@ -238,14 +241,16 @@ void append(Id &id, uint32 code) {
 				// original: 1
 				// add an alias to 'same' in the form of 'original + color'
 				for (const auto color : Colors) {
-					auto originalWithColor = BareIdFromInput(original);
-					originalWithColor.push_back(color);
-					auto sameWithColor = BareIdFromInput(same);
-					for (auto &entry : sameWithColor) {
+					auto copy = original;
+					copy.push_back(color);
+					auto originalWithColor = BareIdFromInput(copy);
+					copy = same;
+					for (auto &entry : copy) {
 						if (entry == ColorMask) {
 							entry = color;
 						}
 					}
+					auto sameWithColor = BareIdFromInput(copy);
 					AddAlias(originalWithColor, sameWithColor);
 				}
 			}
@@ -301,6 +306,7 @@ void appendCategory(
 				it = result.map.emplace(bareId, index).first;
 				result.list.push_back(move(emoji));
 				if (const auto a = Aliases.find(bareId); a != end(Aliases)) {
+					AliasesAdded.emplace(bareId);
 					for (const auto &alias : a->second) {
 						const auto ok = result.map.emplace(alias, index).second;
 						if (!ok) {
@@ -365,6 +371,7 @@ void appendCategory(
 		} else if (const auto d = doubleVariatedIds.find(bareId); d != end(doubleVariatedIds)) {
 			//result.list[it->second].doubleVariated = true;
 
+			const auto baseId = bareId;
 			const auto &different = d->second;
 			if (different.size() < 4
 				|| different[1] != Colors[0]
@@ -377,18 +384,18 @@ void appendCategory(
 				for (auto color2 : Colors) {
 					auto colored = Emoji();
 					//colored.colored = true;
-					// We filled those as aliases were applicable.
-//					if (color1 == color2) {
-//						colored.id = baseId;
-//						append(colored.id, color1);
-//					} else {
-					auto copy = different;
-					copy[1] = color1;
-					copy[copy.size() - 1] = color2;
-					for (const auto code : copy) {
-						append(colored.id, code);
+					if (color1 == color2 && baseId.size() == 2) {
+						colored.id = baseId;
+						append(colored.id, color1);
+					} else {
+						auto copy = different;
+						copy[1] = color1;
+						copy[copy.size() - 1] = color2;
+						for (const auto code : copy) {
+							append(colored.id, code);
+						}
 					}
-					auto bareColoredId = BareIdFromInput(copy);
+					auto bareColoredId = colored.id.replace(QChar(kPostfix), QString());
 					if (addOne(bareColoredId, move(colored)) == result.map.end()) {
 						return;
 					}
@@ -711,6 +718,20 @@ Data PrepareData(const QString &dataPath, const std::vector<QString> &oldDataPat
 	if (result.list.empty()) {
 		return Data();
 	}
+	if (AliasesAdded.size() != Aliases.size()) {
+		for (const auto &[key, list] : Aliases) {
+			if (AliasesAdded.find(key) == AliasesAdded.end()) {
+				QStringList expanded;
+				for (const auto ch : key) {
+					expanded.push_back(QString::number(ch.unicode()));
+				}
+				common::logError(kErrorBadData, "input")
+					<< "Bad data: Not added aliases list for: "
+					<< expanded.join(QChar(',')).toStdString();
+			}
+		}
+		return Data();
+	}
 
 	fillReplaces(result);
 	if (result.list.empty()) {

codegen/emoji/generator.cpp

@@ -46,11 +46,17 @@ QRect computeSourceRect(const QImage &image) {
 	auto top = 1, bottom = 1, left = 1, right = 1;
 	auto rgbBits = reinterpret_cast<const QRgb*>(image.constBits());
 	for (auto i = 0; i != size; ++i) {
-		if (rgbBits[i] > 0
-			|| rgbBits[(size - 1) * size + i] > 0
-			|| rgbBits[i * size] > 0
-			|| rgbBits[i * size + (size - 1)] > 0) {
-			logDataError() << "Bad border.";
+		if (rgbBits[i] > 0) {
+			logDataError() << "Bad top border.";
+			return QRect();
+		} else if (rgbBits[(size - 1) * size + i] > 0) {
+			logDataError() << "Bad bottom border.";
+			return QRect();
+		} else if (rgbBits[i * size] > 0) {
+			logDataError() << "Bad left border.";
+			return QRect();
+		} else if (rgbBits[i * size + (size - 1)] > 0) {
+			logDataError() << "Bad right border.";
 			return QRect();
 		}
 		if (rgbBits[1 * size + i] > 0) {
@@ -186,15 +192,15 @@ constexpr auto kEmojiRowsInFile = 16;
 constexpr auto kEmojiQuality = 99;
 constexpr auto kEmojiSize = 72;
 constexpr auto kEmojiFontSize = 72;
-constexpr auto kEmojiDelta = 67 - 4;
+constexpr auto kEmojiShiftTop = 67 - 4;
 constexpr auto kScaleFromLarge = true;
 constexpr auto kLargeEmojiSize = 180;
 constexpr auto kLargeEmojiFontSizeMac = 180;
-constexpr auto kLargeEmojiDeltaMac = 167 - 9;
-constexpr auto kEmojiShiftMac = 0;
+constexpr auto kLargeEmojiShiftTopMac = 167 - 9;
+constexpr auto kEmojiShiftLeftMac = 0;
 constexpr auto kLargeEmojiFontSizeAndroid = 178;
-constexpr auto kLargeEmojiDeltaAndroid = 140;
-constexpr auto kEmojiShiftAndroid = -4;
+constexpr auto kLargeEmojiShiftTopAndroid = 140;
+constexpr auto kEmojiShiftLeftAndroid = -4;
 
 enum class ImageType {
 	Mac,
@@ -220,15 +226,23 @@ bool PaintSingleFromFont(QPainter &p, QRect targetRect, const Emoji &data, QFont
 		QPainter q(&singleImage);
 		q.setPen(QColor(0, 0, 0, 255));
 		q.setFont(font);
-		const auto delta = !kScaleFromLarge
-			? kEmojiDelta
+		const auto shiftTop = !kScaleFromLarge
+			? kEmojiShiftTop
 			: (type == ImageType::Mac)
-			? kLargeEmojiDeltaMac
-			: kLargeEmojiDeltaAndroid;
-		const auto shift = (type == ImageType::Mac)
-			? kEmojiShiftMac
-			: kEmojiShiftAndroid;
-		q.drawText(2 + shift, 2 + delta, data.id);
+			? kLargeEmojiShiftTopMac
+			: kLargeEmojiShiftTopAndroid;
+		const auto shiftLeft = (type == ImageType::Mac)
+			? kEmojiShiftLeftMac
+			: kEmojiShiftLeftAndroid;
+		auto text = data.id;
+		if (type == ImageType::Android) {
+			if (text.size() > 2 && text.indexOf(QChar(0xFE0F)) >= 0) {
+				// Some emoji, like "Kiss: Person, Person, Light Skin Tone, Medium Skin Tone",
+				// aren't rendered correctly if string still contains 0xFE0F-s from Apple.
+				text = text.replace(QChar(0xFE0F), QString());
+			}
+		}
+		q.drawText(2 + shiftLeft, 2 + shiftTop, text);
 	}
 	auto sourceRect = computeSourceRect(singleImage);
 	if (sourceRect.isEmpty()) {

codegen/emoji/replaces.cpp

@@ -294,6 +294,9 @@ Replaces PrepareReplaces(const QString &filename) {
 }
 
 bool CheckAndConvertReplaces(Replaces &replaces, const Data &data) {
+	if (data.map.empty()) {
+		return false;
+	}
 	auto result = Replaces(replaces.filename);
 	auto sorted = QMultiMap<Id, Replace>();
 	auto findId = [&](const Id &id) {