From 59fa2467ce34673bb127fb026701ab7716064641 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 24 Aug 2017 15:47:44 +0000
Subject: [PATCH] wip #811 @2

---
 fluidbook/tools/fwstk/.idea/workspace.xml     | 135 +++++++++---------
 .../fwstk/out/artifacts/fwstk_jar/fwstk.jar   | Bin 38928515 -> 38928668 bytes
 inc/ws/Metier/class.ws.book.parametres.php    |   3 +-
 .../html5/master/class.ws.html5.compiler.php  |   3 +
 .../vectortexts/class.ws.html5.compiler.php   |   2 +
 5 files changed, 75 insertions(+), 68 deletions(-)

diff --git a/fluidbook/tools/fwstk/.idea/workspace.xml b/fluidbook/tools/fwstk/.idea/workspace.xml
index 5a67bf3a0..036be6d85 100644
--- a/fluidbook/tools/fwstk/.idea/workspace.xml
+++ b/fluidbook/tools/fwstk/.idea/workspace.xml
@@ -7,18 +7,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" readonly="true" id="f146bc67-2578-4de3-9db2-94d2d43e9e83" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Separator.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/artifacts/fwstk_jar/fwstk.jar" afterPath="$PROJECT_DIR$/out/artifacts/fwstk_jar/fwstk.jar" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/deployment.xml" afterPath="$PROJECT_DIR$/.idea/deployment.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Group.java" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Group.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutStripper.java" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutStripper.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Letter.java" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Letter.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Line.java" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Line.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Page.java" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Page.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Space.java" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Space.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Word.java" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Word.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/cube/util/StringUtil.java" afterPath="$PROJECT_DIR$/src/cube/util/StringUtil.java" />
     </list>
     <ignored path="fwstk.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -42,8 +33,8 @@
       <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="427">
-              <caret line="52" column="30" lean-forward="false" selection-start-line="52" selection-start-column="30" selection-end-line="52" selection-end-column="30" />
+            <state relative-caret-position="561">
+              <caret line="43" column="17" lean-forward="false" selection-start-line="43" selection-start-column="17" selection-end-line="43" selection-end-column="17" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -54,8 +45,8 @@
       <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="442">
-              <caret line="99" column="17" lean-forward="true" selection-start-line="99" selection-start-column="17" selection-end-line="99" selection-end-column="17" />
+            <state relative-caret-position="697">
+              <caret line="99" column="15" lean-forward="true" selection-start-line="99" selection-start-column="15" selection-end-line="99" selection-end-column="15" />
               <folding />
             </state>
           </provider>
@@ -74,8 +65,8 @@
       <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="1156">
-              <caret line="82" column="37" lean-forward="false" selection-start-line="82" selection-start-column="37" selection-end-line="82" selection-end-column="37" />
+            <state relative-caret-position="430">
+              <caret line="63" column="16" lean-forward="false" selection-start-line="63" selection-start-column="16" selection-end-line="63" selection-end-column="16" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -86,7 +77,7 @@
       <file leaf-file-name="StringUtil.java" 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="617">
+            <state relative-caret-position="782">
               <caret line="52" column="87" lean-forward="false" selection-start-line="52" selection-start-column="87" selection-end-line="52" selection-end-column="87" />
               <folding>
                 <element signature="e#151#152#0" expanded="true" />
@@ -99,7 +90,7 @@
       <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="238">
+            <state relative-caret-position="1207">
               <caret line="80" column="43" lean-forward="false" selection-start-line="80" selection-start-column="43" selection-end-line="80" selection-end-column="43" />
               <folding />
             </state>
@@ -119,8 +110,8 @@
       <file leaf-file-name="Word.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Word.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="401">
-              <caret line="157" column="42" lean-forward="false" selection-start-line="157" selection-start-column="42" selection-end-line="157" selection-end-column="42" />
+            <state relative-caret-position="535">
+              <caret line="155" column="40" lean-forward="true" selection-start-line="155" selection-start-column="40" selection-end-line="155" selection-end-column="40" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -131,8 +122,8 @@
       <file leaf-file-name="LayoutStripper.java" 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="178">
-              <caret line="40" column="24" lean-forward="false" selection-start-line="40" selection-start-column="24" selection-end-line="40" selection-end-column="24" />
+            <state relative-caret-position="493">
+              <caret line="64" column="24" lean-forward="false" selection-start-line="64" selection-start-column="24" selection-end-line="64" selection-end-column="24" />
               <folding />
             </state>
           </provider>
@@ -141,7 +132,7 @@
       <file leaf-file-name="PDFStreamEngine.class" pinned="false" current-in-tab="false">
         <entry file="jar://$PROJECT_DIR$/lib/pdfbox-1.8.6.jar!/org/apache/pdfbox/util/PDFStreamEngine.class">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-2200">
+            <state relative-caret-position="1156">
               <caret line="103" column="16" lean-forward="false" selection-start-line="103" selection-start-column="16" selection-end-line="103" selection-end-column="16" />
               <folding />
             </state>
@@ -234,7 +225,6 @@
     </navigator>
     <panes>
       <pane id="PackagesPane" />
-      <pane id="AndroidView" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -308,8 +298,9 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scratches" />
+      <pane id="AndroidView" />
       <pane id="Scope" />
+      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -1188,7 +1179,9 @@
       <workItem from="1503064707928" duration="1280000" />
       <workItem from="1503321181453" duration="2310000" />
       <workItem from="1503404277287" duration="12750000" />
-      <workItem from="1503492135605" duration="8416000" />
+      <workItem from="1503492135605" duration="9205000" />
+      <workItem from="1503572393130" duration="1293000" />
+      <workItem from="1503582869459" duration="2692000" />
     </task>
     <task id="LOCAL-00001" summary="wip #1111 @0.5">
       <created>1487172253077</created>
@@ -1204,38 +1197,44 @@
       <option name="project" value="LOCAL" />
       <updated>1503421548272</updated>
     </task>
-    <option name="localTasksCounter" value="3" />
+    <task id="LOCAL-00003" summary="wip #811 @7">
+      <created>1503505996420</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1503505996420</updated>
+    </task>
+    <option name="localTasksCounter" value="4" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="36372000" />
+    <option name="totallyTimeSpent" value="41146000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32826087" sideWeight="0.48720682" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32934782" sideWeight="0.52132195" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32934782" sideWeight="0.47867805" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32934782" sideWeight="0.47867805" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2771855" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2835821" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@@ -1243,7 +1242,9 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32826087" sideWeight="0.48720682" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32936078" sideWeight="0.49573562" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
@@ -1264,11 +1265,20 @@
   <component name="VcsManagerConfiguration">
     <MESSAGE value="wip #1111 @0.5" />
     <MESSAGE value="wip #811 @12" />
-    <option name="LAST_COMMIT_MESSAGE" value="wip #811 @12" />
+    <MESSAGE value="wip #811 @7" />
+    <option name="LAST_COMMIT_MESSAGE" value="wip #811 @7" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="1" />
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Word.java</url>
+          <line>155</line>
+          <properties />
+          <option name="timeStamp" value="1" />
+        </line-breakpoint>
+      </breakpoints>
+      <option name="time" value="2" />
     </breakpoint-manager>
     <watches-manager />
   </component>
@@ -1551,7 +1561,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="68">
           <caret line="11" column="13" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1567,10 +1576,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="194">
           <caret line="187" column="17" lean-forward="false" selection-start-line="187" selection-start-column="17" selection-end-line="187" selection-end-column="17" />
-          <folding>
-            <element signature="e#6938#6939#0" expanded="true" />
-            <element signature="e#6979#6980#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1578,10 +1583,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="255">
           <caret line="18" column="25" lean-forward="false" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />
-          <folding>
-            <element signature="e#353#354#0" expanded="true" />
-            <element signature="e#378#379#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1590,14 +1591,14 @@
         <state relative-caret-position="374">
           <caret line="25" column="29" lean-forward="false" selection-start-line="25" selection-start-column="29" selection-end-line="25" selection-end-column="29" />
           <folding>
-            <element signature="e#579#580#0" expanded="true" />
+            <element signature="e#579#580#0" expanded="false" />
           </folding>
         </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="238">
+        <state relative-caret-position="1207">
           <caret line="80" column="43" lean-forward="false" selection-start-line="80" selection-start-column="43" selection-end-line="80" selection-end-column="43" />
           <folding />
         </state>
@@ -1605,7 +1606,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/cube/util/StringUtil.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="617">
+        <state relative-caret-position="782">
           <caret line="52" column="87" lean-forward="false" selection-start-line="52" selection-start-column="87" selection-end-line="52" selection-end-column="87" />
           <folding>
             <element signature="e#151#152#0" expanded="true" />
@@ -1624,60 +1625,60 @@
     </entry>
     <entry file="jar://$PROJECT_DIR$/lib/pdfbox-1.8.6.jar!/org/apache/pdfbox/util/PDFStreamEngine.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2200">
+        <state relative-caret-position="1156">
           <caret line="103" column="16" lean-forward="false" selection-start-line="103" selection-start-column="16" selection-end-line="103" selection-end-column="16" />
           <folding />
         </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/Space.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="178">
-          <caret line="40" column="24" lean-forward="false" selection-start-line="40" selection-start-column="24" selection-end-line="40" selection-end-column="24" />
+        <state relative-caret-position="102">
+          <caret line="9" column="31" lean-forward="false" selection-start-line="9" selection-start-column="31" selection-end-line="9" selection-end-column="31" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Group.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="1156">
-          <caret line="82" column="37" lean-forward="false" selection-start-line="82" selection-start-column="37" selection-end-line="82" selection-end-column="37" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="493">
+          <caret line="64" column="24" lean-forward="false" selection-start-line="64" selection-start-column="24" selection-end-line="64" selection-end-column="24" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Space.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="102">
-          <caret line="9" column="31" lean-forward="false" selection-start-line="9" selection-start-column="31" selection-end-line="9" selection-end-column="31" />
+        <state relative-caret-position="697">
+          <caret line="99" column="15" lean-forward="true" selection-start-line="99" selection-start-column="15" selection-end-line="99" selection-end-column="15" />
           <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="427">
-          <caret line="52" column="30" lean-forward="false" selection-start-line="52" selection-start-column="30" selection-end-line="52" selection-end-column="30" />
+        <state relative-caret-position="561">
+          <caret line="43" column="17" lean-forward="false" selection-start-line="43" selection-start-column="17" selection-end-line="43" selection-end-column="17" />
           <folding>
             <element signature="imports" 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/Group.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="442">
-          <caret line="99" column="17" lean-forward="true" selection-start-line="99" selection-start-column="17" selection-end-line="99" selection-end-column="17" />
-          <folding />
+        <state relative-caret-position="430">
+          <caret line="63" column="16" lean-forward="false" selection-start-line="63" selection-start-column="16" selection-end-line="63" selection-end-column="16" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </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="401">
-          <caret line="157" column="42" lean-forward="false" selection-start-line="157" selection-start-column="42" selection-end-line="157" selection-end-column="42" />
+        <state relative-caret-position="535">
+          <caret line="155" column="40" lean-forward="true" selection-start-line="155" selection-start-column="40" selection-end-line="155" selection-end-column="40" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar
index 40cb87a807a98b15da051bf6240ff94f3752b678..55faef35d9dbfe6127b041e6eacacb2829ff28db 100644
GIT binary patch
delta 15042
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
KV}zK<$^9Q~k3H7_

delta 14590
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
KH(W|oRQ?Z>gs2Pv

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 919767aa6..ff3cdbc89 100644
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -354,6 +354,7 @@ class wsBookParametres extends wsParametres {
 		                                                               __('Magazine tablette') => 'tab')
 		);
 		$this->fields['rasterizePages'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Ecraser les pages'), 'hint' => '1-3,5 = 1,2,3,5', 'grade' => 1);
+		$this->fields['vectorPages'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Conserver les pages en vecteur'), 'hint' => '1-3,5 = 1,2,3,5', 'grade' => 1);
 
 
 		$this->fields['mobileTransitionDuration'] = array('type' => 'float', 'default' => '1.0', 'editable' => true, 'label' => __('Durée de la transition'));
@@ -371,7 +372,7 @@ class wsBookParametres extends wsParametres {
 		$this->fields['mobileIgnoreBackgroundLinks'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Ignorer les liens de background'));
 
 		$this->forms['mobile'] = array('label' => __('Version mobile'),
-		                               'fieldsnames' => array('alwaysHTML5', 'html5priority', 'mobileNavigationType', '|', 'rasterizePages', '|', 'mobileNavScale', '|', 'mobileTransitions', 'mobileTransitionDuration', "mobileLinksRevealAnim", '|', 'navOrderH', '|', 'mobileIconVector', 'mobileServerConfig', 'mobilePlugins', '|', 'mobileVideosPath', '|', 'mobileExtraXSpace', '|', 'mobileIgnoreBackgroundLinks'));
+		                               'fieldsnames' => array('alwaysHTML5', 'html5priority', 'mobileNavigationType', '|', 'rasterizePages','vectorPages', '|', 'mobileNavScale', '|', 'mobileTransitions', 'mobileTransitionDuration', "mobileLinksRevealAnim", '|', 'navOrderH', '|', 'mobileIconVector', 'mobileServerConfig', 'mobilePlugins', '|', 'mobileVideosPath', '|', 'mobileExtraXSpace', '|', 'mobileIgnoreBackgroundLinks'));
 
 
 		$this->fields['phonegapId'] = array('type' => 'text', 'default' => 'com.fluidbook.phonegap.$id', 'editable' => true, 'label' => __("Identifiant de l'identifiant"), 'grade' => 5, 'hint' => __('De la forme') . ' com.fluidbook.phonegap.xxxxx');
diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index 871a2ff12..654c86697 100644
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -1010,6 +1010,9 @@ class wsHTML5Compiler {
 		$this->config->retinaResolution = $this->maxRes;
 		$this->config->pageLabels = $this->pageLabels;
 		$this->config->pageZoomFactor = $this->z;
+		$this->config->multiply=$this->multiply;
+		$this->config->cssScale=$this->scale;
+		$this->config->pdfZoomFactor=$this->pdf2htmlRatio;
 		if ($this->home) {
 			$this->config->home = 'http://home';
 		}
diff --git a/inc/ws/Util/html5/vectortexts/class.ws.html5.compiler.php b/inc/ws/Util/html5/vectortexts/class.ws.html5.compiler.php
index 5e5699609..e9f8fdc22 100644
--- a/inc/ws/Util/html5/vectortexts/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/vectortexts/class.ws.html5.compiler.php
@@ -29,6 +29,7 @@ class wsHTML5Compiler {
 		'js/libs/gal/gal.js',
 		'js/libs/gal/gal.filesystem.js',
 		'js/libs/interact.js',
+		'js/libs/hammer.js',
 		'js/libs/fluidbook/forms/fluidbook.form.bulle.js',
 		'js/libs/fluidbook/fluidbook.utils.js',
 		'js/libs/fluidbook/fluidbook.links.js',
@@ -1049,6 +1050,7 @@ class wsHTML5Compiler {
 				}
 			}
 		}
+		$this->config->rasterizePages = cubeArray::parseRange($this->config->rasterizePages);
 
 		return 'var DATAS=' . json_encode($this->config) . ';' . "\n";
 	}
-- 
2.39.5