From 7e8fd76cb354e05f2f5ad48eb647ebb00fd1ab9d Mon Sep 17 00:00:00 2001
From: Georgy Litvinov <git@litvinovg.pro>
Date: Fri, 29 Oct 2021 00:51:03 +0200
Subject: [PATCH] Fix diacritic characters combination

---
 Redaction/Clean.xba         | 13 +++++++++----
 Redaction/Configuration.xba |  2 +-
 cleanandvalidate.update.xml |  4 ++--
 description.xml             |  2 +-
 gradle.properties           |  2 +-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Redaction/Clean.xba b/Redaction/Clean.xba
index 3fc9741..cff21ec 100644
--- a/Redaction/Clean.xba
+++ b/Redaction/Clean.xba
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Clean" script:language="StarBasic">Sub mark95
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Clean" script:language="StarBasic">Sub mark96
 
 End Sub
 
@@ -2177,8 +2177,13 @@ Function isFirstCharDiacritic(portion As Object) As Boolean
 End Function
 
 Sub moveFirstCharacter(portion As Object, prevPortion As Object)
-	prevPortion.String = prevPortion.String &amp; Left(portion.String,1)
-	portion.String = Right(portion.String,Len(portion.String) - 1)
+	Dim prevEnd As Object
+	Dim nextStart As Object
+	prevEnd = prevPortion.getEnd()
+	prevEnd.String = Left(portion.String,1)
+	nextStart = portion.Text.createTextCursorByRange(portion.Start)
+	nextStart.goRight(1,true)
+	nextStart.setString(&quot;&quot;)
 End Sub
 
-</script:module>
+</script:module>
\ No newline at end of file
diff --git a/Redaction/Configuration.xba b/Redaction/Configuration.xba
index a69134b..5819383 100644
--- a/Redaction/Configuration.xba
+++ b/Redaction/Configuration.xba
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
 <script:module xmlns:script="http://openoffice.org/2000/script" script:name="Configuration" script:language="StarBasic" script:moduleType="normal">Public Const redactionExtensionName = &quot;cleanAndValidate&quot;
-Public Const redactionExtensionVersion = &quot;0.10.8&quot;
+Public Const redactionExtensionVersion = &quot;0.10.10&quot;
 Public Const template_name_monography = &quot;Монография&quot;
 Public Const template_name_pj = &quot;Философский журнал&quot;
 Public Const template_name_pq = &quot;Вопросы философии&quot;
diff --git a/cleanandvalidate.update.xml b/cleanandvalidate.update.xml
index 23f5439..dece4d5 100644
--- a/cleanandvalidate.update.xml
+++ b/cleanandvalidate.update.xml
@@ -2,9 +2,9 @@
 <description xmlns="http://openoffice.org/extensions/update/2006" 
              xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="pro.litvinovg.Redaction"/>
-    <version value="0.10.7" />
+    <version value="0.10.10" />
     <update-download>
-        <src xlink:href="https://dev.litvinovg.pro/litvinovg/cleanandvalidate/uploads/0545689ae686a087e51c90d0d0d15043/cleanAndValidate.oxt" />
+        <src xlink:href="https://dev.litvinovg.pro/litvinovg/cleanandvalidate/uploads/c1d70a6144d505fa0723465d254889df/cleanAndValidate.oxt" />
     </update-download>
     <release-notes>
         <src xlink:href="https://dev.litvinovg.pro/litvinovg/cleanandvalidate/-/raw/master/releasenotes.txt" lang="en" />
diff --git a/description.xml b/description.xml
index 825899d..c242639 100644
--- a/description.xml
+++ b/description.xml
@@ -21,7 +21,7 @@
     
     
     
-    <version value="0.10.8"/>
+    <version value="0.10.10"/>
                                           
     
     
diff --git a/gradle.properties b/gradle.properties
index bc92a10..d9371f5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1 @@
-version=0.10.8
+version=0.10.10