From 82ca6dc87a96711b67d6164fd951ae7adb9a2500 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 13 Nov 2018 16:28:49 +0000
Subject: [PATCH] #2342

---
 fluidbook/tools/fwstk/.idea/workspace.xml     | 208 ++++++++++--------
 .../fwstk/out/artifacts/fwstk_jar/fwstk.jar   | Bin 3179076 -> 3179076 bytes
 .../html5/3dflip/class.ws.html5.compiler.php  |  10 +-
 3 files changed, 117 insertions(+), 101 deletions(-)

diff --git a/fluidbook/tools/fwstk/.idea/workspace.xml b/fluidbook/tools/fwstk/.idea/workspace.xml
index 2a46a24d4..f6de5ceec 100644
--- a/fluidbook/tools/fwstk/.idea/workspace.xml
+++ b/fluidbook/tools/fwstk/.idea/workspace.xml
@@ -6,7 +6,10 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="f146bc67-2578-4de3-9db2-94d2d43e9e83" name="Default" comment="fix #2243 @0:40" />
+    <list default="true" id="f146bc67-2578-4de3-9db2-94d2d43e9e83" name="Default" comment="fix #2243 @0:40">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/fwstk_jar/fwstk.jar" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/fwstk_jar/fwstk.jar" afterDir="false" />
+    </list>
     <ignored path="fwstk.iws" />
     <ignored path=".idea/workspace.xml" />
     <ignored path="$PROJECT_DIR$/bin/" />
@@ -24,20 +27,21 @@
     <session id="-183392587">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="2" />
+          <entry key="project.closed" value="3" />
           <entry key="project.open.time.1" value="1" />
+          <entry key="project.open.time.10" value="1" />
           <entry key="project.open.time.2" value="1" />
-          <entry key="project.opened" value="2" />
+          <entry key="project.opened" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="java" value="11" />
+          <entry key="java" value="12" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="JAVA" value="11" />
+          <entry key="JAVA" value="12" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
@@ -59,19 +63,10 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutStripper.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="748">
-              <caret line="64" column="22" selection-start-line="64" selection-start-column="22" selection-end-line="64" selection-end-column="22" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/Main.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-9717">
+            <state relative-caret-position="3536">
               <caret line="250" column="32" selection-start-line="250" selection-start-column="32" selection-end-line="250" selection-end-column="32" />
             </state>
           </provider>
@@ -80,7 +75,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Page.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="833">
+            <state relative-caret-position="935">
               <caret line="80" column="16" selection-start-line="80" selection-start-column="16" selection-end-line="80" selection-end-column="16" />
             </state>
           </provider>
@@ -111,7 +106,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Word.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="348">
+            <state relative-caret-position="1513">
               <caret line="105" column="52" selection-start-line="105" selection-start-column="52" selection-end-line="105" selection-end-column="52" />
               <folding>
                 <element signature="imports" expanded="true" />
@@ -125,7 +120,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Line.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="833">
+            <state relative-caret-position="714">
               <caret line="52" column="19" selection-start-line="52" selection-start-column="19" selection-end-line="52" selection-end-column="19" />
               <folding>
                 <element signature="imports" expanded="true" />
@@ -146,21 +141,33 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Group.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="416">
+            <state relative-caret-position="1190">
               <caret line="80" column="53" selection-start-line="80" selection-start-column="53" selection-end-line="80" selection-end-column="53" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/cube/util/StringUtil.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="336">
+            <state relative-caret-position="115">
               <caret line="59" selection-start-line="59" selection-end-line="59" />
             </state>
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="jar://$USER_HOME$/.ideaLibSources/pdfbox-1.8.13-sources.jar!/org/apache/pdfbox/util/PDFStreamEngine.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="217">
+              <caret line="74" column="30" selection-start-line="74" selection-start-column="30" selection-end-line="74" selection-end-column="30" />
+              <folding>
+                <element signature="e#2703#2711#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -294,6 +301,35 @@
               <item name="fwstk" type="462c0819:PsiDirectoryNode" />
               <item name="lib" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="fwstk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="fwstk" type="462c0819:PsiDirectoryNode" />
+              <item name="lib" type="462c0819:PsiDirectoryNode" />
+              <item name="pdfbox-1.8.13.jar" type="ab9368bb:PsiFileNode" />
+            </path>
+            <path>
+              <item name="fwstk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="fwstk" type="462c0819:PsiDirectoryNode" />
+              <item name="lib" type="462c0819:PsiDirectoryNode" />
+              <item name="pdfbox-1.8.13.jar" type="ab9368bb:PsiFileNode" />
+              <item name="pdfbox" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="fwstk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="fwstk" type="462c0819:PsiDirectoryNode" />
+              <item name="lib" type="462c0819:PsiDirectoryNode" />
+              <item name="pdfbox-1.8.13.jar" type="ab9368bb:PsiFileNode" />
+              <item name="pdfbox" type="462c0819:PsiDirectoryNode" />
+              <item name="pdmodel" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="fwstk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="fwstk" type="462c0819:PsiDirectoryNode" />
+              <item name="lib" type="462c0819:PsiDirectoryNode" />
+              <item name="pdfbox-1.8.13.jar" type="ab9368bb:PsiFileNode" />
+              <item name="pdfbox" type="462c0819:PsiDirectoryNode" />
+              <item name="util" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="fwstk" type="b2602c69:ProjectViewProjectNode" />
               <item name="fwstk" type="462c0819:PsiDirectoryNode" />
@@ -356,7 +392,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="AndroidView" />
       <pane id="PackagesPane" />
       <pane id="Scope" />
     </panes>
@@ -374,7 +409,7 @@
     <property name="js.eslint.eslintPackage" value="" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/lib/commons-lang3-3.7.jar!/" />
     <property name="nodejs_interpreter_path" value="C:/Program Files/nodejs/node" />
-    <property name="project.structure.last.edited" value="Project" />
+    <property name="project.structure.last.edited" value="SDKs" />
     <property name="project.structure.proportion" value="0.15193799" />
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="settings.editor.selected.configurable" value="configurable.group.language" />
@@ -399,7 +434,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Application.extract layout">
+  <component name="RunManager" selected="Application.extract texts">
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
       <option name="DEPLOY" value="true" />
@@ -547,8 +582,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\Vincent\Desktop\original.pdf --extractTextsMethod fluidbook --extractTexts C:\Users\Vincent\Desktop\loutres\%s%d.txt --threads 1" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+      <option name="PROGRAM_PARAMETERS" value="--input C:\Users\Vincent\Desktop\document.pdf --extractTextsMethod fluidbook --extractTexts C:\Users\Vincent\Desktop\loutres\%s%d.txt --threads 1" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -738,6 +772,7 @@
       <workItem from="1530632372632" duration="1612000" />
       <workItem from="1536915422503" duration="1202000" />
       <workItem from="1536936327997" duration="1627000" />
+      <workItem from="1541603515738" duration="1532000" />
     </task>
     <task id="LOCAL-00001" summary="wip #1111 @0.5">
       <created>1487172253077</created>
@@ -799,7 +834,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="79732000" />
+    <option name="totallyTimeSpent" value="81264000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -814,7 +849,7 @@
     <frame x="-1928" y="-8" width="1936" height="1176" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16577825" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1673774" />
       <window_info id="Palette&#9;" order="1" />
       <window_info id="Image Layers" order="2" />
       <window_info id="Capture Tool" order="3" />
@@ -823,7 +858,7 @@
       <window_info id="Nl-Palette" order="6" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" sideWeight="0.49573562" weight="0.32934782" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.47867805" weight="0.32934782" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.47867805" weight="0.32853025" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -931,13 +966,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/.ideaLibSources/pdfbox-1.8.13-sources.jar!/org/apache/pdfbox/util/PDFStreamEngine.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="59">
-          <caret line="522" lean-forward="true" selection-start-line="315" selection-start-column="4" selection-end-line="522" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/.idea/libraries/pdfbox_1_8_13.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="170">
@@ -961,20 +989,8 @@
         </state>
       </provider>
     </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_152/src.zip!/java/util/LinkedList.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="197">
-          <caret line="253" column="13" selection-start-line="253" selection-start-column="13" selection-end-line="253" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_152/src.zip!/java/util/ArrayList.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="7140">
-          <caret line="460" column="19" selection-start-line="460" selection-start-column="19" selection-end-line="460" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_152/src.zip!/java/util/LinkedList.java" />
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_152/src.zip!/java/util/ArrayList.java" />
     <entry file="file://$PROJECT_DIR$/MANIFEST.MF">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="102">
@@ -982,13 +998,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_152/src.zip!/java/lang/Object.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="197">
-          <caret line="147" column="19" selection-start-line="147" selection-start-column="19" selection-end-line="147" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_152/src.zip!/java/lang/Object.java" />
     <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Space.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="153">
@@ -1017,12 +1027,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="5151">
           <caret line="345" column="32" selection-start-line="345" selection-start-column="15" selection-end-line="345" selection-end-column="32" />
-          <folding>
-            <element signature="e#51764#51765#0" expanded="true" />
-            <element signature="e#51820#51821#0" expanded="true" />
-            <element signature="e#59179#59180#0" expanded="true" />
-            <element signature="e#59223#59224#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1047,40 +1051,24 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/Word.java">
+    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutStripper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+        <state relative-caret-position="850">
+          <caret line="64" column="22" selection-start-line="64" selection-start-column="22" selection-end-line="64" selection-end-column="22" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/Main.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-9717">
+        <state relative-caret-position="3536">
           <caret line="250" column="32" selection-start-line="250" selection-start-column="32" selection-end-line="250" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Word.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="348">
-          <caret line="105" column="52" selection-start-line="105" selection-start-column="52" selection-end-line="105" selection-end-column="52" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#2325#2326#0" expanded="true" />
-            <element signature="e#2382#2383#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Letter.java">
+    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Page.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1547">
-          <caret line="102" column="19" selection-start-line="102" selection-start-column="19" selection-end-line="102" selection-end-column="19" />
-          <folding>
-            <element signature="e#1852#1853#0" expanded="true" />
-            <element signature="e#1871#1872#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="935">
+          <caret line="80" column="16" selection-start-line="80" selection-start-column="16" selection-end-line="80" selection-end-column="16" />
         </state>
       </provider>
     </entry>
@@ -1091,23 +1079,32 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutStripper.java">
+    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Letter.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="64" column="22" selection-start-line="64" selection-start-column="22" selection-end-line="64" selection-end-column="22" />
+        <state relative-caret-position="1547">
+          <caret line="102" column="19" selection-start-line="102" selection-start-column="19" selection-end-line="102" selection-end-column="19" />
+          <folding>
+            <element signature="e#1852#1853#0" expanded="true" />
+            <element signature="e#1871#1872#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Page.java">
+    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Word.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="833">
-          <caret line="80" column="16" selection-start-line="80" selection-start-column="16" selection-end-line="80" selection-end-column="16" />
+        <state relative-caret-position="1513">
+          <caret line="105" column="52" selection-start-line="105" selection-start-column="52" selection-end-line="105" selection-end-column="52" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#2325#2326#0" expanded="true" />
+            <element signature="e#2382#2383#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Line.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="833">
+        <state relative-caret-position="714">
           <caret line="52" column="19" selection-start-line="52" selection-start-column="19" selection-end-line="52" selection-end-column="19" />
           <folding>
             <element signature="imports" expanded="true" />
@@ -1115,20 +1112,37 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/Word.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="51">
+          <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Group.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="416">
+        <state relative-caret-position="1190">
           <caret line="80" column="53" selection-start-line="80" selection-start-column="53" selection-end-line="80" selection-end-column="53" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/cube/util/StringUtil.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
+        <state relative-caret-position="115">
           <caret line="59" selection-start-line="59" selection-end-line="59" />
         </state>
       </provider>
     </entry>
+    <entry file="jar://$USER_HOME$/.ideaLibSources/pdfbox-1.8.13-sources.jar!/org/apache/pdfbox/util/PDFStreamEngine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="217">
+          <caret line="74" column="30" selection-start-line="74" selection-start-column="30" selection-end-line="74" selection-end-column="30" />
+          <folding>
+            <element signature="e#2703#2711#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
@@ -1137,9 +1151,9 @@
           <artifact-editor>
             <show-content>
               <type id="jpa-descriptors" />
-              <type id="javaee-facet-resources" />
               <type id="library" />
               <type id="artifact" />
+              <type id="javaee-facet-resources" />
             </show-content>
           </artifact-editor>
           <last-edited>fwstk:jar</last-edited>
@@ -1167,7 +1181,7 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>as3</last-edited>
+          <last-edited>downloader_library</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar
index 18715a7b98ead58af558a2a38af178b2a25c291e..6df2683c829eac592bcb28261359602f9026c292 100644
GIT binary patch
delta 5964
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
B3eNxl

delta 5964
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
Z*RL9*%{9M9EY!O->||(9Xyql6{y+H7W>WwF

diff --git a/inc/ws/Util/html5/3dflip/class.ws.html5.compiler.php b/inc/ws/Util/html5/3dflip/class.ws.html5.compiler.php
index 986ffe7a3..056e5d3ba 100644
--- a/inc/ws/Util/html5/3dflip/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/3dflip/class.ws.html5.compiler.php
@@ -223,7 +223,7 @@ class wsHTML5Compiler
 
 		$this->daoBook = new wsDAOBook($core->con);
 		if (null === $book) {
-		$this->book = $this->daoBook->selectById($book_id);
+			$this->book = $this->daoBook->selectById($book_id);
 		} else {
 			$this->book = $book;
 		}
@@ -783,7 +783,7 @@ class wsHTML5Compiler
 			$vars = array('titre', 'style', 'script');
 			foreach ($vars as $v) {
 				if (isset($$v)) {
-				$whtml = str_replace('<!-- $' . $v . ' -->', $$v, $whtml);
+					$whtml = str_replace('<!-- $' . $v . ' -->', $$v, $whtml);
 				} else {
 					$whtml = str_replace('<!-- $' . $v . ' -->', '', $whtml);
 				}
@@ -1076,7 +1076,7 @@ class wsHTML5Compiler
 			}
 			if ($linkData['type'] == 32) {
 				$hiddenLinks[] = $linkData['to'];
-		}
+			}
 		}
 
 		$this->config->pagesOfCustomLinks = $pagesOfCustomLinks;
@@ -1273,7 +1273,7 @@ class wsHTML5Compiler
 				file_put_contents($tmp, $js);
 
 				if (file_exists($minimized)) {
-				unlink($minimized);
+					unlink($minimized);
 				}
 
 				$uglify = new CubeIT_CommandLine('/usr/local/bin/uglifyjs');
@@ -1293,6 +1293,8 @@ class wsHTML5Compiler
 		if ($this->phonegap) {
 			$this->vdir->copy(WS_COMPILE_ASSETS . '/_html5/js/libs/phonegap/' . $this->phonegapVersion . '/cordova-' . $this->phonegap . '.js', 'data/cordova.js');
 		}
+		$this->vdir->copyDirectory($this->assets . '/js/libs/fluidbook/workers', 'js/libs/fluidbook/workers');
+		$this->vdir->copyDirectory($this->assets . '/js/libs/stand', 'js/libs/stand');
 	}
 
 	public function writeTexts()
-- 
2.39.5