(no commit message)

diff --git a/fluidbook/tools/fwstk/nbproject/private/private.xml b/fluidbook/tools/fwstk/nbproject/private/private.xml
index cc2c0e57c4f9286a6ee78a9b3557c26caca57415..5253e48a89c4a01b2c0a69676eabde4d903c97ec 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/private/private.xml
+++ b/fluidbook/tools/fwstk/nbproject/private/private.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">\r
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>\r
+    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">\r
+        <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/com/fluidbook/fwstk/LayoutStripper.java</file>\r
+        <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/org/apache/pdfbox/util/PDFStreamEngine.java</file>\r
+        <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/org/apache/pdfbox/util/operator/ShowTextGlyph.java</file>\r
+        <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/org/apache/pdfbox/util/operator/ShowText.java</file>\r
+    </open-files>\r
 </project-private>\r

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 483641aaf8a8c7fb385ec75aebf56244a0670024..f1c9835c7a7b5be688a23c3ab800c1e7a4078f06 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -248,14 +248,18 @@ class wsDocument extends cubeMetier {
                        return;\r
                }\r
                $this->manualcut = false;\r
-               if ($first == $last && round($first[0] * 2) == round($second[0])) {\r
+               if (self::compareSizes($last, $first) && cubeMath::compare($first[0] * 2, $second[0], 0.9)) {\r
                        $this->autocut = '1-23-4';\r
                }\r
-               if (round($first[0] * 2) == round($second[0]) && $last == $second) {\r
+               if (cubeMath::compare($first[0] * 2, $second[0], 0.9) && self::compareSizes($last, $second)) {\r
                        $this->autocut = '1-23';\r
                }\r
        }\r
 \r
+       public static function compareSizes($x, $y, $tolerance=0.9) {\r
+               return cubeMath::compare($x[0], $y[0], $tolerance) && cubeMath::compare($x[1], $y[1], $tolerance);\r
+       }\r
+\r
        public function parseInfos($data) {\r
                // This function get general infos (pages sizes, boxes, number sections and\r
                // bookmarks\r