From 63a3089a7245cb176a6004cf1b55a195c11bb876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sun, 26 Oct 2014 09:18:00 +0100
Subject: [PATCH] =?UTF-8?q?xsl:=20Bildh=C3=B6he/-breite=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xsd/c3d2web.xsd | 30 ++++++++++++++++--------------
 xsl/xhtml5.xsl  | 32 ++++++++++++++++++++------------
 2 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/xsd/c3d2web.xsd b/xsd/c3d2web.xsd
index 8749bd961..9a78754e2 100644
--- a/xsd/c3d2web.xsd
+++ b/xsd/c3d2web.xsd
@@ -29,13 +29,13 @@
   <xs:element name="item">
     <xs:complexType>
       <xs:sequence>
-	<xs:element ref="image" minOccurs="0"/>
-	<xs:element ref="event" minOccurs="0"/>
-	<xs:group ref="Block.class" minOccurs="0"
-		  maxOccurs="unbounded"/>
-	<xs:element ref="addendum" minOccurs="0"/>
-	<xs:group ref="Block.class" minOccurs="0"
-		  maxOccurs="unbounded"/>
+        <xs:element ref="image" minOccurs="0"/>
+        <xs:element ref="event" minOccurs="0"/>
+        <xs:group ref="Block.class" minOccurs="0"
+          maxOccurs="unbounded"/>
+        <xs:element ref="addendum" minOccurs="0"/>
+        <xs:group ref="Block.class" minOccurs="0"
+          maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="title" type="xs:string" use="required"/>
       <xs:attribute name="date" type="xs:dateTime" use="required"/>
@@ -46,8 +46,8 @@
   <xs:element name="addendum">
     <xs:complexType>
       <xs:sequence>
-	<xs:group ref="Block.class" minOccurs="0"
-		  maxOccurs="unbounded"/>
+        <xs:group ref="Block.class" minOccurs="0"
+          maxOccurs="unbounded"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
@@ -134,10 +134,10 @@
   <xs:element name="p">
     <xs:complexType>
       <xs:complexContent>
-	<xs:extension base="Block">
-	  <xs:attribute name="class" type="xs:string" use="optional"/>
-	  <xs:attribute name="title" type="xs:string" use="optional"/>
-	</xs:extension>
+        <xs:extension base="Block">
+          <xs:attribute name="class" type="xs:string" use="optional"/>
+          <xs:attribute name="title" type="xs:string" use="optional"/>
+        </xs:extension>
       </xs:complexContent>
     </xs:complexType>
   </xs:element>
@@ -145,7 +145,7 @@
   <xs:element name="link">
     <xs:complexType mixed="true">
       <xs:sequence>
-	<xs:element ref="image" minOccurs="0"/>
+        <xs:element ref="image" minOccurs="0"/>
       </xs:sequence>
       <xs:attribute name="href" type="xs:anyURI" use="optional"/>
       <xs:attribute name="class" type="xs:string" use="optional"/>
@@ -157,6 +157,8 @@
       <xs:attribute name="title" type="xs:string" use="required"/>
       <xs:attribute name="class" type="xs:string" use="optional"/>
       <xs:attribute name="thumb" type="xs:string" use="optional"/>
+      <xs:attribute name="width" type="xs:string" use="optional"/>
+      <xs:attribute name="height" type="xs:string" use="optional"/>
     </xs:complexType>
   </xs:element>
 
diff --git a/xsl/xhtml5.xsl b/xsl/xhtml5.xsl
index c8536ddc9..b46761f80 100644
--- a/xsl/xhtml5.xsl
+++ b/xsl/xhtml5.xsl
@@ -220,22 +220,30 @@
 
     <img>
       <xsl:attribute name="src">
-	<xsl:call-template name="normalize-path">
-	  <xsl:with-param name="path">
-	    <xsl:choose>
-	      <xsl:when test="contains(., '://')">
-		<xsl:value-of select="."/>
-	      </xsl:when>
-	      <xsl:otherwise>
-		<xsl:value-of select="concat($baseurl, 'images/news/', .)"/>
-	      </xsl:otherwise>
-	    </xsl:choose>
-	  </xsl:with-param>
-	</xsl:call-template>
+        <xsl:call-template name="normalize-path">
+          <xsl:with-param name="path">
+            <xsl:choose>
+              <xsl:when test="contains(., '://')">
+                <xsl:value-of select="."/>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:value-of select="concat($baseurl, 'images/news/', .)"/>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:with-param>
+        </xsl:call-template>
       </xsl:attribute>
 
       <xsl:attribute name="title"><xsl:value-of select="@title"/></xsl:attribute>
       <xsl:attribute name="alt"><xsl:value-of select="@title"/></xsl:attribute>
+
+      <xsl:if test="@height">
+        <xsl:attribute name="height"><xsl:value-of select="@height"/></xsl:attribute>
+      </xsl:if>
+      <xsl:if test="@width">
+        <xsl:attribute name="width"><xsl:value-of select="@width"/></xsl:attribute>
+      </xsl:if>
+
       <!-- News-Items haben ihre Bilder abwechselnd rechts und links... -->
       <xsl:attribute name="class">
         <xsl:choose>