From 0aca2c1413552b007e65df20a1dd7643ee354370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 1 Sep 2014 13:17:51 +0000
Subject: [PATCH]

---
 include/xslfo2pdf/fo_layout.php | 23 ++++++++++++-----------
 system/xsl/lehrauftrag_0_v3.xsl | 11 ++++++++++-
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/include/xslfo2pdf/fo_layout.php b/include/xslfo2pdf/fo_layout.php
index dec4ee34b..e0473f033 100644
--- a/include/xslfo2pdf/fo_layout.php
+++ b/include/xslfo2pdf/fo_layout.php
@@ -68,19 +68,20 @@ class FO_LayoutObject extends FO_FlowContainer {
   //oesi - convertiert die daten von utf8 nach latin1 und ersetzt 'EURO' durch das eurosymbol
   function convert($str)
   {
+  	
+  	$str = str_replace('ĉ','c',$str);
+  	$str = str_replace('Č','C',$str);
+  	$str = str_replace('č','c',$str);
+  	$str = str_replace('ć','c',$str);
+  	$str = str_replace('Š','S',$str);
+  	$str = str_replace('š','s',$str);
+  	$str = str_replace('ň','n',$str);
+  	$str = str_replace('ř','r',$str);
+  	$str = utf8_decode($str);
   	//echo str_replace('EURO',chr(128),utf8_decode($str));
-	$str = str_replace('EURO',chr(128),$str);
-	$str = str_replace('ĉ','c',$str);
-	$str = str_replace('Č','C',$str);	
-	$str = str_replace('č','c',$str);
-	$str = str_replace('ć','c',$str);
-	$str = str_replace('Š','S',$str);
-	$str = str_replace('š','s',$str);
-	$str = str_replace('ň','n',$str);
-	$str = str_replace('ř','r',$str);
-	
+	$str = str_replace('EURO',chr(128),$str);	
 
-  	return utf8_decode($str);
+  	return $str;
   }
 	
    //Spaltenhoehe Berechnen
diff --git a/system/xsl/lehrauftrag_0_v3.xsl b/system/xsl/lehrauftrag_0_v3.xsl
index 2ae291e9d..4c7885316 100644
--- a/system/xsl/lehrauftrag_0_v3.xsl
+++ b/system/xsl/lehrauftrag_0_v3.xsl
@@ -190,7 +190,16 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 		<fo:table-row  line-height="10pt">
 			<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt" content-width="12mm"><xsl:text> </xsl:text><xsl:value-of select="lehreinheit_id" /></fo:block></fo:table-cell>
 			<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt" content-width="67mm"><xsl:text> </xsl:text><xsl:value-of select="lehrveranstaltung" /></fo:block></fo:table-cell>
-			<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt" content-width="38mm"><xsl:text> </xsl:text><xsl:value-of select="substring(fachbereich,0,25)" /></fo:block></fo:table-cell>
+			<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt" content-width="38mm"><xsl:text> </xsl:text>
+			<xsl:choose>
+				<xsl:when test="string-length(fachbereich)>28">
+					<xsl:value-of select="substring(fachbereich,0,25)" /><xsl:text>...</xsl:text>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="fachbereich" />
+				</xsl:otherwise>
+			</xsl:choose>
+			</fo:block></fo:table-cell>
 			<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt" content-width="30mm" text-align="center"><xsl:value-of select="gruppe" /></fo:block></fo:table-cell>
 			<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt" content-width="10mm" text-align="right"><xsl:value-of select="stunden" /></fo:block></fo:table-cell>
 			<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="8pt" content-width="8mm" text-align="right"><xsl:value-of select="satz" /></fo:block></fo:table-cell>