wip #1111

diff --git a/fluidbook/tools/fwstk/.idea/workspace.xml b/fluidbook/tools/fwstk/.idea/workspace.xml
index a0e74f38e779facc3179d029e27b0a97ae8b9124..66c3b0f1917e1a81b27ef4511815fe79c5a7c96c 100644 (file)
--- a/fluidbook/tools/fwstk/.idea/workspace.xml
+++ b/fluidbook/tools/fwstk/.idea/workspace.xml
@@ -7,10 +7,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" readonly="true" id="f146bc67-2578-4de3-9db2-94d2d43e9e83" name="Default" comment="">
-      <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/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.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/Main.java" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/Main.java" />
     </list>
     <ignored path="fwstk.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -51,8 +48,8 @@
       <file leaf-file-name="Main.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/Main.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1820">
-              <caret line="690" column="46" lean-forward="true" selection-start-line="690" selection-start-column="46" selection-end-line="690" selection-end-column="46" />
+            <state relative-caret-position="409">
+              <caret line="607" column="48" lean-forward="false" selection-start-line="607" selection-start-column="48" selection-end-line="607" selection-end-column="48" />
               <folding />
             </state>
           </provider>
@@ -1042,12 +1039,20 @@
       <workItem from="1474367539645" duration="4924000" />
       <workItem from="1485968626559" duration="6000" />
       <workItem from="1487167125744" duration="1439000" />
-      <workItem from="1487171443640" duration="776000" />
+      <workItem from="1487171443640" duration="1394000" />
     </task>
+    <task id="LOCAL-00001" summary="wip #1111 @0.5">
+      <created>1487172253077</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1487172253077</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="7145000" />
+    <option name="totallyTimeSpent" value="7763000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -1071,7 +1076,7 @@
       <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="2" 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="3" 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.32936078" sideWeight="0.4914712" order="2" 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.32936078" sideWeight="0.4914712" 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="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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25799572" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -1099,6 +1104,10 @@
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="wip #1111 @0.5" />
+    <option name="LAST_COMMIT_MESSAGE" value="wip #1111 @0.5" />
+  </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
     <watches-manager />
@@ -1324,8 +1333,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/Main.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1820">
-          <caret line="690" column="46" lean-forward="true" selection-start-line="690" selection-start-column="46" selection-end-line="690" selection-end-column="46" />
+        <state relative-caret-position="409">
+          <caret line="607" column="48" lean-forward="false" selection-start-line="607" selection-start-column="48" selection-end-line="607" selection-end-column="48" />
           <folding />
         </state>
       </provider>

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index eb3d7e1399835f4b87f8f6394e033791ca91e237..de3b7af4b2f8f5012b969c37e851d3ccd7624212 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -159,6 +159,7 @@ class wsHTML5Compiler {
        protected $home;
        protected $widget = true;
        protected $multiApp = false;
+       protected $pageLabels = array('two' => 2);
 
        function __construct($book_id, $version = 'stable', $phonegap = false, $phonegapVersion = 'latest', $dir = null, $standalone = false, $appcache = false, $home = false) {
                global $core;
@@ -244,6 +245,10 @@ class wsHTML5Compiler {
                $this->config = cubeObject::merge($this->book->parametres->toStandardObject(), $this->theme->parametres->toStandardObject());
        }
 
+       public function addPageLabel($page, $label) {
+               $this->pageLabels[$label] = $page;
+       }
+
        public function getResolutions() {
                $res = self::$resolutions;
                if ($this->widget) {
@@ -280,6 +285,9 @@ class wsHTML5Compiler {
        }
 
        public function virtualToPhysical($virtual) {
+               if (isset($this->pageLabels[$virtual])) {
+                       return $virtual;
+               }
                if (!in_array($virtual, $this->numerotation)) {
                        return 1;
                }
@@ -741,6 +749,8 @@ class wsHTML5Compiler {
                $cpages = array();
                $css = array();
 
+               usort($links, array($this, '_sortLinks'));
+
                foreach ($links as $linkData) {
                        if (in_array($linkData['type'], $ignore)) {
                                continue;
@@ -791,6 +801,14 @@ class wsHTML5Compiler {
                return $css;
        }
 
+       public function _sortLinks($a, $b) {
+               $priorities = array(26 => 1);
+
+               $pa = isset($priorities[$a['type']]) ? $priorities[$a['type']] : 0;
+               $pb = isset($priorities[$b['type']]) ? $priorities[$b['type']] : 0;
+               return $pb - $pa;
+       }
+
        public function addBookmarkGroup($link) {
                if ($link['left'] > $this->book->parametres->width) {
                        //$link['page']++;
@@ -912,6 +930,7 @@ class wsHTML5Compiler {
                $this->config->htmlmultimedia = $this->htmlmultimedia;
                $this->config->phonegap = $this->phonegap;
                $this->config->retinaResolution = $this->maxRes;
+               $this->config->pageLabels = $this->pageLabels;
                if ($this->home) {
                        $this->config->home = 'http://home';
                }

diff --git a/inc/ws/Util/html5/class.ws.html5.links.php b/inc/ws/Util/html5/class.ws.html5.links.php
index 3cb824a0df8d8ad338c729c93e6bdd19353d87d4..952fed1e30cf1581d1c3691cef8c2fce82581036 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/class.ws.html5.links.php
@@ -121,6 +121,9 @@ class wsHTML5Link {
                        case 25:
                                $compiler->addAudiodescription($init);
                                break;
+                       case 26:
+                               $compiler->addPageLabel($init['page'], $init['to']);
+                               break;
                        default:
                                return null;
                }