From f0f6054bef3050c796fd5672a39d262f46eafbd4 Mon Sep 17 00:00:00 2001
From: Georgy Litvinov <git@litvinovg.pro>
Date: Sat, 8 Feb 2020 18:16:31 +0100
Subject: [PATCH] Fixes for conversion

---
 IPHRedaction/Clean.xba | 20 ++++++++++++--------
 description.xml        |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/IPHRedaction/Clean.xba b/IPHRedaction/Clean.xba
index 3c08a68..cb91cc0 100644
--- a/IPHRedaction/Clean.xba
+++ b/IPHRedaction/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 mark12
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Clean" script:language="StarBasic">Sub mark13
 
 End Sub
 
@@ -117,14 +117,18 @@ Private Sub unicodeSymbolsConversion
 	&apos;Basic Latin \u0020-\u007E
 	&apos;Combining diacritical marks 0301 0304 0323 032e 0331 035f
 	&apos;General Punctuation \u2000-\u206f
+	&apos;Latin Extended A \u0100-\u017f
+    &apos;\u02bb Modifier Letter Turned Comma is in IPH Astra
 &apos;	unicodeConversionEverywhere(&quot;[\u0020-\u007F]+&quot;,RAtts)
-	unicodeConversionEverywhere(&quot;[\u2100-\u214F,\u0020-\u007F,\u0080-\u00FF,\u0400-\u04FF,\u2000-\u206f,\u0301,\u0304,\u0323,\u032e,\u0331,\u035f]+&quot;,RAtts)
+	unicodeConversionEverywhere(&quot;[\u2100-\u214f,\u0020-\u007f,\u0080-\u00ff,\u0400-\u04ff,\u2000-\u206f,\u0301,\u0304,\u0323,\u032e,\u0331,\u035f,\u02bb,\u0100-\u017f]+&quot;,RAtts)
 	&apos;Arabic Scheherazade
+    &apos;Arabic Presentation Forms-A fb50-fdff
+    &apos;Arabic Presentation Forms-B fe70-feff
 	newFontName = &quot;Scheherazade&quot;
 	RAtts(0).Value = newFontName
 	RAtts(1).Value = newFontName
 	RAtts(2).Value = newFontName
-	unicodeConversionEverywhere(&quot;[\u0600-\u06FF]+&quot;,RAtts)
+	unicodeConversionEverywhere(&quot;[\u0600-\u06ff,\ufb50-\ufdff,\ufe70-\ufeff]+&quot;,RAtts)
 
 	&apos;Greek Tinos
 	newFontName = &quot;Tinos&quot;
@@ -133,7 +137,7 @@ Private Sub unicodeSymbolsConversion
 	RAtts(2).Value = newFontName
 	&apos;Greek and Coptic 0370—03FF
 	&apos;Greek extended 1F00—1FFF
-	unicodeConversionEverywhere(&quot;[\u0370-\u03FF,\u1F00-\u1FFF]+&quot;,RAtts)
+	unicodeConversionEverywhere(&quot;[\u0370-\u03ff,\u1f00-\u1fff]+&quot;,RAtts)
 
 
 	&apos;DejaVu Sans Mathematical operators
@@ -142,7 +146,7 @@ Private Sub unicodeSymbolsConversion
 	RAtts(1).Value = newFontName
 	RAtts(2).Value = newFontName
 	&apos;\u2200-\u22FF Mathematical operators
-	unicodeConversionEverywhere(&quot;[\u2200-\u22FF]+&quot;,RAtts)
+	unicodeConversionEverywhere(&quot;[\u2200-\u22ff]+&quot;,RAtts)
 	
 End Sub
 
@@ -468,9 +472,9 @@ Sub setAttributesBySearchPattern(searchPattern As String,ReplAttributes, Optiona
 		EndIf
 		If replace then
 			For i = LBound(ReplAttributes) To Ubound(ReplAttributes)
-		  		If oFound.getPropertySetInfo.hasPropertyByName(ReplAttributes(i).Name) Then
+		  		&apos;If oFound.getPropertySetInfo.hasPropertyByName(ReplAttributes(i).Name) Then
 					oFound.SetPropertyValue(ReplAttributes(i).Name, ReplAttributes(i).Value)
-				EndIf
+				&apos;EndIf
 			Next i
 		EndIf	  
 		oFound = ThisComponent.findNext(oFound.End, oSearch)
@@ -1079,4 +1083,4 @@ Function getVersion
 	getVersion=oProduct.getByName(&quot;ooSetupVersion&quot;)
 End Function
 
-</script:module>
\ No newline at end of file
+</script:module>
diff --git a/description.xml b/description.xml
index b869496..5394c4f 100644
--- a/description.xml
+++ b/description.xml
@@ -3,7 +3,7 @@
              xmlns:dep="http://openoffice.org/extensions/description/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
   <identifier value="pro.litvinovg.Redaction" />
-  <version value="0.4.2" />
+  <version value="0.4.3" />
   <platform value="all" />
   <display-name>
     <name lang="en">Cleaning and validation documents for publishing in html and epub with pagination</name>