From fdesbois@users.labs.libre-entreprise.org Fri Jul 17 16:00:57 2009
From: fdesbois@users.labs.libre-entreprise.org
To: jrst-commits@list.nuiton.org
Subject: [Jrst-commits] r383 - trunk/jrst/src/main/resources/xsl
Date: Fri, 17 Jul 2009 16:00:57 +0200
Message-ID: <20090717140057.3D5C116597@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1026557171968466145=="

--===============1026557171968466145==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: fdesbois
Date: 2009-07-17 16:00:57 +0200 (Fri, 17 Jul 2009)
New Revision: 383

Modified:
   trunk/jrst/src/main/resources/xsl/rst2xhtml.xsl
Log:
add support for some parameters (width, height, align) for image directive

Modified: trunk/jrst/src/main/resources/xsl/rst2xhtml.xsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jrst/src/main/resources/xsl/rst2xhtml.xsl	2009-07-17 12:58:29 UTC (=
rev 382)
+++ trunk/jrst/src/main/resources/xsl/rst2xhtml.xsl	2009-07-17 14:00:57 UTC (=
rev 383)
@@ -154,7 +154,7 @@
 	</xsl:template>
 =09
 	<xsl:template match=3D"literal_block">
-		<pre><xsl:value-of select=3D"text()"/></pre>
+		<pre class=3D"literal_block"><xsl:value-of select=3D"text()"/></pre>
 	</xsl:template>
=20
 	<xsl:template match=3D"bullet_list">
@@ -247,19 +247,41 @@
 	</xsl:template>
=20
 	<xsl:template match=3D"image">
-		<!-- todo manage heigth and witdh -->
-		<xsl:if test=3D"@target">
-			<a href=3D"{@target}">
-				<img alt=3D"{@alt}" src=3D"{@uri}"><xsl:apply-templates/></img>
-			</a>
-		</xsl:if>
-		<xsl:if test=3D"not(@target)">
-			<img alt=3D"{@alt}" src=3D"{@uri}"><xsl:apply-templates/></img>
-		</xsl:if>
+                <xsl:choose>
+                    <xsl:when test=3D"(@target) and (@align)">
+                        <p class=3D"align-{@align}">
+                            <a href=3D"{@target}">
+                                <xsl:call-template name=3D"img" />
+                            </a>
+			</p>
+                    </xsl:when>
+                    <xsl:when test=3D"@target">
+                        <a href=3D"{@target}">
+                            <xsl:call-template name=3D"img" />
+                        </a>
+                    </xsl:when>
+                    <xsl:when test=3D"@align">
+                        <p class=3D"align-{@align}">
+                            <xsl:call-template name=3D"img" />
+			</p>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:call-template name=3D"img" />
+                    </xsl:otherwise>
+                </xsl:choose>
 	</xsl:template>
=20
+	<xsl:template name=3D"img">
+            <xsl:element name=3D"img">
+                <xsl:attribute name=3D"alt"><xsl:value-of select=3D"@alt"/><=
/xsl:attribute>
+                <xsl:attribute name=3D"src"><xsl:value-of select=3D"@uri"/><=
/xsl:attribute>
+                <xsl:if test=3D"@width"><xsl:attribute name=3D"width"><xsl:v=
alue-of select=3D"@width"/></xsl:attribute></xsl:if>
+                <xsl:if test=3D"@height"><xsl:attribute name=3D"height"><xsl=
:value-of select=3D"@height"/></xsl:attribute></xsl:if>
+                <xsl:apply-templates/>
+            </xsl:element>
+        </xsl:template>
+
 =09
-=09
 	<xsl:template match=3D"footer">
 		<hr/>
 		<p class=3D"footer"><xsl:apply-templates/></p>


--===============1026557171968466145==--