Index: branches/5.1.x/core/units/pdf/pdf_text.php
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/units/pdf/pdf_text.php	(.../pdf_text.php)	(revision 12127)
+++ branches/5.1.x/core/units/pdf/pdf_text.php	(.../pdf_text.php)	(revision 12657)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: pdf_text.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: pdf_text.php 12657 2009-10-04 20:07:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -12,37 +12,40 @@
 * See http://www.in-portal.net/license/ for copyright notices and details.
 */
 
+defined('FULL_PATH') or die('restricted access!');
+
 class kPDFTextElement extends kPDFElement {
+
 	protected $Data;
 	public $Ascent;
 	public $Descent;
 	public $Gap;
-	
+
 	public $ContentMinWidth;
 	public $ContentMaxWidht;
-	
+
 	function __construct($data='', $node, $helper)
 	{
 		parent::__construct($node, $helper);
 		$this->SetData($data, 0);
 	}
-	
+
 	function SetData($data)
 	{
 		$this->Data = $data;
 	}
-	
+
 	function Init()
 	{
 		parent::Init();
 		$this->SetCSSProperty('display', 'inline');
 	}
-	
+
 	function ComputeCSSProperties()
 	{
 		parent::ComputeCSSProperties();
 		// http://manual.prod.intechnic.lv/css21/text.html#q8
-		
+
 		$whitespace = str_replace('-', '', $this->GetCSSProperty('white-space')); // remove "-" to avoid confusion
 		if ($whitespace == 'normal' || $whitespace == 'nowrap' || $whitespace == 'preline') {
 			$this->Data = preg_replace('/[\n]{1}[\t\\r ]{1}|[\t\\r ]{1}[\n]{1}/', "\n", $this->Data);
@@ -57,7 +60,7 @@
 			$this->Data = preg_replace('/\t/', ' ', $this->Data);
 			$this->Data = preg_replace('/ [ ]+/', ' ', $this->Data);
 		}
-		
+
 		$transform = $this->GetCSSProperty('text-transform');
 		if ($transform == 'uppercase') {
 			$this->Data = strtoupper($this->Data);
@@ -69,46 +72,46 @@
 			$this->Data = ucwords($this->Data);
 		}
 	}
-	
+
 	function CheckDimensions()
 	{
 		$font_size = $this->GetCSSProperty('font-size');
 		$this->Helper->PDF->SetFont( $this->GetCSSProperty('font-family'), $font_size, $this->GetCSSProperty('font-weight'), $this->GetCSSProperty('font-style'), $this->GetCSSProperty('font-variant'));
 		$this->Ascent = $this->Helper->PDF->GetAscent();
 		$this->Descent = -$this->Helper->PDF->GetDescent(); // ((-$font->getDescent() / $units) * $size);
 		$this->Gap = $this->Helper->PDF->GetLineGap(); // (($font->getLineGap() / $units) * $size);
-		
+
 		// proportionally fit ascent & descent into font-size. Wiered why they are greater...
 		if ($this->Ascent + $this->Descent > $font_size) {
 			$this->Ascent = $this->Ascent/($this->Ascent+$this->Descent)*$font_size;
 			$this->Descent = $this->Descent/($this->Ascent+$this->Descent)*$font_size;
 		}
-		
+
 		if ($this->Helper->DimensionsMode == kPDFHelper::DM_SKIP) {
 			return ;
 		}
-		
+
 		if  ($this->Node->Name  == 'BR') {
 			$this->ContentHeight = $this->Ascent + $this->Descent + $this->Gap;
 			$this->SetCSSProperty('height', $this->ContentHeight);
 			$this->NextLine('');
 			$this->GetLineBox()->Closed();
-			return ; 
+			return ;
 		}
-		
+
 		$whitespace = str_replace('-', '', $this->GetCSSProperty('white-space')); // remove "-" to avoid confusion
-		
+
 		if (!$this->Data) {
 			parent::CheckDimensions();
 			return;
 		}
-		
+
 		$this->Wrap2($whitespace);
-		
+
 		$this->GetLineBox()->Closed();
 		parent::CheckDimensions();
 	}
-	
+
 	function CalcMinMaxContentWidth()
 	{
 		$font_size = $this->GetCSSProperty('font-size');
@@ -126,16 +129,16 @@
 		$this->MinContentWidth = $min_w;
 		parent::CalcMinMaxContentWidth();
 	}
-	
+
 	function Wrap2($whitespace) {
 		$start = $this->GetLineBox()->CurX;
-		
+
 		$data = $this->Data;
-		
+
 		if ($this->Parent->FirstChild === $this && ($whitespace == 'normal' || $whitespace == 'nowrap' || $whitespace == 'preline')) {
 			$data = ltrim($data);
 		}
-		
+
 		$words = preg_split('/([ \[\]\+\(\)]{1})/u', $data, null, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 		$words_count = count($words);
 		$i = 0;
@@ -146,17 +149,17 @@
 			$word_w = $this->Helper->PDF->GetStringWidth($words[$i]);
 			if ( (floor($max_width - $start - $elem_w - $word_w) < 0) && ($i > 0 || $start > 0) ) {
 				$line_break = true;
-				break;		
+				break;
 			}
 			$elem_w += $word_w;
 			$i++;
 		}
 		// remove space at the end of line
 		// @todo Find a way to detect a space at the end of last line, which is NOT wrapped
 		// otherwise right-aligned blocks will have a space at the end of last line
-		if ( ($i > 0 && $words[$i-1]) == ' ' && $line_break && 
+		if ( ($i > 0 && $words[$i-1]) == ' ' && $line_break &&
 				($whitespace == 'normal' || $whitespace == 'nowrap' || $whitespace == 'preline')
-				) { 
+				) {
 			$i--;
 			$elem_w -= $this->Helper->PDF->GetStringWidth($words[$i]);
 			array_splice($words, $i, 1);
@@ -186,13 +189,13 @@
 			} while ($elem && $elem->GetDisplayLevel() == 'inline');
 			$elem->Spacers += $spacers;
 			$this->GetLineBox()->CurX = $start + $elem_w;
-			
+
 			if ($i < $words_count) {
 				$this->NextLine(join( $words ));
 			}
 		}
 	}
-	
+
 	function GetFollowingSiblings()
 	{
 		$cur_line = $this->GetLineBox();
@@ -204,15 +207,15 @@
 		} while ( $elem && !($elem instanceof kPDFLine) );
 		return $cur_line->RemoveChildren($cur_pos+1);
 	}
-	
+
 	function CreateNextLine()
 	{
 		$cur_line = $this->GetLineBox();
 		$cur_line->Closed();
 		if ($this->Node->Name != 'BR') $cur_line->LastLine = false;
-		return $cur_line->Parent->AddChild( new kPDFLine($cur_line->Parent->Node, $this->Helper), true, $cur_line); 
+		return $cur_line->Parent->AddChild( new kPDFLine($cur_line->Parent->Node, $this->Helper), true, $cur_line);
 	}
-	
+
 	function NextLine($words)
 	{
 		$removed = $this->GetFollowingSiblings();
@@ -221,22 +224,22 @@
 			$new_elem = $next_line->AddChild( new kPDFTextElement( $words, $this->Node, $this->Helper ));
 			$new_elem->Closed();
 		}
-		
+
 		foreach ($removed as $elem) {
 			$next_line->AddChild( $elem, false ); //don't init
 		}
 	}
-	
+
 	function DrawAt($page, $x, $y, $spacer_w=0)
 	{
 		$page->SetLineWidth(0.1);
-		
+
 		$y += $this->Ascent; //finding baseline
 		$this->Helper->PDF->SetFont( $this->GetCSSProperty('font-family'), $this->GetCSSProperty('font-size'), $this->GetCSSProperty('font-weight'), $this->GetCSSProperty('font-style'), $this->GetCSSProperty('font-variant'));
 		if ($color = $this->GetCSSProperty('color')) {
 			$page->SetFillColor($color);
 		}
-		
+
 		if (defined('PDF_DEBUG_NO_TEXT')) return ;
 		if ($spacer_w == 0) {
 			$data = preg_replace('/\xA0/u', ' ', $this->Data);
@@ -254,5 +257,5 @@
 		}
 		$this->CurX = $x;
 	}
-	
+
 }
\ No newline at end of file