From 0f36f84c36645e614911b3577341063885af7c02 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Sun, 28 Aug 2011 17:45:14 +0000
Subject: [PATCH]

---
 .htaccess                                     |   3 +
 .../FWSTK_Resources/dist/FWSTK_Resources.jar  | Bin 8004211 -> 8004216 bytes
 .../nbproject/private/private.properties      |   2 +-
 .../resources/LayoutStripper.properties       |   6 +-
 .../tools/fwstk/nbproject/build-impl.xml      |  72 ++--
 .../tools/fwstk/nbproject/genfiles.properties |  10 +-
 .../tools/fwstk/nbproject/project.properties  |   2 +-
 fluidbook/tools/fwstk/nbproject/project.xml   |   1 +
 .../apache/pdfbox/util/PDFStreamEngine.java   |   4 +-
 inc/ws/Controlleur/class.ws.url.php           |  42 ++-
 inc/ws/DAO/class.ws.dao.book.php              |   2 +-
 inc/ws/Metier/class.ws.document.php           |   4 +-
 inc/ws/Util/html5/class.ws.html5.compiler.php | 317 +++++++++++-------
 inc/ws/_common.php                            |   1 +
 14 files changed, 294 insertions(+), 172 deletions(-)

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 47c9f1356656d613734df7f7ee73a61823cb1724..04d781ae03ba332aae4b05a7b41012e446dd7953 100644
GIT binary patch
delta 10163
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

delta 10011
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
F{|8RwfZzZC

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/';
-- 
2.39.5