wip #8012 @2

diff --git a/resources/tools/fwstk/.idea/workspace.xml b/resources/tools/fwstk/.idea/workspace.xml
index b9018713c8ca79f53aab6a5526aded61ce2d8af8..50ebceb0942eb573b1d109fb8bc379f25d5ccbb0 100644 (file)
--- a/resources/tools/fwstk/.idea/workspace.xml
+++ b/resources/tools/fwstk/.idea/workspace.xml
@@ -95,38 +95,38 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "Application.extract links.executor": "Run",
-    "Application.extract texts.executor": "Run",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.git.unshallow": "true",
-    "RunOnceActivity.typescript.service.memoryLimit.init": "true",
-    "WebServerToolWindowFactoryState": "true",
-    "WebServerToolWindowPanel.toolwindow.highlight.mappings": "true",
-    "WebServerToolWindowPanel.toolwindow.highlight.symlinks": "true",
-    "WebServerToolWindowPanel.toolwindow.show.date": "false",
-    "WebServerToolWindowPanel.toolwindow.show.permissions": "false",
-    "WebServerToolWindowPanel.toolwindow.show.size": "false",
-    "git-widget-placeholder": "master",
-    "ignore.virus.scanning.warn.message": "true",
-    "junie.onboarding.icon.badge.shown": "true",
-    "kotlin-language-version-configured": "true",
-    "last_opened_file_path": "D:/Works/cubist_pdf/resources/tools/fwstk",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "project.structure.last.edited": "Libraries",
-    "project.structure.proportion": "0.15",
-    "project.structure.side.proportion": "0.2",
-    "ruby.rails.projectView.checked": "true",
-    "settings.editor.selected.configurable": "preferences.lookFeel",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;Application.extract links.executor&quot;: &quot;Run&quot;,
+    &quot;Application.extract texts.executor&quot;: &quot;Run&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.typescript.service.memoryLimit.init&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.highlight.mappings&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.highlight.symlinks&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.show.date&quot;: &quot;false&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.show.permissions&quot;: &quot;false&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.show.size&quot;: &quot;false&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
+    &quot;junie.onboarding.icon.badge.shown&quot;: &quot;true&quot;,
+    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;D:/Works/cubist_pdf/resources/tools/fwstk&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Libraries&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.15&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
+    &quot;ruby.rails.projectView.checked&quot;: &quot;true&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.lookFeel&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="H:\Works\cubeExtranet\fluidbook\tools\fwstk\lib" />
@@ -347,7 +347,7 @@
     <configuration name="extract texts" 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\Downloads\fluidbook_33884.pdf --extractTextsMethod fluidbook --extractTexts C:\Users\vince\Desktop\33884\%s%d.txt --threads 1" />
+      <option name="PROGRAM_PARAMETERS" value="--input C:\Users\vince\Downloads\fluidbook_33071.pdf --extractTextsMethod fluidbook --extractTexts C:\Users\vince\Desktop\33071\%s%d.txt --threads 1" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -528,7 +528,8 @@
       <workItem from="1748355409566" duration="1244000" />
       <workItem from="1748356736199" duration="3367000" />
       <workItem from="1769008557586" duration="495000" />
-      <workItem from="1769682693343" duration="1080000" />
+      <workItem from="1769682693343" duration="1821000" />
+      <workItem from="1771337761714" duration="6158000" />
     </task>
     <task id="LOCAL-00001" summary="wip #1111 @0.5">
       <created>1487172253077</created>

diff --git a/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Group.class b/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Group.class
index cf354198130c8d152f8a8aaac6d1950669fa77ec..12271eafcd802b3b77574ea3c2ce51a513fe7cb4 100644 (file)
Binary files a/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Group.class and b/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Group.class differ

diff --git a/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/LayoutStripper.class b/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/LayoutStripper.class
index 2fdde95ba2d36b2cef7a7810c4ba5af0fca53967..fbfe8e88e2d356ee5b14d1a9aba000b4a605a08c 100644 (file)
Binary files a/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/LayoutStripper.class and b/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/LayoutStripper.class differ

diff --git a/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Page.class b/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Page.class
index 49dbecde6516c846adc2938293b2863c1bf79fad..6ed7daa70fabc05dfde2839ad72492191d971ec7 100644 (file)
Binary files a/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Page.class and b/resources/tools/fwstk/bin/com/fluidbook/fwstk/layout/Page.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 a39d25740bf44230e8e95451e97ee109e2ba7696..63db784801a2c3823a96b8db88b3c40ba01280c1 100644 (file)
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/layout/Group.java b/resources/tools/fwstk/src/com/fluidbook/fwstk/layout/Group.java
index 6e4c96ec20ef94ed73f6d21faaf1a64fa5e3d7bf..9c62f0cd324b5b83114c216e86a12a98801850d3 100644 (file)
--- a/resources/tools/fwstk/src/com/fluidbook/fwstk/layout/Group.java
+++ b/resources/tools/fwstk/src/com/fluidbook/fwstk/layout/Group.java
@@ -67,7 +67,7 @@ public class Group extends LayoutElement {
             }
             res.add(text);
         }
-        return String.join("", res);
+        return String.join(" ", res);
     }
 
     public boolean equals(float size) {

diff --git a/resources/tools/fwstk/src/com/fluidbook/fwstk/layout/LayoutStripper.java b/resources/tools/fwstk/src/com/fluidbook/fwstk/layout/LayoutStripper.java
index 9677c466ab1915fa31835837940ab1a3816dbcff..b3c374d1396438cb0407d8dbb43ee4e2a19179fd 100644 (file)
--- a/resources/tools/fwstk/src/com/fluidbook/fwstk/layout/LayoutStripper.java
+++ b/resources/tools/fwstk/src/com/fluidbook/fwstk/layout/LayoutStripper.java
@@ -26,7 +26,6 @@ public class LayoutStripper extends PDFStreamEngine {
 
     public LayoutStripper(Properties props) throws IOException {
         super(props);
-        // TODO Auto-generated constructor stub
     }
 
     public void setIgnoredSeparators(String ignoredSeparators) {

diff --git a/resources/tools/fwstk/src/com/fluidbook/fwstk/layout/Page.java b/resources/tools/fwstk/src/com/fluidbook/fwstk/layout/Page.java
index 556939efd47f6ed8fe26cfaa1afbc041e049e7e0..d28197bd8897ddd221697fd36684612c2325a20c 100644 (file)
--- a/resources/tools/fwstk/src/com/fluidbook/fwstk/layout/Page.java
+++ b/resources/tools/fwstk/src/com/fluidbook/fwstk/layout/Page.java
@@ -18,8 +18,6 @@ import java.util.regex.Pattern;
 
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.apache.pdfbox.pdmodel.font.PDFont;
-import org.apache.pdfbox.pdmodel.font.PDFontDescriptor;
 import org.apache.pdfbox.pdmodel.graphics.PDGraphicsState;
 import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
 import org.apache.pdfbox.pdmodel.graphics.color.PDColorState;