From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 13 Oct 2011 15:23:07 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=f0883f11083d93e96aa49b2d6a53bb65cd2045d0;p=cubeextranet.git

---

diff --git a/fluidbook/tools/convert.pe b/fluidbook/tools/convert.pe
index efc6c4141..8c996083f 100644
--- 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 75eb4042c..c85e5f3f2 100644
--- 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
 javac.debug=true
 javadoc.preview=true
-user.properties.file=C:\\Users\\Cube\\.netbeans\\7.0\\build.properties
+user.properties.file=C:\\Users\\Vincent\\.netbeans\\7.0\\build.properties
diff --git a/fluidbook/tools/fwstk/nbproject/private/private.xml b/fluidbook/tools/fwstk/nbproject/private/private.xml
index b2009378c..cc2c0e57c 100644
--- 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"?>
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
-    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">
-        <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/com/fluidbook/fwstk/Main.java</file>
-        <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/cube/util/Array.java</file>
-    </open-files>
 </project-private>
diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 6f449afb9..b53239b29 100644
--- 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('&thinsp;', '', $in);
+		
 
 		return $in;
 	}