From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Sun, 28 Aug 2011 17:45:14 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=0f36f84c36645e614911b3577341063885af7c02;p=cubeextranet.git

---

diff --git a/.htaccess b/.htaccess
index 2f639c659..5f9dff0ad 100644
--- a/.htaccess
+++ b/.htaccess
@@ -55,5 +55,8 @@ AddCharset UTF-8 log
 
 	RewriteRule ^viewerhu/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/js/(.+)$ fluidbook/compile/_html5/js/$4 [L]	
 	RewriteRule ^viewerhu/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/(.+)$ fluidbook/books/html5/$1/$4 [L]
+
+	RewriteRule ^viewerht/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/js/(.+)$ fluidbook/compile/_html5/js/$4 [L]	
+	RewriteRule ^viewerht/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/(.+)$ fluidbook/books/html5/$1/$4 [L]
 	
 </IfModule>
\ No newline at end of file
diff --git a/fluidbook/tools/FWSTK_Resources/dist/FWSTK_Resources.jar b/fluidbook/tools/FWSTK_Resources/dist/FWSTK_Resources.jar
index 47c9f1356..04d781ae0 100644
Binary files a/fluidbook/tools/FWSTK_Resources/dist/FWSTK_Resources.jar and b/fluidbook/tools/FWSTK_Resources/dist/FWSTK_Resources.jar differ
diff --git a/fluidbook/tools/FWSTK_Resources/nbproject/private/private.properties b/fluidbook/tools/FWSTK_Resources/nbproject/private/private.properties
index bac0930bd..5b986322c 100644
--- a/fluidbook/tools/FWSTK_Resources/nbproject/private/private.properties
+++ b/fluidbook/tools/FWSTK_Resources/nbproject/private/private.properties
@@ -1,2 +1,2 @@
 compile.on.save=true
-user.properties.file=C:\\Users\\Vincent\\.netbeans\\7.0\\build.properties
+user.properties.file=C:\\Users\\Cube\\.netbeans\\7.0\\build.properties
diff --git a/fluidbook/tools/FWSTK_Resources/src/org/apache/pdfbox/resources/LayoutStripper.properties b/fluidbook/tools/FWSTK_Resources/src/org/apache/pdfbox/resources/LayoutStripper.properties
index f40d9848b..1c84790a9 100644
--- a/fluidbook/tools/FWSTK_Resources/src/org/apache/pdfbox/resources/LayoutStripper.properties
+++ b/fluidbook/tools/FWSTK_Resources/src/org/apache/pdfbox/resources/LayoutStripper.properties
@@ -21,11 +21,11 @@ b#=org.apache.pdfbox.util.operator.pagedrawer.CloseFillNonZeroAndStrokePath
 B#=org.apache.pdfbox.util.operator.pagedrawer.FillNonZeroAndStrokePath
 b*#=org.apache.pdfbox.util.operator.pagedrawer.CloseFillEvenOddAndStrokePath
 B*#=org.apache.pdfbox.util.operator.pagedrawer.FillEvenOddAndStrokePath
-#BDC org.apache.pdfbox.util.operator.NotImplemented ##Begin Marked Content -- section 10.5
+BDC# org.apache.pdfbox.util.operator.NotImplemented ##Begin Marked Content -- section 10.5
 BI#=org.apache.pdfbox.util.operator.pagedrawer.BeginInlineImage
-#BMC org.apache.pdfbox.util.operator.NotImplemented ##Begin Marked Content -- section 10.5
+BMC# org.apache.pdfbox.util.operator.NotImplemented ##Begin Marked Content -- section 10.5
 BT=org.apache.pdfbox.util.operator.BeginText
-#BX org.apache.pdfbox.util.operator.NotImplemented
+BX# org.apache.pdfbox.util.operator.NotImplemented
 c#=org.apache.pdfbox.util.operator.pagedrawer.CurveTo
 cm=org.apache.pdfbox.util.operator.Concatenate
 CS=org.apache.pdfbox.util.operator.SetStrokingColorSpace
diff --git a/fluidbook/tools/fwstk/nbproject/build-impl.xml b/fluidbook/tools/fwstk/nbproject/build-impl.xml
index e0ac685fb..ba8fe7e7e 100644
--- a/fluidbook/tools/fwstk/nbproject/build-impl.xml
+++ b/fluidbook/tools/fwstk/nbproject/build-impl.xml
@@ -54,6 +54,43 @@ is divided into following sections:
         <property file="nbproject/project.properties"/>
     </target>
     <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
+        <j2seproject1:property name="platform.home" value="platforms.${platform.active}.home"/>
+        <j2seproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/>
+        <j2seproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/>
+        <j2seproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/>
+        <condition property="platform.javac" value="${platform.home}/bin/javac">
+            <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/>
+        </condition>
+        <property name="platform.javac" value="${platform.javac.tmp}"/>
+        <j2seproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/>
+        <condition property="platform.java" value="${platform.home}/bin/java">
+            <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/>
+        </condition>
+        <property name="platform.java" value="${platform.java.tmp}"/>
+        <j2seproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/>
+        <condition property="platform.javadoc" value="${platform.home}/bin/javadoc">
+            <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/>
+        </condition>
+        <property name="platform.javadoc" value="${platform.javadoc.tmp}"/>
+        <condition property="platform.invalid" value="true">
+            <or>
+                <contains string="${platform.javac}" substring="$${platforms."/>
+                <contains string="${platform.java}" substring="$${platforms."/>
+                <contains string="${platform.javadoc}" substring="$${platforms."/>
+            </or>
+        </condition>
+        <fail unless="platform.home">Must set platform.home</fail>
+        <fail unless="platform.bootcp">Must set platform.bootcp</fail>
+        <fail unless="platform.java">Must set platform.java</fail>
+        <fail unless="platform.javac">Must set platform.javac</fail>
+        <fail if="platform.invalid">
+ The J2SE Platform is not correctly set up.
+ Your active platform is: ${platform.active}, but the corresponding property "platforms.${platform.active}.home" is not found in the project's properties files. 
+ Either open the project in the IDE and setup the Platform with the same name or add it manually.
+ For example like this:
+     ant -Duser.properties.file=&lt;path_to_property_file&gt; jar (where you put the property "platforms.${platform.active}.home" in a .properties file)
+  or ant -Dplatforms.${platform.active}.home=&lt;path_to_JDK_home&gt; jar (where no properties file is used) 
+  </fail>
         <available file="${manifest.file}" property="manifest.available"/>
         <condition property="splashscreen.available">
             <and>
@@ -185,15 +222,6 @@ is divided into following sections:
         <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
             <length length="0" string="${endorsed.classpath}" when="greater"/>
         </condition>
-        <condition else="false" property="jdkBug6558476">
-            <and>
-                <matches pattern="1\.[56]" string="${java.specification.version}"/>
-                <not>
-                    <os family="unix"/>
-                </not>
-            </and>
-        </condition>
-        <property name="javac.fork" value="${jdkBug6558476}"/>
         <property name="jar.index" value="false"/>
         <property name="jar.index.metainf" value="${jar.index}"/>
         <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
@@ -239,7 +267,7 @@ is divided into following sections:
                 <property location="${build.dir}/empty" name="empty.dir"/>
                 <mkdir dir="${empty.dir}"/>
                 <mkdir dir="@{apgeneratedsrcdir}"/>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
                     <src>
                         <dirset dir="@{gensrcdir}" erroronmissingdir="false">
                             <include name="*"/>
@@ -278,7 +306,7 @@ is divided into following sections:
             <sequential>
                 <property location="${build.dir}/empty" name="empty.dir"/>
                 <mkdir dir="${empty.dir}"/>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
                     <src>
                         <dirset dir="@{gensrcdir}" erroronmissingdir="false">
                             <include name="*"/>
@@ -335,7 +363,7 @@ is divided into following sections:
             <attribute default="**" name="testincludes"/>
             <sequential>
                 <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">
                     <batchtest todir="${build.test.results.dir}"/>
                     <classpath>
                         <path path="${run.test.classpath}"/>
@@ -407,6 +435,9 @@ is divided into following sections:
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
+                    <bootclasspath>
+                        <path path="${platform.bootcp}"/>
+                    </bootclasspath>
                 </nbjpdastart>
             </sequential>
         </macrodef>
@@ -422,7 +453,9 @@ is divided into following sections:
         </macrodef>
     </target>
     <target name="-init-debug-args">
-        <property name="version-output" value="java version &quot;${ant.java.version}"/>
+        <exec executable="${platform.java}" outputproperty="version-output">
+            <arg value="-version"/>
+        </exec>
         <condition property="have-jdk-older-than-1.4">
             <or>
                 <contains string="${version-output}" substring="java version &quot;1.0"/>
@@ -447,7 +480,7 @@ is divided into following sections:
             <attribute default="${debug.classpath}" name="classpath"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}">
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg line="${debug-args-line}"/>
                     <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
@@ -472,7 +505,7 @@ is divided into following sections:
             <attribute default="${run.classpath}" name="classpath"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}">
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
                     <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
@@ -655,7 +688,7 @@ is divided into following sections:
             <path path="${run.classpath}"/>
             <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
         </pathconvert>
-        <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
+        <echo level="info">${platform.java} -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
     </target>
     <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
         <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
@@ -682,7 +715,7 @@ is divided into following sections:
         <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
         <echo level="info">To run this application from the command line without Ant, try:</echo>
         <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <echo level="info">java -jar "${dist.jar.resolved}"</echo>
+        <echo level="info">${platform.java} -jar "${dist.jar.resolved}"</echo>
     </target>
     <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
         <delete>
@@ -832,16 +865,15 @@ is divided into following sections:
             -->
     <target depends="init" if="have.sources" name="-javadoc-build">
         <mkdir dir="${dist.javadoc.dir}"/>
-        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" executable="${platform.javadoc}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
-            <fileset dir="${src.src.dir}" excludes="*.java,${excludes}" includes="${includes}">
+            <fileset dir="${src.src.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
             <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
                 <include name="**/*.java"/>
-                <exclude name="*.java"/>
             </fileset>
         </javadoc>
         <copy todir="${dist.javadoc.dir}">
diff --git a/fluidbook/tools/fwstk/nbproject/genfiles.properties b/fluidbook/tools/fwstk/nbproject/genfiles.properties
index 00af3e9f5..c18a0bf72 100644
--- a/fluidbook/tools/fwstk/nbproject/genfiles.properties
+++ b/fluidbook/tools/fwstk/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=5afba316
+build.xml.data.CRC32=0fe54e23
 build.xml.script.CRC32=ef618d2d
-build.xml.stylesheet.CRC32=28e38971@1.44.1.45
+build.xml.stylesheet.CRC32=28e38971@1.43.1.45
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=5afba316
-nbproject/build-impl.xml.script.CRC32=f0904f14
-nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45
+nbproject/build-impl.xml.data.CRC32=0fe54e23
+nbproject/build-impl.xml.script.CRC32=34b388b3
+nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45
diff --git a/fluidbook/tools/fwstk/nbproject/project.properties b/fluidbook/tools/fwstk/nbproject/project.properties
index e1d9e82f1..2bb20f19c 100644
--- a/fluidbook/tools/fwstk/nbproject/project.properties
+++ b/fluidbook/tools/fwstk/nbproject/project.properties
@@ -85,7 +85,7 @@ main.class=com.fluidbook.fwstk.Main
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=false
-platform.active=default_platform
+platform.active=JDK_1.7
 run.classpath=\
     ${build.classes.dir}:\
     ${javac.classpath}
diff --git a/fluidbook/tools/fwstk/nbproject/project.xml b/fluidbook/tools/fwstk/nbproject/project.xml
index a70a3bf29..38eb6a1e3 100644
--- a/fluidbook/tools/fwstk/nbproject/project.xml
+++ b/fluidbook/tools/fwstk/nbproject/project.xml
@@ -4,6 +4,7 @@
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
             <name>fwstk</name>
+            <explicit-platform explicit-source-supported="true"/>
             <source-roots>
                 <root id="src.src.dir"/>
             </source-roots>
diff --git a/fluidbook/tools/fwstk/src/org/apache/pdfbox/util/PDFStreamEngine.java b/fluidbook/tools/fwstk/src/org/apache/pdfbox/util/PDFStreamEngine.java
index 35039c2fd..b58fc4668 100644
--- a/fluidbook/tools/fwstk/src/org/apache/pdfbox/util/PDFStreamEngine.java
+++ b/fluidbook/tools/fwstk/src/org/apache/pdfbox/util/PDFStreamEngine.java
@@ -143,9 +143,7 @@ public class PDFStreamEngine {
 							(OperatorProcessor) klass.newInstance();
 					registerOperatorProcessor(operator, processor);
 				} catch (Exception e) {
-					throw new WrappedIOException(
-							"OperatorProcessor class " + processorClassName
-							+ " could not be instantiated", e);
+					
 				}
 			}
 		}
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index ef586ea8c..89e8d773f 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -128,7 +128,7 @@ class wsUrl {
 				} else {
 					$res .= '<td class="bouton"><a class="popupFSBar" rel="toolbar=yes" rev="viewer_' . $book->book_id . '" href="' . SITE_PATH . 'viewer/' . $book->book_id . '_' . $book->hash . '/">' . $btVoir . '</a></td>';
 				}
-				$res .= '<td class="bouton"><a class="popupFSBar" rel="toolbar=yes" rev="editor_' . $book->book_id . '" href="' . SITE_PATH . 'editor/' . $book->book_id . '">' . $btEdit . '</a></td>';
+				$res .= '<td class="bouton"><a class="popupFSBar" rel="toolbar=yes" rev="editor_' . $book->book_id . '" href="' . SITE_PATH . 'editor/' . $book->book_id . '_' . $book->hash . '">' . $btEdit . '</a></td>';
 			} else {
 				$res.='<td></td><td></td>';
 			}
@@ -431,14 +431,17 @@ class wsUrl {
 		global $core;
 
 		$args = cubePage::getArgs($args);
-		$book_id = $args[0];
+		$e = explode('_', $args[0]);
+		$book_id = $e[0];
+		$hash = isset($e[1]) ? $e[1] : '';
+
 
 		self::checkDocumentVersionOfBook($book_id);
 
 		if ($book_id == 'new') {
 			$dao = new wsDAOBook($core->con);
 			$book = $dao->creeEmpty($core->user->utilisateur_id, $core->user->lang);
-			http::redirect(SITE_PATH . 'editor/' . $book->book_id);
+			http::redirect(SITE_PATH . 'editor/' . $book->book_id . '_' . $book->hash);
 		}
 
 		$res = '<html><head><style type="text/css">';
@@ -449,7 +452,7 @@ html{height:100%}' . "\n";
 		$res .= '<title>' . __('Edition de la publication') . ' #' . $args[0] . '</title>';
 		$res .= '</head>';
 		$res .= '<body onload="this.focus();">';
-		$res .= self::editComposition($args);
+		$res .= self::editComposition($book_id, $hash);
 		$res .= '</body>';
 		$res .= '</html>';
 		echo $res;
@@ -537,9 +540,11 @@ html{height:100%}' . "\n";
 		exit;
 	}
 
-	public static function editComposition($args) {
+	public static function editComposition($book_id,$hash) {
+
 		$fv = array(session_name() => session_id(),
-			'book_id' => $args[0]);
+			'book_id' => $book_id,
+			'hash' => $hash);
 
 		$mtime = filemtime(ROOT . '/swf/composer.swf');
 		return cubeMedia::flash2(WEBROOT . '/swf/composer.swf?junk=' . $mtime, '100%', '100%', $fv, 'composerSwf', 'swfPanel', 10, '#d2d3c7', '', 'false', 'noscale', 'normal', array(), false, true, false);
@@ -621,6 +626,22 @@ html{height:100%}' . "\n";
 		self::commonHTML5Viewer($book_id, $hash, 'u');
 	}
 
+	public static function viewerht($args) {
+		commonDroits::min(5);
+		$args = cubePage::getArgs($args);
+
+		$e = explode('_', $args[0]);
+		if (count($e) == 2 || $e[2] < TIME - 10) {
+			$e[2] = TIME;
+			http::redirect(SITE_PATH . 'viewerht/' . implode('_', $e) . '/');
+			exit;
+		}
+
+		$book_id = $e[0];
+		$hash = $e[1];
+		self::commonHTML5Viewer($book_id, $hash, 't');
+	}
+
 	public static function commonHTML5Viewer($book_id, $hash, $version='') {
 		global $core;
 		self::checkDocumentVersionOfBook($book_id);
@@ -633,9 +654,14 @@ html{height:100%}' . "\n";
 		}
 
 		if (!$dao->isUpToDate($book_id)) {
-			$dao->compile($book_id);
-			$dao->touchCompile($book_id);
+			if ($version == 'u' || $version == 't') {
+				$dao->compileHTML5($book_id);
+			} else {
+				$dao->compile($book_id);
+				$dao->touchCompile($book_id);
+			}
 		}
+
 		echo file_get_contents(WS_BOOKS . '/html5/' . $book_id . '/index' . $version . '.html');
 		exit;
 	}
diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index b9d50160f..b9617e1b0 100644
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -906,7 +906,7 @@ class wsDAOBook extends commonDAO {
 		return $res;
 	}
 
-	protected function compileHTML5($book_id) {
+	public function compileHTML5($book_id) {
 		$htmlCompiler = new wsHTML5Compiler($book_id);
 		$htmlCompiler->compile();
 	}
diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 7e4e4a82a..5287da6f7 100644
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -634,8 +634,8 @@ class wsDocument extends cubeMetier {
 		// Then make HD background shots
 		$resolutions = array(36 => 90, 72 => 80, 150 => 75);
 		foreach ($resolutions as $r => $q) {
-			$texts = false;
-			$this->makeShotPNM($page, 'html/h' . $r . '-', $r, $q, 4, null, $texts);
+			$this->makeShotPNM($page, 'html/h' . $r . '-', $r, $q, 4, null, false);
+			$this->makeShotPNM($page, 'html/t' . $r . '-', $r, $q, 4, null, true);
 		}
 		// Then get layout infos from swf
 		file_put_contents($this->out . '/html/s' . $page . '.layout', $this->dumpSWF($page));
diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 49a8c184d..b09b38e92 100644
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -22,6 +22,15 @@ class wsHTML5Compiler {
 		'js/libs/fluidbook/fluidbook.nav.js',
 		'js/libs/fluidbook/fluidbook.js',
 		'js/main.js');
+	protected static $testJsFiles = array(
+		'js/libs/cube/fb.js',
+		'js/libs/modernizr.js',
+		'js/libs/jquery/jquery.js',
+		'js/libs/jquery/jquery.transform.js',
+		'js/libs/jquery/jquery.mousewheel.js',
+		'js/libs/jquery/jquery.hashchange.js',
+		'js/tester.js'
+	);
 	protected $layouts = array();
 	protected $cssSize = array();
 	protected $cssColor = array();
@@ -57,6 +66,7 @@ class wsHTML5Compiler {
 	protected $optimalWidth = 567;
 	protected $optimalHeight = 709;
 	protected $additionalConfig = array();
+	protected $fontScale = 1;
 
 	function __construct($book_id) {
 		global $core;
@@ -89,9 +99,6 @@ class wsHTML5Compiler {
 			}
 		}
 
-		$imagesize = getimagesize(WS_DOCS . '/' . $this->pages[1]['document_id'] . '/html/h72-' . $this->pages[1]['document_page'] . '.jpg');
-		$this->pdf2htmlRatio = round($imagesize[0] / $this->layouts[1]['width'], 2);
-
 		$daoDoc = new wsDAODocument($core->con);
 		$firstDoc = $daoDoc->selectById($this->pages[1]['document_id']);
 		$size = $firstDoc->generalInfos['size'];
@@ -99,6 +106,10 @@ class wsHTML5Compiler {
 		$this->width = round($size[0], 2);
 		$this->height = round($size[1], 2);
 
+
+		$imagesize = getimagesize(WS_DOCS . '/' . $this->pages[1]['document_id'] . '/html/h72-' . $this->pages[1]['document_page'] . '.jpg');
+		$this->pdf2htmlRatio = round($imagesize[0] / $this->width, 2);
+
 		$this->cssScale = min($this->optimalWidth / $this->width, $this->optimalHeight / $this->height);
 
 		$this->cssWidth = $this->width * $this->cssScale;
@@ -117,6 +128,16 @@ class wsHTML5Compiler {
 		return $p + 1;
 	}
 
+	protected function sortPage($layout) {
+		$lines = array();
+		foreach ($layout->l as $line) {
+			$lines[] = $line;
+		}
+		usort($lines, array($this, 'compareLines'));
+
+		return $lines;
+	}
+
 	protected function compareLines($a, $b) {
 		if ((float) $a['y'] > (float) $b['y']) {
 			return 1;
@@ -126,15 +147,12 @@ class wsHTML5Compiler {
 	}
 
 	public function compile() {
+
+
 		foreach ($this->layouts as $page => $layout) {
-			$this->div[$page] = array();
+			$lines = $this->sortPage($layout);
 			$document_id = $this->pages[$page]['document_id'];
-			$lines = array();
-			foreach ($layout->l as $line) {
-				$lines[] = $line;
-			}
-			usort($lines, array($this, 'compareLines'));
-
+			$this->div[$page] = array();
 			foreach ($lines as $line) {
 				$this->div[$page][] = $this->addLine($line, $document_id);
 			}
@@ -209,13 +227,28 @@ class wsHTML5Compiler {
 		$scripts[] = '<script type="text/javascript" src="data/datas.js"></script>';
 		$script = implode("\n\t\t", $scripts);
 
+		$scripts=array();
+		foreach (self::$testJsFiles as $js) {
+			$scripts[] = '<script type="text/javascript" src="' . $js . '"></script>';
+		}
+		$scripts[] = '<script type="text/javascript" src="data/datas.js"></script>';
+		$script_test = implode("\n\t\t", $scripts);
+
 		$vars = array('titre', 'credits', 'ga', 'style', 'script');
 		foreach ($vars as $v) {
 			$uhtml = str_replace('<!-- $' . $v . ' -->', $$v, $uhtml);
 		}
 
+		$thtml=file_get_contents(WS_COMPILE_ASSETS . '/_html5/tester.html');
+		
+				$vars = array('titre', 'credits', 'ga', 'style', 'script_test');
+		foreach ($vars as $v) {
+			$thtml = str_replace('<!-- $' . $v . ' -->', $$v, $thtml);
+		}
+
 		file_put_contents($this->vdir . '/index.html', $html);
 		file_put_contents($this->vdir . '/indexu.html', $uhtml);
+		file_put_contents($this->vdir . '/indext.html', $thtml);
 	}
 
 	protected function writeLangs() {
@@ -365,6 +398,7 @@ class wsHTML5Compiler {
 		foreach ($this->pages as $page => $infos) {
 			foreach (self::$resolutions as $r) {
 				copy(WS_DOCS . '/' . $infos['document_id'] . '/html/h' . $r . '-' . $infos['document_page'] . '.jpg', $this->vdir . '/data/background/' . $r . '/p' . $page . '.jpg');
+				copy(WS_DOCS . '/' . $infos['document_id'] . '/html/t' . $r . '-' . $infos['document_page'] . '.jpg', $this->vdir . '/data/background/' . $r . '/t' . $page . '.jpg');
 			}
 			copy(WS_DOCS . '/' . $infos['document_id'] . '/p' . $infos['document_page'] . '.jpg', $this->vdir . '/data/thumbnails/p' . $page . '.jpg');
 		}
@@ -372,15 +406,55 @@ class wsHTML5Compiler {
 
 	protected function writePage($page) {
 		$res = '';
+		$page = $this->sortPageLines($page);
 		foreach ($page as $line) {
 			$res .= $this->writeLine($line);
 		}
 		return $res;
 	}
 
+	protected function sortPageLines($page) {
+		$cols = array();
+		// On groupe par x pour tenter de regrouper les paragraphes
+		foreach ($page as $line) {
+			if (!count($line['groups'])) {
+				continue;
+			}
+			$x = (string) $line['groups'][0]['x'];
+			if (!isset($cols[$x])) {
+				$cols[$x] = array();
+			}
+			$cols[$x][] = $line;
+		}
+		// On trie les colonnes
+		usort($cols, array('wsHTML5Compiler', 'sortCols'));
+		// Maintenant, on écrase tout ça
+		$res = array();
+		foreach ($cols as $c) {
+			foreach ($c as $line) {
+				$res[] = $line;
+			}
+		}
+		return $res;
+	}
+
+	protected function sortCols($a, $b) {
+		if ($a[0]['y'] > $b[0]['y']) {
+			return 1;
+		} else if ($a[0]['y'] < $b[0]['y']) {
+			return -1;
+		} else if ($a[0]['groups'][0]['x'] > $b[0]['groups'][0]['x']) {
+			return 1;
+		} else if ($a[0]['groups'][0]['x'] < $b[0]['groups'][0]['x']) {
+			return -1;
+		}
+		return 0;
+	}
+
 	protected function writeLine($line) {
 		$res = '';
 		foreach ($line['groups'] as $group) {
+
 			$res.=$this->writeGroup($group, $line);
 		}
 		return $res;
@@ -393,6 +467,8 @@ class wsHTML5Compiler {
 
 		$group['y'] = $this->getCSSY(($group['y'] + $line['y']) * $this->multiply);
 		$group['x'] = $this->getCSSX(($group['x']) * $this->multiply);
+		$group['letterspacing'] = $this->getCSSLetterSpacing($group['letterspacing'] * $this->multiply);
+		$group['wordspacing'] = $this->getCSSWordSpacing($group['wordspacing'] * $this->multiply);
 
 		$class = array('g');
 		if (!is_null($group['color'])) {
@@ -422,9 +498,7 @@ class wsHTML5Compiler {
 		$class = implode(' ', $class);
 
 		$res = '<div class="' . $class . '">';
-		foreach ($group['spans'] as $span) {
-			$res.=$this->writeSpan($span);
-		}
+		$res.=$group['text'];
 		$res.='</div>';
 		return $res;
 	}
@@ -616,11 +690,11 @@ class wsHTML5Compiler {
 		}
 
 		foreach ($this->cssLetterSpacing as $letterspacing => $index) {
-			$res[] = '.l' . $index . '{letter-spacing:' . $letterspacing . 'em}';
+			$res[] = '.l' . $index . '{letter-spacing:' . $letterspacing . 'px}';
 		}
 
 		foreach ($this->cssWordSpacing as $wordspacing => $index) {
-			$res[] = '.w' . $index . '{word-spacing:' . $wordspacing . 'em}';
+			$res[] = '.w' . $index . '{word-spacing:' . $wordspacing . 'px}';
 		}
 
 		foreach ($this->cssX as $x => $index) {
@@ -647,7 +721,7 @@ class wsHTML5Compiler {
 		}
 
 		foreach ($this->cssFont as $font => $index) {
-			$res[] = "@font-face{font-family:F" . $index . ";src:url('F" . $index . ".woff') format('woff'),url('F" . $index . ".ttf') format('truetype'),url('F" . $index . ".svg#" . $font . "') format('svg')}";
+			$res[] = "@font-face{font-family:F" . $index . ";src:url('F" . $index . ".ttf') format('truetype'),url('F" . $index . ".woff') format('woff'),url('F" . $index . ".svg#" . $font . "') format('svg')}";
 			$res[] = '.f' . $index . '{font-family:F' . $index . ',Arial,Helvetica}';
 		}
 
@@ -698,9 +772,6 @@ class wsHTML5Compiler {
 		}
 
 		usort($tab, array('wsHTML5Compiler', 'sortSpans'));
-		if ($debug) {
-			//fb($tab);
-		}
 
 		$currentGroup = null;
 		$lastParent = null;
@@ -726,10 +797,6 @@ class wsHTML5Compiler {
 		if (!is_null($currentGroup)) {
 			cubeXML::append($l, $currentGroup);
 		}
-
-		if ($debug) {
-			fb($l);
-		}
 		return $l;
 	}
 
@@ -750,136 +817,129 @@ class wsHTML5Compiler {
 		if ($alpha == 0) {
 			return false;
 		}
-
-		$first = true;
-		$letterSpacing = 0;
-		$letterCount = 0;
-		$wordSpacing = 0;
-		$wordCount = 0;
-
 		$res = array();
-		$spans = array();
-
-		foreach ($group->s as $span) {
-			if ($first && trim((string) $span) == '') {
-				continue;
-			}
-			if ($first) {
-				$pos = $x = $span['x'];
-				$pos+=$span['width'];
-				$first = false;
-			} else {
-				if ((float) $span['x'] < (float) $newSpan['x']) {
-					// On change de groupe
-					$ls = $ws = 0;
-					if ($letterCount > 0) {
-						$ls = $letterSpacing / $letterCount;
-					}
-					if ($wordCount > 0) {
-						$ws = $wordSpacing / $wordCount;
-					}
+		$groups = $this->separateGroups($group);
 
-					$res[] = array(
-						'color' => $this->getCSSColor($group['color']),
-						'size' => $this->getCSSSize($group['size']),
-						'font' => $this->getCSSFont((string) $group['font'], $document_id),
-						'letterspacing' => $this->getCSSLetterSpacing($ls),
-						'wordspacing' => $this->getCSSLetterSpacing($ws),
-						'y' => 0,
-						'x' => $x,
-						'spans' => $spans);
-
-					$spans = array();
-					$pos = $x = $span['x'];
-					$pos+=$span['width'];
-				} else {
-
-					$diff = $span['x'] - $pos;
-					if ($diff > $group['size'] / 4) {
-						$space = round($diff / $group['size'], 4);
-						if ($space > 2) {
-							// On change de groupe
-							$ls = $ws = 0;
-							if ($letterCount > 0) {
-								$ls = $letterSpacing / $letterCount;
-							}
-							if ($wordCount > 0) {
-								$ws = $wordSpacing / $wordCount;
-							}
-							$res[] = array(
-								'color' => $this->getCSSColor($group['color']),
-								'size' => $this->getCSSSize($group['size']),
-								'font' => $this->getCSSFont($group['font'], $document_id),
-								'letterspacing' => $this->getCSSLetterSpacing($ls),
-								'wordspacing' => $this->getCSSLetterSpacing($ws),
-								'y' => 0,
-								'x' => $x,
-								'spans' => $spans);
-
-							$spans = array();
-							$pos = $x = $span['x'];
-							$pos+=$span['width'];
-						} else {
-
-							$newSpan = $this->addSpan('<span style="width:' . $space . 'em;"> </span>', true);
-							array_push($spans, $newSpan);
-						}
-					}
-				}
-			}
+		foreach ($groups as $g) {
+			$first = true;
+			$letterSpacing = 0;
+			$letters = 0;
+			$wordSpacing = 0;
+			$spaces = 0;
 
+			$lastWidth = 0;
+			$nextX = 0;
+			$text = '';
 
-			$newSpan = $this->addSpan($span);
-			$pos = $span['x'] + $span['width'];
+			foreach ($g['spans'] as $span) {
+				$char = $span['text'];
 
-			array_push($spans, $newSpan);
-			$copy = (string) $span;
-			$len = mb_strlen($copy);
-			str_replace(' ', '-', $copy, $w);
-			$l = $len - $w;
+				if ($first && trim($char) == "") {
+					continue;
+				}
+				if ($first) {
+					$x = floatval($span['x']);
+					$first = false;
+				}
 
-			$letterCount+=$l;
-			$wordCount+=$w;
+				$text.=$char;
+			}
 
-			$letterSpacing+=$l * (float) $span['letterspacing'];
-			$wordSpacing+=$w * (float) $span['wordspacing'];
-		}
 
-		if (count($spans)) {
-			$ls = $ws = 0;
-			if ($letterCount > 0) {
-				$ls = $letterSpacing / $letterCount;
-			}
-			if ($wordCount > 0) {
-				$ws = $wordSpacing / $wordCount;
-			}
+			$ws = floatval($group['wordspacing']);
+			$ls = floatval($group['letterspacing']);
+			$size = floatval($group['size']);
 
 			$res[] = array(
 				'color' => $this->getCSSColor($group['color']),
 				'size' => $this->getCSSSize($group['size']),
 				'font' => $this->getCSSFont($group['font'], $document_id),
-				'letterspacing' => $this->getCSSLetterSpacing($ls),
-				'wordspacing' => $this->getCSSLetterSpacing($ws),
+				'letterspacing' => $ls * $size,
+				'wordspacing' => $ws * $size,
 				'y' => 0,
 				'x' => $x,
-				'spans' => $spans);
+				'text' => $text);
 		}
-
 		return $res;
 	}
 
-	protected function addSpan($span, $space=false) {
-		$text = (string) $span;
-		return array('text' => $text, 'space' => $space, 'x' => $span['x']);
+	protected function separateGroups($group) {
+		$res = array();
+
+		$first = true;
+		$currentGroup = array('spans' => array());
+		$nextX = 0;
+		$x = 0;
+
+		$spaceWidth = $group['space'];
+		$size = floatval($group['size']);
+		$letterSpacing = floatval($group['letterspacing']) * $size;
+		$wordSpacing = floatval($group['wordspacing']) * $size + $letterSpacing;
+
+		$lastIsSpace = true;
+
+		foreach ($group->s as $span) {
+			$char = (string) $span;
+
+			if ($first && trim($char) == "") {
+				continue;
+			}
+			if ($first) {
+				$x = floatval($span['x']);
+				$first = false;
+			}
+			$sox = floatval($span['x']);
+			$sx = $sox - $x;
+			$sw = floatval($span['width']);
+
+			$diff = $sx - $nextX;
+
+			$s = $char;
+
+			if ($lastIsSpace) {
+				if ($diff > $wordSpacing) {
+					$diff-=$wordSpacing;
+					$diff = round($diff * $this->multiply, 2);
+					if ($diff != 0) {
+						$s = '<span class="gap" style="margin-left:' . $diff . 'px">' . $s . '</span>';
+					}
+				}
+			} else {
+				if ($diff < $letterSpacing) {
+					$diff-=$letterSpacing;
+					$diff = round($diff * $this->multiply, 2);
+					if ($diff != 0) {
+						$s = '<span class="gap" style="margin-left:' . $diff . 'px">' . $s . '</span>';
+					}
+				} else if ($diff > $letterSpacing) {
+					$diff-=$letterSpacing;
+					$diff = round($diff * $this->multiply, 2);
+					if ($diff != 0) {
+						$s = '<span class="gap" style="margin-left:' . $diff . 'px">' . $s . '</span>';
+					}
+				}
+			}
+
+			$newSpan = array('text' => $s, 'x' => $sox);
+			$currentGroup['spans'][] = $newSpan;
+
+
+			$nextX = $sx + $sw;
+			$lastIsSpace = substr($char, -1) == " ";
+		}
+		$res[] = $currentGroup;
+		return $res;
 	}
 
-	protected function getCSSSize($size) {
+	protected function getCSSSize(
+	$size) {
 		$size = $this->normalizeFloatValue($size);
 		$size*=$this->multiply;
 		return $this->getIndex($size, $this->cssSize);
 	}
 
-	protected function getCSSFont($font, $document_id) {
+	protected function getCSSFont(
+	$font, $document_id) {
 		$font = (string) $font;
 		if (!isset($this->fontDocs[$font])) {
 			$this->fontDocs[$font] = array();
@@ -1046,7 +1106,8 @@ class wsHTML5Compiler {
 			} elseif ($alpha == 1) {
 				return '#' . substr($color, 2, 6);
 			}
-			return 'rgba(' . $red . ',' . $green . ',' . $blue . ',' . $alpha . ')';
+			return 'rgba(' . $red . ',' . $green . ',' . $blue . ',' . $alpha
+					. ')';
 		}
 	}
 
diff --git a/inc/ws/_common.php b/inc/ws/_common.php
index 18585940b..e66a211d4 100644
--- a/inc/ws/_common.php
+++ b/inc/ws/_common.php
@@ -18,6 +18,7 @@ $core->url->register('vieweru', 'vieweru', '^vieweru/(.*)$', array('wsUrl', 'vie
 $core->url->register('viewerp', 'viewerp', '^viewerp/(.*)$', array('wsUrl', 'viewerp'));
 $core->url->register('viewerh', 'viewerh', '^viewerh/(.*)$', array('wsUrl', 'viewerh'));
 $core->url->register('viewerhu', 'viewerhu', '^viewerhu/(.*)$', array('wsUrl', 'viewerhu'));
+$core->url->register('viewerht', 'viewerht', '^viewerht/(.*)$', array('wsUrl', 'viewerht'));
 
 if (DEV) {
 	$tools = ROOT . '/../inc/tools/';