From c0af554240765d7f94a21386a2a8fa45d17ff7ba Mon Sep 17 00:00:00 2001
From: Georgy Litvinov <git@litvinovg.pro>
Date: Mon, 14 Dec 2020 18:26:35 +0100
Subject: [PATCH] Fixes for WL conversion

---
 Redaction/Clean.xba | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/Redaction/Clean.xba b/Redaction/Clean.xba
index e29e713..ea4a325 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 mark70
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Clean" script:language="StarBasic">Sub mark71
 
 End Sub
 
@@ -165,6 +165,8 @@ Private Sub quietCleaning
 	statusIndicator.Start(getTranslation(&quot;statusReplaceFontsInStyles&quot;),100)
 	replaceStyleFonts
 	statusIndicator.Start(getTranslation(&quot;statusConvertSymbolsInTargetFonts&quot;),100)
+	saveAndreload()
+	statusIndicator = ThisComponent.getCurrentController.statusIndicator
     unicodeSymbolsConversion
    	statusIndicator.Start(getTranslation(&quot;statusCleaningManualFormatting&quot;),100)	
 	cleanFormatting
@@ -1381,7 +1383,7 @@ Private Sub convertWLLatin2IPHAstra
 	SrchAttributes(0).Value = Empty
 	ReplAttributes(0).Value = Empty
 &apos;Replace macron below
-	oSearchString = &quot;(.)\uF0D4&quot;
+	oSearchString = &quot;(.)(\uF0D4)+&quot;
 	oReplaceString = &quot;$1̱&quot;
 	&apos;from WL
 	ReplaceFormatting(oSearchString,oReplaceString,SrchAttributes,ReplAttributes, false)
@@ -1390,7 +1392,7 @@ Private Sub convertWLLatin2IPHAstra
 	ReplaceFormatting(oSearchString,oReplaceString,SrchAttributes,ReplAttributes, false)
 	
 	&apos;Replace dot below
-	oSearchString = &quot;(.)\uF0D6&quot;
+	oSearchString = &quot;(.)(\uF0D6)+&quot;
 	oReplaceString = &quot;$1̣&quot;
 	&apos;from WL
 	ReplaceFormatting(oSearchString,oReplaceString,SrchAttributes,ReplAttributes, false)
@@ -1399,16 +1401,25 @@ Private Sub convertWLLatin2IPHAstra
 	ReplaceFormatting(oSearchString,oReplaceString,SrchAttributes,ReplAttributes, false)
 
 	&apos;replace macron
-	oSearchString = &quot;(.)\uF0F4&quot;
+	oSearchString = &quot;(.)(\uF0F4)+&quot;
 	oReplaceString = &quot;$1̄&quot;
 	&apos;from WL
 	ReplaceFormatting(oSearchString,oReplaceString,SrchAttributes,ReplAttributes, false)
 	&apos;from unicode to remove direct formatting
 	oSearchString = &quot;(.)\u0304&quot;
 	ReplaceFormatting(oSearchString,oReplaceString,SrchAttributes,ReplAttributes, false)
-	
+	&apos;replace space
+
+	oSearchString = &quot;\uF020&quot;
+	oReplaceString = &quot; &quot;
+	ReplaceFormatting(oSearchString,oReplaceString,SrchAttributes,ReplAttributes, false)
+	&apos;replace comma
+	oSearchString = &quot;\uF02C&quot;
+	oReplaceString = &quot;,&quot;
+	ReplaceFormatting(oSearchString,oReplaceString,SrchAttributes,ReplAttributes, false)
+
 	&apos;replace accent
-	oSearchString = &quot;(.)\uF0F1&quot;
+	oSearchString = &quot;(.)(\uF0F1)+&quot;
 	oReplaceString = &quot;$1́&quot;
 	ReplaceFormatting(oSearchString,oReplaceString,SrchAttributes,ReplAttributes, false)
 	&apos;from unicode to remove direct formatting