chamilo / chamilo-lms

main/inc/lib/phpdocx/lib/log4php/LoggerLoggingEvent.php

Doc Comments +3 added lines, -2 removed lines

@@ -117,7 +117,7 @@ 
 	* LoggerLoggingEvent are filled when actually needed.
 	*
 	* @param string $fqcn name of the caller class.
-	* @param mixed $logger The {@link Logger} category of this event or the logger name.
+	* @param Logger $logger The {@link Logger} category of this event or the logger name.
 	* @param LoggerLevel $priority The level of this event.
 	* @param mixed $message The message of this event.
 	* @param integer $timeStamp the timestamp of this logging event.
@@ -249,6 +249,7 @@ 
 	/**
 	 * Returns the the context corresponding to the <code>key</code>
 	 * parameter.
+	 * @param string $key
 	 * @return string
 	 */
 	public function getMDC($key) {
@@ -304,7 +305,7 @@ 
 	
 	/**
 	 * Calculates the time of this event.
-	 * @return the time after event starttime when this event has occured
+	 * @return string time after event starttime when this event has occured
 	 */
 	public function getTime() {
         $eventTime = (float)$this->getTimeStamp();

Spacing +18 added lines, -18 removed lines

@@ -124,7 +124,7 @@ 
 	*/
 	public function __construct($fqcn, $logger, $priority, $message, $timeStamp = null) {
 		$this->fqcn = $fqcn;
-		if($logger instanceof Logger) {
+		if ($logger instanceof Logger) {
 			$this->logger = $logger;
 			$this->categoryName = $logger->getName();
 		} else {
@@ -132,10 +132,10 @@ 
 		}
 		$this->level = $priority;
 		$this->message = $message;
-		if($timeStamp !== null && is_float($timeStamp)) {
+		if ($timeStamp !== null && is_float($timeStamp)) {
 			$this->timeStamp = $timeStamp;
 		} else {
-			if(function_exists('microtime')) {
+			if (function_exists('microtime')) {
 				// get microtime as float
 				$this->timeStamp = microtime(true);
 			} else {
@@ -154,20 +154,20 @@ 
 	 * @return LoggerLocationInfo
 	 */
 	public function getLocationInformation() {
-		if($this->locationInfo === null) {
+		if ($this->locationInfo === null) {
 
 			$locationInfo = array();
 
-			if(function_exists('debug_backtrace')) {
+			if (function_exists('debug_backtrace')) {
 				$trace = debug_backtrace();
 				$prevHop = null;
 				// make a downsearch to identify the caller
 				$hop = array_pop($trace);
-				while($hop !== null) {
-					if(isset($hop['class'])) {
+				while ($hop !== null) {
+					if (isset($hop['class'])) {
 						// we are sometimes in functions = no class available: avoid php warning here
 						$className = strtolower($hop['class']);
-						if(!empty($className) and ($className == 'logger' or $className == 'loggercategory' or 
+						if (!empty($className) and ($className == 'logger' or $className == 'loggercategory' or 
 							strtolower(get_parent_class($className)) == 'logger' or
 							strtolower(get_parent_class($className)) == 'loggercategory')) {
 							$locationInfo['line'] = $hop['line'];
@@ -179,7 +179,7 @@ 
 					$hop = array_pop($trace);
 				}
 				$locationInfo['class'] = isset($prevHop['class']) ? $prevHop['class'] : 'main';
-				if(isset($prevHop['function']) and
+				if (isset($prevHop['function']) and
 					$prevHop['function'] !== 'include' and
 					$prevHop['function'] !== 'include_once' and
 					$prevHop['function'] !== 'require' and
@@ -224,7 +224,7 @@ 
 	 * @return mixed
 	 */
 	public function getMessage() {
-		if($this->message !== null) {
+		if ($this->message !== null) {
 			return $this->message;
 		} else {
 			return $this->getRenderedMessage();
@@ -239,7 +239,7 @@ 
 	 * @return string  
 	 */
 	public function getNDC() {
-		if($this->ndcLookupRequired) {
+		if ($this->ndcLookupRequired) {
 			$this->ndcLookupRequired = false;
 			$this->ndc = implode(' ', LoggerNDC::get());
 		}
@@ -260,8 +260,8 @@ 
 	 * @return string
 	 */
 	public function getRenderedMessage() {
-		if($this->renderedMessage === null and $this->message !== null) {
-			if(is_string($this->message)) {
+		if ($this->renderedMessage === null and $this->message !== null) {
+			if (is_string($this->message)) {
 					$this->renderedMessage = $this->message;
 			} else {
 			    // $this->logger might be null or an instance of Logger or RootLogger
@@ -270,7 +270,7 @@ 
 			    // TODO: Logger::getHierarchy() is marked @deprecated!
 				$repository = Logger::getHierarchy();
 				$rendererMap = $repository->getRendererMap();
-				$this->renderedMessage= $rendererMap->findAndRender($this->message);
+				$this->renderedMessage = $rendererMap->findAndRender($this->message);
 			}
 		}
 		return $this->renderedMessage;
@@ -284,7 +284,7 @@ 
 	 * @static
 	 */
 	public static function getStartTime() {
-		if(!isset(self::$startTime)) {
+		if (!isset(self::$startTime)) {
 			if (function_exists('microtime')) {
 				// microtime as float
 				self::$startTime = microtime(true);
@@ -307,8 +307,8 @@ 
 	 * @return the time after event starttime when this event has occured
 	 */
 	public function getTime() {
-        $eventTime = (float)$this->getTimeStamp();
-        $eventStartTime = (float)LoggerLoggingEvent::getStartTime();
+        $eventTime = (float) $this->getTimeStamp();
+        $eventStartTime = (float) LoggerLoggingEvent::getStartTime();
         return number_format(($eventTime - $eventStartTime) * 1000, 0, '', '');
     }
 	
@@ -317,7 +317,7 @@ 
 	 */
 	public function getThreadName() {
 		if ($this->threadName === null) {
-			$this->threadName = (string)getmypid();
+			$this->threadName = (string) getmypid();
 		}
 		return $this->threadName;
 	}

Indentation +293 added lines, -293 removed lines

@@ -26,334 +26,334 @@
  */
 class LoggerLoggingEvent {
 
-	private static $startTime;
+    private static $startTime;
 
-	/** 
-	* @var string Fully Qualified Class Name of the calling category class.
-	*/
-	private $fqcn;
+    /** 
+     * @var string Fully Qualified Class Name of the calling category class.
+     */
+    private $fqcn;
 	
-	/**
-	* @var Logger reference
-	*/
-	private $logger = null;
+    /**
+     * @var Logger reference
+     */
+    private $logger = null;
 	
-	/** 
-	* The category (logger) name.
-	* This field will be marked as private in future
-	* releases. Please do not access it directly. 
-	* Use the {@link getLoggerName()} method instead.
-	* @deprecated 
-	*/
-	private $categoryName;
+    /** 
+     * The category (logger) name.
+     * This field will be marked as private in future
+     * releases. Please do not access it directly. 
+     * Use the {@link getLoggerName()} method instead.
+     * @deprecated 
+     */
+    private $categoryName;
 	
-	/** 
-	* Level of logging event.
-	* <p> This field should not be accessed directly. You shoud use the
-	* {@link getLevel()} method instead.
-	*
-	* @deprecated
-	* @var LoggerLevel
-	*/
-	protected $level;
+    /** 
+     * Level of logging event.
+     * <p> This field should not be accessed directly. You shoud use the
+     * {@link getLevel()} method instead.
+     *
+     * @deprecated
+     * @var LoggerLevel
+     */
+    protected $level;
 	
-	/** 
-	 * @var string The nested diagnostic context (NDC) of logging event. 
-	 */
-	private $ndc;
+    /** 
+     * @var string The nested diagnostic context (NDC) of logging event. 
+     */
+    private $ndc;
 	
-	/** 
-	 * Have we tried to do an NDC lookup? If we did, there is no need
-	 * to do it again.	Note that its value is always false when
-	 * serialized. Thus, a receiving SocketNode will never use it's own
-	 * (incorrect) NDC. See also writeObject method.
-	 * @var boolean
-	 */
-	private $ndcLookupRequired = true;
+    /** 
+     * Have we tried to do an NDC lookup? If we did, there is no need
+     * to do it again.	Note that its value is always false when
+     * serialized. Thus, a receiving SocketNode will never use it's own
+     * (incorrect) NDC. See also writeObject method.
+     * @var boolean
+     */
+    private $ndcLookupRequired = true;
 	
-	/** 
-	 * Have we tried to do an MDC lookup? If we did, there is no need
-	 * to do it again.	Note that its value is always false when
-	 * serialized. See also the getMDC and getMDCCopy methods.
-	 * @var boolean	 
-	 */
-	private $mdcCopyLookupRequired = true;
+    /** 
+     * Have we tried to do an MDC lookup? If we did, there is no need
+     * to do it again.	Note that its value is always false when
+     * serialized. See also the getMDC and getMDCCopy methods.
+     * @var boolean	 
+     */
+    private $mdcCopyLookupRequired = true;
 	
-	/** 
-	 * @var mixed The application supplied message of logging event. 
-	 */
-	private $message;
+    /** 
+     * @var mixed The application supplied message of logging event. 
+     */
+    private $message;
 	
-	/** 
-	 * The application supplied message rendered through the log4php
-	 * objet rendering mechanism. At present renderedMessage == message.
-	 * @var string
-	 */
-	private $renderedMessage = null;
+    /** 
+     * The application supplied message rendered through the log4php
+     * objet rendering mechanism. At present renderedMessage == message.
+     * @var string
+     */
+    private $renderedMessage = null;
 	
-	/** 
-	 * The name of thread in which this logging event was generated.
-	 * log4php saves here the process id via {@link PHP_MANUAL#getmypid getmypid()} 
-	 * @var mixed
-	 */
-	private $threadName = null;
+    /** 
+     * The name of thread in which this logging event was generated.
+     * log4php saves here the process id via {@link PHP_MANUAL#getmypid getmypid()} 
+     * @var mixed
+     */
+    private $threadName = null;
 	
-	/** 
-	* The number of seconds elapsed from 1/1/1970 until logging event
-	* was created plus microseconds if available.
-	* @var float
-	*/
-	public $timeStamp;
+    /** 
+     * The number of seconds elapsed from 1/1/1970 until logging event
+     * was created plus microseconds if available.
+     * @var float
+     */
+    public $timeStamp;
 	
-	/** 
-	* @var LoggerLocationInfo Location information for the caller. 
-	*/
-	private $locationInfo = null;
+    /** 
+     * @var LoggerLocationInfo Location information for the caller. 
+     */
+    private $locationInfo = null;
 	
-	/**
-	* Instantiate a LoggingEvent from the supplied parameters.
-	*
-	* <p>Except {@link $timeStamp} all the other fields of
-	* LoggerLoggingEvent are filled when actually needed.
-	*
-	* @param string $fqcn name of the caller class.
-	* @param mixed $logger The {@link Logger} category of this event or the logger name.
-	* @param LoggerLevel $priority The level of this event.
-	* @param mixed $message The message of this event.
-	* @param integer $timeStamp the timestamp of this logging event.
-	*/
-	public function __construct($fqcn, $logger, $priority, $message, $timeStamp = null) {
-		$this->fqcn = $fqcn;
-		if($logger instanceof Logger) {
-			$this->logger = $logger;
-			$this->categoryName = $logger->getName();
-		} else {
-			$this->categoryName = strval($logger);
-		}
-		$this->level = $priority;
-		$this->message = $message;
-		if($timeStamp !== null && is_float($timeStamp)) {
-			$this->timeStamp = $timeStamp;
-		} else {
-			if(function_exists('microtime')) {
-				// get microtime as float
-				$this->timeStamp = microtime(true);
-			} else {
-				$this->timeStamp = floatval(time());
-			}
-		}
-	}
+    /**
+     * Instantiate a LoggingEvent from the supplied parameters.
+     *
+     * <p>Except {@link $timeStamp} all the other fields of
+     * LoggerLoggingEvent are filled when actually needed.
+     *
+     * @param string $fqcn name of the caller class.
+     * @param mixed $logger The {@link Logger} category of this event or the logger name.
+     * @param LoggerLevel $priority The level of this event.
+     * @param mixed $message The message of this event.
+     * @param integer $timeStamp the timestamp of this logging event.
+     */
+    public function __construct($fqcn, $logger, $priority, $message, $timeStamp = null) {
+        $this->fqcn = $fqcn;
+        if($logger instanceof Logger) {
+            $this->logger = $logger;
+            $this->categoryName = $logger->getName();
+        } else {
+            $this->categoryName = strval($logger);
+        }
+        $this->level = $priority;
+        $this->message = $message;
+        if($timeStamp !== null && is_float($timeStamp)) {
+            $this->timeStamp = $timeStamp;
+        } else {
+            if(function_exists('microtime')) {
+                // get microtime as float
+                $this->timeStamp = microtime(true);
+            } else {
+                $this->timeStamp = floatval(time());
+            }
+        }
+    }
 
-	/**
-	 * Set the location information for this logging event. The collected
-	 * information is cached for future use.
-	 *
-	 * <p>This method uses {@link PHP_MANUAL#debug_backtrace debug_backtrace()} function (if exists)
-	 * to collect informations about caller.</p>
-	 * <p>It only recognize informations generated by {@link Logger} and its subclasses.</p>
-	 * @return LoggerLocationInfo
-	 */
-	public function getLocationInformation() {
-		if($this->locationInfo === null) {
+    /**
+     * Set the location information for this logging event. The collected
+     * information is cached for future use.
+     *
+     * <p>This method uses {@link PHP_MANUAL#debug_backtrace debug_backtrace()} function (if exists)
+     * to collect informations about caller.</p>
+     * <p>It only recognize informations generated by {@link Logger} and its subclasses.</p>
+     * @return LoggerLocationInfo
+     */
+    public function getLocationInformation() {
+        if($this->locationInfo === null) {
 
-			$locationInfo = array();
+            $locationInfo = array();
 
-			if(function_exists('debug_backtrace')) {
-				$trace = debug_backtrace();
-				$prevHop = null;
-				// make a downsearch to identify the caller
-				$hop = array_pop($trace);
-				while($hop !== null) {
-					if(isset($hop['class'])) {
-						// we are sometimes in functions = no class available: avoid php warning here
-						$className = strtolower($hop['class']);
-						if(!empty($className) and ($className == 'logger' or $className == 'loggercategory' or 
-							strtolower(get_parent_class($className)) == 'logger' or
-							strtolower(get_parent_class($className)) == 'loggercategory')) {
-							$locationInfo['line'] = $hop['line'];
-							$locationInfo['file'] = $hop['file'];
-							break;
-						}
-					}
-					$prevHop = $hop;
-					$hop = array_pop($trace);
-				}
-				$locationInfo['class'] = isset($prevHop['class']) ? $prevHop['class'] : 'main';
-				if(isset($prevHop['function']) and
-					$prevHop['function'] !== 'include' and
-					$prevHop['function'] !== 'include_once' and
-					$prevHop['function'] !== 'require' and
-					$prevHop['function'] !== 'require_once') {
+            if(function_exists('debug_backtrace')) {
+                $trace = debug_backtrace();
+                $prevHop = null;
+                // make a downsearch to identify the caller
+                $hop = array_pop($trace);
+                while($hop !== null) {
+                    if(isset($hop['class'])) {
+                        // we are sometimes in functions = no class available: avoid php warning here
+                        $className = strtolower($hop['class']);
+                        if(!empty($className) and ($className == 'logger' or $className == 'loggercategory' or 
+                            strtolower(get_parent_class($className)) == 'logger' or
+                            strtolower(get_parent_class($className)) == 'loggercategory')) {
+                            $locationInfo['line'] = $hop['line'];
+                            $locationInfo['file'] = $hop['file'];
+                            break;
+                        }
+                    }
+                    $prevHop = $hop;
+                    $hop = array_pop($trace);
+                }
+                $locationInfo['class'] = isset($prevHop['class']) ? $prevHop['class'] : 'main';
+                if(isset($prevHop['function']) and
+                    $prevHop['function'] !== 'include' and
+                    $prevHop['function'] !== 'include_once' and
+                    $prevHop['function'] !== 'require' and
+                    $prevHop['function'] !== 'require_once') {
 	
-					$locationInfo['function'] = $prevHop['function'];
-				} else {
-					$locationInfo['function'] = 'main';
-				}
-			}
+                    $locationInfo['function'] = $prevHop['function'];
+                } else {
+                    $locationInfo['function'] = 'main';
+                }
+            }
 					 
-			$this->locationInfo = new LoggerLocationInfo($locationInfo, $this->fqcn);
-		}
-		return $this->locationInfo;
-	}
+            $this->locationInfo = new LoggerLocationInfo($locationInfo, $this->fqcn);
+        }
+        return $this->locationInfo;
+    }
 
-	/**
-	 * Return the level of this event. Use this form instead of directly
-	 * accessing the {@link $level} field.
-	 * @return LoggerLevel	
-	 */
-	public function getLevel() {
-		return $this->level;
-	}
+    /**
+     * Return the level of this event. Use this form instead of directly
+     * accessing the {@link $level} field.
+     * @return LoggerLevel	
+     */
+    public function getLevel() {
+        return $this->level;
+    }
 
-	/**
-	 * Return the name of the logger. Use this form instead of directly
-	 * accessing the {@link $categoryName} field.
-	 * @return string  
-	 */
-	public function getLoggerName() {
-		return $this->categoryName;
-	}
+    /**
+     * Return the name of the logger. Use this form instead of directly
+     * accessing the {@link $categoryName} field.
+     * @return string  
+     */
+    public function getLoggerName() {
+        return $this->categoryName;
+    }
 
-	/**
-	 * Return the message for this logging event.
-	 *
-	 * <p>Before serialization, the returned object is the message
-	 * passed by the user to generate the logging event. After
-	 * serialization, the returned value equals the String form of the
-	 * message possibly after object rendering.
-	 * @return mixed
-	 */
-	public function getMessage() {
-		if($this->message !== null) {
-			return $this->message;
-		} else {
-			return $this->getRenderedMessage();
-		}
-	}
+    /**
+     * Return the message for this logging event.
+     *
+     * <p>Before serialization, the returned object is the message
+     * passed by the user to generate the logging event. After
+     * serialization, the returned value equals the String form of the
+     * message possibly after object rendering.
+     * @return mixed
+     */
+    public function getMessage() {
+        if($this->message !== null) {
+            return $this->message;
+        } else {
+            return $this->getRenderedMessage();
+        }
+    }
 
-	/**
-	 * This method returns the NDC for this event. It will return the
-	 * correct content even if the event was generated in a different
-	 * thread or even on a different machine. The {@link LoggerNDC::get()} method
-	 * should <b>never</b> be called directly.
-	 * @return string  
-	 */
-	public function getNDC() {
-		if($this->ndcLookupRequired) {
-			$this->ndcLookupRequired = false;
-			$this->ndc = implode(' ', LoggerNDC::get());
-		}
-		return $this->ndc;
-	}
+    /**
+     * This method returns the NDC for this event. It will return the
+     * correct content even if the event was generated in a different
+     * thread or even on a different machine. The {@link LoggerNDC::get()} method
+     * should <b>never</b> be called directly.
+     * @return string  
+     */
+    public function getNDC() {
+        if($this->ndcLookupRequired) {
+            $this->ndcLookupRequired = false;
+            $this->ndc = implode(' ', LoggerNDC::get());
+        }
+        return $this->ndc;
+    }
 
-	/**
-	 * Returns the the context corresponding to the <code>key</code>
-	 * parameter.
-	 * @return string
-	 */
-	public function getMDC($key) {
-		return LoggerMDC::get($key);
-	}
+    /**
+     * Returns the the context corresponding to the <code>key</code>
+     * parameter.
+     * @return string
+     */
+    public function getMDC($key) {
+        return LoggerMDC::get($key);
+    }
 
-	/**
-	 * Render message.
-	 * @return string
-	 */
-	public function getRenderedMessage() {
-		if($this->renderedMessage === null and $this->message !== null) {
-			if(is_string($this->message)) {
-					$this->renderedMessage = $this->message;
-			} else {
-			    // $this->logger might be null or an instance of Logger or RootLogger
-			    // But in contrast to log4j, in log4php there is only have one LoggerHierarchy so there is
-			    // no need figure out which one is $this->logger part of.
-			    // TODO: Logger::getHierarchy() is marked @deprecated!
-				$repository = Logger::getHierarchy();
-				$rendererMap = $repository->getRendererMap();
-				$this->renderedMessage= $rendererMap->findAndRender($this->message);
-			}
-		}
-		return $this->renderedMessage;
-	}
+    /**
+     * Render message.
+     * @return string
+     */
+    public function getRenderedMessage() {
+        if($this->renderedMessage === null and $this->message !== null) {
+            if(is_string($this->message)) {
+                    $this->renderedMessage = $this->message;
+            } else {
+                // $this->logger might be null or an instance of Logger or RootLogger
+                // But in contrast to log4j, in log4php there is only have one LoggerHierarchy so there is
+                // no need figure out which one is $this->logger part of.
+                // TODO: Logger::getHierarchy() is marked @deprecated!
+                $repository = Logger::getHierarchy();
+                $rendererMap = $repository->getRendererMap();
+                $this->renderedMessage= $rendererMap->findAndRender($this->message);
+            }
+        }
+        return $this->renderedMessage;
+    }
 
-	/**
-	 * Returns the time when the application started, in seconds
-	 * elapsed since 01.01.1970 plus microseconds if available.
-	 *
-	 * @return float
-	 * @static
-	 */
-	public static function getStartTime() {
-		if(!isset(self::$startTime)) {
-			if (function_exists('microtime')) {
-				// microtime as float
-				self::$startTime = microtime(true);
-			} else {
-				self::$startTime = floatval(time());
-			}
-		}
-		return self::$startTime; 
-	}
+    /**
+     * Returns the time when the application started, in seconds
+     * elapsed since 01.01.1970 plus microseconds if available.
+     *
+     * @return float
+     * @static
+     */
+    public static function getStartTime() {
+        if(!isset(self::$startTime)) {
+            if (function_exists('microtime')) {
+                // microtime as float
+                self::$startTime = microtime(true);
+            } else {
+                self::$startTime = floatval(time());
+            }
+        }
+        return self::$startTime; 
+    }
 
-	/**
-	 * @return float
-	 */
-	public function getTimeStamp() {
-		return $this->timeStamp;
-	}
+    /**
+     * @return float
+     */
+    public function getTimeStamp() {
+        return $this->timeStamp;
+    }
 	
-	/**
-	 * Calculates the time of this event.
-	 * @return the time after event starttime when this event has occured
-	 */
-	public function getTime() {
+    /**
+     * Calculates the time of this event.
+     * @return the time after event starttime when this event has occured
+     */
+    public function getTime() {
         $eventTime = (float)$this->getTimeStamp();
         $eventStartTime = (float)LoggerLoggingEvent::getStartTime();
         return number_format(($eventTime - $eventStartTime) * 1000, 0, '', '');
     }
 	
-	/**
-	 * @return mixed
-	 */
-	public function getThreadName() {
-		if ($this->threadName === null) {
-			$this->threadName = (string)getmypid();
-		}
-		return $this->threadName;
-	}
+    /**
+     * @return mixed
+     */
+    public function getThreadName() {
+        if ($this->threadName === null) {
+            $this->threadName = (string)getmypid();
+        }
+        return $this->threadName;
+    }
 
-	/**
-	 * @return mixed null
-	 */
-	public function getThrowableInformation() {
-		return null;
-	}
+    /**
+     * @return mixed null
+     */
+    public function getThrowableInformation() {
+        return null;
+    }
 	
-	/**
-	 * Serialize this object
-	 * @return string
-	 */
-	public function toString() {
-		serialize($this);
-	}
+    /**
+     * Serialize this object
+     * @return string
+     */
+    public function toString() {
+        serialize($this);
+    }
 	
-	/**
-	 * Avoid serialization of the {@link $logger} object
-	 */
-	public function __sleep() {
-		return array(
-			'fqcn',
-			'categoryName',
-			'level',
-			'ndc',
-			'ndcLookupRequired',
-			'message',
-			'renderedMessage',
-			'threadName',
-			'timeStamp',
-			'locationInfo',
-		);
-	}
+    /**
+     * Avoid serialization of the {@link $logger} object
+     */
+    public function __sleep() {
+        return array(
+            'fqcn',
+            'categoryName',
+            'level',
+            'ndc',
+            'ndcLookupRequired',
+            'message',
+            'renderedMessage',
+            'threadName',
+            'timeStamp',
+            'locationInfo',
+        );
+    }
 
 }
 

main/inc/lib/phpdocx/lib/log4php/LoggerReflectionUtils.php

Doc Comments +5 added lines, -1 removed lines

@@ -47,6 +47,10 @@ 
 	 * @static
 	 */
 	 // TODO: check, if this is really useful
+
+	/**
+	 * @param string $prefix
+	 */
 	public static function setPropertiesByObject($obj, $properties, $prefix) {
 		$pSetter = new LoggerReflectionUtils($obj);
 		return $pSetter->setProperties($properties, $prefix);
@@ -123,7 +127,7 @@ 
 	/**
 	 * Creates an instances from the given class name.
 	 *
-	 * @param string $classname
+	 * @param string $class
 	 * @return an object from the class with the given classname
 	 */
 	public static function createObject($class) {

Indentation +106 added lines, -106 removed lines

@@ -18,123 +18,123 @@
  * @package log4php
  */
  
- /**
-  * Provides methods for reflective use on php objects
-  * @package log4php
-  */
+    /**
+     * Provides methods for reflective use on php objects
+     * @package log4php
+     */
 class LoggerReflectionUtils {
-		/** the target object */
-	private $obj;
+        /** the target object */
+    private $obj;
   
-	/**
-	 * Create a new LoggerReflectionUtils for the specified Object. 
-	 * This is done in prepartion for invoking {@link setProperty()} 
-	 * one or more times.
-	 * @param object &$obj the object for which to set properties
-	 */
-	public function __construct($obj) {
-		$this->obj = $obj;
-	}
+    /**
+     * Create a new LoggerReflectionUtils for the specified Object. 
+     * This is done in prepartion for invoking {@link setProperty()} 
+     * one or more times.
+     * @param object &$obj the object for which to set properties
+     */
+    public function __construct($obj) {
+        $this->obj = $obj;
+    }
   
-	/**
-	 * Set the properties of an object passed as a parameter in one
-	 * go. The <code>properties</code> are parsed relative to a
-	 * <code>prefix</code>.
-	 *
-	 * @param object $obj The object to configure.
-	 * @param array $properties An array containing keys and values.
-	 * @param string $prefix Only keys having the specified prefix will be set.
-	 * @static
-	 */
-	 // TODO: check, if this is really useful
-	public static function setPropertiesByObject($obj, $properties, $prefix) {
-		$pSetter = new LoggerReflectionUtils($obj);
-		return $pSetter->setProperties($properties, $prefix);
-	}
+    /**
+     * Set the properties of an object passed as a parameter in one
+     * go. The <code>properties</code> are parsed relative to a
+     * <code>prefix</code>.
+     *
+     * @param object $obj The object to configure.
+     * @param array $properties An array containing keys and values.
+     * @param string $prefix Only keys having the specified prefix will be set.
+     * @static
+     */
+        // TODO: check, if this is really useful
+    public static function setPropertiesByObject($obj, $properties, $prefix) {
+        $pSetter = new LoggerReflectionUtils($obj);
+        return $pSetter->setProperties($properties, $prefix);
+    }
   
 
-	/**
-	 * Set the properites for the object that match the
-	 * <code>prefix</code> passed as parameter.
-	 * 
-	 * Example:
-	 * 
-	 * $arr['xxxname'] = 'Joe';
- 	 * $arr['xxxmale'] = true;
-	 * and prefix xxx causes setName and setMale.	
-	 *
-	 * @param array $properties An array containing keys and values.
-	 * @param string $prefix Only keys having the specified prefix will be set.
-	 */
-	 // TODO: check, if this is really useful
-	public function setProperties($properties, $prefix) {
-		$len = strlen($prefix);
-		while(list($key,) = each($properties)) {
-			if(strpos($key, $prefix) === 0) {
-				if(strpos($key, '.', ($len + 1)) > 0) {
-					continue;
-				}
-				$value = LoggerOptionConverter::findAndSubst($key, $properties);
-				$key = substr($key, $len);
-				if($key == 'layout' and ($this->obj instanceof LoggerAppender)) {
-					continue;
-				}
-				$this->setProperty($key, $value);
-			}
-		}
-		$this->activate();
-	}
+    /**
+     * Set the properites for the object that match the
+     * <code>prefix</code> passed as parameter.
+     * 
+     * Example:
+     * 
+     * $arr['xxxname'] = 'Joe';
+     * $arr['xxxmale'] = true;
+     * and prefix xxx causes setName and setMale.	
+     *
+     * @param array $properties An array containing keys and values.
+     * @param string $prefix Only keys having the specified prefix will be set.
+     */
+        // TODO: check, if this is really useful
+    public function setProperties($properties, $prefix) {
+        $len = strlen($prefix);
+        while(list($key,) = each($properties)) {
+            if(strpos($key, $prefix) === 0) {
+                if(strpos($key, '.', ($len + 1)) > 0) {
+                    continue;
+                }
+                $value = LoggerOptionConverter::findAndSubst($key, $properties);
+                $key = substr($key, $len);
+                if($key == 'layout' and ($this->obj instanceof LoggerAppender)) {
+                    continue;
+                }
+                $this->setProperty($key, $value);
+            }
+        }
+        $this->activate();
+    }
 	
-	/**
-	 * Set a property on this PropertySetter's Object. If successful, this
-	 * method will invoke a setter method on the underlying Object. The
-	 * setter is the one for the specified property name and the value is
-	 * determined partly from the setter argument type and partly from the
-	 * value specified in the call to this method.
-	 *
-	 * <p>If the setter expects a String no conversion is necessary.
-	 * If it expects an int, then an attempt is made to convert 'value'
-	 * to an int using new Integer(value). If the setter expects a boolean,
-	 * the conversion is by new Boolean(value).
-	 *
-	 * @param string $name	  name of the property
-	 * @param string $value	  String value of the property
-	 */
-	public function setProperty($name, $value) {
-		if($value === null) {
-			return;
-		}
+    /**
+     * Set a property on this PropertySetter's Object. If successful, this
+     * method will invoke a setter method on the underlying Object. The
+     * setter is the one for the specified property name and the value is
+     * determined partly from the setter argument type and partly from the
+     * value specified in the call to this method.
+     *
+     * <p>If the setter expects a String no conversion is necessary.
+     * If it expects an int, then an attempt is made to convert 'value'
+     * to an int using new Integer(value). If the setter expects a boolean,
+     * the conversion is by new Boolean(value).
+     *
+     * @param string $name	  name of the property
+     * @param string $value	  String value of the property
+     */
+    public function setProperty($name, $value) {
+        if($value === null) {
+            return;
+        }
 		
-		$method = "set" . ucfirst($name);
+        $method = "set" . ucfirst($name);
 		
-		if(!method_exists($this->obj, $method)) {
-			throw new Exception("Error setting log4php property $name to $value: no method $method in class ".get_class($this->obj)."!");
-		} else {
-			return call_user_func(array($this->obj, $method), $value);
-		} 
-	}
+        if(!method_exists($this->obj, $method)) {
+            throw new Exception("Error setting log4php property $name to $value: no method $method in class ".get_class($this->obj)."!");
+        } else {
+            return call_user_func(array($this->obj, $method), $value);
+        } 
+    }
   
-	public function activate() {
-		if(method_exists($this->obj, 'activateoptions')) {
-			return call_user_func(array($this->obj, 'activateoptions'));
-		} 
-	}
+    public function activate() {
+        if(method_exists($this->obj, 'activateoptions')) {
+            return call_user_func(array($this->obj, 'activateoptions'));
+        } 
+    }
 	
-	/**
-	 * Creates an instances from the given class name.
-	 *
-	 * @param string $classname
-	 * @return an object from the class with the given classname
-	 */
-	public static function createObject($class) {
-		if(!empty($class)) {
-			$class = basename($class);
-			return new $class();
-		}
-		return null;
-	}
+    /**
+     * Creates an instances from the given class name.
+     *
+     * @param string $classname
+     * @return an object from the class with the given classname
+     */
+    public static function createObject($class) {
+        if(!empty($class)) {
+            $class = basename($class);
+            return new $class();
+        }
+        return null;
+    }
 	
-	/**
+    /**
      * @param object $object
      * @param string $name
      * @param mixed $value

Spacing +9 added lines, -9 removed lines

@@ -69,14 +69,14 @@ 
 	 // TODO: check, if this is really useful
 	public function setProperties($properties, $prefix) {
 		$len = strlen($prefix);
-		while(list($key,) = each($properties)) {
-			if(strpos($key, $prefix) === 0) {
-				if(strpos($key, '.', ($len + 1)) > 0) {
+		while (list($key,) = each($properties)) {
+			if (strpos($key, $prefix) === 0) {
+				if (strpos($key, '.', ($len + 1)) > 0) {
 					continue;
 				}
 				$value = LoggerOptionConverter::findAndSubst($key, $properties);
 				$key = substr($key, $len);
-				if($key == 'layout' and ($this->obj instanceof LoggerAppender)) {
+				if ($key == 'layout' and ($this->obj instanceof LoggerAppender)) {
 					continue;
 				}
 				$this->setProperty($key, $value);
@@ -101,13 +101,13 @@ 
 	 * @param string $value	  String value of the property
 	 */
 	public function setProperty($name, $value) {
-		if($value === null) {
+		if ($value === null) {
 			return;
 		}
 		
-		$method = "set" . ucfirst($name);
+		$method = "set".ucfirst($name);
 		
-		if(!method_exists($this->obj, $method)) {
+		if (!method_exists($this->obj, $method)) {
 			throw new Exception("Error setting log4php property $name to $value: no method $method in class ".get_class($this->obj)."!");
 		} else {
 			return call_user_func(array($this->obj, $method), $value);
@@ -115,7 +115,7 @@ 
 	}
   
 	public function activate() {
-		if(method_exists($this->obj, 'activateoptions')) {
+		if (method_exists($this->obj, 'activateoptions')) {
 			return call_user_func(array($this->obj, 'activateoptions'));
 		} 
 	}
@@ -127,7 +127,7 @@ 
 	 * @return an object from the class with the given classname
 	 */
 	public static function createObject($class) {
-		if(!empty($class)) {
+		if (!empty($class)) {
 			$class = basename($class);
 			return new $class();
 		}

main/inc/lib/phpdocx/lib/log4php/renderers/LoggerRendererMap.php

Doc Comments +1 added lines, -2 removed lines

@@ -58,7 +58,6 @@ 
 	 * Add a renderer to a hierarchy passed as parameter.
 	 * Note that hierarchy must implement getRendererMap() and setRenderer() methods.
 	 *
-	 * @param LoggerHierarchy $repository a logger repository.
 	 * @param string $renderedClassName
 	 * @param string $renderingClassName
 	 * @static
@@ -108,7 +107,7 @@ 
 	 * class of the object parameter.
 	 * 
 	 * @param mixed $o
-	 * @return string
+	 * @return LoggerRendererObject
 	 */
 	public function getByObject($o) {
 		return ($o == null) ? null : $this->getByClassName(get_class($o));

Indentation +117 added lines, -117 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 /**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *	   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * @package log4php
- */
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements. See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License. You may obtain a copy of the License at
+     *
+     *	   http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     *
+     * @package log4php
+     */
 
 /**
  * Log objects using customized renderers that implement {@link LoggerRendererObject}.
@@ -36,114 +36,114 @@ 
  */
 class LoggerRendererMap {
 
-	/**
-	 * @var array
-	 */
-	private $map;
+    /**
+     * @var array
+     */
+    private $map;
 
-	/**
-	 * @var LoggerDefaultRenderer
-	 */
-	private $defaultRenderer;
+    /**
+     * @var LoggerDefaultRenderer
+     */
+    private $defaultRenderer;
 
-	/**
-	 * Constructor
-	 */
-	public function __construct() {
-		$this->map = array();
-		$this->defaultRenderer = new LoggerRendererDefault();
-	}
+    /**
+     * Constructor
+     */
+    public function __construct() {
+        $this->map = array();
+        $this->defaultRenderer = new LoggerRendererDefault();
+    }
 
-	/**
-	 * Add a renderer to a hierarchy passed as parameter.
-	 * Note that hierarchy must implement getRendererMap() and setRenderer() methods.
-	 *
-	 * @param LoggerHierarchy $repository a logger repository.
-	 * @param string $renderedClassName
-	 * @param string $renderingClassName
-	 * @static
-	 */
-	public function addRenderer($renderedClassName, $renderingClassName) {
-		$renderer = LoggerReflectionUtils::createObject($renderingClassName);
-		if($renderer == null) {
-			return;
-		} else {
-			$this->put($renderedClassName, $renderer);
-		}
-	}
+    /**
+     * Add a renderer to a hierarchy passed as parameter.
+     * Note that hierarchy must implement getRendererMap() and setRenderer() methods.
+     *
+     * @param LoggerHierarchy $repository a logger repository.
+     * @param string $renderedClassName
+     * @param string $renderingClassName
+     * @static
+     */
+    public function addRenderer($renderedClassName, $renderingClassName) {
+        $renderer = LoggerReflectionUtils::createObject($renderingClassName);
+        if($renderer == null) {
+            return;
+        } else {
+            $this->put($renderedClassName, $renderer);
+        }
+    }
 
 
-	/**
-	 * Find the appropriate renderer for the class type of the
-	 * <var>o</var> parameter. 
-	 *
-	 * This is accomplished by calling the {@link getByObject()} 
-	 * method if <var>o</var> is object or using {@link LoggerRendererDefault}. 
-	 * Once a renderer is found, it is applied on the object <var>o</var> and 
-	 * the result is returned as a string.
-	 *
-	 * @param mixed $o
-	 * @return string 
-	 */
-	public function findAndRender($o) {
-		if($o == null) {
-			return null;
-		} else {
-			if(is_object($o)) {
-				$renderer = $this->getByObject($o);
-				if($renderer !== null) {
-					return $renderer->render($o);
-				} else {
-					return null;
-				}
-			} else {
-				$renderer = $this->defaultRenderer;
-				return $renderer->render($o);
-			}
-		}
-	}
+    /**
+     * Find the appropriate renderer for the class type of the
+     * <var>o</var> parameter. 
+     *
+     * This is accomplished by calling the {@link getByObject()} 
+     * method if <var>o</var> is object or using {@link LoggerRendererDefault}. 
+     * Once a renderer is found, it is applied on the object <var>o</var> and 
+     * the result is returned as a string.
+     *
+     * @param mixed $o
+     * @return string 
+     */
+    public function findAndRender($o) {
+        if($o == null) {
+            return null;
+        } else {
+            if(is_object($o)) {
+                $renderer = $this->getByObject($o);
+                if($renderer !== null) {
+                    return $renderer->render($o);
+                } else {
+                    return null;
+                }
+            } else {
+                $renderer = $this->defaultRenderer;
+                return $renderer->render($o);
+            }
+        }
+    }
 
-	/**
-	 * Syntactic sugar method that calls {@link PHP_MANUAL#get_class} with the
-	 * class of the object parameter.
-	 * 
-	 * @param mixed $o
-	 * @return string
-	 */
-	public function getByObject($o) {
-		return ($o == null) ? null : $this->getByClassName(get_class($o));
-	}
+    /**
+     * Syntactic sugar method that calls {@link PHP_MANUAL#get_class} with the
+     * class of the object parameter.
+     * 
+     * @param mixed $o
+     * @return string
+     */
+    public function getByObject($o) {
+        return ($o == null) ? null : $this->getByClassName(get_class($o));
+    }
 
 
-	/**
-	 * Search the parents of <var>clazz</var> for a renderer. 
-	 *
-	 * The renderer closest in the hierarchy will be returned. If no
-	 * renderers could be found, then the default renderer is returned.
-	 *
-	 * @param string $class
-	 * @return LoggerRendererObject
-	 */
-	public function getByClassName($class) {
-		$r = null;
-		for($c = strtolower($class); !empty($c); $c = get_parent_class($c)) {
-			if(isset($this->map[$c])) {
-				return $this->map[$c];
-			}
-		}
-		return $this->defaultRenderer;
-	}
+    /**
+     * Search the parents of <var>clazz</var> for a renderer. 
+     *
+     * The renderer closest in the hierarchy will be returned. If no
+     * renderers could be found, then the default renderer is returned.
+     *
+     * @param string $class
+     * @return LoggerRendererObject
+     */
+    public function getByClassName($class) {
+        $r = null;
+        for($c = strtolower($class); !empty($c); $c = get_parent_class($c)) {
+            if(isset($this->map[$c])) {
+                return $this->map[$c];
+            }
+        }
+        return $this->defaultRenderer;
+    }
 
-	public function clear() {
-		$this->map = array();
-	}
+    public function clear() {
+        $this->map = array();
+    }
 
-	/**
-	 * Register a {@link LoggerRendererObject} for <var>clazz</var>.
-	 * @param string $class
-	 * @param LoggerRendererObject $or
-	 */
-	private function put($class, $or) {
-		$this->map[strtolower($class)] = $or;
-	}
+    /**
+     * Register a {@link LoggerRendererObject} for <var>clazz</var>.
+     * @param string $class
+     * @param LoggerRendererObject $or
+     */
+    private function put($class, $or) {
+        $this->map[strtolower($class)] = $or;
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -65,7 +65,7 @@ 
 	 */
 	public function addRenderer($renderedClassName, $renderingClassName) {
 		$renderer = LoggerReflectionUtils::createObject($renderingClassName);
-		if($renderer == null) {
+		if ($renderer == null) {
 			return;
 		} else {
 			$this->put($renderedClassName, $renderer);
@@ -86,12 +86,12 @@ 
 	 * @return string 
 	 */
 	public function findAndRender($o) {
-		if($o == null) {
+		if ($o == null) {
 			return null;
 		} else {
-			if(is_object($o)) {
+			if (is_object($o)) {
 				$renderer = $this->getByObject($o);
-				if($renderer !== null) {
+				if ($renderer !== null) {
 					return $renderer->render($o);
 				} else {
 					return null;
@@ -126,8 +126,8 @@ 
 	 */
 	public function getByClassName($class) {
 		$r = null;
-		for($c = strtolower($class); !empty($c); $c = get_parent_class($c)) {
-			if(isset($this->map[$c])) {
+		for ($c = strtolower($class); !empty($c); $c = get_parent_class($c)) {
+			if (isset($this->map[$c])) {
 				return $this->map[$c];
 			}
 		}

main/inc/lib/phpdocx/pdf/include/abstract_renderer.cls.php

Doc Comments -1 removed lines

@@ -98,7 +98,6 @@
   /**
    * Render a background image over a rectangular area
    *
-   * @param string $img      The background image to load
    * @param float  $x        The left edge of the rectangular area
    * @param float  $y        The top edge of the rectangular area
    * @param float  $width    The width of the rectangular area

Switch Indentation +245 added lines, -245 removed lines

@@ -299,21 +299,21 @@ 
 
     switch (strtolower($ext)) {
 
-    case "png":
-      $src = imagecreatefrompng($img);
-      break;
+        case "png":
+          $src = imagecreatefrompng($img);
+          break;
 
-    case "jpg":
-    case "jpeg":
-      $src = imagecreatefromjpeg($img);
-      break;
+        case "jpg":
+        case "jpeg":
+          $src = imagecreatefromjpeg($img);
+          break;
 
-    case "gif":
-      $src = imagecreatefromgif($img);
-      break;
+        case "gif":
+          $src = imagecreatefromgif($img);
+          break;
 
-    default:
-      return; // Unsupported image type
+        default:
+          return; // Unsupported image type
     }
 
     if ($src == null) {
@@ -475,22 +475,22 @@ 
     
     switch ($side) {
 
-    case "top":
-      $delta = $top / 2;
-    case "bottom":
-      $delta = isset($delta) ? $delta : -$bottom / 2;
-      $this->_canvas->line($x, $y + $delta, $x + $length, $y + $delta, $color, $$side, $dash);
-      break;
-
-    case "left":
-      $delta = $left / 2;
-    case "right":
-      $delta = isset($delta) ? $delta : - $right / 2;
-      $this->_canvas->line($x + $delta, $y, $x + $delta, $y + $length, $color, $$side, $dash);
-      break;
-
-    default:
-      return;
+        case "top":
+          $delta = $top / 2;
+        case "bottom":
+          $delta = isset($delta) ? $delta : -$bottom / 2;
+          $this->_canvas->line($x, $y + $delta, $x + $length, $y + $delta, $color, $$side, $dash);
+          break;
+
+        case "left":
+          $delta = $left / 2;
+        case "right":
+          $delta = isset($delta) ? $delta : - $right / 2;
+          $this->_canvas->line($x + $delta, $y, $x + $delta, $y + $length, $color, $$side, $dash);
+          break;
+
+        default:
+          return;
 
     }
   }
@@ -501,22 +501,22 @@ 
 
     switch ($side) {
 
-    case "top":
-      $delta = $top / 2;
-    case "bottom":
-      $delta = isset($delta) ? $delta : -$bottom / 2;
-      $this->_canvas->line($x, $y + $delta, $x + $length, $y + $delta, $color, $$side, array(3 * $$side));
-      break;
-
-    case "left":
-      $delta = $left / 2;
-    case "right":
-      $delta = isset($delta) ? $delta : - $right / 2;
-      $this->_canvas->line($x + $delta, $y, $x + $delta, $y + $length, $color, $$side, array(3 * $$side));
-      break;
-
-    default:
-      return;
+        case "top":
+          $delta = $top / 2;
+        case "bottom":
+          $delta = isset($delta) ? $delta : -$bottom / 2;
+          $this->_canvas->line($x, $y + $delta, $x + $length, $y + $delta, $color, $$side, array(3 * $$side));
+          break;
+
+        case "left":
+          $delta = $left / 2;
+        case "right":
+          $delta = isset($delta) ? $delta : - $right / 2;
+          $this->_canvas->line($x + $delta, $y, $x + $delta, $y + $length, $color, $$side, array(3 * $$side));
+          break;
+
+        default:
+          return;
     }
     
   }
@@ -528,57 +528,57 @@ 
     // All this polygon business is for beveled corners...
     switch ($side) {
 
-    case "top":
-      if ( $corner_style === "bevel" ) {
+        case "top":
+          if ( $corner_style === "bevel" ) {
         
-        $points = array($x, $y,
-                        $x + $length, $y,
-                        $x + $length - $right, $y + $top,
-                        $x + $left, $y + $top);
-        $this->_canvas->polygon($points, $color, null, null, true);
-      } else
-        $this->_canvas->filled_rectangle($x, $y, $length, $top, $color);
+            $points = array($x, $y,
+                            $x + $length, $y,
+                            $x + $length - $right, $y + $top,
+                            $x + $left, $y + $top);
+            $this->_canvas->polygon($points, $color, null, null, true);
+          } else
+            $this->_canvas->filled_rectangle($x, $y, $length, $top, $color);
       
-      break;
+          break;
       
-    case "bottom":
-      if ( $corner_style === "bevel" ) {
-        $points = array($x, $y,
-                        $x + $length, $y,
-                        $x + $length - $right, $y - $bottom,
-                        $x + $left, $y - $bottom);
-        $this->_canvas->polygon($points, $color, null, null, true);
-      } else
-        $this->_canvas->filled_rectangle($x, $y - $bottom, $length, $bottom, $color);
+        case "bottom":
+          if ( $corner_style === "bevel" ) {
+            $points = array($x, $y,
+                            $x + $length, $y,
+                            $x + $length - $right, $y - $bottom,
+                            $x + $left, $y - $bottom);
+            $this->_canvas->polygon($points, $color, null, null, true);
+          } else
+            $this->_canvas->filled_rectangle($x, $y - $bottom, $length, $bottom, $color);
       
-      break;
+          break;
       
-    case "left":
-      if ( $corner_style === "bevel" ) {
-        $points = array($x, $y,
-                        $x, $y + $length,
-                        $x + $left, $y + $length - $bottom,
-                        $x + $left, $y + $top);
-        $this->_canvas->polygon($points, $color, null, null, true);
-      } else
-        $this->_canvas->filled_rectangle($x, $y, $left, $length, $color);
+        case "left":
+          if ( $corner_style === "bevel" ) {
+            $points = array($x, $y,
+                            $x, $y + $length,
+                            $x + $left, $y + $length - $bottom,
+                            $x + $left, $y + $top);
+            $this->_canvas->polygon($points, $color, null, null, true);
+          } else
+            $this->_canvas->filled_rectangle($x, $y, $left, $length, $color);
       
-      break;
+          break;
       
-    case "right":
-      if ( $corner_style === "bevel" ) {
-        $points = array($x, $y,
-                        $x, $y + $length,
-                        $x - $right, $y + $length - $bottom,
-                        $x - $right, $y + $top);
-        $this->_canvas->polygon($points, $color, null, null, true);
-      } else
-        $this->_canvas->filled_rectangle($x - $right, $y, $right, $length, $color);
-
-      break;
-
-    default:
-      return;
+        case "right":
+          if ( $corner_style === "bevel" ) {
+            $points = array($x, $y,
+                            $x, $y + $length,
+                            $x - $right, $y + $length - $bottom,
+                            $x - $right, $y + $top);
+            $this->_canvas->polygon($points, $color, null, null, true);
+          } else
+            $this->_canvas->filled_rectangle($x - $right, $y, $right, $length, $color);
+
+          break;
+
+        default:
+          return;
 
     }
         
@@ -595,105 +595,105 @@ 
     // inner bottom, inner top.
     switch ($side) {
 
-    case "top":
-      if ( $corner_style === "bevel" ) {
-        $left_line_width = $left / 4;
-        $right_line_width = $right / 4;
+        case "top":
+          if ( $corner_style === "bevel" ) {
+            $left_line_width = $left / 4;
+            $right_line_width = $right / 4;
         
-        $points = array($x, $y,
-                        $x + $length, $y,
-                        $x + $length - $right_line_width, $y + $line_width,
-                        $x + $left_line_width, $y + $line_width,);
-        $this->_canvas->polygon($points, $color, null, null, true);
+            $points = array($x, $y,
+                            $x + $length, $y,
+                            $x + $length - $right_line_width, $y + $line_width,
+                            $x + $left_line_width, $y + $line_width,);
+            $this->_canvas->polygon($points, $color, null, null, true);
         
-        $points = array($x + $left - $left_line_width, $y + $top - $line_width,
-                        $x + $length - $right + $right_line_width, $y + $top - $line_width,
-                        $x + $length - $right, $y + $top,
-                        $x + $left, $y + $top);
-        $this->_canvas->polygon($points, $color, null, null, true);
+            $points = array($x + $left - $left_line_width, $y + $top - $line_width,
+                            $x + $length - $right + $right_line_width, $y + $top - $line_width,
+                            $x + $length - $right, $y + $top,
+                            $x + $left, $y + $top);
+            $this->_canvas->polygon($points, $color, null, null, true);
 
-      } else {
-        $this->_canvas->filled_rectangle($x, $y, $length, $line_width, $color);
-        $this->_canvas->filled_rectangle($x, $y + $top - $line_width, $length, $line_width, $color);
+          } else {
+            $this->_canvas->filled_rectangle($x, $y, $length, $line_width, $color);
+            $this->_canvas->filled_rectangle($x, $y + $top - $line_width, $length, $line_width, $color);
 
-      }
-      break;
+          }
+          break;
       
-    case "bottom":
-      if ( $corner_style === "bevel" ) {
-        $left_line_width = $left / 4;
-        $right_line_width = $right / 4;
+        case "bottom":
+          if ( $corner_style === "bevel" ) {
+            $left_line_width = $left / 4;
+            $right_line_width = $right / 4;
         
-        $points = array($x, $y,
-                        $x + $length, $y,
-                        $x + $length - $right_line_width, $y - $line_width,
-                        $x + $left_line_width, $y - $line_width);
-        $this->_canvas->polygon($points, $color, null, null, true);
+            $points = array($x, $y,
+                            $x + $length, $y,
+                            $x + $length - $right_line_width, $y - $line_width,
+                            $x + $left_line_width, $y - $line_width);
+            $this->_canvas->polygon($points, $color, null, null, true);
         
-        $points = array($x + $left - $left_line_width, $y - $bottom + $line_width,
-                        $x + $length - $right + $right_line_width, $y - $bottom + $line_width,
-                        $x + $length - $right, $y - $bottom,
-                        $x + $left, $y - $bottom);
-        $this->_canvas->polygon($points, $color, null, null, true);
+            $points = array($x + $left - $left_line_width, $y - $bottom + $line_width,
+                            $x + $length - $right + $right_line_width, $y - $bottom + $line_width,
+                            $x + $length - $right, $y - $bottom,
+                            $x + $left, $y - $bottom);
+            $this->_canvas->polygon($points, $color, null, null, true);
 
-      } else {
-        $this->_canvas->filled_rectangle($x, $y - $line_width, $length, $line_width, $color);
-        $this->_canvas->filled_rectangle($x, $y - $bottom, $length, $line_width, $color);
-      }
+          } else {
+            $this->_canvas->filled_rectangle($x, $y - $line_width, $length, $line_width, $color);
+            $this->_canvas->filled_rectangle($x, $y - $bottom, $length, $line_width, $color);
+          }
           
-      break;
+          break;
 
-    case "left":
-      if ( $corner_style === "bevel" ) {
-        $top_line_width = $top / 4;
-        $bottom_line_width = $bottom / 4;
+        case "left":
+          if ( $corner_style === "bevel" ) {
+            $top_line_width = $top / 4;
+            $bottom_line_width = $bottom / 4;
         
-        $points = array($x, $y,
-                        $x, $y + $length,
-                        $x + $line_width, $y + $length - $bottom_line_width,
-                        $x + $line_width, $y + $top_line_width);
-        $this->_canvas->polygon($points, $color, null, null, true);
-
-        $points = array($x + $left - $line_width, $y + $top - $top_line_width,
-                        $x + $left - $line_width, $y + $length - $bottom + $bottom_line_width,
-                        $x + $left, $y + $length - $bottom,
-                        $x + $left, $y + $top);
-        $this->_canvas->polygon($points, $color, null, null, true);
+            $points = array($x, $y,
+                            $x, $y + $length,
+                            $x + $line_width, $y + $length - $bottom_line_width,
+                            $x + $line_width, $y + $top_line_width);
+            $this->_canvas->polygon($points, $color, null, null, true);
+
+            $points = array($x + $left - $line_width, $y + $top - $top_line_width,
+                            $x + $left - $line_width, $y + $length - $bottom + $bottom_line_width,
+                            $x + $left, $y + $length - $bottom,
+                            $x + $left, $y + $top);
+            $this->_canvas->polygon($points, $color, null, null, true);
 
-      } else {
-        $this->_canvas->filled_rectangle($x, $y, $line_width, $length, $color);
-        $this->_canvas->filled_rectangle($x + $left - $line_width, $y, $line_width, $length, $color);
-      }
+          } else {
+            $this->_canvas->filled_rectangle($x, $y, $line_width, $length, $color);
+            $this->_canvas->filled_rectangle($x + $left - $line_width, $y, $line_width, $length, $color);
+          }
       
-      break;
+          break;
                       
-    case "right":
-      if ( $corner_style === "bevel" ) {
-        $top_line_width = $top / 4;
-        $bottom_line_width = $bottom / 4;
+        case "right":
+          if ( $corner_style === "bevel" ) {
+            $top_line_width = $top / 4;
+            $bottom_line_width = $bottom / 4;
         
       
-        $points = array($x, $y,
-                      $x, $y + $length,
-                        $x - $line_width, $y + $length - $bottom_line_width,
-                        $x - $line_width, $y + $top_line_width);
-        $this->_canvas->polygon($points, $color, null, null, true);
+            $points = array($x, $y,
+                          $x, $y + $length,
+                            $x - $line_width, $y + $length - $bottom_line_width,
+                            $x - $line_width, $y + $top_line_width);
+            $this->_canvas->polygon($points, $color, null, null, true);
         
-        $points = array($x - $right + $line_width, $y + $top - $top_line_width,
-                        $x - $right + $line_width, $y + $length - $bottom + $bottom_line_width,
-                        $x - $right, $y + $length - $bottom,
-                        $x - $right, $y + $top);
-        $this->_canvas->polygon($points, $color, null, null, true);
+            $points = array($x - $right + $line_width, $y + $top - $top_line_width,
+                            $x - $right + $line_width, $y + $length - $bottom + $bottom_line_width,
+                            $x - $right, $y + $length - $bottom,
+                            $x - $right, $y + $top);
+            $this->_canvas->polygon($points, $color, null, null, true);
 
-      } else {
-        $this->_canvas->filled_rectangle($x - $line_width, $y, $line_width, $length, $color);
-        $this->_canvas->filled_rectangle($x - $right, $y, $line_width, $length, $color);
-      }
+          } else {
+            $this->_canvas->filled_rectangle($x - $line_width, $y, $line_width, $length, $color);
+            $this->_canvas->filled_rectangle($x - $right, $y, $line_width, $length, $color);
+          }
       
-      break;
+          break;
 
-    default:
-      return;
+        default:
+          return;
 
     }
         
@@ -708,32 +708,32 @@ 
 
     switch ($side) {
 
-    case "top":
-      $x += $left / 2;
-      $y += $top / 2;
-      $length -= $left / 2 + $right / 2;
-      break;
-
-    case "bottom":
-      $x += $left / 2;
-      $y -= $bottom / 2;
-      $length -= $left / 2 + $right / 2;
-      break;
-
-    case "left":
-      $x += $left / 2;
-      $y += $top / 2;
-      $length -= $top / 2 + $bottom / 2;
-      break;
-
-    case "right":
-      $x -= $right / 2;
-      $y += $top / 2;
-      $length -= $top / 2 + $bottom / 2;
-      break;
-
-    default:
-      return;
+        case "top":
+          $x += $left / 2;
+          $y += $top / 2;
+          $length -= $left / 2 + $right / 2;
+          break;
+
+        case "bottom":
+          $x += $left / 2;
+          $y -= $bottom / 2;
+          $length -= $left / 2 + $right / 2;
+          break;
+
+        case "left":
+          $x += $left / 2;
+          $y += $top / 2;
+          $length -= $top / 2 + $bottom / 2;
+          break;
+
+        case "right":
+          $x -= $right / 2;
+          $y += $top / 2;
+          $length -= $top / 2 + $bottom / 2;
+          break;
+
+        default:
+          return;
 
     }
 
@@ -750,32 +750,32 @@ 
 
     switch ($side) {
 
-    case "top":
-      $x += $left / 2;
-      $y += $top / 2;
-      $length -= $left / 2 + $right / 2;
-      break;
-
-    case "bottom":
-      $x += $left / 2;
-      $y -= $bottom / 2;
-      $length -= $left / 2 + $right / 2;
-      break;
-
-    case "left":
-      $x += $left / 2;
-      $y += $top / 2;
-      $length -= $top / 2 + $bottom / 2;
-      break;
-
-    case "right":
-      $x -= $right / 2;
-      $y += $top / 2;
-      $length -= $top / 2 + $bottom / 2;
-      break;
-
-    default:
-      return;
+        case "top":
+          $x += $left / 2;
+          $y += $top / 2;
+          $length -= $left / 2 + $right / 2;
+          break;
+
+        case "bottom":
+          $x += $left / 2;
+          $y -= $bottom / 2;
+          $length -= $left / 2 + $right / 2;
+          break;
+
+        case "left":
+          $x += $left / 2;
+          $y += $top / 2;
+          $length -= $top / 2 + $bottom / 2;
+          break;
+
+        case "right":
+          $x -= $right / 2;
+          $y += $top / 2;
+          $length -= $top / 2 + $bottom / 2;
+          break;
+
+        default:
+          return;
 
     }
 
@@ -802,20 +802,20 @@ 
     
     switch ($side) {
 
-    case "top":
-    case "left":
-      $shade = array_map(array($this, "_shade"), $color);
-      $this->_border_solid($x, $y, $length, $shade, $widths, $side);
-      break;
+        case "top":
+        case "left":
+          $shade = array_map(array($this, "_shade"), $color);
+          $this->_border_solid($x, $y, $length, $shade, $widths, $side);
+          break;
 
-    case "bottom":
-    case "right":
-      $tint = array_map(array($this, "_tint"), $color);
-      $this->_border_solid($x, $y, $length, $tint, $widths, $side);
-      break;
+        case "bottom":
+        case "right":
+          $tint = array_map(array($this, "_tint"), $color);
+          $this->_border_solid($x, $y, $length, $tint, $widths, $side);
+          break;
 
-    default:
-      return;
+        default:
+          return;
     }
   }
   
@@ -823,20 +823,20 @@ 
     list($top, $right, $bottom, $left) = $widths;
     
     switch ($side) {
-    case "top":
-    case "left":
-      $tint = array_map(array($this, "_tint"), $color);
-      $this->_border_solid($x, $y, $length, $tint, $widths, $side);
-      break;
-
-    case "bottom":
-    case "right":
-      $shade = array_map(array($this, "_shade"), $color);
-      $this->_border_solid($x, $y, $length, $shade, $widths, $side);
-      break;
-
-    default:
-      return;
+        case "top":
+        case "left":
+          $tint = array_map(array($this, "_tint"), $color);
+          $this->_border_solid($x, $y, $length, $tint, $widths, $side);
+          break;
+
+        case "bottom":
+        case "right":
+          $shade = array_map(array($this, "_shade"), $color);
+          $this->_border_solid($x, $y, $length, $shade, $widths, $side);
+          break;
+
+        default:
+          return;
 
     }
   }

Spacing +53 added lines, -53 removed lines

@@ -109,7 +109,7 @@ 
     $sheet = $style->get_stylesheet();
 
     // Skip degenerate cases
-    if ( $width == 0 || $height == 0 )
+    if ($width == 0 || $height == 0)
       return;
 
     //debugpng
@@ -121,7 +121,7 @@ 
                                                 $sheet->get_base_path());
 
     // Bail if the image is no good
-    if ( $img === DOMPDF_LIB_DIR . "/res/broken_image.png" )
+    if ($img === DOMPDF_LIB_DIR."/res/broken_image.png")
       return;
 
 	//Try to optimize away reading and composing of same background multiple times
@@ -140,35 +140,35 @@ 
 
 	//Increase background resolution and dependent box size according to image resolution to be placed in
 	//Then image can be copied in without resize
-    $bg_width = round((float)($width * DOMPDF_DPI) / 72);
-    $bg_height = round((float)($height * DOMPDF_DPI) / 72);
+    $bg_width = round((float) ($width * DOMPDF_DPI) / 72);
+    $bg_height = round((float) ($height * DOMPDF_DPI) / 72);
 
     //Need %bg_x, $bg_y as background pos, where img starts, converted to pixel
 
     list($bg_x, $bg_y) = $style->background_position;
 
-    if ( is_percent($bg_x) ) {
+    if (is_percent($bg_x)) {
       // The point $bg_x % from the left edge of the image is placed
       // $bg_x % from the left edge of the background rectangle
-      $p = ((float)$bg_x)/100.0;
+      $p = ((float) $bg_x) / 100.0;
       $x1 = $p * $img_w;
       $x2 = $p * $bg_width;
 
       $bg_x = round($x2 - $x1);
     } else {
-      $bg_x = round((float)($style->length_in_pt($bg_x)*DOMPDF_DPI) / 72);
+      $bg_x = round((float) ($style->length_in_pt($bg_x) * DOMPDF_DPI) / 72);
     }
 
-    if ( is_percent($bg_y) ) {
+    if (is_percent($bg_y)) {
       // The point $bg_y % from the left edge of the image is placed
       // $bg_y % from the left edge of the background rectangle
-      $p = ((float)$bg_y)/100.0;
+      $p = ((float) $bg_y) / 100.0;
       $y1 = $p * $img_h;
       $y2 = $p * $bg_height;
 
       $bg_y = round($y2 - $y1);
     } else {
-      $bg_y = round((float)($style->length_in_pt($bg_y)*DOMPDF_DPI) / 72);
+      $bg_y = round((float) ($style->length_in_pt($bg_y) * DOMPDF_DPI) / 72);
     }
 
     //clip background to the image area on partial repeat. Nothing to do if img off area
@@ -176,12 +176,12 @@ 
     //On no repeat with positive offset: move size/start to have offset==0
     //Handle x/y Dimensions separately
 
-    if ( $repeat !== "repeat" && $repeat !== "repeat-x" ) {
+    if ($repeat !== "repeat" && $repeat !== "repeat-x") {
       //No repeat x
       if ($bg_x < 0) {
         $bg_width = $img_w + $bg_x;
       } else {
-        $x += ($bg_x * 72)/DOMPDF_DPI;
+        $x += ($bg_x * 72) / DOMPDF_DPI;
         $bg_width = $bg_width - $bg_x;
         if ($bg_width > $img_w) {
           $bg_width = $img_w;
@@ -191,7 +191,7 @@ 
       if ($bg_width <= 0) {
       	return;
       }
-      $width = (float)($bg_width * 72)/DOMPDF_DPI;
+      $width = (float) ($bg_width * 72) / DOMPDF_DPI;
     } else {
       //repeat x
       if ($bg_x < 0) {
@@ -204,12 +204,12 @@ 
       }
     }
 
-    if ( $repeat !== "repeat" && $repeat !== "repeat-y" ) {
+    if ($repeat !== "repeat" && $repeat !== "repeat-y") {
       //no repeat y
       if ($bg_y < 0) {
         $bg_height = $img_h + $bg_y;
       } else {
-        $y += ($bg_y * 72)/DOMPDF_DPI;
+        $y += ($bg_y * 72) / DOMPDF_DPI;
         $bg_height = $bg_height - $bg_y;
         if ($bg_height > $img_h) {
           $bg_height = $img_h;
@@ -219,7 +219,7 @@ 
       if ($bg_height <= 0) {
       	return;
       }
-      $height = (float)($bg_height * 72)/DOMPDF_DPI;
+      $height = (float) ($bg_height * 72) / DOMPDF_DPI;
     } else {
       //repeat y
       if ($bg_y < 0) {
@@ -233,14 +233,14 @@ 
     }
 
     //Optimization, if repeat has no effect
-    if ( $repeat === "repeat" && $bg_y <= 0 && $img_h+$bg_y >= $bg_height ) {
+    if ($repeat === "repeat" && $bg_y <= 0 && $img_h + $bg_y >= $bg_height) {
       $repeat = "repeat-x";
     }
-    if ( $repeat === "repeat" && $bg_x <= 0 && $img_w+$bg_x >= $bg_width ) {
+    if ($repeat === "repeat" && $bg_x <= 0 && $img_w + $bg_x >= $bg_width) {
       $repeat = "repeat-y";
     }
-    if ( ($repeat === "repeat-x" && $bg_x <= 0 && $img_w+$bg_x >= $bg_width) ||
-         ($repeat === "repeat-y" && $bg_y <= 0 && $img_h+$bg_y >= $bg_height) ) {
+    if (($repeat === "repeat-x" && $bg_x <= 0 && $img_w + $bg_x >= $bg_width) ||
+         ($repeat === "repeat-y" && $bg_y <= 0 && $img_h + $bg_y >= $bg_height)) {
       $repeat = "no-repeat";
     }
 
@@ -281,10 +281,10 @@ 
     //Optimization to avoid multiple times rendering the same image.
     //If check functions are existing and identical image already cached,
     //then skip creation of duplicate, because it is not needed by addImagePng
-	if ( method_exists( $this->_canvas, "get_cpdf" ) &&
-	     method_exists( $this->_canvas->get_cpdf(), "addImagePng" ) &&
-	     method_exists( $this->_canvas->get_cpdf(), "image_iscached" ) &&
-	     $this->_canvas->get_cpdf()->image_iscached($filedummy) ) {
+	if (method_exists($this->_canvas, "get_cpdf") &&
+	     method_exists($this->_canvas->get_cpdf(), "addImagePng") &&
+	     method_exists($this->_canvas->get_cpdf(), "image_iscached") &&
+	     $this->_canvas->get_cpdf()->image_iscached($filedummy)) {
 	  $bg = null;
 
       //debugpng
@@ -327,15 +327,15 @@ 
     //to keep the transparency when copying over the non transparent parts of the tiles.
 	$ti = imagecolortransparent($src);
 	if ($ti >= 0) {
-	  $tc = imagecolorsforindex($src,$ti);
-      $ti = imagecolorallocate($bg,$tc['red'],$tc['green'],$tc['blue']);
-      imagefill($bg,0,0,$ti);
+	  $tc = imagecolorsforindex($src, $ti);
+      $ti = imagecolorallocate($bg, $tc['red'], $tc['green'], $tc['blue']);
+      imagefill($bg, 0, 0, $ti);
       imagecolortransparent($bg, $ti);
     }
 
     //This has only an effect for the non repeatable dimension.
     //compute start of src and dest coordinates of the single copy
-    if ( $bg_x < 0 ) {
+    if ($bg_x < 0) {
       $dst_x = 0;
       $src_x = -$bg_x;
     } else {
@@ -343,7 +343,7 @@ 
       $dst_x = $bg_x;
     }
 
-    if ( $bg_y < 0 ) {
+    if ($bg_y < 0) {
       $dst_y = 0;
       $src_y = -$bg_y;
     } else {
@@ -358,15 +358,15 @@ 
 
     // Copy regions from the source image to the background
 
-    if ( $repeat === "no-repeat" ) {
+    if ($repeat === "no-repeat") {
 
       // Simply place the image on the background
       imagecopy($bg, $src, $dst_x, $dst_y, $src_x, $src_y, $img_w, $img_h);
 
-    } else if ( $repeat === "repeat-x" ) {
+    } else if ($repeat === "repeat-x") {
 
-      for ( $bg_x = $start_x; $bg_x < $bg_width; $bg_x += $img_w ) {
-        if ( $bg_x < 0 ) {
+      for ($bg_x = $start_x; $bg_x < $bg_width; $bg_x += $img_w) {
+        if ($bg_x < 0) {
           $dst_x = 0;
           $src_x = -$bg_x;
           $w = $img_w + $bg_x;
@@ -378,10 +378,10 @@ 
         imagecopy($bg, $src, $dst_x, $dst_y, $src_x, $src_y, $w, $img_h);
       }
 
-    } else if ( $repeat === "repeat-y" ) {
+    } else if ($repeat === "repeat-y") {
 
-      for ( $bg_y = $start_y; $bg_y < $bg_height; $bg_y += $img_h ) {
-        if ( $bg_y < 0 ) {
+      for ($bg_y = $start_y; $bg_y < $bg_height; $bg_y += $img_h) {
+        if ($bg_y < 0) {
           $dst_y = 0;
           $src_y = -$bg_y;
           $h = $img_h + $bg_y;
@@ -394,12 +394,12 @@ 
 
       }
 
-    } else if ( $repeat === "repeat" ) {
+    } else if ($repeat === "repeat") {
 
-      for ( $bg_y = $start_y; $bg_y < $bg_height; $bg_y += $img_h ) {
-        for ( $bg_x = $start_x; $bg_x < $bg_width; $bg_x += $img_w ) {
+      for ($bg_y = $start_y; $bg_y < $bg_height; $bg_y += $img_h) {
+        for ($bg_x = $start_x; $bg_x < $bg_width; $bg_x += $img_w) {
 
-          if ( $bg_x < 0 ) {
+          if ($bg_x < 0) {
             $dst_x = 0;
             $src_x = -$bg_x;
             $w = $img_w + $bg_x;
@@ -409,7 +409,7 @@ 
             $w = $img_w;
           }
 
-          if ( $bg_y < 0 ) {
+          if ($bg_y < 0) {
             $dst_y = 0;
             $src_y = -$bg_y;
             $h = $img_h + $bg_y;
@@ -438,7 +438,7 @@ 
 	//$src: GD object of original image
     //When using cpdf and optimization to direct png creation from gd object is available,
     //don't create temp file, but place gd object directly into the pdf
-	if ( method_exists( $this->_canvas, "get_cpdf" ) && method_exists( $this->_canvas->get_cpdf(), "addImagePng" ) ) {
+	if (method_exists($this->_canvas, "get_cpdf") && method_exists($this->_canvas->get_cpdf(), "addImagePng")) {
       //Note: CPDF_Adapter image converts y position
 	  $this->_canvas->get_cpdf()->addImagePng(
 	  		$filedummy,
@@ -467,7 +467,7 @@ 
   protected function _border_dotted($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
     list($top, $right, $bottom, $left) = $widths;
 
-    if ( $$side < 2 )
+    if ($$side < 2)
       $dash = array($$side, 2);
     else
       $dash = array($$side);
@@ -529,7 +529,7 @@ 
     switch ($side) {
 
     case "top":
-      if ( $corner_style === "bevel" ) {
+      if ($corner_style === "bevel") {
         
         $points = array($x, $y,
                         $x + $length, $y,
@@ -542,7 +542,7 @@ 
       break;
       
     case "bottom":
-      if ( $corner_style === "bevel" ) {
+      if ($corner_style === "bevel") {
         $points = array($x, $y,
                         $x + $length, $y,
                         $x + $length - $right, $y - $bottom,
@@ -554,7 +554,7 @@ 
       break;
       
     case "left":
-      if ( $corner_style === "bevel" ) {
+      if ($corner_style === "bevel") {
         $points = array($x, $y,
                         $x, $y + $length,
                         $x + $left, $y + $length - $bottom,
@@ -566,7 +566,7 @@ 
       break;
       
     case "right":
-      if ( $corner_style === "bevel" ) {
+      if ($corner_style === "bevel") {
         $points = array($x, $y,
                         $x, $y + $length,
                         $x - $right, $y + $length - $bottom,
@@ -596,7 +596,7 @@ 
     switch ($side) {
 
     case "top":
-      if ( $corner_style === "bevel" ) {
+      if ($corner_style === "bevel") {
         $left_line_width = $left / 4;
         $right_line_width = $right / 4;
         
@@ -620,7 +620,7 @@ 
       break;
       
     case "bottom":
-      if ( $corner_style === "bevel" ) {
+      if ($corner_style === "bevel") {
         $left_line_width = $left / 4;
         $right_line_width = $right / 4;
         
@@ -644,7 +644,7 @@ 
       break;
 
     case "left":
-      if ( $corner_style === "bevel" ) {
+      if ($corner_style === "bevel") {
         $top_line_width = $top / 4;
         $bottom_line_width = $bottom / 4;
         
@@ -668,7 +668,7 @@ 
       break;
                       
     case "right":
-      if ( $corner_style === "bevel" ) {
+      if ($corner_style === "bevel") {
         $top_line_width = $top / 4;
         $bottom_line_width = $bottom / 4;
         
@@ -784,14 +784,14 @@ 
   }
 
   protected function _tint($c) {
-    if ( !is_numeric($c) )
+    if (!is_numeric($c))
       return $c;
     
     return min(1, $c + 0.66);
   }
 
   protected function _shade($c) {
-    if ( !is_numeric($c) )
+    if (!is_numeric($c))
       return $c;
     
     return max(0, $c - 0.66);

Braces +41 added lines, -25 removed lines

@@ -109,11 +109,14 @@ 
     $sheet = $style->get_stylesheet();
 
     // Skip degenerate cases
-    if ( $width == 0 || $height == 0 )
-      return;
+    if ( $width == 0 || $height == 0 ) {
+          return;
+    }
 
     //debugpng
-    if (DEBUGPNG) print '[_background_image '.$url.']';
+    if (DEBUGPNG) {
+        print '[_background_image '.$url.']';
+    }
 
     list($img, $ext) = Image_Cache::resolve_url($url,
                                                 $sheet->get_protocol(),
@@ -121,8 +124,9 @@ 
                                                 $sheet->get_base_path());
 
     // Bail if the image is no good
-    if ( $img === DOMPDF_LIB_DIR . "/res/broken_image.png" )
-      return;
+    if ( $img === DOMPDF_LIB_DIR . "/res/broken_image.png" ) {
+          return;
+    }
 
 	//Try to optimize away reading and composing of same background multiple times
 	//Postponing read with imagecreatefrom   ...()
@@ -446,16 +450,21 @@ 
 	} else {
       $tmp_file = tempnam(DOMPDF_TEMP_DIR, "bg_dompdf_img_").'.png';
       //debugpng
-      if (DEBUGPNG) print '[_background_image '.$tmp_file.']';
+      if (DEBUGPNG) {
+          print '[_background_image '.$tmp_file.']';
+      }
 
       imagepng($bg, $tmp_file);
       $this->_canvas->image($tmp_file, "png", $x, $y, $width, $height);
 
       //debugpng
-      if (DEBUGPNG) print '[_background_image unlink '.$tmp_file.']';
+      if (DEBUGPNG) {
+          print '[_background_image unlink '.$tmp_file.']';
+      }
 
-      if (!DEBUGKEEPTEMP)
-        unlink($tmp_file);
+      if (!DEBUGKEEPTEMP) {
+              unlink($tmp_file);
+      }
     }
   }
 
@@ -467,10 +476,11 @@ 
   protected function _border_dotted($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
     list($top, $right, $bottom, $left) = $widths;
 
-    if ( $$side < 2 )
-      $dash = array($$side, 2);
-    else
-      $dash = array($$side);
+    if ( $$side < 2 ) {
+          $dash = array($$side, 2);
+    } else {
+          $dash = array($$side);
+    }
   
     
     switch ($side) {
@@ -536,8 +546,9 @@ 
                         $x + $length - $right, $y + $top,
                         $x + $left, $y + $top);
         $this->_canvas->polygon($points, $color, null, null, true);
-      } else
-        $this->_canvas->filled_rectangle($x, $y, $length, $top, $color);
+      } else {
+              $this->_canvas->filled_rectangle($x, $y, $length, $top, $color);
+      }
       
       break;
       
@@ -548,8 +559,9 @@ 
                         $x + $length - $right, $y - $bottom,
                         $x + $left, $y - $bottom);
         $this->_canvas->polygon($points, $color, null, null, true);
-      } else
-        $this->_canvas->filled_rectangle($x, $y - $bottom, $length, $bottom, $color);
+      } else {
+              $this->_canvas->filled_rectangle($x, $y - $bottom, $length, $bottom, $color);
+      }
       
       break;
       
@@ -560,8 +572,9 @@ 
                         $x + $left, $y + $length - $bottom,
                         $x + $left, $y + $top);
         $this->_canvas->polygon($points, $color, null, null, true);
-      } else
-        $this->_canvas->filled_rectangle($x, $y, $left, $length, $color);
+      } else {
+              $this->_canvas->filled_rectangle($x, $y, $left, $length, $color);
+      }
       
       break;
       
@@ -572,8 +585,9 @@ 
                         $x - $right, $y + $length - $bottom,
                         $x - $right, $y + $top);
         $this->_canvas->polygon($points, $color, null, null, true);
-      } else
-        $this->_canvas->filled_rectangle($x - $right, $y, $right, $length, $color);
+      } else {
+              $this->_canvas->filled_rectangle($x - $right, $y, $right, $length, $color);
+      }
 
       break;
 
@@ -784,15 +798,17 @@ 
   }
 
   protected function _tint($c) {
-    if ( !is_numeric($c) )
-      return $c;
+    if ( !is_numeric($c) ) {
+          return $c;
+    }
     
     return min(1, $c + 0.66);
   }
 
   protected function _shade($c) {
-    if ( !is_numeric($c) )
-      return $c;
+    if ( !is_numeric($c) ) {
+          return $c;
+    }
     
     return max(0, $c - 0.66);
   }

Indentation +320 added lines, -320 removed lines

@@ -1,54 +1,54 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: abstract_renderer.cls.php,v $
- * Created on: 2004-06-01
- *
- * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library in the file LICENSE.LGPL; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * Alternatively, you may distribute this software under the terms of the
- * PHP License, version 3.0 or later.  A copy of this license should have
- * been distributed with this file in the file LICENSE.PHP .  If this is not
- * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
- *
- * The latest version of DOMPDF might be available at:
- * http://www.dompdf.com/
- *
- * @link http://www.dompdf.com/
- * @copyright 2004 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @contributor Helmut Tischer <htischer@weihenstephan.org>
- * @package dompdf
- *
- * Changes
- * @contributor Helmut Tischer <htischer@weihenstephan.org>
- * @version 0.5.1.htischer.20090507
- * - On background image
- *   - Clip invisible areas from background images, then merge identical
- *     image/size/offset to a single image.
- *   - Fix rounding of background image size.
- *   - Fix background image position given as percent
- *   - Check if identical image is already cached by cpdf. Then do not create
- *     duplicates to save memory and CPU time
- *   - Fix skipping of image repetition if area is too small
- *   - Do not create temporary files, but pass gd object directly
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: abstract_renderer.cls.php,v $
+     * Created on: 2004-06-01
+     *
+     * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public License
+     * along with this library in the file LICENSE.LGPL; if not, write to the
+     * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     * 02111-1307 USA
+     *
+     * Alternatively, you may distribute this software under the terms of the
+     * PHP License, version 3.0 or later.  A copy of this license should have
+     * been distributed with this file in the file LICENSE.PHP .  If this is not
+     * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
+     *
+     * The latest version of DOMPDF might be available at:
+     * http://www.dompdf.com/
+     *
+     * @link http://www.dompdf.com/
+     * @copyright 2004 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @package dompdf
+     *
+     * Changes
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @version 0.5.1.htischer.20090507
+     * - On background image
+     *   - Clip invisible areas from background images, then merge identical
+     *     image/size/offset to a single image.
+     *   - Fix rounding of background image size.
+     *   - Fix background image position given as percent
+     *   - Check if identical image is already cached by cpdf. Then do not create
+     *     duplicates to save memory and CPU time
+     *   - Fix skipping of image repetition if area is too small
+     *   - Do not create temporary files, but pass gd object directly
+     */
 
 /* $Id: abstract_renderer.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -60,57 +60,57 @@ 
  */
 abstract class Abstract_Renderer {
 
-  /**
-   * Rendering backend
-   *
-   * @var Canvas
-   */
-  protected $_canvas;
-
-  /**
-   * Current dompdf instance
-   *
-   * @var DOMPDF
-   */
-  protected $_dompdf;
+    /**
+     * Rendering backend
+     *
+     * @var Canvas
+     */
+    protected $_canvas;
+
+    /**
+     * Current dompdf instance
+     *
+     * @var DOMPDF
+     */
+    protected $_dompdf;
   
-  /**
-   * Class constructor
-   *
-   * @param DOMPDF $dompdf The current dompdf instance
-   */
-  function __construct(DOMPDF $dompdf) {
+    /**
+     * Class constructor
+     *
+     * @param DOMPDF $dompdf The current dompdf instance
+     */
+    function __construct(DOMPDF $dompdf) {
     $this->_dompdf = $dompdf;
     $this->_canvas = $dompdf->get_canvas();
-  }
+    }
   
-  /**
-   * Render a frame.
-   *
-   * Specialized in child classes
-   *
-   * @param Frame $frame The frame to render
-   */
-  abstract function render(Frame $frame);
-
-  //........................................................................
-
-  /**
-   * Render a background image over a rectangular area
-   *
-   * @param string $img      The background image to load
-   * @param float  $x        The left edge of the rectangular area
-   * @param float  $y        The top edge of the rectangular area
-   * @param float  $width    The width of the rectangular area
-   * @param float  $height   The height of the rectangular area
-   * @param Style  $style    The associated Style object
-   */
-  protected function _background_image($url, $x, $y, $width, $height, $style) {
+    /**
+     * Render a frame.
+     *
+     * Specialized in child classes
+     *
+     * @param Frame $frame The frame to render
+     */
+    abstract function render(Frame $frame);
+
+    //........................................................................
+
+    /**
+     * Render a background image over a rectangular area
+     *
+     * @param string $img      The background image to load
+     * @param float  $x        The left edge of the rectangular area
+     * @param float  $y        The top edge of the rectangular area
+     * @param float  $width    The width of the rectangular area
+     * @param float  $height   The height of the rectangular area
+     * @param Style  $style    The associated Style object
+     */
+    protected function _background_image($url, $x, $y, $width, $height, $style) {
     $sheet = $style->get_stylesheet();
 
     // Skip degenerate cases
     if ( $width == 0 || $height == 0 )
-      return;
+        return;
 
     //debugpng
     if (DEBUGPNG) print '[_background_image '.$url.']';
@@ -122,24 +122,24 @@ 
 
     // Bail if the image is no good
     if ( $img === DOMPDF_LIB_DIR . "/res/broken_image.png" )
-      return;
+        return;
 
-	//Try to optimize away reading and composing of same background multiple times
-	//Postponing read with imagecreatefrom   ...()
-	//final composition paramters and name not known yet
-	//Therefore read dimension directly from file, instead of creating gd object first.
+    //Try to optimize away reading and composing of same background multiple times
+    //Postponing read with imagecreatefrom   ...()
+    //final composition paramters and name not known yet
+    //Therefore read dimension directly from file, instead of creating gd object first.
     //$img_w = imagesx($src); $img_h = imagesy($src);
 
     list($img_w, $img_h) = getimagesize($img);
     if (!isset($img_w) || $img_w == 0 || !isset($img_h) || $img_h == 0) {
-      return;
+        return;
     }
 
     $repeat = $style->background_repeat;
     $bg_color = $style->background_color;
 
-	//Increase background resolution and dependent box size according to image resolution to be placed in
-	//Then image can be copied in without resize
+    //Increase background resolution and dependent box size according to image resolution to be placed in
+    //Then image can be copied in without resize
     $bg_width = round((float)($width * DOMPDF_DPI) / 72);
     $bg_height = round((float)($height * DOMPDF_DPI) / 72);
 
@@ -148,27 +148,27 @@ 
     list($bg_x, $bg_y) = $style->background_position;
 
     if ( is_percent($bg_x) ) {
-      // The point $bg_x % from the left edge of the image is placed
-      // $bg_x % from the left edge of the background rectangle
-      $p = ((float)$bg_x)/100.0;
-      $x1 = $p * $img_w;
-      $x2 = $p * $bg_width;
+        // The point $bg_x % from the left edge of the image is placed
+        // $bg_x % from the left edge of the background rectangle
+        $p = ((float)$bg_x)/100.0;
+        $x1 = $p * $img_w;
+        $x2 = $p * $bg_width;
 
-      $bg_x = round($x2 - $x1);
+        $bg_x = round($x2 - $x1);
     } else {
-      $bg_x = round((float)($style->length_in_pt($bg_x)*DOMPDF_DPI) / 72);
+        $bg_x = round((float)($style->length_in_pt($bg_x)*DOMPDF_DPI) / 72);
     }
 
     if ( is_percent($bg_y) ) {
-      // The point $bg_y % from the left edge of the image is placed
-      // $bg_y % from the left edge of the background rectangle
-      $p = ((float)$bg_y)/100.0;
-      $y1 = $p * $img_h;
-      $y2 = $p * $bg_height;
+        // The point $bg_y % from the left edge of the image is placed
+        // $bg_y % from the left edge of the background rectangle
+        $p = ((float)$bg_y)/100.0;
+        $y1 = $p * $img_h;
+        $y2 = $p * $bg_height;
 
-      $bg_y = round($y2 - $y1);
+        $bg_y = round($y2 - $y1);
     } else {
-      $bg_y = round((float)($style->length_in_pt($bg_y)*DOMPDF_DPI) / 72);
+        $bg_y = round((float)($style->length_in_pt($bg_y)*DOMPDF_DPI) / 72);
     }
 
     //clip background to the image area on partial repeat. Nothing to do if img off area
@@ -177,79 +177,79 @@ 
     //Handle x/y Dimensions separately
 
     if ( $repeat !== "repeat" && $repeat !== "repeat-x" ) {
-      //No repeat x
-      if ($bg_x < 0) {
+        //No repeat x
+        if ($bg_x < 0) {
         $bg_width = $img_w + $bg_x;
-      } else {
+        } else {
         $x += ($bg_x * 72)/DOMPDF_DPI;
         $bg_width = $bg_width - $bg_x;
         if ($bg_width > $img_w) {
-          $bg_width = $img_w;
+            $bg_width = $img_w;
         }
         $bg_x = 0;
-      }
-      if ($bg_width <= 0) {
-      	return;
-      }
-      $width = (float)($bg_width * 72)/DOMPDF_DPI;
+        }
+        if ($bg_width <= 0) {
+            return;
+        }
+        $width = (float)($bg_width * 72)/DOMPDF_DPI;
     } else {
-      //repeat x
-      if ($bg_x < 0) {
+        //repeat x
+        if ($bg_x < 0) {
         $bg_x = - ((-$bg_x) % $img_w);
-      } else {
+        } else {
         $bg_x = $bg_x % $img_w;
         if ($bg_x > 0) {
-          $bg_x -= $img_w;
+            $bg_x -= $img_w;
+        }
         }
-      }
     }
 
     if ( $repeat !== "repeat" && $repeat !== "repeat-y" ) {
-      //no repeat y
-      if ($bg_y < 0) {
+        //no repeat y
+        if ($bg_y < 0) {
         $bg_height = $img_h + $bg_y;
-      } else {
+        } else {
         $y += ($bg_y * 72)/DOMPDF_DPI;
         $bg_height = $bg_height - $bg_y;
         if ($bg_height > $img_h) {
-          $bg_height = $img_h;
+            $bg_height = $img_h;
         }
         $bg_y = 0;
-      }
-      if ($bg_height <= 0) {
-      	return;
-      }
-      $height = (float)($bg_height * 72)/DOMPDF_DPI;
+        }
+        if ($bg_height <= 0) {
+            return;
+        }
+        $height = (float)($bg_height * 72)/DOMPDF_DPI;
     } else {
-      //repeat y
-      if ($bg_y < 0) {
+        //repeat y
+        if ($bg_y < 0) {
         $bg_y = - ((-$bg_y) % $img_h);
-      } else {
+        } else {
         $bg_y = $bg_y % $img_h;
         if ($bg_y > 0) {
-          $bg_y -= $img_h;
+            $bg_y -= $img_h;
+        }
         }
-      }
     }
 
     //Optimization, if repeat has no effect
     if ( $repeat === "repeat" && $bg_y <= 0 && $img_h+$bg_y >= $bg_height ) {
-      $repeat = "repeat-x";
+        $repeat = "repeat-x";
     }
     if ( $repeat === "repeat" && $bg_x <= 0 && $img_w+$bg_x >= $bg_width ) {
-      $repeat = "repeat-y";
+        $repeat = "repeat-y";
     }
     if ( ($repeat === "repeat-x" && $bg_x <= 0 && $img_w+$bg_x >= $bg_width) ||
          ($repeat === "repeat-y" && $bg_y <= 0 && $img_h+$bg_y >= $bg_height) ) {
-      $repeat = "no-repeat";
+        $repeat = "no-repeat";
     }
 
-	//Use filename as indicator only
-	//different names for different variants to have different copies in the pdf
-	//This is not dependent of background color of box! .'_'.(is_array($bg_color) ? $bg_color["hex"] : $bg_color)
-	//Note: Here, bg_* are the start values, not end values after going through the tile loops!
+    //Use filename as indicator only
+    //different names for different variants to have different copies in the pdf
+    //This is not dependent of background color of box! .'_'.(is_array($bg_color) ? $bg_color["hex"] : $bg_color)
+    //Note: Here, bg_* are the start values, not end values after going through the tile loops!
 
-	$filedummy = $img;
+    $filedummy = $img;
 
     /* 
     //Make shorter strings with limited characters for cache associative array index - needed?	
@@ -274,50 +274,50 @@ 
 	}
 	*/
 	
-	$filedummy .= '_'.$bg_width.'_'.$bg_height.'_'.$bg_x.'_'.$bg_y.'_'.$repeat;
+    $filedummy .= '_'.$bg_width.'_'.$bg_height.'_'.$bg_x.'_'.$bg_y.'_'.$repeat;
     //debugpng
     //if (DEBUGPNG) print '<pre>[_background_image name '.$filedummy.']</pre>';
 
     //Optimization to avoid multiple times rendering the same image.
     //If check functions are existing and identical image already cached,
     //then skip creation of duplicate, because it is not needed by addImagePng
-	if ( method_exists( $this->_canvas, "get_cpdf" ) &&
-	     method_exists( $this->_canvas->get_cpdf(), "addImagePng" ) &&
-	     method_exists( $this->_canvas->get_cpdf(), "image_iscached" ) &&
-	     $this->_canvas->get_cpdf()->image_iscached($filedummy) ) {
-	  $bg = null;
+    if ( method_exists( $this->_canvas, "get_cpdf" ) &&
+         method_exists( $this->_canvas->get_cpdf(), "addImagePng" ) &&
+         method_exists( $this->_canvas->get_cpdf(), "image_iscached" ) &&
+         $this->_canvas->get_cpdf()->image_iscached($filedummy) ) {
+        $bg = null;
 
-      //debugpng
-      //if (DEBUGPNG) print '[_background_image skip]';
+        //debugpng
+        //if (DEBUGPNG) print '[_background_image skip]';
 
-	} else {
+    } else {
 
     // Create a new image to fit over the background rectangle
     $bg = imagecreatetruecolor($bg_width, $bg_height);
     //anyway default
-	//imagealphablending($img, true);
+    //imagealphablending($img, true);
 
     switch (strtolower($ext)) {
 
     case "png":
       $src = imagecreatefrompng($img);
-      break;
+        break;
 
     case "jpg":
     case "jpeg":
       $src = imagecreatefromjpeg($img);
-      break;
+        break;
 
     case "gif":
       $src = imagecreatefromgif($img);
-      break;
+        break;
 
     default:
       return; // Unsupported image type
     }
 
     if ($src == null) {
-      return;
+        return;
     }
 
     //Background color if box is not relevant here
@@ -325,34 +325,34 @@ 
     //Transparent image: The image controls the transparency and lets shine through whatever background.
     //However on transparent imaage preset the composed image with the transparency color,
     //to keep the transparency when copying over the non transparent parts of the tiles.
-	$ti = imagecolortransparent($src);
-	if ($ti >= 0) {
-	  $tc = imagecolorsforindex($src,$ti);
-      $ti = imagecolorallocate($bg,$tc['red'],$tc['green'],$tc['blue']);
-      imagefill($bg,0,0,$ti);
-      imagecolortransparent($bg, $ti);
+    $ti = imagecolortransparent($src);
+    if ($ti >= 0) {
+        $tc = imagecolorsforindex($src,$ti);
+        $ti = imagecolorallocate($bg,$tc['red'],$tc['green'],$tc['blue']);
+        imagefill($bg,0,0,$ti);
+        imagecolortransparent($bg, $ti);
     }
 
     //This has only an effect for the non repeatable dimension.
     //compute start of src and dest coordinates of the single copy
     if ( $bg_x < 0 ) {
-      $dst_x = 0;
-      $src_x = -$bg_x;
+        $dst_x = 0;
+        $src_x = -$bg_x;
     } else {
-      $src_x = 0;
-      $dst_x = $bg_x;
+        $src_x = 0;
+        $dst_x = $bg_x;
     }
 
     if ( $bg_y < 0 ) {
-      $dst_y = 0;
-      $src_y = -$bg_y;
+        $dst_y = 0;
+        $src_y = -$bg_y;
     } else {
-      $src_y = 0;
-      $dst_y = $bg_y;
+        $src_y = 0;
+        $dst_y = $bg_y;
     }
 
-	//For historical reasons exchange meanings of variables:
-	//start_* will be the start values, while bg_* will be the temporary start values in the loops
+    //For historical reasons exchange meanings of variables:
+    //start_* will be the start values, while bg_* will be the temporary start values in the loops
     $start_x = $bg_x;
     $start_y = $bg_y;
 
@@ -360,117 +360,117 @@ 
 
     if ( $repeat === "no-repeat" ) {
 
-      // Simply place the image on the background
-      imagecopy($bg, $src, $dst_x, $dst_y, $src_x, $src_y, $img_w, $img_h);
+        // Simply place the image on the background
+        imagecopy($bg, $src, $dst_x, $dst_y, $src_x, $src_y, $img_w, $img_h);
 
     } else if ( $repeat === "repeat-x" ) {
 
-      for ( $bg_x = $start_x; $bg_x < $bg_width; $bg_x += $img_w ) {
+        for ( $bg_x = $start_x; $bg_x < $bg_width; $bg_x += $img_w ) {
         if ( $bg_x < 0 ) {
-          $dst_x = 0;
-          $src_x = -$bg_x;
-          $w = $img_w + $bg_x;
+            $dst_x = 0;
+            $src_x = -$bg_x;
+            $w = $img_w + $bg_x;
         } else {
-          $dst_x = $bg_x;
-          $src_x = 0;
-          $w = $img_w;
+            $dst_x = $bg_x;
+            $src_x = 0;
+            $w = $img_w;
         }
         imagecopy($bg, $src, $dst_x, $dst_y, $src_x, $src_y, $w, $img_h);
-      }
+        }
 
     } else if ( $repeat === "repeat-y" ) {
 
-      for ( $bg_y = $start_y; $bg_y < $bg_height; $bg_y += $img_h ) {
+        for ( $bg_y = $start_y; $bg_y < $bg_height; $bg_y += $img_h ) {
         if ( $bg_y < 0 ) {
-          $dst_y = 0;
-          $src_y = -$bg_y;
-          $h = $img_h + $bg_y;
+            $dst_y = 0;
+            $src_y = -$bg_y;
+            $h = $img_h + $bg_y;
         } else {
-          $dst_y = $bg_y;
-          $src_y = 0;
-          $h = $img_h;
+            $dst_y = $bg_y;
+            $src_y = 0;
+            $h = $img_h;
         }
         imagecopy($bg, $src, $dst_x, $dst_y, $src_x, $src_y, $img_w, $h);
 
-      }
+        }
 
     } else if ( $repeat === "repeat" ) {
 
-      for ( $bg_y = $start_y; $bg_y < $bg_height; $bg_y += $img_h ) {
+        for ( $bg_y = $start_y; $bg_y < $bg_height; $bg_y += $img_h ) {
         for ( $bg_x = $start_x; $bg_x < $bg_width; $bg_x += $img_w ) {
 
-          if ( $bg_x < 0 ) {
+            if ( $bg_x < 0 ) {
             $dst_x = 0;
             $src_x = -$bg_x;
             $w = $img_w + $bg_x;
-          } else {
+            } else {
             $dst_x = $bg_x;
             $src_x = 0;
             $w = $img_w;
-          }
+            }
 
-          if ( $bg_y < 0 ) {
+            if ( $bg_y < 0 ) {
             $dst_y = 0;
             $src_y = -$bg_y;
             $h = $img_h + $bg_y;
-          } else {
+            } else {
             $dst_y = $bg_y;
             $src_y = 0;
             $h = $img_h;
-          }
-          imagecopy($bg, $src, $dst_x, $dst_y, $src_x, $src_y, $w, $h);
+            }
+            imagecopy($bg, $src, $dst_x, $dst_y, $src_x, $src_y, $w, $h);
+        }
         }
-      }
     } else {
- print 'Unknown repeat!';
+    print 'Unknown repeat!';
     }   
 
     } /* End optimize away creation of duplicates */
 
     //img: image url string
-	//img_w, img_h: original image size in px
-	//width, height: box size in pt
-	//bg_width, bg_height: box size in px
-	//x, y: left/top edge of box on page in pt
-	//start_x, start_y: placement of image relativ to pattern
-	//$repeat: repeat mode
-	//$bg: GD object of result image
-	//$src: GD object of original image
+    //img_w, img_h: original image size in px
+    //width, height: box size in pt
+    //bg_width, bg_height: box size in px
+    //x, y: left/top edge of box on page in pt
+    //start_x, start_y: placement of image relativ to pattern
+    //$repeat: repeat mode
+    //$bg: GD object of result image
+    //$src: GD object of original image
     //When using cpdf and optimization to direct png creation from gd object is available,
     //don't create temp file, but place gd object directly into the pdf
-	if ( method_exists( $this->_canvas, "get_cpdf" ) && method_exists( $this->_canvas->get_cpdf(), "addImagePng" ) ) {
-      //Note: CPDF_Adapter image converts y position
-	  $this->_canvas->get_cpdf()->addImagePng(
-	  		$filedummy,
-			$x, $this->_canvas->get_height() - $y - $height, $width, $height, $bg);
-	} else {
-      $tmp_file = tempnam(DOMPDF_TEMP_DIR, "bg_dompdf_img_").'.png';
-      //debugpng
-      if (DEBUGPNG) print '[_background_image '.$tmp_file.']';
+    if ( method_exists( $this->_canvas, "get_cpdf" ) && method_exists( $this->_canvas->get_cpdf(), "addImagePng" ) ) {
+        //Note: CPDF_Adapter image converts y position
+        $this->_canvas->get_cpdf()->addImagePng(
+                $filedummy,
+            $x, $this->_canvas->get_height() - $y - $height, $width, $height, $bg);
+    } else {
+        $tmp_file = tempnam(DOMPDF_TEMP_DIR, "bg_dompdf_img_").'.png';
+        //debugpng
+        if (DEBUGPNG) print '[_background_image '.$tmp_file.']';
 
-      imagepng($bg, $tmp_file);
-      $this->_canvas->image($tmp_file, "png", $x, $y, $width, $height);
+        imagepng($bg, $tmp_file);
+        $this->_canvas->image($tmp_file, "png", $x, $y, $width, $height);
 
-      //debugpng
-      if (DEBUGPNG) print '[_background_image unlink '.$tmp_file.']';
+        //debugpng
+        if (DEBUGPNG) print '[_background_image unlink '.$tmp_file.']';
 
-      if (!DEBUGKEEPTEMP)
+        if (!DEBUGKEEPTEMP)
         unlink($tmp_file);
     }
-  }
+    }
 
-  protected function _border_none($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
+    protected function _border_none($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
     return;
-  }
+    }
   
-  // Border rendering functions
-  protected function _border_dotted($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
+    // Border rendering functions
+    protected function _border_dotted($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
     list($top, $right, $bottom, $left) = $widths;
 
     if ( $$side < 2 )
-      $dash = array($$side, 2);
+        $dash = array($$side, 2);
     else
-      $dash = array($$side);
+        $dash = array($$side);
   
     
     switch ($side) {
@@ -479,24 +479,24 @@ 
       $delta = $top / 2;
     case "bottom":
       $delta = isset($delta) ? $delta : -$bottom / 2;
-      $this->_canvas->line($x, $y + $delta, $x + $length, $y + $delta, $color, $$side, $dash);
-      break;
+        $this->_canvas->line($x, $y + $delta, $x + $length, $y + $delta, $color, $$side, $dash);
+        break;
 
     case "left":
       $delta = $left / 2;
     case "right":
       $delta = isset($delta) ? $delta : - $right / 2;
-      $this->_canvas->line($x + $delta, $y, $x + $delta, $y + $length, $color, $$side, $dash);
-      break;
+        $this->_canvas->line($x + $delta, $y, $x + $delta, $y + $length, $color, $$side, $dash);
+        break;
 
     default:
       return;
 
     }
-  }
+    }
 
   
-  protected function _border_dashed($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
+    protected function _border_dashed($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
     list($top, $right, $bottom, $left) = $widths;
 
     switch ($side) {
@@ -505,24 +505,24 @@ 
       $delta = $top / 2;
     case "bottom":
       $delta = isset($delta) ? $delta : -$bottom / 2;
-      $this->_canvas->line($x, $y + $delta, $x + $length, $y + $delta, $color, $$side, array(3 * $$side));
-      break;
+        $this->_canvas->line($x, $y + $delta, $x + $length, $y + $delta, $color, $$side, array(3 * $$side));
+        break;
 
     case "left":
       $delta = $left / 2;
     case "right":
       $delta = isset($delta) ? $delta : - $right / 2;
-      $this->_canvas->line($x + $delta, $y, $x + $delta, $y + $length, $color, $$side, array(3 * $$side));
-      break;
+        $this->_canvas->line($x + $delta, $y, $x + $delta, $y + $length, $color, $$side, array(3 * $$side));
+        break;
 
     default:
       return;
     }
     
-  }
+    }
 
   
-  protected function _border_solid($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
+    protected function _border_solid($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
     list($top, $right, $bottom, $left) = $widths;
 
     // All this polygon business is for beveled corners...
@@ -536,10 +536,10 @@ 
                         $x + $length - $right, $y + $top,
                         $x + $left, $y + $top);
         $this->_canvas->polygon($points, $color, null, null, true);
-      } else
+        } else
         $this->_canvas->filled_rectangle($x, $y, $length, $top, $color);
       
-      break;
+        break;
       
     case "bottom":
       if ( $corner_style === "bevel" ) {
@@ -548,10 +548,10 @@ 
                         $x + $length - $right, $y - $bottom,
                         $x + $left, $y - $bottom);
         $this->_canvas->polygon($points, $color, null, null, true);
-      } else
+        } else
         $this->_canvas->filled_rectangle($x, $y - $bottom, $length, $bottom, $color);
       
-      break;
+        break;
       
     case "left":
       if ( $corner_style === "bevel" ) {
@@ -560,10 +560,10 @@ 
                         $x + $left, $y + $length - $bottom,
                         $x + $left, $y + $top);
         $this->_canvas->polygon($points, $color, null, null, true);
-      } else
+        } else
         $this->_canvas->filled_rectangle($x, $y, $left, $length, $color);
       
-      break;
+        break;
       
     case "right":
       if ( $corner_style === "bevel" ) {
@@ -572,20 +572,20 @@ 
                         $x - $right, $y + $length - $bottom,
                         $x - $right, $y + $top);
         $this->_canvas->polygon($points, $color, null, null, true);
-      } else
+        } else
         $this->_canvas->filled_rectangle($x - $right, $y, $right, $length, $color);
 
-      break;
+        break;
 
     default:
       return;
 
     }
         
-  }
+    }
 
 
-  protected function _border_double($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
+    protected function _border_double($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
     list($top, $right, $bottom, $left) = $widths;
     
     $line_width = $$side / 4;
@@ -612,12 +612,12 @@ 
                         $x + $left, $y + $top);
         $this->_canvas->polygon($points, $color, null, null, true);
 
-      } else {
+        } else {
         $this->_canvas->filled_rectangle($x, $y, $length, $line_width, $color);
         $this->_canvas->filled_rectangle($x, $y + $top - $line_width, $length, $line_width, $color);
 
-      }
-      break;
+        }
+        break;
       
     case "bottom":
       if ( $corner_style === "bevel" ) {
@@ -636,12 +636,12 @@ 
                         $x + $left, $y - $bottom);
         $this->_canvas->polygon($points, $color, null, null, true);
 
-      } else {
+        } else {
         $this->_canvas->filled_rectangle($x, $y - $line_width, $length, $line_width, $color);
         $this->_canvas->filled_rectangle($x, $y - $bottom, $length, $line_width, $color);
-      }
+        }
           
-      break;
+        break;
 
     case "left":
       if ( $corner_style === "bevel" ) {
@@ -660,12 +660,12 @@ 
                         $x + $left, $y + $top);
         $this->_canvas->polygon($points, $color, null, null, true);
 
-      } else {
+        } else {
         $this->_canvas->filled_rectangle($x, $y, $line_width, $length, $color);
         $this->_canvas->filled_rectangle($x + $left - $line_width, $y, $line_width, $length, $color);
-      }
+        }
       
-      break;
+        break;
                       
     case "right":
       if ( $corner_style === "bevel" ) {
@@ -674,7 +674,7 @@ 
         
       
         $points = array($x, $y,
-                      $x, $y + $length,
+                        $x, $y + $length,
                         $x - $line_width, $y + $length - $bottom_line_width,
                         $x - $line_width, $y + $top_line_width);
         $this->_canvas->polygon($points, $color, null, null, true);
@@ -685,21 +685,21 @@ 
                         $x - $right, $y + $top);
         $this->_canvas->polygon($points, $color, null, null, true);
 
-      } else {
+        } else {
         $this->_canvas->filled_rectangle($x - $line_width, $y, $line_width, $length, $color);
         $this->_canvas->filled_rectangle($x - $right, $y, $line_width, $length, $color);
-      }
+        }
       
-      break;
+        break;
 
     default:
       return;
 
     }
         
-  }
+    }
 
-  protected function _border_groove($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
+    protected function _border_groove($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
     list($top, $right, $bottom, $left) = $widths;
       
     $half_widths = array($top / 2, $right / 2, $bottom / 2, $left / 2);
@@ -710,27 +710,27 @@ 
 
     case "top":
       $x += $left / 2;
-      $y += $top / 2;
-      $length -= $left / 2 + $right / 2;
-      break;
+        $y += $top / 2;
+        $length -= $left / 2 + $right / 2;
+        break;
 
     case "bottom":
       $x += $left / 2;
-      $y -= $bottom / 2;
-      $length -= $left / 2 + $right / 2;
-      break;
+        $y -= $bottom / 2;
+        $length -= $left / 2 + $right / 2;
+        break;
 
     case "left":
       $x += $left / 2;
-      $y += $top / 2;
-      $length -= $top / 2 + $bottom / 2;
-      break;
+        $y += $top / 2;
+        $length -= $top / 2 + $bottom / 2;
+        break;
 
     case "right":
       $x -= $right / 2;
-      $y += $top / 2;
-      $length -= $top / 2 + $bottom / 2;
-      break;
+        $y += $top / 2;
+        $length -= $top / 2 + $bottom / 2;
+        break;
 
     default:
       return;
@@ -739,9 +739,9 @@ 
 
     $this->_border_outset($x, $y, $length, $color, $half_widths, $side);
     
-  }
+    }
   
-  protected function _border_ridge($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
+    protected function _border_ridge($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
     list($top, $right, $bottom, $left) = $widths;
      
     $half_widths = array($top / 2, $right / 2, $bottom / 2, $left / 2);
@@ -752,27 +752,27 @@ 
 
     case "top":
       $x += $left / 2;
-      $y += $top / 2;
-      $length -= $left / 2 + $right / 2;
-      break;
+        $y += $top / 2;
+        $length -= $left / 2 + $right / 2;
+        break;
 
     case "bottom":
       $x += $left / 2;
-      $y -= $bottom / 2;
-      $length -= $left / 2 + $right / 2;
-      break;
+        $y -= $bottom / 2;
+        $length -= $left / 2 + $right / 2;
+        break;
 
     case "left":
       $x += $left / 2;
-      $y += $top / 2;
-      $length -= $top / 2 + $bottom / 2;
-      break;
+        $y += $top / 2;
+        $length -= $top / 2 + $bottom / 2;
+        break;
 
     case "right":
       $x -= $right / 2;
-      $y += $top / 2;
-      $length -= $top / 2 + $bottom / 2;
-      break;
+        $y += $top / 2;
+        $length -= $top / 2 + $bottom / 2;
+        break;
 
     default:
       return;
@@ -781,23 +781,23 @@ 
 
     $this->_border_inset($x, $y, $length, $color, $half_widths, $side);
 
-  }
+    }
 
-  protected function _tint($c) {
+    protected function _tint($c) {
     if ( !is_numeric($c) )
-      return $c;
+        return $c;
     
     return min(1, $c + 0.66);
-  }
+    }
 
-  protected function _shade($c) {
+    protected function _shade($c) {
     if ( !is_numeric($c) )
-      return $c;
+        return $c;
     
     return max(0, $c - 0.66);
-  }
+    }
 
-  protected function _border_inset($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
+    protected function _border_inset($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
     list($top, $right, $bottom, $left) = $widths;
     
     switch ($side) {
@@ -805,43 +805,43 @@ 
     case "top":
     case "left":
       $shade = array_map(array($this, "_shade"), $color);
-      $this->_border_solid($x, $y, $length, $shade, $widths, $side);
-      break;
+        $this->_border_solid($x, $y, $length, $shade, $widths, $side);
+        break;
 
     case "bottom":
     case "right":
       $tint = array_map(array($this, "_tint"), $color);
-      $this->_border_solid($x, $y, $length, $tint, $widths, $side);
-      break;
+        $this->_border_solid($x, $y, $length, $tint, $widths, $side);
+        break;
 
     default:
       return;
     }
-  }
+    }
   
-  protected function _border_outset($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
+    protected function _border_outset($x, $y, $length, $color, $widths, $side, $corner_style = "bevel") {
     list($top, $right, $bottom, $left) = $widths;
     
     switch ($side) {
     case "top":
     case "left":
       $tint = array_map(array($this, "_tint"), $color);
-      $this->_border_solid($x, $y, $length, $tint, $widths, $side);
-      break;
+        $this->_border_solid($x, $y, $length, $tint, $widths, $side);
+        break;
 
     case "bottom":
     case "right":
       $shade = array_map(array($this, "_shade"), $color);
-      $this->_border_solid($x, $y, $length, $shade, $widths, $side);
-      break;
+        $this->_border_solid($x, $y, $length, $shade, $widths, $side);
+        break;
 
     default:
       return;
 
     }
-  }
+    }
 
-  //........................................................................
+    //........................................................................
   
 
 }

main/inc/lib/phpdocx/pdf/include/block_frame_decorator.cls.php

Doc Comments +3 added lines

@@ -106,6 +106,9 @@
       unset($this->_lines[$i]);
   }
 
+  /**
+   * @param integer $lineno
+   */
   function set_line($lineno, $y = null, $w = null, $h = null) {
 
     if ( is_array($y) )

Switch Indentation +19 added lines, -19 removed lines

@@ -266,32 +266,32 @@
 
     switch ($type) {
 
-    default:
-    case "decimal":
-      return $this->_counters[$id];
+        default:
+        case "decimal":
+          return $this->_counters[$id];
 
-    case "decimal-leading-zero":
-      return str_pad($this->_counters[$id], 2, "0");
+        case "decimal-leading-zero":
+          return str_pad($this->_counters[$id], 2, "0");
 
-    case "lower-roman":
-      return dec2roman($this->_counters[$id]);
+        case "lower-roman":
+          return dec2roman($this->_counters[$id]);
 
-    case "upper-roman":
-      return mb_strtoupper(dec2roman($this->_counters[$id]));
+        case "upper-roman":
+          return mb_strtoupper(dec2roman($this->_counters[$id]));
 
-    case "lower-latin":
-    case "lower-alpha":
-      return chr( ($this->_counters[$id] % 26) + ord('a') - 1);
+        case "lower-latin":
+        case "lower-alpha":
+          return chr( ($this->_counters[$id] % 26) + ord('a') - 1);
 
-    case "upper-latin":
-    case "upper-alpha":
-      return chr( ($this->_counters[$id] % 26) + ord('A') - 1);
+        case "upper-latin":
+        case "upper-alpha":
+          return chr( ($this->_counters[$id] % 26) + ord('A') - 1);
 
-    case "lower-greek":
-      return chr($this->_counters[$id] + 944);
+        case "lower-greek":
+          return chr($this->_counters[$id] + 944);
 
-    case "upper-greek":
-      return chr($this->_counters[$id] + 912);
+        case "upper-greek":
+          return chr($this->_counters[$id] + 912);
     }
   }
 }

Spacing +24 added lines, -24 removed lines

@@ -52,7 +52,7 @@ 
   protected $_lines; // array( [num] => array([frames] => array(<frame list>),
                      //                 y, w, h) )
   protected $_counters; // array([id] => counter_value) (for generated content)
-  protected $_cl;    // current line index
+  protected $_cl; // current line index
 
   //........................................................................
 
@@ -87,7 +87,7 @@ 
 
   function get_current_line($i = null) {
     $cl = $this->_lines[$this->_cl];
-    if ( isset($i) )
+    if (isset($i))
       return $cl[$i];
     return $cl;
   }
@@ -102,13 +102,13 @@ 
   }
 
   function clear_line($i) {
-    if ( isset($this->_lines[$i]) )
+    if (isset($this->_lines[$i]))
       unset($this->_lines[$i]);
   }
 
   function set_line($lineno, $y = null, $w = null, $h = null) {
 
-    if ( is_array($y) )
+    if (is_array($y))
       extract($y);
 
     if (is_numeric($y))
@@ -126,37 +126,37 @@ 
   function add_frame_to_line(Frame $frame) {
 
     // Handle inline frames (which are effectively wrappers)
-    if ( $frame instanceof Inline_Frame_Decorator ) {
+    if ($frame instanceof Inline_Frame_Decorator) {
 
       // Handle line breaks
-      if ( $frame->get_node()->nodeName === "br" ) {
-        $this->maximize_line_height( $frame->get_style()->length_in_pt($frame->get_style()->line_height) );
+      if ($frame->get_node()->nodeName === "br") {
+        $this->maximize_line_height($frame->get_style()->length_in_pt($frame->get_style()->line_height));
         $this->add_line();
         return;
       }
 
       // Add each child of the inline frame to the line individually
       foreach ($frame->get_children() as $child)
-        $this->add_frame_to_line( $child );
+        $this->add_frame_to_line($child);
 
       return;
     }
 
     // Trim leading text if this is an empty line.  Kinda a hack to put it here,
     // but what can you do...
-    if ( $this->_lines[$this->_cl]["w"] == 0 &&
+    if ($this->_lines[$this->_cl]["w"] == 0 &&
          $frame->get_node()->nodeName === "#text" &&
          ($frame->get_style()->white_space !== "pre" ||
-          $frame->get_style()->white_space !== "pre-wrap") ) {
+          $frame->get_style()->white_space !== "pre-wrap")) {
 
-      $frame->set_text( ltrim($frame->get_text()) );
+      $frame->set_text(ltrim($frame->get_text()));
       $frame->recalculate_width();
 
     }
 
     $w = $frame->get_margin_width();
 
-    if ( $w == 0 )
+    if ($w == 0)
       return;
 
     // Debugging code:
@@ -184,7 +184,7 @@ 
 
     $this->_lines[$this->_cl]["frames"][] = $frame;
 
-    if ( $frame->get_node()->nodeName === "#text")
+    if ($frame->get_node()->nodeName === "#text")
       $this->_lines[$this->_cl]["wc"] += count(preg_split("/\s+/", $frame->get_text()));
 
     $this->_lines[$this->_cl]["w"] += $w;
@@ -197,12 +197,12 @@ 
     $i = $this->_cl;
 
     while ($i >= 0) {
-      if ( ($j = in_array($frame, $this->_lines[$i]["frames"], true)) !== false )
+      if (($j = in_array($frame, $this->_lines[$i]["frames"], true)) !== false)
         break;
       $i--;
     }
 
-    if ( $j === false )
+    if ($j === false)
       return;
 
     // Remove $frame and all frames that follow
@@ -215,22 +215,22 @@ 
     // Recalculate the height of the line
     $h = 0;
     foreach ($this->_lines[$i]["frames"] as $f)
-      $h = max( $h, $f->get_margin_height() );
+      $h = max($h, $f->get_margin_height());
 
     $this->_lines[$i]["h"] = $h;
 
     // Remove all lines that follow
     while ($this->_cl > $i)
-      unset($this->_lines[ $this->_cl-- ]);
+      unset($this->_lines[$this->_cl--]);
 
   }
 
   function increase_line_width($w) {
-    $this->_lines[ $this->_cl ]["w"] += $w;
+    $this->_lines[$this->_cl]["w"] += $w;
   }
 
   function maximize_line_height($val) {
-    $this->_lines[ $this->_cl ]["h"] = max($this->_lines[ $this->_cl ]["h"], $val);
+    $this->_lines[$this->_cl]["h"] = max($this->_lines[$this->_cl]["h"], $val);
   }
 
   function add_line() {
@@ -240,7 +240,7 @@ 
 
     $y = $this->_lines[$this->_cl]["y"] + $this->_lines[$this->_cl]["h"];
 
-    $this->_lines[ ++$this->_cl ] = array("frames" => array(),
+    $this->_lines[ ++$this->_cl] = array("frames" => array(),
                                           "wc" => 0,
                                           "y" => $y, "w" => 0, "h" => 0);
   }
@@ -252,7 +252,7 @@ 
   }
 
   function increment_counter($id = self::DEFAULT_COUNTER, $increment = 1) {
-    if ( !isset($this->_counters[$id]) )
+    if (!isset($this->_counters[$id]))
       $this->_counters[$id] = $increment;
     else
       $this->_counters[$id] += $increment;
@@ -261,7 +261,7 @@ 
 
   function counter_value($id = self::DEFAULT_COUNTER, $type = "decimal") {
     $type = mb_strtolower($type);
-    if ( !isset($this->_counters[$id]) )
+    if (!isset($this->_counters[$id]))
       $this->_counters[$id] = 0;
 
     switch ($type) {
@@ -281,11 +281,11 @@ 
 
     case "lower-latin":
     case "lower-alpha":
-      return chr( ($this->_counters[$id] % 26) + ord('a') - 1);
+      return chr(($this->_counters[$id] % 26) + ord('a') - 1);
 
     case "upper-latin":
     case "upper-alpha":
-      return chr( ($this->_counters[$id] % 26) + ord('A') - 1);
+      return chr(($this->_counters[$id] % 26) + ord('A') - 1);
 
     case "lower-greek":
       return chr($this->_counters[$id] + 944);

Braces +50 added lines, -34 removed lines

@@ -87,8 +87,9 @@ 
 
   function get_current_line($i = null) {
     $cl = $this->_lines[$this->_cl];
-    if ( isset($i) )
-      return $cl[$i];
+    if ( isset($i) ) {
+          return $cl[$i];
+    }
     return $cl;
   }
 
@@ -102,23 +103,28 @@ 
   }
 
   function clear_line($i) {
-    if ( isset($this->_lines[$i]) )
-      unset($this->_lines[$i]);
+    if ( isset($this->_lines[$i]) ) {
+          unset($this->_lines[$i]);
+    }
   }
 
   function set_line($lineno, $y = null, $w = null, $h = null) {
 
-    if ( is_array($y) )
-      extract($y);
+    if ( is_array($y) ) {
+          extract($y);
+    }
 
-    if (is_numeric($y))
-      $this->_lines[$lineno]["y"] = $y;
+    if (is_numeric($y)) {
+          $this->_lines[$lineno]["y"] = $y;
+    }
 
-    if (is_numeric($w))
-      $this->_lines[$lineno]["w"] = $w;
+    if (is_numeric($w)) {
+          $this->_lines[$lineno]["w"] = $w;
+    }
 
-    if (is_numeric($h))
-      $this->_lines[$lineno]["h"] = $h;
+    if (is_numeric($h)) {
+          $this->_lines[$lineno]["h"] = $h;
+    }
 
   }
 
@@ -136,8 +142,9 @@ 
       }
 
       // Add each child of the inline frame to the line individually
-      foreach ($frame->get_children() as $child)
-        $this->add_frame_to_line( $child );
+      foreach ($frame->get_children() as $child) {
+              $this->add_frame_to_line( $child );
+      }
 
       return;
     }
@@ -156,8 +163,9 @@ 
 
     $w = $frame->get_margin_width();
 
-    if ( $w == 0 )
-      return;
+    if ( $w == 0 ) {
+          return;
+    }
 
     // Debugging code:
     /*
@@ -176,16 +184,18 @@ 
     */
     // End debugging
 
-    if ($this->_lines[$this->_cl]["w"] + $w > $this->get_containing_block("w"))
-      $this->add_line();
+    if ($this->_lines[$this->_cl]["w"] + $w > $this->get_containing_block("w")) {
+          $this->add_line();
+    }
 
     $frame->position();
 
 
     $this->_lines[$this->_cl]["frames"][] = $frame;
 
-    if ( $frame->get_node()->nodeName === "#text")
-      $this->_lines[$this->_cl]["wc"] += count(preg_split("/\s+/", $frame->get_text()));
+    if ( $frame->get_node()->nodeName === "#text") {
+          $this->_lines[$this->_cl]["wc"] += count(preg_split("/\s+/", $frame->get_text()));
+    }
 
     $this->_lines[$this->_cl]["w"] += $w;
     $this->_lines[$this->_cl]["h"] = max($this->_lines[$this->_cl]["h"], $frame->get_margin_height());
@@ -197,13 +207,15 @@ 
     $i = $this->_cl;
 
     while ($i >= 0) {
-      if ( ($j = in_array($frame, $this->_lines[$i]["frames"], true)) !== false )
-        break;
+      if ( ($j = in_array($frame, $this->_lines[$i]["frames"], true)) !== false ) {
+              break;
+      }
       $i--;
     }
 
-    if ( $j === false )
-      return;
+    if ( $j === false ) {
+          return;
+    }
 
     // Remove $frame and all frames that follow
     while ($j < count($this->_lines[$i]["frames"])) {
@@ -214,14 +226,16 @@ 
 
     // Recalculate the height of the line
     $h = 0;
-    foreach ($this->_lines[$i]["frames"] as $f)
-      $h = max( $h, $f->get_margin_height() );
+    foreach ($this->_lines[$i]["frames"] as $f) {
+          $h = max( $h, $f->get_margin_height() );
+    }
 
     $this->_lines[$i]["h"] = $h;
 
     // Remove all lines that follow
-    while ($this->_cl > $i)
-      unset($this->_lines[ $this->_cl-- ]);
+    while ($this->_cl > $i) {
+          unset($this->_lines[ $this->_cl-- ]);
+    }
 
   }
 
@@ -252,17 +266,19 @@ 
   }
 
   function increment_counter($id = self::DEFAULT_COUNTER, $increment = 1) {
-    if ( !isset($this->_counters[$id]) )
-      $this->_counters[$id] = $increment;
-    else
-      $this->_counters[$id] += $increment;
+    if ( !isset($this->_counters[$id]) ) {
+          $this->_counters[$id] = $increment;
+    } else {
+          $this->_counters[$id] += $increment;
+    }
 
   }
 
   function counter_value($id = self::DEFAULT_COUNTER, $type = "decimal") {
     $type = mb_strtolower($type);
-    if ( !isset($this->_counters[$id]) )
-      $this->_counters[$id] = 0;
+    if ( !isset($this->_counters[$id]) ) {
+          $this->_counters[$id] = 0;
+    }
 
     switch ($type) {
 

Indentation +71 added lines, -72 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: block_frame_decorator.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,16 +46,16 @@ 
  */
 class Block_Frame_Decorator extends Frame_Decorator {
 
-  const DEFAULT_COUNTER = "-dompdf-default-counter";
+    const DEFAULT_COUNTER = "-dompdf-default-counter";
 
-  protected $_lines; // array( [num] => array([frames] => array(<frame list>),
-                     //                 y, w, h) )
-  protected $_counters; // array([id] => counter_value) (for generated content)
-  protected $_cl;    // current line index
+    protected $_lines; // array( [num] => array([frames] => array(<frame list>),
+                        //                 y, w, h) )
+    protected $_counters; // array([id] => counter_value) (for generated content)
+    protected $_cl;    // current line index
 
-  //........................................................................
+    //........................................................................
 
-  function __construct(Frame $frame, DOMPDF $dompdf) {
+    function __construct(Frame $frame, DOMPDF $dompdf) {
     parent::__construct($frame, $dompdf);
     $this->_lines = array(array("frames" => array(),
                                 "wc" => 0,
@@ -66,11 +65,11 @@ 
     $this->_counters = array(self::DEFAULT_COUNTER => 0);
     $this->_cl = 0;
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function reset() {
+    function reset() {
     parent::reset();
     $this->_lines = array(array("frames" => array(),
                                 "wc" => 0,
@@ -79,67 +78,67 @@ 
                                 "h" => 0));
     $this->_counters = array(self::DEFAULT_COUNTER => 0);
     $this->_cl = 0;
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  // Accessor methods
+    // Accessor methods
 
-  function get_current_line($i = null) {
+    function get_current_line($i = null) {
     $cl = $this->_lines[$this->_cl];
     if ( isset($i) )
-      return $cl[$i];
+        return $cl[$i];
     return $cl;
-  }
+    }
 
-  function get_lines() { return $this->_lines; }
+    function get_lines() { return $this->_lines; }
 
-  //........................................................................
+    //........................................................................
 
-  // Set methods
-  function set_current_line($y = null, $w = null, $h = null) {
+    // Set methods
+    function set_current_line($y = null, $w = null, $h = null) {
     $this->set_line($this->_cl, $y, $w, $h);
-  }
+    }
 
-  function clear_line($i) {
+    function clear_line($i) {
     if ( isset($this->_lines[$i]) )
-      unset($this->_lines[$i]);
-  }
+        unset($this->_lines[$i]);
+    }
 
-  function set_line($lineno, $y = null, $w = null, $h = null) {
+    function set_line($lineno, $y = null, $w = null, $h = null) {
 
     if ( is_array($y) )
-      extract($y);
+        extract($y);
 
     if (is_numeric($y))
-      $this->_lines[$lineno]["y"] = $y;
+        $this->_lines[$lineno]["y"] = $y;
 
     if (is_numeric($w))
-      $this->_lines[$lineno]["w"] = $w;
+        $this->_lines[$lineno]["w"] = $w;
 
     if (is_numeric($h))
-      $this->_lines[$lineno]["h"] = $h;
+        $this->_lines[$lineno]["h"] = $h;
 
-  }
+    }
 
 
-  function add_frame_to_line(Frame $frame) {
+    function add_frame_to_line(Frame $frame) {
 
     // Handle inline frames (which are effectively wrappers)
     if ( $frame instanceof Inline_Frame_Decorator ) {
 
-      // Handle line breaks
-      if ( $frame->get_node()->nodeName === "br" ) {
+        // Handle line breaks
+        if ( $frame->get_node()->nodeName === "br" ) {
         $this->maximize_line_height( $frame->get_style()->length_in_pt($frame->get_style()->line_height) );
         $this->add_line();
         return;
-      }
+        }
 
-      // Add each child of the inline frame to the line individually
-      foreach ($frame->get_children() as $child)
+        // Add each child of the inline frame to the line individually
+        foreach ($frame->get_children() as $child)
         $this->add_frame_to_line( $child );
 
-      return;
+        return;
     }
 
     // Trim leading text if this is an empty line.  Kinda a hack to put it here,
@@ -149,15 +148,15 @@ 
          ($frame->get_style()->white_space !== "pre" ||
           $frame->get_style()->white_space !== "pre-wrap") ) {
 
-      $frame->set_text( ltrim($frame->get_text()) );
-      $frame->recalculate_width();
+        $frame->set_text( ltrim($frame->get_text()) );
+        $frame->recalculate_width();
 
     }
 
     $w = $frame->get_margin_width();
 
     if ( $w == 0 )
-      return;
+        return;
 
     // Debugging code:
     /*
@@ -177,7 +176,7 @@ 
     // End debugging
 
     if ($this->_lines[$this->_cl]["w"] + $w > $this->get_containing_block("w"))
-      $this->add_line();
+        $this->add_line();
 
     $frame->position();
 
@@ -185,55 +184,55 @@ 
     $this->_lines[$this->_cl]["frames"][] = $frame;
 
     if ( $frame->get_node()->nodeName === "#text")
-      $this->_lines[$this->_cl]["wc"] += count(preg_split("/\s+/", $frame->get_text()));
+        $this->_lines[$this->_cl]["wc"] += count(preg_split("/\s+/", $frame->get_text()));
 
     $this->_lines[$this->_cl]["w"] += $w;
     $this->_lines[$this->_cl]["h"] = max($this->_lines[$this->_cl]["h"], $frame->get_margin_height());
 
-  }
+    }
 
-  function remove_frames_from_line(Frame $frame) {
+    function remove_frames_from_line(Frame $frame) {
     // Search backwards through the lines for $frame
     $i = $this->_cl;
 
     while ($i >= 0) {
-      if ( ($j = in_array($frame, $this->_lines[$i]["frames"], true)) !== false )
+        if ( ($j = in_array($frame, $this->_lines[$i]["frames"], true)) !== false )
         break;
-      $i--;
+        $i--;
     }
 
     if ( $j === false )
-      return;
+        return;
 
     // Remove $frame and all frames that follow
     while ($j < count($this->_lines[$i]["frames"])) {
-      $f = $this->_lines[$i]["frames"][$j];
-      unset($this->_lines[$i]["frames"][$j++]);
-      $this->_lines[$i]["w"] -= $f->get_margin_width();
+        $f = $this->_lines[$i]["frames"][$j];
+        unset($this->_lines[$i]["frames"][$j++]);
+        $this->_lines[$i]["w"] -= $f->get_margin_width();
     }
 
     // Recalculate the height of the line
     $h = 0;
     foreach ($this->_lines[$i]["frames"] as $f)
-      $h = max( $h, $f->get_margin_height() );
+        $h = max( $h, $f->get_margin_height() );
 
     $this->_lines[$i]["h"] = $h;
 
     // Remove all lines that follow
     while ($this->_cl > $i)
-      unset($this->_lines[ $this->_cl-- ]);
+        unset($this->_lines[ $this->_cl-- ]);
 
-  }
+    }
 
-  function increase_line_width($w) {
+    function increase_line_width($w) {
     $this->_lines[ $this->_cl ]["w"] += $w;
-  }
+    }
 
-  function maximize_line_height($val) {
+    function maximize_line_height($val) {
     $this->_lines[ $this->_cl ]["h"] = max($this->_lines[ $this->_cl ]["h"], $val);
-  }
+    }
 
-  function add_line() {
+    function add_line() {
 
 //     if ( $this->_lines[$this->_cl]["h"] == 0 ) //count($this->_lines[$i]["frames"]) == 0 ||
 //       return;
@@ -241,28 +240,28 @@ 
     $y = $this->_lines[$this->_cl]["y"] + $this->_lines[$this->_cl]["h"];
 
     $this->_lines[ ++$this->_cl ] = array("frames" => array(),
-                                          "wc" => 0,
-                                          "y" => $y, "w" => 0, "h" => 0);
-  }
+                                            "wc" => 0,
+                                            "y" => $y, "w" => 0, "h" => 0);
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function reset_counter($id = self::DEFAULT_COUNTER, $value = 0) {
+    function reset_counter($id = self::DEFAULT_COUNTER, $value = 0) {
     $this->_counters[$id] = $value;
-  }
+    }
 
-  function increment_counter($id = self::DEFAULT_COUNTER, $increment = 1) {
+    function increment_counter($id = self::DEFAULT_COUNTER, $increment = 1) {
     if ( !isset($this->_counters[$id]) )
-      $this->_counters[$id] = $increment;
+        $this->_counters[$id] = $increment;
     else
-      $this->_counters[$id] += $increment;
+        $this->_counters[$id] += $increment;
 
-  }
+    }
 
-  function counter_value($id = self::DEFAULT_COUNTER, $type = "decimal") {
+    function counter_value($id = self::DEFAULT_COUNTER, $type = "decimal") {
     $type = mb_strtolower($type);
     if ( !isset($this->_counters[$id]) )
-      $this->_counters[$id] = 0;
+        $this->_counters[$id] = 0;
 
     switch ($type) {
 
@@ -293,5 +292,5 @@ 
     case "upper-greek":
       return chr($this->_counters[$id] + 912);
     }
-  }
+    }
 }

main/inc/lib/phpdocx/pdf/include/canvas_factory.cls.php

Doc Comments +4 added lines

@@ -54,6 +54,10 @@
    */
   private function __construct() { }
 
+  /**
+   * @param string $paper
+   * @param string $orientation
+   */
   static function get_instance($paper = null, $orientation = null,  $class = null) {
 
     $backend = strtolower(DOMPDF_PDF_BACKEND);

Indentation +47 added lines, -48 removed lines

@@ -1,41 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: canvas_factory.cls.php,v $
- * Created on: 2004-06-02
- *
- * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library in the file LICENSE.LGPL; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * Alternatively, you may distribute this software under the terms of the
- * PHP License, version 3.0 or later.  A copy of this license should have
- * been distributed with this file in the file LICENSE.PHP .  If this is not
- * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
- *
- * The latest version of DOMPDF might be available at:
- * http://www.dompdf.com/
- *
- * @link http://www.dompdf.com/
- * @copyright 2004 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @package dompdf
-
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: canvas_factory.cls.php,v $
+     * Created on: 2004-06-02
+     *
+     * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public License
+     * along with this library in the file LICENSE.LGPL; if not, write to the
+     * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     * 02111-1307 USA
+     *
+     * Alternatively, you may distribute this software under the terms of the
+     * PHP License, version 3.0 or later.  A copy of this license should have
+     * been distributed with this file in the file LICENSE.PHP .  If this is not
+     * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
+     *
+     * The latest version of DOMPDF might be available at:
+     * http://www.dompdf.com/
+     *
+     * @link http://www.dompdf.com/
+     * @copyright 2004 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @package dompdf
+     */
 
 /* $Id: canvas_factory.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -49,35 +48,35 @@ 
  */
 class Canvas_Factory {
 
-  /**
-   * Constructor is private: this is a static class
-   */
-  private function __construct() { }
+    /**
+     * Constructor is private: this is a static class
+     */
+    private function __construct() { }
 
-  static function get_instance($paper = null, $orientation = null,  $class = null) {
+    static function get_instance($paper = null, $orientation = null,  $class = null) {
 
     $backend = strtolower(DOMPDF_PDF_BACKEND);
     
     if ( isset($class) && class_exists($class, false) )
-      $class .= "_Adapter";
+        $class .= "_Adapter";
     
     else if ( (DOMPDF_PDF_BACKEND === "auto" || $backend === "pdflib" ) &&
               class_exists("PDFLib", false) )
-      $class = "PDFLib_Adapter";
+        $class = "PDFLib_Adapter";
 
     else if ( (DOMPDF_PDF_BACKEND === "auto" || $backend === "cpdf") )
-      $class = "CPDF_Adapter";
+        $class = "CPDF_Adapter";
 
     else if ( ( $backend === "tcpdf") )
-      $class = "TCPDF_Adapter";
+        $class = "TCPDF_Adapter";
       
     else if ( $backend === "gd" )
-      $class = "GD_Adapter";
+        $class = "GD_Adapter";
     
     else
-      $class = "CPDF_Adapter";
+        $class = "CPDF_Adapter";
 
     return new $class($paper, $orientation);
         
-  }
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -54,24 +54,24 @@
    */
   private function __construct() { }
 
-  static function get_instance($paper = null, $orientation = null,  $class = null) {
+  static function get_instance($paper = null, $orientation = null, $class = null) {
 
     $backend = strtolower(DOMPDF_PDF_BACKEND);
     
-    if ( isset($class) && class_exists($class, false) )
+    if (isset($class) && class_exists($class, false))
       $class .= "_Adapter";
     
-    else if ( (DOMPDF_PDF_BACKEND === "auto" || $backend === "pdflib" ) &&
-              class_exists("PDFLib", false) )
+    else if ((DOMPDF_PDF_BACKEND === "auto" || $backend === "pdflib") &&
+              class_exists("PDFLib", false))
       $class = "PDFLib_Adapter";
 
-    else if ( (DOMPDF_PDF_BACKEND === "auto" || $backend === "cpdf") )
+    else if ((DOMPDF_PDF_BACKEND === "auto" || $backend === "cpdf"))
       $class = "CPDF_Adapter";
 
-    else if ( ( $backend === "tcpdf") )
+    else if (($backend === "tcpdf"))
       $class = "TCPDF_Adapter";
       
-    else if ( $backend === "gd" )
+    else if ($backend === "gd")
       $class = "GD_Adapter";
     
     else

Braces +14 added lines, -18 removed lines

@@ -58,24 +58,20 @@
 
     $backend = strtolower(DOMPDF_PDF_BACKEND);
     
-    if ( isset($class) && class_exists($class, false) )
-      $class .= "_Adapter";
-    
-    else if ( (DOMPDF_PDF_BACKEND === "auto" || $backend === "pdflib" ) &&
-              class_exists("PDFLib", false) )
-      $class = "PDFLib_Adapter";
-
-    else if ( (DOMPDF_PDF_BACKEND === "auto" || $backend === "cpdf") )
-      $class = "CPDF_Adapter";
-
-    else if ( ( $backend === "tcpdf") )
-      $class = "TCPDF_Adapter";
-      
-    else if ( $backend === "gd" )
-      $class = "GD_Adapter";
-    
-    else
-      $class = "CPDF_Adapter";
+    if ( isset($class) && class_exists($class, false) ) {
+          $class .= "_Adapter";
+    } else if ( (DOMPDF_PDF_BACKEND === "auto" || $backend === "pdflib" ) &&
+              class_exists("PDFLib", false) ) {
+          $class = "PDFLib_Adapter";
+    } else if ( (DOMPDF_PDF_BACKEND === "auto" || $backend === "cpdf") ) {
+          $class = "CPDF_Adapter";
+    } else if ( ( $backend === "tcpdf") ) {
+          $class = "TCPDF_Adapter";
+    } else if ( $backend === "gd" ) {
+          $class = "GD_Adapter";
+    } else {
+          $class = "CPDF_Adapter";
+    }
 
     return new $class($paper, $orientation);
         

main/inc/lib/phpdocx/pdf/include/cellmap.cls.php

Doc Comments +8 added lines

@@ -194,6 +194,9 @@ 
     return $this->_rows[$j];
   }
 
+  /**
+   * @param string $h_v
+   */
   function get_border($i, $j, $h_v, $prop = null) {
     if ( !isset($this->_borders[$i][$j][$h_v]) )
       $this->_borders[$i][$j][$h_v] = array("width" => 0,
@@ -318,6 +321,11 @@ 
   //........................................................................
 
 
+  /**
+   * @param integer $i
+   * @param integer $j
+   * @param string $h_v
+   */
   protected function _resolve_border($i, $j, $h_v, $border_spec) {
     $n_width = $border_spec["width"];
     $n_style = $border_spec["style"];

Spacing +83 added lines, -83 removed lines

@@ -170,7 +170,7 @@ 
   }
 
   function &get_column($i) {
-    if ( !isset($this->_columns[$i]) )
+    if (!isset($this->_columns[$i]))
       $this->_columns[$i] = array("x" => 0,
                                   "min-width" => 0,
                                   "max-width" => 0,
@@ -187,7 +187,7 @@ 
   }
 
   function &get_row($j) {
-    if ( !isset($this->_rows[$j]) )
+    if (!isset($this->_rows[$j]))
       $this->_rows[$j] = array("y" => 0,
                                "first-column" => 0,
                                "height" => null);
@@ -195,11 +195,11 @@ 
   }
 
   function get_border($i, $j, $h_v, $prop = null) {
-    if ( !isset($this->_borders[$i][$j][$h_v]) )
+    if (!isset($this->_borders[$i][$j][$h_v]))
       $this->_borders[$i][$j][$h_v] = array("width" => 0,
                                            "style" => "solid",
                                            "color" => "black");
-    if ( isset($prop) )
+    if (isset($prop))
       return $this->_borders[$i][$j][$h_v][$prop];
 
     return $this->_borders[$i][$j][$h_v];
@@ -208,9 +208,9 @@ 
   function get_border_properties($i, $j) {
 
     $left = $this->get_border($i, $j, "vertical");
-    $right = $this->get_border($i, $j+1, "vertical");
+    $right = $this->get_border($i, $j + 1, "vertical");
     $top = $this->get_border($i, $j, "horizontal");
-    $bottom = $this->get_border($i+1, $j, "horizontal");
+    $bottom = $this->get_border($i + 1, $j, "horizontal");
 
     return compact("top", "bottom", "left", "right");
   }
@@ -220,7 +220,7 @@ 
   function get_spanned_cells($frame) {
     $key = $frame->get_id();
 
-    if ( !isset($this->_frames[$key]) ) {
+    if (!isset($this->_frames[$key])) {
       throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
     }
 
@@ -238,20 +238,20 @@ 
 
     $key = $frame->get_id();
 
-    if ( !isset($this->_frames[$key]) ) {
+    if (!isset($this->_frames[$key])) {
       throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
     }
 
     $col = $this->_frames[$key]["columns"][0];
     $row = $this->_frames[$key]["rows"][0];
 
-    if ( !isset($this->_columns[$col])) {
+    if (!isset($this->_columns[$col])) {
       $_dompdf_warnings[] = "Frame not found in columns array.  Check your table layout for missing or extra TDs.";
       $x = 0;
     } else
       $x = $this->_columns[$col]["x"];
 
-    if ( !isset($this->_rows[$row])) {
+    if (!isset($this->_rows[$row])) {
       $_dompdf_warnings[] = "Frame not found in row array.  Check your table layout for missing or extra TDs.";
       $y = 0;
     } else
@@ -263,7 +263,7 @@ 
   function get_frame_width($frame) {
     $key = $frame->get_id();
 
-    if ( !isset($this->_frames[$key]) ) {
+    if (!isset($this->_frames[$key])) {
       throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
     }
 
@@ -279,13 +279,13 @@ 
   function get_frame_height($frame) {
     $key = $frame->get_id();
 
-    if ( !isset($this->_frames[$key]) )
+    if (!isset($this->_frames[$key]))
       throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
 
     $rows = $this->_frames[$key]["rows"];
     $h = 0;
     foreach ($rows as $i) {
-      if ( !isset($this->_rows[$i]) )  {
+      if (!isset($this->_rows[$i])) {
         throw new Exception("foo");
       }
       $h += $this->_rows[$i]["height"];
@@ -298,19 +298,19 @@ 
   //........................................................................
 
   function set_column_width($j, $width) {
-    $col =& $this->get_column($j);
+    $col = & $this->get_column($j);
     $col["used-width"] = $width;
-    $next_col =& $this->get_column($j+1);
+    $next_col = & $this->get_column($j + 1);
     $next_col["x"] = $next_col["x"] + $width;
   }
 
   function set_row_height($i, $height) {
-    $row =& $this->get_row($i);
-    if ( $height <= $row["height"] )
+    $row = & $this->get_row($i);
+    if ($height <= $row["height"])
       return;
 
     $row["height"] = $height;
-    $next_row =& $this->get_row($i+1);
+    $next_row = & $this->get_row($i + 1);
     $next_row["y"] = $row["y"] + $height;
 
   }
@@ -323,7 +323,7 @@ 
     $n_style = $border_spec["style"];
     $n_color = $border_spec["color"];
 
-    if ( !isset($this->_borders[$i][$j][$h_v]) ) {
+    if (!isset($this->_borders[$i][$j][$h_v])) {
       $this->_borders[$i][$j][$h_v] = $border_spec;
       return $this->_borders[$i][$j][$h_v]["width"];
     }
@@ -332,15 +332,15 @@ 
     $o_style = $this->_borders[$i][$j][$h_v]["style"];
     $o_color = $this->_borders[$i][$j][$h_v]["color"];
 
-    if ( ($n_style === "hidden" ||
-          $n_width  >  $o_width ||
+    if (($n_style === "hidden" ||
+          $n_width > $o_width ||
           $o_style === "none")
 
          or
 
          ($o_width == $n_width &&
           in_array($n_style, self::$_BORDER_STYLE_SCORE) &&
-          self::$_BORDER_STYLE_SCORE[ $n_style ] > self::$_BORDER_STYLE_SCORE[ $o_style ]) )
+          self::$_BORDER_STYLE_SCORE[$n_style] > self::$_BORDER_STYLE_SCORE[$o_style]))
       $this->_borders[$i][$j][$h_v] = $border_spec;
 
     return $this->_borders[$i][$j][$h_v]["width"];
@@ -356,37 +356,37 @@ 
     $collapse = $this->_table->get_style()->border_collapse == "collapse";
 
     // Recursively add the frames within tables, table-row-groups and table-rows
-    if ( $display == "table-row" ||
+    if ($display == "table-row" ||
          $display == "table" ||
          $display == "inline-table" ||
-         in_array($display, Table_Frame_Decorator::$ROW_GROUPS) ) {
+         in_array($display, Table_Frame_Decorator::$ROW_GROUPS)) {
 
       $start_row = $this->__row;
-      foreach ( $frame->get_children() as $child )
-        $this->add_frame( $child );
+      foreach ($frame->get_children() as $child)
+        $this->add_frame($child);
 
-      if ( $display == "table-row" )
+      if ($display == "table-row")
         $this->add_row();
 
       $num_rows = $this->__row - $start_row - 1;
       $key = $frame->get_id();
 
       // Row groups always span across the entire table
-      $this->_frames[ $key ]["columns"] = range(0,max(0,$this->_num_cols-1));
-      $this->_frames[ $key ]["rows"] = range($start_row, max(0, $this->__row - 1));
-      $this->_frames[ $key ]["frame"] = $frame;
+      $this->_frames[$key]["columns"] = range(0, max(0, $this->_num_cols - 1));
+      $this->_frames[$key]["rows"] = range($start_row, max(0, $this->__row - 1));
+      $this->_frames[$key]["frame"] = $frame;
 
-      if ( $display != "table-row" && $collapse ) {
+      if ($display != "table-row" && $collapse) {
 
         $bp = $style->get_border_properties();
 
         // Resolve the borders
-        for ( $i = 0; $i < $num_rows+1; $i++) {
+        for ($i = 0; $i < $num_rows + 1; $i++) {
           $this->_resolve_border($start_row + $i, 0, "vertical", $bp["left"]);
           $this->_resolve_border($start_row + $i, $this->_num_cols, "vertical", $bp["right"]);
         }
 
-        for ( $j = 0; $j < $this->_num_cols; $j++) {
+        for ($j = 0; $j < $this->_num_cols; $j++) {
           $this->_resolve_border($start_row, $j, "horizontal", $bp["top"]);
           $this->_resolve_border($this->__row, $j, "horizontal", $bp["bottom"]);
         }
@@ -400,14 +400,14 @@ 
     $colspan = $frame->get_node()->getAttribute("colspan");
     $rowspan = $frame->get_node()->getAttribute("rowspan");
 
-    if ( !$colspan ) {
+    if (!$colspan) {
       $colspan = 1;
-      $frame->get_node()->setAttribute("colspan",1);
+      $frame->get_node()->setAttribute("colspan", 1);
     }
 
-    if ( !$rowspan ) {
+    if (!$rowspan) {
       $rowspan = 1;
-      $frame->get_node()->setAttribute("rowspan",1);
+      $frame->get_node()->setAttribute("rowspan", 1);
     }
     $key = $frame->get_id();
 
@@ -419,20 +419,20 @@ 
 
     // Find the next available column (fix by Ciro Mondueri)
     $ac = $this->__col;
-    while ( isset($this->_cells[$this->__row][$ac]) )
+    while (isset($this->_cells[$this->__row][$ac]))
        $ac++;
     $this->__col = $ac;
 
     // Rows:
-    for ( $i = 0; $i < $rowspan; $i++ ) {
+    for ($i = 0; $i < $rowspan; $i++) {
       $row = $this->__row + $i;
 
-      $this->_frames[ $key ]["rows"][] = $row;
+      $this->_frames[$key]["rows"][] = $row;
 
-      for ( $j = 0; $j < $colspan; $j++)
+      for ($j = 0; $j < $colspan; $j++)
         $this->_cells[$row][$this->__col + $j] = $frame;
 
-      if ( $collapse ) {
+      if ($collapse) {
         // Resolve vertical borders
         $max_left = max($max_left, $this->_resolve_border($row, $this->__col, "vertical", $bp["left"]));
         $max_right = max($max_right, $this->_resolve_border($row, $this->__col + $colspan, "vertical", $bp["right"]));
@@ -442,21 +442,21 @@ 
     $max_top = $max_bottom = 0;
 
     // Columns:
-    for ( $j = 0; $j < $colspan; $j++ ) {
+    for ($j = 0; $j < $colspan; $j++) {
       $col = $this->__col + $j;
-      $this->_frames[ $key ]["columns"][] = $col;
+      $this->_frames[$key]["columns"][] = $col;
 
-      if ( $collapse ) {
+      if ($collapse) {
         // Resolve horizontal borders
         $max_top = max($max_top, $this->_resolve_border($this->__row, $col, "horizontal", $bp["top"]));
         $max_bottom = max($max_bottom, $this->_resolve_border($this->__row + $rowspan, $col, "horizontal", $bp["bottom"]));
       }
     }
 
-    $this->_frames[ $key ]["frame"] = $frame;
+    $this->_frames[$key]["frame"] = $frame;
 
     // Handle seperated border model
-    if ( !$collapse ) {
+    if (!$collapse) {
       list($h, $v) = $this->_table->get_style()->border_spacing;
 
       // Border spacing is effectively a margin between cells
@@ -481,26 +481,26 @@ 
 
     $width = $style->width;
 
-    if ( is_percent($width) ) {
+    if (is_percent($width)) {
       $var = "percent";
-      $val = (float)rtrim($width, "% ") / $colspan;
+      $val = (float) rtrim($width, "% ") / $colspan;
 
-    } else if ( $width !== "auto" ) {
+    } else if ($width !== "auto") {
       $var = "absolute";
       $val = $style->length_in_pt($frame_min) / $colspan;
     }
 
     $min = 0;
     $max = 0;
-    for ( $cs = 0; $cs < $colspan; $cs++ ) {
+    for ($cs = 0; $cs < $colspan; $cs++) {
 
       // Resolve the frame's width(s) with other cells
-      $col =& $this->get_column( $this->__col + $cs );
+      $col = & $this->get_column($this->__col + $cs);
 
       // Note: $var is either 'percent' or 'absolute'.  We compare the
       // requested percentage or absolute values with the existing widths
       // and adjust accordingly.
-      if ( isset($var) && $val > $col[$var] ) {
+      if (isset($var) && $val > $col[$var]) {
         $col[$var] = $val;
         $col["auto"] = false;
       }
@@ -510,25 +510,25 @@ 
     }
 
 
-    if ( $frame_min > $min ) {
+    if ($frame_min > $min) {
       // The frame needs more space.  Expand each sub-column
       $inc = ($frame_min - $min) / $colspan;
       for ($c = 0; $c < $colspan; $c++) {
-        $col =& $this->get_column($this->__col + $c);
+        $col = & $this->get_column($this->__col + $c);
         $col["min-width"] += $inc;
       }
     }
 
-    if ( $frame_max > $max ) {
+    if ($frame_max > $max) {
       $inc = ($frame_max - $max) / $colspan;
       for ($c = 0; $c < $colspan; $c++) {
-        $col =& $this->get_column($this->__col + $c);
+        $col = & $this->get_column($this->__col + $c);
         $col["max-width"] += $inc;
       }
     }
 
     $this->__col += $colspan;
-    if ( $this->__col > $this->_num_cols )
+    if ($this->__col > $this->_num_cols)
       $this->_num_cols = $this->__col;
 
   }
@@ -542,7 +542,7 @@ 
 
     // Find the next available column
     $i = 0;
-    while ( isset($this->_cells[$this->__row][$i]) )
+    while (isset($this->_cells[$this->__row][$i]))
       $i++;
 
     $this->__col = $i;
@@ -559,8 +559,8 @@ 
   function remove_row(Frame $row) {
 
     $key = $row->get_id();
-    if ( !isset($this->_frames[$key]) )
-      return;  // Presumably this row has alredy been removed
+    if (!isset($this->_frames[$key]))
+      return; // Presumably this row has alredy been removed
 
     $this->_row = $this->_num_rows--;
 
@@ -568,11 +568,11 @@ 
     $columns = $this->_frames[$key]["columns"];
 
     // Remove all frames from this row
-    foreach ( $rows as $r ) {
-      foreach ( $columns as $c ) {
-        if ( isset($this->_cells[$r][$c]) ) {
+    foreach ($rows as $r) {
+      foreach ($columns as $c) {
+        if (isset($this->_cells[$r][$c])) {
           $frame = $this->_cells[$r][$c];
-          unset($this->_frames[ $frame->get_id() ]);
+          unset($this->_frames[$frame->get_id()]);
           unset($this->_cells[$r][$c]);
         }
       }
@@ -591,8 +591,8 @@ 
   function remove_row_group(Frame $group) {
 
     $key = $group->get_id();
-    if ( !isset($this->_frames[$key]) )
-      return;  // Presumably this row has alredy been removed
+    if (!isset($this->_frames[$key]))
+      return; // Presumably this row has alredy been removed
 
     $iter = $group->get_first_child();
     while ($iter) {
@@ -615,7 +615,7 @@ 
     $r_key = $last_row->get_id();
 
     $r_rows = $this->_frames[$r_key]["rows"];
-    $this->_frames[$g_key]["rows"] = range( $this->_frames[$g_key]["rows"][0], end($r_rows) );
+    $this->_frames[$g_key]["rows"] = range($this->_frames[$g_key]["rows"][0], end($r_rows));
 
   }
 
@@ -626,7 +626,7 @@ 
     // column[0]["x"] must be set.
 
     $x = $this->_columns[0]["x"];
-    foreach ( array_keys($this->_columns) as $j ) {
+    foreach (array_keys($this->_columns) as $j) {
       $this->_columns[$j]["x"] = $x;
       $x += $this->_columns[$j]["used-width"];
 
@@ -638,18 +638,18 @@ 
     // Pre-condition: widths and heights of each column & row must be
     // calcluated
 
-    foreach ( $this->_frames as $arr ) {
+    foreach ($this->_frames as $arr) {
       $frame = $arr["frame"];
 
       $h = 0;
-      foreach( $arr["rows"] as $row ) {
-        if ( !isset($this->_rows[$row]) )
+      foreach ($arr["rows"] as $row) {
+        if (!isset($this->_rows[$row]))
           // The row has been removed because of a page split, so skip it.
           continue;
         $h += $this->_rows[$row]["height"];
       }
 
-      if ( $frame instanceof Table_Cell_Frame_Decorator )
+      if ($frame instanceof Table_Cell_Frame_Decorator)
         $frame->set_cell_height($h);
       else
         $frame->get_style()->height = $h;
@@ -666,12 +666,12 @@ 
 
 
     // Distribute the increased height proportionally amongst each row
-    foreach ( $this->_frames as $arr ) {
+    foreach ($this->_frames as $arr) {
       $frame = $arr["frame"];
 
       $h = 0;
-      foreach ($arr["rows"] as $row ) {
-        if ( !isset($this->_rows[$row]) )
+      foreach ($arr["rows"] as $row) {
+        if (!isset($this->_rows[$row]))
           continue;
 
         $h += $this->_rows[$row]["height"];
@@ -679,7 +679,7 @@ 
 
       $new_height = ($h / $content_height) * $table_height;
 
-      if ( $frame instanceof Table_Cell_Frame_Decorator )
+      if ($frame instanceof Table_Cell_Frame_Decorator)
         $frame->set_cell_height($new_height);
       else
         $frame->get_style()->height = $new_height;
@@ -694,19 +694,19 @@ 
     $str = "";
     $str .= "Columns:<br/>";
     $str .= pre_r($this->_columns, true);
-    $str .=  "Rows:<br/>";
+    $str .= "Rows:<br/>";
     $str .= pre_r($this->_rows, true);
 
-    $str .=  "Frames:<br/>";
+    $str .= "Frames:<br/>";
     $arr = array();
-    foreach ( $this->_frames as $key => $val )
+    foreach ($this->_frames as $key => $val)
       $arr[$key] = array("columns" => $val["columns"], "rows" => $val["rows"]);
 
     $str .= pre_r($arr, true);
 
-    if ( php_sapi_name() == "cli" )
-      $str = strip_tags(str_replace(array("<br/>","<b>","</b>"),
-                                    array("\n",chr(27)."[01;33m", chr(27)."[0m"),
+    if (php_sapi_name() == "cli")
+      $str = strip_tags(str_replace(array("<br/>", "<b>", "</b>"),
+                                    array("\n", chr(27)."[01;33m", chr(27)."[0m"),
                                     $str));
     return $str;
   }

Braces +78 added lines, -52 removed lines

@@ -170,14 +170,15 @@ 
   }
 
   function &get_column($i) {
-    if ( !isset($this->_columns[$i]) )
-      $this->_columns[$i] = array("x" => 0,
+    if ( !isset($this->_columns[$i]) ) {
+          $this->_columns[$i] = array("x" => 0,
                                   "min-width" => 0,
                                   "max-width" => 0,
                                   "used-width" => null,
                                   "absolute" => 0,
                                   "percent" => 0,
                                   "auto" => true);
+    }
 
     return $this->_columns[$i];
   }
@@ -187,20 +188,23 @@ 
   }
 
   function &get_row($j) {
-    if ( !isset($this->_rows[$j]) )
-      $this->_rows[$j] = array("y" => 0,
+    if ( !isset($this->_rows[$j]) ) {
+          $this->_rows[$j] = array("y" => 0,
                                "first-column" => 0,
                                "height" => null);
+    }
     return $this->_rows[$j];
   }
 
   function get_border($i, $j, $h_v, $prop = null) {
-    if ( !isset($this->_borders[$i][$j][$h_v]) )
-      $this->_borders[$i][$j][$h_v] = array("width" => 0,
+    if ( !isset($this->_borders[$i][$j][$h_v]) ) {
+          $this->_borders[$i][$j][$h_v] = array("width" => 0,
                                            "style" => "solid",
                                            "color" => "black");
-    if ( isset($prop) )
-      return $this->_borders[$i][$j][$h_v][$prop];
+    }
+    if ( isset($prop) ) {
+          return $this->_borders[$i][$j][$h_v][$prop];
+    }
 
     return $this->_borders[$i][$j][$h_v];
   }
@@ -248,14 +252,16 @@ 
     if ( !isset($this->_columns[$col])) {
       $_dompdf_warnings[] = "Frame not found in columns array.  Check your table layout for missing or extra TDs.";
       $x = 0;
-    } else
-      $x = $this->_columns[$col]["x"];
+    } else {
+          $x = $this->_columns[$col]["x"];
+    }
 
     if ( !isset($this->_rows[$row])) {
       $_dompdf_warnings[] = "Frame not found in row array.  Check your table layout for missing or extra TDs.";
       $y = 0;
-    } else
-      $y = $this->_rows[$row]["y"];
+    } else {
+          $y = $this->_rows[$row]["y"];
+    }
 
     return array($x, $y, "x" => $x, "y" => $y);
   }
@@ -269,8 +275,9 @@ 
 
     $cols = $this->_frames[$key]["columns"];
     $w = 0;
-    foreach ($cols as $i)
-      $w += $this->_columns[$i]["used-width"];
+    foreach ($cols as $i) {
+          $w += $this->_columns[$i]["used-width"];
+    }
 
     return $w;
 
@@ -279,8 +286,9 @@ 
   function get_frame_height($frame) {
     $key = $frame->get_id();
 
-    if ( !isset($this->_frames[$key]) )
-      throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
+    if ( !isset($this->_frames[$key]) ) {
+          throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
+    }
 
     $rows = $this->_frames[$key]["rows"];
     $h = 0;
@@ -306,8 +314,9 @@ 
 
   function set_row_height($i, $height) {
     $row =& $this->get_row($i);
-    if ( $height <= $row["height"] )
-      return;
+    if ( $height <= $row["height"] ) {
+          return;
+    }
 
     $row["height"] = $height;
     $next_row =& $this->get_row($i+1);
@@ -340,8 +349,9 @@ 
 
          ($o_width == $n_width &&
           in_array($n_style, self::$_BORDER_STYLE_SCORE) &&
-          self::$_BORDER_STYLE_SCORE[ $n_style ] > self::$_BORDER_STYLE_SCORE[ $o_style ]) )
-      $this->_borders[$i][$j][$h_v] = $border_spec;
+          self::$_BORDER_STYLE_SCORE[ $n_style ] > self::$_BORDER_STYLE_SCORE[ $o_style ]) ) {
+          $this->_borders[$i][$j][$h_v] = $border_spec;
+    }
 
     return $this->_borders[$i][$j][$h_v]["width"];
   }
@@ -362,11 +372,13 @@ 
          in_array($display, Table_Frame_Decorator::$ROW_GROUPS) ) {
 
       $start_row = $this->__row;
-      foreach ( $frame->get_children() as $child )
-        $this->add_frame( $child );
+      foreach ( $frame->get_children() as $child ) {
+              $this->add_frame( $child );
+      }
 
-      if ( $display == "table-row" )
-        $this->add_row();
+      if ( $display == "table-row" ) {
+              $this->add_row();
+      }
 
       $num_rows = $this->__row - $start_row - 1;
       $key = $frame->get_id();
@@ -419,8 +431,9 @@ 
 
     // Find the next available column (fix by Ciro Mondueri)
     $ac = $this->__col;
-    while ( isset($this->_cells[$this->__row][$ac]) )
-       $ac++;
+    while ( isset($this->_cells[$this->__row][$ac]) ) {
+           $ac++;
+    }
     $this->__col = $ac;
 
     // Rows:
@@ -429,8 +442,9 @@ 
 
       $this->_frames[ $key ]["rows"][] = $row;
 
-      for ( $j = 0; $j < $colspan; $j++)
-        $this->_cells[$row][$this->__col + $j] = $frame;
+      for ( $j = 0; $j < $colspan; $j++) {
+              $this->_cells[$row][$this->__col + $j] = $frame;
+      }
 
       if ( $collapse ) {
         // Resolve vertical borders
@@ -528,8 +542,9 @@ 
     }
 
     $this->__col += $colspan;
-    if ( $this->__col > $this->_num_cols )
-      $this->_num_cols = $this->__col;
+    if ( $this->__col > $this->_num_cols ) {
+          $this->_num_cols = $this->__col;
+    }
 
   }
 
@@ -542,8 +557,9 @@ 
 
     // Find the next available column
     $i = 0;
-    while ( isset($this->_cells[$this->__row][$i]) )
-      $i++;
+    while ( isset($this->_cells[$this->__row][$i]) ) {
+          $i++;
+    }
 
     $this->__col = $i;
 
@@ -559,8 +575,10 @@ 
   function remove_row(Frame $row) {
 
     $key = $row->get_id();
-    if ( !isset($this->_frames[$key]) )
-      return;  // Presumably this row has alredy been removed
+    if ( !isset($this->_frames[$key]) ) {
+          return;
+    }
+    // Presumably this row has alredy been removed
 
     $this->_row = $this->_num_rows--;
 
@@ -591,8 +609,10 @@ 
   function remove_row_group(Frame $group) {
 
     $key = $group->get_id();
-    if ( !isset($this->_frames[$key]) )
-      return;  // Presumably this row has alredy been removed
+    if ( !isset($this->_frames[$key]) ) {
+          return;
+    }
+    // Presumably this row has alredy been removed
 
     $iter = $group->get_first_child();
     while ($iter) {
@@ -643,16 +663,18 @@ 
 
       $h = 0;
       foreach( $arr["rows"] as $row ) {
-        if ( !isset($this->_rows[$row]) )
-          // The row has been removed because of a page split, so skip it.
+        if ( !isset($this->_rows[$row]) ) {
+                  // The row has been removed because of a page split, so skip it.
           continue;
+        }
         $h += $this->_rows[$row]["height"];
       }
 
-      if ( $frame instanceof Table_Cell_Frame_Decorator )
-        $frame->set_cell_height($h);
-      else
-        $frame->get_style()->height = $h;
+      if ( $frame instanceof Table_Cell_Frame_Decorator ) {
+              $frame->set_cell_height($h);
+      } else {
+              $frame->get_style()->height = $h;
+      }
     }
 
   }
@@ -671,18 +693,20 @@ 
 
       $h = 0;
       foreach ($arr["rows"] as $row ) {
-        if ( !isset($this->_rows[$row]) )
-          continue;
+        if ( !isset($this->_rows[$row]) ) {
+                  continue;
+        }
 
         $h += $this->_rows[$row]["height"];
       }
 
       $new_height = ($h / $content_height) * $table_height;
 
-      if ( $frame instanceof Table_Cell_Frame_Decorator )
-        $frame->set_cell_height($new_height);
-      else
-        $frame->get_style()->height = $new_height;
+      if ( $frame instanceof Table_Cell_Frame_Decorator ) {
+              $frame->set_cell_height($new_height);
+      } else {
+              $frame->get_style()->height = $new_height;
+      }
     }
 
   }
@@ -699,15 +723,17 @@ 
 
     $str .=  "Frames:<br/>";
     $arr = array();
-    foreach ( $this->_frames as $key => $val )
-      $arr[$key] = array("columns" => $val["columns"], "rows" => $val["rows"]);
+    foreach ( $this->_frames as $key => $val ) {
+          $arr[$key] = array("columns" => $val["columns"], "rows" => $val["rows"]);
+    }
 
     $str .= pre_r($arr, true);
 
-    if ( php_sapi_name() == "cli" )
-      $str = strip_tags(str_replace(array("<br/>","<b>","</b>"),
+    if ( php_sapi_name() == "cli" ) {
+          $str = strip_tags(str_replace(array("<br/>","<b>","</b>"),
                                     array("\n",chr(27)."[01;33m", chr(27)."[0m"),
                                     $str));
+    }
     return $str;
   }
 }

Indentation +288 added lines, -289 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: cellmap.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -50,12 +49,12 @@ 
  */
 class Cellmap {
 
-  /**
-   * Border style weight lookup for collapsed border resolution.
-   *
-   * @var array
-   */
-  static protected $_BORDER_STYLE_SCORE = array("inset"  => 1,
+    /**
+     * Border style weight lookup for collapsed border resolution.
+     *
+     * @var array
+     */
+    static protected $_BORDER_STYLE_SCORE = array("inset"  => 1,
                                                 "groove" => 2,
                                                 "outset" => 3,
                                                 "ridge"  => 4,
@@ -65,87 +64,87 @@ 
                                                 "double" => 8,
                                                 "none"   => 0);
 
-  /**
-   * The table object this cellmap is attached to.
-   *
-   * @var Table_Frame_Decorator
-   */
-  protected $_table;
-
-  /**
-   * The total number of rows in the table
-   *
-   * @var int
-   */
-  protected $_num_rows;
-
-  /**
-   * The total number of columns in the table
-   *
-   * @var int
-   */
-  protected $_num_cols;
-
-  /**
-   * 2D array mapping <row,column> to frames
-   *
-   * @var array
-   */
-  protected $_cells;
-
-  /**
-   * 1D array of column dimensions
-   *
-   * @var array
-   */
-  protected $_columns;
-
-  /**
-   * 1D array of row dimensions
-   *
-   * @var array
-   */
-  protected $_rows;
-
-  /**
-   * 2D array of border specs
-   *
-   * @var array
-   */
-  protected $_borders;
-
-  /**
-   * 1D Array mapping frames to (multiple) <row, col> pairs, keyed on
-   * frame_id.
-   *
-   * @var array
-   */
-  protected $_frames;
-
-  /**
-   * Current column when adding cells, 0-based
-   *
-   * @var int
-   */
-  private $__col;
-
-  /**
-   * Current row when adding cells, 0-based
-   *
-   * @var int
-   */
-  private $__row;
-
-  //........................................................................
-
-  function __construct(Table_Frame_Decorator $table) {
+    /**
+     * The table object this cellmap is attached to.
+     *
+     * @var Table_Frame_Decorator
+     */
+    protected $_table;
+
+    /**
+     * The total number of rows in the table
+     *
+     * @var int
+     */
+    protected $_num_rows;
+
+    /**
+     * The total number of columns in the table
+     *
+     * @var int
+     */
+    protected $_num_cols;
+
+    /**
+     * 2D array mapping <row,column> to frames
+     *
+     * @var array
+     */
+    protected $_cells;
+
+    /**
+     * 1D array of column dimensions
+     *
+     * @var array
+     */
+    protected $_columns;
+
+    /**
+     * 1D array of row dimensions
+     *
+     * @var array
+     */
+    protected $_rows;
+
+    /**
+     * 2D array of border specs
+     *
+     * @var array
+     */
+    protected $_borders;
+
+    /**
+     * 1D Array mapping frames to (multiple) <row, col> pairs, keyed on
+     * frame_id.
+     *
+     * @var array
+     */
+    protected $_frames;
+
+    /**
+     * Current column when adding cells, 0-based
+     *
+     * @var int
+     */
+    private $__col;
+
+    /**
+     * Current row when adding cells, 0-based
+     *
+     * @var int
+     */
+    private $__row;
+
+    //........................................................................
+
+    function __construct(Table_Frame_Decorator $table) {
     $this->_table = $table;
     $this->reset();
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function reset() {
+    function reset() {
     $this->_num_rows = 0;
     $this->_num_cols = 0;
 
@@ -158,54 +157,54 @@ 
     $this->_borders = array();
 
     $this->__col = $this->__row = 0;
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function get_num_rows() { return $this->_num_rows; }
-  function get_num_cols() { return $this->_num_cols; }
+    function get_num_rows() { return $this->_num_rows; }
+    function get_num_cols() { return $this->_num_cols; }
 
-  function &get_columns() {
+    function &get_columns() {
     return $this->_columns;
-  }
+    }
 
-  function &get_column($i) {
+    function &get_column($i) {
     if ( !isset($this->_columns[$i]) )
-      $this->_columns[$i] = array("x" => 0,
-                                  "min-width" => 0,
-                                  "max-width" => 0,
-                                  "used-width" => null,
-                                  "absolute" => 0,
-                                  "percent" => 0,
-                                  "auto" => true);
+        $this->_columns[$i] = array("x" => 0,
+                                    "min-width" => 0,
+                                    "max-width" => 0,
+                                    "used-width" => null,
+                                    "absolute" => 0,
+                                    "percent" => 0,
+                                    "auto" => true);
 
     return $this->_columns[$i];
-  }
+    }
 
-  function &get_rows() {
+    function &get_rows() {
     return $this->_rows;
-  }
+    }
 
-  function &get_row($j) {
+    function &get_row($j) {
     if ( !isset($this->_rows[$j]) )
-      $this->_rows[$j] = array("y" => 0,
-                               "first-column" => 0,
-                               "height" => null);
+        $this->_rows[$j] = array("y" => 0,
+                                "first-column" => 0,
+                                "height" => null);
     return $this->_rows[$j];
-  }
+    }
 
-  function get_border($i, $j, $h_v, $prop = null) {
+    function get_border($i, $j, $h_v, $prop = null) {
     if ( !isset($this->_borders[$i][$j][$h_v]) )
-      $this->_borders[$i][$j][$h_v] = array("width" => 0,
-                                           "style" => "solid",
-                                           "color" => "black");
+        $this->_borders[$i][$j][$h_v] = array("width" => 0,
+                                            "style" => "solid",
+                                            "color" => "black");
     if ( isset($prop) )
-      return $this->_borders[$i][$j][$h_v][$prop];
+        return $this->_borders[$i][$j][$h_v][$prop];
 
     return $this->_borders[$i][$j][$h_v];
-  }
+    }
 
-  function get_border_properties($i, $j) {
+    function get_border_properties($i, $j) {
 
     $left = $this->get_border($i, $j, "vertical");
     $right = $this->get_border($i, $j+1, "vertical");
@@ -213,119 +212,119 @@ 
     $bottom = $this->get_border($i+1, $j, "horizontal");
 
     return compact("top", "bottom", "left", "right");
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function get_spanned_cells($frame) {
+    function get_spanned_cells($frame) {
     $key = $frame->get_id();
 
     if ( !isset($this->_frames[$key]) ) {
-      throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
+        throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
     }
 
     return $this->_frames[$key];
 
-  }
+    }
 
-  function frame_exists_in_cellmap($frame) {
+    function frame_exists_in_cellmap($frame) {
     $key = $frame->get_id();
     return isset($this->_frames[$key]);
-  }
+    }
   
-  function get_frame_position($frame) {
+    function get_frame_position($frame) {
     global $_dompdf_warnings;
 
     $key = $frame->get_id();
 
     if ( !isset($this->_frames[$key]) ) {
-      throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
+        throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
     }
 
     $col = $this->_frames[$key]["columns"][0];
     $row = $this->_frames[$key]["rows"][0];
 
     if ( !isset($this->_columns[$col])) {
-      $_dompdf_warnings[] = "Frame not found in columns array.  Check your table layout for missing or extra TDs.";
-      $x = 0;
+        $_dompdf_warnings[] = "Frame not found in columns array.  Check your table layout for missing or extra TDs.";
+        $x = 0;
     } else
-      $x = $this->_columns[$col]["x"];
+        $x = $this->_columns[$col]["x"];
 
     if ( !isset($this->_rows[$row])) {
-      $_dompdf_warnings[] = "Frame not found in row array.  Check your table layout for missing or extra TDs.";
-      $y = 0;
+        $_dompdf_warnings[] = "Frame not found in row array.  Check your table layout for missing or extra TDs.";
+        $y = 0;
     } else
-      $y = $this->_rows[$row]["y"];
+        $y = $this->_rows[$row]["y"];
 
     return array($x, $y, "x" => $x, "y" => $y);
-  }
+    }
 
-  function get_frame_width($frame) {
+    function get_frame_width($frame) {
     $key = $frame->get_id();
 
     if ( !isset($this->_frames[$key]) ) {
-      throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
+        throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
     }
 
     $cols = $this->_frames[$key]["columns"];
     $w = 0;
     foreach ($cols as $i)
-      $w += $this->_columns[$i]["used-width"];
+        $w += $this->_columns[$i]["used-width"];
 
     return $w;
 
-  }
+    }
 
-  function get_frame_height($frame) {
+    function get_frame_height($frame) {
     $key = $frame->get_id();
 
     if ( !isset($this->_frames[$key]) )
-      throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
+        throw new DOMPDF_Internal_Exception("Frame not found in cellmap");
 
     $rows = $this->_frames[$key]["rows"];
     $h = 0;
     foreach ($rows as $i) {
-      if ( !isset($this->_rows[$i]) )  {
+        if ( !isset($this->_rows[$i]) )  {
         throw new Exception("foo");
-      }
-      $h += $this->_rows[$i]["height"];
+        }
+        $h += $this->_rows[$i]["height"];
     }
     return $h;
 
-  }
+    }
 
 
-  //........................................................................
+    //........................................................................
 
-  function set_column_width($j, $width) {
+    function set_column_width($j, $width) {
     $col =& $this->get_column($j);
     $col["used-width"] = $width;
     $next_col =& $this->get_column($j+1);
     $next_col["x"] = $next_col["x"] + $width;
-  }
+    }
 
-  function set_row_height($i, $height) {
+    function set_row_height($i, $height) {
     $row =& $this->get_row($i);
     if ( $height <= $row["height"] )
-      return;
+        return;
 
     $row["height"] = $height;
     $next_row =& $this->get_row($i+1);
     $next_row["y"] = $row["y"] + $height;
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
 
-  protected function _resolve_border($i, $j, $h_v, $border_spec) {
+    protected function _resolve_border($i, $j, $h_v, $border_spec) {
     $n_width = $border_spec["width"];
     $n_style = $border_spec["style"];
     $n_color = $border_spec["color"];
 
     if ( !isset($this->_borders[$i][$j][$h_v]) ) {
-      $this->_borders[$i][$j][$h_v] = $border_spec;
-      return $this->_borders[$i][$j][$h_v]["width"];
+        $this->_borders[$i][$j][$h_v] = $border_spec;
+        return $this->_borders[$i][$j][$h_v]["width"];
     }
 
     $o_width = $this->_borders[$i][$j][$h_v]["width"];
@@ -341,14 +340,14 @@ 
          ($o_width == $n_width &&
           in_array($n_style, self::$_BORDER_STYLE_SCORE) &&
           self::$_BORDER_STYLE_SCORE[ $n_style ] > self::$_BORDER_STYLE_SCORE[ $o_style ]) )
-      $this->_borders[$i][$j][$h_v] = $border_spec;
+        $this->_borders[$i][$j][$h_v] = $border_spec;
 
     return $this->_borders[$i][$j][$h_v]["width"];
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function add_frame(Frame $frame) {
+    function add_frame(Frame $frame) {
     
     $style = $frame->get_style();
     $display = $style->display;
@@ -361,39 +360,39 @@ 
          $display == "inline-table" ||
          in_array($display, Table_Frame_Decorator::$ROW_GROUPS) ) {
 
-      $start_row = $this->__row;
-      foreach ( $frame->get_children() as $child )
+        $start_row = $this->__row;
+        foreach ( $frame->get_children() as $child )
         $this->add_frame( $child );
 
-      if ( $display == "table-row" )
+        if ( $display == "table-row" )
         $this->add_row();
 
-      $num_rows = $this->__row - $start_row - 1;
-      $key = $frame->get_id();
+        $num_rows = $this->__row - $start_row - 1;
+        $key = $frame->get_id();
 
-      // Row groups always span across the entire table
-      $this->_frames[ $key ]["columns"] = range(0,max(0,$this->_num_cols-1));
-      $this->_frames[ $key ]["rows"] = range($start_row, max(0, $this->__row - 1));
-      $this->_frames[ $key ]["frame"] = $frame;
+        // Row groups always span across the entire table
+        $this->_frames[ $key ]["columns"] = range(0,max(0,$this->_num_cols-1));
+        $this->_frames[ $key ]["rows"] = range($start_row, max(0, $this->__row - 1));
+        $this->_frames[ $key ]["frame"] = $frame;
 
-      if ( $display != "table-row" && $collapse ) {
+        if ( $display != "table-row" && $collapse ) {
 
         $bp = $style->get_border_properties();
 
         // Resolve the borders
         for ( $i = 0; $i < $num_rows+1; $i++) {
-          $this->_resolve_border($start_row + $i, 0, "vertical", $bp["left"]);
-          $this->_resolve_border($start_row + $i, $this->_num_cols, "vertical", $bp["right"]);
+            $this->_resolve_border($start_row + $i, 0, "vertical", $bp["left"]);
+            $this->_resolve_border($start_row + $i, $this->_num_cols, "vertical", $bp["right"]);
         }
 
         for ( $j = 0; $j < $this->_num_cols; $j++) {
-          $this->_resolve_border($start_row, $j, "horizontal", $bp["top"]);
-          $this->_resolve_border($this->__row, $j, "horizontal", $bp["bottom"]);
+            $this->_resolve_border($start_row, $j, "horizontal", $bp["top"]);
+            $this->_resolve_border($this->__row, $j, "horizontal", $bp["bottom"]);
+        }
         }
-      }
 
 
-      return;
+        return;
     }
 
     // Determine where this cell is going
@@ -401,13 +400,13 @@ 
     $rowspan = $frame->get_node()->getAttribute("rowspan");
 
     if ( !$colspan ) {
-      $colspan = 1;
-      $frame->get_node()->setAttribute("colspan",1);
+        $colspan = 1;
+        $frame->get_node()->setAttribute("colspan",1);
     }
 
     if ( !$rowspan ) {
-      $rowspan = 1;
-      $frame->get_node()->setAttribute("rowspan",1);
+        $rowspan = 1;
+        $frame->get_node()->setAttribute("rowspan",1);
     }
     $key = $frame->get_id();
 
@@ -420,60 +419,60 @@ 
     // Find the next available column (fix by Ciro Mondueri)
     $ac = $this->__col;
     while ( isset($this->_cells[$this->__row][$ac]) )
-       $ac++;
+        $ac++;
     $this->__col = $ac;
 
     // Rows:
     for ( $i = 0; $i < $rowspan; $i++ ) {
-      $row = $this->__row + $i;
+        $row = $this->__row + $i;
 
-      $this->_frames[ $key ]["rows"][] = $row;
+        $this->_frames[ $key ]["rows"][] = $row;
 
-      for ( $j = 0; $j < $colspan; $j++)
+        for ( $j = 0; $j < $colspan; $j++)
         $this->_cells[$row][$this->__col + $j] = $frame;
 
-      if ( $collapse ) {
+        if ( $collapse ) {
         // Resolve vertical borders
         $max_left = max($max_left, $this->_resolve_border($row, $this->__col, "vertical", $bp["left"]));
         $max_right = max($max_right, $this->_resolve_border($row, $this->__col + $colspan, "vertical", $bp["right"]));
-      }
+        }
     }
 
     $max_top = $max_bottom = 0;
 
     // Columns:
     for ( $j = 0; $j < $colspan; $j++ ) {
-      $col = $this->__col + $j;
-      $this->_frames[ $key ]["columns"][] = $col;
+        $col = $this->__col + $j;
+        $this->_frames[ $key ]["columns"][] = $col;
 
-      if ( $collapse ) {
+        if ( $collapse ) {
         // Resolve horizontal borders
         $max_top = max($max_top, $this->_resolve_border($this->__row, $col, "horizontal", $bp["top"]));
         $max_bottom = max($max_bottom, $this->_resolve_border($this->__row + $rowspan, $col, "horizontal", $bp["bottom"]));
-      }
+        }
     }
 
     $this->_frames[ $key ]["frame"] = $frame;
 
     // Handle seperated border model
     if ( !$collapse ) {
-      list($h, $v) = $this->_table->get_style()->border_spacing;
+        list($h, $v) = $this->_table->get_style()->border_spacing;
 
-      // Border spacing is effectively a margin between cells
-      $v = $style->length_in_pt($v) / 2;
-      $h = $style->length_in_pt($h) / 2;
-      $style->margin = "$v $h";
+        // Border spacing is effectively a margin between cells
+        $v = $style->length_in_pt($v) / 2;
+        $h = $style->length_in_pt($h) / 2;
+        $style->margin = "$v $h";
 
-      // The additional 1/2 width gets added to the table proper
+        // The additional 1/2 width gets added to the table proper
 
     } else {
 
-      // Drop the frame's actual border
-      $style->border_left_width = $max_left / 2;
-      $style->border_right_width = $max_right / 2;
-      $style->border_top_width = $max_top / 2;
-      $style->border_bottom_width = $max_bottom / 2;
-      $style->margin = "none";
+        // Drop the frame's actual border
+        $style->border_left_width = $max_left / 2;
+        $style->border_right_width = $max_right / 2;
+        $style->border_top_width = $max_top / 2;
+        $style->border_bottom_width = $max_bottom / 2;
+        $style->margin = "none";
     }
 
     // Resolve the frame's width
@@ -482,60 +481,60 @@ 
     $width = $style->width;
 
     if ( is_percent($width) ) {
-      $var = "percent";
-      $val = (float)rtrim($width, "% ") / $colspan;
+        $var = "percent";
+        $val = (float)rtrim($width, "% ") / $colspan;
 
     } else if ( $width !== "auto" ) {
-      $var = "absolute";
-      $val = $style->length_in_pt($frame_min) / $colspan;
+        $var = "absolute";
+        $val = $style->length_in_pt($frame_min) / $colspan;
     }
 
     $min = 0;
     $max = 0;
     for ( $cs = 0; $cs < $colspan; $cs++ ) {
 
-      // Resolve the frame's width(s) with other cells
-      $col =& $this->get_column( $this->__col + $cs );
+        // Resolve the frame's width(s) with other cells
+        $col =& $this->get_column( $this->__col + $cs );
 
-      // Note: $var is either 'percent' or 'absolute'.  We compare the
-      // requested percentage or absolute values with the existing widths
-      // and adjust accordingly.
-      if ( isset($var) && $val > $col[$var] ) {
+        // Note: $var is either 'percent' or 'absolute'.  We compare the
+        // requested percentage or absolute values with the existing widths
+        // and adjust accordingly.
+        if ( isset($var) && $val > $col[$var] ) {
         $col[$var] = $val;
         $col["auto"] = false;
-      }
+        }
 
-      $min += $col["min-width"];
-      $max += $col["max-width"];
+        $min += $col["min-width"];
+        $max += $col["max-width"];
     }
 
 
     if ( $frame_min > $min ) {
-      // The frame needs more space.  Expand each sub-column
-      $inc = ($frame_min - $min) / $colspan;
-      for ($c = 0; $c < $colspan; $c++) {
+        // The frame needs more space.  Expand each sub-column
+        $inc = ($frame_min - $min) / $colspan;
+        for ($c = 0; $c < $colspan; $c++) {
         $col =& $this->get_column($this->__col + $c);
         $col["min-width"] += $inc;
-      }
+        }
     }
 
     if ( $frame_max > $max ) {
-      $inc = ($frame_max - $max) / $colspan;
-      for ($c = 0; $c < $colspan; $c++) {
+        $inc = ($frame_max - $max) / $colspan;
+        for ($c = 0; $c < $colspan; $c++) {
         $col =& $this->get_column($this->__col + $c);
         $col["max-width"] += $inc;
-      }
+        }
     }
 
     $this->__col += $colspan;
     if ( $this->__col > $this->_num_cols )
-      $this->_num_cols = $this->__col;
+        $this->_num_cols = $this->__col;
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function add_row() {
+    function add_row() {
 
     $this->__row++;
     $this->_num_rows++;
@@ -543,24 +542,24 @@ 
     // Find the next available column
     $i = 0;
     while ( isset($this->_cells[$this->__row][$i]) )
-      $i++;
+        $i++;
 
     $this->__col = $i;
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Remove a row from the cellmap.
-   *
-   * @param Frame
-   */
-  function remove_row(Frame $row) {
+    /**
+     * Remove a row from the cellmap.
+     *
+     * @param Frame
+     */
+    function remove_row(Frame $row) {
 
     $key = $row->get_id();
     if ( !isset($this->_frames[$key]) )
-      return;  // Presumably this row has alredy been removed
+        return;  // Presumably this row has alredy been removed
 
     $this->_row = $this->_num_rows--;
 
@@ -569,47 +568,47 @@ 
 
     // Remove all frames from this row
     foreach ( $rows as $r ) {
-      foreach ( $columns as $c ) {
+        foreach ( $columns as $c ) {
         if ( isset($this->_cells[$r][$c]) ) {
-          $frame = $this->_cells[$r][$c];
-          unset($this->_frames[ $frame->get_id() ]);
-          unset($this->_cells[$r][$c]);
+            $frame = $this->_cells[$r][$c];
+            unset($this->_frames[ $frame->get_id() ]);
+            unset($this->_cells[$r][$c]);
+        }
         }
-      }
-      unset($this->_rows[$r]);
+        unset($this->_rows[$r]);
     }
 
     unset($this->_frames[$key]);
 
-  }
+    }
 
-  /**
-   * Remove a row group from the cellmap.
-   *
-   * @param Frame $group  The group to remove
-   */
-  function remove_row_group(Frame $group) {
+    /**
+     * Remove a row group from the cellmap.
+     *
+     * @param Frame $group  The group to remove
+     */
+    function remove_row_group(Frame $group) {
 
     $key = $group->get_id();
     if ( !isset($this->_frames[$key]) )
-      return;  // Presumably this row has alredy been removed
+        return;  // Presumably this row has alredy been removed
 
     $iter = $group->get_first_child();
     while ($iter) {
-      $this->remove_row($iter);
-      $iter = $iter->get_next_sibling();
+        $this->remove_row($iter);
+        $iter = $iter->get_next_sibling();
     }
 
     unset($this->_frames[$key]);
-  }
+    }
 
-  /**
-   * Update a row group after rows have been removed
-   *
-   * @param Frame $group    The group to update
-   * @param Frame $last_row The last row in the row group
-   */
-  function update_row_group(Frame $group, Frame $last_row) {
+    /**
+     * Update a row group after rows have been removed
+     *
+     * @param Frame $group    The group to update
+     * @param Frame $last_row The last row in the row group
+     */
+    function update_row_group(Frame $group, Frame $last_row) {
 
     $g_key = $group->get_id();
     $r_key = $last_row->get_id();
@@ -617,80 +616,80 @@ 
     $r_rows = $this->_frames[$r_key]["rows"];
     $this->_frames[$g_key]["rows"] = range( $this->_frames[$g_key]["rows"][0], end($r_rows) );
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function assign_x_positions() {
+    function assign_x_positions() {
     // Pre-condition: widths must be resolved and assigned to columns and
     // column[0]["x"] must be set.
 
     $x = $this->_columns[0]["x"];
     foreach ( array_keys($this->_columns) as $j ) {
-      $this->_columns[$j]["x"] = $x;
-      $x += $this->_columns[$j]["used-width"];
+        $this->_columns[$j]["x"] = $x;
+        $x += $this->_columns[$j]["used-width"];
 
     }
 
-  }
+    }
 
-  function assign_frame_heights() {
+    function assign_frame_heights() {
     // Pre-condition: widths and heights of each column & row must be
     // calcluated
 
     foreach ( $this->_frames as $arr ) {
-      $frame = $arr["frame"];
+        $frame = $arr["frame"];
 
-      $h = 0;
-      foreach( $arr["rows"] as $row ) {
+        $h = 0;
+        foreach( $arr["rows"] as $row ) {
         if ( !isset($this->_rows[$row]) )
-          // The row has been removed because of a page split, so skip it.
-          continue;
+            // The row has been removed because of a page split, so skip it.
+            continue;
         $h += $this->_rows[$row]["height"];
-      }
+        }
 
-      if ( $frame instanceof Table_Cell_Frame_Decorator )
+        if ( $frame instanceof Table_Cell_Frame_Decorator )
         $frame->set_cell_height($h);
-      else
+        else
         $frame->get_style()->height = $h;
     }
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Re-adjust frame height if the table height is larger than its content
-   */
-  function set_frame_heights($table_height, $content_height) {
+    /**
+     * Re-adjust frame height if the table height is larger than its content
+     */
+    function set_frame_heights($table_height, $content_height) {
 
 
     // Distribute the increased height proportionally amongst each row
     foreach ( $this->_frames as $arr ) {
-      $frame = $arr["frame"];
+        $frame = $arr["frame"];
 
-      $h = 0;
-      foreach ($arr["rows"] as $row ) {
+        $h = 0;
+        foreach ($arr["rows"] as $row ) {
         if ( !isset($this->_rows[$row]) )
-          continue;
+            continue;
 
         $h += $this->_rows[$row]["height"];
-      }
+        }
 
-      $new_height = ($h / $content_height) * $table_height;
+        $new_height = ($h / $content_height) * $table_height;
 
-      if ( $frame instanceof Table_Cell_Frame_Decorator )
+        if ( $frame instanceof Table_Cell_Frame_Decorator )
         $frame->set_cell_height($new_height);
-      else
+        else
         $frame->get_style()->height = $new_height;
     }
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  // Used for debugging:
-  function __toString() {
+    // Used for debugging:
+    function __toString() {
     $str = "";
     $str .= "Columns:<br/>";
     $str .= pre_r($this->_columns, true);
@@ -700,14 +699,14 @@ 
     $str .=  "Frames:<br/>";
     $arr = array();
     foreach ( $this->_frames as $key => $val )
-      $arr[$key] = array("columns" => $val["columns"], "rows" => $val["rows"]);
+        $arr[$key] = array("columns" => $val["columns"], "rows" => $val["rows"]);
 
     $str .= pre_r($arr, true);
 
     if ( php_sapi_name() == "cli" )
-      $str = strip_tags(str_replace(array("<br/>","<b>","</b>"),
+        $str = strip_tags(str_replace(array("<br/>","<b>","</b>"),
                                     array("\n",chr(27)."[01;33m", chr(27)."[0m"),
                                     $str));
     return $str;
-  }
+    }
 }

main/inc/lib/phpdocx/pdf/include/cpdf_adapter.cls.php

Doc Comments +5 added lines, -2 removed lines

@@ -461,6 +461,8 @@ 
    * @param string cap
    * @param string join
    * @param array dash
+   * @param string $cap
+   * @param string $join
    */
   protected function _set_line_style($width, $cap, $join, $dash) {
     $this->_pdf->setLineStyle($width, $cap, $join, $dash);
@@ -496,6 +498,7 @@ 
   /**
    * Convert a GIF image to a PNG image
    *
+   * @param string $image_url
    * @return string The url of the newly converted image
    */
   protected function _convert_gif_to_png($image_url) {
@@ -775,8 +778,8 @@ 
    * @param string $font the font file to use
    * @param float $size the font size, in points
    * @param array $color
-   * @param float $adjust word spacing adjustment
-   * @param float $angle angle to write the text at, measured CW starting from the x-axis
+   * @param integer $adjust word spacing adjustment
+   * @param integer $angle angle to write the text at, measured CW starting from the x-axis
    */
   function page_text($x, $y, $text, $font, $size, $color = array(0,0,0),
                      $adjust = 0, $angle = 0) {

Switch Indentation +58 added lines, -58 removed lines

@@ -595,56 +595,56 @@ 
     $img_type = mb_strtolower($img_type);
 
     switch ($img_type) {
-    case "jpeg":
-    case "jpg":
-      //debugpng
-      if (DEBUGPNG)  print '!!!jpg!!!';
+        case "jpeg":
+        case "jpg":
+          //debugpng
+          if (DEBUGPNG)  print '!!!jpg!!!';
 
-      $this->_pdf->addJpegFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
-      break;
+          $this->_pdf->addJpegFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
+          break;
 
-    case "png":
-      //debugpng
-      if (DEBUGPNG)  print '!!!png!!!';
-
-      $this->_pdf->addPngFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
-      break;
-
-    case "gif":
-      // Convert gifs to pngs
-      //DEBUG_IMG_TEMP
-      //if (0) {
-      if ( method_exists( $this->_pdf, "addImagePng" ) ) {
-        //debugpng
-        if (DEBUGPNG)  print '!!!gif addImagePng!!!';
-
-      	//If optimization to direct png creation from gd object is available,
-        //don't create temp file, but place gd object directly into the pdf
-	    if ( method_exists( $this->_pdf, "image_iscached" ) &&
-	         $this->_pdf->image_iscached($img_url) ) {
-	      //If same image has occured already before, no need to load because
-	      //duplicate will anyway be eliminated.
-	      $img = null;
-	    } else {
-    	  $img = @imagecreatefromgif($img_url);
-    	  if (!$img) {
-      	    return;
-    	  }
-    	  imageinterlace($img, 0);
-    	}
-    	$this->_pdf->addImagePng($img_url, $x, $this->y($y) - $h, $w, $h, $img);
-      } else {
-        //debugpng
-        if (DEBUGPNG)  print '!!!gif addPngFromFile!!!';
-        $img_url = $this->_convert_gif_to_png($img_url);
-        $this->_pdf->addPngFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
-      }
-      break;
+        case "png":
+          //debugpng
+          if (DEBUGPNG)  print '!!!png!!!';
 
-    default:
-      //debugpng
-      if (DEBUGPNG) print '!!!unknown!!!';
-      break;
+          $this->_pdf->addPngFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
+          break;
+
+        case "gif":
+          // Convert gifs to pngs
+          //DEBUG_IMG_TEMP
+          //if (0) {
+          if ( method_exists( $this->_pdf, "addImagePng" ) ) {
+            //debugpng
+            if (DEBUGPNG)  print '!!!gif addImagePng!!!';
+
+      	    //If optimization to direct png creation from gd object is available,
+            //don't create temp file, but place gd object directly into the pdf
+	        if ( method_exists( $this->_pdf, "image_iscached" ) &&
+	             $this->_pdf->image_iscached($img_url) ) {
+	          //If same image has occured already before, no need to load because
+	          //duplicate will anyway be eliminated.
+	          $img = null;
+	        } else {
+    	      $img = @imagecreatefromgif($img_url);
+    	      if (!$img) {
+      	        return;
+    	      }
+    	      imageinterlace($img, 0);
+    	    }
+    	    $this->_pdf->addImagePng($img_url, $x, $this->y($y) - $h, $w, $h, $img);
+          } else {
+            //debugpng
+            if (DEBUGPNG)  print '!!!gif addPngFromFile!!!';
+            $img_url = $this->_convert_gif_to_png($img_url);
+            $this->_pdf->addPngFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
+          }
+          break;
+
+        default:
+          //debugpng
+          if (DEBUGPNG) print '!!!unknown!!!';
+          break;
     }
     
     return;
@@ -833,18 +833,18 @@ 
 
         switch ($_t) {
             
-        case "text":
-        $text = str_replace(array("{PAGE_NUM}","{PAGE_COUNT}"),
-                            array($page_number, $this->_page_count), $text);
-        $this->text($x, $y, $text, $font, $size, $color, $adjust, $angle);
-          break;
+            case "text":
+            $text = str_replace(array("{PAGE_NUM}","{PAGE_COUNT}"),
+                                array($page_number, $this->_page_count), $text);
+            $this->text($x, $y, $text, $font, $size, $color, $adjust, $angle);
+              break;
           
-        case "script":
-          if (!$eval) {
-            $eval = new PHP_Evaluator($this);
-          }
-          $eval->evaluate($code, array('PAGE_NUM' => $page_number, 'PAGE_COUNT' => $this->_page_count));
-          break;
+            case "script":
+              if (!$eval) {
+                $eval = new PHP_Evaluator($this);
+              }
+              $eval->evaluate($code, array('PAGE_NUM' => $page_number, 'PAGE_COUNT' => $this->_page_count));
+              break;
         }
       }
 

Spacing +80 added lines, -80 removed lines

@@ -55,7 +55,7 @@ 
 /* $Id: cpdf_adapter.cls.php 217 2010-03-11 23:03:57Z ryan.masten $ */
 
 // FIXME: Need to sanity check inputs to this class
-require_once(DOMPDF_LIB_DIR . "/class.pdf.php");
+require_once(DOMPDF_LIB_DIR."/class.pdf.php");
 
 /**
  * PDF rendering interface
@@ -79,62 +79,62 @@ 
    *
    * @var array;
    */
-  static $PAPER_SIZES = array("4a0" => array(0,0,4767.87,6740.79),
-                              "2a0" => array(0,0,3370.39,4767.87),
-                              "a0" => array(0,0,2383.94,3370.39),
-                              "a1" => array(0,0,1683.78,2383.94),
-                              "a2" => array(0,0,1190.55,1683.78),
-                              "a3" => array(0,0,841.89,1190.55),
-                              "a4" => array(0,0,595.28,841.89),
-                              "a5" => array(0,0,419.53,595.28),
-                              "a6" => array(0,0,297.64,419.53),
-                              "a7" => array(0,0,209.76,297.64),
-                              "a8" => array(0,0,147.40,209.76),
-                              "a9" => array(0,0,104.88,147.40),
-                              "a10" => array(0,0,73.70,104.88),
-                              "b0" => array(0,0,2834.65,4008.19),
-                              "b1" => array(0,0,2004.09,2834.65),
-                              "b2" => array(0,0,1417.32,2004.09),
-                              "b3" => array(0,0,1000.63,1417.32),
-                              "b4" => array(0,0,708.66,1000.63),
-                              "b5" => array(0,0,498.90,708.66),
-                              "b6" => array(0,0,354.33,498.90),
-                              "b7" => array(0,0,249.45,354.33),
-                              "b8" => array(0,0,175.75,249.45),
-                              "b9" => array(0,0,124.72,175.75),
-                              "b10" => array(0,0,87.87,124.72),
-                              "c0" => array(0,0,2599.37,3676.54),
-                              "c1" => array(0,0,1836.85,2599.37),
-                              "c2" => array(0,0,1298.27,1836.85),
-                              "c3" => array(0,0,918.43,1298.27),
-                              "c4" => array(0,0,649.13,918.43),
-                              "c5" => array(0,0,459.21,649.13),
-                              "c6" => array(0,0,323.15,459.21),
-                              "c7" => array(0,0,229.61,323.15),
-                              "c8" => array(0,0,161.57,229.61),
-                              "c9" => array(0,0,113.39,161.57),
-                              "c10" => array(0,0,79.37,113.39),
-                              "ra0" => array(0,0,2437.80,3458.27),
-                              "ra1" => array(0,0,1729.13,2437.80),
-                              "ra2" => array(0,0,1218.90,1729.13),
-                              "ra3" => array(0,0,864.57,1218.90),
-                              "ra4" => array(0,0,609.45,864.57),
-                              "sra0" => array(0,0,2551.18,3628.35),
-                              "sra1" => array(0,0,1814.17,2551.18),
-                              "sra2" => array(0,0,1275.59,1814.17),
-                              "sra3" => array(0,0,907.09,1275.59),
-                              "sra4" => array(0,0,637.80,907.09),
-                              "letter" => array(0,0,612.00,792.00),
-                              "legal" => array(0,0,612.00,1008.00),
-                              "ledger" => array(0,0,1224.00, 792.00),
-                              "tabloid" => array(0,0,792.00, 1224.00),
-                              "executive" => array(0,0,521.86,756.00),
-                              "folio" => array(0,0,612.00,936.00),
-                              "commerical #10 envelope" => array(0,0,684,297),
-                              "catalog #10 1/2 envelope" => array(0,0,648,864),
-                              "8.5x11" => array(0,0,612.00,792.00),
-                              "8.5x14" => array(0,0,612.00,1008.0),
-                              "11x17"  => array(0,0,792.00, 1224.00));
+  static $PAPER_SIZES = array("4a0" => array(0, 0, 4767.87, 6740.79),
+                              "2a0" => array(0, 0, 3370.39, 4767.87),
+                              "a0" => array(0, 0, 2383.94, 3370.39),
+                              "a1" => array(0, 0, 1683.78, 2383.94),
+                              "a2" => array(0, 0, 1190.55, 1683.78),
+                              "a3" => array(0, 0, 841.89, 1190.55),
+                              "a4" => array(0, 0, 595.28, 841.89),
+                              "a5" => array(0, 0, 419.53, 595.28),
+                              "a6" => array(0, 0, 297.64, 419.53),
+                              "a7" => array(0, 0, 209.76, 297.64),
+                              "a8" => array(0, 0, 147.40, 209.76),
+                              "a9" => array(0, 0, 104.88, 147.40),
+                              "a10" => array(0, 0, 73.70, 104.88),
+                              "b0" => array(0, 0, 2834.65, 4008.19),
+                              "b1" => array(0, 0, 2004.09, 2834.65),
+                              "b2" => array(0, 0, 1417.32, 2004.09),
+                              "b3" => array(0, 0, 1000.63, 1417.32),
+                              "b4" => array(0, 0, 708.66, 1000.63),
+                              "b5" => array(0, 0, 498.90, 708.66),
+                              "b6" => array(0, 0, 354.33, 498.90),
+                              "b7" => array(0, 0, 249.45, 354.33),
+                              "b8" => array(0, 0, 175.75, 249.45),
+                              "b9" => array(0, 0, 124.72, 175.75),
+                              "b10" => array(0, 0, 87.87, 124.72),
+                              "c0" => array(0, 0, 2599.37, 3676.54),
+                              "c1" => array(0, 0, 1836.85, 2599.37),
+                              "c2" => array(0, 0, 1298.27, 1836.85),
+                              "c3" => array(0, 0, 918.43, 1298.27),
+                              "c4" => array(0, 0, 649.13, 918.43),
+                              "c5" => array(0, 0, 459.21, 649.13),
+                              "c6" => array(0, 0, 323.15, 459.21),
+                              "c7" => array(0, 0, 229.61, 323.15),
+                              "c8" => array(0, 0, 161.57, 229.61),
+                              "c9" => array(0, 0, 113.39, 161.57),
+                              "c10" => array(0, 0, 79.37, 113.39),
+                              "ra0" => array(0, 0, 2437.80, 3458.27),
+                              "ra1" => array(0, 0, 1729.13, 2437.80),
+                              "ra2" => array(0, 0, 1218.90, 1729.13),
+                              "ra3" => array(0, 0, 864.57, 1218.90),
+                              "ra4" => array(0, 0, 609.45, 864.57),
+                              "sra0" => array(0, 0, 2551.18, 3628.35),
+                              "sra1" => array(0, 0, 1814.17, 2551.18),
+                              "sra2" => array(0, 0, 1275.59, 1814.17),
+                              "sra3" => array(0, 0, 907.09, 1275.59),
+                              "sra4" => array(0, 0, 637.80, 907.09),
+                              "letter" => array(0, 0, 612.00, 792.00),
+                              "legal" => array(0, 0, 612.00, 1008.00),
+                              "ledger" => array(0, 0, 1224.00, 792.00),
+                              "tabloid" => array(0, 0, 792.00, 1224.00),
+                              "executive" => array(0, 0, 521.86, 756.00),
+                              "folio" => array(0, 0, 612.00, 936.00),
+                              "commerical #10 envelope" => array(0, 0, 684, 297),
+                              "catalog #10 1/2 envelope" => array(0, 0, 648, 864),
+                              "8.5x11" => array(0, 0, 612.00, 792.00),
+                              "8.5x14" => array(0, 0, 612.00, 1008.0),
+                              "11x17"  => array(0, 0, 792.00, 1224.00));
 
 
   /**
@@ -201,14 +201,14 @@ 
    */
   function __construct($paper = "letter", $orientation = "portrait") {
 
-    if ( is_array($paper) )
+    if (is_array($paper))
       $size = $paper;
-    else if ( isset(self::$PAPER_SIZES[mb_strtolower($paper)]) )
+    else if (isset(self::$PAPER_SIZES[mb_strtolower($paper)]))
       $size = self::$PAPER_SIZES[mb_strtolower($paper)];
     else
       $size = self::$PAPER_SIZES["letter"];
 
-    if ( mb_strtolower($orientation) === "landscape" ) {
+    if (mb_strtolower($orientation) === "landscape") {
       $a = $size[3];
       $size[3] = $size[2];
       $size[2] = $a;
@@ -224,7 +224,7 @@ 
     
 
     $this->_width = $size[2] - $size[0];
-    $this->_height= $size[3] - $size[1];
+    $this->_height = $size[3] - $size[1];
     $this->_pdf->openHere('Fit');
     
     $this->_page_number = $this->_page_count = 1;
@@ -500,14 +500,14 @@ 
    */
   protected function _convert_gif_to_png($image_url) {
     
-    if ( !function_exists("imagecreatefromgif") ) {
+    if (!function_exists("imagecreatefromgif")) {
       throw new DOMPDF_Exception("Function imagecreatefromgif() not found.  Cannot convert gif image: $image_url.  Please install the image PHP extension.");
     }
 
     $old_err = set_error_handler("record_warnings");
     $im = imagecreatefromgif($image_url);
 
-    if ( $im ) {
+    if ($im) {
       imageinterlace($im, 0);
 
       $filename = tempnam(DOMPDF_TEMP_DIR, "gifdompdf_img_").'.png';
@@ -516,7 +516,7 @@ 
       imagepng($im, $filename);
 
     } else {
-      $filename = DOMPDF_LIB_DIR . "/res/broken_image.png";
+      $filename = DOMPDF_LIB_DIR."/res/broken_image.png";
 
     }
 
@@ -559,11 +559,11 @@ 
     $this->_set_line_transparency($blend, $opacity);
     $this->_set_fill_transparency($blend, $opacity);
     
-    if ( !$fill && isset($width) )
+    if (!$fill && isset($width))
       $this->_set_line_style($width, "square", "miter", $style);
     
     // Adjust y values
-    for ( $i = 1; $i < count($points); $i += 2)
+    for ($i = 1; $i < count($points); $i += 2)
       $points[$i] = $this->y($points[$i]);
     
     $this->_pdf->polygon($points, count($points) / 2, $fill);
@@ -580,7 +580,7 @@ 
     $this->_set_line_transparency($blend, $opacity);
     $this->_set_fill_transparency($blend, $opacity);
 
-    if ( !$fill && isset($width) )
+    if (!$fill && isset($width))
       $this->_set_line_style($width, "round", "round", $style);
 
     $this->_pdf->ellipse($x, $this->y($y), $r1, 0, 0, 8, 0, 360, 1, $fill);
@@ -614,14 +614,14 @@ 
       // Convert gifs to pngs
       //DEBUG_IMG_TEMP
       //if (0) {
-      if ( method_exists( $this->_pdf, "addImagePng" ) ) {
+      if (method_exists($this->_pdf, "addImagePng")) {
         //debugpng
         if (DEBUGPNG)  print '!!!gif addImagePng!!!';
 
       	//If optimization to direct png creation from gd object is available,
         //don't create temp file, but place gd object directly into the pdf
-	    if ( method_exists( $this->_pdf, "image_iscached" ) &&
-	         $this->_pdf->image_iscached($img_url) ) {
+	    if (method_exists($this->_pdf, "image_iscached") &&
+	         $this->_pdf->image_iscached($img_url)) {
 	      //If same image has occured already before, no need to load because
 	      //duplicate will anyway be eliminated.
 	      $img = null;
@@ -652,7 +652,7 @@ 
 
   //........................................................................
 
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0),
+  function text($x, $y, $text, $font, $size, $color = array(0, 0, 0),
                 $adjust = 0, $angle = 0, $blend = "Normal", $opacity = 1.0) {
 
     list($r, $g, $b) = $color;
@@ -695,7 +695,7 @@ 
     //$this->_pdf->addText($x, $this->y($y) - Font_Metrics::get_font_height($font, $size), $size, $text, $angle, $adjust);
 	//$this->_pdf->addText($x, $this->y($y) - $size, $size, $text, $angle, $adjust);
 	//$this->_pdf->addText($x, $this->y($y) - $this->_pdf->getFontHeight($size)-$this->_pdf->getFontDescender($size), $size, $text, $angle, $adjust);
-	$this->_pdf->addText($x, $this->y($y) - ($this->_pdf->fonts[$this->_pdf->currentFont]['FontBBox'][3]*$size)/1000, $size, $text, $angle, $adjust);
+	$this->_pdf->addText($x, $this->y($y) - ($this->_pdf->fonts[$this->_pdf->currentFont]['FontBBox'][3] * $size) / 1000, $size, $text, $angle, $adjust);
   }
 
   //........................................................................
@@ -712,7 +712,7 @@ 
    * @param string $anchorname The name of the named destination
    */
   function add_named_dest($anchorname) {
-    $this->_pdf->addDestination($anchorname,"Fit");
+    $this->_pdf->addDestination($anchorname, "Fit");
   }
 
   //........................................................................
@@ -730,10 +730,10 @@ 
 
     $y = $this->y($y) - $height;
 
-    if ( strpos($url, '#') === 0 ) {
+    if (strpos($url, '#') === 0) {
       // Local link
-      $name = substr($url,1);
-      if ( $name )
+      $name = substr($url, 1);
+      if ($name)
         $this->_pdf->addInternalLink($name, $x, $y, $x + $width, $y + $height);
 
     } else {
@@ -778,7 +778,7 @@ 
    * @param float $adjust word spacing adjustment
    * @param float $angle angle to write the text at, measured CW starting from the x-axis
    */
-  function page_text($x, $y, $text, $font, $size, $color = array(0,0,0),
+  function page_text($x, $y, $text, $font, $size, $color = array(0, 0, 0),
                      $adjust = 0, $angle = 0) {
     $_t = "text";
     $this->_page_text[] = compact("_t", "x", "y", "text", "font", "size", "color", "adjust", "angle");
@@ -819,7 +819,7 @@ 
    */
   protected function _add_page_text() {
     
-    if ( !count($this->_page_text) )
+    if (!count($this->_page_text))
       return;
 
     $page_number = 1;
@@ -834,7 +834,7 @@ 
         switch ($_t) {
             
         case "text":
-        $text = str_replace(array("{PAGE_NUM}","{PAGE_COUNT}"),
+        $text = str_replace(array("{PAGE_NUM}", "{PAGE_COUNT}"),
                             array($page_number, $this->_page_count), $text);
         $this->text($x, $y, $text, $font, $size, $color, $adjust, $angle);
           break;
@@ -878,7 +878,7 @@ 
     // Add page text
     $this->_add_page_text();
 
-    if ( isset($options["compress"]) && $options["compress"] != 1 )
+    if (isset($options["compress"]) && $options["compress"] != 1)
       $debug = 1;
     else
       $debug = 0;

Braces +51 added lines, -29 removed lines

@@ -201,12 +201,13 @@ 
    */
   function __construct($paper = "letter", $orientation = "portrait") {
 
-    if ( is_array($paper) )
-      $size = $paper;
-    else if ( isset(self::$PAPER_SIZES[mb_strtolower($paper)]) )
-      $size = self::$PAPER_SIZES[mb_strtolower($paper)];
-    else
-      $size = self::$PAPER_SIZES["letter"];
+    if ( is_array($paper) ) {
+          $size = $paper;
+    } else if ( isset(self::$PAPER_SIZES[mb_strtolower($paper)]) ) {
+          $size = self::$PAPER_SIZES[mb_strtolower($paper)];
+    } else {
+          $size = self::$PAPER_SIZES["letter"];
+    }
 
     if ( mb_strtolower($orientation) === "landscape" ) {
       $a = $size[3];
@@ -243,9 +244,12 @@ 
   function __destruct() {
     foreach ($this->_image_cache as $img) {
       //debugpng
-      if (DEBUGPNG) print '[__destruct unlink '.$img.']';
-      if (!DEBUGKEEPTEMP)
-        unlink($img);
+      if (DEBUGPNG) {
+          print '[__destruct unlink '.$img.']';
+      }
+      if (!DEBUGKEEPTEMP) {
+              unlink($img);
+      }
     }
   }
   
@@ -559,12 +563,14 @@ 
     $this->_set_line_transparency($blend, $opacity);
     $this->_set_fill_transparency($blend, $opacity);
     
-    if ( !$fill && isset($width) )
-      $this->_set_line_style($width, "square", "miter", $style);
+    if ( !$fill && isset($width) ) {
+          $this->_set_line_style($width, "square", "miter", $style);
+    }
     
     // Adjust y values
-    for ( $i = 1; $i < count($points); $i += 2)
-      $points[$i] = $this->y($points[$i]);
+    for ( $i = 1; $i < count($points); $i += 2) {
+          $points[$i] = $this->y($points[$i]);
+    }
     
     $this->_pdf->polygon($points, count($points) / 2, $fill);
   }
@@ -580,8 +586,9 @@ 
     $this->_set_line_transparency($blend, $opacity);
     $this->_set_fill_transparency($blend, $opacity);
 
-    if ( !$fill && isset($width) )
-      $this->_set_line_style($width, "round", "round", $style);
+    if ( !$fill && isset($width) ) {
+          $this->_set_line_style($width, "round", "round", $style);
+    }
 
     $this->_pdf->ellipse($x, $this->y($y), $r1, 0, 0, 8, 0, 360, 1, $fill);
   }
@@ -590,7 +597,9 @@ 
 
   function image($img_url, $img_type, $x, $y, $w, $h) {
     //debugpng
-    if (DEBUGPNG) print '[image:'.$img_url.'|'.$img_type.']';
+    if (DEBUGPNG) {
+        print '[image:'.$img_url.'|'.$img_type.']';
+    }
 
     $img_type = mb_strtolower($img_type);
 
@@ -598,14 +607,18 @@ 
     case "jpeg":
     case "jpg":
       //debugpng
-      if (DEBUGPNG)  print '!!!jpg!!!';
+      if (DEBUGPNG) {
+          print '!!!jpg!!!';
+      }
 
       $this->_pdf->addJpegFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
       break;
 
     case "png":
       //debugpng
-      if (DEBUGPNG)  print '!!!png!!!';
+      if (DEBUGPNG) {
+          print '!!!png!!!';
+      }
 
       $this->_pdf->addPngFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
       break;
@@ -616,7 +629,9 @@ 
       //if (0) {
       if ( method_exists( $this->_pdf, "addImagePng" ) ) {
         //debugpng
-        if (DEBUGPNG)  print '!!!gif addImagePng!!!';
+        if (DEBUGPNG) {
+            print '!!!gif addImagePng!!!';
+        }
 
       	//If optimization to direct png creation from gd object is available,
         //don't create temp file, but place gd object directly into the pdf
@@ -635,7 +650,9 @@ 
     	$this->_pdf->addImagePng($img_url, $x, $this->y($y) - $h, $w, $h, $img);
       } else {
         //debugpng
-        if (DEBUGPNG)  print '!!!gif addPngFromFile!!!';
+        if (DEBUGPNG) {
+            print '!!!gif addPngFromFile!!!';
+        }
         $img_url = $this->_convert_gif_to_png($img_url);
         $this->_pdf->addPngFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
       }
@@ -643,7 +660,9 @@ 
 
     default:
       //debugpng
-      if (DEBUGPNG) print '!!!unknown!!!';
+      if (DEBUGPNG) {
+          print '!!!unknown!!!';
+      }
       break;
     }
     
@@ -733,8 +752,9 @@ 
     if ( strpos($url, '#') === 0 ) {
       // Local link
       $name = substr($url,1);
-      if ( $name )
-        $this->_pdf->addInternalLink($name, $x, $y, $x + $width, $y + $height);
+      if ( $name ) {
+              $this->_pdf->addInternalLink($name, $x, $y, $x + $width, $y + $height);
+      }
 
     } else {
       $this->_pdf->addLink(rawurldecode($url), $x, $y, $x + $width, $y + $height);
@@ -819,8 +839,9 @@ 
    */
   protected function _add_page_text() {
     
-    if ( !count($this->_page_text) )
-      return;
+    if ( !count($this->_page_text) ) {
+          return;
+    }
 
     $page_number = 1;
     $eval = null;
@@ -878,10 +899,11 @@ 
     // Add page text
     $this->_add_page_text();
 
-    if ( isset($options["compress"]) && $options["compress"] != 1 )
-      $debug = 1;
-    else
-      $debug = 0;
+    if ( isset($options["compress"]) && $options["compress"] != 1 ) {
+          $debug = 1;
+    } else {
+          $debug = 0;
+    }
     
     return $this->_pdf->output($debug);
     

Indentation +575 added lines, -575 removed lines

@@ -1,56 +1,56 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: cpdf_adapter.cls.php,v $
- * Created on: 2004-08-04
- * Modified on: 2008-01-05
- *
- * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
- * Portions copyright (c) 2008 - Orion Richardson <orionr@yahoo.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library in the file LICENSE.LGPL; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * Alternatively, you may distribute this software under the terms of the
- * PHP License, version 3.0 or later.  A copy of this license should have
- * been distributed with this file in the file LICENSE.PHP .  If this is not
- * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
- *
- * The latest version of DOMPDF might be available at:
- * http://www.dompdf.com/
- *
- * @link http://www.dompdf.com/
- * @copyright 2004 Benj Carson
- * @author Benj Carson <benjcarson@digitaljunkies.ca>
- * @contributor Orion Richardson <orionr@yahoo.com>
- * @contributor Helmut Tischer <htischer@weihenstephan.org>
- * @package dompdf
- *
- * Changes
- * @contributor Helmut Tischer <htischer@weihenstephan.org>
- * @version 0.5.1.htischer.20090507
- * - On gif to png conversion tmp file creation, clarify tmp name and add to tmp deletion list only on success
- * - On gif to png conversion, when available add direct from gd without tmp file, skip image load if already cached.
- *   to safe CPU time and memory
- * @contributor Helmut Tischer <htischer@weihenstephan.org>
- * @version dompdf_trunk_with_helmut_mods.20090524
- * - Pass temp and fontcache folders to Cpdf, to making Cpdf independent from dompdf
- * @version dompdf_trunk_with_helmut_mods.20090528
- * - fix text position according to glyph baseline to match background rectangle
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: cpdf_adapter.cls.php,v $
+     * Created on: 2004-08-04
+     * Modified on: 2008-01-05
+     *
+     * Copyright (c) 2004 - Benj Carson <benjcarson@digitaljunkies.ca>
+     * Portions copyright (c) 2008 - Orion Richardson <orionr@yahoo.com>
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public License
+     * along with this library in the file LICENSE.LGPL; if not, write to the
+     * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+     * 02111-1307 USA
+     *
+     * Alternatively, you may distribute this software under the terms of the
+     * PHP License, version 3.0 or later.  A copy of this license should have
+     * been distributed with this file in the file LICENSE.PHP .  If this is not
+     * the case, you can obtain a copy at http://www.php.net/license/3_0.txt.
+     *
+     * The latest version of DOMPDF might be available at:
+     * http://www.dompdf.com/
+     *
+     * @link http://www.dompdf.com/
+     * @copyright 2004 Benj Carson
+     * @author Benj Carson <benjcarson@digitaljunkies.ca>
+     * @contributor Orion Richardson <orionr@yahoo.com>
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @package dompdf
+     *
+     * Changes
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @version 0.5.1.htischer.20090507
+     * - On gif to png conversion tmp file creation, clarify tmp name and add to tmp deletion list only on success
+     * - On gif to png conversion, when available add direct from gd without tmp file, skip image load if already cached.
+     *   to safe CPU time and memory
+     * @contributor Helmut Tischer <htischer@weihenstephan.org>
+     * @version dompdf_trunk_with_helmut_mods.20090524
+     * - Pass temp and fontcache folders to Cpdf, to making Cpdf independent from dompdf
+     * @version dompdf_trunk_with_helmut_mods.20090528
+     * - fix text position according to glyph baseline to match background rectangle
+     */
 
 /* $Id: cpdf_adapter.cls.php 217 2010-03-11 23:03:57Z ryan.masten $ */
 
@@ -74,144 +74,144 @@ 
  */
 class CPDF_Adapter implements Canvas {
 
-  /**
-   * Dimensions of paper sizes in points
-   *
-   * @var array;
-   */
-  static $PAPER_SIZES = array("4a0" => array(0,0,4767.87,6740.79),
-                              "2a0" => array(0,0,3370.39,4767.87),
-                              "a0" => array(0,0,2383.94,3370.39),
-                              "a1" => array(0,0,1683.78,2383.94),
-                              "a2" => array(0,0,1190.55,1683.78),
-                              "a3" => array(0,0,841.89,1190.55),
-                              "a4" => array(0,0,595.28,841.89),
-                              "a5" => array(0,0,419.53,595.28),
-                              "a6" => array(0,0,297.64,419.53),
-                              "a7" => array(0,0,209.76,297.64),
-                              "a8" => array(0,0,147.40,209.76),
-                              "a9" => array(0,0,104.88,147.40),
-                              "a10" => array(0,0,73.70,104.88),
-                              "b0" => array(0,0,2834.65,4008.19),
-                              "b1" => array(0,0,2004.09,2834.65),
-                              "b2" => array(0,0,1417.32,2004.09),
-                              "b3" => array(0,0,1000.63,1417.32),
-                              "b4" => array(0,0,708.66,1000.63),
-                              "b5" => array(0,0,498.90,708.66),
-                              "b6" => array(0,0,354.33,498.90),
-                              "b7" => array(0,0,249.45,354.33),
-                              "b8" => array(0,0,175.75,249.45),
-                              "b9" => array(0,0,124.72,175.75),
-                              "b10" => array(0,0,87.87,124.72),
-                              "c0" => array(0,0,2599.37,3676.54),
-                              "c1" => array(0,0,1836.85,2599.37),
-                              "c2" => array(0,0,1298.27,1836.85),
-                              "c3" => array(0,0,918.43,1298.27),
-                              "c4" => array(0,0,649.13,918.43),
-                              "c5" => array(0,0,459.21,649.13),
-                              "c6" => array(0,0,323.15,459.21),
-                              "c7" => array(0,0,229.61,323.15),
-                              "c8" => array(0,0,161.57,229.61),
-                              "c9" => array(0,0,113.39,161.57),
-                              "c10" => array(0,0,79.37,113.39),
-                              "ra0" => array(0,0,2437.80,3458.27),
-                              "ra1" => array(0,0,1729.13,2437.80),
-                              "ra2" => array(0,0,1218.90,1729.13),
-                              "ra3" => array(0,0,864.57,1218.90),
-                              "ra4" => array(0,0,609.45,864.57),
-                              "sra0" => array(0,0,2551.18,3628.35),
-                              "sra1" => array(0,0,1814.17,2551.18),
-                              "sra2" => array(0,0,1275.59,1814.17),
-                              "sra3" => array(0,0,907.09,1275.59),
-                              "sra4" => array(0,0,637.80,907.09),
-                              "letter" => array(0,0,612.00,792.00),
-                              "legal" => array(0,0,612.00,1008.00),
-                              "ledger" => array(0,0,1224.00, 792.00),
-                              "tabloid" => array(0,0,792.00, 1224.00),
-                              "executive" => array(0,0,521.86,756.00),
-                              "folio" => array(0,0,612.00,936.00),
-                              "commerical #10 envelope" => array(0,0,684,297),
-                              "catalog #10 1/2 envelope" => array(0,0,648,864),
-                              "8.5x11" => array(0,0,612.00,792.00),
-                              "8.5x14" => array(0,0,612.00,1008.0),
-                              "11x17"  => array(0,0,792.00, 1224.00));
-
-
-  /**
-   * Instance of Cpdf class
-   *
-   * @var Cpdf
-   */
-  private $_pdf;
-
-  /**
-   * PDF width, in points
-   *
-   * @var float
-   */
-  private $_width;
-
-  /**
-   * PDF height, in points
-   *
-   * @var float;
-   */
-  private $_height;
-
-  /**
-   * Current page number
-   *
-   * @var int
-   */
-  private $_page_number;
-
-  /**
-   * Total number of pages
-   *
-   * @var int
-   */
-  private $_page_count;
-
-  /**
-   * Text to display on every page
-   *
-   * @var array
-   */
-  private $_page_text;
-
-  /**
-   * Array of pages for accesing after rendering is initially complete
-   *
-   * @var array
-   */
-  private $_pages;
-
-  /**
-   * Array of temporary cached images to be deleted when processing is complete
-   *
-   * @var array
-   */
-  private $_image_cache;
+    /**
+     * Dimensions of paper sizes in points
+     *
+     * @var array;
+     */
+    static $PAPER_SIZES = array("4a0" => array(0,0,4767.87,6740.79),
+                                "2a0" => array(0,0,3370.39,4767.87),
+                                "a0" => array(0,0,2383.94,3370.39),
+                                "a1" => array(0,0,1683.78,2383.94),
+                                "a2" => array(0,0,1190.55,1683.78),
+                                "a3" => array(0,0,841.89,1190.55),
+                                "a4" => array(0,0,595.28,841.89),
+                                "a5" => array(0,0,419.53,595.28),
+                                "a6" => array(0,0,297.64,419.53),
+                                "a7" => array(0,0,209.76,297.64),
+                                "a8" => array(0,0,147.40,209.76),
+                                "a9" => array(0,0,104.88,147.40),
+                                "a10" => array(0,0,73.70,104.88),
+                                "b0" => array(0,0,2834.65,4008.19),
+                                "b1" => array(0,0,2004.09,2834.65),
+                                "b2" => array(0,0,1417.32,2004.09),
+                                "b3" => array(0,0,1000.63,1417.32),
+                                "b4" => array(0,0,708.66,1000.63),
+                                "b5" => array(0,0,498.90,708.66),
+                                "b6" => array(0,0,354.33,498.90),
+                                "b7" => array(0,0,249.45,354.33),
+                                "b8" => array(0,0,175.75,249.45),
+                                "b9" => array(0,0,124.72,175.75),
+                                "b10" => array(0,0,87.87,124.72),
+                                "c0" => array(0,0,2599.37,3676.54),
+                                "c1" => array(0,0,1836.85,2599.37),
+                                "c2" => array(0,0,1298.27,1836.85),
+                                "c3" => array(0,0,918.43,1298.27),
+                                "c4" => array(0,0,649.13,918.43),
+                                "c5" => array(0,0,459.21,649.13),
+                                "c6" => array(0,0,323.15,459.21),
+                                "c7" => array(0,0,229.61,323.15),
+                                "c8" => array(0,0,161.57,229.61),
+                                "c9" => array(0,0,113.39,161.57),
+                                "c10" => array(0,0,79.37,113.39),
+                                "ra0" => array(0,0,2437.80,3458.27),
+                                "ra1" => array(0,0,1729.13,2437.80),
+                                "ra2" => array(0,0,1218.90,1729.13),
+                                "ra3" => array(0,0,864.57,1218.90),
+                                "ra4" => array(0,0,609.45,864.57),
+                                "sra0" => array(0,0,2551.18,3628.35),
+                                "sra1" => array(0,0,1814.17,2551.18),
+                                "sra2" => array(0,0,1275.59,1814.17),
+                                "sra3" => array(0,0,907.09,1275.59),
+                                "sra4" => array(0,0,637.80,907.09),
+                                "letter" => array(0,0,612.00,792.00),
+                                "legal" => array(0,0,612.00,1008.00),
+                                "ledger" => array(0,0,1224.00, 792.00),
+                                "tabloid" => array(0,0,792.00, 1224.00),
+                                "executive" => array(0,0,521.86,756.00),
+                                "folio" => array(0,0,612.00,936.00),
+                                "commerical #10 envelope" => array(0,0,684,297),
+                                "catalog #10 1/2 envelope" => array(0,0,648,864),
+                                "8.5x11" => array(0,0,612.00,792.00),
+                                "8.5x14" => array(0,0,612.00,1008.0),
+                                "11x17"  => array(0,0,792.00, 1224.00));
+
+
+    /**
+     * Instance of Cpdf class
+     *
+     * @var Cpdf
+     */
+    private $_pdf;
+
+    /**
+     * PDF width, in points
+     *
+     * @var float
+     */
+    private $_width;
+
+    /**
+     * PDF height, in points
+     *
+     * @var float;
+     */
+    private $_height;
+
+    /**
+     * Current page number
+     *
+     * @var int
+     */
+    private $_page_number;
+
+    /**
+     * Total number of pages
+     *
+     * @var int
+     */
+    private $_page_count;
+
+    /**
+     * Text to display on every page
+     *
+     * @var array
+     */
+    private $_page_text;
+
+    /**
+     * Array of pages for accesing after rendering is initially complete
+     *
+     * @var array
+     */
+    private $_pages;
+
+    /**
+     * Array of temporary cached images to be deleted when processing is complete
+     *
+     * @var array
+     */
+    private $_image_cache;
   
-  /**
-   * Class constructor
-   *
-   * @param mixed  $paper  The size of paper to use in this PDF ({@link CPDF_Adapter::$PAPER_SIZES})
-   * @param string $orientation The orienation of the document (either 'landscape' or 'portrait')
-   */
-  function __construct($paper = "letter", $orientation = "portrait") {
+    /**
+     * Class constructor
+     *
+     * @param mixed  $paper  The size of paper to use in this PDF ({@link CPDF_Adapter::$PAPER_SIZES})
+     * @param string $orientation The orienation of the document (either 'landscape' or 'portrait')
+     */
+    function __construct($paper = "letter", $orientation = "portrait") {
 
     if ( is_array($paper) )
-      $size = $paper;
+        $size = $paper;
     else if ( isset(self::$PAPER_SIZES[mb_strtolower($paper)]) )
-      $size = self::$PAPER_SIZES[mb_strtolower($paper)];
+        $size = self::$PAPER_SIZES[mb_strtolower($paper)];
     else
-      $size = self::$PAPER_SIZES["letter"];
+        $size = self::$PAPER_SIZES["letter"];
 
     if ( mb_strtolower($orientation) === "landscape" ) {
-      $a = $size[3];
-      $size[3] = $size[2];
-      $size[2] = $a;
+        $a = $size[3];
+        $size[3] = $size[2];
+        $size[2] = $a;
     }
     
     $this->_pdf = new Cpdf($size, DOMPDF_UNICODE_ENABLED, DOMPDF_FONT_CACHE, DOMPDF_TEMP_DIR);
@@ -219,8 +219,8 @@ 
 
     // Silence pedantic warnings about missing TZ settings
     $time = substr_replace(date('YmdHisO'), '\'', (0 - 2), 0).'\'';
-	$this->_pdf->addInfo("CreationDate", "D:".$time);
-	$this->_pdf->addInfo("ModDate", "D:".$time);
+    $this->_pdf->addInfo("CreationDate", "D:".$time);
+    $this->_pdf->addInfo("ModDate", "D:".$time);
     
 
     $this->_width = $size[2] - $size[0];
@@ -233,253 +233,253 @@ 
     $this->_pages = array($this->_pdf->getFirstPageId());
 
     $this->_image_cache = array();
-  }
-
-  /**
-   * Class destructor
-   *
-   * Deletes all temporary image files
-   */
-  function __destruct() {
+    }
+
+    /**
+     * Class destructor
+     *
+     * Deletes all temporary image files
+     */
+    function __destruct() {
     foreach ($this->_image_cache as $img) {
-      //debugpng
-      if (DEBUGPNG) print '[__destruct unlink '.$img.']';
-      if (!DEBUGKEEPTEMP)
+        //debugpng
+        if (DEBUGPNG) print '[__destruct unlink '.$img.']';
+        if (!DEBUGKEEPTEMP)
         unlink($img);
     }
-  }
+    }
   
-  /**
-   * Returns the Cpdf instance
-   *
-   * @return Cpdf
-   */
-  function get_cpdf() { return $this->_pdf; }
-
-  /**
-   * Add meta information to the PDF
-   *
-   * @param string $label  label of the value (Creator, Producter, etc.)
-   * @param string $value  the text to set
-   */
-  function add_info($label, $value) {
+    /**
+     * Returns the Cpdf instance
+     *
+     * @return Cpdf
+     */
+    function get_cpdf() { return $this->_pdf; }
+
+    /**
+     * Add meta information to the PDF
+     *
+     * @param string $label  label of the value (Creator, Producter, etc.)
+     * @param string $value  the text to set
+     */
+    function add_info($label, $value) {
     $this->_pdf->addInfo($label, $value);
-  }
-
-  /**
-   * Opens a new 'object'
-   *
-   * While an object is open, all drawing actions are recored in the object,
-   * as opposed to being drawn on the current page.  Objects can be added
-   * later to a specific page or to several pages.
-   *
-   * The return value is an integer ID for the new object.
-   *
-   * @see CPDF_Adapter::close_object()
-   * @see CPDF_Adapter::add_object()
-   *
-   * @return int
-   */
-  function open_object() {
+    }
+
+    /**
+     * Opens a new 'object'
+     *
+     * While an object is open, all drawing actions are recored in the object,
+     * as opposed to being drawn on the current page.  Objects can be added
+     * later to a specific page or to several pages.
+     *
+     * The return value is an integer ID for the new object.
+     *
+     * @see CPDF_Adapter::close_object()
+     * @see CPDF_Adapter::add_object()
+     *
+     * @return int
+     */
+    function open_object() {
     $ret = $this->_pdf->openObject();
     $this->_pdf->saveState();
     return $ret;
-  }
-
-  /**
-   * Reopens an existing 'object'
-   *
-   * @see CPDF_Adapter::open_object()
-   * @param int $object  the ID of a previously opened object
-   */
-  function reopen_object($object) {
+    }
+
+    /**
+     * Reopens an existing 'object'
+     *
+     * @see CPDF_Adapter::open_object()
+     * @param int $object  the ID of a previously opened object
+     */
+    function reopen_object($object) {
     $this->_pdf->reopenObject($object);
     $this->_pdf->saveState();
-  }
-
-  /**
-   * Closes the current 'object'
-   *
-   * @see CPDF_Adapter::open_object()
-   */
-  function close_object() {
+    }
+
+    /**
+     * Closes the current 'object'
+     *
+     * @see CPDF_Adapter::open_object()
+     */
+    function close_object() {
     $this->_pdf->restoreState();
     $this->_pdf->closeObject();
-  }
-
-  /**
-   * Adds a specified 'object' to the document
-   *
-   * $object int specifying an object created with {@link
-   * CPDF_Adapter::open_object()}.  $where can be one of:
-   * - 'add' add to current page only
-   * - 'all' add to every page from the current one onwards
-   * - 'odd' add to all odd numbered pages from now on
-   * - 'even' add to all even numbered pages from now on
-   * - 'next' add the object to the next page only
-   * - 'nextodd' add to all odd numbered pages from the next one
-   * - 'nexteven' add to all even numbered pages from the next one
-   *
-   * @see Cpdf::addObject()
-   *
-   * @param int $object
-   * @param string $where
-   */
-  function add_object($object, $where = 'all') {
+    }
+
+    /**
+     * Adds a specified 'object' to the document
+     *
+     * $object int specifying an object created with {@link
+     * CPDF_Adapter::open_object()}.  $where can be one of:
+     * - 'add' add to current page only
+     * - 'all' add to every page from the current one onwards
+     * - 'odd' add to all odd numbered pages from now on
+     * - 'even' add to all even numbered pages from now on
+     * - 'next' add the object to the next page only
+     * - 'nextodd' add to all odd numbered pages from the next one
+     * - 'nexteven' add to all even numbered pages from the next one
+     *
+     * @see Cpdf::addObject()
+     *
+     * @param int $object
+     * @param string $where
+     */
+    function add_object($object, $where = 'all') {
     $this->_pdf->addObject($object, $where);
-  }
-
-  /**
-   * Stops the specified 'object' from appearing in the document.
-   *
-   * The object will stop being displayed on the page following the current
-   * one.
-   *
-   * @param int $object
-   */
-  function stop_object($object) {
+    }
+
+    /**
+     * Stops the specified 'object' from appearing in the document.
+     *
+     * The object will stop being displayed on the page following the current
+     * one.
+     *
+     * @param int $object
+     */
+    function stop_object($object) {
     $this->_pdf->stopObject($object);
-  }
+    }
 
-  /**
-   * @access private
-   */
-  function serialize_object($id) {
+    /**
+     * @access private
+     */
+    function serialize_object($id) {
     // Serialize the pdf object's current state for retrieval later
     return $this->_pdf->serializeObject($id);
-  }
+    }
 
-  /**
-   * @access private
-   */
-  function reopen_serialized_object($obj) {
+    /**
+     * @access private
+     */
+    function reopen_serialized_object($obj) {
     return $this->_pdf->restoreSerializedObject($obj);
-  }
+    }
     
-  //........................................................................
-
-  /**
-   * Returns the PDF's width in points
-   * @return float
-   */
-  function get_width() { return $this->_width; }
-
-  /**
-   * Returns the PDF's height in points
-   * @return float
-   */
-  function get_height() { return $this->_height; }
-
-  /**
-   * Returns the current page number
-   * @return int
-   */
-  function get_page_number() { return $this->_page_number; }
-
-  /**
-   * Returns the total number of pages in the document
-   * @return int
-   */
-  function get_page_count() { return $this->_page_count; }
-
-  /**
-   * Sets the current page number
-   *
-   * @param int $num
-   */
-  function set_page_number($num) { $this->_page_number = $num; }
-
-  /**
-   * Sets the page count
-   *
-   * @param int $count
-   */
-  function set_page_count($count) {  $this->_page_count = $count; }
+    //........................................................................
+
+    /**
+     * Returns the PDF's width in points
+     * @return float
+     */
+    function get_width() { return $this->_width; }
+
+    /**
+     * Returns the PDF's height in points
+     * @return float
+     */
+    function get_height() { return $this->_height; }
+
+    /**
+     * Returns the current page number
+     * @return int
+     */
+    function get_page_number() { return $this->_page_number; }
+
+    /**
+     * Returns the total number of pages in the document
+     * @return int
+     */
+    function get_page_count() { return $this->_page_count; }
+
+    /**
+     * Sets the current page number
+     *
+     * @param int $num
+     */
+    function set_page_number($num) { $this->_page_number = $num; }
+
+    /**
+     * Sets the page count
+     *
+     * @param int $count
+     */
+    function set_page_count($count) {  $this->_page_count = $count; }
     
-  /**
-   * Sets the stroke colour
-   *
-   * See {@link Style::set_colour()} for the format of the color array.
-   * @param array $color
-   */
-  protected function _set_stroke_color($color) {
+    /**
+     * Sets the stroke colour
+     *
+     * See {@link Style::set_colour()} for the format of the color array.
+     * @param array $color
+     */
+    protected function _set_stroke_color($color) {
     list($r, $g, $b) = $color;
     $this->_pdf->setStrokeColor($r, $g, $b);
-  }
+    }
   
-  /**
-   * Sets the fill colour
-   *
-   * See {@link Style::set_colour()} for the format of the colour array.
-   * @param array $color
-   */
-  protected function _set_fill_color($color) {
+    /**
+     * Sets the fill colour
+     *
+     * See {@link Style::set_colour()} for the format of the colour array.
+     * @param array $color
+     */
+    protected function _set_fill_color($color) {
     list($r, $g, $b) = $color;
     $this->_pdf->setColor($r, $g, $b);
-  }
-
-  /**
-   * Sets line transparency
-   * @see Cpdf::setLineTransparency()
-   *
-   * Valid blend modes are (case-sensitive):
-   *
-   * Normal, Multiply, Screen, Overlay, Darken, Lighten,
-   * ColorDodge, ColorBurn, HardLight, SoftLight, Difference,
-   * Exclusion
-   *
-   * @param string $mode the blending mode to use
-   * @param float $opacity 0.0 fully transparent, 1.0 fully opaque
-   */
-  protected function _set_line_transparency($mode, $opacity) {
+    }
+
+    /**
+     * Sets line transparency
+     * @see Cpdf::setLineTransparency()
+     *
+     * Valid blend modes are (case-sensitive):
+     *
+     * Normal, Multiply, Screen, Overlay, Darken, Lighten,
+     * ColorDodge, ColorBurn, HardLight, SoftLight, Difference,
+     * Exclusion
+     *
+     * @param string $mode the blending mode to use
+     * @param float $opacity 0.0 fully transparent, 1.0 fully opaque
+     */
+    protected function _set_line_transparency($mode, $opacity) {
     $this->_pdf->setLineTransparency($mode, $opacity);
-  }
+    }
   
-  /**
-   * Sets fill transparency
-   * @see Cpdf::setFillTransparency()
-   *
-   * Valid blend modes are (case-sensitive):
-   *
-   * Normal, Multiply, Screen, Overlay, Darken, Lighten,
-   * ColorDogde, ColorBurn, HardLight, SoftLight, Difference,
-   * Exclusion
-   *
-   * @param string $mode the blending mode to use
-   * @param float $opacity 0.0 fully transparent, 1.0 fully opaque
-   */
-  protected function _set_fill_transparency($mode, $opacity) {
+    /**
+     * Sets fill transparency
+     * @see Cpdf::setFillTransparency()
+     *
+     * Valid blend modes are (case-sensitive):
+     *
+     * Normal, Multiply, Screen, Overlay, Darken, Lighten,
+     * ColorDogde, ColorBurn, HardLight, SoftLight, Difference,
+     * Exclusion
+     *
+     * @param string $mode the blending mode to use
+     * @param float $opacity 0.0 fully transparent, 1.0 fully opaque
+     */
+    protected function _set_fill_transparency($mode, $opacity) {
     $this->_pdf->setFillTransparency($mode, $opacity);
-  }
-
-  /**
-   * Sets the line style
-   *
-   * @see Cpdf::setLineStyle()
-   *
-   * @param float width
-   * @param string cap
-   * @param string join
-   * @param array dash
-   */
-  protected function _set_line_style($width, $cap, $join, $dash) {
+    }
+
+    /**
+     * Sets the line style
+     *
+     * @see Cpdf::setLineStyle()
+     *
+     * @param float width
+     * @param string cap
+     * @param string join
+     * @param array dash
+     */
+    protected function _set_line_style($width, $cap, $join, $dash) {
     $this->_pdf->setLineStyle($width, $cap, $join, $dash);
-  }
+    }
   
-  //........................................................................
+    //........................................................................
 
   
-  /**
-   * Remaps y coords from 4th to 1st quadrant
-   *
-   * @param float $y
-   * @return float
-   */
-  protected function y($y) { return $this->_height - $y; }
+    /**
+     * Remaps y coords from 4th to 1st quadrant
+     *
+     * @param float $y
+     * @return float
+     */
+    protected function y($y) { return $this->_height - $y; }
 
-  // Canvas implementation
+    // Canvas implementation
 
-  function line($x1, $y1, $x2, $y2, $color, $width, $style = array(),
+    function line($x1, $y1, $x2, $y2, $color, $width, $style = array(),
                 $blend = "Normal", $opacity = 1.0) {
     //pre_r(compact("x1", "y1", "x2", "y2", "color", "width", "style"));
 
@@ -488,35 +488,35 @@ 
     $this->_set_line_transparency($blend, $opacity);
     
     $this->_pdf->line($x1, $this->y($y1),
-                      $x2, $this->y($y2));
-  }
+                        $x2, $this->y($y2));
+    }
                               
-  //........................................................................
-
-  /**
-   * Convert a GIF image to a PNG image
-   *
-   * @return string The url of the newly converted image
-   */
-  protected function _convert_gif_to_png($image_url) {
+    //........................................................................
+
+    /**
+     * Convert a GIF image to a PNG image
+     *
+     * @return string The url of the newly converted image
+     */
+    protected function _convert_gif_to_png($image_url) {
     
     if ( !function_exists("imagecreatefromgif") ) {
-      throw new DOMPDF_Exception("Function imagecreatefromgif() not found.  Cannot convert gif image: $image_url.  Please install the image PHP extension.");
+        throw new DOMPDF_Exception("Function imagecreatefromgif() not found.  Cannot convert gif image: $image_url.  Please install the image PHP extension.");
     }
 
     $old_err = set_error_handler("record_warnings");
     $im = imagecreatefromgif($image_url);
 
     if ( $im ) {
-      imageinterlace($im, 0);
+        imageinterlace($im, 0);
 
-      $filename = tempnam(DOMPDF_TEMP_DIR, "gifdompdf_img_").'.png';
-      $this->_image_cache[] = $filename;
+        $filename = tempnam(DOMPDF_TEMP_DIR, "gifdompdf_img_").'.png';
+        $this->_image_cache[] = $filename;
 
-      imagepng($im, $filename);
+        imagepng($im, $filename);
 
     } else {
-      $filename = DOMPDF_LIB_DIR . "/res/broken_image.png";
+        $filename = DOMPDF_LIB_DIR . "/res/broken_image.png";
 
     }
 
@@ -524,21 +524,21 @@ 
 
     return $filename;
     
-  }
+    }
 
-  function rectangle($x1, $y1, $w, $h, $color, $width, $style = array(),
-                     $blend = "Normal", $opacity = 1.0) {
+    function rectangle($x1, $y1, $w, $h, $color, $width, $style = array(),
+                        $blend = "Normal", $opacity = 1.0) {
 
     $this->_set_stroke_color($color);
     $this->_set_line_style($width, "square", "miter", $style);
     $this->_set_line_transparency($blend, $opacity);
     
     $this->_pdf->rectangle($x1, $this->y($y1) - $h, $w, $h);
-  }
+    }
 
-  //........................................................................
+    //........................................................................
   
-  function filled_rectangle($x1, $y1, $w, $h, $color, $blend = "Normal", $opacity = 1.0) {
+    function filled_rectangle($x1, $y1, $w, $h, $color, $blend = "Normal", $opacity = 1.0) {
 
     $this->_set_fill_color($color);
     $this->_set_line_style(1, "square", "miter", array());
@@ -546,12 +546,12 @@ 
     $this->_set_fill_transparency($blend, $opacity);
     
     $this->_pdf->filledRectangle($x1, $this->y($y1) - $h, $w, $h);
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function polygon($points, $color, $width = null, $style = array(),
-                   $fill = false, $blend = "Normal", $opacity = 1.0) {
+    function polygon($points, $color, $width = null, $style = array(),
+                    $fill = false, $blend = "Normal", $opacity = 1.0) {
 
     $this->_set_fill_color($color);
     $this->_set_stroke_color($color);
@@ -560,19 +560,19 @@ 
     $this->_set_fill_transparency($blend, $opacity);
     
     if ( !$fill && isset($width) )
-      $this->_set_line_style($width, "square", "miter", $style);
+        $this->_set_line_style($width, "square", "miter", $style);
     
     // Adjust y values
     for ( $i = 1; $i < count($points); $i += 2)
-      $points[$i] = $this->y($points[$i]);
+        $points[$i] = $this->y($points[$i]);
     
     $this->_pdf->polygon($points, count($points) / 2, $fill);
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function circle($x, $y, $r1, $color, $width = null, $style = null,
-                  $fill = false, $blend = "Normal", $opacity = 1.0) {
+    function circle($x, $y, $r1, $color, $width = null, $style = null,
+                    $fill = false, $blend = "Normal", $opacity = 1.0) {
 
     $this->_set_fill_color($color);
     $this->_set_stroke_color($color);
@@ -581,14 +581,14 @@ 
     $this->_set_fill_transparency($blend, $opacity);
 
     if ( !$fill && isset($width) )
-      $this->_set_line_style($width, "round", "round", $style);
+        $this->_set_line_style($width, "round", "round", $style);
 
     $this->_pdf->ellipse($x, $this->y($y), $r1, 0, 0, 8, 0, 360, 1, $fill);
-  }
+    }
   
-  //........................................................................
+    //........................................................................
 
-  function image($img_url, $img_type, $x, $y, $w, $h) {
+    function image($img_url, $img_type, $x, $y, $w, $h) {
     //debugpng
     if (DEBUGPNG) print '[image:'.$img_url.'|'.$img_type.']';
 
@@ -600,15 +600,15 @@ 
       //debugpng
       if (DEBUGPNG)  print '!!!jpg!!!';
 
-      $this->_pdf->addJpegFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
-      break;
+        $this->_pdf->addJpegFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
+        break;
 
     case "png":
       //debugpng
       if (DEBUGPNG)  print '!!!png!!!';
 
-      $this->_pdf->addPngFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
-      break;
+        $this->_pdf->addPngFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
+        break;
 
     case "gif":
       // Convert gifs to pngs
@@ -618,41 +618,41 @@ 
         //debugpng
         if (DEBUGPNG)  print '!!!gif addImagePng!!!';
 
-      	//If optimization to direct png creation from gd object is available,
+            //If optimization to direct png creation from gd object is available,
         //don't create temp file, but place gd object directly into the pdf
-	    if ( method_exists( $this->_pdf, "image_iscached" ) &&
-	         $this->_pdf->image_iscached($img_url) ) {
-	      //If same image has occured already before, no need to load because
-	      //duplicate will anyway be eliminated.
-	      $img = null;
-	    } else {
-    	  $img = @imagecreatefromgif($img_url);
-    	  if (!$img) {
-      	    return;
-    	  }
-    	  imageinterlace($img, 0);
-    	}
-    	$this->_pdf->addImagePng($img_url, $x, $this->y($y) - $h, $w, $h, $img);
-      } else {
+        if ( method_exists( $this->_pdf, "image_iscached" ) &&
+             $this->_pdf->image_iscached($img_url) ) {
+            //If same image has occured already before, no need to load because
+            //duplicate will anyway be eliminated.
+            $img = null;
+        } else {
+            $img = @imagecreatefromgif($img_url);
+            if (!$img) {
+                return;
+            }
+            imageinterlace($img, 0);
+        }
+        $this->_pdf->addImagePng($img_url, $x, $this->y($y) - $h, $w, $h, $img);
+        } else {
         //debugpng
         if (DEBUGPNG)  print '!!!gif addPngFromFile!!!';
         $img_url = $this->_convert_gif_to_png($img_url);
         $this->_pdf->addPngFromFile($img_url, $x, $this->y($y) - $h, $w, $h);
-      }
-      break;
+        }
+        break;
 
     default:
       //debugpng
       if (DEBUGPNG) print '!!!unknown!!!';
-      break;
+        break;
     }
     
     return;
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0),
+    function text($x, $y, $text, $font, $size, $color = array(0,0,0),
                 $adjust = 0, $angle = 0, $blend = "Normal", $opacity = 1.0) {
 
     list($r, $g, $b) = $color;
@@ -693,142 +693,142 @@ 
     //print '<pre>['.$font.','.$size.','.$this->_pdf->getFontHeight($size).','.$this->_pdf->getFontDescender($size).','.$this->_pdf->fonts[$this->_pdf->currentFont]['FontBBox'][3].','.$this->_pdf->fonts[$this->_pdf->currentFont]['FontBBox'][1].','.$this->_pdf->fonts[$this->_pdf->currentFont]['FontHeightOffset'].','.$this->_pdf->fonts[$this->_pdf->currentFont]['Ascender'].','.$this->_pdf->fonts[$this->_pdf->currentFont]['Descender'].']</pre>';
     //
     //$this->_pdf->addText($x, $this->y($y) - Font_Metrics::get_font_height($font, $size), $size, $text, $angle, $adjust);
-	//$this->_pdf->addText($x, $this->y($y) - $size, $size, $text, $angle, $adjust);
-	//$this->_pdf->addText($x, $this->y($y) - $this->_pdf->getFontHeight($size)-$this->_pdf->getFontDescender($size), $size, $text, $angle, $adjust);
-	$this->_pdf->addText($x, $this->y($y) - ($this->_pdf->fonts[$this->_pdf->currentFont]['FontBBox'][3]*$size)/1000, $size, $text, $angle, $adjust);
-  }
+    //$this->_pdf->addText($x, $this->y($y) - $size, $size, $text, $angle, $adjust);
+    //$this->_pdf->addText($x, $this->y($y) - $this->_pdf->getFontHeight($size)-$this->_pdf->getFontDescender($size), $size, $text, $angle, $adjust);
+    $this->_pdf->addText($x, $this->y($y) - ($this->_pdf->fonts[$this->_pdf->currentFont]['FontBBox'][3]*$size)/1000, $size, $text, $angle, $adjust);
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function javascript($code) {
+    function javascript($code) {
     $this->_pdf->addJavascript($code);
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Add a named destination (similar to <a name="foo">...</a> in html)
-   *
-   * @param string $anchorname The name of the named destination
-   */
-  function add_named_dest($anchorname) {
+    /**
+     * Add a named destination (similar to <a name="foo">...</a> in html)
+     *
+     * @param string $anchorname The name of the named destination
+     */
+    function add_named_dest($anchorname) {
     $this->_pdf->addDestination($anchorname,"Fit");
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Add a link to the pdf
-   *
-   * @param string $url The url to link to
-   * @param float  $x   The x position of the link
-   * @param float  $y   The y position of the link
-   * @param float  $width   The width of the link
-   * @param float  $height   The height of the link
-   */
-  function add_link($url, $x, $y, $width, $height) {
+    /**
+     * Add a link to the pdf
+     *
+     * @param string $url The url to link to
+     * @param float  $x   The x position of the link
+     * @param float  $y   The y position of the link
+     * @param float  $width   The width of the link
+     * @param float  $height   The height of the link
+     */
+    function add_link($url, $x, $y, $width, $height) {
 
     $y = $this->y($y) - $height;
 
     if ( strpos($url, '#') === 0 ) {
-      // Local link
-      $name = substr($url,1);
-      if ( $name )
+        // Local link
+        $name = substr($url,1);
+        if ( $name )
         $this->_pdf->addInternalLink($name, $x, $y, $x + $width, $y + $height);
 
     } else {
-      $this->_pdf->addLink(rawurldecode($url), $x, $y, $x + $width, $y + $height);
+        $this->_pdf->addLink(rawurldecode($url), $x, $y, $x + $width, $y + $height);
     }
     
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function get_text_width($text, $font, $size, $spacing = 0) {
+    function get_text_width($text, $font, $size, $spacing = 0) {
     $this->_pdf->selectFont($font);
     if (!DOMPDF_UNICODE_ENABLED) {
-    	$text = mb_convert_encoding($text, 'Windows-1252', 'UTF-8');
+        $text = mb_convert_encoding($text, 'Windows-1252', 'UTF-8');
     }
     return $this->_pdf->getTextWidth($size, $text, $spacing);
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function get_font_height($font, $size) {
+    function get_font_height($font, $size) {
     $this->_pdf->selectFont($font);
     return $this->_pdf->getFontHeight($size);
-  }
+    }
 
-  //........................................................................
+    //........................................................................
   
-  /**
-   * Writes text at the specified x and y coordinates on every page
-   *
-   * The strings '{PAGE_NUM}' and '{PAGE_COUNT}' are automatically replaced
-   * with their current values.
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   *
-   * @param float $x
-   * @param float $y
-   * @param string $text the text to write
-   * @param string $font the font file to use
-   * @param float $size the font size, in points
-   * @param array $color
-   * @param float $adjust word spacing adjustment
-   * @param float $angle angle to write the text at, measured CW starting from the x-axis
-   */
-  function page_text($x, $y, $text, $font, $size, $color = array(0,0,0),
-                     $adjust = 0, $angle = 0) {
+    /**
+     * Writes text at the specified x and y coordinates on every page
+     *
+     * The strings '{PAGE_NUM}' and '{PAGE_COUNT}' are automatically replaced
+     * with their current values.
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     *
+     * @param float $x
+     * @param float $y
+     * @param string $text the text to write
+     * @param string $font the font file to use
+     * @param float $size the font size, in points
+     * @param array $color
+     * @param float $adjust word spacing adjustment
+     * @param float $angle angle to write the text at, measured CW starting from the x-axis
+     */
+    function page_text($x, $y, $text, $font, $size, $color = array(0,0,0),
+                        $adjust = 0, $angle = 0) {
     $_t = "text";
     $this->_page_text[] = compact("_t", "x", "y", "text", "font", "size", "color", "adjust", "angle");
-  }
+    }
 
-  //........................................................................
+    //........................................................................
     
-  /**
-   * Processes a script on every page
-   *
-   * The variables $pdf, $PAGE_NUM, and $PAGE_COUNT are available.
-   *
-   * This function can be used to add page numbers to all pages
-   * after the first one, for example.
-   *
-   * @param string $code the script code
-   * @param string $type the language type for script
-   */
-  function page_script($code, $type = "text/php") {
+    /**
+     * Processes a script on every page
+     *
+     * The variables $pdf, $PAGE_NUM, and $PAGE_COUNT are available.
+     *
+     * This function can be used to add page numbers to all pages
+     * after the first one, for example.
+     *
+     * @param string $code the script code
+     * @param string $type the language type for script
+     */
+    function page_script($code, $type = "text/php") {
     $_t = "script";
     $this->_page_text[] = compact("_t", "code", "type");
-  }
+    }
   
-  //........................................................................
+    //........................................................................
 
-  function new_page() {
+    function new_page() {
     $this->_page_count++;
 
     $ret = $this->_pdf->newPage();
     $this->_pages[] = $ret;
     return $ret;
-  }
+    }
   
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Add text to each page after rendering is complete
-   */
-  protected function _add_page_text() {
+    /**
+     * Add text to each page after rendering is complete
+     */
+    protected function _add_page_text() {
     
     if ( !count($this->_page_text) )
-      return;
+        return;
 
     $page_number = 1;
     $eval = null;
 
     foreach ($this->_pages as $pid) {
-      $this->reopen_object($pid);
+        $this->reopen_object($pid);
 
-      foreach ($this->_page_text as $pt) {
+        foreach ($this->_page_text as $pt) {
         extract($pt);
 
         switch ($_t) {
@@ -837,63 +837,63 @@ 
         $text = str_replace(array("{PAGE_NUM}","{PAGE_COUNT}"),
                             array($page_number, $this->_page_count), $text);
         $this->text($x, $y, $text, $font, $size, $color, $adjust, $angle);
-          break;
+            break;
           
         case "script":
           if (!$eval) {
             $eval = new PHP_Evaluator($this);
-          }
-          $eval->evaluate($code, array('PAGE_NUM' => $page_number, 'PAGE_COUNT' => $this->_page_count));
-          break;
+            }
+            $eval->evaluate($code, array('PAGE_NUM' => $page_number, 'PAGE_COUNT' => $this->_page_count));
+            break;
+        }
         }
-      }
 
-      $this->close_object();
-      $page_number++;
+        $this->close_object();
+        $page_number++;
+    }
     }
-  }
   
-  /**
-   * Streams the PDF directly to the browser
-   *
-   * @param string $filename the name of the PDF file
-   * @param array  $options associative array, 'Attachment' => 0 or 1, 'compress' => 1 or 0
-   */
-  function stream($filename, $options = null) {
+    /**
+     * Streams the PDF directly to the browser
+     *
+     * @param string $filename the name of the PDF file
+     * @param array  $options associative array, 'Attachment' => 0 or 1, 'compress' => 1 or 0
+     */
+    function stream($filename, $options = null) {
     // Add page text
     $this->_add_page_text();
     
     $options["Content-Disposition"] = $filename;
     $this->_pdf->stream($options);
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Returns the PDF as a string
-   *
-   * @return string
-   */
-  function output($options = null) {
+    /**
+     * Returns the PDF as a string
+     *
+     * @return string
+     */
+    function output($options = null) {
     // Add page text
     $this->_add_page_text();
 
     if ( isset($options["compress"]) && $options["compress"] != 1 )
-      $debug = 1;
+        $debug = 1;
     else
-      $debug = 0;
+        $debug = 0;
     
     return $this->_pdf->output($debug);
     
-  }
+    }
   
-  //........................................................................
-
-  /**
-   * Returns logging messages generated by the Cpdf class
-   *
-   * @return string
-   */
-  function get_messages() { return $this->_pdf->messages; }
+    //........................................................................
+
+    /**
+     * Returns logging messages generated by the Cpdf class
+     *
+     * @return string
+     */
+    function get_messages() { return $this->_pdf->messages; }
   
 }

main/inc/lib/phpdocx/pdf/include/css_color.cls.php

Doc Comments +3 added lines

@@ -190,6 +190,9 @@
     "yellowgreen" => "9ACD32",

   );

 

+  /**
+   * @param string $colour
+   */
   static function parse($colour) {

     if ( is_array($colour) )

       // Assume the array has the right format...