From 1e737abaaedbc98b960d3b9d96d77b9403d635c1 Mon Sep 17 00:00:00 2001
From: Abs62 <ottomann@yandex.ru>
Date: Fri, 23 Feb 2024 14:47:55 +0300
Subject: [PATCH] =?UTF-8?q?Add=20belarus=20letter=20pairs=20"=D0=8E=D1=9E/?=
 =?UTF-8?q?=D0=A3=D1=83"=20to=20diacritic=20handler=20(dictionaries=20rein?=
 =?UTF-8?q?dexing=20will=20follow)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 folding.hh                      | 2 +-
 ftshelpers.hh                   | 2 +-
 generators/DiacriticFolding.txt | 2 ++
 inc_diacritic_folding.hh        | 4 ++++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/folding.hh b/folding.hh
index 381573f68..c92821284 100644
--- a/folding.hh
+++ b/folding.hh
@@ -24,7 +24,7 @@ using gd::wchar;
 /// The algorithm's version.
 enum
 {
-  Version = 5
+  Version = 6
 };
 
 /// Applies the folding algorithm to each character in the given string,
diff --git a/ftshelpers.hh b/ftshelpers.hh
index 52c2699d8..c303e883f 100644
--- a/ftshelpers.hh
+++ b/ftshelpers.hh
@@ -22,7 +22,7 @@ namespace FtsHelpers
 enum
 {
   FtsSignature = 0x58535446, // FTSX on little-endian, XSTF on big-endian
-  CurrentFtsFormatVersion = 2 + BtreeIndexing::FormatVersion,
+  CurrentFtsFormatVersion = 2 + BtreeIndexing::FormatVersion + Folding::Version,
 };
 
 #pragma pack(push,1)
diff --git a/generators/DiacriticFolding.txt b/generators/DiacriticFolding.txt
index 4bb7d3e38..572e297d8 100644
--- a/generators/DiacriticFolding.txt
+++ b/generators/DiacriticFolding.txt
@@ -3,6 +3,8 @@
 
 0401; 0415 # CYRILLIC CAPITAL LETTER IO -> CYRILLIC CAPITAL LETTER IE
 0451; 0435 # CYRILLIC SMALL LETTER IO -> CYRILLIC SMALL LETTER IE
+040E; 0423 # CYRILLIC CAPITAL LETTER SHORT U -> CYRILLIC CAPITAL LETTER U
+045E; 0443 # CYRILLIC SMALL LETTER SHORT U -> CYRILLIC SMALL LETTER U
 
 # 	DiacriticFolding.txt
 #	DRAFT 1 - 2004-07-14 John Cowan
diff --git a/inc_diacritic_folding.hh b/inc_diacritic_folding.hh
index cf3c98f9a..f1fb0ef1a 100644
--- a/inc_diacritic_folding.hh
+++ b/inc_diacritic_folding.hh
@@ -3134,6 +3134,8 @@ wchar foldDiacritic( wchar const * in, size_t size, size_t & consumed )
         consumed = 1; return 0x415;
       case 0x40d:
         consumed = 1; return 0x418;
+      case 0x40e:
+        consumed = 1; return 0x423;
       case 0x410:
         if ( size > 1 )
         {
@@ -3368,6 +3370,8 @@ wchar foldDiacritic( wchar const * in, size_t size, size_t & consumed )
         consumed = 1; return 0x435;
       case 0x45d:
         consumed = 1; return 0x438;
+      case 0x45e:
+        consumed = 1; return 0x443;
       case 0x474:
         if ( size > 1 )
         {