(no commit message)

diff --git a/fluidbook/tools/convert.pe b/fluidbook/tools/convert.pe
index efc6c41412f8c08839ef8cb3e32d2267de99af32..8c996083fdcdaa4a172cac36147a19c1f685b14e 100644 (file)
--- a/fluidbook/tools/convert.pe
+++ b/fluidbook/tools/convert.pe
@@ -32,6 +32,24 @@ if($argv[i]!="-")
                        j++
                endif
        endloop 
+
+       if(j==0)
+               Print("Empty cmap")
+               Print("Map non-display values to private area")
+               
+               k=1
+
+               Reencode("unicode",1);
+
+               while(k<=32)
+                       SelectNone()
+                       Select(k)
+                       CopyReference()
+                       Select(k+57344)
+                       Paste()
+                       k++
+               endloop
+       endif
 endif
 i++
 Print("Write font ",$argv[i])

diff --git a/fluidbook/tools/fwstk/nbproject/private/private.properties b/fluidbook/tools/fwstk/nbproject/private/private.properties
index 75eb4042cfe9916c9d015a70e633193825e04eb6..c85e5f3f2e1a01c3d61bf97f79be5499643ed027 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/private/private.properties
+++ b/fluidbook/tools/fwstk/nbproject/private/private.properties
@@ -4,4 +4,4 @@ do.depend=false
 do.jar=true\r
 javac.debug=true\r
 javadoc.preview=true\r
-user.properties.file=C:\\Users\\Cube\\.netbeans\\7.0\\build.properties\r
+user.properties.file=C:\\Users\\Vincent\\.netbeans\\7.0\\build.properties\r

diff --git a/fluidbook/tools/fwstk/nbproject/private/private.xml b/fluidbook/tools/fwstk/nbproject/private/private.xml
index b2009378c8fd2d500ba5216b79c265a3b54217ed..cc2c0e57c4f9286a6ee78a9b3557c26caca57415 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/private/private.xml
+++ b/fluidbook/tools/fwstk/nbproject/private/private.xml
@@ -1,8 +1,4 @@
 <?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/Main.java</file>\r
-        <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/cube/util/Array.java</file>\r
-    </open-files>\r
 </project-private>\r

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 6f449afb9d880149ea2f016cfba24bd32dac7480..b53239b29ee50142150737bf6ea664d34e21fff9 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -917,7 +917,11 @@ class wsHTML5Compiler {
                }
                $this->fontDocs[$font][$document_id] = true;
 
-               return $this->getIndex($font, $this->cssFont, array('oblique' => $oblique));
+               
+               
+               $idx= $this->getIndex($font, $this->cssFont, array('oblique' => $oblique));
+               
+               return $idx;
        }
 
        protected function getCSSColor($color) {
@@ -999,7 +1003,7 @@ class wsHTML5Compiler {
                } else {
                        $tab[$value] = array_merge(array('index' => $res), $params);
                }
-               return $res;
+               return $tab[$value];
        }
 
        protected function normalizeFloatValue($value, $round=3) {
@@ -1057,6 +1061,7 @@ class wsHTML5Compiler {
 
                //$in = htmlentities($in, ENT_NOQUOTES, "UTF-8");
                $in = str_replace(' ', '', $in);
+               
 
                return $in;
        }