From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 23 Oct 2023 16:15:42 +0000 (+0200)
Subject: wip #6430 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=57ff8cf71356fccc4c256c33ccfaa216ce5a032d;p=cubist_pdf.git

wip #6430 @0.5
---

diff --git a/resources/tools/fwstk/.idea/workspace.xml b/resources/tools/fwstk/.idea/workspace.xml
index 466fcb6..c839016 100644
--- a/resources/tools/fwstk/.idea/workspace.xml
+++ b/resources/tools/fwstk/.idea/workspace.xml
@@ -9,7 +9,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="f146bc67-2578-4de3-9db2-94d2d43e9e83" name="Default" comment="wip #5410" />
+    <list default="true" id="f146bc67-2578-4de3-9db2-94d2d43e9e83" name="Default" comment="wip #643" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -361,7 +361,7 @@
     <configuration name="extract layout" type="Application" factoryName="Application">
       <option name="MAIN_CLASS_NAME" value="com.fluidbook.fwstk.Main" />
       <module name="fwstk" />
-      <option name="PROGRAM_PARAMETERS" value="--input C:\Users\vince\Desktop\test.pdf --mode robust --layout C:\Users\vince\Desktop\test\p%d.fby --threads 1" />
+      <option name="PROGRAM_PARAMETERS" value="--input C:\Users\vince\Desktop\1.pdf --mode robust --layout C:\Users\vince\Desktop\test\p%d.fby --threads 1" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -495,6 +495,7 @@
       <workItem from="1694699117438" duration="618000" />
       <workItem from="1697471786856" duration="382000" />
       <workItem from="1697543960076" duration="2149000" />
+      <workItem from="1698075842281" duration="1718000" />
     </task>
     <task id="LOCAL-00001" summary="wip #1111 @0.5">
       <created>1487172253077</created>
diff --git a/resources/tools/fwstk/bin/com/fluidbook/fwstk/TextsThread.class b/resources/tools/fwstk/bin/com/fluidbook/fwstk/TextsThread.class
index d1cf200..965dedb 100644
Binary files a/resources/tools/fwstk/bin/com/fluidbook/fwstk/TextsThread.class and b/resources/tools/fwstk/bin/com/fluidbook/fwstk/TextsThread.class differ
diff --git a/resources/tools/fwstk/bin/cube/util/StringUtil.class b/resources/tools/fwstk/bin/cube/util/StringUtil.class
index f28562f..5de73f6 100644
Binary files a/resources/tools/fwstk/bin/cube/util/StringUtil.class and b/resources/tools/fwstk/bin/cube/util/StringUtil.class differ
diff --git a/resources/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar b/resources/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar
index 6fe8dd5..161aed6 100644
Binary files a/resources/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar and b/resources/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar differ
diff --git a/resources/tools/fwstk/src/com/fluidbook/fwstk/TextsThread.java b/resources/tools/fwstk/src/com/fluidbook/fwstk/TextsThread.java
index 77b4323..a5014a7 100644
--- a/resources/tools/fwstk/src/com/fluidbook/fwstk/TextsThread.java
+++ b/resources/tools/fwstk/src/com/fluidbook/fwstk/TextsThread.java
@@ -201,6 +201,7 @@ public class TextsThread extends Thread {
                     fbtext = html2text(fbtext);
                     if (this.robust) {
                         fbtext=StringUtil.removeSpaces(fbtext);
+                        fbtext=StringUtil.removeAccents(fbtext);
                     }
 
                     try {
diff --git a/resources/tools/fwstk/src/cube/util/StringUtil.java b/resources/tools/fwstk/src/cube/util/StringUtil.java
index 74abfb8..0ef8cc6 100644
--- a/resources/tools/fwstk/src/cube/util/StringUtil.java
+++ b/resources/tools/fwstk/src/cube/util/StringUtil.java
@@ -3,12 +3,17 @@ package cube.util;
 import cube.util.AsciiUtils;
 import org.apache.commons.lang3.StringUtils;
 
+import java.text.Normalizer;
 import java.util.HashMap;
 
 public class StringUtil {
 
     public static String removeAccents(String in) {
-        return AsciiUtils.convertNonAscii(in);
+        in = AsciiUtils.convertNonAscii(in);
+        in = Normalizer.normalize(in, Normalizer.Form.NFD)
+                .replaceAll("[\\p{InCombiningDiacriticalMarks}\\p{IsM}]+", "");
+        in = in.replaceAll("[\\u0e34-\\u0e3e\\u0e47-\\u0e4e]", "");
+        return in;
     }
 
     public static String condenseWhite(String in) {
@@ -75,7 +80,7 @@ public class StringUtil {
     }
 
     public static String removeSpaces(String in) {
-        return StringUtils.deleteWhitespace(in).replaceAll("\\s+","");
+        return StringUtils.deleteWhitespace(in).replaceAll("\\s+", "");
     }
 
     public static String removeControl(String in) {