From c16d41599421a13c58a65ee460aef63629550213 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 3 Jul 2018 18:51:24 +0000
Subject: [PATCH] wip #2116 @8

---
 fluidbook/tools/fwstk/.idea/misc.xml          |   3 -
 fluidbook/tools/fwstk/.idea/workspace.xml     | 647 ++++--------------
 .../fwstk/out/artifacts/fwstk_jar/fwstk.jar   | Bin 3179192 -> 3179072 bytes
 inc/ws/Util/class.ws.util.php                 |   4 +-
 .../advancedseo/class.ws.html5.compiler.php   | 140 ++--
 .../html5/advancedseo/class.ws.html5.seo.php  | 183 +++++
 inc/ws/Util/html5/class.ws.html5.php          |  25 +-
 7 files changed, 383 insertions(+), 619 deletions(-)
 create mode 100644 inc/ws/Util/html5/advancedseo/class.ws.html5.seo.php

diff --git a/fluidbook/tools/fwstk/.idea/misc.xml b/fluidbook/tools/fwstk/.idea/misc.xml
index ac8680147..91ce3bc21 100644
--- a/fluidbook/tools/fwstk/.idea/misc.xml
+++ b/fluidbook/tools/fwstk/.idea/misc.xml
@@ -192,7 +192,6 @@
           <value>
             <SvnBranchConfiguration>
               <option name="trunkUrl" value="svn+ssh://svn.cubedesigners.com/java" />
-              <option name="userinfoInUrl" value="true" />
             </SvnBranchConfiguration>
           </value>
         </entry>
@@ -215,7 +214,6 @@
           <value>
             <SvnBranchConfiguration>
               <option name="trunkUrl" value="svn+ssh://svn.cubedesigners.com/projects/cubeExtranet/fluidbook/tools/fwstk" />
-              <option name="userinfoInUrl" value="true" />
             </SvnBranchConfiguration>
           </value>
         </entry>
@@ -223,7 +221,6 @@
           <value>
             <SvnBranchConfiguration>
               <option name="trunkUrl" value="svn+ssh://svn.cubedesigners.com/java/com/fluidbook/fwstk" />
-              <option name="userinfoInUrl" value="true" />
             </SvnBranchConfiguration>
           </value>
         </entry>
diff --git a/fluidbook/tools/fwstk/.idea/workspace.xml b/fluidbook/tools/fwstk/.idea/workspace.xml
index db45a241e..b8ae44ecd 100644
--- a/fluidbook/tools/fwstk/.idea/workspace.xml
+++ b/fluidbook/tools/fwstk/.idea/workspace.xml
@@ -8,6 +8,8 @@
   <component name="ChangeListManager">
     <list default="true" readonly="true" id="f146bc67-2578-4de3-9db2-94d2d43e9e83" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.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" />
+      <change beforePath="$PROJECT_DIR$/src/com/fluidbook/fwstk/CustomStripper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/CustomStripper.java" afterDir="false" />
     </list>
     <ignored path="fwstk.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -31,7 +33,7 @@
       <file leaf-file-name="Word.java" 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="323">
+            <state relative-caret-position="255">
               <caret line="24" column="97" selection-start-line="24" selection-start-column="97" selection-end-line="24" selection-end-column="97" />
               <folding>
                 <element signature="imports" expanded="true" />
@@ -52,7 +54,7 @@
       <file leaf-file-name="Main.java" 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="678">
+            <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>
@@ -61,43 +63,46 @@
       <file leaf-file-name="Page.java" 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="364">
-              <caret line="88" column="39" selection-start-line="88" selection-start-column="39" selection-end-line="88" selection-end-column="39" />
-              <folding>
-                <element signature="e#2787#2795#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="714">
+              <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="fwstk.iml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/fwstk.iml">
+      <file leaf-file-name="commons_lang3_3_7.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/.idea/libraries/commons_lang3_3_7.xml">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file leaf-file-name="CustomStripper.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/CustomStripper.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="425">
-              <caret line="25" column="43" selection-start-line="25" selection-start-column="43" selection-end-line="25" selection-end-column="43" />
+            <state relative-caret-position="310">
+              <caret line="27" column="50" selection-start-line="27" selection-start-column="50" selection-end-line="27" selection-end-column="50" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="fwstk_jar.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/.idea/artifacts/fwstk_jar.xml">
+      <file leaf-file-name="PDFTextStripper.java" pinned="false" current-in-tab="false">
+        <entry file="jar://$USER_HOME$/.ideaLibSources/pdfbox-1.8.13-sources.jar!/org/apache/pdfbox/util/PDFTextStripper.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="187">
-              <caret line="11" column="68" selection-start-line="11" selection-start-column="68" selection-end-line="11" selection-end-column="68" />
+            <state relative-caret-position="321">
+              <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>
       </file>
-      <file leaf-file-name="commons_lang3_3_7.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/.idea/libraries/commons_lang3_3_7.xml">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file leaf-file-name="CustomStripper.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/CustomStripper.java">
+      <file leaf-file-name="TextsThread.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/TextsThread.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="21">
-              <caret line="11" column="42" selection-start-line="11" selection-start-column="42" selection-end-line="11" selection-end-column="42" />
+            <state relative-caret-position="2537">
+              <caret line="196" column="61" lean-forward="true" selection-start-line="196" selection-start-column="61" selection-end-line="196" selection-end-column="61" />
             </state>
           </provider>
         </entry>
@@ -105,7 +110,7 @@
       <file leaf-file-name="Line.java" 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="637">
+            <state relative-caret-position="867">
               <caret line="61" column="34" selection-start-line="61" selection-start-column="34" selection-end-line="61" selection-end-column="34" />
               <folding>
                 <element signature="imports" expanded="true" />
@@ -114,11 +119,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Group.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="Group.java" 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="243">
-              <caret line="25" column="32" lean-forward="true" selection-start-line="25" selection-start-column="32" selection-end-line="25" selection-end-column="32" />
+            <state relative-caret-position="617">
+              <caret line="47" column="25" lean-forward="true" selection-start-line="47" selection-start-column="25" selection-end-line="47" selection-end-column="25" />
             </state>
           </provider>
         </entry>
@@ -155,11 +160,16 @@
       <find>add</find>
       <find>extractTexts</find>
       <find>layout</find>
+      <find>CustomStripper</find>
+      <find>&lt;/div&gt;</find>
+      <find>getPageEnd</find>
+      <find>writePageStart</find>
+      <find>addMoreFormatting</find>
     </findStrings>
     <dirStrings>
-      <dir>H:\Works\cubeExtranet\fluidbook\tools\fwstk\src</dir>
       <dir>H:\Works\cubeExtranet\fluidbook\tools\fwstk\src\com\fluidbook\fwstk\layout</dir>
       <dir>H:\Works\cubeExtranet\fluidbook\tools\fwstk</dir>
+      <dir>H:\Works\cubeExtranet\fluidbook\tools\fwstk\src</dir>
     </dirStrings>
   </component>
   <component name="GradleLocalSettings">
@@ -176,7 +186,6 @@
         <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutElement.java" />
         <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/Link.java" />
         <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutStripper.java" />
-        <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/CustomStripper.java" />
         <option value="$PROJECT_DIR$/src/cube/util/StringUtil.java" />
         <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/Main.java" />
         <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Page.java" />
@@ -190,6 +199,7 @@
         <option value="$PROJECT_DIR$/.idea/artifacts/fwstk_jar.xml" />
         <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Word.java" />
         <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Group.java" />
+        <option value="$PROJECT_DIR$/src/com/fluidbook/fwstk/CustomStripper.java" />
       </list>
     </option>
   </component>
@@ -199,11 +209,14 @@
     <detection-done>true</detection-done>
     <sorting>DEFINITION_ORDER</sorting>
   </component>
+  <component name="NodePackageJsonFileManager">
+    <packageJsonPaths />
+  </component>
   <component name="PhpServers">
     <servers />
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-8" />
+    <option name="x" value="-1928" />
     <option name="y" value="-8" />
     <option name="width" value="1936" />
     <option name="height" value="1176" />
@@ -216,6 +229,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
+      <pane id="AndroidView" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -251,6 +266,24 @@
               <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="out" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="fwstk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="fwstk" type="462c0819:PsiDirectoryNode" />
+              <item name="out" type="462c0819:PsiDirectoryNode" />
+              <item name="artifacts" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="fwstk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="fwstk" type="462c0819:PsiDirectoryNode" />
+              <item name="out" type="462c0819:PsiDirectoryNode" />
+              <item name="artifacts" type="462c0819:PsiDirectoryNode" />
+              <item name="fwstk_jar" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="fwstk" type="b2602c69:ProjectViewProjectNode" />
               <item name="fwstk" type="462c0819:PsiDirectoryNode" />
@@ -288,9 +321,7 @@
           <select />
         </subPane>
       </pane>
-      <pane id="AndroidView" />
       <pane id="PackagesPane" />
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -452,34 +483,6 @@
       <properties />
       <listeners />
     </configuration>
-    <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android App">
-      <module name="" />
-      <option name="DEPLOY" value="true" />
-      <option name="ARTIFACT_NAME" value="" />
-      <option name="PM_INSTALL_OPTIONS" value="" />
-      <option name="ACTIVITY_EXTRA_FLAGS" value="" />
-      <option name="MODE" value="default_activity" />
-      <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
-      <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-      <option name="FORCE_STOP_RUNNING_APP" value="true" />
-      <option name="DEBUGGER_TYPE" value="Java" />
-      <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-      <option name="PREFERRED_AVD" value="" />
-      <Java />
-      <Profilers>
-        <option name="ENABLE_ADVANCED_PROFILING" value="true" />
-        <option name="GAPID_ENABLED" value="false" />
-        <option name="GAPID_DISABLE_PCS" value="false" />
-        <option name="SUPPORT_LIB_ENABLED" value="true" />
-        <option name="INSTRUMENTATION_ENABLED" value="true" />
-      </Profilers>
-      <option name="DEEP_LINK" value="" />
-      <option name="ACTIVITY_CLASS" value="" />
-      <method />
-    </configuration>
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
       <option name="DEPLOY" value="true" />
@@ -531,113 +534,6 @@
       </Profilers>
       <method />
     </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" value="" />
-      <option name="VM_PARAMETERS" value="" />
-      <option name="PROGRAM_PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-    </configuration>
-    <configuration default="true" type="BashConfigurationType" factoryName="Bash">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="INTERPRETER_PATH" value="C:\Windows\system32\bash.exe" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <option name="SCRIPT_NAME" value="" />
-      <option name="PARAMETERS" value="" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="BatchConfigurationType" factoryName="Batch">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs />
-      <module name="" />
-      <option name="SCRIPT_NAME" value="" />
-      <option name="PARAMETERS" value="" />
-      <method />
-    </configuration>
-    <configuration default="true" type="Cold Fusion runner description" factoryName="Cold Fusion" custom_browser="" web_path="">
-      <method />
-    </configuration>
-    <configuration default="true" type="CucumberJavaRunConfigurationType" factoryName="Cucumber java">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="myFilePath" />
-      <option name="GLUE" />
-      <option name="myNameFilter" />
-      <option name="myGeneratedName" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="CucumberRunConfigurationType" factoryName="Cucumber">
-      <predefined_log_file id="RUBY_CUCUMBER" enabled="true" />
-      <module name="" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
-      <envs />
-      <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
-      <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
-      <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*.feature" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_TAGS_FILTER" VALUE="" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_NAME_FILTER" VALUE="" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="CUCUMBER_ARGS" VALUE="--color -r features" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="VERBOSE_OPTION" VALUE="false" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="DRB" VALUE="false" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="ZEUS" VALUE="false" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="SPRING" VALUE="false" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="CUCUMBER_RUNNER_PATH" VALUE="" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="USE_CUSTOM_RUNNER" VALUE="false" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="SETTINGS_VERSION" VALUE="2" />
-      <method />
-    </configuration>
-    <configuration default="true" type="DjangoTestsConfigurationType" factoryName="Django tests">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs>
-        <env name="PYTHONUNBUFFERED" value="1" />
-      </envs>
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <module name="fwstk" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="TARGET" value="" />
-      <option name="SETTINGS_FILE" value="" />
-      <option name="CUSTOM_SETTINGS" value="false" />
-      <option name="USE_OPTIONS" value="false" />
-      <option name="OPTIONS" value="" />
-      <method />
-    </configuration>
     <configuration default="true" type="FlashRunConfigurationType" factoryName="Flash App">
       <option name="BCName" value="" />
       <option name="IOSSimulatorSdkPath" value="" />
@@ -687,273 +583,6 @@
       <option name="trusted" value="true" />
       <method />
     </configuration>
-    <configuration default="true" type="GradleRunConfiguration" factoryName="Gradle">
-      <ExternalSystemSettings>
-        <option name="executionName" />
-        <option name="externalProjectPath" />
-        <option name="externalSystemIdString" value="GRADLE" />
-        <option name="scriptParameters" />
-        <option name="taskDescriptions">
-          <list />
-        </option>
-        <option name="taskNames">
-          <list />
-        </option>
-        <option name="vmOptions" />
-      </ExternalSystemSettings>
-      <method />
-    </configuration>
-    <configuration default="true" type="JRubyCucumberRunConfigurationType" factoryName="JRuby Cucumber">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" value="-Dforce.jruby.jit=true -Djruby.debug.fullTrace=true" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*.feature" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_TAGS_FILTER" VALUE="" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_NAME_FILTER" VALUE="" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="CUCUMBER_ARGS" VALUE="--color -r features" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="VERBOSE_OPTION" VALUE="false" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="DRB" VALUE="false" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="ZEUS" VALUE="false" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="SPRING" VALUE="false" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="CUCUMBER_RUNNER_PATH" VALUE="" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="USE_CUSTOM_RUNNER" VALUE="false" />
-      <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="SETTINGS_VERSION" VALUE="2" />
-      <method />
-    </configuration>
-    <configuration default="true" type="Java Scratch" factoryName="Java Scratch">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="SCRATCH_FILE_ID" value="0" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="JavaScriptTestRunnerProtractor" factoryName="Protractor">
-      <config-file value="" />
-      <node-interpreter value="project" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
-      <method />
-    </configuration>
-    <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="fwstk" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType" factoryName="Kotlin script">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="filePath" />
-      <option name="vmParameters" />
-      <option name="alternativeJrePath" />
-      <option name="programParameters" />
-      <option name="passParentEnvs" value="true" />
-      <option name="workingDirectory" />
-      <option name="isAlternativeJrePathEnabled" value="false" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="project" working-dir="">
-      <method />
-    </configuration>
-    <configuration default="true" type="PHPUnitRunConfigurationType" factoryName="PHPUnit">
-      <TestRunner />
-      <method />
-    </configuration>
-    <configuration default="true" type="PhpLocalRunConfigurationType" factoryName="PHP Console">
-      <method />
-    </configuration>
-    <configuration default="true" type="PyBehaveRunConfigurationType" factoryName="Behave">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs />
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <module name="fwstk" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="ADDITIONAL_ARGS" value="" />
-      <method />
-    </configuration>
-    <configuration default="true" type="PyLettuceRunConfigurationType" factoryName="Lettuce">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs />
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <module name="fwstk" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="ADDITIONAL_ARGS" value="" />
-      <method />
-    </configuration>
-    <configuration default="true" type="PythonConfigurationType" factoryName="Python">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs>
-        <env name="PYTHONUNBUFFERED" value="1" />
-      </envs>
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <module name="fwstk" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="" />
-      <option name="PARAMETERS" value="" />
-      <option name="SHOW_COMMAND_LINE" value="false" />
-      <option name="EMULATE_TERMINAL" value="false" />
-      <method />
-    </configuration>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-    </configuration>
-    <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="TestUnitRunConfigurationType" factoryName="Test::Unit/Shoulda/Minitest">
-      <predefined_log_file id="RUBY_TESTUNIT" enabled="true" />
-      <module name="" />
-      <RTEST_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
-      <RTEST_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />
-      <RTEST_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
-      <RTEST_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
-      <RTEST_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
-      <envs />
-      <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
-      <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
-      <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov" />
-      <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
-      <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" />
-      <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="" />
-      <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_METHOD_NAME" VALUE="" />
-      <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
-      <RTEST_RUN_CONFIG_SETTINGS_ID NAME="DRB" VALUE="false" />
-      <RTEST_RUN_CONFIG_SETTINGS_ID NAME="ZEUS" VALUE="false" />
-      <RTEST_RUN_CONFIG_SETTINGS_ID NAME="SPRING" VALUE="false" />
-      <RTEST_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_OPTIONS" VALUE="" />
-      <method />
-    </configuration>
-    <configuration default="true" type="Tox" factoryName="Tox">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs />
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <module name="fwstk" />
-      <method />
-    </configuration>
-    <configuration default="true" type="#PerlConfigurationType" factoryName="Perl" show_console_on_std_err="false" show_console_on_std_out="false">
-      <option name="alternativeSdkPath" />
-      <option name="compileTimeBreakpointsEnabled" value="false" />
-      <option name="consoleCharset" />
-      <option name="envs">
-        <map />
-      </option>
-      <option name="nonInteractiveModeEnabled" value="false" />
-      <option name="passParentEnvs" value="true" />
-      <option name="perlParameters" value="" />
-      <option name="programParameters" />
-      <option name="scriptPath" />
-      <option name="useAlternativeSdk" value="false" />
-      <option name="workingDirectory" />
-      <option name="SCRIPT_PATH" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="PERL_PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ENVS">
-        <map />
-      </option>
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="CHARSET" />
-      <option name="USE_ALTERNATIVE_SDK" value="false" />
-      <option name="ALTERNATIVE_SDK_PATH" />
-      <option name="scriptCharset" value="utf8" />
-      <option name="startMode" value="RUN" />
-      <option name="isNonInteractiveModeEnabled" value="false" />
-      <option name="isCompileTimeBreakpointsEnabled" value="false" />
-      <option name="initCode" value="" />
-      <method />
-    </configuration>
-    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
-      <module name="" />
-      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
-      <option name="PROGRAM_PARAMETERS" />
-      <predefined_log_file id="idea.log" enabled="true" />
-    </configuration>
-    <configuration default="true" type="js.build_tools.npm" factoryName="npm">
-      <command value="run" />
-      <scripts />
-      <node-interpreter value="project" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="mocha-javascript-test-runner" factoryName="Mocha">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <working-directory />
-      <pass-parent-env>true</pass-parent-env>
-      <envs />
-      <ui />
-      <extra-mocha-options />
-      <test-kind>DIRECTORY</test-kind>
-      <test-directory />
-      <recursive>false</recursive>
-      <method />
-    </configuration>
-    <configuration default="true" type="osgi.bnd.run" factoryName="Run Launcher">
-      <method />
-    </configuration>
-    <configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)">
-      <method />
-    </configuration>
     <configuration default="true" type="tests" factoryName="Attests">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -974,26 +603,6 @@
       <option name="USE_PATTERN" value="false" />
       <method />
     </configuration>
-    <configuration default="true" type="tests" factoryName="Doctests">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs />
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <module name="fwstk" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="" />
-      <option name="CLASS_NAME" value="" />
-      <option name="METHOD_NAME" value="" />
-      <option name="FOLDER_NAME" value="" />
-      <option name="TEST_TYPE" value="TEST_SCRIPT" />
-      <option name="PATTERN" value="" />
-      <option name="USE_PATTERN" value="false" />
-      <method />
-    </configuration>
     <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
       <node-interpreter>project</node-interpreter>
       <node-options />
@@ -1117,6 +726,7 @@
       <workItem from="1515419571657" duration="12314000" />
       <workItem from="1515494590332" duration="6979000" />
       <workItem from="1522337389921" duration="866000" />
+      <workItem from="1530632372632" duration="1612000" />
     </task>
     <task id="LOCAL-00001" summary="wip #1111 @0.5">
       <created>1487172253077</created>
@@ -1171,7 +781,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="75291000" />
+    <option name="totallyTimeSpent" value="76903000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1183,43 +793,43 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1176" extended-state="6" />
+    <frame x="-1928" y="-8" width="1936" height="1176" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32934782" />
-      <window_info id="Palette&#9;" order="1" />
-      <window_info id="Image Layers" order="2" />
-      <window_info anchor="right" id="Capture Analysis" order="5" />
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.52132195" side_tool="true" weight="0.32934782" />
       <window_info anchor="right" id="Maven Projects" order="6" />
-      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.47867805" weight="0.32934782" />
-      <window_info anchor="bottom" id="Version Control" order="8" weight="0.32934782" />
-      <window_info anchor="bottom" id="Terminal" order="9" weight="0.32934782" />
+      <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
       <window_info id="Capture Tool" order="3" />
-      <window_info anchor="right" id="Remote Host" order="7" visible="true" weight="0.32995737" />
+      <window_info anchor="right" id="Remote Host" order="7" visible="true" weight="0.21108742" />
       <window_info anchor="right" id="Designer" order="8" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1609808" />
       <window_info anchor="right" id="Database" order="9" />
-      <window_info anchor="right" id="SciView" order="0" />
       <window_info anchor="right" id="Structure" order="13" side_tool="true" weight="0.25" />
       <window_info anchor="right" id="Ant Build" order="2" weight="0.25" />
       <window_info id="UI Designer" order="4" />
-      <window_info anchor="right" id="Theme Preview" order="10" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.32934782" />
+      <window_info anchor="bottom" id="Messages" order="10" sideWeight="0.48720682" weight="0.32755297" />
+      <window_info id="Palette&#9;" order="1" />
+      <window_info id="Image Layers" order="2" />
+      <window_info anchor="right" id="Capture Analysis" order="5" />
+      <window_info anchor="bottom" id="File Transfer" order="11" visible="true" weight="0.32851636" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.47867805" weight="0.32934782" />
+      <window_info anchor="bottom" id="Version Control" order="8" weight="0.32934782" />
+      <window_info anchor="bottom" id="Terminal" order="9" weight="0.32934782" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16257995" />
+      <window_info anchor="bottom" id="Find" order="1" sideWeight="0.49573562" weight="0.32934782" />
+      <window_info anchor="right" id="SciView" order="0" />
+      <window_info anchor="right" id="Theme Preview" order="10" />
       <window_info id="Favorites" order="5" side_tool="true" />
-      <window_info anchor="bottom" id="Messages" order="10" sideWeight="0.48720682" weight="0.32826087" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="1" type="SLIDING" weight="0.4" />
-      <window_info anchor="bottom" id="Find" order="1" sideWeight="0.49573562" weight="0.32934782" />
+      <window_info anchor="right" id="Data View" order="12" />
       <window_info id="Nl-Palette" order="6" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="right" id="Properties" order="11" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="3" weight="0.25" />
-      <window_info anchor="right" id="Data View" order="12" />
-      <window_info anchor="bottom" id="File Transfer" order="11" weight="0.32934782" />
+      <window_info anchor="right" id="Properties" order="11" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1405,13 +1015,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/.ideaLibSources/pdfbox-1.8.13-sources.jar!/org/apache/pdfbox/util/PDFTextStripper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="468" column="13" selection-start-line="468" selection-start-column="13" selection-end-line="468" 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">
@@ -1433,25 +1036,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/TextsThread.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="121">
-          <caret line="183" column="52" selection-start-line="183" selection-start-column="52" selection-end-line="183" selection-end-column="52" />
-          <folding>
-            <element signature="e#6626#6627#0" />
-            <element signature="e#6671#6672#0" />
-          </folding>
-        </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" />
-          <folding>
-            <element signature="e#5748#5749#0" />
-            <element signature="e#5784#5785#0" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1470,10 +1058,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="374">
           <caret line="25" column="47" selection-start-line="25" selection-start-column="47" selection-end-line="25" selection-end-column="47" />
-          <folding>
-            <element signature="e#729#730#0" expanded="true" />
-            <element signature="e#752#753#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1508,33 +1092,16 @@
     <entry file="file://$PROJECT_DIR$/.idea/libraries/commons_lang3_3_7.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/CustomStripper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="11" column="42" selection-start-line="11" selection-start-column="42" selection-end-line="11" selection-end-column="42" />
-        </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="678">
+        <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/Page.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="364">
-          <caret line="88" column="39" selection-start-line="88" selection-start-column="39" selection-end-line="88" selection-end-column="39" />
-          <folding>
-            <element signature="e#2787#2795#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="637">
+        <state relative-caret-position="867">
           <caret line="61" column="34" selection-start-line="61" selection-start-column="34" selection-end-line="61" selection-end-column="34" />
           <folding>
             <element signature="imports" expanded="true" />
@@ -1544,7 +1111,7 @@
     </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="323">
+        <state relative-caret-position="255">
           <caret line="24" column="97" selection-start-line="24" selection-start-column="97" selection-end-line="24" selection-end-column="97" />
           <folding>
             <element signature="imports" expanded="true" />
@@ -1552,6 +1119,27 @@
         </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="617">
+          <caret line="47" column="25" lean-forward="true" selection-start-line="47" selection-start-column="25" selection-end-line="47" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/TextsThread.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2537">
+          <caret line="196" column="61" lean-forward="true" selection-start-line="196" selection-start-column="61" selection-end-line="196" selection-end-column="61" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Page.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="130" column="5" lean-forward="true" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutStripper.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="850">
@@ -1559,10 +1147,23 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Group.java">
+    <entry file="jar://$USER_HOME$/.ideaLibSources/pdfbox-1.8.13-sources.jar!/org/apache/pdfbox/util/PDFTextStripper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="321">
+          <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>
+    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/CustomStripper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="243">
-          <caret line="25" column="32" lean-forward="true" selection-start-line="25" selection-start-column="32" selection-end-line="25" selection-end-column="32" />
+        <state relative-caret-position="310">
+          <caret line="27" column="50" selection-start-line="27" selection-start-column="50" selection-end-line="27" selection-end-column="50" />
         </state>
       </provider>
     </entry>
diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar
index da2f5dcf6f2fb34d590826468fe81a27ba3998a4..4be76c959e54f85b9dcb9a74d18046fe0c884b76 100644
GIT binary patch
delta 12381
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

delta 12642
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

diff --git a/inc/ws/Util/class.ws.util.php b/inc/ws/Util/class.ws.util.php
index 209bffb0f..6bcfb94a5 100644
--- a/inc/ws/Util/class.ws.util.php
+++ b/inc/ws/Util/class.ws.util.php
@@ -51,9 +51,9 @@ class wsUtil
 				}
 
 				if ($assoc) {
-					$worksheets[$title] = $worksheet->toArray(null, true, true);
-				} else {
 					$worksheets[$title] = self::_assocSheet($worksheet->toArray(null, true, true));
+				} else {
+					$worksheets[$title] = $worksheet->toArray(null, true, true);
 				}
 			}
 			file_put_contents($cacheFile, json_encode($worksheets));
diff --git a/inc/ws/Util/html5/advancedseo/class.ws.html5.compiler.php b/inc/ws/Util/html5/advancedseo/class.ws.html5.compiler.php
index 559a8ba88..852ac734d 100644
--- a/inc/ws/Util/html5/advancedseo/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/advancedseo/class.ws.html5.compiler.php
@@ -2,7 +2,7 @@
 
 class wsHTML5Compiler
 {
-	protected static $resolutions = array(150, 300);
+	public static $resolutions = array(150, 300);
 	public $maxRes = 300;
 
 	public $jsFiles = array(
@@ -98,17 +98,17 @@ class wsHTML5Compiler
 	public $pluginCSS = array();
 	public $pluginJs = array();
 	public $htmlmultimedia = array();
-	protected $cssX = array();
-	protected $cssY = array();
-	protected $cssWidths = array();
-	protected $pdf2htmlRatio;
-	protected $scale;
-	protected $multiply;
-	protected $div = array();
-	protected $numerotation;
-	protected $fontDocs = array();
-	protected $dir;
-	protected $z = 3;
+	public $cssX = array();
+	public $cssY = array();
+	public $cssWidths = array();
+	public $pdf2htmlRatio;
+	public $scale;
+	public $multiply;
+	public $div = array();
+	public $numerotation;
+	public $fontDocs = array();
+	public $dir;
+	public $z = 3;
 	public $vdir;
 	public $wdir;
 
@@ -117,52 +117,55 @@ class wsHTML5Compiler
 	 * @var wsBook
 	 */
 	public $book;
-	protected $pages;
-	protected $theme;
+	public $pages;
+	public $theme;
 	public $version;
 	public $book_id;
-	protected $themeRoot;
+	public $themeRoot;
 
 	/**
 	 *
 	 * @var wsDAOBook
 	 */
-	protected $daoBook;
-	protected $needToRecompileContents = true;
-	protected $needToRecompileSettings = true;
+	public $daoBook;
+	public $needToRecompileContents = true;
+	public $needToRecompileSettings = true;
 	public $width;
 	public $height;
-	protected $cssWidth;
-	protected $cssHeight;
-	protected $cssOneWidth;
-	protected $cssOneHeight;
-	protected $cssScale;
-	protected $cssSVGScale;
-	protected $optimalWidth = 567;
-	protected $optimalHeight = 709;
-	protected $additionalConfig = array();
-	protected $fontScale = 1;
-	protected $cache = array();
-	protected $backgroundsPrefix = array();
-	protected $svg = true;
-	protected $config = array();
-	protected $assets = '';
-	protected $phonegap = false;
-	protected $phonegapVersion;
-	protected $standalone = false;
-	protected $hiddenContents = array();
-	protected $appcache;
-	protected $home;
-	protected $widget = true;
-	protected $multiApp = false;
-	protected $pageLabels = array();
-	protected $stylesheets = array();
-	protected $logfp = null;
-	protected $logtime = null;
-	protected $beginBody = array();
-	protected $seoArticles = [];
-	protected $securityPolicyWhitelist = ['*.google-analytics.com', '*.youtube.com', '*.ytimg.com'];
-	protected $seoAdvanced = null;
+	public $cssWidth;
+	public $cssHeight;
+	public $cssOneWidth;
+	public $cssOneHeight;
+	public $cssScale;
+	public $cssSVGScale;
+	public $optimalWidth = 567;
+	public $optimalHeight = 709;
+	public $additionalConfig = array();
+	public $fontScale = 1;
+	public $cache = array();
+	public $backgroundsPrefix = array();
+	public $svg = true;
+	public $config = array();
+	public $assets = '';
+	public $phonegap = false;
+	public $phonegapVersion;
+	public $standalone = false;
+	public $hiddenContents = array();
+	public $appcache;
+	public $home;
+	public $widget = true;
+	public $multiApp = false;
+	public $pageLabels = array();
+	public $stylesheets = array();
+	public $logfp = null;
+	public $logtime = null;
+	public $beginBody = array();
+	public $seoArticles = [];
+	public $securityPolicyWhitelist = ['*.google-analytics.com', '*.youtube.com', '*.ytimg.com'];
+	/**
+	 * @var wsHTML5Seo
+	 */
+	public $seo = null;
 
 
 	function __construct($book_id, $version = 'stable', $phonegap = false, $phonegapVersion = 'latest', $dir = null, $standalone = false, $appcache = false, $home = false)
@@ -358,6 +361,7 @@ class wsHTML5Compiler
 		$this->log('CSS written');
 		$this->writeLangs();
 		$this->log('Langs written');
+		$this->writeSEO();
 		$this->writeIndex();
 		$this->log('Index written');
 		$this->writeSounds();
@@ -368,7 +372,6 @@ class wsHTML5Compiler
 		$this->log('Extras written');
 		$this->writeJs();
 		$this->log('Js written');
-		$this->writeSEO();
 		$this->vdir->sync($delete);
 		$this->log('Files Synced');
 	}
@@ -478,12 +481,11 @@ class wsHTML5Compiler
 	{
 		global $core;
 
-		$html = file_get_contents($this->assets . '/_index.html');
+		$html = $this->seo->pages[1]->getHTML();
 		$uhtml = $html;
 
 		$titre = $this->book->parametres->title;
 
-
 		$daoSignature = new wsDAOSignature($core->con);
 		$signature = $daoSignature->selectById($this->book->parametres->signature);
 
@@ -502,19 +504,6 @@ class wsHTML5Compiler
 
 		$bgcolor = $this->theme->parametres->loadingBackColor;
 
-		// Google analytics
-		$ga = '';
-		if ($this->book->parametres->googleAnalytics != '') {
-			$ga = cubePage::googleAnalytics($this->book->parametres->googleAnalytics);
-		}
-		if ($this->book->parametres->googleAnalyticsCustom != '') {
-			$ga .= $this->book->parametres->googleAnalyticsCustom;
-		}
-
-		$statsfooter = '';
-		if ($this->book->parametres->statsCustom != '') {
-			$statsfooter = $this->book->parametres->statsCustom;
-		}
 		// Feuilles de style
 		$sheets = array_merge($this->stylesheets, $this->specialCSS);
 
@@ -551,7 +540,6 @@ class wsHTML5Compiler
 			$script .= '<script type="text/javascript" charset="utf-8" src="' . $p . '"></script>' . "\n";
 		}
 		$script .= $iscript;
-		$description = '<meta name="description" content="' . html::escapeHTML(isset($this->book->parametres->seoDescription) && $this->book->parametres->seoDescription ? $this->book->parametres->seoDescription : $titre . ' - Powered by Fluidbook') . '">';
 
 		$socialTitle = $this->book->parametres->facebook_title ? $this->book->parametres->facebook_title : $titre;
 		$socialDescription = $this->book->parametres->seoDescription ? $this->book->parametres->seoDescription : $this->book->parametres->seoDescription;
@@ -630,7 +618,7 @@ class wsHTML5Compiler
 		if ($this->phonegap) {
 			$csp = "<meta http-equiv=\"Content-Security-Policy\" content=\"default-src 'self' data: gap: 'unsafe-inline' *; style-src 'self' 'unsafe-inline'; font-src 'self' data:; script-src 'self' 'unsafe-inline' 'unsafe-eval' " . implode(' ', array_unique($this->securityPolicyWhitelist)) . "; img-src * data:\">";
 		}
-		$vars = array('titre', 'credits', 'statsfooter', 'ga', 'style', 'script', 'pagesContents', 'description', 'print', 'hiddenContents', 'splash', 'cache', 'bgcolor', 'message', 'favicon', 'svg', 'beginbody', 'csp', 'opengraph', 'twittercard');
+		$vars = array('credits', 'style', 'script', 'pagesContents', 'print', 'hiddenContents', 'splash', 'cache', 'bgcolor', 'message', 'favicon', 'svg', 'beginbody', 'csp', 'opengraph', 'twittercard');
 		foreach ($vars as $v) {
 			if (isset($$v)) {
 				$html = str_replace('<!-- $' . $v . ' -->', $$v, $html);
@@ -663,13 +651,13 @@ class wsHTML5Compiler
 
 		$thtml = $uhtml;
 
-		$vars = array('titre', 'credits', 'statsfooter', 'ga', 'style', 'script', 'pagesContents', 'print', 'hiddenContents', 'splash', 'cache', 'bgcolor', 'message', 'favicon');
+		$vars = array('credits', 'style', 'script', 'pagesContents', 'print', 'hiddenContents', 'splash', 'cache', 'bgcolor', 'message', 'favicon');
 		foreach ($vars as $v) {
 			$uhtml = str_replace('<!-- $' . $v . ' -->', $$v, $uhtml);
 		}
 
 		$script .= "\n\t\t" . '<script type="text/javascript" charset="utf-8">window.tester = true;</script>';
-		$vars = array('titre', 'credits', 'statsfooter', 'ga', 'style', 'script', 'print', 'hiddenContents', 'splash', 'message');
+		$vars = array('credits', 'style', 'script', 'print', 'hiddenContents', 'splash', 'message');
 		foreach ($vars as $v) {
 			$thtml = str_replace('<!-- $' . $v . ' -->', $$v, $thtml);
 		}
@@ -711,19 +699,7 @@ class wsHTML5Compiler
 			}
 			$this->vdir->file_put_contents('p/' . $seoArticle['url'], $html);
 		}
-
-		// Define default seo contents
-		$seoContents = [];
-
-		foreach ($this->pages as $page => $infos) {
-			$c = ['page' => $page,
-				'text' => file_get_contents(wsDocument::getDir($infos['document_id']) . 'h' . $infos['document_page'] . '.txt')];
-			$seoContents[$page] = $c;
-		}
-
-		if ($this->book->parametres->seoAdvanced) {
-			$this->seoAdvanced = wsUtil::excelToArray($this->wdir . '/' . $this->book->parametres->seoAdvanced,true);
-		}
+		$this->seo = new wsHTML5Seo($this);
 	}
 
 	protected function writeScorm()
diff --git a/inc/ws/Util/html5/advancedseo/class.ws.html5.seo.php b/inc/ws/Util/html5/advancedseo/class.ws.html5.seo.php
new file mode 100644
index 000000000..4f8661f8f
--- /dev/null
+++ b/inc/ws/Util/html5/advancedseo/class.ws.html5.seo.php
@@ -0,0 +1,183 @@
+<?php
+
+class wsHTML5Seo
+{
+	/**
+	 * @var wsHTML5Compiler
+	 */
+	public $compiler;
+	public $pages;
+	protected $_nav = null;
+
+
+	public function __construct($compiler)
+	{
+		$this->compiler = $compiler;
+		// Define default seo contents
+		$this->pages = [];
+
+		foreach ($compiler->pages as $page => $infos) {
+			$p = new wsHTML5SeoPage($this);
+			$p->page = $page;
+			$p->title = $this->_getPageLabel($page);
+			$p->text = $this->getTextContent($infos);
+			$p->description = $this->compiler->book->parametres->seoDescription ? $this->compiler->book->parametres->seoDescription : $this->compiler->book->parametres->title . ' - Powered by Fluidbook';
+			$p->keywords = $this->compiler->book->parametres->seoKeywords;
+			$p->robots = $this->compiler->book->parametres->seoRobots ? 'index,follow' : 'noindex,nofollow';
+
+			// Google analytics
+			$p->ua = '';
+			if ($this->compiler->book->parametres->googleAnalytics != '') {
+				$p->ua .= cubePage::googleAnalytics($this->compiler->book->parametres->googleAnalytics);
+			}
+			if ($this->compiler->book->parametres->googleAnalyticsCustom != '') {
+				$p->ua .= $this->compiler->book->parametres->googleAnalyticsCustom;
+			}
+
+			if ($this->compiler->book->parametres->statsCustom != '') {
+				$p->footer = $this->compiler->book->parametres->statsCustom;
+			}
+
+			$this->pages[$page] = $p;
+		}
+
+
+		if ($compiler->book->parametres->seoAdvanced) {
+			$sheets = wsUtil::excelToArray($compiler->wdir . '/' . $compiler->book->parametres->seoAdvanced, true);
+			foreach ($sheets as $sheet) {
+				$a = $sheet;
+				break;
+			}
+			$minPage = 100000000;
+			foreach ($a as $item) {
+				$minPage = min($minPage, $item['page']);
+			}
+			$offsetPage = -($minPage - 1);
+
+			foreach ($a as $item) {
+				$page = $item['page'] + $offsetPage;
+				foreach ($item as $k => $v) {
+					if ($k == 'page') {
+						continue;
+					}
+					$this->pages[$page]->$k = $v;
+				}
+			}
+		}
+	}
+
+	public function getTextContent($infos)
+	{
+		switch ($this->compiler->book->parametres->textExtraction) {
+			case 'poppler':
+				$prefix = 'p';
+				break;
+			case 'fluidbook':
+				$prefix = 'f';
+				break;
+			default:
+				$prefix = '';
+				break;
+		}
+
+		return file_get_contents(wsDocument::getDir($infos['document_id']) . $prefix . 'h' . $infos['document_page'] . '.txt');
+	}
+
+	public function _getPageLabel($page)
+	{
+		$res = $this->compiler->book->parametres->title;
+		foreach ($this->compiler->book->chapters as $chapter) {
+			$p = $this->compiler->virtualToPhysical($chapter->page);
+			if ($page < $p) {
+				continue;
+			}
+			if ($page >= $p) {
+				$res = $chapter->label;
+			}
+		}
+		return $res;
+	}
+
+	public function getNav()
+	{
+		if (null == $this->_nav) {
+			$this->_nav = '<nav>';
+			foreach ($this->pages as $page => $p) {
+				$this->_nav .= '<a href="' . $p->getUrl() . '">' . $p->title . '</a>';
+			}
+			$this->_nav .= '</nav>';
+		}
+		return $this->_nav;
+	}
+}
+
+class wsHTML5SeoPage
+{
+	public $page;
+	public $text;
+	public $title;
+	public $description;
+	public $url = null;
+	public $h1;
+	public $ua;
+	public $canonical;
+	public $prev;
+	public $next;
+	public $keywords;
+	public $robots;
+	public $footer;
+
+	/**
+	 * @var wsHTML5Seo
+	 */
+	public $_container;
+
+
+	public function __construct($container)
+	{
+		$this->_container = $container;
+	}
+
+	public function getHTML()
+	{
+		$compiler = $this->_container->compiler;
+		$html = file_get_contents($this->_container->compiler->assets . '/_index.html');
+
+
+		$vars = ['description' => $this->description ? '<meta name="description" content="' . $this->description . '">' : '',
+			'keywords' => $this->keywords ? '<meta name="keywords" content="' . $this->keywords . '">' : '',
+			'titre' => $this->title,
+			'canonical' => $this->canonical ? '<link rel="canonical" href="' . $this->canonical . '">' : '',
+			'prev' => $this->prev ? '<meta name="prev" href="' . $this->prev . '">' : '',
+			'next' => $this->next ? '<meta name="next" href="' . $this->next . '">' : '',
+			'robots' => $this->robots ? '<meta name="robots" content="' . $this->robots . '">' : '',
+			'statsfooter' => $this->footer,
+			'ga' => $this->ua,
+			'seoContent' => $this->getSEOContent()];
+
+		foreach ($vars as $k => $var) {
+			$html = str_replace('<!-- $' . $k . ' -->', $var, $html);
+		}
+
+		return $html;
+	}
+
+	public function getSEOContent()
+	{
+		$res = '';
+		if (null !== $this->h1) {
+			$res .= '<h1>' . htmlentities($this->h1) . '</h1>';
+		}
+		$res .= $this->text;
+		$res .= $this->_container->getNav();
+		return $res;
+	}
+
+	public function getURL()
+	{
+		if (null === $this->url) {
+			return $this->page . '-' . CubeIT_Text::str2URL($this->title);
+		}
+		return $this->url;
+	}
+}
\ No newline at end of file
diff --git a/inc/ws/Util/html5/class.ws.html5.php b/inc/ws/Util/html5/class.ws.html5.php
index 38cc1bc01..a221c2961 100644
--- a/inc/ws/Util/html5/class.ws.html5.php
+++ b/inc/ws/Util/html5/class.ws.html5.php
@@ -1,9 +1,11 @@
 <?php
 
-class wsHTML5 {
+class wsHTML5
+{
 	protected static $uaPrefixes = array('-moz-', '-webkit-', '-o-', '-ms-', '');
 
-	public static function compilerFactory($book_id, $version = 'stable', $phonegap = false, $phonegapVersion = 'latest', $dir = null, $standalone = false, $appcache = false, $home = false) {
+	public static function compilerFactory($book_id, $version = 'stable', $phonegap = false, $phonegapVersion = 'latest', $dir = null, $standalone = false, $appcache = false, $home = false)
+	{
 		if (is_null($version)) {
 			global $core;
 			$dao = new wsDAOBook($core->con);
@@ -20,13 +22,13 @@ class wsHTML5 {
 
 		$branchDir = __DIR__ . '/' . $branch . '/';
 		$masterDir = __DIR__ . '/master/';
-		$files = array('class.ws.html5.compiler.php', 'class.ws.html5.links.php');
+		$files = array('class.ws.html5.compiler.php', 'class.ws.html5.links.php', 'class.ws.html5.seo.php');
 
 		if (!class_exists('wsHTML5Compiler', false)) {
 			foreach ($files as $file) {
 				if (file_exists($branchDir . $file)) {
 					require_once $branchDir . $file;
-				} else {
+				} else if (file_exists($masterDir . $file)) {
 					require_once $masterDir . $file;
 				}
 			}
@@ -35,7 +37,8 @@ class wsHTML5 {
 		return new wsHTML5Compiler($book_id, $version, $phonegap, $phonegapVersion, $dir, $standalone, $appcache, $home);
 	}
 
-	public static function getPhonegapVersion($v = 'latest') {
+	public static function getPhonegapVersion($v = 'latest')
+	{
 		if ($v != 'latest') {
 			return $v;
 		}
@@ -44,7 +47,8 @@ class wsHTML5 {
 		return array_pop($versions);
 	}
 
-	public static function getPhonegapVersions() {
+	public static function getPhonegapVersions()
+	{
 		$versions = array();
 		$phonegap_dir = WS_COMPILE_ASSETS . '/_html5/js/libs/phonegap';
 
@@ -62,7 +66,8 @@ class wsHTML5 {
 		return $versions;
 	}
 
-	public static function writeCSSUA($property, $value) {
+	public static function writeCSSUA($property, $value)
+	{
 		$res = array();
 		foreach (self::$uaPrefixes as $prefix) {
 			$res[] = $prefix . $property . ':' . $value;
@@ -70,7 +75,8 @@ class wsHTML5 {
 		return implode(';', $res);
 	}
 
-	public static function colorToArray($color, $forceAlpha = null) {
+	public static function colorToArray($color, $forceAlpha = null)
+	{
 		$color = ltrim($color, '#');
 		if (strlen($color) == 6) {
 			$hex = $color;
@@ -87,7 +93,8 @@ class wsHTML5 {
 		return array('hex' => strtoupper($hex), 'opacity' => number_format($alpha, 3, '.', ''));
 	}
 
-	public static function colorToCSS($color, $forceAlpha = null) {
+	public static function colorToCSS($color, $forceAlpha = null)
+	{
 		return CubeIT_Graphics_Color::colorToCSS($color, $forceAlpha);
 	}
 }
\ No newline at end of file
-- 
2.39.5