last-svn-commit-991-gbb48d4e Fix text justification in HTML document reconstruction. - Olena-patches

13 Sep 2011

* demo/xml2doc/templates/html/css.css,
	* demo/xml2doc/templates/html/main.xsl,
	* demo/xml2doc/templates/html/main_base64.xsl: Add new CSS rules.
---
 scribo/ChangeLog                                   |    8 +++++++
 scribo/demo/xml2doc/templates/html/css.css         |   12 ++++++++-
 scribo/demo/xml2doc/templates/html/main.xsl        |   23 ++++++++++++++++---
 scribo/demo/xml2doc/templates/html/main_base64.xsl |   16 +++++++++++--
 4 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/scribo/ChangeLog b/scribo/ChangeLog
index f351b82..1c3e5b8 100644
--- a/scribo/ChangeLog
+++ b/scribo/ChangeLog
@@ -1,3 +1,11 @@
+2011-09-13  Guillaume Lazzara  &lt;z(a)lrde.epita.fr&gt;
+
+	Fix text justification in HTML document reconstruction.
+
+	* demo/xml2doc/templates/html/css.css,
+	* demo/xml2doc/templates/html/main.xsl,
+	* demo/xml2doc/templates/html/main_base64.xsl: Add new CSS rules.
+
 2011-09-12  Guillaume Lazzara  &lt;z(a)lrde.epita.fr&gt;
 
 	Small fixes in Scribo.
diff --git a/scribo/demo/xml2doc/templates/html/css.css
b/scribo/demo/xml2doc/templates/html/css.css
index 0443390..baf03cf 100644
--- a/scribo/demo/xml2doc/templates/html/css.css
+++ b/scribo/demo/xml2doc/templates/html/css.css
@@ -3,8 +3,8 @@
     position:absolute;
     background-color:white;
     z-index:7;
-    display:inline;
-    white-space:pre;
+
+    /*white-space:pre;*/
 
     /* FIXME */
     letter-spacing:-2px;
@@ -13,6 +13,9 @@
     margin:0px;
     filter:alpha(opacity=100);
     font-family:"Times New Roman", Times, serif;
+
+    text-align: justify;
+    display: block;
 }
 .para
 {
@@ -28,4 +31,9 @@
 {
     position:absolute;
     border:0;
+}
+.line noop
+{
+    width:1000px;
+    display: inline-block;
 }
\ No newline at end of file
diff --git a/scribo/demo/xml2doc/templates/html/main.xsl
b/scribo/demo/xml2doc/templates/html/main.xsl
index 9492604..46b4b8f 100644
--- a/scribo/demo/xml2doc/templates/html/main.xsl
+++ b/scribo/demo/xml2doc/templates/html/main.xsl
@@ -10,27 +10,41 @@
 	  .line
 	  {
 	  position:absolute;
+	  background-color:white;
 	  z-index:7;
-	  display:inline;
-	  white-space:pre;
+	  /*white-space:pre;*/
 
-	  <!-- FIXME -->
+	  /* FIXME */
 	  letter-spacing:-2px;
 
 	  padding:0px;
 	  margin:0px;
+	  filter:alpha(opacity=100);
 	  font-family:"Times New Roman", Times, serif;
+
+	  text-align: justify;
+	  display: block;
 	  }
-	  .region
+	  .para
 	  {
 	  position:absolute;
 	  z-index:6;
 	  }
+	  .region
+	  {
+	  position:absolute;
+	  z-index:5;
+	  }
 	  .image
 	  {
 	  position:absolute;
 	  border:0;
 	  }
+	  .line noop
+	  {
+	  width:1000px;
+	  display: inline-block;
+	  }
 	</style>
       </head>
       <body>
@@ -222,6 +236,7 @@
 	      color:<xsl:value-of select="$color" />;
 	    </xsl:attribute>
 	    <xsl:value-of select="@text"/>
+	    <noop />
 	  </span>
 	  <!-- ENF OF TEXT LINE -->
   </xsl:template>
diff --git a/scribo/demo/xml2doc/templates/html/main_base64.xsl
b/scribo/demo/xml2doc/templates/html/main_base64.xsl
index 79489e6..623f4a2 100644
--- a/scribo/demo/xml2doc/templates/html/main_base64.xsl
+++ b/scribo/demo/xml2doc/templates/html/main_base64.xsl
@@ -7,13 +7,13 @@
 	<meta http-equiv="Content-Type" content="text/html;
charset=UTF-8" />
 	<title>SCRIBO</title>
 	<style type="text/css">
-     	  .line
+	  .line
 	  {
 	  position:absolute;
 	  background-color:white;
 	  z-index:7;
-	  display:inline;
-	  white-space:pre;
+
+	  /* white-space:pre; */
 
 	  /* FIXME */
 	  letter-spacing:-2px;
@@ -22,6 +22,9 @@
 	  margin:0px;
 	  filter:alpha(opacity=100);
 	  font-family:"Times New Roman", Times, serif;
+
+	  text-align: justify;
+	  display: block;
 	  }
 	  .para
 	  {
@@ -38,6 +41,11 @@
 	  position:absolute;
 	  border:0;
 	  }
+	  .line noop
+	  {
+	  width:1000px;
+	  display: inline-block;
+	  }
 	</style>
 	<!--	<link rel="stylesheet" type="text/css"
href="css.css" /> -->
       </head>
@@ -237,6 +245,7 @@
 	color:<xsl:value-of select="$color" />;
       </xsl:attribute>
       <xsl:value-of select="@text"/>
+      <noop />
     </span>
     <!-- ENF OF TEXT LINE -->
   </xsl:template>
@@ -376,6 +385,7 @@
 	  color:<xsl:value-of select="$color" />;
 	</xsl:attribute>
 	<xsl:value-of select="@text"/>
+	<noop />
       </div>
     </xsl:if>
     <!-- ENF OF TEXT LINE -->
-- 
1.7.2.5


    