wait #5190

diff --git a/fluidbook/tools/fwstk/.idea/runConfigurations.xml b/fluidbook/tools/fwstk/.idea/runConfigurations.xml
deleted file mode 100644 (file)
index 93e4b17..0000000
--- a/fluidbook/tools/fwstk/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<project version="4">\r
-  <component name="RunConfigurationProducerService">\r
-    <option name="ignoredProducers">\r
-      <set>\r
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />\r
-      </set>\r
-    </option>\r
-  </component>\r
-</project>
\ No newline at end of file

diff --git a/fluidbook/tools/fwstk/.idea/workspace.xml b/fluidbook/tools/fwstk/.idea/workspace.xml
index c342875b5ebdd763774066335f0ea49c5dbc5d4e..df16269d71a4c1642d42118ddbb1c823fcce5f53 100644 (file)
--- a/fluidbook/tools/fwstk/.idea/workspace.xml
+++ b/fluidbook/tools/fwstk/.idea/workspace.xml
@@ -7,9 +7,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="f146bc67-2578-4de3-9db2-94d2d43e9e83" name="Default" comment="wip #4097 @0.25">
-      <change afterPath="$PROJECT_DIR$/.idea/runConfigurations.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/runConfigurations.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/artifacts/fwstk_jar/fwstk.jar" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/fwstk_jar/fwstk.jar" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/fluidbook/fwstk/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/Main.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -65,6 +66,21 @@
       <dir>H:\Works\cubeExtranet\fluidbook\tools\fwstk\src</dir>
     </dirStrings>
   </component>
+  <component name="HighlightingSettingsPerFile">
+    <setting file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutStripper.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Separator.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/.idea/artifacts/fwstk_jar.xml" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/Link.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/.idea/copyright/profiles_settings.xml" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Space.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/MANIFEST.MF" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Page.java" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/fwstk.iml" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/src/com/fluidbook/fwstk/Main.java" root0="FORCE_HIGHLIGHTING" />
+  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
   <component name="PhpServers">
     <servers />
   </component>
@@ -410,24 +426,24 @@
     <option name="myMappingRoots">
       <list>
         <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="H:\Works\cubeExtranet\fluidbook\tools\fwstk" />
-          <option name="myCopyRoot" value="H:\Works\cubeExtranet\fluidbook\tools\fwstk" />
+          <option name="myVcsRoot" value="D:\Works\cubeExtranet\fluidbook\tools\fwstk" />
+          <option name="myCopyRoot" value="D:\Works\cubeExtranet\fluidbook\tools\fwstk" />
         </SvnCopyRootSimple>
         <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="H:\Works\cubeExtranet\fluidbook\tools\fwstk" />
-          <option name="myCopyRoot" value="H:\Works\cubeExtranet\fluidbook\tools\fwstk\src\com\fluidbook\fwstk" />
+          <option name="myVcsRoot" value="D:\Works\cubeExtranet\fluidbook\tools\fwstk" />
+          <option name="myCopyRoot" value="D:\Works\cubeExtranet\fluidbook\tools\fwstk\src\com\fluidbook\fwstk" />
         </SvnCopyRootSimple>
       </list>
     </option>
     <option name="myMoreRealMappingRoots">
       <list>
         <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="H:\Works\cubeExtranet\fluidbook\tools\fwstk" />
-          <option name="myCopyRoot" value="H:\Works\cubeExtranet\fluidbook\tools\fwstk" />
+          <option name="myVcsRoot" value="D:\Works\cubeExtranet\fluidbook\tools\fwstk" />
+          <option name="myCopyRoot" value="D:\Works\cubeExtranet\fluidbook\tools\fwstk" />
         </SvnCopyRootSimple>
         <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="H:\Works\cubeExtranet\fluidbook\tools\fwstk" />
-          <option name="myCopyRoot" value="H:\Works\cubeExtranet\fluidbook\tools\fwstk\src\com\fluidbook\fwstk" />
+          <option name="myVcsRoot" value="D:\Works\cubeExtranet\fluidbook\tools\fwstk" />
+          <option name="myCopyRoot" value="D:\Works\cubeExtranet\fluidbook\tools\fwstk\src\com\fluidbook\fwstk" />
         </SvnCopyRootSimple>
       </list>
     </option>
@@ -475,6 +491,7 @@
       <workItem from="1595346736329" duration="5317000" />
       <workItem from="1606322492928" duration="1489000" />
       <workItem from="1631721143268" duration="984000" />
+      <workItem from="1648579261372" duration="3578000" />
     </task>
     <task id="LOCAL-00001" summary="wip #1111 @0.5">
       <created>1487172253077</created>

diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar
index 3dd089ab5796dcb1de058241e7b15fae7dee5723..757f7c1d2ebda94c14f83c24638ff64f7d2780ff 100644 (file)
Binary files a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar and b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar differ

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 803f35ff3c106caa813070c93f1577d728946f6d..94295b0deba92807a42a3e3099dca1b16103f1d9 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -284,6 +284,7 @@ class wsBookParametres extends wsParametres
         );
         $this->fields['forceWhiteBackground'] = ['type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Ajouter un fond blanc aux pages')];
         $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['extraXSpace'] = array('type' => 'integer', 'default' => 0, 'editable' => true, 'label' => __('Marge supplémentaire horizontale'), 'grade' => 3);
         $this->fields['mobileExtraXSpace'] = array('type' => 'integer', 'default' => 0, 'editable' => true, 'label' => __('Marge supplémentaire horizontale'), 'grade' => 3);
@@ -296,13 +297,14 @@ class wsBookParametres extends wsParametres
             'JPEG' => 'jpg', 'PNG' => 'png'), 'grade' => 2, 'label' => __('Format des images'));
         $this->fields['svgToCanvas'] = ['type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer le rendu svgtocanvas')];
         $this->fields['svgToCanvasUpscale'] = ['type' => 'float', 'default' => 1, 'editable' => true, 'label' => __('Upscale de la fonction svgtocanvas')];
+        $this->fields['svgTextMethod'] = ['type' => 'combo', 'default' => 'pdftocairo', 'editable' => true, 'label' => __('Méthode d\'extraction des textes en SVG'), 'datas' => [__('Cairo') => 'pdf', __('Mu') => 'mu']];
         $this->fields['textsThickness'] = ['type' => 'float', 'default' => 1, 'editable' => true, 'label' => __('Epaisseur des textes')];
         $this->fields['textsThicknessPages'] = ['type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Appliquer l\'épaisseur des texte sur les pages')];
         $this->fields['dynamicBackgroundColor'] = ['type' => 'textarea', 'default' => '', 'editable' => true, 'label' => 'Couleur de fond dynamique', 'grade' => 3];
 
 
         $this->forms['3d_mode'] = array('label' => __('Options de visualisation'),
-            'fieldsnames' => array('mobileNavigationType', '|', 'mobileTransitions', 'mobileTransitionDuration', '|', 'forceWhiteBackground', 'rasterizePages', 'vectorPages', 'visualisationMode', 'antialiasReading', 'correctCenter', 'pagesBaseAngle', 'centerBook', '|', 'extraXSpace', 'mobileExtraXSpace', 'extraYSpace', '|', 'viewMode', '|', 'dynamicBackgroundColor', '|', 'svgToCanvas', 'svgToCanvasUpscale', 'textsThickness', 'textsThicknessPages', '|', 'imageFormat', 'maxResolution', 'JPEGQuality'));
+            'fieldsnames' => array('mobileNavigationType', '|', 'mobileTransitions', 'mobileTransitionDuration', '|', 'forceWhiteBackground', 'rasterizePages', 'vectorPages', 'visualisationMode', 'antialiasReading', 'correctCenter', 'pagesBaseAngle', 'centerBook', '|', 'extraXSpace', 'mobileExtraXSpace', 'extraYSpace', '|', 'viewMode', '|', 'dynamicBackgroundColor', '|', 'svgToCanvas', 'svgToCanvasUpscale', 'svgTextMethod', 'textsThickness', 'textsThicknessPages', '|', 'imageFormat', 'maxResolution', 'JPEGQuality'));
 
         $this->fields['rasterizeOnSafari'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Ecraser les pages pour Safari (Mac OS)'), 'grade' => 1);
         $this->fields['performance3DMode'] = array('type' => 'combo', 'datas' => [__('Tester la machine') => 'auto',

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index ebe652bcc44786e3179e0bf1f9fb00c61fe2542a..5117d6073a1e6c1fe135dd9706366f19322c6a0f 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -442,6 +442,7 @@ class wsDocument extends cubeMetier
 
     public function _getFile($page, $format = 'jpg', $resolution = 150, $withText = true, $withGraphics = true, $version = 'html', $force = false)
     {
+
         if ($format === 'jpeg') {
             $format = 'jpg';
         }

diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index 5ebbc175057860cc51722c3badce9a4b360ea0f6..20c6dcd7b2c9b1549cab3d136630242b795d501b 100644 (file)
--- a/inc/ws/Util/class.ws.exporter.php
+++ b/inc/ws/Util/class.ws.exporter.php
@@ -18,8 +18,6 @@ class wsExporter
 
     const VINCENT = "paris.cubedesigners.com";
 
-    //const VINCENT = "tortuga.enhydra.fr";
-
     public function exportCollection($collectionId, $os)
     {
         global $core;
@@ -99,15 +97,13 @@ class wsExporter
         }
 
         $phonegap->setPreference('show-splash-screen-spinner', false);
-        $phonegap->setPreference('auto-hide-splash-screen', false);
+        $phonegap->setPreference('auto-hide-splash-screen', $os==='ios');
         $phonegap->setPreference('ios-statusbarstyle', CubeIT_Mobile_Phonegap::BARSTYLE_TRANSLUCENT);
         $phonegap->setPreference('iosPersistentFileLocation', 'Library');
         $phonegap->setPreference('EnableViewportScale', true);
         $phonegap->addFeatures(array(
                 CubeIT_Mobile_Phonegap::FEATURE_CONNECTION,
                 CubeIT_Mobile_Phonegap::FEATURE_DEVICE,
-                CubeIT_Mobile_Phonegap::FEATURE_FILE,
-                CubeIT_Mobile_Phonegap::FEATURE_FILETRANSFER,
                 CubeIT_Mobile_Phonegap::FEATURE_STORAGE,
                 CubeIT_Mobile_Phonegap::FEATURE_NOTIFICATION_DIALOG,
                 CubeIT_Mobile_Phonegap::FEATURE_INAPPBROWSER,
@@ -122,6 +118,8 @@ class wsExporter
             $phonegap->addFeature(CubeIT_Mobile_Phonegap::FEATURE_STATUSBAR);
             //$phonegap->addFeature(CubeIT_Mobile_Phonegap_IOS::FEATURE_WKWEBVIEW);
         } else if ($os == 'android') {
+            $phonegap->addFeatures([CubeIT_Mobile_Phonegap::FEATURE_FILE,
+                CubeIT_Mobile_Phonegap::FEATURE_FILETRANSFER]);
             $phonegap->addFeature(CubeIT_Mobile_Phonegap::FEATURE_WEBINTENT);
         }
 

diff --git a/inc/ws/Util/class.ws.pdf.convert.php b/inc/ws/Util/class.ws.pdf.convert.php
index e308f63cc2d4303e8eb9b8eef98a7c92a25b8718..4984f8475490717ff8676a81fadc95e2c765cdc4 100644 (file)
--- a/inc/ws/Util/class.ws.pdf.convert.php
+++ b/inc/ws/Util/class.ws.pdf.convert.php
@@ -133,7 +133,7 @@ no-reuse-images
 \r
             $mu = new CubeIT_CommandLine('mutool');\r
             $mu->setArg(null, 'convert');\r
-            $mu->setArg('O', 'text=text');\r
+            $mu->setArg('O', 'text=path');\r
             $mu->setArg('F', 'svg');\r
             $mu->setArg('o', $out);\r
             $mu->setArg(null, $in);\r
@@ -220,7 +220,7 @@ no-reuse-images
                 }\r
             }\r
         }\r
-        $res = $svg->saveXML();\r
+       $res = $svg->saveXML();\r
         $res = preg_replace('/<g clip-path="url\(#clip\d+\)" clip-rule="nonzero"\/>/', '', $res);\r
         while (true) {\r
             $res = preg_replace('/<g clip-path="url\(#clip\d+\)" clip-rule="nonzero"><\/g>/', '', $res, -1, $count);\r