chamilo / chamilo-lms

main/inc/lib/phpdocx/pdf/include/functions.inc.php

Doc Comments +17 added lines

@@ -305,6 +305,10 @@ 
  */
 
 if ( !function_exists("mb_convert_encoding") ) {
+
+  /**
+   * @param string|null $to_encoding
+   */
   function mb_convert_encoding($data, $to_encoding, $from_encoding='UTF-8') {
     if (str_replace('-', '', strtolower($to_encoding)) == 'utf8') {
       return utf8_encode($data);
@@ -327,6 +331,10 @@ 
 }
 
 if ( !function_exists("mb_internal_encoding") ) {
+
+  /**
+   * @param string $encoding
+   */
   function mb_internal_encoding($encoding=NULL) {
     if (isset($encoding)) {
       return true;
@@ -365,6 +373,10 @@ 
 }
 
 if ( !function_exists("mb_strtoupper") ) {
+
+  /**
+   * @param string $str
+   */
   function mb_strtoupper($str) {
     return strtoupper($str);
   }
@@ -380,6 +392,10 @@ 
 }
 
 if ( !function_exists("mb_substr_count") ) {
+
+  /**
+   * @param string $needle
+   */
   function mb_substr_count($haystack, $needle) {
     return substr_count($haystack, $needle);
   }
@@ -442,6 +458,7 @@ 
  * Print debug messages
  *
  * @param string $type  The type of debug messages to print
+ * @param string $msg
  */
 function dompdf_debug($type, $msg) {
   global $_DOMPDF_DEBUG_TYPES;

Indentation +137 added lines, -137 removed lines

@@ -63,18 +63,18 @@ 
  */
 if ( !function_exists("pre_r") ) {
 function pre_r($mixed, $return = false) {
-  if ($return)
+    if ($return)
     return "<pre>" . print_r($mixed, true) . "</pre>";
 
-  if ( php_sapi_name() !== "cli")
+    if ( php_sapi_name() !== "cli")
     echo ("<pre>");
-  print_r($mixed);
+    print_r($mixed);
 
-  if ( php_sapi_name() !== "cli")
+    if ( php_sapi_name() !== "cli")
     echo("</pre>");
-  else
+    else
     echo ("\n");
-  flush();
+    flush();
 
 }
 }
@@ -89,10 +89,10 @@ 
  */
 if ( !function_exists("pre_var_dump") ) {
 function pre_var_dump($mixed) {
-  if ( php_sapi_name() !== "cli")
+    if ( php_sapi_name() !== "cli")
     echo("<pre>");
-  var_dump($mixed);
-  if ( php_sapi_name() !== "cli")
+    var_dump($mixed);
+    if ( php_sapi_name() !== "cli")
     echo("</pre>");
 }
 }
@@ -115,41 +115,41 @@ 
  * is appended (o.k. also for Windows)
  */
 function build_url($protocol, $host, $base_path, $url) {
-  if ( mb_strlen($url) == 0 ) {
+    if ( mb_strlen($url) == 0 ) {
     //return $protocol . $host . rtrim($base_path, "/\\") . "/";
     return $protocol . $host . $base_path;
-  }
+    }
 
-  // Is the url already fully qualified?
-  if ( mb_strpos($url, "://") !== false )
+    // Is the url already fully qualified?
+    if ( mb_strpos($url, "://") !== false )
     return $url;
 
-  $ret = $protocol;
+    $ret = $protocol;
 
-  if (!in_array(mb_strtolower($protocol), array("http://", "https://", "ftp://", "ftps://"))) {
+    if (!in_array(mb_strtolower($protocol), array("http://", "https://", "ftp://", "ftps://"))) {
     //On Windows local file, an abs path can begin also with a '\' or a drive letter and colon
     //drive: followed by a relative path would be a drive specific default folder.
     //not known in php app code, treat as abs path
     //($url[1] !== ':' || ($url[2]!=='\\' && $url[2]!=='/'))
     if ($url[0] !== '/' && (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN' || ($url[0] !== '\\' && $url[1] !== ':'))) {
-      // For rel path and local acess we ignore the host, and run the path through realpath()
-      $ret .= realpath($base_path).'/';
+        // For rel path and local acess we ignore the host, and run the path through realpath()
+        $ret .= realpath($base_path).'/';
     }
     $ret .= $url;
     return $ret;
-  }
+    }
 
-  //remote urls with backslash in html/css are not really correct, but lets be genereous
-  if ( $url[0] === '/' || $url[0] === '\\' ) {
+    //remote urls with backslash in html/css are not really correct, but lets be genereous
+    if ( $url[0] === '/' || $url[0] === '\\' ) {
     // Absolute path
     $ret .= $host . $url;
-  } else {
+    } else {
     // Relative path
     //$base_path = $base_path !== "" ? rtrim($base_path, "/\\") . "/" : "";
     $ret .= $host . $base_path . $url;
-  }
+    }
 
-  return $ret;
+    return $ret;
 
 }
 
@@ -161,56 +161,56 @@ 
  * @return array
  */
 function explode_url($url) {
-  $protocol = "";
-  $host = "";
-  $path = "";
-  $file = "";
+    $protocol = "";
+    $host = "";
+    $path = "";
+    $file = "";
 
-  $arr = parse_url($url);
+    $arr = parse_url($url);
 
-  if ( isset($arr["scheme"]) &&
+    if ( isset($arr["scheme"]) &&
        $arr["scheme"] !== "file" &&
        mb_strlen($arr["scheme"]) > 1 ) // Exclude windows drive letters...
     {
     $protocol = $arr["scheme"] . "://";
 
     if ( isset($arr["user"]) ) {
-      $host .= $arr["user"];
+        $host .= $arr["user"];
 
-      if ( isset($arr["pass"]) )
+        if ( isset($arr["pass"]) )
         $host .= "@" . $arr["pass"];
 
-      $host .= ":";
+        $host .= ":";
     }
 
     if ( isset($arr["host"]) )
-      $host .= $arr["host"];
+        $host .= $arr["host"];
 
     if ( isset($arr["port"]) )
-      $host .= ":" . $arr["port"];
+        $host .= ":" . $arr["port"];
 
     if ( isset($arr["path"]) && $arr["path"] !== "" ) {
-      // Do we have a trailing slash?
-      if ( $arr["path"]{ mb_strlen($arr["path"]) - 1 } === "/" ) {
+        // Do we have a trailing slash?
+        if ( $arr["path"]{ mb_strlen($arr["path"]) - 1 } === "/" ) {
         $path = $arr["path"];
         $file = "";
-      } else {
+        } else {
         $path = dirname($arr["path"]) . "/";
         $file = basename($arr["path"]);
-      }
+        }
     }
 
     if ( isset($arr["query"]) )
-      $file .= "?" . $arr["query"];
+        $file .= "?" . $arr["query"];
 
     if ( isset($arr["fragment"]) )
-      $file .= "#" . $arr["fragment"];
+        $file .= "#" . $arr["fragment"];
 
-  } else {
+    } else {
 
     $i = mb_strpos($url, "file://");
     if ( $i !== false)
-      $url = mb_substr($url, $i + 7);
+        $url = mb_substr($url, $i + 7);
 
     $protocol = ""; // "file://"; ? why doesn't this work... It's because of
                     // network filenames like //COMPU/SHARENAME
@@ -222,28 +222,28 @@ 
 
     // Check that the path exists
     if ( $path !== false ) {
-      $path .= '/';
+        $path .= '/';
 
     } else {
-      // generate a url to access the file if no real path found.
-      $protocol = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? 'https://' : 'http://';
+        // generate a url to access the file if no real path found.
+        $protocol = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? 'https://' : 'http://';
 
-      $host = isset($_SERVER["HTTP_HOST"]) ? $_SERVER["HTTP_HOST"] : php_uname("n");
+        $host = isset($_SERVER["HTTP_HOST"]) ? $_SERVER["HTTP_HOST"] : php_uname("n");
 
-      if ( substr($arr["path"], 0, 1) === '/' ) {
+        if ( substr($arr["path"], 0, 1) === '/' ) {
         $path = dirname($arr["path"]);
-      } else {
+        } else {
         $path = '/' . rtrim(dirname($_SERVER["SCRIPT_NAME"]), '/') . '/' . $arr["path"];
-      }
+        }
+    }
     }
-  }
-
-  $ret = array($protocol, $host, $path, $file,
-               "protocol" => $protocol,
-               "host" => $host,
-               "path" => $path,
-               "file" => $file);
-  return $ret;
+
+    $ret = array($protocol, $host, $path, $file,
+                "protocol" => $protocol,
+                "host" => $host,
+                "path" => $path,
+                "file" => $file);
+    return $ret;
 }
 
 /**
@@ -254,41 +254,41 @@ 
  */
 function dec2roman($num) {
 
-  static $ones = array("", "i", "ii", "iii", "iv", "v",
-                       "vi", "vii", "viii", "ix");
-  static $tens = array("", "x", "xx", "xxx", "xl", "l",
-                       "lx", "lxx", "lxxx", "xc");
-  static $hund = array("", "c", "cc", "ccc", "cd", "d",
-                       "dc", "dcc", "dccc", "cm");
-  static $thou = array("", "m", "mm", "mmm");
+    static $ones = array("", "i", "ii", "iii", "iv", "v",
+                        "vi", "vii", "viii", "ix");
+    static $tens = array("", "x", "xx", "xxx", "xl", "l",
+                        "lx", "lxx", "lxxx", "xc");
+    static $hund = array("", "c", "cc", "ccc", "cd", "d",
+                        "dc", "dcc", "dccc", "cm");
+    static $thou = array("", "m", "mm", "mmm");
 
-  if ( !is_numeric($num) )
+    if ( !is_numeric($num) )
     throw new DOMPDF_Exception("dec2roman() requires a numeric argument.");
 
-  if ( $num > 4000 || $num < 0 )
+    if ( $num > 4000 || $num < 0 )
     return "(out of range)";
 
-  $num = strrev((string)$num);
+    $num = strrev((string)$num);
 
-  $ret = "";
-  switch (mb_strlen($num)) {
+    $ret = "";
+    switch (mb_strlen($num)) {
 
-  case 4:
+    case 4:
     $ret .= $thou[$num[3]];
 
-  case 3:
+    case 3:
     $ret .= $hund[$num[2]];
 
-  case 2:
+    case 2:
     $ret .= $tens[$num[1]];
 
-  case 1:
+    case 1:
     $ret .= $ones[$num[0]];
 
-  default:
+    default:
     break;
-  }
-  return $ret;
+    }
+    return $ret;
 
 }
 
@@ -305,84 +305,84 @@ 
  */
 
 if ( !function_exists("mb_convert_encoding") ) {
-  function mb_convert_encoding($data, $to_encoding, $from_encoding='UTF-8') {
+    function mb_convert_encoding($data, $to_encoding, $from_encoding='UTF-8') {
     if (str_replace('-', '', strtolower($to_encoding)) == 'utf8') {
-      return utf8_encode($data);
+        return utf8_encode($data);
     } else {
-      return utf8_decode($data);
+        return utf8_decode($data);
+    }
     }
-  }
 }
 
 if ( !function_exists("mb_detect_encoding") ) {
-  function mb_detect_encoding($data, $encoding_list=array('iso-8859-1'), $strict=false) {
+    function mb_detect_encoding($data, $encoding_list=array('iso-8859-1'), $strict=false) {
     return 'iso-8859-1';
-  }
+    }
 }
 
 if ( !function_exists("mb_detect_order") ) {
-  function mb_detect_order($encoding_list=array('iso-8859-1')) {
+    function mb_detect_order($encoding_list=array('iso-8859-1')) {
     return 'iso-8859-1';
-  }
+    }
 }
 
 if ( !function_exists("mb_internal_encoding") ) {
-  function mb_internal_encoding($encoding=NULL) {
+    function mb_internal_encoding($encoding=NULL) {
     if (isset($encoding)) {
-      return true;
+        return true;
     } else {
-      return 'iso-8859-1';
+        return 'iso-8859-1';
+    }
     }
-  }
 }
 
 if ( !function_exists("mb_strlen") ) {
-  function mb_strlen($str, $encoding='iso-8859-1') {
+    function mb_strlen($str, $encoding='iso-8859-1') {
     if (str_replace('-', '', strtolower($encoding)) == 'utf8') {
-      return strlen(utf8_encode($data));
+        return strlen(utf8_encode($data));
     } else {
-      return strlen(utf8_decode($data));
+        return strlen(utf8_decode($data));
+    }
     }
-  }
 }
 
 if ( !function_exists("mb_strpos") ) {
-  function mb_strpos($haystack, $needle, $offset = 0) {
+    function mb_strpos($haystack, $needle, $offset = 0) {
     return strpos($haystack, $needle, $offset);
-  }
+    }
 }
 
 if ( !function_exists("mb_strrpos") ) {
-  function mb_strrpos($haystack, $needle, $offset = 0) {
+    function mb_strrpos($haystack, $needle, $offset = 0) {
     return strrpos($haystack, $needle, $offset);
-  }
+    }
 }
 
 if ( !function_exists("mb_strtolower") ) {
-  function mb_strtolower($str) {
+    function mb_strtolower($str) {
     return strtolower($str);
-  }
+    }
 }
 
 if ( !function_exists("mb_strtoupper") ) {
-  function mb_strtoupper($str) {
+    function mb_strtoupper($str) {
     return strtoupper($str);
-  }
+    }
 }
 
 if ( !function_exists("mb_substr") ) {
-  function mb_substr($str, $start, $length=null, $encoding='iso-8859-1') {
+    function mb_substr($str, $start, $length=null, $encoding='iso-8859-1') {
     if ( is_null($length) )
-      return substr($str, $start);
+        return substr($str, $start);
     else
-      return substr($str, $start, $length);
-  }
+        return substr($str, $start, $length);
+    }
 }
 
 if ( !function_exists("mb_substr_count") ) {
-  function mb_substr_count($haystack, $needle) {
+    function mb_substr_count($haystack, $needle) {
     return substr_count($haystack, $needle);
-  }
+    }
 }
 
 /**
@@ -402,40 +402,40 @@ 
  */
 function record_warnings($errno, $errstr, $errfile, $errline) {
 
-  if ( !($errno & (E_WARNING | E_NOTICE | E_USER_NOTICE | E_USER_WARNING )) ) // Not a warning or notice
+    if ( !($errno & (E_WARNING | E_NOTICE | E_USER_NOTICE | E_USER_WARNING )) ) // Not a warning or notice
     throw new DOMPDF_Exception($errstr . " $errno");
 
-  global $_dompdf_warnings;
-  global $_dompdf_show_warnings;
+    global $_dompdf_warnings;
+    global $_dompdf_show_warnings;
 
-  if ( $_dompdf_show_warnings )
+    if ( $_dompdf_show_warnings )
     echo $errstr . "\n";
 
-  $_dompdf_warnings[] = $errstr;
+    $_dompdf_warnings[] = $errstr;
 }
 
 /**
  * Print a useful backtrace
  */
 function bt() {
-  $bt = debug_backtrace();
+    $bt = debug_backtrace();
 
-  array_shift($bt); // remove actual bt() call
-  echo "\n";
+    array_shift($bt); // remove actual bt() call
+    echo "\n";
 
-  $i = 0;
-  foreach ($bt as $call) {
+    $i = 0;
+    foreach ($bt as $call) {
     $file = basename($call["file"]) . " (" . $call["line"] . ")";
     if ( isset($call["class"]) ) {
-      $func = $call["class"] . "->" . $call["function"] . "()";
+        $func = $call["class"] . "->" . $call["function"] . "()";
     } else {
-      $func = $call["function"] . "()";
+        $func = $call["function"] . "()";
     }
 
     echo "#" . str_pad($i, 2, " ", STR_PAD_RIGHT) . ": " . str_pad($file.":", 42) . " $func\n";
     $i++;
-  }
-  echo "\n";
+    }
+    echo "\n";
 }
 
 /**
@@ -444,15 +444,15 @@ 
  * @param string $type  The type of debug messages to print
  */
 function dompdf_debug($type, $msg) {
-  global $_DOMPDF_DEBUG_TYPES;
-  global $_dompdf_show_warnings;
-  global $_dompdf_debug;
-  if ( isset($_DOMPDF_DEBUG_TYPES[$type]) && ($_dompdf_show_warnings || $_dompdf_debug) ) {
+    global $_DOMPDF_DEBUG_TYPES;
+    global $_dompdf_show_warnings;
+    global $_dompdf_debug;
+    if ( isset($_DOMPDF_DEBUG_TYPES[$type]) && ($_dompdf_show_warnings || $_dompdf_debug) ) {
     $arr = debug_backtrace();
 
     echo basename($arr[0]["file"]) . " (" . $arr[0]["line"] ."): " . $arr[1]["function"] . ": ";
     pre_r($msg);
-  }
+    }
 }
 
 /**
@@ -460,20 +460,20 @@ 
  */
 if ( !function_exists("print_memusage") ) {
 function print_memusage() {
-  global $memusage;
-  echo ("Memory Usage\n");
-  $prev = 0;
-  $initial = reset($memusage);
-  echo (str_pad("Initial:", 40) . $initial . "\n\n");
+    global $memusage;
+    echo ("Memory Usage\n");
+    $prev = 0;
+    $initial = reset($memusage);
+    echo (str_pad("Initial:", 40) . $initial . "\n\n");
 
-  foreach ($memusage as $key=>$mem) {
+    foreach ($memusage as $key=>$mem) {
     $mem -= $initial;
     echo (str_pad("$key:" , 40));
     echo (str_pad("$mem", 12) . "(diff: " . ($mem - $prev) . ")\n");
     $prev = $mem;
-  }
+    }
 
-  echo ("\n" . str_pad("Total:", 40) . memory_get_usage()) . "\n";
+    echo ("\n" . str_pad("Total:", 40) . memory_get_usage()) . "\n";
 }
 }
 
@@ -495,8 +495,8 @@ 
  */
 if ( !function_exists("mark_memusage") ) {
 function mark_memusage($location) {
-  global $memusage;
-  if ( isset($memusage) )
+    global $memusage;
+    if ( isset($memusage) )
     $memusage[$location] = memory_get_usage();
 }
 }
@@ -507,7 +507,7 @@ 
  * @link http://us.php.net/manual/en/function.sys-get-temp-dir.php#85261
  */
 if ( !function_exists('sys_get_temp_dir')) {
-  function sys_get_temp_dir() {
+    function sys_get_temp_dir() {
     if (!empty($_ENV['TMP'])) { return realpath($_ENV['TMP']); }
     if (!empty($_ENV['TMPDIR'])) { return realpath( $_ENV['TMPDIR']); }
     if (!empty($_ENV['TEMP'])) { return realpath( $_ENV['TEMP']); }
@@ -516,5 +516,5 @@ 
     unlink($tempfile);
     return realpath(dirname($tempfile));
     }
-  }
+    }
 }

Switch Indentation +10 added lines, -10 removed lines

@@ -273,20 +273,20 @@
   $ret = "";
   switch (mb_strlen($num)) {
 
-  case 4:
-    $ret .= $thou[$num[3]];
+      case 4:
+        $ret .= $thou[$num[3]];
 
-  case 3:
-    $ret .= $hund[$num[2]];
+      case 3:
+        $ret .= $hund[$num[2]];
 
-  case 2:
-    $ret .= $tens[$num[1]];
+      case 2:
+        $ret .= $tens[$num[1]];
 
-  case 1:
-    $ret .= $ones[$num[0]];
+      case 1:
+        $ret .= $ones[$num[0]];
 
-  default:
-    break;
+      default:
+        break;
   }
   return $ret;
 

Spacing +77 added lines, -77 removed lines

@@ -61,16 +61,16 @@ 
  * @param bool $return
  *
  */
-if ( !function_exists("pre_r") ) {
+if (!function_exists("pre_r")) {
 function pre_r($mixed, $return = false) {
   if ($return)
-    return "<pre>" . print_r($mixed, true) . "</pre>";
+    return "<pre>".print_r($mixed, true)."</pre>";
 
-  if ( php_sapi_name() !== "cli")
+  if (php_sapi_name() !== "cli")
     echo ("<pre>");
   print_r($mixed);
 
-  if ( php_sapi_name() !== "cli")
+  if (php_sapi_name() !== "cli")
     echo("</pre>");
   else
     echo ("\n");
@@ -87,12 +87,12 @@ 
  *
  * @param mixed $mixed variable or expression to display.
  */
-if ( !function_exists("pre_var_dump") ) {
+if (!function_exists("pre_var_dump")) {
 function pre_var_dump($mixed) {
-  if ( php_sapi_name() !== "cli")
+  if (php_sapi_name() !== "cli")
     echo("<pre>");
   var_dump($mixed);
-  if ( php_sapi_name() !== "cli")
+  if (php_sapi_name() !== "cli")
     echo("</pre>");
 }
 }
@@ -115,13 +115,13 @@ 
  * is appended (o.k. also for Windows)
  */
 function build_url($protocol, $host, $base_path, $url) {
-  if ( mb_strlen($url) == 0 ) {
+  if (mb_strlen($url) == 0) {
     //return $protocol . $host . rtrim($base_path, "/\\") . "/";
-    return $protocol . $host . $base_path;
+    return $protocol.$host.$base_path;
   }
 
   // Is the url already fully qualified?
-  if ( mb_strpos($url, "://") !== false )
+  if (mb_strpos($url, "://") !== false)
     return $url;
 
   $ret = $protocol;
@@ -140,13 +140,13 @@ 
   }
 
   //remote urls with backslash in html/css are not really correct, but lets be genereous
-  if ( $url[0] === '/' || $url[0] === '\\' ) {
+  if ($url[0] === '/' || $url[0] === '\\') {
     // Absolute path
-    $ret .= $host . $url;
+    $ret .= $host.$url;
   } else {
     // Relative path
     //$base_path = $base_path !== "" ? rtrim($base_path, "/\\") . "/" : "";
-    $ret .= $host . $base_path . $url;
+    $ret .= $host.$base_path.$url;
   }
 
   return $ret;
@@ -168,48 +168,48 @@ 
 
   $arr = parse_url($url);
 
-  if ( isset($arr["scheme"]) &&
+  if (isset($arr["scheme"]) &&
        $arr["scheme"] !== "file" &&
-       mb_strlen($arr["scheme"]) > 1 ) // Exclude windows drive letters...
+       mb_strlen($arr["scheme"]) > 1) // Exclude windows drive letters...
     {
-    $protocol = $arr["scheme"] . "://";
+    $protocol = $arr["scheme"]."://";
 
-    if ( isset($arr["user"]) ) {
+    if (isset($arr["user"])) {
       $host .= $arr["user"];
 
-      if ( isset($arr["pass"]) )
-        $host .= "@" . $arr["pass"];
+      if (isset($arr["pass"]))
+        $host .= "@".$arr["pass"];
 
       $host .= ":";
     }
 
-    if ( isset($arr["host"]) )
+    if (isset($arr["host"]))
       $host .= $arr["host"];
 
-    if ( isset($arr["port"]) )
-      $host .= ":" . $arr["port"];
+    if (isset($arr["port"]))
+      $host .= ":".$arr["port"];
 
-    if ( isset($arr["path"]) && $arr["path"] !== "" ) {
+    if (isset($arr["path"]) && $arr["path"] !== "") {
       // Do we have a trailing slash?
-      if ( $arr["path"]{ mb_strlen($arr["path"]) - 1 } === "/" ) {
+      if ($arr["path"]{ mb_strlen($arr["path"]) - 1 } === "/") {
         $path = $arr["path"];
         $file = "";
       } else {
-        $path = dirname($arr["path"]) . "/";
+        $path = dirname($arr["path"])."/";
         $file = basename($arr["path"]);
       }
     }
 
-    if ( isset($arr["query"]) )
-      $file .= "?" . $arr["query"];
+    if (isset($arr["query"]))
+      $file .= "?".$arr["query"];
 
-    if ( isset($arr["fragment"]) )
-      $file .= "#" . $arr["fragment"];
+    if (isset($arr["fragment"]))
+      $file .= "#".$arr["fragment"];
 
   } else {
 
     $i = mb_strpos($url, "file://");
-    if ( $i !== false)
+    if ($i !== false)
       $url = mb_substr($url, $i + 7);
 
     $protocol = ""; // "file://"; ? why doesn't this work... It's because of
@@ -221,7 +221,7 @@ 
     $path = dirname($url);
 
     // Check that the path exists
-    if ( $path !== false ) {
+    if ($path !== false) {
       $path .= '/';
 
     } else {
@@ -230,10 +230,10 @@ 
 
       $host = isset($_SERVER["HTTP_HOST"]) ? $_SERVER["HTTP_HOST"] : php_uname("n");
 
-      if ( substr($arr["path"], 0, 1) === '/' ) {
+      if (substr($arr["path"], 0, 1) === '/') {
         $path = dirname($arr["path"]);
       } else {
-        $path = '/' . rtrim(dirname($_SERVER["SCRIPT_NAME"]), '/') . '/' . $arr["path"];
+        $path = '/'.rtrim(dirname($_SERVER["SCRIPT_NAME"]), '/').'/'.$arr["path"];
       }
     }
   }
@@ -262,13 +262,13 @@ 
                        "dc", "dcc", "dccc", "cm");
   static $thou = array("", "m", "mm", "mmm");
 
-  if ( !is_numeric($num) )
+  if (!is_numeric($num))
     throw new DOMPDF_Exception("dec2roman() requires a numeric argument.");
 
-  if ( $num > 4000 || $num < 0 )
+  if ($num > 4000 || $num < 0)
     return "(out of range)";
 
-  $num = strrev((string)$num);
+  $num = strrev((string) $num);
 
   $ret = "";
   switch (mb_strlen($num)) {
@@ -304,8 +304,8 @@ 
  * mb_string compatibility
  */
 
-if ( !function_exists("mb_convert_encoding") ) {
-  function mb_convert_encoding($data, $to_encoding, $from_encoding='UTF-8') {
+if (!function_exists("mb_convert_encoding")) {
+  function mb_convert_encoding($data, $to_encoding, $from_encoding = 'UTF-8') {
     if (str_replace('-', '', strtolower($to_encoding)) == 'utf8') {
       return utf8_encode($data);
     } else {
@@ -314,20 +314,20 @@ 
   }
 }
 
-if ( !function_exists("mb_detect_encoding") ) {
-  function mb_detect_encoding($data, $encoding_list=array('iso-8859-1'), $strict=false) {
+if (!function_exists("mb_detect_encoding")) {
+  function mb_detect_encoding($data, $encoding_list = array('iso-8859-1'), $strict = false) {
     return 'iso-8859-1';
   }
 }
 
-if ( !function_exists("mb_detect_order") ) {
-  function mb_detect_order($encoding_list=array('iso-8859-1')) {
+if (!function_exists("mb_detect_order")) {
+  function mb_detect_order($encoding_list = array('iso-8859-1')) {
     return 'iso-8859-1';
   }
 }
 
-if ( !function_exists("mb_internal_encoding") ) {
-  function mb_internal_encoding($encoding=NULL) {
+if (!function_exists("mb_internal_encoding")) {
+  function mb_internal_encoding($encoding = NULL) {
     if (isset($encoding)) {
       return true;
     } else {
@@ -336,8 +336,8 @@ 
   }
 }
 
-if ( !function_exists("mb_strlen") ) {
-  function mb_strlen($str, $encoding='iso-8859-1') {
+if (!function_exists("mb_strlen")) {
+  function mb_strlen($str, $encoding = 'iso-8859-1') {
     if (str_replace('-', '', strtolower($encoding)) == 'utf8') {
       return strlen(utf8_encode($data));
     } else {
@@ -346,40 +346,40 @@ 
   }
 }
 
-if ( !function_exists("mb_strpos") ) {
+if (!function_exists("mb_strpos")) {
   function mb_strpos($haystack, $needle, $offset = 0) {
     return strpos($haystack, $needle, $offset);
   }
 }
 
-if ( !function_exists("mb_strrpos") ) {
+if (!function_exists("mb_strrpos")) {
   function mb_strrpos($haystack, $needle, $offset = 0) {
     return strrpos($haystack, $needle, $offset);
   }
 }
 
-if ( !function_exists("mb_strtolower") ) {
+if (!function_exists("mb_strtolower")) {
   function mb_strtolower($str) {
     return strtolower($str);
   }
 }
 
-if ( !function_exists("mb_strtoupper") ) {
+if (!function_exists("mb_strtoupper")) {
   function mb_strtoupper($str) {
     return strtoupper($str);
   }
 }
 
-if ( !function_exists("mb_substr") ) {
-  function mb_substr($str, $start, $length=null, $encoding='iso-8859-1') {
-    if ( is_null($length) )
+if (!function_exists("mb_substr")) {
+  function mb_substr($str, $start, $length = null, $encoding = 'iso-8859-1') {
+    if (is_null($length))
       return substr($str, $start);
     else
       return substr($str, $start, $length);
   }
 }
 
-if ( !function_exists("mb_substr_count") ) {
+if (!function_exists("mb_substr_count")) {
   function mb_substr_count($haystack, $needle) {
     return substr_count($haystack, $needle);
   }
@@ -402,14 +402,14 @@ 
  */
 function record_warnings($errno, $errstr, $errfile, $errline) {
 
-  if ( !($errno & (E_WARNING | E_NOTICE | E_USER_NOTICE | E_USER_WARNING )) ) // Not a warning or notice
-    throw new DOMPDF_Exception($errstr . " $errno");
+  if (!($errno & (E_WARNING | E_NOTICE | E_USER_NOTICE | E_USER_WARNING))) // Not a warning or notice
+    throw new DOMPDF_Exception($errstr." $errno");
 
   global $_dompdf_warnings;
   global $_dompdf_show_warnings;
 
-  if ( $_dompdf_show_warnings )
-    echo $errstr . "\n";
+  if ($_dompdf_show_warnings)
+    echo $errstr."\n";
 
   $_dompdf_warnings[] = $errstr;
 }
@@ -425,14 +425,14 @@ 
 
   $i = 0;
   foreach ($bt as $call) {
-    $file = basename($call["file"]) . " (" . $call["line"] . ")";
-    if ( isset($call["class"]) ) {
-      $func = $call["class"] . "->" . $call["function"] . "()";
+    $file = basename($call["file"])." (".$call["line"].")";
+    if (isset($call["class"])) {
+      $func = $call["class"]."->".$call["function"]."()";
     } else {
-      $func = $call["function"] . "()";
+      $func = $call["function"]."()";
     }
 
-    echo "#" . str_pad($i, 2, " ", STR_PAD_RIGHT) . ": " . str_pad($file.":", 42) . " $func\n";
+    echo "#".str_pad($i, 2, " ", STR_PAD_RIGHT).": ".str_pad($file.":", 42)." $func\n";
     $i++;
   }
   echo "\n";
@@ -447,10 +447,10 @@ 
   global $_DOMPDF_DEBUG_TYPES;
   global $_dompdf_show_warnings;
   global $_dompdf_debug;
-  if ( isset($_DOMPDF_DEBUG_TYPES[$type]) && ($_dompdf_show_warnings || $_dompdf_debug) ) {
+  if (isset($_DOMPDF_DEBUG_TYPES[$type]) && ($_dompdf_show_warnings || $_dompdf_debug)) {
     $arr = debug_backtrace();
 
-    echo basename($arr[0]["file"]) . " (" . $arr[0]["line"] ."): " . $arr[1]["function"] . ": ";
+    echo basename($arr[0]["file"])." (".$arr[0]["line"]."): ".$arr[1]["function"].": ";
     pre_r($msg);
   }
 }
@@ -458,29 +458,29 @@ 
 /**
  * Dump memory usage
  */
-if ( !function_exists("print_memusage") ) {
+if (!function_exists("print_memusage")) {
 function print_memusage() {
   global $memusage;
   echo ("Memory Usage\n");
   $prev = 0;
   $initial = reset($memusage);
-  echo (str_pad("Initial:", 40) . $initial . "\n\n");
+  echo (str_pad("Initial:", 40).$initial."\n\n");
 
   foreach ($memusage as $key=>$mem) {
     $mem -= $initial;
-    echo (str_pad("$key:" , 40));
-    echo (str_pad("$mem", 12) . "(diff: " . ($mem - $prev) . ")\n");
+    echo (str_pad("$key:", 40));
+    echo (str_pad("$mem", 12)."(diff: ".($mem - $prev).")\n");
     $prev = $mem;
   }
 
-  echo ("\n" . str_pad("Total:", 40) . memory_get_usage()) . "\n";
+  echo ("\n".str_pad("Total:", 40).memory_get_usage())."\n";
 }
 }
 
 /**
  * Initialize memory profiling code
  */
-if ( !function_exists("enable_mem_profile") ) {
+if (!function_exists("enable_mem_profile")) {
 function enable_mem_profile() {
     global $memusage;
     $memusage = array("Startup" => memory_get_usage());
@@ -493,10 +493,10 @@ 
  *
  * @param string $location a meaningful location
  */
-if ( !function_exists("mark_memusage") ) {
+if (!function_exists("mark_memusage")) {
 function mark_memusage($location) {
   global $memusage;
-  if ( isset($memusage) )
+  if (isset($memusage))
     $memusage[$location] = memory_get_usage();
 }
 }
@@ -506,12 +506,12 @@ 
  *
  * @link http://us.php.net/manual/en/function.sys-get-temp-dir.php#85261
  */
-if ( !function_exists('sys_get_temp_dir')) {
+if (!function_exists('sys_get_temp_dir')) {
   function sys_get_temp_dir() {
     if (!empty($_ENV['TMP'])) { return realpath($_ENV['TMP']); }
-    if (!empty($_ENV['TMPDIR'])) { return realpath( $_ENV['TMPDIR']); }
-    if (!empty($_ENV['TEMP'])) { return realpath( $_ENV['TEMP']); }
-    $tempfile=tempnam(uniqid(rand(),TRUE),'');
+    if (!empty($_ENV['TMPDIR'])) { return realpath($_ENV['TMPDIR']); }
+    if (!empty($_ENV['TEMP'])) { return realpath($_ENV['TEMP']); }
+    $tempfile = tempnam(uniqid(rand(), TRUE), '');
     if (file_exists($tempfile)) {
     unlink($tempfile);
     return realpath(dirname($tempfile));

Braces +63 added lines, -42 removed lines

@@ -63,17 +63,20 @@ 
  */
 if ( !function_exists("pre_r") ) {
 function pre_r($mixed, $return = false) {
-  if ($return)
-    return "<pre>" . print_r($mixed, true) . "</pre>";
+  if ($return) {
+      return "<pre>" . print_r($mixed, true) . "</pre>";
+  }
 
-  if ( php_sapi_name() !== "cli")
-    echo ("<pre>");
+  if ( php_sapi_name() !== "cli") {
+      echo ("<pre>");
+  }
   print_r($mixed);
 
-  if ( php_sapi_name() !== "cli")
-    echo("</pre>");
-  else
-    echo ("\n");
+  if ( php_sapi_name() !== "cli") {
+      echo("</pre>");
+  } else {
+      echo ("\n");
+  }
   flush();
 
 }
@@ -89,12 +92,14 @@ 
  */
 if ( !function_exists("pre_var_dump") ) {
 function pre_var_dump($mixed) {
-  if ( php_sapi_name() !== "cli")
-    echo("<pre>");
+  if ( php_sapi_name() !== "cli") {
+      echo("<pre>");
+  }
   var_dump($mixed);
-  if ( php_sapi_name() !== "cli")
-    echo("</pre>");
-}
+  if ( php_sapi_name() !== "cli") {
+      echo("</pre>");
+  }
+  }
 }
 
 /**
@@ -121,8 +126,9 @@ 
   }
 
   // Is the url already fully qualified?
-  if ( mb_strpos($url, "://") !== false )
-    return $url;
+  if ( mb_strpos($url, "://") !== false ) {
+      return $url;
+  }
 
   $ret = $protocol;
 
@@ -170,24 +176,29 @@ 
 
   if ( isset($arr["scheme"]) &&
        $arr["scheme"] !== "file" &&
-       mb_strlen($arr["scheme"]) > 1 ) // Exclude windows drive letters...
+       mb_strlen($arr["scheme"]) > 1 ) {
+      // Exclude windows drive letters...
     {
     $protocol = $arr["scheme"] . "://";
+  }
 
     if ( isset($arr["user"]) ) {
       $host .= $arr["user"];
 
-      if ( isset($arr["pass"]) )
-        $host .= "@" . $arr["pass"];
+      if ( isset($arr["pass"]) ) {
+              $host .= "@" . $arr["pass"];
+      }
 
       $host .= ":";
     }
 
-    if ( isset($arr["host"]) )
-      $host .= $arr["host"];
+    if ( isset($arr["host"]) ) {
+          $host .= $arr["host"];
+    }
 
-    if ( isset($arr["port"]) )
-      $host .= ":" . $arr["port"];
+    if ( isset($arr["port"]) ) {
+          $host .= ":" . $arr["port"];
+    }
 
     if ( isset($arr["path"]) && $arr["path"] !== "" ) {
       // Do we have a trailing slash?
@@ -200,17 +211,20 @@ 
       }
     }
 
-    if ( isset($arr["query"]) )
-      $file .= "?" . $arr["query"];
+    if ( isset($arr["query"]) ) {
+          $file .= "?" . $arr["query"];
+    }
 
-    if ( isset($arr["fragment"]) )
-      $file .= "#" . $arr["fragment"];
+    if ( isset($arr["fragment"]) ) {
+          $file .= "#" . $arr["fragment"];
+    }
 
   } else {
 
     $i = mb_strpos($url, "file://");
-    if ( $i !== false)
-      $url = mb_substr($url, $i + 7);
+    if ( $i !== false) {
+          $url = mb_substr($url, $i + 7);
+    }
 
     $protocol = ""; // "file://"; ? why doesn't this work... It's because of
                     // network filenames like //COMPU/SHARENAME
@@ -262,11 +276,13 @@ 
                        "dc", "dcc", "dccc", "cm");
   static $thou = array("", "m", "mm", "mmm");
 
-  if ( !is_numeric($num) )
-    throw new DOMPDF_Exception("dec2roman() requires a numeric argument.");
+  if ( !is_numeric($num) ) {
+      throw new DOMPDF_Exception("dec2roman() requires a numeric argument.");
+  }
 
-  if ( $num > 4000 || $num < 0 )
-    return "(out of range)";
+  if ( $num > 4000 || $num < 0 ) {
+      return "(out of range)";
+  }
 
   $num = strrev((string)$num);
 
@@ -372,10 +388,11 @@ 
 
 if ( !function_exists("mb_substr") ) {
   function mb_substr($str, $start, $length=null, $encoding='iso-8859-1') {
-    if ( is_null($length) )
-      return substr($str, $start);
-    else
-      return substr($str, $start, $length);
+    if ( is_null($length) ) {
+          return substr($str, $start);
+    } else {
+          return substr($str, $start, $length);
+    }
   }
 }
 
@@ -402,14 +419,17 @@ 
  */
 function record_warnings($errno, $errstr, $errfile, $errline) {
 
-  if ( !($errno & (E_WARNING | E_NOTICE | E_USER_NOTICE | E_USER_WARNING )) ) // Not a warning or notice
+  if ( !($errno & (E_WARNING | E_NOTICE | E_USER_NOTICE | E_USER_WARNING )) ) {
+      // Not a warning or notice
     throw new DOMPDF_Exception($errstr . " $errno");
+  }
 
   global $_dompdf_warnings;
   global $_dompdf_show_warnings;
 
-  if ( $_dompdf_show_warnings )
-    echo $errstr . "\n";
+  if ( $_dompdf_show_warnings ) {
+      echo $errstr . "\n";
+  }
 
   $_dompdf_warnings[] = $errstr;
 }
@@ -496,9 +516,10 @@ 
 if ( !function_exists("mark_memusage") ) {
 function mark_memusage($location) {
   global $memusage;
-  if ( isset($memusage) )
-    $memusage[$location] = memory_get_usage();
-}
+  if ( isset($memusage) ) {
+      $memusage[$location] = memory_get_usage();
+  }
+  }
 }
 
 /**

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

Doc Comments +4 added lines, -4 removed lines

@@ -96,7 +96,7 @@ 
    *
    * @param mixed  $size         The size of image to create: array(x1,y1,x2,y2) or "letter", "legal", etc.
    * @param string $orientation  The orientation of the document (either 'landscape' or 'portrait')
-   * @param float  $aa_factor    Anti-aliasing factor, 1 for no AA
+   * @param integer  $aa_factor    Anti-aliasing factor, 1 for no AA
    * @param array  $bg_color     Image background color: array(r,g,b,a), 0 <= r,g,b,a <= 1
    */
   function __construct($size, $orientation = "portrait", $aa_factor = 1, $bg_color = array(1,1,1,0) ) {
@@ -536,8 +536,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 Text angle
+   * @param integer $adjust word spacing adjustment
+   * @param integer $angle Text angle
    */
   function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
 
@@ -590,7 +590,7 @@ 
    * @param string $text the text to be sized
    * @param string $font the desired font
    * @param float  $size the desired font size
-   * @param float  $spacing word spacing, if any
+   * @param integer  $spacing word spacing, if any
    * @return float
    */
   function get_text_width($text, $font, $size, $spacing = 0) {    

Switch Indentation +35 added lines, -35 removed lines

@@ -489,21 +489,21 @@ 
   function image($img_url, $img_type, $x, $y, $w, $h) {
 
     switch ($img_type) {
-    case "png":
-      $src = @imagecreatefrompng($img_url);
-      break;
+        case "png":
+          $src = @imagecreatefrompng($img_url);
+          break;
       
-    case "gif":
-      $src = @imagecreatefromgif($img_url);
-      break;
+        case "gif":
+          $src = @imagecreatefromgif($img_url);
+          break;
       
-    case "jpg":
-    case "jpeg":
-      $src = @imagecreatefromjpeg($img_url);
-      break;
+        case "jpg":
+        case "jpeg":
+          $src = @imagecreatefromjpeg($img_url);
+          break;
 
-    default:
-      break;
+        default:
+          break;
       
     }
 
@@ -658,20 +658,20 @@ 
     
     switch ($type) {
 
-    case "jpg":
-    case "jpeg":
-      if ( !isset($options["quality"]) )
-        $options["quality"] = 75;
+        case "jpg":
+        case "jpeg":
+          if ( !isset($options["quality"]) )
+            $options["quality"] = 75;
       
-      header("Content-type: image/jpeg");
-      imagejpeg($dst, '', $options["quality"]);
-      break;
-
-    case "png":
-    default:
-      header("Content-type: image/png");
-      imagepng($dst);
-      break;
+          header("Content-type: image/jpeg");
+          imagejpeg($dst, '', $options["quality"]);
+          break;
+
+        case "png":
+        default:
+          header("Content-type: image/png");
+          imagepng($dst);
+          break;
     }
 
     if ( $this->_aa_factor != 1 ) 
@@ -706,18 +706,18 @@ 
 
     switch ($type) {
 
-    case "jpg":
-    case "jpeg":
-      if ( !isset($options["quality"]) )
-        $options["quality"] = 75;
+        case "jpg":
+        case "jpeg":
+          if ( !isset($options["quality"]) )
+            $options["quality"] = 75;
       
-      imagejpeg($dst, '', $options["quality"]);
-      break;
+          imagejpeg($dst, '', $options["quality"]);
+          break;
 
-    case "png":
-    default:
-      imagepng($dst);
-      break;
+        case "png":
+        default:
+          imagepng($dst);
+          break;
     }
 
     $image = ob_get_contents();

Spacing +34 added lines, -34 removed lines

@@ -99,22 +99,22 @@ 
    * @param float  $aa_factor    Anti-aliasing factor, 1 for no AA
    * @param array  $bg_color     Image background color: array(r,g,b,a), 0 <= r,g,b,a <= 1
    */
-  function __construct($size, $orientation = "portrait", $aa_factor = 1, $bg_color = array(1,1,1,0) ) {
+  function __construct($size, $orientation = "portrait", $aa_factor = 1, $bg_color = array(1, 1, 1, 0)) {
 
-    if ( !is_array($size) ) {
+    if (!is_array($size)) {
 
-      if ( isset(CPDF_Adapter::$PAPER_SIZES[ strtolower($size)]) ) 
+      if (isset(CPDF_Adapter::$PAPER_SIZES[strtolower($size)])) 
         $size = CPDF_Adapter::$PAPER_SIZES[$size];
       else
         $size = CPDF_Adapter::$PAPER_SIZES["letter"];
     
     }
 
-    if ( strtolower($orientation) === "landscape" ) {
-      list($size[2],$size[3]) = array($size[3],$size[2]);
+    if (strtolower($orientation) === "landscape") {
+      list($size[2], $size[3]) = array($size[3], $size[2]);
     }
 
-    if ( $aa_factor < 1 )
+    if ($aa_factor < 1)
       $aa_factor = 1;
 
     $this->_aa_factor = $aa_factor;
@@ -127,9 +127,9 @@ 
 
     $this->_img = imagecreatetruecolor($this->_width, $this->_height);
 
-    if ( is_null($bg_color) || !is_array($bg_color) ) {
+    if (is_null($bg_color) || !is_array($bg_color)) {
       // Pure white bg
-      $bg_color = array(1,1,1,0);
+      $bg_color = array(1, 1, 1, 0);
     }
 
     $this->_bg_color = $this->_allocate_color($bg_color);
@@ -197,10 +197,10 @@ 
   private function _allocate_color($color) {
     
     // Full opacity if no alpha set
-    if ( !isset($color[3]) ) 
+    if (!isset($color[3])) 
       $color[3] = 0;
     
-    list($r,$g,$b,$a) = $color;
+    list($r, $g, $b, $a) = $color;
     
     $r *= 255;
     $g *= 255;
@@ -220,10 +220,10 @@ 
       
     $key = sprintf("#%02X%02X%02X%02X", $r, $g, $b, $a);
       
-    if ( isset($this->_colors[$key]) )
+    if (isset($this->_colors[$key]))
       return $this->_colors[$key];
 
-    if ( $a != 0 ) 
+    if ($a != 0) 
       $this->_colors[$key] = imagecolorallocatealpha($this->_img, $r, $g, $b, $a);
     else
       $this->_colors[$key] = imagecolorallocate($this->_img, $r, $g, $b);
@@ -259,10 +259,10 @@ 
     $c = $this->_allocate_color($color);
 
     // Convert the style array if required
-    if ( !is_null($style) ) {
+    if (!is_null($style)) {
       $gd_style = array();
 
-      if ( count($style) == 1 ) {
+      if (count($style) == 1) {
         for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) {
           $gd_style[] = $c;
         }
@@ -276,7 +276,7 @@ 
         $i = 0;
         foreach ($style as $length) {
 
-          if ( $i % 2 == 0 ) {
+          if ($i % 2 == 0) {
             // 'On' pattern
             for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) 
               $gd_style[] = $c;
@@ -327,7 +327,7 @@ 
     $c = $this->_allocate_color($color);
 
     // Convert the style array if required
-    if ( !is_null($style) ) {
+    if (!is_null($style)) {
       $gd_style = array();
 
       foreach ($style as $length) {
@@ -404,7 +404,7 @@ 
     $c = $this->_allocate_color($color);
 
     // Convert the style array if required
-    if ( !is_null($style) && !$fill ) {
+    if (!is_null($style) && !$fill) {
       $gd_style = array();
 
       foreach ($style as $length) {
@@ -419,7 +419,7 @@ 
 
     imagesetthickness($this->_img, $width);
 
-    if ( $fill ) 
+    if ($fill) 
       imagefilledpolygon($this->_img, $points, count($points) / 2, $c);
     else
       imagepolygon($this->_img, $points, count($points) / 2, $c);
@@ -451,7 +451,7 @@ 
     $c = $this->_allocate_color($color);
 
     // Convert the style array if required
-    if ( !is_null($style) && !$fill ) {
+    if (!is_null($style) && !$fill) {
       $gd_style = array();
 
       foreach ($style as $length) {
@@ -466,7 +466,7 @@ 
 
     imagesetthickness($this->_img, $width);
 
-    if ( $fill )
+    if ($fill)
       imagefilledellipse($this->_img, $x, $y, $r, $r, $c);
     else
       imageellipse($this->_img, $x, $y, $r, $r, $c);
@@ -507,7 +507,7 @@ 
       
     }
 
-    if ( !$src )
+    if (!$src)
       return; // Probably should add to $_dompdf_errors or whatever here
     
     // Scale by the AA factor
@@ -539,7 +539,7 @@ 
    * @param float $adjust word spacing adjustment
    * @param float $angle Text angle
    */
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
+  function text($x, $y, $text, $font, $size, $color = array(0, 0, 0), $adjust = 0, $angle = 0) {
 
     // Scale by the AA factor
     $x *= $this->_aa_factor;
@@ -550,7 +550,7 @@ 
     
     $c = $this->_allocate_color($color);
 
-    if ( strpos($font, '.ttf') === false )
+    if (strpos($font, '.ttf') === false)
       $font .= ".ttf";
 
     // FIXME: word spacing
@@ -595,7 +595,7 @@ 
    */
   function get_text_width($text, $font, $size, $spacing = 0) {    
 
-    if ( strpos($font, '.ttf') === false )
+    if (strpos($font, '.ttf') === false)
       $font .= ".ttf";
 
     // FIXME: word spacing
@@ -611,11 +611,11 @@ 
    * @return float
    */
   function get_font_height($font, $size) {
-    if ( strpos($font, '.ttf') === false )
+    if (strpos($font, '.ttf') === false)
       $font .= ".ttf";
 
     // FIXME: word spacing
-    list(,$y2,,,,$y1) = imagettfbbox($size, 0, $font, "MXjpqytfhl");  // Test string with ascenders, descenders and caps
+    list(,$y2,,,,$y1) = imagettfbbox($size, 0, $font, "MXjpqytfhl"); // Test string with ascenders, descenders and caps
     return $y2 - $y1;
   }
 
@@ -638,7 +638,7 @@ 
   function stream($filename, $options = null) {
 
     // Perform any antialiasing
-    if ( $this->_aa_factor != 1 ) {
+    if ($this->_aa_factor != 1) {
       $dst_w = $this->_width / $this->_aa_factor;
       $dst_h = $this->_height / $this->_aa_factor;
       $dst = imagecreatetruecolor($dst_w, $dst_h);
@@ -649,7 +649,7 @@ 
       $dst = $this->_img;
     }
 
-    if ( !isset($options["type"]) )
+    if (!isset($options["type"]))
       $options["type"] = "png";
 
     $type = strtolower($options["type"]);
@@ -660,7 +660,7 @@ 
 
     case "jpg":
     case "jpeg":
-      if ( !isset($options["quality"]) )
+      if (!isset($options["quality"]))
         $options["quality"] = 75;
       
       header("Content-type: image/jpeg");
@@ -674,7 +674,7 @@ 
       break;
     }
 
-    if ( $this->_aa_factor != 1 ) 
+    if ($this->_aa_factor != 1) 
       imagedestroy($dst);
   }
 
@@ -686,7 +686,7 @@ 
    */
   function output($options = null) {
 
-    if ( $this->_aa_factor != 1 ) {
+    if ($this->_aa_factor != 1) {
       $dst_w = $this->_width / $this->_aa_factor;
       $dst_h = $this->_height / $this->_aa_factor;
       $dst = imagecreatetruecolor($dst_w, $dst_h);
@@ -697,7 +697,7 @@ 
       $dst = $this->_img;
     }
     
-    if ( !isset($options["type"]) )
+    if (!isset($options["type"]))
       $options["type"] = "png";
 
     $type = $options["type"];
@@ -708,7 +708,7 @@ 
 
     case "jpg":
     case "jpeg":
-      if ( !isset($options["quality"]) )
+      if (!isset($options["quality"]))
         $options["quality"] = 75;
       
       imagejpeg($dst, '', $options["quality"]);
@@ -723,7 +723,7 @@ 
     $image = ob_get_contents();
     ob_end_clean();
 
-    if ( $this->_aa_factor != 1 )
+    if ($this->_aa_factor != 1)
       imagedestroy($dst);
     
     return $image;

Braces +69 added lines, -48 removed lines

@@ -103,10 +103,11 @@ 
 
     if ( !is_array($size) ) {
 
-      if ( isset(CPDF_Adapter::$PAPER_SIZES[ strtolower($size)]) ) 
-        $size = CPDF_Adapter::$PAPER_SIZES[$size];
-      else
-        $size = CPDF_Adapter::$PAPER_SIZES["letter"];
+      if ( isset(CPDF_Adapter::$PAPER_SIZES[ strtolower($size)]) ) {
+              $size = CPDF_Adapter::$PAPER_SIZES[$size];
+      } else {
+              $size = CPDF_Adapter::$PAPER_SIZES["letter"];
+      }
     
     }
 
@@ -114,8 +115,9 @@ 
       list($size[2],$size[3]) = array($size[3],$size[2]);
     }
 
-    if ( $aa_factor < 1 )
-      $aa_factor = 1;
+    if ( $aa_factor < 1 ) {
+          $aa_factor = 1;
+    }
 
     $this->_aa_factor = $aa_factor;
     
@@ -197,8 +199,9 @@ 
   private function _allocate_color($color) {
     
     // Full opacity if no alpha set
-    if ( !isset($color[3]) ) 
-      $color[3] = 0;
+    if ( !isset($color[3]) ) {
+          $color[3] = 0;
+    }
     
     list($r,$g,$b,$a) = $color;
     
@@ -220,13 +223,15 @@ 
       
     $key = sprintf("#%02X%02X%02X%02X", $r, $g, $b, $a);
       
-    if ( isset($this->_colors[$key]) )
-      return $this->_colors[$key];
+    if ( isset($this->_colors[$key]) ) {
+          return $this->_colors[$key];
+    }
 
-    if ( $a != 0 ) 
-      $this->_colors[$key] = imagecolorallocatealpha($this->_img, $r, $g, $b, $a);
-    else
-      $this->_colors[$key] = imagecolorallocate($this->_img, $r, $g, $b);
+    if ( $a != 0 ) {
+          $this->_colors[$key] = imagecolorallocatealpha($this->_img, $r, $g, $b, $a);
+    } else {
+          $this->_colors[$key] = imagecolorallocate($this->_img, $r, $g, $b);
+    }
       
     return $this->_colors[$key];
     
@@ -278,13 +283,15 @@ 
 
           if ( $i % 2 == 0 ) {
             // 'On' pattern
-            for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) 
-              $gd_style[] = $c;
+            for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) {
+                          $gd_style[] = $c;
+            }
             
           } else {
             // Off pattern
-            for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) 
-              $gd_style[] = $this->_bg_color;
+            for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) {
+                          $gd_style[] = $this->_bg_color;
+            }
             
           }
           $i++;
@@ -398,8 +405,9 @@ 
   function polygon($points, $color, $width = null, $style = null, $fill = false) {
 
     // Scale each point by the AA factor
-    foreach (array_keys($points) as $i)
-      $points[$i] *= $this->_aa_factor;
+    foreach (array_keys($points) as $i) {
+          $points[$i] *= $this->_aa_factor;
+    }
 
     $c = $this->_allocate_color($color);
 
@@ -419,10 +427,11 @@ 
 
     imagesetthickness($this->_img, $width);
 
-    if ( $fill ) 
-      imagefilledpolygon($this->_img, $points, count($points) / 2, $c);
-    else
-      imagepolygon($this->_img, $points, count($points) / 2, $c);
+    if ( $fill ) {
+          imagefilledpolygon($this->_img, $points, count($points) / 2, $c);
+    } else {
+          imagepolygon($this->_img, $points, count($points) / 2, $c);
+    }
         
   }
 
@@ -466,10 +475,11 @@ 
 
     imagesetthickness($this->_img, $width);
 
-    if ( $fill )
-      imagefilledellipse($this->_img, $x, $y, $r, $r, $c);
-    else
-      imageellipse($this->_img, $x, $y, $r, $r, $c);
+    if ( $fill ) {
+          imagefilledellipse($this->_img, $x, $y, $r, $r, $c);
+    } else {
+          imageellipse($this->_img, $x, $y, $r, $r, $c);
+    }
         
   }
 
@@ -507,8 +517,10 @@ 
       
     }
 
-    if ( !$src )
-      return; // Probably should add to $_dompdf_errors or whatever here
+    if ( !$src ) {
+          return;
+    }
+    // Probably should add to $_dompdf_errors or whatever here
     
     // Scale by the AA factor
     $x *= $this->_aa_factor;
@@ -550,8 +562,9 @@ 
     
     $c = $this->_allocate_color($color);
 
-    if ( strpos($font, '.ttf') === false )
-      $font .= ".ttf";
+    if ( strpos($font, '.ttf') === false ) {
+          $font .= ".ttf";
+    }
 
     // FIXME: word spacing
     imagettftext($this->_img, $size, $angle, $x, $y + $h, $c, $font, $text);
@@ -595,8 +608,9 @@ 
    */
   function get_text_width($text, $font, $size, $spacing = 0) {    
 
-    if ( strpos($font, '.ttf') === false )
-      $font .= ".ttf";
+    if ( strpos($font, '.ttf') === false ) {
+          $font .= ".ttf";
+    }
 
     // FIXME: word spacing
     list($x1,,$x2) = imagettfbbox($size, 0, $font, $text);
@@ -611,8 +625,9 @@ 
    * @return float
    */
   function get_font_height($font, $size) {
-    if ( strpos($font, '.ttf') === false )
-      $font .= ".ttf";
+    if ( strpos($font, '.ttf') === false ) {
+          $font .= ".ttf";
+    }
 
     // FIXME: word spacing
     list(,$y2,,,,$y1) = imagettfbbox($size, 0, $font, "MXjpqytfhl");  // Test string with ascenders, descenders and caps
@@ -649,8 +664,9 @@ 
       $dst = $this->_img;
     }
 
-    if ( !isset($options["type"]) )
-      $options["type"] = "png";
+    if ( !isset($options["type"]) ) {
+          $options["type"] = "png";
+    }
 
     $type = strtolower($options["type"]);
     
@@ -660,8 +676,9 @@ 
 
     case "jpg":
     case "jpeg":
-      if ( !isset($options["quality"]) )
-        $options["quality"] = 75;
+      if ( !isset($options["quality"]) ) {
+              $options["quality"] = 75;
+      }
       
       header("Content-type: image/jpeg");
       imagejpeg($dst, '', $options["quality"]);
@@ -674,8 +691,9 @@ 
       break;
     }
 
-    if ( $this->_aa_factor != 1 ) 
-      imagedestroy($dst);
+    if ( $this->_aa_factor != 1 ) {
+          imagedestroy($dst);
+    }
   }
 
   /**
@@ -697,8 +715,9 @@ 
       $dst = $this->_img;
     }
     
-    if ( !isset($options["type"]) )
-      $options["type"] = "png";
+    if ( !isset($options["type"]) ) {
+          $options["type"] = "png";
+    }
 
     $type = $options["type"];
     
@@ -708,8 +727,9 @@ 
 
     case "jpg":
     case "jpeg":
-      if ( !isset($options["quality"]) )
-        $options["quality"] = 75;
+      if ( !isset($options["quality"]) ) {
+              $options["quality"] = 75;
+      }
       
       imagejpeg($dst, '', $options["quality"]);
       break;
@@ -723,8 +743,9 @@ 
     $image = ob_get_contents();
     ob_end_clean();
 
-    if ( $this->_aa_factor != 1 )
-      imagedestroy($dst);
+    if ( $this->_aa_factor != 1 ) {
+          imagedestroy($dst);
+    }
     
     return $image;
   }

Indentation +413 added lines, -414 removed lines

@@ -1,41 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: gd_adapter.cls.php,v $
- * Created on: 2004-06-06
- *
- * 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: gd_adapter.cls.php,v $
+     * Created on: 2004-06-06
+     *
+     * 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: gd_adapter.cls.php 217 2010-03-11 23:03:57Z ryan.masten $ */
 
@@ -49,73 +48,73 @@ 
  */
 class GD_Adapter implements Canvas {
 
-  /**
-   * Resoure handle for the image
-   *
-   * @var resource
-   */
-  private $_img;
-
-  /**
-   * Image width in pixels
-   *
-   * @var int
-   */
-  private $_width;
-
-  /**
-   * Image height in pixels
-   *
-   * @var int
-   */
-  private $_height;
-
-  /**
-   * Image antialias factor
-   *
-   * @var float
-   */
-  private $_aa_factor;
-
-  /**
-   * Allocated colors
-   *
-   * @var array
-   */
-  private $_colors;
-
-  /**
-   * Background color
-   *
-   * @var int
-   */
-  private $_bg_color;
+    /**
+     * Resoure handle for the image
+     *
+     * @var resource
+     */
+    private $_img;
+
+    /**
+     * Image width in pixels
+     *
+     * @var int
+     */
+    private $_width;
+
+    /**
+     * Image height in pixels
+     *
+     * @var int
+     */
+    private $_height;
+
+    /**
+     * Image antialias factor
+     *
+     * @var float
+     */
+    private $_aa_factor;
+
+    /**
+     * Allocated colors
+     *
+     * @var array
+     */
+    private $_colors;
+
+    /**
+     * Background color
+     *
+     * @var int
+     */
+    private $_bg_color;
   
-  /**
-   * Class constructor
-   *
-   * @param mixed  $size         The size of image to create: array(x1,y1,x2,y2) or "letter", "legal", etc.
-   * @param string $orientation  The orientation of the document (either 'landscape' or 'portrait')
-   * @param float  $aa_factor    Anti-aliasing factor, 1 for no AA
-   * @param array  $bg_color     Image background color: array(r,g,b,a), 0 <= r,g,b,a <= 1
-   */
-  function __construct($size, $orientation = "portrait", $aa_factor = 1, $bg_color = array(1,1,1,0) ) {
+    /**
+     * Class constructor
+     *
+     * @param mixed  $size         The size of image to create: array(x1,y1,x2,y2) or "letter", "legal", etc.
+     * @param string $orientation  The orientation of the document (either 'landscape' or 'portrait')
+     * @param float  $aa_factor    Anti-aliasing factor, 1 for no AA
+     * @param array  $bg_color     Image background color: array(r,g,b,a), 0 <= r,g,b,a <= 1
+     */
+    function __construct($size, $orientation = "portrait", $aa_factor = 1, $bg_color = array(1,1,1,0) ) {
 
     if ( !is_array($size) ) {
 
-      if ( isset(CPDF_Adapter::$PAPER_SIZES[ strtolower($size)]) ) 
+        if ( isset(CPDF_Adapter::$PAPER_SIZES[ strtolower($size)]) ) 
         $size = CPDF_Adapter::$PAPER_SIZES[$size];
-      else
+        else
         $size = CPDF_Adapter::$PAPER_SIZES["letter"];
     
     }
 
     if ( strtolower($orientation) === "landscape" ) {
-      list($size[2],$size[3]) = array($size[3],$size[2]);
+        list($size[2],$size[3]) = array($size[3],$size[2]);
     }
 
     if ( $aa_factor < 1 )
-      $aa_factor = 1;
+        $aa_factor = 1;
 
     $this->_aa_factor = $aa_factor;
     
@@ -128,8 +127,8 @@ 
     $this->_img = imagecreatetruecolor($this->_width, $this->_height);
 
     if ( is_null($bg_color) || !is_array($bg_color) ) {
-      // Pure white bg
-      $bg_color = array(1,1,1,0);
+        // Pure white bg
+        $bg_color = array(1,1,1,0);
     }
 
     $this->_bg_color = $this->_allocate_color($bg_color);
@@ -137,68 +136,68 @@ 
     imagesavealpha($this->_img, true);
     imagefill($this->_img, 0, 0, $this->_bg_color);
         
-  }
-
-  /**
-   * Return the GF image resource
-   *
-   * @return resource
-   */
-  function get_image() { return $this->_img; }
-
-  /**
-   * Return the image's width in pixels
-   *
-   * @return float
-   */
-  function get_width() { return $this->_width / $this->_aa_factor; }
-
-  /**
-   * Return the image's height in pixels
-   *
-   * @return float
-   */
-  function get_height() { return $this->_height / $this->_aa_factor; }
+    }
+
+    /**
+     * Return the GF image resource
+     *
+     * @return resource
+     */
+    function get_image() { return $this->_img; }
+
+    /**
+     * Return the image's width in pixels
+     *
+     * @return float
+     */
+    function get_width() { return $this->_width / $this->_aa_factor; }
+
+    /**
+     * Return the image's height in pixels
+     *
+     * @return float
+     */
+    function get_height() { return $this->_height / $this->_aa_factor; }
   
-  /**
-   * Returns the current page number
-   *
-   * @return int
-   */
-  function get_page_number() {
+    /**
+     * Returns the current page number
+     *
+     * @return int
+     */
+    function get_page_number() {
     // FIXME
-  }
+    }
    
-  /**
-   * Returns the total number of pages
-   *
-   * @return int
-   */
-  function get_page_count() {
+    /**
+     * Returns the total number of pages
+     *
+     * @return int
+     */
+    function get_page_count() {
     // FIXME
-  }    
-
-  /**
-   * Sets the total number of pages
-   *
-   * @param int $count
-   */
-  function set_page_count($count) {
+    }    
+
+    /**
+     * Sets the total number of pages
+     *
+     * @param int $count
+     */
+    function set_page_count($count) {
     // FIXME
-  }    
-
-  /**
-   * Allocate a new color.  Allocate with GD as needed and store
-   * previously allocated colors in $this->_colors.
-   *
-   * @param array $color  The new current color
-   * @return int           The allocated color
-   */
-  private function _allocate_color($color) {
+    }    
+
+    /**
+     * Allocate a new color.  Allocate with GD as needed and store
+     * previously allocated colors in $this->_colors.
+     *
+     * @param array $color  The new current color
+     * @return int           The allocated color
+     */
+    private function _allocate_color($color) {
     
     // Full opacity if no alpha set
     if ( !isset($color[3]) ) 
-      $color[3] = 0;
+        $color[3] = 0;
     
     list($r,$g,$b,$a) = $color;
     
@@ -221,33 +220,33 @@ 
     $key = sprintf("#%02X%02X%02X%02X", $r, $g, $b, $a);
       
     if ( isset($this->_colors[$key]) )
-      return $this->_colors[$key];
+        return $this->_colors[$key];
 
     if ( $a != 0 ) 
-      $this->_colors[$key] = imagecolorallocatealpha($this->_img, $r, $g, $b, $a);
+        $this->_colors[$key] = imagecolorallocatealpha($this->_img, $r, $g, $b, $a);
     else
-      $this->_colors[$key] = imagecolorallocate($this->_img, $r, $g, $b);
+        $this->_colors[$key] = imagecolorallocate($this->_img, $r, $g, $b);
       
     return $this->_colors[$key];
     
-  }
+    }
   
-  /**
-   * Draws a line from x1,y1 to x2,y2
-   *
-   * See {@link Style::munge_color()} for the format of the color array.
-   * See {@link Cpdf::setLineStyle()} for a description of the format of the
-   * $style parameter (aka dash).
-   *
-   * @param float $x1
-   * @param float $y1
-   * @param float $x2
-   * @param float $y2
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   */
-  function line($x1, $y1, $x2, $y2, $color, $width, $style = null) {
+    /**
+     * Draws a line from x1,y1 to x2,y2
+     *
+     * See {@link Style::munge_color()} for the format of the color array.
+     * See {@link Cpdf::setLineStyle()} for a description of the format of the
+     * $style parameter (aka dash).
+     *
+     * @param float $x1
+     * @param float $y1
+     * @param float $x2
+     * @param float $y2
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     */
+    function line($x1, $y1, $x2, $y2, $color, $width, $style = null) {
 
     // Scale by the AA factor
     $x1 *= $this->_aa_factor;
@@ -260,63 +259,63 @@ 
 
     // Convert the style array if required
     if ( !is_null($style) ) {
-      $gd_style = array();
+        $gd_style = array();
 
-      if ( count($style) == 1 ) {
+        if ( count($style) == 1 ) {
         for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) {
-          $gd_style[] = $c;
+            $gd_style[] = $c;
         }
 
         for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) {
-          $gd_style[] = $this->_bg_color;
+            $gd_style[] = $this->_bg_color;
         }
 
-      } else {
+        } else {
 
         $i = 0;
         foreach ($style as $length) {
 
-          if ( $i % 2 == 0 ) {
+            if ( $i % 2 == 0 ) {
             // 'On' pattern
             for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) 
-              $gd_style[] = $c;
+                $gd_style[] = $c;
             
-          } else {
+            } else {
             // Off pattern
             for ($i = 0; $i < $style[0] * $this->_aa_factor; $i++) 
-              $gd_style[] = $this->_bg_color;
+                $gd_style[] = $this->_bg_color;
             
-          }
-          $i++;
+            }
+            $i++;
+        }
         }
-      }
       
-      imagesetstyle($this->_img, $gd_style);
-      $c = IMG_COLOR_STYLED;
+        imagesetstyle($this->_img, $gd_style);
+        $c = IMG_COLOR_STYLED;
     }
     
     imagesetthickness($this->_img, $width);
 
     imageline($this->_img, $x1, $y1, $x2, $y2, $c);
     
-  }
-
-  /**
-   * Draws a rectangle at x1,y1 with width w and height h
-   *
-   * See {@link Style::munge_color()} for the format of the color array.
-   * See {@link Cpdf::setLineStyle()} for a description of the $style
-   * parameter (aka dash)
-   *
-   * @param float $x1
-   * @param float $y1
-   * @param float $w
-   * @param float $h
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   */   
-  function rectangle($x1, $y1, $w, $h, $color, $width, $style = null) {
+    }
+
+    /**
+     * Draws a rectangle at x1,y1 with width w and height h
+     *
+     * See {@link Style::munge_color()} for the format of the color array.
+     * See {@link Cpdf::setLineStyle()} for a description of the $style
+     * parameter (aka dash)
+     *
+     * @param float $x1
+     * @param float $y1
+     * @param float $w
+     * @param float $h
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     */   
+    function rectangle($x1, $y1, $w, $h, $color, $width, $style = null) {
 
     // Scale by the AA factor
     $x1 *= $this->_aa_factor;
@@ -328,36 +327,36 @@ 
 
     // Convert the style array if required
     if ( !is_null($style) ) {
-      $gd_style = array();
+        $gd_style = array();
 
-      foreach ($style as $length) {
+        foreach ($style as $length) {
         for ($i = 0; $i < $length; $i++) {
-          $gd_style[] = $c;
+            $gd_style[] = $c;
+        }
         }
-      }
 
-      imagesetstyle($this->_img, $gd_style);
-      $c = IMG_COLOR_STYLED;
+        imagesetstyle($this->_img, $gd_style);
+        $c = IMG_COLOR_STYLED;
     }
 
     imagesetthickness($this->_img, $width);
 
     imagerectangle($this->_img, $x1, $y1, $x1 + $w, $y1 + $h, $c);
     
-  }
-
-  /**
-   * Draws a filled rectangle at x1,y1 with width w and height h
-   *
-   * See {@link Style::munge_color()} for the format of the color array.
-   *
-   * @param float $x1
-   * @param float $y1
-   * @param float $w
-   * @param float $h
-   * @param array $color
-   */   
-  function filled_rectangle($x1, $y1, $w, $h, $color) {
+    }
+
+    /**
+     * Draws a filled rectangle at x1,y1 with width w and height h
+     *
+     * See {@link Style::munge_color()} for the format of the color array.
+     *
+     * @param float $x1
+     * @param float $y1
+     * @param float $w
+     * @param float $h
+     * @param array $color
+     */   
+    function filled_rectangle($x1, $y1, $w, $h, $color) {
 
     // Scale by the AA factor
     $x1 *= $this->_aa_factor;
@@ -369,79 +368,79 @@ 
 
     imagefilledrectangle($this->_img, $x1, $y1, $x1 + $w, $y1 + $h, $c);
 
-  }
-
-  /**
-   * Draws a polygon
-   *
-   * The polygon is formed by joining all the points stored in the $points
-   * array.  $points has the following structure:
-   * <code>
-   * array(0 => x1,
-   *       1 => y1,
-   *       2 => x2,
-   *       3 => y2,
-   *       ...
-   *       );
-   * </code>
-   *
-   * See {@link Style::munge_color()} for the format of the color array.
-   * See {@link Cpdf::setLineStyle()} for a description of the $style
-   * parameter (aka dash)   
-   *
-   * @param array $points
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   * @param bool  $fill  Fills the polygon if true
-   */
-  function polygon($points, $color, $width = null, $style = null, $fill = false) {
+    }
+
+    /**
+     * Draws a polygon
+     *
+     * The polygon is formed by joining all the points stored in the $points
+     * array.  $points has the following structure:
+     * <code>
+     * array(0 => x1,
+     *       1 => y1,
+     *       2 => x2,
+     *       3 => y2,
+     *       ...
+     *       );
+     * </code>
+     *
+     * See {@link Style::munge_color()} for the format of the color array.
+     * See {@link Cpdf::setLineStyle()} for a description of the $style
+     * parameter (aka dash)   
+     *
+     * @param array $points
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     * @param bool  $fill  Fills the polygon if true
+     */
+    function polygon($points, $color, $width = null, $style = null, $fill = false) {
 
     // Scale each point by the AA factor
     foreach (array_keys($points) as $i)
-      $points[$i] *= $this->_aa_factor;
+        $points[$i] *= $this->_aa_factor;
 
     $c = $this->_allocate_color($color);
 
     // Convert the style array if required
     if ( !is_null($style) && !$fill ) {
-      $gd_style = array();
+        $gd_style = array();
 
-      foreach ($style as $length) {
+        foreach ($style as $length) {
         for ($i = 0; $i < $length; $i++) {
-          $gd_style[] = $c;
+            $gd_style[] = $c;
+        }
         }
-      }
 
-      imagesetstyle($this->_img, $gd_style);
-      $c = IMG_COLOR_STYLED;
+        imagesetstyle($this->_img, $gd_style);
+        $c = IMG_COLOR_STYLED;
     }
 
     imagesetthickness($this->_img, $width);
 
     if ( $fill ) 
-      imagefilledpolygon($this->_img, $points, count($points) / 2, $c);
+        imagefilledpolygon($this->_img, $points, count($points) / 2, $c);
     else
-      imagepolygon($this->_img, $points, count($points) / 2, $c);
+        imagepolygon($this->_img, $points, count($points) / 2, $c);
         
-  }
-
-  /**
-   * Draws a circle at $x,$y with radius $r
-   *
-   * See {@link Style::munge_color()} for the format of the color array.
-   * See {@link Cpdf::setLineStyle()} for a description of the $style
-   * parameter (aka dash)
-   *
-   * @param float $x
-   * @param float $y
-   * @param float $r
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   * @param bool $fill Fills the circle if true   
-   */   
-  function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false) {
+    }
+
+    /**
+     * Draws a circle at $x,$y with radius $r
+     *
+     * See {@link Style::munge_color()} for the format of the color array.
+     * See {@link Cpdf::setLineStyle()} for a description of the $style
+     * parameter (aka dash)
+     *
+     * @param float $x
+     * @param float $y
+     * @param float $r
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     * @param bool $fill Fills the circle if true   
+     */   
+    function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false) {
 
     // Scale by the AA factor
     $x *= $this->_aa_factor;
@@ -452,55 +451,55 @@ 
 
     // Convert the style array if required
     if ( !is_null($style) && !$fill ) {
-      $gd_style = array();
+        $gd_style = array();
 
-      foreach ($style as $length) {
+        foreach ($style as $length) {
         for ($i = 0; $i < $length; $i++) {
-          $gd_style[] = $c;
+            $gd_style[] = $c;
+        }
         }
-      }
 
-      imagesetstyle($this->_img, $gd_style);
-      $c = IMG_COLOR_STYLED;
+        imagesetstyle($this->_img, $gd_style);
+        $c = IMG_COLOR_STYLED;
     }
 
     imagesetthickness($this->_img, $width);
 
     if ( $fill )
-      imagefilledellipse($this->_img, $x, $y, $r, $r, $c);
+        imagefilledellipse($this->_img, $x, $y, $r, $r, $c);
     else
-      imageellipse($this->_img, $x, $y, $r, $r, $c);
+        imageellipse($this->_img, $x, $y, $r, $r, $c);
         
-  }
-
-  /**
-   * Add an image to the pdf.
-   *
-   * The image is placed at the specified x and y coordinates with the
-   * given width and height.
-   *
-   * @param string $img_url the path to the image
-   * @param string $img_type the type (e.g. extension) of the image
-   * @param float $x x position
-   * @param float $y y position
-   * @param int $w width (in pixels)
-   * @param int $h height (in pixels)
-   */
-  function image($img_url, $img_type, $x, $y, $w, $h) {
+    }
+
+    /**
+     * Add an image to the pdf.
+     *
+     * The image is placed at the specified x and y coordinates with the
+     * given width and height.
+     *
+     * @param string $img_url the path to the image
+     * @param string $img_type the type (e.g. extension) of the image
+     * @param float $x x position
+     * @param float $y y position
+     * @param int $w width (in pixels)
+     * @param int $h height (in pixels)
+     */
+    function image($img_url, $img_type, $x, $y, $w, $h) {
 
     switch ($img_type) {
     case "png":
       $src = @imagecreatefrompng($img_url);
-      break;
+        break;
       
     case "gif":
       $src = @imagecreatefromgif($img_url);
-      break;
+        break;
       
     case "jpg":
     case "jpeg":
       $src = @imagecreatefromjpeg($img_url);
-      break;
+        break;
 
     default:
       break;
@@ -508,7 +507,7 @@ 
     }
 
     if ( !$src )
-      return; // Probably should add to $_dompdf_errors or whatever here
+        return; // Probably should add to $_dompdf_errors or whatever here
     
     // Scale by the AA factor
     $x *= $this->_aa_factor;
@@ -523,23 +522,23 @@ 
     
     imagecopyresampled($this->_img, $src, $x, $y, 0, 0, $w, $h, $img_w, $img_h);
     
-  }
-
-  /**
-   * Writes text at the specified x and y coordinates
-   *
-   * See {@link Style::munge_color()} for the format of the color 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 Text angle
-   */
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
+    }
+
+    /**
+     * Writes text at the specified x and y coordinates
+     *
+     * See {@link Style::munge_color()} for the format of the color 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 Text angle
+     */
+    function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
 
     // Scale by the AA factor
     $x *= $this->_aa_factor;
@@ -551,106 +550,106 @@ 
     $c = $this->_allocate_color($color);
 
     if ( strpos($font, '.ttf') === false )
-      $font .= ".ttf";
+        $font .= ".ttf";
 
     // FIXME: word spacing
     imagettftext($this->_img, $size, $angle, $x, $y + $h, $c, $font, $text);
     
-  }
+    }
   
-  function javascript($code) {
+    function javascript($code) {
     // Not implemented
-  }
-
-  /**
-   * 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) {
     // Not implemented
-  }
-
-  /**
-   * 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) {
     // Not implemented
-  }
-
-  /**
-   * Calculates text size, in points
-   *
-   * @param string $text the text to be sized
-   * @param string $font the desired font
-   * @param float  $size the desired font size
-   * @param float  $spacing word spacing, if any
-   * @return float
-   */
-  function get_text_width($text, $font, $size, $spacing = 0) {    
+    }
+
+    /**
+     * Calculates text size, in points
+     *
+     * @param string $text the text to be sized
+     * @param string $font the desired font
+     * @param float  $size the desired font size
+     * @param float  $spacing word spacing, if any
+     * @return float
+     */
+    function get_text_width($text, $font, $size, $spacing = 0) {    
 
     if ( strpos($font, '.ttf') === false )
-      $font .= ".ttf";
+        $font .= ".ttf";
 
     // FIXME: word spacing
     list($x1,,$x2) = imagettfbbox($size, 0, $font, $text);
     return $x2 - $x1;
-  }
-
-  /**
-   * Calculates font height, in points
-   *
-   * @param string $font
-   * @param float $size
-   * @return float
-   */
-  function get_font_height($font, $size) {
+    }
+
+    /**
+     * Calculates font height, in points
+     *
+     * @param string $font
+     * @param float $size
+     * @return float
+     */
+    function get_font_height($font, $size) {
     if ( strpos($font, '.ttf') === false )
-      $font .= ".ttf";
+        $font .= ".ttf";
 
     // FIXME: word spacing
     list(,$y2,,,,$y1) = imagettfbbox($size, 0, $font, "MXjpqytfhl");  // Test string with ascenders, descenders and caps
     return $y2 - $y1;
-  }
+    }
 
   
-  /**
-   * Starts a new page
-   *
-   * Subsequent drawing operations will appear on the new page.
-   */
-  function new_page() {
+    /**
+     * Starts a new page
+     *
+     * Subsequent drawing operations will appear on the new page.
+     */
+    function new_page() {
     // FIXME
-  }    
+    }    
 
-  /**
-   * Streams the image directly to the browser
-   *
-   * @param string $filename the name of the image file (ignored)
-   * @param array  $options associative array, 'type' => jpeg|jpg|png, 'quality' => 0 - 100 (jpeg only)
-   */
-  function stream($filename, $options = null) {
+    /**
+     * Streams the image directly to the browser
+     *
+     * @param string $filename the name of the image file (ignored)
+     * @param array  $options associative array, 'type' => jpeg|jpg|png, 'quality' => 0 - 100 (jpeg only)
+     */
+    function stream($filename, $options = null) {
 
     // Perform any antialiasing
     if ( $this->_aa_factor != 1 ) {
-      $dst_w = $this->_width / $this->_aa_factor;
-      $dst_h = $this->_height / $this->_aa_factor;
-      $dst = imagecreatetruecolor($dst_w, $dst_h);
-      imagecopyresampled($dst, $this->_img, 0, 0, 0, 0,
-                         $dst_w, $dst_h,
-                         $this->_width, $this->_height);
+        $dst_w = $this->_width / $this->_aa_factor;
+        $dst_h = $this->_height / $this->_aa_factor;
+        $dst = imagecreatetruecolor($dst_w, $dst_h);
+        imagecopyresampled($dst, $this->_img, 0, 0, 0, 0,
+                            $dst_w, $dst_h,
+                            $this->_width, $this->_height);
     } else {
-      $dst = $this->_img;
+        $dst = $this->_img;
     }
 
     if ( !isset($options["type"]) )
-      $options["type"] = "png";
+        $options["type"] = "png";
 
     $type = strtolower($options["type"]);
     
@@ -663,42 +662,42 @@ 
       if ( !isset($options["quality"]) )
         $options["quality"] = 75;
       
-      header("Content-type: image/jpeg");
-      imagejpeg($dst, '', $options["quality"]);
-      break;
+        header("Content-type: image/jpeg");
+        imagejpeg($dst, '', $options["quality"]);
+        break;
 
     case "png":
     default:
       header("Content-type: image/png");
-      imagepng($dst);
-      break;
+        imagepng($dst);
+        break;
     }
 
     if ( $this->_aa_factor != 1 ) 
-      imagedestroy($dst);
-  }
+        imagedestroy($dst);
+    }
 
-  /**
-   * Returns the PNG as a string
-   *
-   * @param array  $options associative array, 'type' => jpeg|jpg|png, 'quality' => 0 - 100 (jpeg only)
-   * @return string
-   */
-  function output($options = null) {
+    /**
+     * Returns the PNG as a string
+     *
+     * @param array  $options associative array, 'type' => jpeg|jpg|png, 'quality' => 0 - 100 (jpeg only)
+     * @return string
+     */
+    function output($options = null) {
 
     if ( $this->_aa_factor != 1 ) {
-      $dst_w = $this->_width / $this->_aa_factor;
-      $dst_h = $this->_height / $this->_aa_factor;
-      $dst = imagecreatetruecolor($dst_w, $dst_h);
-      imagecopyresampled($dst, $this->_img, 0, 0, 0, 0,
-                         $dst_w, $dst_h,
-                         $this->_width, $this->_height);
+        $dst_w = $this->_width / $this->_aa_factor;
+        $dst_h = $this->_height / $this->_aa_factor;
+        $dst = imagecreatetruecolor($dst_w, $dst_h);
+        imagecopyresampled($dst, $this->_img, 0, 0, 0, 0,
+                            $dst_w, $dst_h,
+                            $this->_width, $this->_height);
     } else {
-      $dst = $this->_img;
+        $dst = $this->_img;
     }
     
     if ( !isset($options["type"]) )
-      $options["type"] = "png";
+        $options["type"] = "png";
 
     $type = $options["type"];
     
@@ -711,23 +710,23 @@ 
       if ( !isset($options["quality"]) )
         $options["quality"] = 75;
       
-      imagejpeg($dst, '', $options["quality"]);
-      break;
+        imagejpeg($dst, '', $options["quality"]);
+        break;
 
     case "png":
     default:
       imagepng($dst);
-      break;
+        break;
     }
 
     $image = ob_get_contents();
     ob_end_clean();
 
     if ( $this->_aa_factor != 1 )
-      imagedestroy($dst);
+        imagedestroy($dst);
     
     return $image;
-  }
+    }
   
   
 }

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

Doc Comments +2 added lines, -2 removed lines

@@ -109,7 +109,7 @@ 
   /**
    * Return the bullet's width
    *
-   * @return int
+   * @return double
    */
   function get_width() {
     //ignore image width, use same width as on predefined bullet List_Bullet_Frame_Decorator
@@ -159,7 +159,7 @@ 
   /**
    * Override get_margin_height()
    *
-   * @return int
+   * @return double
    */
   function get_margin_height() {
     //Hits only on "inset" lists items, to increase height of box

Indentation +69 added lines, -69 removed lines

@@ -52,34 +52,34 @@ 
  */
 class List_Bullet_Image_Frame_Decorator extends Frame_Decorator {
 
-  /**
-   * The underlying image frame
-   * 
-   * @var Image_Frame_Decorator
-   */
-  protected $_img;
+    /**
+     * The underlying image frame
+     * 
+     * @var Image_Frame_Decorator
+     */
+    protected $_img;
 
-  /**
-   * The image's width in pixels
-   *
-   * @var int
-   */
-  protected $_width;
+    /**
+     * The image's width in pixels
+     *
+     * @var int
+     */
+    protected $_width;
   
-  /**
-   * The image's height in pixels
-   *
-   * @var int
-   */
-  protected $_height;
+    /**
+     * The image's height in pixels
+     *
+     * @var int
+     */
+    protected $_height;
 
-  /**
-   * Class constructor
-   *
-   * @param Frame $frame the bullet frame to decorate
-   * @param DOMPDF $dompdf the document's dompdf object
-   */
-  function __construct(Frame $frame, DOMPDF $dompdf) {
+    /**
+     * Class constructor
+     *
+     * @param Frame $frame the bullet frame to decorate
+     * @param DOMPDF $dompdf the document's dompdf object
+     */
+    function __construct(Frame $frame, DOMPDF $dompdf) {
     $style = $frame->get_style();
     $url = $style->list_style_image;
     $frame->get_node()->setAttribute("src", $url);
@@ -104,38 +104,38 @@ 
     //  $style->min_height = $this->_height;
     //}
     //$style->height = "auto";   
-  }
+    }
 
-  /**
-   * Return the bullet's width
-   *
-   * @return int
-   */
-  function get_width() {
+    /**
+     * Return the bullet's width
+     *
+     * @return int
+     */
+    function get_width() {
     //ignore image width, use same width as on predefined bullet List_Bullet_Frame_Decorator
     //for proper alignment of bullet image and text. Allow image to not fitting on left border.
     //This controls the distance between bullet image and text 
     //return $this->_width;
     return $this->_frame->get_style()->get_font_size()*List_Bullet_Frame_Decorator::BULLET_SIZE + 
       2 * List_Bullet_Frame_Decorator::BULLET_PADDING;
-  }
+    }
 
-  /**
-   * Return the bullet's height
-   *
-   * @return int
-   */
-  function get_height() {
+    /**
+     * Return the bullet's height
+     *
+     * @return int
+     */
+    function get_height() {
     //based on image height
     return $this->_height;
-  }
+    }
   
-  /**
-   * Override get_margin_width
-   *
-   * @return int
-   */
-  function get_margin_width() {
+    /**
+     * Override get_margin_width
+     *
+     * @return int
+     */
+    function get_margin_width() {
     //ignore image width, use same width as on predefined bullet List_Bullet_Frame_Decorator
     //for proper alignment of bullet image and text. Allow image to not fitting on left border.
     //This controls the extra indentation of text to make room for the bullet image.
@@ -147,42 +147,42 @@ 
     // Image Might not exist, then position like on list_bullet_frame_decorator fallback to none. 
     if ( $this->_frame->get_style()->list_style_position === "outside" ||
          $this->_width == 0) 
-      return 0;
+        return 0;
     //This aligns the "inside" image position with the text.
     //The text starts to the right of the image.
     //Between the image and the text there is an added margin of image width.
     //Where this comes from is unknown.
     //The corresponding List_Bullet_Frame_Decorator sets a smaller margin. bullet size?
     return $this->_width + 2 * List_Bullet_Frame_Decorator::BULLET_PADDING;
-  }
+    }
 
-  /**
-   * Override get_margin_height()
-   *
-   * @return int
-   */
-  function get_margin_height() {
+    /**
+     * Override get_margin_height()
+     *
+     * @return int
+     */
+    function get_margin_height() {
     //Hits only on "inset" lists items, to increase height of box
     //based on image height
     return $this->_height + 2 * List_Bullet_Frame_Decorator::BULLET_PADDING;
-  }
+    }
 
-  /**
-   * Return image url
-   *
-   * @return string
-   */
-  function get_image_url() {
+    /**
+     * Return image url
+     *
+     * @return string
+     */
+    function get_image_url() {
     return $this->_img->get_image_url();
-  }
+    }
 
-  /**
-   * Return the image extension
-   *
-   * @return string
-   */
-  function get_image_ext() {
+    /**
+     * Return the image extension
+     *
+     * @return string
+     */
+    function get_image_ext() {
     return $this->_img->get_image_ext();
-  }
+    }
   
 }

Spacing +4 added lines, -4 removed lines

@@ -90,8 +90,8 @@ 
     // Resample the bullet image to be consistent with 'auto' sized images
     // See also Image_Frame_Reflower::get_min_max_width
     // Tested php ver: value measured in px, suffix "px" not in value: rtrim unnecessary.
-    $this->_width = (((float)rtrim($width, "px")) * 72) / DOMPDF_DPI;
-    $this->_height = (((float)rtrim($height, "px")) * 72) / DOMPDF_DPI;
+    $this->_width = (((float) rtrim($width, "px")) * 72) / DOMPDF_DPI;
+    $this->_height = (((float) rtrim($height, "px")) * 72) / DOMPDF_DPI;
  
     //If an image is taller as the containing block/box, the box should be extended.
     //Neighbour elements are overwriting the overlapping image areas.
@@ -116,7 +116,7 @@ 
     //for proper alignment of bullet image and text. Allow image to not fitting on left border.
     //This controls the distance between bullet image and text 
     //return $this->_width;
-    return $this->_frame->get_style()->get_font_size()*List_Bullet_Frame_Decorator::BULLET_SIZE + 
+    return $this->_frame->get_style()->get_font_size() * List_Bullet_Frame_Decorator::BULLET_SIZE + 
       2 * List_Bullet_Frame_Decorator::BULLET_PADDING;
   }
 
@@ -145,7 +145,7 @@ 
 
     // Small hack to prevent indenting of list text
     // Image Might not exist, then position like on list_bullet_frame_decorator fallback to none. 
-    if ( $this->_frame->get_style()->list_style_position === "outside" ||
+    if ($this->_frame->get_style()->list_style_position === "outside" ||
          $this->_width == 0) 
       return 0;
     //This aligns the "inside" image position with the text.

Braces +3 added lines, -2 removed lines

@@ -146,8 +146,9 @@
     // Small hack to prevent indenting of list text
     // Image Might not exist, then position like on list_bullet_frame_decorator fallback to none. 
     if ( $this->_frame->get_style()->list_style_position === "outside" ||
-         $this->_width == 0) 
-      return 0;
+         $this->_width == 0) {
+          return 0;
+    }
     //This aligns the "inside" image position with the text.
     //The text starts to the right of the image.
     //Between the image and the text there is an added margin of image width.

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

Doc Comments +7 added lines

@@ -70,12 +70,19 @@
   
   function __construct() { throw new Exception("Can not create instance of Page_Class.  Class is static."); }
 
+  /**
+   * @param string $sql
+   */
   private static function __query($sql) {
     if ( !($res = pg_query(self::$__connection, $sql)) )
       throw new Exception(pg_last_error(self::$__connection));
     return $res;
   }
   
+  /**
+   * @param integer $page_num
+   * @param string|null $data
+   */
   static function store_page($id, $page_num, $data) {
     $where = "WHERE id='" . pg_escape_string($id) . "' AND ".
       "page_num=". pg_escape_string($page_num);

Indentation +70 added lines, -71 removed lines

@@ -1,41 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: page_cache.cls.php,v $
- * Created on: 2004-07-23
- *
- * 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: page_cache.cls.php,v $
+     * Created on: 2004-07-23
+     *
+     * 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: page_cache.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -50,59 +49,59 @@ 
  */
 class Page_Cache {
 
-  const DB_USER = "dompdf_page_cache";
-  const DB_PASS = "some meaningful password";
-  const DB_NAME = "dompdf_page_cache";
+    const DB_USER = "dompdf_page_cache";
+    const DB_PASS = "some meaningful password";
+    const DB_NAME = "dompdf_page_cache";
   
-  static private $__connection = null;
+    static private $__connection = null;
   
-  function init() {
+    function init() {
     if ( is_null(self::$__connection) ) {
-      $con_str = "host=" . DB_HOST .
+        $con_str = "host=" . DB_HOST .
         " dbname=" . self::DB_NAME .
         " user=" . self::DB_USER .
         " password=" . self::DB_PASS;
       
-      if ( !self::$__connection = pg_connect($con_str) )
+        if ( !self::$__connection = pg_connect($con_str) )
         throw new Exception("Database connection failed.");
     }
-  }
+    }
   
-  function __construct() { throw new Exception("Can not create instance of Page_Class.  Class is static."); }
+    function __construct() { throw new Exception("Can not create instance of Page_Class.  Class is static."); }
 
-  private static function __query($sql) {
+    private static function __query($sql) {
     if ( !($res = pg_query(self::$__connection, $sql)) )
-      throw new Exception(pg_last_error(self::$__connection));
+        throw new Exception(pg_last_error(self::$__connection));
     return $res;
-  }
+    }
   
-  static function store_page($id, $page_num, $data) {
+    static function store_page($id, $page_num, $data) {
     $where = "WHERE id='" . pg_escape_string($id) . "' AND ".
-      "page_num=". pg_escape_string($page_num);
+        "page_num=". pg_escape_string($page_num);
 
     $res = self::__query("SELECT timestamp FROM page_cache ". $where);
 
     $row = pg_fetch_assoc($res);
     
     if ( $row ) 
-      self::__query("UPDATE page_cache SET data='" . pg_escape_string($data) . "' " . $where);
+        self::__query("UPDATE page_cache SET data='" . pg_escape_string($data) . "' " . $where);
     else 
-      self::__query("INSERT INTO page_cache (id, page_num, data) VALUES ('" . pg_escape_string($id) . "', ".
-                     pg_escape_string($page_num) . ", ".
-                     "'". pg_escape_string($data) . "')");
+        self::__query("INSERT INTO page_cache (id, page_num, data) VALUES ('" . pg_escape_string($id) . "', ".
+                        pg_escape_string($page_num) . ", ".
+                        "'". pg_escape_string($data) . "')");
 
-  }
+    }
 
-  static function store_fonts($id, $fonts) {
+    static function store_fonts($id, $fonts) {
     self::__query("BEGIN");
     // Update the font information
     self::__query("DELETE FROM page_fonts WHERE id='" . pg_escape_string($id) . "'");
 
     foreach (array_keys($fonts) as $font)
-      self::__query("INSERT INTO page_fonts (id, font_name) VALUES ('" .
+        self::__query("INSERT INTO page_fonts (id, font_name) VALUES ('" .
                     pg_escape_string($id) . "', '" . pg_escape_string($font) . "')");
     self::__query("COMMIT");
-  }
+    }
   
 //   static function retrieve_page($id, $page_num) {
 
@@ -115,45 +114,45 @@ 
     
 //   }
 
-  static function get_page_timestamp($id, $page_num) {
+    static function get_page_timestamp($id, $page_num) {
     $res = self::__query("SELECT timestamp FROM page_cache WHERE id='" . pg_escape_string($id) . "' AND ".
-                          "page_num=". pg_escape_string($page_num));
+                            "page_num=". pg_escape_string($page_num));
 
     $row = pg_fetch_assoc($res);
 
     return $row["timestamp"];
     
-  }
+    }
 
-  // Adds the cached document referenced by $id to the provided pdf
-  static function insert_cached_document(CPDF_Adapter $pdf, $id, $new_page = true) {
+    // Adds the cached document referenced by $id to the provided pdf
+    static function insert_cached_document(CPDF_Adapter $pdf, $id, $new_page = true) {
     $res = self::__query("SELECT font_name FROM page_fonts WHERE id='" . pg_escape_string($id) . "'");
 
     // Ensure that the fonts needed by the cached document are loaded into
     // the pdf
     while ($row = pg_fetch_assoc($res)) 
-      $pdf->get_cpdf()->selectFont($row["font_name"]);
+        $pdf->get_cpdf()->selectFont($row["font_name"]);
     
     $res = self::__query("SELECT data FROM page_cache WHERE id='" . pg_escape_string($id) . "'");
 
     if ( $new_page )
-      $pdf->new_page();
+        $pdf->new_page();
 
     $first = true;
     while ($row = pg_fetch_assoc($res)) {
 
-      if ( !$first ) 
+        if ( !$first ) 
         $pdf->new_page();
-      else 
+        else 
         $first = false;        
       
-      $page = $pdf->reopen_serialized_object($row["data"]);
-      //$pdf->close_object();
-      $pdf->add_object($page, "add");
+        $page = $pdf->reopen_serialized_object($row["data"]);
+        //$pdf->close_object();
+        $pdf->add_object($page, "add");
 
     }
       
-  }
+    }
 }
 
 Page_Cache::init();

Spacing +24 added lines, -24 removed lines

@@ -57,13 +57,13 @@ 
   static private $__connection = null;
   
   function init() {
-    if ( is_null(self::$__connection) ) {
-      $con_str = "host=" . DB_HOST .
-        " dbname=" . self::DB_NAME .
-        " user=" . self::DB_USER .
-        " password=" . self::DB_PASS;
+    if (is_null(self::$__connection)) {
+      $con_str = "host=".DB_HOST.
+        " dbname=".self::DB_NAME.
+        " user=".self::DB_USER.
+        " password=".self::DB_PASS;
       
-      if ( !self::$__connection = pg_connect($con_str) )
+      if (!self::$__connection = pg_connect($con_str))
         throw new Exception("Database connection failed.");
     }
   }
@@ -71,36 +71,36 @@ 
   function __construct() { throw new Exception("Can not create instance of Page_Class.  Class is static."); }
 
   private static function __query($sql) {
-    if ( !($res = pg_query(self::$__connection, $sql)) )
+    if (!($res = pg_query(self::$__connection, $sql)))
       throw new Exception(pg_last_error(self::$__connection));
     return $res;
   }
   
   static function store_page($id, $page_num, $data) {
-    $where = "WHERE id='" . pg_escape_string($id) . "' AND ".
-      "page_num=". pg_escape_string($page_num);
+    $where = "WHERE id='".pg_escape_string($id)."' AND ".
+      "page_num=".pg_escape_string($page_num);
 
-    $res = self::__query("SELECT timestamp FROM page_cache ". $where);
+    $res = self::__query("SELECT timestamp FROM page_cache ".$where);
 
     $row = pg_fetch_assoc($res);
     
-    if ( $row ) 
-      self::__query("UPDATE page_cache SET data='" . pg_escape_string($data) . "' " . $where);
+    if ($row) 
+      self::__query("UPDATE page_cache SET data='".pg_escape_string($data)."' ".$where);
     else 
-      self::__query("INSERT INTO page_cache (id, page_num, data) VALUES ('" . pg_escape_string($id) . "', ".
-                     pg_escape_string($page_num) . ", ".
-                     "'". pg_escape_string($data) . "')");
+      self::__query("INSERT INTO page_cache (id, page_num, data) VALUES ('".pg_escape_string($id)."', ".
+                     pg_escape_string($page_num).", ".
+                     "'".pg_escape_string($data)."')");
 
   }
 
   static function store_fonts($id, $fonts) {
     self::__query("BEGIN");
     // Update the font information
-    self::__query("DELETE FROM page_fonts WHERE id='" . pg_escape_string($id) . "'");
+    self::__query("DELETE FROM page_fonts WHERE id='".pg_escape_string($id)."'");
 
     foreach (array_keys($fonts) as $font)
-      self::__query("INSERT INTO page_fonts (id, font_name) VALUES ('" .
-                    pg_escape_string($id) . "', '" . pg_escape_string($font) . "')");
+      self::__query("INSERT INTO page_fonts (id, font_name) VALUES ('".
+                    pg_escape_string($id)."', '".pg_escape_string($font)."')");
     self::__query("COMMIT");
   }
   
@@ -116,8 +116,8 @@ 
 //   }
 
   static function get_page_timestamp($id, $page_num) {
-    $res = self::__query("SELECT timestamp FROM page_cache WHERE id='" . pg_escape_string($id) . "' AND ".
-                          "page_num=". pg_escape_string($page_num));
+    $res = self::__query("SELECT timestamp FROM page_cache WHERE id='".pg_escape_string($id)."' AND ".
+                          "page_num=".pg_escape_string($page_num));
 
     $row = pg_fetch_assoc($res);
 
@@ -127,22 +127,22 @@ 
 
   // Adds the cached document referenced by $id to the provided pdf
   static function insert_cached_document(CPDF_Adapter $pdf, $id, $new_page = true) {
-    $res = self::__query("SELECT font_name FROM page_fonts WHERE id='" . pg_escape_string($id) . "'");
+    $res = self::__query("SELECT font_name FROM page_fonts WHERE id='".pg_escape_string($id)."'");
 
     // Ensure that the fonts needed by the cached document are loaded into
     // the pdf
     while ($row = pg_fetch_assoc($res)) 
       $pdf->get_cpdf()->selectFont($row["font_name"]);
     
-    $res = self::__query("SELECT data FROM page_cache WHERE id='" . pg_escape_string($id) . "'");
+    $res = self::__query("SELECT data FROM page_cache WHERE id='".pg_escape_string($id)."'");
 
-    if ( $new_page )
+    if ($new_page)
       $pdf->new_page();
 
     $first = true;
     while ($row = pg_fetch_assoc($res)) {
 
-      if ( !$first ) 
+      if (!$first) 
         $pdf->new_page();
       else 
         $first = false;        

Braces +25 added lines, -18 removed lines

@@ -63,16 +63,18 @@ 
         " user=" . self::DB_USER .
         " password=" . self::DB_PASS;
       
-      if ( !self::$__connection = pg_connect($con_str) )
-        throw new Exception("Database connection failed.");
+      if ( !self::$__connection = pg_connect($con_str) ) {
+              throw new Exception("Database connection failed.");
+      }
     }
   }
   
   function __construct() { throw new Exception("Can not create instance of Page_Class.  Class is static."); }
 
   private static function __query($sql) {
-    if ( !($res = pg_query(self::$__connection, $sql)) )
-      throw new Exception(pg_last_error(self::$__connection));
+    if ( !($res = pg_query(self::$__connection, $sql)) ) {
+          throw new Exception(pg_last_error(self::$__connection));
+    }
     return $res;
   }
   
@@ -84,12 +86,13 @@ 
 
     $row = pg_fetch_assoc($res);
     
-    if ( $row ) 
-      self::__query("UPDATE page_cache SET data='" . pg_escape_string($data) . "' " . $where);
-    else 
-      self::__query("INSERT INTO page_cache (id, page_num, data) VALUES ('" . pg_escape_string($id) . "', ".
+    if ( $row ) {
+          self::__query("UPDATE page_cache SET data='" . pg_escape_string($data) . "' " . $where);
+    } else {
+          self::__query("INSERT INTO page_cache (id, page_num, data) VALUES ('" . pg_escape_string($id) . "', ".
                      pg_escape_string($page_num) . ", ".
                      "'". pg_escape_string($data) . "')");
+    }
 
   }
 
@@ -98,9 +101,10 @@ 
     // Update the font information
     self::__query("DELETE FROM page_fonts WHERE id='" . pg_escape_string($id) . "'");
 
-    foreach (array_keys($fonts) as $font)
-      self::__query("INSERT INTO page_fonts (id, font_name) VALUES ('" .
+    foreach (array_keys($fonts) as $font) {
+          self::__query("INSERT INTO page_fonts (id, font_name) VALUES ('" .
                     pg_escape_string($id) . "', '" . pg_escape_string($font) . "')");
+    }
     self::__query("COMMIT");
   }
   
@@ -131,21 +135,24 @@ 
 
     // Ensure that the fonts needed by the cached document are loaded into
     // the pdf
-    while ($row = pg_fetch_assoc($res)) 
-      $pdf->get_cpdf()->selectFont($row["font_name"]);
+    while ($row = pg_fetch_assoc($res)) {
+          $pdf->get_cpdf()->selectFont($row["font_name"]);
+    }
     
     $res = self::__query("SELECT data FROM page_cache WHERE id='" . pg_escape_string($id) . "'");
 
-    if ( $new_page )
-      $pdf->new_page();
+    if ( $new_page ) {
+          $pdf->new_page();
+    }
 
     $first = true;
     while ($row = pg_fetch_assoc($res)) {
 
-      if ( !$first ) 
-        $pdf->new_page();
-      else 
-        $first = false;        
+      if ( !$first ) {
+              $pdf->new_page();
+      } else {
+              $first = false;
+      }
       
       $page = $pdf->reopen_serialized_object($row["data"]);
       //$pdf->close_object();

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

Doc Comments +2 added lines, -2 removed lines

@@ -171,7 +171,7 @@ 
    * @link http://www.w3.org/TR/CSS21/page.html#forced
    *
    * @param Frame $frame the frame to check
-   * @return bool true if a page break occured
+   * @return null|boolean true if a page break occured
    */
   function check_forced_page_break(Frame $frame) {
 
@@ -426,7 +426,7 @@ 
    * correct location.
    *
    * @param Frame $frame the frame to check
-   * @return Frame the frame following the page break
+   * @return boolean the frame following the page break
    */
   function check_page_break(Frame $frame) {
     // Do not split if we have already

Indentation +294 added lines, -295 removed lines

@@ -1,41 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: page_frame_decorator.cls.php,v $
- * Created on: 2004-06-15
- *
- * 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: page_frame_decorator.cls.php,v $
+     * Created on: 2004-06-15
+     *
+     * 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: page_frame_decorator.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -47,137 +46,137 @@ 
  */
 class Page_Frame_Decorator extends Frame_Decorator {
 
-  /**
-   * y value of bottom page margin
-   *
-   * @var float
-   */
-  protected $_bottom_page_margin;
-
-  /**
-   * Flag indicating page is full.
-   *
-   * @var bool
-   */
-  protected $_page_full;
-
-  /**
-   * Number of tables currently being reflowed
-   *
-   * @var int
-   */
-  protected $_in_table;
-
-  /**
-   * The pdf renderer
-   *
-   * @var Renderer
-   */
-  protected $_renderer;
-
-  //........................................................................
-
-  /**
-   * Class constructor
-   *
-   * @param Frame $frame the frame to decorate
-   */
-  function __construct(Frame $frame, DOMPDF $dompdf) {
+    /**
+     * y value of bottom page margin
+     *
+     * @var float
+     */
+    protected $_bottom_page_margin;
+
+    /**
+     * Flag indicating page is full.
+     *
+     * @var bool
+     */
+    protected $_page_full;
+
+    /**
+     * Number of tables currently being reflowed
+     *
+     * @var int
+     */
+    protected $_in_table;
+
+    /**
+     * The pdf renderer
+     *
+     * @var Renderer
+     */
+    protected $_renderer;
+
+    //........................................................................
+
+    /**
+     * Class constructor
+     *
+     * @param Frame $frame the frame to decorate
+     */
+    function __construct(Frame $frame, DOMPDF $dompdf) {
     parent::__construct($frame, $dompdf);
     $this->_page_full = false;
     $this->_in_table = 0;
     $this->_bottom_page_margin = null;
-  }
+    }
 
 
-  /**
-   * Set the renderer used for this pdf
-   *
-   * @param Renderer $renderer the renderer to use
-   */
-  function set_renderer($renderer) {
+    /**
+     * Set the renderer used for this pdf
+     *
+     * @param Renderer $renderer the renderer to use
+     */
+    function set_renderer($renderer) {
     $this->_renderer = $renderer;
-  }
-
-  /**
-   * Return the renderer used for this pdf
-   *
-   * @return Renderer
-   */
-  function get_renderer() {
+    }
+
+    /**
+     * Return the renderer used for this pdf
+     *
+     * @return Renderer
+     */
+    function get_renderer() {
     return $this->_renderer;
-  }
-
-  /**
-   * Set the frame's containing block.  Overridden to set $this->_bottom_page_margin.
-   *
-   * @param float $x
-   * @param float $y
-   * @param float $w
-   * @param float $h
-   */
-  function set_containing_block($x = null, $y = null, $w = null, $h = null) {
+    }
+
+    /**
+     * Set the frame's containing block.  Overridden to set $this->_bottom_page_margin.
+     *
+     * @param float $x
+     * @param float $y
+     * @param float $w
+     * @param float $h
+     */
+    function set_containing_block($x = null, $y = null, $w = null, $h = null) {
     parent::set_containing_block($x,$y,$w,$h);
     $w = $this->get_containing_block("w");
     if ( isset($h) )
-      $this->_bottom_page_margin = $h; // - $this->_frame->get_style()->length_in_pt($this->_frame->get_style()->margin_bottom, $w);
-  }
-
-  /**
-   * Returns true if the page is full and is no longer accepting frames.
-   *
-   * @return bool
-   */
-  function is_full() {
+        $this->_bottom_page_margin = $h; // - $this->_frame->get_style()->length_in_pt($this->_frame->get_style()->margin_bottom, $w);
+    }
+
+    /**
+     * Returns true if the page is full and is no longer accepting frames.
+     *
+     * @return bool
+     */
+    function is_full() {
     return $this->_page_full;
-  }
+    }
 
-  /**
-   * Start a new page by resetting the full flag.
-   */
-  function next_page() {
+    /**
+     * Start a new page by resetting the full flag.
+     */
+    function next_page() {
     $this->_renderer->new_page();
     $this->_page_full = false;
-  }
+    }
 
-  /**
-   * Indicate to the page that a table is currently being reflowed.
-   */
-  function table_reflow_start() {
+    /**
+     * Indicate to the page that a table is currently being reflowed.
+     */
+    function table_reflow_start() {
     $this->_in_table++;
-  }
+    }
 
-  /**
-   * Indicate to the page that table reflow is finished.
-   */
-  function table_reflow_end() {
+    /**
+     * Indicate to the page that table reflow is finished.
+     */
+    function table_reflow_end() {
     $this->_in_table--;
-  }
-
-  /**
-   * Return whether we are currently in a nested table or not
-   *
-   * @return bool
-   */
-  function in_nested_table() {
+    }
+
+    /**
+     * Return whether we are currently in a nested table or not
+     *
+     * @return bool
+     */
+    function in_nested_table() {
     return $this->_in_table > 1;
-  }
+    }
   
-  /**
-   * Check if a forced page break is required before $frame.  This uses the
-   * frame's page_break_before property as well as the preceeding frame's
-   * page_break_after property.
-   *
-   * @link http://www.w3.org/TR/CSS21/page.html#forced
-   *
-   * @param Frame $frame the frame to check
-   * @return bool true if a page break occured
-   */
-  function check_forced_page_break(Frame $frame) {
+    /**
+     * Check if a forced page break is required before $frame.  This uses the
+     * frame's page_break_before property as well as the preceeding frame's
+     * page_break_after property.
+     *
+     * @link http://www.w3.org/TR/CSS21/page.html#forced
+     *
+     * @param Frame $frame the frame to check
+     * @return bool true if a page break occured
+     */
+    function check_forced_page_break(Frame $frame) {
 
     // Skip check if page is already split
     if ( $this->_page_full )
-      return;
+        return;
 
     $block_types = array("block", "list-item", "table");
     $page_breaks = array("always", "left", "right");
@@ -185,42 +184,42 @@ 
     $style = $frame->get_style();
 
     if ( !in_array($style->display, $block_types) )
-      return false;
+        return false;
 
     // Find the previous block-level sibling
     $prev = $frame->get_prev_sibling();
     while ( $prev && !in_array($prev->get_style()->display, $block_types) )
-      $prev = $prev->get_prev_sibling();
+        $prev = $prev->get_prev_sibling();
 
     if ( in_array($style->page_break_before, $page_breaks) ) {
 
-      // Prevent cascading splits
-      $frame->split();
-      // We have to grab the style again here because split() resets
-      // $frame->style to the frame's orignal style.
-      $frame->get_style()->page_break_before = "auto";
-      $this->_page_full = true;
-      return true;
+        // Prevent cascading splits
+        $frame->split();
+        // We have to grab the style again here because split() resets
+        // $frame->style to the frame's orignal style.
+        $frame->get_style()->page_break_before = "auto";
+        $this->_page_full = true;
+        return true;
     }
 
     if ( ($prev && in_array($prev->get_style()->page_break_after, $page_breaks)) ) {
-      // Prevent cascading splits
-      $frame->split();
-      $prev->get_style()->page_break_after = "auto";
-      $this->_page_full = true;
-      return true;
+        // Prevent cascading splits
+        $frame->split();
+        $prev->get_style()->page_break_after = "auto";
+        $this->_page_full = true;
+        return true;
     }
 
     return false;
-  }
-
-  /**
-   * Determine if a page break is allowed before $frame
-   *
-   * @param Frame $frame the frame to check
-   * @return bool true if a break is allowed, false otherwise
-   */
-  protected function _page_break_allowed(Frame $frame) {
+    }
+
+    /**
+     * Determine if a page break is allowed before $frame
+     *
+     * @param Frame $frame the frame to check
+     * @return bool true if a break is allowed, false otherwise
+     */
+    protected function _page_break_allowed(Frame $frame) {
     /**
      *
      * http://www.w3.org/TR/CSS21/page.html#allowed-page-breaks
@@ -276,162 +275,162 @@ 
     // Block Frames (1):
     if ( in_array($display, $block_types) ) {
 
-      // Avoid breaks within table-cells
-      if ( $this->_in_table ) {
+        // Avoid breaks within table-cells
+        if ( $this->_in_table ) {
         dompdf_debug("page-break", "In table: " . $this->_in_table);
         return false;
-      }
+        }
 
-      // Rules A & B
+        // Rules A & B
 
-      if ( $frame->get_style()->page_break_before === "avoid" ) {
+        if ( $frame->get_style()->page_break_before === "avoid" ) {
         dompdf_debug("page-break", "before: avoid");
         return false;
-      }
+        }
 
-      // Find the preceeding block-level sibling
-      $prev = $frame->get_prev_sibling();
-      while ( $prev && !in_array($prev->get_style()->display, $block_types) )
+        // Find the preceeding block-level sibling
+        $prev = $frame->get_prev_sibling();
+        while ( $prev && !in_array($prev->get_style()->display, $block_types) )
         $prev = $prev->get_prev_sibling();
 
-      // Does the previous element allow a page break after?
-      if ( $prev && $prev->get_style()->page_break_after === "avoid" ) {
+        // Does the previous element allow a page break after?
+        if ( $prev && $prev->get_style()->page_break_after === "avoid" ) {
         dompdf_debug("page-break", "after: avoid");
         return false;
-      }
+        }
 
-      // If both $prev & $frame have the same parent, check the parent's
-      // page_break_inside property.
-      $parent = $frame->get_parent();
-      if ( $prev && $parent && $parent->get_style()->page_break_inside === "avoid" ) {
-          dompdf_debug("page-break", "parent inside: avoid");
+        // If both $prev & $frame have the same parent, check the parent's
+        // page_break_inside property.
+        $parent = $frame->get_parent();
+        if ( $prev && $parent && $parent->get_style()->page_break_inside === "avoid" ) {
+            dompdf_debug("page-break", "parent inside: avoid");
         return false;
-      }
+        }
 
-      // To prevent cascading page breaks when a top-level element has
-      // page-break-inside: avoid, ensure that at least one frame is
-      // on the page before splitting.
-      if ( $parent->get_node()->nodeName === "body" && !$prev ) {
+        // To prevent cascading page breaks when a top-level element has
+        // page-break-inside: avoid, ensure that at least one frame is
+        // on the page before splitting.
+        if ( $parent->get_node()->nodeName === "body" && !$prev ) {
         // We are the body's first child
-          dompdf_debug("page-break", "Body's first child.");
+            dompdf_debug("page-break", "Body's first child.");
         return false;
-      }
+        }
 
-      // If the frame is the first block-level frame, use the value from
-      // $frame's parent instead.
-      if ( !$prev && $parent )
+        // If the frame is the first block-level frame, use the value from
+        // $frame's parent instead.
+        if ( !$prev && $parent )
         return $this->_page_break_allowed( $parent );
 
-      dompdf_debug("page-break", "block: break allowed");
-      return true;
+        dompdf_debug("page-break", "block: break allowed");
+        return true;
 
     }
 
     // Inline frames (2):
     else if ( in_array($display, Style::$INLINE_TYPES) ) {
 
-      // Avoid breaks within table-cells
-      if ( $this->_in_table ) {
-          dompdf_debug("page-break", "In table: " . $this->_in_table);
+        // Avoid breaks within table-cells
+        if ( $this->_in_table ) {
+            dompdf_debug("page-break", "In table: " . $this->_in_table);
         return false;
-      }
+        }
 
-      // Rule C
-      $block_parent = $frame->find_block_parent();
-      if ( count($block_parent->get_lines() ) < $frame->get_style()->orphans ) {
-          dompdf_debug("page-break", "orphans");
+        // Rule C
+        $block_parent = $frame->find_block_parent();
+        if ( count($block_parent->get_lines() ) < $frame->get_style()->orphans ) {
+            dompdf_debug("page-break", "orphans");
         return false;
-      }
+        }
 
-      // FIXME: Checking widows is tricky without having laid out the
-      // remaining line boxes.  Just ignore it for now...
+        // FIXME: Checking widows is tricky without having laid out the
+        // remaining line boxes.  Just ignore it for now...
 
-      // Rule D
-      $p = $block_parent;
-      while ($p) {
+        // Rule D
+        $p = $block_parent;
+        while ($p) {
         if ( $p->get_style()->page_break_inside === "avoid" ) {
-          dompdf_debug("page-break", "parent->inside: avoid");
-          return false;
+            dompdf_debug("page-break", "parent->inside: avoid");
+            return false;
         }
         $p = $p->find_block_parent();
-      }
+        }
 
-      // To prevent cascading page breaks when a top-level element has
-      // page-break-inside: avoid, ensure that at least one frame with
-      // some content is on the page before splitting.
-      $prev = $frame->get_prev_sibling();
-      while ( $prev && ($prev->get_node()->nodeName === "#text" && trim($prev->get_node()->nodeValue) == "") )
+        // To prevent cascading page breaks when a top-level element has
+        // page-break-inside: avoid, ensure that at least one frame with
+        // some content is on the page before splitting.
+        $prev = $frame->get_prev_sibling();
+        while ( $prev && ($prev->get_node()->nodeName === "#text" && trim($prev->get_node()->nodeValue) == "") )
         $prev = $prev->get_prev_sibling();
 
-      if ( $block_parent->get_node()->nodeName === "body" && !$prev ) {
+        if ( $block_parent->get_node()->nodeName === "body" && !$prev ) {
         // We are the body's first child
-          dompdf_debug("page-break", "Body's first child.");
+            dompdf_debug("page-break", "Body's first child.");
         return false;
-      }
+        }
 
-      // Skip breaks on empty text nodes
-      if ( $frame->get_node()->nodeName === "#text" &&
+        // Skip breaks on empty text nodes
+        if ( $frame->get_node()->nodeName === "#text" &&
            $frame->get_node()->nodeValue == "" )
         return false;
 
-      dompdf_debug("page-break", "inline: break allowed");
-      return true;
+        dompdf_debug("page-break", "inline: break allowed");
+        return true;
 
     // Table-rows
     } else if ( $display === "table-row" ) {
 
-      // Simply check if the parent table's page_break_inside property is
-      // not 'avoid'
-      $p = Table_Frame_Decorator::find_parent_table($frame);
+        // Simply check if the parent table's page_break_inside property is
+        // not 'avoid'
+        $p = Table_Frame_Decorator::find_parent_table($frame);
 
-      while ($p) {
+        while ($p) {
         if ( $p->get_style()->page_break_inside === "avoid" ) {
-          dompdf_debug("page-break", "parent->inside: avoid");
-          return false;
+            dompdf_debug("page-break", "parent->inside: avoid");
+            return false;
         }
         $p = $p->find_block_parent();
-      }
+        }
 
-      // Avoid breaking after the first row of a table
-      if ( $p && $p->get_first_child() === $frame) {
-         dompdf_debug("page-break", "table: first-row");
+        // Avoid breaking after the first row of a table
+        if ( $p && $p->get_first_child() === $frame) {
+            dompdf_debug("page-break", "table: first-row");
         return false;
-      }
+        }
 
-      // If this is a nested table, prevent the page from breaking
-      if ( $this->_in_table > 1 ) {
+        // If this is a nested table, prevent the page from breaking
+        if ( $this->_in_table > 1 ) {
         dompdf_debug("page-break", "table: nested table");
         return false;
-      }
+        }
 
-      dompdf_debug("page-break","table-row/row-groups: break allowed");
-      return true;
+        dompdf_debug("page-break","table-row/row-groups: break allowed");
+        return true;
 
     } else if ( in_array($display, Table_Frame_Decorator::$ROW_GROUPS) ) {
 
-      // Disallow breaks at row-groups: only split at row boundaries
-      return false;
+        // Disallow breaks at row-groups: only split at row boundaries
+        return false;
 
     } else {
 
-      dompdf_debug("page-break", "? " . $frame->get_style()->display . "");
-      return false;
+        dompdf_debug("page-break", "? " . $frame->get_style()->display . "");
+        return false;
+    }
+
     }
 
-  }
-
-  /**
-   * Check if $frame will fit on the page.  If the frame does not fit,
-   * the frame tree is modified so that a page break occurs in the
-   * correct location.
-   *
-   * @param Frame $frame the frame to check
-   * @return Frame the frame following the page break
-   */
-  function check_page_break(Frame $frame) {
+    /**
+     * Check if $frame will fit on the page.  If the frame does not fit,
+     * the frame tree is modified so that a page break occurs in the
+     * correct location.
+     *
+     * @param Frame $frame the frame to check
+     * @return Frame the frame following the page break
+     */
+    function check_page_break(Frame $frame) {
     // Do not split if we have already
     if ( $this->_page_full )
-      return false;
+        return false;
 
     // Determine the frame's maximum y value
     $max_y = $frame->get_position("y") + $frame->get_margin_height();
@@ -440,18 +439,18 @@ 
     // parents of $frame must fit on the page as well:
     $p = $frame->get_parent();
     while ( $p ) {
-      $style = $p->get_style();
-      $max_y += $style->length_in_pt(array($style->margin_bottom,
-                                           $style->padding_bottom,
-                                           $style->border_bottom_width));
-      $p = $p->get_parent();
+        $style = $p->get_style();
+        $max_y += $style->length_in_pt(array($style->margin_bottom,
+                                            $style->padding_bottom,
+                                            $style->border_bottom_width));
+        $p = $p->get_parent();
     }
 
 
     // Check if $frame flows off the page
     if ( $max_y <= $this->_bottom_page_margin )
-      // no: do nothing
-      return false;
+        // no: do nothing
+        return false;
 
     dompdf_debug("page-break", "check_page_break");
     dompdf_debug("page-break", "in_table: " . $this->_in_table);
@@ -466,58 +465,58 @@ 
     dompdf_debug("page-break","Starting search");
     while ( $iter ) {
 //       echo "\nbacktrack: " .$iter->get_node()->nodeName ." ".spl_object_hash($iter->get_node()). "";
-      if ( $iter === $this ) {
-         dompdf_debug("page-break", "reached root.");
+        if ( $iter === $this ) {
+            dompdf_debug("page-break", "reached root.");
         // We've reached the root in our search.  Just split at $frame.
         break;
-      }
+        }
 
-      if ( $this->_page_break_allowed($iter) ) {
+        if ( $this->_page_break_allowed($iter) ) {
         dompdf_debug("page-break","break allowed, splitting.");
         $iter->split();
         $this->_page_full = true;
         $this->_in_table = $in_table;
         return true;
-      }
+        }
 
-      if ( !$flg && $next = $iter->get_last_child() ) {
-         dompdf_debug("page-break", "following last child.");
+        if ( !$flg && $next = $iter->get_last_child() ) {
+            dompdf_debug("page-break", "following last child.");
 
         if ( in_array($next->get_style()->display, Style::$TABLE_TYPES) )
-          $this->_in_table++;
+            $this->_in_table++;
 
         $iter = $next;
         continue;
-      }
+        }
 
-      if ( $next = $iter->get_prev_sibling() ) {
-         dompdf_debug("page-break", "following prev sibling.");
+        if ( $next = $iter->get_prev_sibling() ) {
+            dompdf_debug("page-break", "following prev sibling.");
 
         if ( in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
              !in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
-          $this->_in_table++;
+            $this->_in_table++;
 
         else if ( !in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
                   in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
-          $this->_in_table--;
+            $this->_in_table--;
 
         $iter = $next;
         $flg = false;
         continue;
-      }
+        }
 
-      if ( $next = $iter->get_parent() ) {
-         dompdf_debug("page-break", "following parent.");
+        if ( $next = $iter->get_parent() ) {
+            dompdf_debug("page-break", "following parent.");
 
         if ( in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
-          $this->_in_table--;
+            $this->_in_table--;
 
         $iter = $next;
         $flg = true;
         continue;
-      }
+        }
 
-      break;
+        break;
 
     }
 
@@ -528,33 +527,33 @@ 
 
     // If we are in a table, backtrack to the nearest top-level table row
     if ( $this->_in_table ) {
-      $num_tables = $this->_in_table - 1;
+        $num_tables = $this->_in_table - 1;
 
-      $iter = $frame;
-      while ( $iter && $num_tables && $iter->get_style->display !== "table" ) {
+        $iter = $frame;
+        while ( $iter && $num_tables && $iter->get_style->display !== "table" ) {
         $iter = $iter->get_parent();
         $num_tables--;
-      }
+        }
 
-      $iter = $frame;
-      while ($iter && $iter->get_style()->display !== "table-row" )
+        $iter = $frame;
+        while ($iter && $iter->get_style()->display !== "table-row" )
         $iter = $iter->get_parent();
 
-      $iter->split();
-      $this->_page_full = true;
-      return true;
+        $iter->split();
+        $this->_page_full = true;
+        return true;
     }
 
     $frame->split();
     $this->_page_full = true;
     return true;
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function split($frame = null) {
+    function split($frame = null) {
     // Do nothing
-  }
+    }
 
 }

Spacing +55 added lines, -55 removed lines

@@ -117,9 +117,9 @@ 
    * @param float $h
    */
   function set_containing_block($x = null, $y = null, $w = null, $h = null) {
-    parent::set_containing_block($x,$y,$w,$h);
+    parent::set_containing_block($x, $y, $w, $h);
     $w = $this->get_containing_block("w");
-    if ( isset($h) )
+    if (isset($h))
       $this->_bottom_page_margin = $h; // - $this->_frame->get_style()->length_in_pt($this->_frame->get_style()->margin_bottom, $w);
   }
 
@@ -176,7 +176,7 @@ 
   function check_forced_page_break(Frame $frame) {
 
     // Skip check if page is already split
-    if ( $this->_page_full )
+    if ($this->_page_full)
       return;
 
     $block_types = array("block", "list-item", "table");
@@ -184,15 +184,15 @@ 
 
     $style = $frame->get_style();
 
-    if ( !in_array($style->display, $block_types) )
+    if (!in_array($style->display, $block_types))
       return false;
 
     // Find the previous block-level sibling
     $prev = $frame->get_prev_sibling();
-    while ( $prev && !in_array($prev->get_style()->display, $block_types) )
+    while ($prev && !in_array($prev->get_style()->display, $block_types))
       $prev = $prev->get_prev_sibling();
 
-    if ( in_array($style->page_break_before, $page_breaks) ) {
+    if (in_array($style->page_break_before, $page_breaks)) {
 
       // Prevent cascading splits
       $frame->split();
@@ -203,7 +203,7 @@ 
       return true;
     }
 
-    if ( ($prev && in_array($prev->get_style()->page_break_after, $page_breaks)) ) {
+    if (($prev && in_array($prev->get_style()->page_break_after, $page_breaks))) {
       // Prevent cascading splits
       $frame->split();
       $prev->get_style()->page_break_after = "auto";
@@ -270,32 +270,32 @@ 
      */
 
     $block_types = array("block", "list-item", "table");
-    dompdf_debug("page-break", "_page_break_allowed(" . $frame->get_node()->nodeName. ")");
+    dompdf_debug("page-break", "_page_break_allowed(".$frame->get_node()->nodeName.")");
     $display = $frame->get_style()->display;
 
     // Block Frames (1):
-    if ( in_array($display, $block_types) ) {
+    if (in_array($display, $block_types)) {
 
       // Avoid breaks within table-cells
-      if ( $this->_in_table ) {
-        dompdf_debug("page-break", "In table: " . $this->_in_table);
+      if ($this->_in_table) {
+        dompdf_debug("page-break", "In table: ".$this->_in_table);
         return false;
       }
 
       // Rules A & B
 
-      if ( $frame->get_style()->page_break_before === "avoid" ) {
+      if ($frame->get_style()->page_break_before === "avoid") {
         dompdf_debug("page-break", "before: avoid");
         return false;
       }
 
       // Find the preceeding block-level sibling
       $prev = $frame->get_prev_sibling();
-      while ( $prev && !in_array($prev->get_style()->display, $block_types) )
+      while ($prev && !in_array($prev->get_style()->display, $block_types))
         $prev = $prev->get_prev_sibling();
 
       // Does the previous element allow a page break after?
-      if ( $prev && $prev->get_style()->page_break_after === "avoid" ) {
+      if ($prev && $prev->get_style()->page_break_after === "avoid") {
         dompdf_debug("page-break", "after: avoid");
         return false;
       }
@@ -303,7 +303,7 @@ 
       // If both $prev & $frame have the same parent, check the parent's
       // page_break_inside property.
       $parent = $frame->get_parent();
-      if ( $prev && $parent && $parent->get_style()->page_break_inside === "avoid" ) {
+      if ($prev && $parent && $parent->get_style()->page_break_inside === "avoid") {
           dompdf_debug("page-break", "parent inside: avoid");
         return false;
       }
@@ -311,7 +311,7 @@ 
       // To prevent cascading page breaks when a top-level element has
       // page-break-inside: avoid, ensure that at least one frame is
       // on the page before splitting.
-      if ( $parent->get_node()->nodeName === "body" && !$prev ) {
+      if ($parent->get_node()->nodeName === "body" && !$prev) {
         // We are the body's first child
           dompdf_debug("page-break", "Body's first child.");
         return false;
@@ -319,8 +319,8 @@ 
 
       // If the frame is the first block-level frame, use the value from
       // $frame's parent instead.
-      if ( !$prev && $parent )
-        return $this->_page_break_allowed( $parent );
+      if (!$prev && $parent)
+        return $this->_page_break_allowed($parent);
 
       dompdf_debug("page-break", "block: break allowed");
       return true;
@@ -328,17 +328,17 @@ 
     }
 
     // Inline frames (2):
-    else if ( in_array($display, Style::$INLINE_TYPES) ) {
+    else if (in_array($display, Style::$INLINE_TYPES)) {
 
       // Avoid breaks within table-cells
-      if ( $this->_in_table ) {
-          dompdf_debug("page-break", "In table: " . $this->_in_table);
+      if ($this->_in_table) {
+          dompdf_debug("page-break", "In table: ".$this->_in_table);
         return false;
       }
 
       // Rule C
       $block_parent = $frame->find_block_parent();
-      if ( count($block_parent->get_lines() ) < $frame->get_style()->orphans ) {
+      if (count($block_parent->get_lines()) < $frame->get_style()->orphans) {
           dompdf_debug("page-break", "orphans");
         return false;
       }
@@ -349,7 +349,7 @@ 
       // Rule D
       $p = $block_parent;
       while ($p) {
-        if ( $p->get_style()->page_break_inside === "avoid" ) {
+        if ($p->get_style()->page_break_inside === "avoid") {
           dompdf_debug("page-break", "parent->inside: avoid");
           return false;
         }
@@ -360,32 +360,32 @@ 
       // page-break-inside: avoid, ensure that at least one frame with
       // some content is on the page before splitting.
       $prev = $frame->get_prev_sibling();
-      while ( $prev && ($prev->get_node()->nodeName === "#text" && trim($prev->get_node()->nodeValue) == "") )
+      while ($prev && ($prev->get_node()->nodeName === "#text" && trim($prev->get_node()->nodeValue) == ""))
         $prev = $prev->get_prev_sibling();
 
-      if ( $block_parent->get_node()->nodeName === "body" && !$prev ) {
+      if ($block_parent->get_node()->nodeName === "body" && !$prev) {
         // We are the body's first child
           dompdf_debug("page-break", "Body's first child.");
         return false;
       }
 
       // Skip breaks on empty text nodes
-      if ( $frame->get_node()->nodeName === "#text" &&
-           $frame->get_node()->nodeValue == "" )
+      if ($frame->get_node()->nodeName === "#text" &&
+           $frame->get_node()->nodeValue == "")
         return false;
 
       dompdf_debug("page-break", "inline: break allowed");
       return true;
 
     // Table-rows
-    } else if ( $display === "table-row" ) {
+    } else if ($display === "table-row") {
 
       // Simply check if the parent table's page_break_inside property is
       // not 'avoid'
       $p = Table_Frame_Decorator::find_parent_table($frame);
 
       while ($p) {
-        if ( $p->get_style()->page_break_inside === "avoid" ) {
+        if ($p->get_style()->page_break_inside === "avoid") {
           dompdf_debug("page-break", "parent->inside: avoid");
           return false;
         }
@@ -393,28 +393,28 @@ 
       }
 
       // Avoid breaking after the first row of a table
-      if ( $p && $p->get_first_child() === $frame) {
+      if ($p && $p->get_first_child() === $frame) {
          dompdf_debug("page-break", "table: first-row");
         return false;
       }
 
       // If this is a nested table, prevent the page from breaking
-      if ( $this->_in_table > 1 ) {
+      if ($this->_in_table > 1) {
         dompdf_debug("page-break", "table: nested table");
         return false;
       }
 
-      dompdf_debug("page-break","table-row/row-groups: break allowed");
+      dompdf_debug("page-break", "table-row/row-groups: break allowed");
       return true;
 
-    } else if ( in_array($display, Table_Frame_Decorator::$ROW_GROUPS) ) {
+    } else if (in_array($display, Table_Frame_Decorator::$ROW_GROUPS)) {
 
       // Disallow breaks at row-groups: only split at row boundaries
       return false;
 
     } else {
 
-      dompdf_debug("page-break", "? " . $frame->get_style()->display . "");
+      dompdf_debug("page-break", "? ".$frame->get_style()->display."");
       return false;
     }
 
@@ -430,7 +430,7 @@ 
    */
   function check_page_break(Frame $frame) {
     // Do not split if we have already
-    if ( $this->_page_full )
+    if ($this->_page_full)
       return false;
 
     // Determine the frame's maximum y value
@@ -439,7 +439,7 @@ 
     // If a split is to occur here, then the bottom margins & paddings of all
     // parents of $frame must fit on the page as well:
     $p = $frame->get_parent();
-    while ( $p ) {
+    while ($p) {
       $style = $p->get_style();
       $max_y += $style->length_in_pt(array($style->margin_bottom,
                                            $style->padding_bottom,
@@ -449,12 +449,12 @@ 
 
 
     // Check if $frame flows off the page
-    if ( $max_y <= $this->_bottom_page_margin )
+    if ($max_y <= $this->_bottom_page_margin)
       // no: do nothing
       return false;
 
     dompdf_debug("page-break", "check_page_break");
-    dompdf_debug("page-break", "in_table: " . $this->_in_table);
+    dompdf_debug("page-break", "in_table: ".$this->_in_table);
 
 
     // yes: determine page break location
@@ -463,42 +463,42 @@ 
 
     $in_table = $this->_in_table;
 
-    dompdf_debug("page-break","Starting search");
-    while ( $iter ) {
+    dompdf_debug("page-break", "Starting search");
+    while ($iter) {
 //       echo "\nbacktrack: " .$iter->get_node()->nodeName ." ".spl_object_hash($iter->get_node()). "";
-      if ( $iter === $this ) {
+      if ($iter === $this) {
          dompdf_debug("page-break", "reached root.");
         // We've reached the root in our search.  Just split at $frame.
         break;
       }
 
-      if ( $this->_page_break_allowed($iter) ) {
-        dompdf_debug("page-break","break allowed, splitting.");
+      if ($this->_page_break_allowed($iter)) {
+        dompdf_debug("page-break", "break allowed, splitting.");
         $iter->split();
         $this->_page_full = true;
         $this->_in_table = $in_table;
         return true;
       }
 
-      if ( !$flg && $next = $iter->get_last_child() ) {
+      if (!$flg && $next = $iter->get_last_child()) {
          dompdf_debug("page-break", "following last child.");
 
-        if ( in_array($next->get_style()->display, Style::$TABLE_TYPES) )
+        if (in_array($next->get_style()->display, Style::$TABLE_TYPES))
           $this->_in_table++;
 
         $iter = $next;
         continue;
       }
 
-      if ( $next = $iter->get_prev_sibling() ) {
+      if ($next = $iter->get_prev_sibling()) {
          dompdf_debug("page-break", "following prev sibling.");
 
-        if ( in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
-             !in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
+        if (in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
+             !in_array($iter->get_style()->display, Style::$TABLE_TYPES))
           $this->_in_table++;
 
-        else if ( !in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
-                  in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
+        else if (!in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
+                  in_array($iter->get_style()->display, Style::$TABLE_TYPES))
           $this->_in_table--;
 
         $iter = $next;
@@ -506,10 +506,10 @@ 
         continue;
       }
 
-      if ( $next = $iter->get_parent() ) {
+      if ($next = $iter->get_parent()) {
          dompdf_debug("page-break", "following parent.");
 
-        if ( in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
+        if (in_array($iter->get_style()->display, Style::$TABLE_TYPES))
           $this->_in_table--;
 
         $iter = $next;
@@ -527,17 +527,17 @@ 
     dompdf_debug("page-break", "no valid break found, just splitting.");
 
     // If we are in a table, backtrack to the nearest top-level table row
-    if ( $this->_in_table ) {
+    if ($this->_in_table) {
       $num_tables = $this->_in_table - 1;
 
       $iter = $frame;
-      while ( $iter && $num_tables && $iter->get_style->display !== "table" ) {
+      while ($iter && $num_tables && $iter->get_style->display !== "table") {
         $iter = $iter->get_parent();
         $num_tables--;
       }
 
       $iter = $frame;
-      while ($iter && $iter->get_style()->display !== "table-row" )
+      while ($iter && $iter->get_style()->display !== "table-row")
         $iter = $iter->get_parent();
 
       $iter->split();

Braces +46 added lines, -32 removed lines

@@ -119,8 +119,10 @@ 
   function set_containing_block($x = null, $y = null, $w = null, $h = null) {
     parent::set_containing_block($x,$y,$w,$h);
     $w = $this->get_containing_block("w");
-    if ( isset($h) )
-      $this->_bottom_page_margin = $h; // - $this->_frame->get_style()->length_in_pt($this->_frame->get_style()->margin_bottom, $w);
+    if ( isset($h) ) {
+          $this->_bottom_page_margin = $h;
+    }
+    // - $this->_frame->get_style()->length_in_pt($this->_frame->get_style()->margin_bottom, $w);
   }
 
   /**
@@ -176,21 +178,24 @@ 
   function check_forced_page_break(Frame $frame) {
 
     // Skip check if page is already split
-    if ( $this->_page_full )
-      return;
+    if ( $this->_page_full ) {
+          return;
+    }
 
     $block_types = array("block", "list-item", "table");
     $page_breaks = array("always", "left", "right");
 
     $style = $frame->get_style();
 
-    if ( !in_array($style->display, $block_types) )
-      return false;
+    if ( !in_array($style->display, $block_types) ) {
+          return false;
+    }
 
     // Find the previous block-level sibling
     $prev = $frame->get_prev_sibling();
-    while ( $prev && !in_array($prev->get_style()->display, $block_types) )
-      $prev = $prev->get_prev_sibling();
+    while ( $prev && !in_array($prev->get_style()->display, $block_types) ) {
+          $prev = $prev->get_prev_sibling();
+    }
 
     if ( in_array($style->page_break_before, $page_breaks) ) {
 
@@ -291,8 +296,9 @@ 
 
       // Find the preceeding block-level sibling
       $prev = $frame->get_prev_sibling();
-      while ( $prev && !in_array($prev->get_style()->display, $block_types) )
-        $prev = $prev->get_prev_sibling();
+      while ( $prev && !in_array($prev->get_style()->display, $block_types) ) {
+              $prev = $prev->get_prev_sibling();
+      }
 
       // Does the previous element allow a page break after?
       if ( $prev && $prev->get_style()->page_break_after === "avoid" ) {
@@ -319,8 +325,9 @@ 
 
       // If the frame is the first block-level frame, use the value from
       // $frame's parent instead.
-      if ( !$prev && $parent )
-        return $this->_page_break_allowed( $parent );
+      if ( !$prev && $parent ) {
+              return $this->_page_break_allowed( $parent );
+      }
 
       dompdf_debug("page-break", "block: break allowed");
       return true;
@@ -360,8 +367,9 @@ 
       // page-break-inside: avoid, ensure that at least one frame with
       // some content is on the page before splitting.
       $prev = $frame->get_prev_sibling();
-      while ( $prev && ($prev->get_node()->nodeName === "#text" && trim($prev->get_node()->nodeValue) == "") )
-        $prev = $prev->get_prev_sibling();
+      while ( $prev && ($prev->get_node()->nodeName === "#text" && trim($prev->get_node()->nodeValue) == "") ) {
+              $prev = $prev->get_prev_sibling();
+      }
 
       if ( $block_parent->get_node()->nodeName === "body" && !$prev ) {
         // We are the body's first child
@@ -371,8 +379,9 @@ 
 
       // Skip breaks on empty text nodes
       if ( $frame->get_node()->nodeName === "#text" &&
-           $frame->get_node()->nodeValue == "" )
-        return false;
+           $frame->get_node()->nodeValue == "" ) {
+              return false;
+      }
 
       dompdf_debug("page-break", "inline: break allowed");
       return true;
@@ -430,8 +439,9 @@ 
    */
   function check_page_break(Frame $frame) {
     // Do not split if we have already
-    if ( $this->_page_full )
-      return false;
+    if ( $this->_page_full ) {
+          return false;
+    }
 
     // Determine the frame's maximum y value
     $max_y = $frame->get_position("y") + $frame->get_margin_height();
@@ -449,9 +459,10 @@ 
 
 
     // Check if $frame flows off the page
-    if ( $max_y <= $this->_bottom_page_margin )
-      // no: do nothing
+    if ( $max_y <= $this->_bottom_page_margin ) {
+          // no: do nothing
       return false;
+    }
 
     dompdf_debug("page-break", "check_page_break");
     dompdf_debug("page-break", "in_table: " . $this->_in_table);
@@ -483,8 +494,9 @@ 
       if ( !$flg && $next = $iter->get_last_child() ) {
          dompdf_debug("page-break", "following last child.");
 
-        if ( in_array($next->get_style()->display, Style::$TABLE_TYPES) )
-          $this->_in_table++;
+        if ( in_array($next->get_style()->display, Style::$TABLE_TYPES) ) {
+                  $this->_in_table++;
+        }
 
         $iter = $next;
         continue;
@@ -494,12 +506,12 @@ 
          dompdf_debug("page-break", "following prev sibling.");
 
         if ( in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
-             !in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
-          $this->_in_table++;
-
-        else if ( !in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
-                  in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
-          $this->_in_table--;
+             !in_array($iter->get_style()->display, Style::$TABLE_TYPES) ) {
+                  $this->_in_table++;
+        } else if ( !in_array($next->get_style()->display, Style::$TABLE_TYPES) &&
+                  in_array($iter->get_style()->display, Style::$TABLE_TYPES) ) {
+                  $this->_in_table--;
+        }
 
         $iter = $next;
         $flg = false;
@@ -509,8 +521,9 @@ 
       if ( $next = $iter->get_parent() ) {
          dompdf_debug("page-break", "following parent.");
 
-        if ( in_array($iter->get_style()->display, Style::$TABLE_TYPES) )
-          $this->_in_table--;
+        if ( in_array($iter->get_style()->display, Style::$TABLE_TYPES) ) {
+                  $this->_in_table--;
+        }
 
         $iter = $next;
         $flg = true;
@@ -537,8 +550,9 @@ 
       }
 
       $iter = $frame;
-      while ($iter && $iter->get_style()->display !== "table-row" )
-        $iter = $iter->get_parent();
+      while ($iter && $iter->get_style()->display !== "table-row" ) {
+              $iter = $iter->get_parent();
+      }
 
       $iter->split();
       $this->_page_full = true;

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

Doc Comments +5 added lines, -2 removed lines

@@ -442,6 +442,9 @@ 
    * @param string corner
    * @param string join
    * @param array dash
+   * @param double $width
+   * @param string $cap
+   * @param string $join
    */
   protected function _set_line_style($width, $cap, $join, $dash) {
 
@@ -795,8 +798,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,  $blend = "Normal", $opacity = 1.0) {

Indentation +527 added lines, -527 removed lines

@@ -1,46 +1,46 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: pdflib_adapter.cls.php,v $
- * Created on: 2005-02-28
- *
- * 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
- * - Clarify temp file name, optional debug output for temp file tracking
- */
+     * DOMPDF - PHP5 HTML to PDF renderer
+     *
+     * File: $RCSfile: pdflib_adapter.cls.php,v $
+     * Created on: 2005-02-28
+     *
+     * 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
+     * - Clarify temp file name, optional debug output for temp file tracking
+     */
 
 /* $Id: pdflib_adapter.cls.php 217 2010-03-11 23:03:57Z ryan.masten $ */
 
@@ -61,170 +61,170 @@ 
  */
 class PDFLib_Adapter implements Canvas {
 
-  /**
-   * Dimensions of paper sizes in points
-   *
-   * @var array;
-   */
-  static public $PAPER_SIZES = array(); // Set to
+    /**
+     * Dimensions of paper sizes in points
+     *
+     * @var array;
+     */
+    static public $PAPER_SIZES = array(); // Set to
                                         // CPDF_Adapter::$PAPER_SIZES below.
 
-  /**
-   * Fudge factor to adjust reported font heights
-   *
-   * CPDF reports larger font heights than PDFLib.  This factor
-   * adjusts the height reported by get_font_height().
-   *
-   * @var float
-   */
-  const FONT_HEIGHT_SCALE = 1.2;
-
-  /**
-   * Whether to create PDFs in memory or on disk
-   *
-   * @var bool
-   */
-  static $IN_MEMORY = true;
-
-  /**
-   * Instance of PDFLib class
-   *
-   * @var PDFlib
-   */
-  private $_pdf;
-
-  /**
-   * Name of temporary file used for PDFs created on disk
-   *
-   * @var string
-   */
-  private $_file;
-
-  /**
-   * PDF width, in points
-   *
-   * @var float
-   */
-  private $_width;
-
-  /**
-   * PDF height, in points
-   *
-   * @var height
-   */
-  private $_height;
-
-  /**
-   * Last fill colour used
-   *
-   * @var array
-   */
-  private $_last_fill_color;
-
-  /**
-   * Last stroke colour used
-   *
-   * @var array
-   */
-  private $_last_stroke_color;
-
-  /**
-   * Cache of image handles
-   *
-   * @var array
-   */
-  private $_imgs;
-
-  /**
-   * Cache of font handles
-   *
-   * @var array
-   */
-  private $_fonts;
-
-  /**
-   * List of objects (templates) to add to multiple pages
-   *
-   * @var array
-   */
-  private $_objs;
-
-  /**
-   * 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;
-
-  /**
-   * Class constructor
-   *
-   * @param mixed $paper The size of paper to use either a string (see {@link CPDF_Adapter::$PAPER_SIZES}) or
-   *                     an array(xmin,ymin,xmax,ymax)
-   * @param string $orientation The orientation of the document (either 'landscape' or 'portrait')
-   */
-  function __construct($paper = "letter", $orientation = "portrait") {
+    /**
+     * Fudge factor to adjust reported font heights
+     *
+     * CPDF reports larger font heights than PDFLib.  This factor
+     * adjusts the height reported by get_font_height().
+     *
+     * @var float
+     */
+    const FONT_HEIGHT_SCALE = 1.2;
+
+    /**
+     * Whether to create PDFs in memory or on disk
+     *
+     * @var bool
+     */
+    static $IN_MEMORY = true;
+
+    /**
+     * Instance of PDFLib class
+     *
+     * @var PDFlib
+     */
+    private $_pdf;
+
+    /**
+     * Name of temporary file used for PDFs created on disk
+     *
+     * @var string
+     */
+    private $_file;
+
+    /**
+     * PDF width, in points
+     *
+     * @var float
+     */
+    private $_width;
+
+    /**
+     * PDF height, in points
+     *
+     * @var height
+     */
+    private $_height;
+
+    /**
+     * Last fill colour used
+     *
+     * @var array
+     */
+    private $_last_fill_color;
+
+    /**
+     * Last stroke colour used
+     *
+     * @var array
+     */
+    private $_last_stroke_color;
+
+    /**
+     * Cache of image handles
+     *
+     * @var array
+     */
+    private $_imgs;
+
+    /**
+     * Cache of font handles
+     *
+     * @var array
+     */
+    private $_fonts;
+
+    /**
+     * List of objects (templates) to add to multiple pages
+     *
+     * @var array
+     */
+    private $_objs;
+
+    /**
+     * 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;
+
+    /**
+     * Class constructor
+     *
+     * @param mixed $paper The size of paper to use either a string (see {@link CPDF_Adapter::$PAPER_SIZES}) or
+     *                     an array(xmin,ymin,xmax,ymax)
+     * @param string $orientation The orientation 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->_width = $size[2] - $size[0];
     $this->_height= $size[3] - $size[1];
 
     $this->_pdf = new PDFLib();
 
-	if ( defined("DOMPDF_PDFLIB_LICENSE") )
-      $this->_pdf->set_parameter( "license", DOMPDF_PDFLIB_LICENSE);
+    if ( defined("DOMPDF_PDFLIB_LICENSE") )
+        $this->_pdf->set_parameter( "license", DOMPDF_PDFLIB_LICENSE);
 
-	$this->_pdf->set_parameter("textformat", "utf8");
+    $this->_pdf->set_parameter("textformat", "utf8");
     $this->_pdf->set_parameter("fontwarning", "false");
 
     $this->_pdf->set_info("Creator", "DOMPDF Converter");
 
     // Silence pedantic warnings about missing TZ settings
     if ( function_exists("date_default_timezone_get") ) {
-      $tz = @date_default_timezone_get();
-      date_default_timezone_set("UTC");
-      $this->_pdf->set_info("Date", date("Y-m-d"));
-      date_default_timezone_set($tz);
+        $tz = @date_default_timezone_get();
+        date_default_timezone_set("UTC");
+        $this->_pdf->set_info("Date", date("Y-m-d"));
+        date_default_timezone_set($tz);
     } else {
-      $this->_pdf->set_info("Date", date("Y-m-d"));
+        $this->_pdf->set_info("Date", date("Y-m-d"));
     }
 
     if ( self::$IN_MEMORY )
-      $this->_pdf->begin_document("","");
+        $this->_pdf->begin_document("","");
     else {
-      $this->_file = tempnam(DOMPDF_TEMP_DIR, "libdompdf_pdf_").'.pdf';
-      $this->_pdf->begin_document($this->_file,"");
+        $this->_file = tempnam(DOMPDF_TEMP_DIR, "libdompdf_pdf_").'.pdf';
+        $this->_pdf->begin_document($this->_file,"");
     }
 
     $this->_pdf->begin_page_ext($this->_width, $this->_height, "");
@@ -239,155 +239,155 @@ 
     // Set up font paths
     $families = Font_Metrics::get_font_families();
     foreach ($families as $family => $files) {
-      foreach ($files as $style => $file) {
+        foreach ($files as $style => $file) {
         $face = basename($file);
 
         // Prefer ttfs to afms
         if ( file_exists($file.".ttf") ) {
-          $outline = "$file.ttf";
-          $afm = null;
+            $outline = "$file.ttf";
+            $afm = null;
 
         } else if ( file_exists($file .".TTF") ) {
-          $outline = "$file.TTF";
-          $afm = null;
+            $outline = "$file.TTF";
+            $afm = null;
 
         } else if ( file_exists($file . ".pfb") ) {
-          $outline = "$file.pfb";
+            $outline = "$file.pfb";
 
-          if ( file_exists($file . ".afm") )
+            if ( file_exists($file . ".afm") )
             $afm = "$file.afm";
 
         } else if ( file_exists($file . ".PFB") ) {
-          $outline = "$file.PFB";
-          if ( file_exists($file . ".AFM") )
+            $outline = "$file.PFB";
+            if ( file_exists($file . ".AFM") )
             $afm = "$file.AFM";
         } else
-          continue;
+            continue;
 
         $this->_pdf->set_parameter("FontOutline", "\{$face\}=\{$outline\}");
         if ( !is_null($afm) )
-          $this->_pdf->set_parameter("FontAFM", "\{$face\}=\{$afm\}");
-      }
+            $this->_pdf->set_parameter("FontAFM", "\{$face\}=\{$afm\}");
+        }
+    }
     }
-  }
 
-  /**
-   * Close the pdf
-   */
-  protected function _close() {
+    /**
+     * Close the pdf
+     */
+    protected function _close() {
     $this->_place_objects();
 
     // Close all pages
     $this->_pdf->suspend_page("");
     for ($p = 1; $p <= $this->_page_count; $p++) {
-      $this->_pdf->resume_page("pagenumber=$p");
-      $this->_pdf->end_page_ext("");
+        $this->_pdf->resume_page("pagenumber=$p");
+        $this->_pdf->end_page_ext("");
     }
 
     $this->_pdf->end_document("");
-  }
-
-
-  /**
-   * Returns the PDFLib instance
-   *
-   * @return PDFLib
-   */
-  function get_pdflib() { 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 PDFLib instance
+     *
+     * @return PDFLib
+     */
+    function get_pdflib() { 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->set_info($label, $value);
-  }
+    }
   
-  /**
-   * Opens a new 'object' (template in PDFLib-speak)
-   *
-   * While an object is open, all drawing actions are recorded to the
-   * object instead of 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 PDFLib_Adapter::close_object()
-   * @see PDFLib_Adapter::add_object()
-   *
-   * @return int
-   */
-  function open_object() {
+    /**
+     * Opens a new 'object' (template in PDFLib-speak)
+     *
+     * While an object is open, all drawing actions are recorded to the
+     * object instead of 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 PDFLib_Adapter::close_object()
+     * @see PDFLib_Adapter::add_object()
+     *
+     * @return int
+     */
+    function open_object() {
     $this->_pdf->suspend_page("");
     $ret = $this->_pdf->begin_template($this->_width, $this->_height);
     $this->_pdf->save();
     $this->_objs[$ret] = array("start_page" => $this->_page_number);
     return $ret;
-  }
-
-  /**
-   * Reopen an existing object (NOT IMPLEMENTED)
-   *
-   * PDFLib does not seem to support reopening templates.
-   *
-   * @param int $object the ID of a previously opened object
-   */
-  function reopen_object($object) {
+    }
+
+    /**
+     * Reopen an existing object (NOT IMPLEMENTED)
+     *
+     * PDFLib does not seem to support reopening templates.
+     *
+     * @param int $object the ID of a previously opened object
+     */
+    function reopen_object($object) {
     throw new DOMPDF_Exception("PDFLib does not support reopening objects.");
-  }
-
-  /**
-   * Close the current template
-   *
-   * @see PDFLib_Adapter::open_object()
-   */
-  function close_object() {
+    }
+
+    /**
+     * Close the current template
+     *
+     * @see PDFLib_Adapter::open_object()
+     */
+    function close_object() {
     $this->_pdf->restore();
     $this->_pdf->end_template();
     $this->_pdf->resume_page("pagenumber=".$this->_page_number);
-  }
-
-  /**
-   * Adds the specified object to the document
-   *
-   * $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
-   *
-   * @param int $object the object handle returned by open_object()
-   * @param string $where
-   */
-  function add_object($object, $where = 'all') {
+    }
+
+    /**
+     * Adds the specified object to the document
+     *
+     * $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
+     *
+     * @param int $object the object handle returned by open_object()
+     * @param string $where
+     */
+    function add_object($object, $where = 'all') {
 
     if ( mb_strpos($where, "next") !== false ) {
-      $this->_objs[$object]["start_page"]++;
-      $where = str_replace("next", "", $where);
-      if ( $where == "" )
+        $this->_objs[$object]["start_page"]++;
+        $where = str_replace("next", "", $where);
+        if ( $where == "" )
         $where = "add";
     }
 
     $this->_objs[$object]["where"] = $where;
-  }
-
-  /**
-   * Stops the specified template 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 template 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) {
 
     if ( !isset($this->_objs[$object]) )
-      return;
+        return;
 
     $start = $this->_objs[$object]["start_page"];
     $where = $this->_objs[$object]["where"];
@@ -397,74 +397,74 @@ 
          (($this->_page_number % 2 == 0 && $where === "even") ||
           ($this->_page_number % 2 == 1 && $where === "odd") ||
           ($where === "all")) )
-      $this->_pdf->fit_image($object,0,0,"");
+        $this->_pdf->fit_image($object,0,0,"");
 
     unset($this->_objs[$object]);
-  }
+    }
 
-  /**
-   * Add all active objects to the current page
-   */
-  protected function _place_objects() {
+    /**
+     * Add all active objects to the current page
+     */
+    protected function _place_objects() {
 
     foreach ( $this->_objs as $obj => $props ) {
-      $start = $props["start_page"];
-      $where = $props["where"];
+        $start = $props["start_page"];
+        $where = $props["where"];
 
-      // Place the object on this page if required
-      if ( $this->_page_number >= $start &&
+        // Place the object on this page if required
+        if ( $this->_page_number >= $start &&
            (($this->_page_number % 2 == 0 && $where === "even") ||
             ($this->_page_number % 2 == 1 && $where === "odd") ||
             ($where === "all")) ) {
         $this->_pdf->fit_image($obj,0,0,"");
-      }
+        }
     }
 
-  }
+    }
 
-  function get_width() { return $this->_width; }
+    function get_width() { return $this->_width; }
 
-  function get_height() { return $this->_height; }
+    function get_height() { return $this->_height; }
 
-  function get_page_number() { return $this->_page_number; }
+    function get_page_number() { return $this->_page_number; }
 
-  function get_page_count() { return $this->_page_count; }
+    function get_page_count() { return $this->_page_count; }
 
-  function set_page_number($num) { $this->_page_number = (int)$num; }
+    function set_page_number($num) { $this->_page_number = (int)$num; }
 
-  function set_page_count($count) { $this->_page_count = (int)$count; }
+    function set_page_count($count) { $this->_page_count = (int)$count; }
 
 
-  /**
-   * Sets the line style
-   *
-   * @param float width
-   * @param string corner
-   * @param string join
-   * @param array dash
-   */
-  protected function _set_line_style($width, $cap, $join, $dash) {
+    /**
+     * Sets the line style
+     *
+     * @param float width
+     * @param string corner
+     * @param string join
+     * @param array dash
+     */
+    protected function _set_line_style($width, $cap, $join, $dash) {
 
     if ( count($dash) == 1 )
-      $dash[] = $dash[0];
+        $dash[] = $dash[0];
 
     if ( count($dash) > 1 )
-      $this->_pdf->setdashpattern("dasharray={" . join(" ", $dash) . "}");
+        $this->_pdf->setdashpattern("dasharray={" . join(" ", $dash) . "}");
     else
-      $this->_pdf->setdash(0,0);
+        $this->_pdf->setdash(0,0);
 
     switch ( $join ) {
     case "miter":
       $this->_pdf->setlinejoin(0);
-      break;
+        break;
 
     case "round":
       $this->_pdf->setlinejoin(1);
-      break;
+        break;
 
     case "bevel":
       $this->_pdf->setlinejoin(2);
-      break;
+        break;
 
     default:
       break;
@@ -473,15 +473,15 @@ 
     switch ( $cap ) {
     case "butt":
       $this->_pdf->setlinecap(0);
-      break;
+        break;
 
     case "round":
       $this->_pdf->setlinecap(1);
-      break;
+        break;
 
     case "square":
       $this->_pdf->setlinecap(2);
-      break;
+        break;
 
     default:
       break;
@@ -489,69 +489,69 @@ 
 
     $this->_pdf->setlinewidth($width);
 
-  }
+    }
 
-  /**
-   * Sets the line color
-   *
-   * @param array $color array(r,g,b)
-   */
-  protected function _set_stroke_color($color) {
+    /**
+     * Sets the line color
+     *
+     * @param array $color array(r,g,b)
+     */
+    protected function _set_stroke_color($color) {
     if($this->_last_stroke_color == $color)
-    	return;
+        return;
 
     $this->_last_stroke_color = $color;
 
     list($r,$g,$b) = $color;
     $this->_pdf->setcolor("stroke", "rgb", $r, $g, $b, 0);
-  }
-
-  /**
-   * Sets the fill color
-   *
-   * @param array $color array(r,g,b)
-   */
-  protected function _set_fill_color($color) {
+    }
+
+    /**
+     * Sets the fill color
+     *
+     * @param array $color array(r,g,b)
+     */
+    protected function _set_fill_color($color) {
     if($this->_last_fill_color == $color)
-    	return;
+        return;
 
     $this->_last_fill_color = $color;
 
     list($r,$g,$b) = $color;
     $this->_pdf->setcolor("fill", "rgb", $r, $g, $b, 0);
-  }
+    }
 
-  /**
-   * Loads a specific font and stores the corresponding descriptor.
-   *
-   * @param string $font
-   * @return int the font descriptor for the font
-   */
-  protected function _load_font($font, $encoding = null, $options = "") {
+    /**
+     * Loads a specific font and stores the corresponding descriptor.
+     *
+     * @param string $font
+     * @return int the font descriptor for the font
+     */
+    protected function _load_font($font, $encoding = null, $options = "") {
 
     // Check if the font is a native PDF font
     // Embed non-native fonts
     $native_fonts = array("courier", "courier-bold", "courier-oblique", "courier-boldoblique",
-                          "helvetica", "helvetica-bold", "helvetica-oblique", "helvetica-boldoblique",
-                          "times-roman", "times-bold", "times-italic", "times-bolditalic",
-                          "symbol", "zapfdinbats");
+                            "helvetica", "helvetica-bold", "helvetica-oblique", "helvetica-boldoblique",
+                            "times-roman", "times-bold", "times-italic", "times-bolditalic",
+                            "symbol", "zapfdinbats");
 
     $test = strtolower(basename($font));
     if ( in_array($test, $native_fonts) ) {
-      $font = basename($font);
+        $font = basename($font);
 
     } else {
-      // Embed non-native fonts
-      $options .= " embedding=true";
+        // Embed non-native fonts
+        $options .= " embedding=true";
     }
 
     if ( is_null($encoding) ) {
 
-      // Unicode encoding is only available for the commerical
-      // version of PDFlib and not PDFlib-Lite
-      if ( defined("DOMPDF_PDFLIB_LICENSE") )
+        // Unicode encoding is only available for the commerical
+        // version of PDFlib and not PDFlib-Lite
+        if ( defined("DOMPDF_PDFLIB_LICENSE") )
         $encoding = "unicode";
-      else
+        else
         $encoding = "auto";
 
     }
@@ -559,28 +559,28 @@ 
     $key = $font .":". $encoding .":". $options;
 
     if ( isset($this->_fonts[$key]) )
-      return $this->_fonts[$key];
+        return $this->_fonts[$key];
 
     else {
 
-      $this->_fonts[$key] = $this->_pdf->load_font($font, $encoding, $options);
-      return $this->_fonts[$key];
+        $this->_fonts[$key] = $this->_pdf->load_font($font, $encoding, $options);
+        return $this->_fonts[$key];
 
     }
 
-  }
+    }
 
-  /**
-   * 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; }
 
-  //........................................................................
+    //........................................................................
 
-  function line($x1, $y1, $x2, $y2, $color, $width, $style = null) {
+    function line($x1, $y1, $x2, $y2, $color, $width, $style = null) {
     $this->_set_line_style($width, "butt", "", $style);
     $this->_set_stroke_color($color);
 
@@ -590,11 +590,11 @@ 
     $this->_pdf->moveto($x1,$y1);
     $this->_pdf->lineto($x2, $y2);
     $this->_pdf->stroke();
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function rectangle($x1, $y1, $w, $h, $color, $width, $style = null) {
+    function rectangle($x1, $y1, $w, $h, $color, $width, $style = null) {
     $this->_set_stroke_color($color);
     $this->_set_line_style($width, "square", "miter", $style);
 
@@ -602,93 +602,93 @@ 
 
     $this->_pdf->rect($x1, $y1, $w, $h);
     $this->_pdf->stroke();
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function filled_rectangle($x1, $y1, $w, $h, $color) {
+    function filled_rectangle($x1, $y1, $w, $h, $color) {
     $this->_set_fill_color($color);
 
     $y1 = $this->y($y1) - $h;
 
     $this->_pdf->rect($x1, $y1, $w, $h);
     $this->_pdf->fill();
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function polygon($points, $color, $width = null, $style = null, $fill = false) {
+    function polygon($points, $color, $width = null, $style = null, $fill = false) {
 
     $this->_set_fill_color($color);
     $this->_set_stroke_color($color);
 
     if ( !$fill && isset($width) )
-      $this->_set_line_style($width, "square", "miter", $style);
+        $this->_set_line_style($width, "square", "miter", $style);
 
     $y = $this->y(array_pop($points));
     $x = array_pop($points);
     $this->_pdf->moveto($x,$y);
 
     while (count($points) > 1) {
-      $y = $this->y(array_pop($points));
-      $x = array_pop($points);
-      $this->_pdf->lineto($x,$y);
+        $y = $this->y(array_pop($points));
+        $x = array_pop($points);
+        $this->_pdf->lineto($x,$y);
     }
 
     if ( $fill )
-      $this->_pdf->fill();
+        $this->_pdf->fill();
     else
-      $this->_pdf->closepath_stroke();
-  }
+        $this->_pdf->closepath_stroke();
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false) {
+    function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false) {
 
     $this->_set_fill_color($color);
     $this->_set_stroke_color($color);
 
     if ( !$fill && isset($width) )
-      $this->_set_line_style($width, "round", "round", $style);
+        $this->_set_line_style($width, "round", "round", $style);
 
     $y = $this->y($y);
 
     $this->_pdf->circle($x, $y, $r);
 
     if ( $fill )
-      $this->_pdf->fill();
+        $this->_pdf->fill();
     else
-      $this->_pdf->stroke();
+        $this->_pdf->stroke();
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function image($img_url, $img_type, $x, $y, $w, $h) {
+    function image($img_url, $img_type, $x, $y, $w, $h) {
     $w = (int)$w;
     $h = (int)$h;
 
     $img_type = strtolower($img_type);
 
     if ( $img_type === "jpg" )
-      $img_type = "jpeg";
+        $img_type = "jpeg";
 
     if ( isset($this->_imgs[$img_url]) )
-      $img = $this->_imgs[$img_url];
+        $img = $this->_imgs[$img_url];
 
     else {
 
-      $img = $this->_imgs[$img_url] = $this->_pdf->load_image($img_type, $img_url, "");
+        $img = $this->_imgs[$img_url] = $this->_pdf->load_image($img_type, $img_url, "");
     }
 
     $y = $this->y($y) - $h;
     $this->_pdf->fit_image($img, $x, $y, 'boxsize={'. "$w $h" .'} fitmethod=entire');
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
+    function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
     $fh = $this->_load_font($font);
 
     $this->_pdf->setfont($fh, $size);
@@ -701,72 +701,72 @@ 
 
     $this->_pdf->fit_textline($text, $x, $y, "rotate=$angle wordspacing=$adjust");
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
   
-  function javascript($code) {
+    function javascript($code) {
     // Not implemented
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * 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->add_nameddest($anchorname,"");
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * 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->create_annotation($x, $y, $x + $width, $y + $height, 'Link', "contents={$url} destname=". substr($url,1) . " linewidth=0");
     } else {
 
-      list($proto, $host, $path, $file) = explode_url($url);
+        list($proto, $host, $path, $file) = explode_url($url);
 
-      if ( $proto == "" || $proto === "file://" )
+        if ( $proto == "" || $proto === "file://" )
         return; // Local links are not allowed
-      $url = build_url($proto, $host, $path, $file);
-      $url = '{' . rawurldecode($url) . '}';
+        $url = build_url($proto, $host, $path, $file);
+        $url = '{' . rawurldecode($url) . '}';
       
-      $action = $this->_pdf->create_action("URI", "url=" . $url);
-      $this->_pdf->create_annotation($x, $y, $x + $width, $y + $height, 'Link', "contents={$url} action={activate=$action} linewidth=0");
+        $action = $this->_pdf->create_action("URI", "url=" . $url);
+        $this->_pdf->create_annotation($x, $y, $x + $width, $y + $height, 'Link', "contents={$url} action={activate=$action} linewidth=0");
+    }
     }
-  }
 
-  //........................................................................
+    //........................................................................
 
-  function get_text_width($text, $font, $size, $spacing = 0) {
+    function get_text_width($text, $font, $size, $spacing = 0) {
     $fh = $this->_load_font($font);
 
     // Determine the additional width due to extra spacing
     $num_spaces = mb_substr_count($text," ");
     $delta = $spacing * $num_spaces;
     return $this->_pdf->stringwidth($text, $fh, $size) + $delta;
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function get_font_height($font, $size) {
+    function get_font_height($font, $size) {
 
     $fh = $this->_load_font($font);
 
@@ -777,54 +777,54 @@ 
 
     // $desc is usually < 0,
     return self::FONT_HEIGHT_SCALE * $size * ($asc - $desc);
-  }
-
-  //........................................................................
-
-  /**
-   * 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,  $blend = "Normal", $opacity = 1.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,  $blend = "Normal", $opacity = 1.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() {
 
     // Add objects to the current page
     $this->_place_objects();
@@ -833,69 +833,69 @@ 
     $this->_pdf->begin_page_ext($this->_width, $this->_height, "");
     $this->_page_number = ++$this->_page_count;
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * 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;
 
     $this->_pdf->suspend_page("");
 
     for ($p = 1; $p <= $this->_page_count; $p++) {
-      $this->_pdf->resume_page("pagenumber=$p");
+        $this->_pdf->resume_page("pagenumber=$p");
 
-      foreach ($this->_page_text as $pt) {
+        foreach ($this->_page_text as $pt) {
         extract($pt);
 
         switch ($_t) {
 
         case "text":
           $text = str_replace(array("{PAGE_NUM}","{PAGE_COUNT}"),
-                              array($p, $this->_page_count), $text);
-          $this->text($x, $y, $text, $font, $size, $color, $adjust, $angle);
-          break;
+                                array($p, $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' => $p, 'PAGE_COUNT' => $this->_page_count));
-          break;
+            }
+            $eval->evaluate($code, array('PAGE_NUM' => $p, 'PAGE_COUNT' => $this->_page_count));
+            break;
+        }
         }
-      }
 
-      $this->_pdf->suspend_page("");
+        $this->_pdf->suspend_page("");
     }
 
     $this->_pdf->resume_page("pagenumber=".$this->_page_number);
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function stream($filename, $options = null) {
+    function stream($filename, $options = null) {
 
     // Add page text
     $this->_add_page_text();
 
     if ( isset($options["compress"]) && $options["compress"] != 1 )
-      $this->_pdf->set_value("compress", 0);
+        $this->_pdf->set_value("compress", 0);
     else
-      $this->_pdf->set_value("compress", 6);
+        $this->_pdf->set_value("compress", 6);
 
     $this->_close();
 
     if ( self::$IN_MEMORY ) {
-      $data = $this->_pdf->get_buffer();
-      $size = strlen($data);
+        $data = $this->_pdf->get_buffer();
+        $size = strlen($data);
 
     } else
-      $size = filesize($this->_file);
+        $size = filesize($this->_file);
 
 
     $filename = str_replace(array("\n","'"),"", $filename);
@@ -908,63 +908,63 @@ 
     //header("Content-length: " . $size);
 
     if ( self::$IN_MEMORY )
-      echo $data;
+        echo $data;
 
     else {
 
-      // Chunked readfile()
-      $chunk = (1 << 21); // 2 MB
-      $fh = fopen($this->_file, "rb");
-      if ( !$fh )
+        // Chunked readfile()
+        $chunk = (1 << 21); // 2 MB
+        $fh = fopen($this->_file, "rb");
+        if ( !$fh )
         throw new DOMPDF_Exception("Unable to load temporary PDF file: " . $this->_file);
 
-      while ( !feof($fh) )
+        while ( !feof($fh) )
         echo fread($fh,$chunk);
-      fclose($fh);
+        fclose($fh);
 
-      //debugpng
-      if (DEBUGPNG) print '[pdflib stream unlink '.$this->_file.']';
-      if (!DEBUGKEEPTEMP)
+        //debugpng
+        if (DEBUGPNG) print '[pdflib stream unlink '.$this->_file.']';
+        if (!DEBUGKEEPTEMP)
 
-      unlink($this->_file);
-      $this->_file = null;
+        unlink($this->_file);
+        $this->_file = null;
     }
 
     flush();
 
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  function output($options = null) {
+    function output($options = null) {
 
     // Add page text
     $this->_add_page_text();
 
     if ( isset($options["compress"]) && $options["compress"] != 1 )
-      $this->_pdf->set_value("compress", 0);
+        $this->_pdf->set_value("compress", 0);
     else
-      $this->_pdf->set_value("compress", 6);
+        $this->_pdf->set_value("compress", 6);
 
     $this->_close();
 
     if ( self::$IN_MEMORY )
-      $data = $this->_pdf->get_buffer();
+        $data = $this->_pdf->get_buffer();
 
     else {
-      $data = file_get_contents($this->_file);
+        $data = file_get_contents($this->_file);
 
-      //debugpng
-      if (DEBUGPNG) print '[pdflib output unlink '.$this->_file.']';
-      if (!DEBUGKEEPTEMP)
+        //debugpng
+        if (DEBUGPNG) print '[pdflib output unlink '.$this->_file.']';
+        if (!DEBUGKEEPTEMP)
 
-      unlink($this->_file);
-      $this->_file = null;
+        unlink($this->_file);
+        $this->_file = null;
     }
 
     return $data;
-  }
+    }
 }
 
 // Workaround for idiotic limitation on statics...

Switch Indentation +34 added lines, -34 removed lines

@@ -454,37 +454,37 @@ 
       $this->_pdf->setdash(0,0);
 
     switch ( $join ) {
-    case "miter":
-      $this->_pdf->setlinejoin(0);
-      break;
+        case "miter":
+          $this->_pdf->setlinejoin(0);
+          break;
 
-    case "round":
-      $this->_pdf->setlinejoin(1);
-      break;
+        case "round":
+          $this->_pdf->setlinejoin(1);
+          break;
 
-    case "bevel":
-      $this->_pdf->setlinejoin(2);
-      break;
+        case "bevel":
+          $this->_pdf->setlinejoin(2);
+          break;
 
-    default:
-      break;
+        default:
+          break;
     }
 
     switch ( $cap ) {
-    case "butt":
-      $this->_pdf->setlinecap(0);
-      break;
+        case "butt":
+          $this->_pdf->setlinecap(0);
+          break;
 
-    case "round":
-      $this->_pdf->setlinecap(1);
-      break;
+        case "round":
+          $this->_pdf->setlinecap(1);
+          break;
 
-    case "square":
-      $this->_pdf->setlinecap(2);
-      break;
+        case "square":
+          $this->_pdf->setlinecap(2);
+          break;
 
-    default:
-      break;
+        default:
+          break;
     }
 
     $this->_pdf->setlinewidth($width);
@@ -855,18 +855,18 @@ 
 
         switch ($_t) {
 
-        case "text":
-          $text = str_replace(array("{PAGE_NUM}","{PAGE_COUNT}"),
-                              array($p, $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' => $p, 'PAGE_COUNT' => $this->_page_count));
-          break;
+            case "text":
+              $text = str_replace(array("{PAGE_NUM}","{PAGE_COUNT}"),
+                                  array($p, $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' => $p, 'PAGE_COUNT' => $this->_page_count));
+              break;
         }
       }
 

Spacing +82 added lines, -82 removed lines

@@ -185,25 +185,25 @@ 
    * @param string $orientation The orientation of the document (either 'landscape' or 'portrait')
    */
   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;
     }
     $this->_width = $size[2] - $size[0];
-    $this->_height= $size[3] - $size[1];
+    $this->_height = $size[3] - $size[1];
 
     $this->_pdf = new PDFLib();
 
-	if ( defined("DOMPDF_PDFLIB_LICENSE") )
-      $this->_pdf->set_parameter( "license", DOMPDF_PDFLIB_LICENSE);
+	if (defined("DOMPDF_PDFLIB_LICENSE"))
+      $this->_pdf->set_parameter("license", DOMPDF_PDFLIB_LICENSE);
 
 	$this->_pdf->set_parameter("textformat", "utf8");
     $this->_pdf->set_parameter("fontwarning", "false");
@@ -211,7 +211,7 @@ 
     $this->_pdf->set_info("Creator", "DOMPDF Converter");
 
     // Silence pedantic warnings about missing TZ settings
-    if ( function_exists("date_default_timezone_get") ) {
+    if (function_exists("date_default_timezone_get")) {
       $tz = @date_default_timezone_get();
       date_default_timezone_set("UTC");
       $this->_pdf->set_info("Date", date("Y-m-d"));
@@ -220,11 +220,11 @@ 
       $this->_pdf->set_info("Date", date("Y-m-d"));
     }
 
-    if ( self::$IN_MEMORY )
-      $this->_pdf->begin_document("","");
+    if (self::$IN_MEMORY)
+      $this->_pdf->begin_document("", "");
     else {
       $this->_file = tempnam(DOMPDF_TEMP_DIR, "libdompdf_pdf_").'.pdf';
-      $this->_pdf->begin_document($this->_file,"");
+      $this->_pdf->begin_document($this->_file, "");
     }
 
     $this->_pdf->begin_page_ext($this->_width, $this->_height, "");
@@ -243,29 +243,29 @@ 
         $face = basename($file);
 
         // Prefer ttfs to afms
-        if ( file_exists($file.".ttf") ) {
+        if (file_exists($file.".ttf")) {
           $outline = "$file.ttf";
           $afm = null;
 
-        } else if ( file_exists($file .".TTF") ) {
+        } else if (file_exists($file.".TTF")) {
           $outline = "$file.TTF";
           $afm = null;
 
-        } else if ( file_exists($file . ".pfb") ) {
+        } else if (file_exists($file.".pfb")) {
           $outline = "$file.pfb";
 
-          if ( file_exists($file . ".afm") )
+          if (file_exists($file.".afm"))
             $afm = "$file.afm";
 
-        } else if ( file_exists($file . ".PFB") ) {
+        } else if (file_exists($file.".PFB")) {
           $outline = "$file.PFB";
-          if ( file_exists($file . ".AFM") )
+          if (file_exists($file.".AFM"))
             $afm = "$file.AFM";
         } else
           continue;
 
         $this->_pdf->set_parameter("FontOutline", "\{$face\}=\{$outline\}");
-        if ( !is_null($afm) )
+        if (!is_null($afm))
           $this->_pdf->set_parameter("FontAFM", "\{$face\}=\{$afm\}");
       }
     }
@@ -366,10 +366,10 @@ 
    */
   function add_object($object, $where = 'all') {
 
-    if ( mb_strpos($where, "next") !== false ) {
+    if (mb_strpos($where, "next") !== false) {
       $this->_objs[$object]["start_page"]++;
       $where = str_replace("next", "", $where);
-      if ( $where == "" )
+      if ($where == "")
         $where = "add";
     }
 
@@ -386,18 +386,18 @@ 
    */
   function stop_object($object) {
 
-    if ( !isset($this->_objs[$object]) )
+    if (!isset($this->_objs[$object]))
       return;
 
     $start = $this->_objs[$object]["start_page"];
     $where = $this->_objs[$object]["where"];
 
     // Place the object on this page if required
-    if ( $this->_page_number >= $start &&
+    if ($this->_page_number >= $start &&
          (($this->_page_number % 2 == 0 && $where === "even") ||
           ($this->_page_number % 2 == 1 && $where === "odd") ||
-          ($where === "all")) )
-      $this->_pdf->fit_image($object,0,0,"");
+          ($where === "all")))
+      $this->_pdf->fit_image($object, 0, 0, "");
 
     unset($this->_objs[$object]);
   }
@@ -407,16 +407,16 @@ 
    */
   protected function _place_objects() {
 
-    foreach ( $this->_objs as $obj => $props ) {
+    foreach ($this->_objs as $obj => $props) {
       $start = $props["start_page"];
       $where = $props["where"];
 
       // Place the object on this page if required
-      if ( $this->_page_number >= $start &&
+      if ($this->_page_number >= $start &&
            (($this->_page_number % 2 == 0 && $where === "even") ||
             ($this->_page_number % 2 == 1 && $where === "odd") ||
-            ($where === "all")) ) {
-        $this->_pdf->fit_image($obj,0,0,"");
+            ($where === "all"))) {
+        $this->_pdf->fit_image($obj, 0, 0, "");
       }
     }
 
@@ -430,9 +430,9 @@ 
 
   function get_page_count() { return $this->_page_count; }
 
-  function set_page_number($num) { $this->_page_number = (int)$num; }
+  function set_page_number($num) { $this->_page_number = (int) $num; }
 
-  function set_page_count($count) { $this->_page_count = (int)$count; }
+  function set_page_count($count) { $this->_page_count = (int) $count; }
 
 
   /**
@@ -445,15 +445,15 @@ 
    */
   protected function _set_line_style($width, $cap, $join, $dash) {
 
-    if ( count($dash) == 1 )
+    if (count($dash) == 1)
       $dash[] = $dash[0];
 
-    if ( count($dash) > 1 )
-      $this->_pdf->setdashpattern("dasharray={" . join(" ", $dash) . "}");
+    if (count($dash) > 1)
+      $this->_pdf->setdashpattern("dasharray={".join(" ", $dash)."}");
     else
-      $this->_pdf->setdash(0,0);
+      $this->_pdf->setdash(0, 0);
 
-    switch ( $join ) {
+    switch ($join) {
     case "miter":
       $this->_pdf->setlinejoin(0);
       break;
@@ -470,7 +470,7 @@ 
       break;
     }
 
-    switch ( $cap ) {
+    switch ($cap) {
     case "butt":
       $this->_pdf->setlinecap(0);
       break;
@@ -497,12 +497,12 @@ 
    * @param array $color array(r,g,b)
    */
   protected function _set_stroke_color($color) {
-    if($this->_last_stroke_color == $color)
+    if ($this->_last_stroke_color == $color)
     	return;
 
     $this->_last_stroke_color = $color;
 
-    list($r,$g,$b) = $color;
+    list($r, $g, $b) = $color;
     $this->_pdf->setcolor("stroke", "rgb", $r, $g, $b, 0);
   }
 
@@ -512,12 +512,12 @@ 
    * @param array $color array(r,g,b)
    */
   protected function _set_fill_color($color) {
-    if($this->_last_fill_color == $color)
+    if ($this->_last_fill_color == $color)
     	return;
 
     $this->_last_fill_color = $color;
 
-    list($r,$g,$b) = $color;
+    list($r, $g, $b) = $color;
     $this->_pdf->setcolor("fill", "rgb", $r, $g, $b, 0);
   }
 
@@ -537,7 +537,7 @@ 
                           "symbol", "zapfdinbats");
 
     $test = strtolower(basename($font));
-    if ( in_array($test, $native_fonts) ) {
+    if (in_array($test, $native_fonts)) {
       $font = basename($font);
 
     } else {
@@ -545,20 +545,20 @@ 
       $options .= " embedding=true";
     }
 
-    if ( is_null($encoding) ) {
+    if (is_null($encoding)) {
 
       // Unicode encoding is only available for the commerical
       // version of PDFlib and not PDFlib-Lite
-      if ( defined("DOMPDF_PDFLIB_LICENSE") )
+      if (defined("DOMPDF_PDFLIB_LICENSE"))
         $encoding = "unicode";
       else
         $encoding = "auto";
 
     }
 
-    $key = $font .":". $encoding .":". $options;
+    $key = $font.":".$encoding.":".$options;
 
-    if ( isset($this->_fonts[$key]) )
+    if (isset($this->_fonts[$key]))
       return $this->_fonts[$key];
 
     else {
@@ -587,7 +587,7 @@ 
     $y1 = $this->y($y1);
     $y2 = $this->y($y2);
 
-    $this->_pdf->moveto($x1,$y1);
+    $this->_pdf->moveto($x1, $y1);
     $this->_pdf->lineto($x2, $y2);
     $this->_pdf->stroke();
   }
@@ -622,20 +622,20 @@ 
     $this->_set_fill_color($color);
     $this->_set_stroke_color($color);
 
-    if ( !$fill && isset($width) )
+    if (!$fill && isset($width))
       $this->_set_line_style($width, "square", "miter", $style);
 
     $y = $this->y(array_pop($points));
     $x = array_pop($points);
-    $this->_pdf->moveto($x,$y);
+    $this->_pdf->moveto($x, $y);
 
     while (count($points) > 1) {
       $y = $this->y(array_pop($points));
       $x = array_pop($points);
-      $this->_pdf->lineto($x,$y);
+      $this->_pdf->lineto($x, $y);
     }
 
-    if ( $fill )
+    if ($fill)
       $this->_pdf->fill();
     else
       $this->_pdf->closepath_stroke();
@@ -648,14 +648,14 @@ 
     $this->_set_fill_color($color);
     $this->_set_stroke_color($color);
 
-    if ( !$fill && isset($width) )
+    if (!$fill && isset($width))
       $this->_set_line_style($width, "round", "round", $style);
 
     $y = $this->y($y);
 
     $this->_pdf->circle($x, $y, $r);
 
-    if ( $fill )
+    if ($fill)
       $this->_pdf->fill();
     else
       $this->_pdf->stroke();
@@ -665,15 +665,15 @@ 
   //........................................................................
 
   function image($img_url, $img_type, $x, $y, $w, $h) {
-    $w = (int)$w;
-    $h = (int)$h;
+    $w = (int) $w;
+    $h = (int) $h;
 
     $img_type = strtolower($img_type);
 
-    if ( $img_type === "jpg" )
+    if ($img_type === "jpg")
       $img_type = "jpeg";
 
-    if ( isset($this->_imgs[$img_url]) )
+    if (isset($this->_imgs[$img_url]))
       $img = $this->_imgs[$img_url];
 
     else {
@@ -682,13 +682,13 @@ 
     }
 
     $y = $this->y($y) - $h;
-    $this->_pdf->fit_image($img, $x, $y, 'boxsize={'. "$w $h" .'} fitmethod=entire');
+    $this->_pdf->fit_image($img, $x, $y, 'boxsize={'."$w $h".'} fitmethod=entire');
 
   }
 
   //........................................................................
 
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0, $angle = 0) {
+  function text($x, $y, $text, $font, $size, $color = array(0, 0, 0), $adjust = 0, $angle = 0) {
     $fh = $this->_load_font($font);
 
     $this->_pdf->setfont($fh, $size);
@@ -696,8 +696,8 @@ 
 
     $y = $this->y($y) - Font_Metrics::get_font_height($font, $size);
 
-    $adjust = (float)$adjust;
-    $angle = -(float)$angle;
+    $adjust = (float) $adjust;
+    $angle = -(float) $angle;
 
     $this->_pdf->fit_textline($text, $x, $y, "rotate=$angle wordspacing=$adjust");
 
@@ -717,7 +717,7 @@ 
    * @param string $anchorname The name of the named destination
    */
   function add_named_dest($anchorname) {
-    $this->_pdf->add_nameddest($anchorname,"");
+    $this->_pdf->add_nameddest($anchorname, "");
   }
 
   //........................................................................
@@ -734,21 +734,21 @@ 
   function add_link($url, $x, $y, $width, $height) {
 
     $y = $this->y($y) - $height;
-    if ( strpos($url, '#') === 0 ) {
+    if (strpos($url, '#') === 0) {
       // Local link
-      $name = substr($url,1);
-      if ( $name )
-        $this->_pdf->create_annotation($x, $y, $x + $width, $y + $height, 'Link', "contents={$url} destname=". substr($url,1) . " linewidth=0");
+      $name = substr($url, 1);
+      if ($name)
+        $this->_pdf->create_annotation($x, $y, $x + $width, $y + $height, 'Link', "contents={$url} destname=".substr($url, 1)." linewidth=0");
     } else {
 
       list($proto, $host, $path, $file) = explode_url($url);
 
-      if ( $proto == "" || $proto === "file://" )
+      if ($proto == "" || $proto === "file://")
         return; // Local links are not allowed
       $url = build_url($proto, $host, $path, $file);
-      $url = '{' . rawurldecode($url) . '}';
+      $url = '{'.rawurldecode($url).'}';
       
-      $action = $this->_pdf->create_action("URI", "url=" . $url);
+      $action = $this->_pdf->create_action("URI", "url=".$url);
       $this->_pdf->create_annotation($x, $y, $x + $width, $y + $height, 'Link', "contents={$url} action={activate=$action} linewidth=0");
     }
   }
@@ -759,7 +759,7 @@ 
     $fh = $this->_load_font($font);
 
     // Determine the additional width due to extra spacing
-    $num_spaces = mb_substr_count($text," ");
+    $num_spaces = mb_substr_count($text, " ");
     $delta = $spacing * $num_spaces;
     return $this->_pdf->stringwidth($text, $fh, $size) + $delta;
   }
@@ -798,8 +798,8 @@ 
    * @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,  $blend = "Normal", $opacity = 1.0) {
+  function page_text($x, $y, $text, $font, $size, $color = array(0, 0, 0),
+                     $adjust = 0, $angle = 0, $blend = "Normal", $opacity = 1.0) {
     $_t = "text";
     $this->_page_text[] = compact("_t", "x", "y", "text", "font", "size", "color", "adjust", "angle");
   }
@@ -842,7 +842,7 @@ 
    */
   protected function _add_page_text() {
 
-    if ( !count($this->_page_text) )
+    if (!count($this->_page_text))
       return;
 
     $this->_pdf->suspend_page("");
@@ -856,7 +856,7 @@ 
         switch ($_t) {
 
         case "text":
-          $text = str_replace(array("{PAGE_NUM}","{PAGE_COUNT}"),
+          $text = str_replace(array("{PAGE_NUM}", "{PAGE_COUNT}"),
                               array($p, $this->_page_count), $text);
           $this->text($x, $y, $text, $font, $size, $color, $adjust, $angle);
           break;
@@ -883,14 +883,14 @@ 
     // Add page text
     $this->_add_page_text();
 
-    if ( isset($options["compress"]) && $options["compress"] != 1 )
+    if (isset($options["compress"]) && $options["compress"] != 1)
       $this->_pdf->set_value("compress", 0);
     else
       $this->_pdf->set_value("compress", 6);
 
     $this->_close();
 
-    if ( self::$IN_MEMORY ) {
+    if (self::$IN_MEMORY) {
       $data = $this->_pdf->get_buffer();
       $size = strlen($data);
 
@@ -898,7 +898,7 @@ 
       $size = filesize($this->_file);
 
 
-    $filename = str_replace(array("\n","'"),"", $filename);
+    $filename = str_replace(array("\n", "'"), "", $filename);
     $attach = (isset($options["Attachment"]) && $options["Attachment"]) ? "attachment" : "inline";
 
     header("Cache-Control: private");
@@ -907,7 +907,7 @@ 
 
     //header("Content-length: " . $size);
 
-    if ( self::$IN_MEMORY )
+    if (self::$IN_MEMORY)
       echo $data;
 
     else {
@@ -915,11 +915,11 @@ 
       // Chunked readfile()
       $chunk = (1 << 21); // 2 MB
       $fh = fopen($this->_file, "rb");
-      if ( !$fh )
-        throw new DOMPDF_Exception("Unable to load temporary PDF file: " . $this->_file);
+      if (!$fh)
+        throw new DOMPDF_Exception("Unable to load temporary PDF file: ".$this->_file);
 
-      while ( !feof($fh) )
-        echo fread($fh,$chunk);
+      while (!feof($fh))
+        echo fread($fh, $chunk);
       fclose($fh);
 
       //debugpng
@@ -942,14 +942,14 @@ 
     // Add page text
     $this->_add_page_text();
 
-    if ( isset($options["compress"]) && $options["compress"] != 1 )
+    if (isset($options["compress"]) && $options["compress"] != 1)
       $this->_pdf->set_value("compress", 0);
     else
       $this->_pdf->set_value("compress", 6);
 
     $this->_close();
 
-    if ( self::$IN_MEMORY )
+    if (self::$IN_MEMORY)
       $data = $this->_pdf->get_buffer();
 
     else {

Braces +125 added lines, -95 removed lines

@@ -185,12 +185,13 @@ 
    * @param string $orientation The orientation of the document (either 'landscape' or 'portrait')
    */
   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];
@@ -202,8 +203,9 @@ 
 
     $this->_pdf = new PDFLib();
 
-	if ( defined("DOMPDF_PDFLIB_LICENSE") )
-      $this->_pdf->set_parameter( "license", DOMPDF_PDFLIB_LICENSE);
+	if ( defined("DOMPDF_PDFLIB_LICENSE") ) {
+	      $this->_pdf->set_parameter( "license", DOMPDF_PDFLIB_LICENSE);
+	}
 
 	$this->_pdf->set_parameter("textformat", "utf8");
     $this->_pdf->set_parameter("fontwarning", "false");
@@ -220,9 +222,9 @@ 
       $this->_pdf->set_info("Date", date("Y-m-d"));
     }
 
-    if ( self::$IN_MEMORY )
-      $this->_pdf->begin_document("","");
-    else {
+    if ( self::$IN_MEMORY ) {
+          $this->_pdf->begin_document("","");
+    } else {
       $this->_file = tempnam(DOMPDF_TEMP_DIR, "libdompdf_pdf_").'.pdf';
       $this->_pdf->begin_document($this->_file,"");
     }
@@ -254,19 +256,23 @@ 
         } else if ( file_exists($file . ".pfb") ) {
           $outline = "$file.pfb";
 
-          if ( file_exists($file . ".afm") )
-            $afm = "$file.afm";
+          if ( file_exists($file . ".afm") ) {
+                      $afm = "$file.afm";
+          }
 
         } else if ( file_exists($file . ".PFB") ) {
           $outline = "$file.PFB";
-          if ( file_exists($file . ".AFM") )
-            $afm = "$file.AFM";
-        } else
-          continue;
+          if ( file_exists($file . ".AFM") ) {
+                      $afm = "$file.AFM";
+          }
+        } else {
+                  continue;
+        }
 
         $this->_pdf->set_parameter("FontOutline", "\{$face\}=\{$outline\}");
-        if ( !is_null($afm) )
-          $this->_pdf->set_parameter("FontAFM", "\{$face\}=\{$afm\}");
+        if ( !is_null($afm) ) {
+                  $this->_pdf->set_parameter("FontAFM", "\{$face\}=\{$afm\}");
+        }
       }
     }
   }
@@ -369,8 +375,9 @@ 
     if ( mb_strpos($where, "next") !== false ) {
       $this->_objs[$object]["start_page"]++;
       $where = str_replace("next", "", $where);
-      if ( $where == "" )
-        $where = "add";
+      if ( $where == "" ) {
+              $where = "add";
+      }
     }
 
     $this->_objs[$object]["where"] = $where;
@@ -386,8 +393,9 @@ 
    */
   function stop_object($object) {
 
-    if ( !isset($this->_objs[$object]) )
-      return;
+    if ( !isset($this->_objs[$object]) ) {
+          return;
+    }
 
     $start = $this->_objs[$object]["start_page"];
     $where = $this->_objs[$object]["where"];
@@ -396,8 +404,9 @@ 
     if ( $this->_page_number >= $start &&
          (($this->_page_number % 2 == 0 && $where === "even") ||
           ($this->_page_number % 2 == 1 && $where === "odd") ||
-          ($where === "all")) )
-      $this->_pdf->fit_image($object,0,0,"");
+          ($where === "all")) ) {
+          $this->_pdf->fit_image($object,0,0,"");
+    }
 
     unset($this->_objs[$object]);
   }
@@ -445,13 +454,15 @@ 
    */
   protected function _set_line_style($width, $cap, $join, $dash) {
 
-    if ( count($dash) == 1 )
-      $dash[] = $dash[0];
+    if ( count($dash) == 1 ) {
+          $dash[] = $dash[0];
+    }
 
-    if ( count($dash) > 1 )
-      $this->_pdf->setdashpattern("dasharray={" . join(" ", $dash) . "}");
-    else
-      $this->_pdf->setdash(0,0);
+    if ( count($dash) > 1 ) {
+          $this->_pdf->setdashpattern("dasharray={" . join(" ", $dash) . "}");
+    } else {
+          $this->_pdf->setdash(0,0);
+    }
 
     switch ( $join ) {
     case "miter":
@@ -497,8 +508,9 @@ 
    * @param array $color array(r,g,b)
    */
   protected function _set_stroke_color($color) {
-    if($this->_last_stroke_color == $color)
-    	return;
+    if($this->_last_stroke_color == $color) {
+        	return;
+    }
 
     $this->_last_stroke_color = $color;
 
@@ -512,8 +524,9 @@ 
    * @param array $color array(r,g,b)
    */
   protected function _set_fill_color($color) {
-    if($this->_last_fill_color == $color)
-    	return;
+    if($this->_last_fill_color == $color) {
+        	return;
+    }
 
     $this->_last_fill_color = $color;
 
@@ -549,19 +562,19 @@ 
 
       // Unicode encoding is only available for the commerical
       // version of PDFlib and not PDFlib-Lite
-      if ( defined("DOMPDF_PDFLIB_LICENSE") )
-        $encoding = "unicode";
-      else
-        $encoding = "auto";
+      if ( defined("DOMPDF_PDFLIB_LICENSE") ) {
+              $encoding = "unicode";
+      } else {
+              $encoding = "auto";
+      }
 
     }
 
     $key = $font .":". $encoding .":". $options;
 
-    if ( isset($this->_fonts[$key]) )
-      return $this->_fonts[$key];
-
-    else {
+    if ( isset($this->_fonts[$key]) ) {
+          return $this->_fonts[$key];
+    } else {
 
       $this->_fonts[$key] = $this->_pdf->load_font($font, $encoding, $options);
       return $this->_fonts[$key];
@@ -622,8 +635,9 @@ 
     $this->_set_fill_color($color);
     $this->_set_stroke_color($color);
 
-    if ( !$fill && isset($width) )
-      $this->_set_line_style($width, "square", "miter", $style);
+    if ( !$fill && isset($width) ) {
+          $this->_set_line_style($width, "square", "miter", $style);
+    }
 
     $y = $this->y(array_pop($points));
     $x = array_pop($points);
@@ -635,10 +649,11 @@ 
       $this->_pdf->lineto($x,$y);
     }
 
-    if ( $fill )
-      $this->_pdf->fill();
-    else
-      $this->_pdf->closepath_stroke();
+    if ( $fill ) {
+          $this->_pdf->fill();
+    } else {
+          $this->_pdf->closepath_stroke();
+    }
   }
 
   //........................................................................
@@ -648,17 +663,19 @@ 
     $this->_set_fill_color($color);
     $this->_set_stroke_color($color);
 
-    if ( !$fill && isset($width) )
-      $this->_set_line_style($width, "round", "round", $style);
+    if ( !$fill && isset($width) ) {
+          $this->_set_line_style($width, "round", "round", $style);
+    }
 
     $y = $this->y($y);
 
     $this->_pdf->circle($x, $y, $r);
 
-    if ( $fill )
-      $this->_pdf->fill();
-    else
-      $this->_pdf->stroke();
+    if ( $fill ) {
+          $this->_pdf->fill();
+    } else {
+          $this->_pdf->stroke();
+    }
 
   }
 
@@ -670,13 +687,13 @@ 
 
     $img_type = strtolower($img_type);
 
-    if ( $img_type === "jpg" )
-      $img_type = "jpeg";
-
-    if ( isset($this->_imgs[$img_url]) )
-      $img = $this->_imgs[$img_url];
+    if ( $img_type === "jpg" ) {
+          $img_type = "jpeg";
+    }
 
-    else {
+    if ( isset($this->_imgs[$img_url]) ) {
+          $img = $this->_imgs[$img_url];
+    } else {
 
       $img = $this->_imgs[$img_url] = $this->_pdf->load_image($img_type, $img_url, "");
     }
@@ -737,14 +754,17 @@ 
     if ( strpos($url, '#') === 0 ) {
       // Local link
       $name = substr($url,1);
-      if ( $name )
-        $this->_pdf->create_annotation($x, $y, $x + $width, $y + $height, 'Link', "contents={$url} destname=". substr($url,1) . " linewidth=0");
+      if ( $name ) {
+              $this->_pdf->create_annotation($x, $y, $x + $width, $y + $height, 'Link', "contents={$url} destname=". substr($url,1) . " linewidth=0");
+      }
     } else {
 
       list($proto, $host, $path, $file) = explode_url($url);
 
-      if ( $proto == "" || $proto === "file://" )
-        return; // Local links are not allowed
+      if ( $proto == "" || $proto === "file://" ) {
+              return;
+      }
+      // Local links are not allowed
       $url = build_url($proto, $host, $path, $file);
       $url = '{' . rawurldecode($url) . '}';
       
@@ -842,8 +862,9 @@ 
    */
   protected function _add_page_text() {
 
-    if ( !count($this->_page_text) )
-      return;
+    if ( !count($this->_page_text) ) {
+          return;
+    }
 
     $this->_pdf->suspend_page("");
 
@@ -883,10 +904,11 @@ 
     // Add page text
     $this->_add_page_text();
 
-    if ( isset($options["compress"]) && $options["compress"] != 1 )
-      $this->_pdf->set_value("compress", 0);
-    else
-      $this->_pdf->set_value("compress", 6);
+    if ( isset($options["compress"]) && $options["compress"] != 1 ) {
+          $this->_pdf->set_value("compress", 0);
+    } else {
+          $this->_pdf->set_value("compress", 6);
+    }
 
     $this->_close();
 
@@ -894,8 +916,9 @@ 
       $data = $this->_pdf->get_buffer();
       $size = strlen($data);
 
-    } else
-      $size = filesize($this->_file);
+    } else {
+          $size = filesize($this->_file);
+    }
 
 
     $filename = str_replace(array("\n","'"),"", $filename);
@@ -907,26 +930,30 @@ 
 
     //header("Content-length: " . $size);
 
-    if ( self::$IN_MEMORY )
-      echo $data;
-
-    else {
+    if ( self::$IN_MEMORY ) {
+          echo $data;
+    } else {
 
       // Chunked readfile()
       $chunk = (1 << 21); // 2 MB
       $fh = fopen($this->_file, "rb");
-      if ( !$fh )
-        throw new DOMPDF_Exception("Unable to load temporary PDF file: " . $this->_file);
+      if ( !$fh ) {
+              throw new DOMPDF_Exception("Unable to load temporary PDF file: " . $this->_file);
+      }
 
-      while ( !feof($fh) )
-        echo fread($fh,$chunk);
+      while ( !feof($fh) ) {
+              echo fread($fh,$chunk);
+      }
       fclose($fh);
 
       //debugpng
-      if (DEBUGPNG) print '[pdflib stream unlink '.$this->_file.']';
-      if (!DEBUGKEEPTEMP)
-
+      if (DEBUGPNG) {
+          print '[pdflib stream unlink '.$this->_file.']';
+      }
+      if (!DEBUGKEEPTEMP) {
+      
       unlink($this->_file);
+      }
       $this->_file = null;
     }
 
@@ -942,24 +969,27 @@ 
     // Add page text
     $this->_add_page_text();
 
-    if ( isset($options["compress"]) && $options["compress"] != 1 )
-      $this->_pdf->set_value("compress", 0);
-    else
-      $this->_pdf->set_value("compress", 6);
+    if ( isset($options["compress"]) && $options["compress"] != 1 ) {
+          $this->_pdf->set_value("compress", 0);
+    } else {
+          $this->_pdf->set_value("compress", 6);
+    }
 
     $this->_close();
 
-    if ( self::$IN_MEMORY )
-      $data = $this->_pdf->get_buffer();
-
-    else {
+    if ( self::$IN_MEMORY ) {
+          $data = $this->_pdf->get_buffer();
+    } else {
       $data = file_get_contents($this->_file);
 
       //debugpng
-      if (DEBUGPNG) print '[pdflib output unlink '.$this->_file.']';
-      if (!DEBUGKEEPTEMP)
-
+      if (DEBUGPNG) {
+          print '[pdflib output unlink '.$this->_file.']';
+      }
+      if (!DEBUGKEEPTEMP) {
+      
       unlink($this->_file);
+      }
       $this->_file = null;
     }
 

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

Doc Comments +27 added lines, -2 removed lines

@@ -742,6 +742,10 @@ 
    * Assume that __set will be also called when this is called, so do not check validity again.
    * Only created, if !important exists -> always set true.
    */
+
+  /**
+   * @param string $prop
+   */
   function important_set($prop) {
       $prop = str_replace("-", "_", $prop);
       $this->_important_props[$prop] = true;
@@ -1276,7 +1280,8 @@ 
   /**
    * Return a single border property
    *
-   * @return mixed
+   * @param string $side
+   * @return string
    */
   protected function _get_border($side) {
     $color = $this->__get("border_" . $side . "_color");
@@ -1363,6 +1368,10 @@ 
    * Applicable for background, border, padding, margin, font, list_style
    * Note: $type has a leading underscore (or is empty), the others not.
    */
+
+  /**
+   * @param string $side
+   */
   protected function _set_style_side_type($style,$side,$type,$val,$important) {
     if ( !isset($this->_important_props[$style.'_'.$side.$type]) || $important) {
       //see __set and __get, on all assignments clear cache!
@@ -1381,6 +1390,9 @@ 
       $this->_set_style_side_type($style,'left',$type,$left,$important);
   }
 
+  /**
+   * @param boolean $important
+   */
   protected function _set_style_type($style,$type,$val,$important) {
     $arr = explode(" ", $val);
     switch (count($arr)) {
@@ -1404,6 +1416,10 @@ 
     $this->_props[$style.$type] = $val;
   }
 
+  /**
+   * @param string $style
+   * @param string $type
+   */
   protected function _set_style_type_important($style,$type,$val) {
     $this->_set_style_type($style,$type,$val,isset($this->_important_props[$style.$type]));
   }
@@ -1411,12 +1427,21 @@ 
   /* Anyway only called if _important matches and is assigned
    * E.g. _set_style_side_type($style,$side,'',str_replace("none", "0px", $val),isset($this->_important_props[$style.'_'.$side]));
    */
+
+  /**
+   * @param string $style
+   * @param string $side
+   */
   protected function _set_style_side_width_important($style,$side,$val) {
     //see __set and __get, on all assignments clear cache!
     $this->_prop_cache[$style.'_'.$side] = null;
     $this->_props[$style.'_'.$side] = str_replace("none", "0px", $val);
   }
 
+  /**
+   * @param string $style
+   * @param boolean $important
+   */
   protected function _set_style($style,$val,$important) {
     if ( !isset($this->_important_props[$style]) || $important) {
       if ($important) {
@@ -1505,7 +1530,6 @@ 
    * Set the background image url
    *
    * @link http://www.w3.org/TR/CSS21/colors.html#background-properties
-   * @param string $url
    */
   function set_background_image($val) {
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
@@ -1769,6 +1793,7 @@ 
    *
    * @param string $side
    * @param string $border_spec  ([width] [style] [color])
+   * @param boolean $important
    */
   protected function _set_border($side, $border_spec, $important) {
     $border_spec = str_replace(",", " ", $border_spec);

Switch Indentation +201 added lines, -201 removed lines

@@ -592,130 +592,130 @@ 
     // Handle colour names
     switch ($colour) {
 
-    case "maroon":
-      $r = 0x80;
-      break;
-
-    case "red":
-      $r = 0xff;
-      break;
-
-    case "orange":
-      $r = 0xff;
-      $g = 0xa5;
-      break;
-
-    case "yellow":
-      $r = 0xff;
-      $g = 0xff;
-      break;
-
-    case "olive":
-      $r = 0x80;
-      $g = 0x80;
-      break;
-
-    case "purple":
-      $r = 0x80;
-      $b = 0x80;
-      break;
-
-    case "fuchsia":
-      $r = 0xff;
-      $b = 0xff;
-      break;
-
-    case "white":
-      $r = $g = $b = 0xff;
-      break;
-
-    case "lime":
-      $g = 0xff;
-      break;
-
-    case "green":
-      $g = 0x80;
-      break;
-
-    case "navy":
-      $b = 0x80;
-      break;
-
-    case "blue":
-      $b = 0xff;
-      break;
-
-    case "aqua":
-      $g = 0xff;
-      $b = 0xff;
-      break;
-
-    case "teal":
-      $g = 0x80;
-      $b = 0x80;
-      break;
-
-    case "black":
-      break;
-
-    case "sliver":
-      $r = $g = $b = 0xc0;
-      break;
-
-    case "gray":
-    case "grey":
-      $r = $g = $b = 0x80;
-      break;
-
-    case "transparent":
-      return "transparent";
+        case "maroon":
+          $r = 0x80;
+          break;
+
+        case "red":
+          $r = 0xff;
+          break;
+
+        case "orange":
+          $r = 0xff;
+          $g = 0xa5;
+          break;
+
+        case "yellow":
+          $r = 0xff;
+          $g = 0xff;
+          break;
+
+        case "olive":
+          $r = 0x80;
+          $g = 0x80;
+          break;
+
+        case "purple":
+          $r = 0x80;
+          $b = 0x80;
+          break;
+
+        case "fuchsia":
+          $r = 0xff;
+          $b = 0xff;
+          break;
+
+        case "white":
+          $r = $g = $b = 0xff;
+          break;
+
+        case "lime":
+          $g = 0xff;
+          break;
+
+        case "green":
+          $g = 0x80;
+          break;
+
+        case "navy":
+          $b = 0x80;
+          break;
+
+        case "blue":
+          $b = 0xff;
+          break;
+
+        case "aqua":
+          $g = 0xff;
+          $b = 0xff;
+          break;
+
+        case "teal":
+          $g = 0x80;
+          $b = 0x80;
+          break;
+
+        case "black":
+          break;
+
+        case "sliver":
+          $r = $g = $b = 0xc0;
+          break;
+
+        case "gray":
+        case "grey":
+          $r = $g = $b = 0x80;
+          break;
+
+        case "transparent":
+          return "transparent";
       
-    default:
-      if ( mb_strlen($colour) == 4 && $colour[0] === "#" ) {
-        // #rgb format
-        $r = hexdec($colour[1] . $colour[1]);
-        $g = hexdec($colour[2] . $colour[2]);
-        $b = hexdec($colour[3] . $colour[3]);
-
-      } else if ( mb_strlen($colour) == 7 && $colour[0] === "#" ) {
-        // #rrggbb format
-        $r = hexdec(mb_substr($colour, 1, 2));
-        $g = hexdec(mb_substr($colour, 3, 2));
-        $b = hexdec(mb_substr($colour, 5, 2));
-
-      } else if ( mb_strpos($colour, "rgb") !== false ) {
-        // rgb( r,g,b ) format
-        $i = mb_strpos($colour, "(");
-        $j = mb_strpos($colour, ")");
+        default:
+          if ( mb_strlen($colour) == 4 && $colour[0] === "#" ) {
+            // #rgb format
+            $r = hexdec($colour[1] . $colour[1]);
+            $g = hexdec($colour[2] . $colour[2]);
+            $b = hexdec($colour[3] . $colour[3]);
+
+          } else if ( mb_strlen($colour) == 7 && $colour[0] === "#" ) {
+            // #rrggbb format
+            $r = hexdec(mb_substr($colour, 1, 2));
+            $g = hexdec(mb_substr($colour, 3, 2));
+            $b = hexdec(mb_substr($colour, 5, 2));
+
+          } else if ( mb_strpos($colour, "rgb") !== false ) {
+            // rgb( r,g,b ) format
+            $i = mb_strpos($colour, "(");
+            $j = mb_strpos($colour, ")");
         
-        // Bad colour value
-        if ($i === false || $j === false)
-          return null;
+            // Bad colour value
+            if ($i === false || $j === false)
+              return null;
 
-        $triplet = explode(",", mb_substr($colour, $i+1, $j-$i-1));
+            $triplet = explode(",", mb_substr($colour, $i+1, $j-$i-1));
 
-        if (count($triplet) != 3)
-          return null;
+            if (count($triplet) != 3)
+              return null;
         
-        foreach (array_keys($triplet) as $c) {
-          $triplet[$c] = trim($triplet[$c]);
+            foreach (array_keys($triplet) as $c) {
+              $triplet[$c] = trim($triplet[$c]);
           
-          if ( $triplet[$c]{mb_strlen($triplet[$c]) - 1} === "%" )
-            $triplet[$c] = round($triplet[$c] * 0.255);
-        }
+              if ( $triplet[$c]{mb_strlen($triplet[$c]) - 1} === "%" )
+                $triplet[$c] = round($triplet[$c] * 0.255);
+            }
 
-        list($r, $g, $b) = $triplet;
+            list($r, $g, $b) = $triplet;
 
-      } else {
-        // Who knows?
-        return null;
-      }
+          } else {
+            // Who knows?
+            return null;
+          }
       
-      // Clip to 0 - 1
-      $r = $r < 0 ? 0 : ($r > 255 ? 255 : $r);
-      $g = $g < 0 ? 0 : ($g > 255 ? 255 : $g);
-      $b = $b < 0 ? 0 : ($b > 255 ? 255 : $b);
-      break;
+          // Clip to 0 - 1
+          $r = $r < 0 ? 0 : ($r > 255 ? 255 : $r);
+          $g = $g < 0 ? 0 : ($g > 255 ? 255 : $g);
+          $b = $b < 0 ? 0 : ($b > 255 ? 255 : $b);
+          break;
       
     }
     
@@ -941,38 +941,38 @@ 
     
     switch ($fs) {
       
-    case "xx-small":
-      $fs = 3/5 * $this->_parent_font_size;
-      break;
-
-    case "x-small":
-      $fs = 3/4 * $this->_parent_font_size;
-      break;
-
-    case "smaller":
-    case "small":
-      $fs = 8/9 * $this->_parent_font_size;
-      break;
-
-    case "medium":
-      $fs = $this->_parent_font_size;
-      break;
-
-    case "larger":
-    case "large":
-      $fs = 6/5 * $this->_parent_font_size;
-      break;
-
-    case "x-large":
-      $fs = 3/2 * $this->_parent_font_size;
-      break;
-
-    case "xx-large":
-      $fs = 2/1 * $this->_parent_font_size;
-      break;
-
-    default:
-      break;
+        case "xx-small":
+          $fs = 3/5 * $this->_parent_font_size;
+          break;
+
+        case "x-small":
+          $fs = 3/4 * $this->_parent_font_size;
+          break;
+
+        case "smaller":
+        case "small":
+          $fs = 8/9 * $this->_parent_font_size;
+          break;
+
+        case "medium":
+          $fs = $this->_parent_font_size;
+          break;
+
+        case "larger":
+        case "large":
+          $fs = 6/5 * $this->_parent_font_size;
+          break;
+
+        case "x-large":
+          $fs = 3/2 * $this->_parent_font_size;
+          break;
+
+        case "xx-large":
+          $fs = 2/1 * $this->_parent_font_size;
+          break;
+
+        default:
+          break;
     }
 
     // Ensure relative sizes resolve to something
@@ -1058,61 +1058,61 @@ 
 
     switch ($tmp[0]) {
 
-    case "left":
-      $x = "0%";
-      break;
+        case "left":
+          $x = "0%";
+          break;
 
-    case "right":
-      $x = "100%";
-      break;
+        case "right":
+          $x = "100%";
+          break;
 
-    case "top":
-      $y = "0%";
-      break;
+        case "top":
+          $y = "0%";
+          break;
 
-    case "bottom":
-      $y = "100%";
-      break;
+        case "bottom":
+          $y = "100%";
+          break;
 
-    case "center":
-      $x = "50%";
-      $y = "50%";
-      break;
+        case "center":
+          $x = "50%";
+          $y = "50%";
+          break;
 
-    default:
-      $x = $tmp[0];
-      break;
+        default:
+          $x = $tmp[0];
+          break;
     }
 
     if ( isset($tmp[1]) ) {
 
       switch ($tmp[1]) {
-      case "left":
-        $x = "0%";
-        break;
+          case "left":
+            $x = "0%";
+            break;
         
-      case "right":
-        $x = "100%";
-        break;
+          case "right":
+            $x = "100%";
+            break;
         
-      case "top":
-        $y = "0%";
-        break;
+          case "top":
+            $y = "0%";
+            break;
         
-      case "bottom":
-        $y = "100%";
-        break;
+          case "bottom":
+            $y = "100%";
+            break;
         
-      case "center":
-        if ( $tmp[0] === "left" || $tmp[0] === "right" || $tmp[0] === "center" )
-          $y = "50%";
-        else
-          $x = "50%";
-        break;
+          case "center":
+            if ( $tmp[0] === "left" || $tmp[0] === "right" || $tmp[0] === "center" )
+              $y = "50%";
+            else
+              $x = "50%";
+            break;
         
-      default:
-        $y = $tmp[1];
-        break;
+          default:
+            $y = $tmp[1];
+            break;
       }
 
     } else {
@@ -1384,20 +1384,20 @@ 
   protected function _set_style_type($style,$type,$val,$important) {
     $arr = explode(" ", $val);
     switch (count($arr)) {
-    case 1:
-      $this->_set_style_sides_type($style,$arr[0],$arr[0],$arr[0],$arr[0],$type,$important);
-      break;
-    case 2:
-      $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[0],$arr[1],$type,$important);
-      break;
-    case 3:
-      $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[1],$arr[2],$type,$important);
-      break;
-    case 4:
-      $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[2],$arr[3],$type,$important);
-      break;
-    default:
-      break;
+        case 1:
+          $this->_set_style_sides_type($style,$arr[0],$arr[0],$arr[0],$arr[0],$type,$important);
+          break;
+        case 2:
+          $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[0],$arr[1],$type,$important);
+          break;
+        case 3:
+          $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[1],$arr[2],$type,$important);
+          break;
+        case 4:
+          $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[2],$arr[3],$type,$important);
+          break;
+        default:
+          break;
     }
     //see __set and __get, on all assignments clear cache!
 	$this->_prop_cache[$style.$type] = null;

Spacing +159 added lines, -159 removed lines

@@ -111,7 +111,7 @@ 
    *
    * @var array
    */
-  static $BLOCK_TYPES = array("block","inline-block", "table-cell", "list-item");
+  static $BLOCK_TYPES = array("block", "inline-block", "table-cell", "list-item");
 
   /**
    * List of all table types.  Should really be a constant.
@@ -199,10 +199,10 @@ 
     $this->_parent_font_size = null;
     $this->__font_size_calculated = false;
     
-    if ( !isset(self::$_defaults) ) {
+    if (!isset(self::$_defaults)) {
     
       // Shorthand
-      $d =& self::$_defaults;
+      $d = & self::$_defaults;
     
       // All CSS 2.1 properties, and their default values
       $d["azimuth"] = "center";
@@ -398,90 +398,90 @@ 
    */
   function length_in_pt($length, $ref_size = null) {
 
-    if ( !is_array($length) )
+    if (!is_array($length))
       $length = array($length);
 
-    if ( !isset($ref_size) )
+    if (!isset($ref_size))
       $ref_size = self::$default_font_size;
 
     $ret = 0;
     foreach ($length as $l) {
 
-      if ( $l === "auto" )
+      if ($l === "auto")
         return "auto";
       
-      if ( $l === "none" )
+      if ($l === "none")
         return "none";
 
       // Assume numeric values are already in points
-      if ( is_numeric($l) ) {
+      if (is_numeric($l)) {
         $ret += $l;
         continue;
       }
         
-      if ( $l === "normal" ) {
+      if ($l === "normal") {
         $ret += $ref_size;
         continue;
       }
 
       // Border lengths
-      if ( $l === "thin" ) {
+      if ($l === "thin") {
         $ret += 0.5;
         continue;
       }
       
-      if ( $l === "medium" ) {
+      if ($l === "medium") {
         $ret += 1.5;
         continue;
       }
     
-      if ( $l === "thick" ) {
+      if ($l === "thick") {
         $ret += 2.5;
         continue;
       }
       
-      if ( ($i = mb_strpos($l, "pt"))  !== false ) {
+      if (($i = mb_strpos($l, "pt")) !== false) {
         $ret += mb_substr($l, 0, $i);
         continue;
       }
 
-      if ( ($i = mb_strpos($l, "px"))  !== false ) {
-        $ret += ( mb_substr($l, 0, $i)  * 72 ) / DOMPDF_DPI;
+      if (($i = mb_strpos($l, "px")) !== false) {
+        $ret += (mb_substr($l, 0, $i) * 72) / DOMPDF_DPI;
         continue;
       }
 
-      if ( ($i = mb_strpos($l, "em"))  !== false ) {
+      if (($i = mb_strpos($l, "em")) !== false) {
         $ret += mb_substr($l, 0, $i) * $this->__get("font_size");
         continue;
       }
       
       // FIXME: em:ex ratio?
-      if ( ($i = mb_strpos($l, "ex"))  !== false ) {
+      if (($i = mb_strpos($l, "ex")) !== false) {
         $ret += mb_substr($l, 0, $i) * $this->__get("font_size");
         continue;
       }
       
-      if ( ($i = mb_strpos($l, "%"))  !== false ) {
-        $ret += mb_substr($l, 0, $i)/100 * $ref_size;
+      if (($i = mb_strpos($l, "%")) !== false) {
+        $ret += mb_substr($l, 0, $i) / 100 * $ref_size;
         continue;
       }
       
-      if ( ($i = mb_strpos($l, "in")) !== false ) {
+      if (($i = mb_strpos($l, "in")) !== false) {
         $ret += mb_substr($l, 0, $i) * 72;
         continue;
       }
           
-      if ( ($i = mb_strpos($l, "cm")) !== false ) {
+      if (($i = mb_strpos($l, "cm")) !== false) {
         $ret += mb_substr($l, 0, $i) * 72 / 2.54;
         continue;
       }
 
-      if ( ($i = mb_strpos($l, "mm")) !== false ) {
+      if (($i = mb_strpos($l, "mm")) !== false) {
         $ret += mb_substr($l, 0, $i) * 72 / 25.4;
         continue;
       }
           
-      if ( ($i = mb_strpos($l, "pc")) !== false ) {
+      if (($i = mb_strpos($l, "pc")) !== false) {
         $ret += mb_substr($l, 0, $i) / 12;
         continue;
       }
@@ -507,12 +507,12 @@ 
     foreach (self::$_inherited as $prop) {
       //inherit the !important property also.
       //if local property is also !important, don't inherit.
-      if ( isset($parent->_props[$prop]) &&
-           ( !isset($this->_props[$prop]) ||
-             ( isset($parent->_important_props[$prop]) && !isset($this->_important_props[$prop]) )
+      if (isset($parent->_props[$prop]) &&
+           (!isset($this->_props[$prop]) ||
+             (isset($parent->_important_props[$prop]) && !isset($this->_important_props[$prop]))
            )
          ) {
-        if ( isset($parent->_important_props[$prop]) ) {
+        if (isset($parent->_important_props[$prop])) {
           $this->_important_props[$prop] = true;
         }
         //see __set and __get, on all assignments clear cache!
@@ -522,8 +522,8 @@ 
     }
       
     foreach (array_keys($this->_props) as $prop) {
-      if ( $this->_props[$prop] === "inherit" ) {
-        if ( isset($parent->_important_props[$prop]) ) {
+      if ($this->_props[$prop] === "inherit") {
+        if (isset($parent->_important_props[$prop])) {
           $this->_important_props[$prop] = true;
         }
         //do not assign direct, but
@@ -554,20 +554,20 @@ 
     //treat the !important attribute
     //if old rule has !important attribute, override with new rule only if
     //the new rule is also !important
-    foreach($style->_props as $prop => $val ) {
+    foreach ($style->_props as $prop => $val) {
       if (isset($style->_important_props[$prop])) {
  	    $this->_important_props[$prop] = true;
         //see __set and __get, on all assignments clear cache!
 		$this->_prop_cache[$prop] = null;
  	    $this->_props[$prop] = $val;
- 	  } else if ( !isset($this->_important_props[$prop]) ) {
+ 	  } else if (!isset($this->_important_props[$prop])) {
         //see __set and __get, on all assignments clear cache!
 		$this->_prop_cache[$prop] = null;
  	    $this->_props[$prop] = $val;
  	  }
  	}
 
-    if ( isset($style->_props["font_size"]) )
+    if (isset($style->_props["font_size"]))
       $this->__font_size_calculated = false;
   }
 
@@ -580,7 +580,7 @@ 
    * @return array
    */
   function munge_colour($colour) {
-    if ( is_array($colour) )
+    if (is_array($colour))
       // Assume the array has the right format...
       // FIXME: should/could verify this.
       return $colour;
@@ -671,19 +671,19 @@ 
       return "transparent";
       
     default:
-      if ( mb_strlen($colour) == 4 && $colour[0] === "#" ) {
+      if (mb_strlen($colour) == 4 && $colour[0] === "#") {
         // #rgb format
-        $r = hexdec($colour[1] . $colour[1]);
-        $g = hexdec($colour[2] . $colour[2]);
-        $b = hexdec($colour[3] . $colour[3]);
+        $r = hexdec($colour[1].$colour[1]);
+        $g = hexdec($colour[2].$colour[2]);
+        $b = hexdec($colour[3].$colour[3]);
 
-      } else if ( mb_strlen($colour) == 7 && $colour[0] === "#" ) {
+      } else if (mb_strlen($colour) == 7 && $colour[0] === "#") {
         // #rrggbb format
         $r = hexdec(mb_substr($colour, 1, 2));
         $g = hexdec(mb_substr($colour, 3, 2));
         $b = hexdec(mb_substr($colour, 5, 2));
 
-      } else if ( mb_strpos($colour, "rgb") !== false ) {
+      } else if (mb_strpos($colour, "rgb") !== false) {
         // rgb( r,g,b ) format
         $i = mb_strpos($colour, "(");
         $j = mb_strpos($colour, ")");
@@ -692,7 +692,7 @@ 
         if ($i === false || $j === false)
           return null;
 
-        $triplet = explode(",", mb_substr($colour, $i+1, $j-$i-1));
+        $triplet = explode(",", mb_substr($colour, $i + 1, $j - $i - 1));
 
         if (count($triplet) != 3)
           return null;
@@ -700,7 +700,7 @@ 
         foreach (array_keys($triplet) as $c) {
           $triplet[$c] = trim($triplet[$c]);
           
-          if ( $triplet[$c]{mb_strlen($triplet[$c]) - 1} === "%" )
+          if ($triplet[$c]{mb_strlen($triplet[$c]) - 1} === "%")
             $triplet[$c] = round($triplet[$c] * 0.255);
         }
 
@@ -784,19 +784,19 @@ 
     $prop = str_replace("-", "_", $prop);
     $this->_prop_cache[$prop] = null;
     
-    if ( !isset(self::$_defaults[$prop]) ) {
+    if (!isset(self::$_defaults[$prop])) {
       $_dompdf_warnings[] = "'$prop' is not a valid CSS2 property.";
       return;
     }
     
-    if ( $prop !== "content" && is_string($val) && mb_strpos($val, "url") === false ) {
+    if ($prop !== "content" && is_string($val) && mb_strpos($val, "url") === false) {
       $val = mb_strtolower(trim(str_replace(array("\n", "\t"), array(" "), $val)));
       $val = preg_replace("/([0-9]+) (pt|px|pc|em|ex|in|cm|mm|%)/S", "\\1\\2", $val);
     }
     
     $method = "set_$prop";
 
-    if ( method_exists($this, $method) )
+    if (method_exists($this, $method))
       $this->$method($val);
     else
       $this->_props[$prop] = $val;
@@ -818,19 +818,19 @@ 
    */
   function __get($prop) {
     
-    if ( !isset(self::$_defaults[$prop]) )
+    if (!isset(self::$_defaults[$prop]))
       throw new DOMPDF_Exception("'$prop' is not a valid CSS2 property.");
 
-    if ( isset($this->_prop_cache[$prop]) && $this->_prop_cache[$prop] != null)
+    if (isset($this->_prop_cache[$prop]) && $this->_prop_cache[$prop] != null)
       return $this->_prop_cache[$prop];
     
     $method = "get_$prop";
 
     // Fall back on defaults if property is not set
-    if ( !isset($this->_props[$prop]) )
+    if (!isset($this->_props[$prop]))
       $this->_props[$prop] = self::$_defaults[$prop];
 
-    if ( method_exists($this, $method) )
+    if (method_exists($this, $method))
       return $this->_prop_cache[$prop] = $this->$method();
 
 
@@ -849,7 +849,7 @@ 
    */
   function get_font_family() {
   
-    $DEBUGCSS=DEBUGCSS; //=DEBUGCSS; Allow override of global setting for ad hoc debug
+    $DEBUGCSS = DEBUGCSS; //=DEBUGCSS; Allow override of global setting for ad hoc debug
 	
     // Select the appropriate font.  First determine the subtype, then check
     // the specified font-families for a candidate.
@@ -857,14 +857,14 @@ 
     // Resolve font-weight
     $weight = $this->__get("font_weight");
     
-    if ( is_numeric($weight) ) {
+    if (is_numeric($weight)) {
 
-      if ( $weight < 600 )
+      if ($weight < 600)
         $weight = "normal";
       else
         $weight = "bold";
 
-    } else if ( $weight === "bold" || $weight === "bolder" ) {
+    } else if ($weight === "bold" || $weight === "bolder") {
       $weight = "bold";
 
     } else {
@@ -875,11 +875,11 @@ 
     // Resolve font-style
     $font_style = $this->__get("font_style");
 
-    if ( $weight === "bold" && ($font_style === "italic" || $font_style === "oblique") )
+    if ($weight === "bold" && ($font_style === "italic" || $font_style === "oblique"))
       $subtype = "bold_italic";
-    else if ( $weight === "bold" && $font_style !== "italic" && $font_style !== "oblique" )
+    else if ($weight === "bold" && $font_style !== "italic" && $font_style !== "oblique")
       $subtype = "bold";
-    else if ( $weight !== "bold" && ($font_style === "italic" || $font_style === "oblique") )
+    else if ($weight !== "bold" && ($font_style === "italic" || $font_style === "oblique"))
       $subtype = "italic";
     else
       $subtype = "normal";
@@ -890,19 +890,19 @@ 
       print '('.$this->_props["font_family"].'.'.$font_style.'.'.$this->__get("font_weight").'.'.$weight.'.'.$subtype.')';
     }
     $families = explode(",", $this->_props["font_family"]);
-    $families = array_map('trim',$families);
+    $families = array_map('trim', $families);
     reset($families);
 
     $font = null;
-    while ( current($families) ) {
+    while (current($families)) {
       list(,$family) = each($families);
       //remove leading and trailing string delimiters, e.g. on font names with spaces;
       //remove leading and trailing whitespace
-      $family=trim($family," \t\n\r\x0B\"'");
+      $family = trim($family, " \t\n\r\x0B\"'");
       if ($DEBUGCSS) print '('.$family.')';
       $font = Font_Metrics::get_font($family, $subtype);
 
-      if ( $font ) {
+      if ($font) {
         if ($DEBUGCSS)  print '('.$font.")get_font_family]\n</pre>";
         return $font;
       }
@@ -912,11 +912,11 @@ 
     if ($DEBUGCSS)  print '(default)';
     $font = Font_Metrics::get_font($family, $subtype);
 
-    if ( $font ) {
+    if ($font) {
       if ($DEBUGCSS) print '('.$font.")get_font_family]\n</pre>";
       return $font;
     }
-    throw new DOMPDF_Exception("Unable to find a suitable font replacement for: '" . $this->_props["font_family"] ."'");
+    throw new DOMPDF_Exception("Unable to find a suitable font replacement for: '".$this->_props["font_family"]."'");
     
   }
 
@@ -928,30 +928,30 @@ 
    */
   function get_font_size() {
 
-    if ( $this->__font_size_calculated )
+    if ($this->__font_size_calculated)
       return $this->_props["font_size"];
     
-    if ( !isset($this->_props["font_size"]) )
+    if (!isset($this->_props["font_size"]))
       $fs = self::$_defaults["font_size"];
     else
       $fs = $this->_props["font_size"];
     
-    if ( !isset($this->_parent_font_size) )
+    if (!isset($this->_parent_font_size))
       $this->_parent_font_size = self::$default_font_size;
     
     switch ($fs) {
       
     case "xx-small":
-      $fs = 3/5 * $this->_parent_font_size;
+      $fs = 3 / 5 * $this->_parent_font_size;
       break;
 
     case "x-small":
-      $fs = 3/4 * $this->_parent_font_size;
+      $fs = 3 / 4 * $this->_parent_font_size;
       break;
 
     case "smaller":
     case "small":
-      $fs = 8/9 * $this->_parent_font_size;
+      $fs = 8 / 9 * $this->_parent_font_size;
       break;
 
     case "medium":
@@ -960,15 +960,15 @@ 
 
     case "larger":
     case "large":
-      $fs = 6/5 * $this->_parent_font_size;
+      $fs = 6 / 5 * $this->_parent_font_size;
       break;
 
     case "x-large":
-      $fs = 3/2 * $this->_parent_font_size;
+      $fs = 3 / 2 * $this->_parent_font_size;
       break;
 
     case "xx-large":
-      $fs = 2/1 * $this->_parent_font_size;
+      $fs = 2 / 1 * $this->_parent_font_size;
       break;
 
     default:
@@ -976,10 +976,10 @@ 
     }
 
     // Ensure relative sizes resolve to something
-    if ( ($i = mb_strpos($fs, "em")) !== false )
+    if (($i = mb_strpos($fs, "em")) !== false)
       $fs = mb_substr($fs, 0, $i) * $this->_parent_font_size;
 
-    else if ( ($i = mb_strpos($fs, "ex")) !== false )
+    else if (($i = mb_strpos($fs, "ex")) !== false)
       $fs = mb_substr($fs, 0, $i) * $this->_parent_font_size;
 
     else
@@ -998,7 +998,7 @@ 
    * @return float
    */
   function get_word_spacing() {
-    if ( $this->_props["word_spacing"] === "normal" )
+    if ($this->_props["word_spacing"] === "normal")
       return 0;
 
     return $this->_props["word_spacing"];
@@ -1009,13 +1009,13 @@ 
    * @return float
    */
   function get_line_height() {
-    if ( $this->_props["line_height"] === "normal" )
+    if ($this->_props["line_height"] === "normal")
       return self::$default_line_height * $this->get_font_size();
 
-    if ( is_numeric($this->_props["line_height"]) )
-      return $this->length_in_pt( $this->_props["line_height"] . "%", $this->get_font_size());
+    if (is_numeric($this->_props["line_height"]))
+      return $this->length_in_pt($this->_props["line_height"]."%", $this->get_font_size());
     
-    return $this->length_in_pt( $this->_props["line_height"], $this->get_font_size() );
+    return $this->length_in_pt($this->_props["line_height"], $this->get_font_size());
   }
 
   /**
@@ -1028,7 +1028,7 @@ 
    * @return array
    */
   function get_color() {
-    return $this->munge_color( $this->_props["color"] );
+    return $this->munge_color($this->_props["color"]);
   }
 
   /**
@@ -1040,7 +1040,7 @@ 
    * @return array
    */
   function get_background_color() {
-    return $this->munge_color( $this->_props["background_color"] );
+    return $this->munge_color($this->_props["background_color"]);
   }
   
   /**
@@ -1084,7 +1084,7 @@ 
       break;
     }
 
-    if ( isset($tmp[1]) ) {
+    if (isset($tmp[1])) {
 
       switch ($tmp[1]) {
       case "left":
@@ -1104,7 +1104,7 @@ 
         break;
         
       case "center":
-        if ( $tmp[0] === "left" || $tmp[0] === "right" || $tmp[0] === "center" )
+        if ($tmp[0] === "left" || $tmp[0] === "right" || $tmp[0] === "center")
           $y = "50%";
         else
           $x = "50%";
@@ -1119,14 +1119,14 @@ 
       $y = "50%";
     }
 
-    if ( !isset($x) )
+    if (!isset($x))
       $x = "0%";
 
-    if ( !isset($y) )
+    if (!isset($y))
       $y = "0%";
 
-    return array( 0 => $x, "x" => $x,
-                  1 => $y, "y" => $y );
+    return array(0 => $x, "x" => $x,
+                  1 => $y, "y" => $y);
   }
 
 
@@ -1181,7 +1181,7 @@ 
    * @return array
    */
   function get_border_top_color() {
-    if ( $this->_props["border_top_color"] === "" ) {
+    if ($this->_props["border_top_color"] === "") {
       //see __set and __get, on all assignments clear cache!
       $this->_prop_cache["border_top_color"] = null;
       $this->_props["border_top_color"] = $this->__get("color");
@@ -1190,7 +1190,7 @@ 
   }
 
   function get_border_right_color() {
-    if ( $this->_props["border_right_color"] === "" ) {
+    if ($this->_props["border_right_color"] === "") {
       //see __set and __get, on all assignments clear cache!
       $this->_prop_cache["border_right_color"] = null;
       $this->_props["border_right_color"] = $this->__get("color");
@@ -1199,16 +1199,16 @@ 
   }
 
   function get_border_bottom_color() {
-    if ( $this->_props["border_bottom_color"] === "" ) {
+    if ($this->_props["border_bottom_color"] === "") {
       //see __set and __get, on all assignments clear cache!
       $this->_prop_cache["border_bottom_color"] = null;
       $this->_props["border_bottom_color"] = $this->__get("color");
     }
-    return $this->munge_color($this->_props["border_bottom_color"]);;
+    return $this->munge_color($this->_props["border_bottom_color"]); ;
   }
 
   function get_border_left_color() {
-    if ( $this->_props["border_left_color"] === "" ) {
+    if ($this->_props["border_left_color"] === "") {
       //see __set and __get, on all assignments clear cache!
       $this->_prop_cache["border_left_color"] = null;
       $this->_props["border_left_color"] = $this->__get("color");
@@ -1279,10 +1279,10 @@ 
    * @return mixed
    */
   protected function _get_border($side) {
-    $color = $this->__get("border_" . $side . "_color");
+    $color = $this->__get("border_".$side."_color");
     
-    return $this->__get("border_" . $side . "_width") . " " .
-      $this->__get("border_" . $side . "_style") . " " . $color["hex"];
+    return $this->__get("border_".$side."_width")." ".
+      $this->__get("border_".$side."_style")." ".$color["hex"];
   }
 
   /**#@+
@@ -1363,8 +1363,8 @@ 
    * Applicable for background, border, padding, margin, font, list_style
    * Note: $type has a leading underscore (or is empty), the others not.
    */
-  protected function _set_style_side_type($style,$side,$type,$val,$important) {
-    if ( !isset($this->_important_props[$style.'_'.$side.$type]) || $important) {
+  protected function _set_style_side_type($style, $side, $type, $val, $important) {
+    if (!isset($this->_important_props[$style.'_'.$side.$type]) || $important) {
       //see __set and __get, on all assignments clear cache!
       $this->_prop_cache[$style.'_'.$side.$type] = null;
       if ($important) {
@@ -1374,27 +1374,27 @@ 
     }
   }
 
-  protected function _set_style_sides_type($style,$top,$right,$bottom,$left,$type,$important) {
-      $this->_set_style_side_type($style,'top',$type,$top,$important);
-      $this->_set_style_side_type($style,'right',$type,$right,$important);
-      $this->_set_style_side_type($style,'bottom',$type,$bottom,$important);
-      $this->_set_style_side_type($style,'left',$type,$left,$important);
+  protected function _set_style_sides_type($style, $top, $right, $bottom, $left, $type, $important) {
+      $this->_set_style_side_type($style, 'top', $type, $top, $important);
+      $this->_set_style_side_type($style, 'right', $type, $right, $important);
+      $this->_set_style_side_type($style, 'bottom', $type, $bottom, $important);
+      $this->_set_style_side_type($style, 'left', $type, $left, $important);
   }
 
-  protected function _set_style_type($style,$type,$val,$important) {
+  protected function _set_style_type($style, $type, $val, $important) {
     $arr = explode(" ", $val);
     switch (count($arr)) {
     case 1:
-      $this->_set_style_sides_type($style,$arr[0],$arr[0],$arr[0],$arr[0],$type,$important);
+      $this->_set_style_sides_type($style, $arr[0], $arr[0], $arr[0], $arr[0], $type, $important);
       break;
     case 2:
-      $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[0],$arr[1],$type,$important);
+      $this->_set_style_sides_type($style, $arr[0], $arr[1], $arr[0], $arr[1], $type, $important);
       break;
     case 3:
-      $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[1],$arr[2],$type,$important);
+      $this->_set_style_sides_type($style, $arr[0], $arr[1], $arr[1], $arr[2], $type, $important);
       break;
     case 4:
-      $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[2],$arr[3],$type,$important);
+      $this->_set_style_sides_type($style, $arr[0], $arr[1], $arr[2], $arr[3], $type, $important);
       break;
     default:
       break;
@@ -1404,21 +1404,21 @@ 
     $this->_props[$style.$type] = $val;
   }
 
-  protected function _set_style_type_important($style,$type,$val) {
-    $this->_set_style_type($style,$type,$val,isset($this->_important_props[$style.$type]));
+  protected function _set_style_type_important($style, $type, $val) {
+    $this->_set_style_type($style, $type, $val, isset($this->_important_props[$style.$type]));
   }
 
   /* Anyway only called if _important matches and is assigned
    * E.g. _set_style_side_type($style,$side,'',str_replace("none", "0px", $val),isset($this->_important_props[$style.'_'.$side]));
    */
-  protected function _set_style_side_width_important($style,$side,$val) {
+  protected function _set_style_side_width_important($style, $side, $val) {
     //see __set and __get, on all assignments clear cache!
     $this->_prop_cache[$style.'_'.$side] = null;
     $this->_props[$style.'_'.$side] = str_replace("none", "0px", $val);
   }
 
-  protected function _set_style($style,$val,$important) {
-    if ( !isset($this->_important_props[$style]) || $important) {
+  protected function _set_style($style, $val, $important) {
+    if (!isset($this->_important_props[$style]) || $important) {
       if ($important) {
         $this->_important_props[$style] = true;
       }
@@ -1429,22 +1429,22 @@ 
   }
 
   protected function _image($val) {
-    $DEBUGCSS=DEBUGCSS;
+    $DEBUGCSS = DEBUGCSS;
     
-    if ( mb_strpos($val, "url") === false ) {
+    if (mb_strpos($val, "url") === false) {
       $path = "none"; //Don't resolve no image -> otherwise would prefix path and no longer recognize as none
     } else {
-      $val = preg_replace("/url\(['\"]?([^'\")]+)['\"]?\)/","\\1", trim($val));
+      $val = preg_replace("/url\(['\"]?([^'\")]+)['\"]?\)/", "\\1", trim($val));
 
       // Resolve the url now in the context of the current stylesheet
       $parsed_url = explode_url($val);
-      if ( $parsed_url["protocol"] == "" && $this->_stylesheet->get_protocol() == "" ) {
-        if ($parsed_url["path"]{0} === '/' || $parsed_url["path"]{0} === '\\' ) {
+      if ($parsed_url["protocol"] == "" && $this->_stylesheet->get_protocol() == "") {
+        if ($parsed_url["path"]{0} === '/' || $parsed_url["path"]{0} === '\\') {
           $path = $_SERVER["DOCUMENT_ROOT"].'/';
         } else {
           $path = $this->_stylesheet->get_base_path();
         }
-        $path .= $parsed_url["path"] . $parsed_url["file"];
+        $path .= $parsed_url["path"].$parsed_url["file"];
         $path = realpath($path);
         // If realpath returns FALSE then specifically state that there is no background image
         if (!$path) { $path = 'none'; }
@@ -1459,7 +1459,7 @@ 
       print "<pre>[_image\n";
       print_r($parsed_url);
       print $this->_stylesheet->get_protocol()."\n".$this->_stylesheet->get_base_path()."\n".$path."\n";
-      print "_image]</pre>";;
+      print "_image]</pre>"; ;
     }
     return $path;
   }
@@ -1477,7 +1477,7 @@ 
   function set_color($colour) {
     $col = $this->munge_colour($colour);
 
-    if ( is_null($col) )
+    if (is_null($col))
       $col = self::$_defaults["color"];
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
@@ -1493,7 +1493,7 @@ 
    */
   function set_background_color($colour) {
     $col = $this->munge_colour($colour);
-    if ( is_null($col) )
+    if (is_null($col))
       $col = self::$_defaults["background_color"];
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
@@ -1520,7 +1520,7 @@ 
    * @param string $val
    */
   function set_background_repeat($val) {
-    if ( is_null($val) )
+    if (is_null($val))
       $val = self::$_defaults["background_repeat"];
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
     $this->_prop_cache["background_repeat"] = null;
@@ -1534,7 +1534,7 @@ 
    * @param string $val
    */
   function set_background_attachment($val) {
-    if ( is_null($val) )
+    if (is_null($val))
       $val = self::$_defaults["background_attachment"];
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
@@ -1549,7 +1549,7 @@ 
    * @param string $val
    */
   function set_background_position($val) {
-    if ( is_null($val) )
+    if (is_null($val))
       $val = self::$_defaults["background_position"];
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
@@ -1568,21 +1568,21 @@ 
     $pos = array();
     $tmp = explode(" ", $val);
     $important = isset($this->_important_props["background"]);
-    foreach($tmp as $attr) {
+    foreach ($tmp as $attr) {
 	  if (mb_substr($attr, 0, 3) === "url" || $attr === "none") {
    	    $this->_set_style("background_image", $this->_image($attr), $important);
   	  } else if ($attr === "fixed" || $attr === "scroll") {
    	    $this->_set_style("background_attachment", $attr, $important);
   	  } else if ($attr === "repeat" || $attr === "repeat-x" || $attr === "repeat-y" || $attr === "no-repeat") {
    	    $this->_set_style("background_repeat", $attr, $important);
-      } else if (($col = $this->munge_color($attr)) != null ) {
+      } else if (($col = $this->munge_color($attr)) != null) {
    	    $this->_set_style("background_color", is_array($col) ? $col["hex"] : $col, $important);
       } else {
  		$pos[] = $attr;
  	  }
  	}
  	if (count($pos)) {
- 	  $this->_set_style("background_position",implode(' ',$pos), $important);
+ 	  $this->_set_style("background_position", implode(' ', $pos), $important);
  	}
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
 	$this->_prop_cache["background"] = null;
@@ -1636,14 +1636,14 @@ 
 
     $important = isset($this->_important_props["font"]);
 
-	if ( preg_match("/^(italic|oblique|normal)\s*(.*)$/i",$val,$match) ) {
+	if (preg_match("/^(italic|oblique|normal)\s*(.*)$/i", $val, $match)) {
 		$this->_set_style("font_style", $match[1], $important);
 		$val = $match[2];
 	} else {
 		$this->_set_style("font_style", self::$_defaults["font_style"], $important);
 	}
 
-	if ( preg_match("/^(small-caps|normal)\s*(.*)$/i",$val,$match) ) {
+	if (preg_match("/^(small-caps|normal)\s*(.*)$/i", $val, $match)) {
 		$this->_set_style("font_variant", $match[1], $important);
 		$val = $match[2];
 	} else {
@@ -1651,8 +1651,8 @@ 
 	}
 
     //matching numeric value followed by unit -> this is indeed a subsequent font size. Skip!
-	if ( preg_match("/^(bold|bolder|lighter|100|200|300|400|500|600|700|800|900|normal)\s*(.*)$/i",$val,$match) &&
-         !preg_match("/^(?:pt|px|pc|em|ex|in|cm|mm|%)/",$match[2])
+	if (preg_match("/^(bold|bolder|lighter|100|200|300|400|500|600|700|800|900|normal)\s*(.*)$/i", $val, $match) &&
+         !preg_match("/^(?:pt|px|pc|em|ex|in|cm|mm|%)/", $match[2])
 	   ) {
 		$this->_set_style("font_weight", $match[1], $important);
 		$val = $match[2];
@@ -1660,10 +1660,10 @@ 
 		$this->_set_style("font_weight", self::$_defaults["font_weight"], $important);
 	}
 
-	if ( preg_match("/^(xx-small|x-small|small|medium|large|x-large|xx-large|smaller|larger|\d+\s*(?:pt|px|pc|em|ex|in|cm|mm|%))\s*(.*)$/i",$val,$match) ) {
+	if (preg_match("/^(xx-small|x-small|small|medium|large|x-large|xx-large|smaller|larger|\d+\s*(?:pt|px|pc|em|ex|in|cm|mm|%))\s*(.*)$/i", $val, $match)) {
 		$this->_set_style("font_size", $match[1], $important);
 		$val = $match[2];
-        if (preg_match("/^\/\s*(\d+\s*(?:pt|px|pc|em|ex|in|cm|mm|%))\s*(.*)$/i",$val,$match) ) {
+        if (preg_match("/^\/\s*(\d+\s*(?:pt|px|pc|em|ex|in|cm|mm|%))\s*(.*)$/i", $val, $match)) {
 			$this->_set_style("line_height", $match[1], $important);
 			$val = $match[2];
         } else {
@@ -1674,7 +1674,7 @@ 
 		$this->_set_style("line_height", self::$_defaults["line_height"], $important);
 	}
 
-	if(strlen($val) != 0) {
+	if (strlen($val) != 0) {
 	  $this->_set_style("font_family", $val, $important);
 	} else {
 	  $this->_set_style("font_family", self::$_defaults["font_family"], $important);
@@ -1715,24 +1715,24 @@ 
    * @param $val
    */
   function set_margin_top($val) {
-    $this->_set_style_side_width_important('margin','top',$val);
+    $this->_set_style_side_width_important('margin', 'top', $val);
   }
 
   function set_margin_right($val) {
-    $this->_set_style_side_width_important('margin','right',$val);
+    $this->_set_style_side_width_important('margin', 'right', $val);
   }
 
   function set_margin_bottom($val) {
-    $this->_set_style_side_width_important('margin','bottom',$val);
+    $this->_set_style_side_width_important('margin', 'bottom', $val);
   }
 
   function set_margin_left($val) {
-    $this->_set_style_side_width_important('margin','left',$val);
+    $this->_set_style_side_width_important('margin', 'left', $val);
   }
   
   function set_margin($val) {
     $val = str_replace("none", "0px", $val);
-    $this->_set_style_type_important('margin','',$val);
+    $this->_set_style_type_important('margin', '', $val);
   }
   /**#@-*/
 
@@ -1743,24 +1743,24 @@ 
    * @param $val
    */
   function set_padding_top($val) {
-    $this->_set_style_side_width_important('padding','top',$val);
+    $this->_set_style_side_width_important('padding', 'top', $val);
   }
 
   function set_padding_right($val) {
-    $this->_set_style_side_width_important('padding','right',$val);
+    $this->_set_style_side_width_important('padding', 'right', $val);
   }
 
   function set_padding_bottom($val) {
-    $this->_set_style_side_width_important('padding','bottom',$val);
+    $this->_set_style_side_width_important('padding', 'bottom', $val);
   }
 
   function set_padding_left($val) {
-    $this->_set_style_side_width_important('padding','left',$val);
+    $this->_set_style_side_width_important('padding', 'left', $val);
   }
 
   function set_padding($val) {
     $val = str_replace("none", "0px", $val);
-    $this->_set_style_type_important('padding','',$val);
+    $this->_set_style_type_important('padding', '', $val);
   }
   /**#@-*/
 
@@ -1778,21 +1778,21 @@ 
  
     //For consistency of individal and combined properties, and with ie8 and firefox3
     //reset all attributes, even if only partially given
-    $this->_set_style_side_type('border',$side,'_style',self::$_defaults['border_'.$side.'_style'],$important);
-    $this->_set_style_side_type('border',$side,'_width',self::$_defaults['border_'.$side.'_width'],$important);
-    $this->_set_style_side_type('border',$side,'_color',self::$_defaults['border_'.$side.'_color'],$important);
+    $this->_set_style_side_type('border', $side, '_style', self::$_defaults['border_'.$side.'_style'], $important);
+    $this->_set_style_side_type('border', $side, '_width', self::$_defaults['border_'.$side.'_width'], $important);
+    $this->_set_style_side_type('border', $side, '_color', self::$_defaults['border_'.$side.'_color'], $important);
 
     foreach ($arr as $value) {
       $value = trim($value);
-      if ( in_array($value, self::$BORDER_STYLES) ) {
-        $this->_set_style_side_type('border',$side,'_style',$value,$important);
+      if (in_array($value, self::$BORDER_STYLES)) {
+        $this->_set_style_side_type('border', $side, '_style', $value, $important);
 
-      } else if ( preg_match("/[.0-9]+(?:px|pt|pc|em|ex|%|in|mm|cm)|(?:thin|medium|thick)/", $value ) ) {
-        $this->_set_style_side_type('border',$side,'_width',$value,$important);
+      } else if (preg_match("/[.0-9]+(?:px|pt|pc|em|ex|%|in|mm|cm)|(?:thin|medium|thick)/", $value)) {
+        $this->_set_style_side_type('border', $side, '_width', $value, $important);
 
       } else {
         // must be colour
-        $this->_set_style_side_type('border',$side,'_color',$value,$important);
+        $this->_set_style_side_type('border', $side, '_color', $value, $important);
       }
     }
 
@@ -1824,15 +1824,15 @@ 
   }
 
   function set_border_width($val) {
-    $this->_set_style_type_important('border','_width',$val);
+    $this->_set_style_type_important('border', '_width', $val);
   }
 
   function set_border_color($val) {
-    $this->_set_style_type_important('border','_color',$val);
+    $this->_set_style_type_important('border', '_color', $val);
   }
 
   function set_border_style($val) {
-    $this->_set_style_type_important('border','_style',$val);
+    $this->_set_style_type_important('border', '_style', $val);
   }
   /**#@-*/
 
@@ -1847,12 +1847,12 @@ 
 
     $arr = explode(" ", $val);
 
-    if ( count($arr) == 1 )
+    if (count($arr) == 1)
       $arr[1] = $arr[0];
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
 	$this->_prop_cache["border_spacing"] = null;
-    $this->_props["border_spacing"] = $arr[0] . " " . $arr[1];
+    $this->_props["border_spacing"] = $arr[0]." ".$arr[1];
   }
 
   /**
@@ -1907,9 +1907,9 @@ 
         continue;
       }
 
-      if ( in_array($value, $types) ) {
+      if (in_array($value, $types)) {
    	    $this->_set_style("list_style_type", $value, $important);
-      } else if ( in_array($value, $positions) ) {
+      } else if (in_array($value, $positions)) {
    	    $this->_set_style("list_style_position", $value, $important);
       }
     }
@@ -1935,8 +1935,8 @@ 
 
 /*DEBUGCSS*/  function debug_print()
 /*DEBUGCSS*/  {
-/*DEBUGCSS*/    print "parent_font_size:".$this->_parent_font_size . ";\n";
-/*DEBUGCSS*/    foreach($this->_props as $prop => $val ) {
+/*DEBUGCSS*/    print "parent_font_size:".$this->_parent_font_size.";\n";
+/*DEBUGCSS*/    foreach ($this->_props as $prop => $val) {
 /*DEBUGCSS*/      print $prop.':'.$val;
 /*DEBUGCSS*/      if (isset($this->_important_props[$prop])) {
 /*DEBUGCSS*/      	print '!important';

Braces +132 added lines, -92 removed lines

@@ -398,20 +398,24 @@ 
    */
   function length_in_pt($length, $ref_size = null) {
 
-    if ( !is_array($length) )
-      $length = array($length);
+    if ( !is_array($length) ) {
+          $length = array($length);
+    }
 
-    if ( !isset($ref_size) )
-      $ref_size = self::$default_font_size;
+    if ( !isset($ref_size) ) {
+          $ref_size = self::$default_font_size;
+    }
 
     $ret = 0;
     foreach ($length as $l) {
 
-      if ( $l === "auto" )
-        return "auto";
+      if ( $l === "auto" ) {
+              return "auto";
+      }
       
-      if ( $l === "none" )
-        return "none";
+      if ( $l === "none" ) {
+              return "none";
+      }
 
       // Assume numeric values are already in points
       if ( is_numeric($l) ) {
@@ -567,8 +571,9 @@ 
  	  }
  	}
 
-    if ( isset($style->_props["font_size"]) )
-      $this->__font_size_calculated = false;
+    if ( isset($style->_props["font_size"]) ) {
+          $this->__font_size_calculated = false;
+    }
   }
 
   
@@ -580,10 +585,11 @@ 
    * @return array
    */
   function munge_colour($colour) {
-    if ( is_array($colour) )
-      // Assume the array has the right format...
+    if ( is_array($colour) ) {
+          // Assume the array has the right format...
       // FIXME: should/could verify this.
       return $colour;
+    }
     
     $r = 0;
     $g = 0;
@@ -689,19 +695,22 @@ 
         $j = mb_strpos($colour, ")");
         
         // Bad colour value
-        if ($i === false || $j === false)
-          return null;
+        if ($i === false || $j === false) {
+                  return null;
+        }
 
         $triplet = explode(",", mb_substr($colour, $i+1, $j-$i-1));
 
-        if (count($triplet) != 3)
-          return null;
+        if (count($triplet) != 3) {
+                  return null;
+        }
         
         foreach (array_keys($triplet) as $c) {
           $triplet[$c] = trim($triplet[$c]);
           
-          if ( $triplet[$c]{mb_strlen($triplet[$c]) - 1} === "%" )
-            $triplet[$c] = round($triplet[$c] * 0.255);
+          if ( $triplet[$c]{mb_strlen($triplet[$c]) - 1} === "%" ) {
+                      $triplet[$c] = round($triplet[$c] * 0.255);
+          }
         }
 
         list($r, $g, $b) = $triplet;
@@ -796,10 +805,11 @@ 
     
     $method = "set_$prop";
 
-    if ( method_exists($this, $method) )
-      $this->$method($val);
-    else
-      $this->_props[$prop] = $val;
+    if ( method_exists($this, $method) ) {
+          $this->$method($val);
+    } else {
+          $this->_props[$prop] = $val;
+    }
     
   }
 
@@ -818,20 +828,24 @@ 
    */
   function __get($prop) {
     
-    if ( !isset(self::$_defaults[$prop]) )
-      throw new DOMPDF_Exception("'$prop' is not a valid CSS2 property.");
+    if ( !isset(self::$_defaults[$prop]) ) {
+          throw new DOMPDF_Exception("'$prop' is not a valid CSS2 property.");
+    }
 
-    if ( isset($this->_prop_cache[$prop]) && $this->_prop_cache[$prop] != null)
-      return $this->_prop_cache[$prop];
+    if ( isset($this->_prop_cache[$prop]) && $this->_prop_cache[$prop] != null) {
+          return $this->_prop_cache[$prop];
+    }
     
     $method = "get_$prop";
 
     // Fall back on defaults if property is not set
-    if ( !isset($this->_props[$prop]) )
-      $this->_props[$prop] = self::$_defaults[$prop];
+    if ( !isset($this->_props[$prop]) ) {
+          $this->_props[$prop] = self::$_defaults[$prop];
+    }
 
-    if ( method_exists($this, $method) )
-      return $this->_prop_cache[$prop] = $this->$method();
+    if ( method_exists($this, $method) ) {
+          return $this->_prop_cache[$prop] = $this->$method();
+    }
 
 
     return $this->_prop_cache[$prop] = $this->_props[$prop];
@@ -859,10 +873,11 @@ 
     
     if ( is_numeric($weight) ) {
 
-      if ( $weight < 600 )
-        $weight = "normal";
-      else
-        $weight = "bold";
+      if ( $weight < 600 ) {
+              $weight = "normal";
+      } else {
+              $weight = "bold";
+      }
 
     } else if ( $weight === "bold" || $weight === "bolder" ) {
       $weight = "bold";
@@ -875,14 +890,15 @@ 
     // Resolve font-style
     $font_style = $this->__get("font_style");
 
-    if ( $weight === "bold" && ($font_style === "italic" || $font_style === "oblique") )
-      $subtype = "bold_italic";
-    else if ( $weight === "bold" && $font_style !== "italic" && $font_style !== "oblique" )
-      $subtype = "bold";
-    else if ( $weight !== "bold" && ($font_style === "italic" || $font_style === "oblique") )
-      $subtype = "italic";
-    else
-      $subtype = "normal";
+    if ( $weight === "bold" && ($font_style === "italic" || $font_style === "oblique") ) {
+          $subtype = "bold_italic";
+    } else if ( $weight === "bold" && $font_style !== "italic" && $font_style !== "oblique" ) {
+          $subtype = "bold";
+    } else if ( $weight !== "bold" && ($font_style === "italic" || $font_style === "oblique") ) {
+          $subtype = "italic";
+    } else {
+          $subtype = "normal";
+    }
     
     // Resolve the font family
     if ($DEBUGCSS) {
@@ -899,21 +915,29 @@ 
       //remove leading and trailing string delimiters, e.g. on font names with spaces;
       //remove leading and trailing whitespace
       $family=trim($family," \t\n\r\x0B\"'");
-      if ($DEBUGCSS) print '('.$family.')';
+      if ($DEBUGCSS) {
+          print '('.$family.')';
+      }
       $font = Font_Metrics::get_font($family, $subtype);
 
       if ( $font ) {
-        if ($DEBUGCSS)  print '('.$font.")get_font_family]\n</pre>";
+        if ($DEBUGCSS) {
+            print '('.$font.")get_font_family]\n</pre>";
+        }
         return $font;
       }
     }
 
     $family = null;
-    if ($DEBUGCSS)  print '(default)';
+    if ($DEBUGCSS) {
+        print '(default)';
+    }
     $font = Font_Metrics::get_font($family, $subtype);
 
     if ( $font ) {
-      if ($DEBUGCSS) print '('.$font.")get_font_family]\n</pre>";
+      if ($DEBUGCSS) {
+          print '('.$font.")get_font_family]\n</pre>";
+      }
       return $font;
     }
     throw new DOMPDF_Exception("Unable to find a suitable font replacement for: '" . $this->_props["font_family"] ."'");
@@ -928,16 +952,19 @@ 
    */
   function get_font_size() {
 
-    if ( $this->__font_size_calculated )
-      return $this->_props["font_size"];
+    if ( $this->__font_size_calculated ) {
+          return $this->_props["font_size"];
+    }
     
-    if ( !isset($this->_props["font_size"]) )
-      $fs = self::$_defaults["font_size"];
-    else
-      $fs = $this->_props["font_size"];
+    if ( !isset($this->_props["font_size"]) ) {
+          $fs = self::$_defaults["font_size"];
+    } else {
+          $fs = $this->_props["font_size"];
+    }
     
-    if ( !isset($this->_parent_font_size) )
-      $this->_parent_font_size = self::$default_font_size;
+    if ( !isset($this->_parent_font_size) ) {
+          $this->_parent_font_size = self::$default_font_size;
+    }
     
     switch ($fs) {
       
@@ -976,14 +1003,13 @@ 
     }
 
     // Ensure relative sizes resolve to something
-    if ( ($i = mb_strpos($fs, "em")) !== false )
-      $fs = mb_substr($fs, 0, $i) * $this->_parent_font_size;
-
-    else if ( ($i = mb_strpos($fs, "ex")) !== false )
-      $fs = mb_substr($fs, 0, $i) * $this->_parent_font_size;
-
-    else
-      $fs = $this->length_in_pt($fs);
+    if ( ($i = mb_strpos($fs, "em")) !== false ) {
+          $fs = mb_substr($fs, 0, $i) * $this->_parent_font_size;
+    } else if ( ($i = mb_strpos($fs, "ex")) !== false ) {
+          $fs = mb_substr($fs, 0, $i) * $this->_parent_font_size;
+    } else {
+          $fs = $this->length_in_pt($fs);
+    }
 
     //see __set and __get, on all assignments clear cache!
 	$this->_prop_cache["font_size"] = null;
@@ -998,8 +1024,9 @@ 
    * @return float
    */
   function get_word_spacing() {
-    if ( $this->_props["word_spacing"] === "normal" )
-      return 0;
+    if ( $this->_props["word_spacing"] === "normal" ) {
+          return 0;
+    }
 
     return $this->_props["word_spacing"];
   }
@@ -1009,11 +1036,13 @@ 
    * @return float
    */
   function get_line_height() {
-    if ( $this->_props["line_height"] === "normal" )
-      return self::$default_line_height * $this->get_font_size();
+    if ( $this->_props["line_height"] === "normal" ) {
+          return self::$default_line_height * $this->get_font_size();
+    }
 
-    if ( is_numeric($this->_props["line_height"]) )
-      return $this->length_in_pt( $this->_props["line_height"] . "%", $this->get_font_size());
+    if ( is_numeric($this->_props["line_height"]) ) {
+          return $this->length_in_pt( $this->_props["line_height"] . "%", $this->get_font_size());
+    }
     
     return $this->length_in_pt( $this->_props["line_height"], $this->get_font_size() );
   }
@@ -1104,10 +1133,11 @@ 
         break;
         
       case "center":
-        if ( $tmp[0] === "left" || $tmp[0] === "right" || $tmp[0] === "center" )
-          $y = "50%";
-        else
-          $x = "50%";
+        if ( $tmp[0] === "left" || $tmp[0] === "right" || $tmp[0] === "center" ) {
+                  $y = "50%";
+        } else {
+                  $x = "50%";
+        }
         break;
         
       default:
@@ -1119,11 +1149,13 @@ 
       $y = "50%";
     }
 
-    if ( !isset($x) )
-      $x = "0%";
+    if ( !isset($x) ) {
+          $x = "0%";
+    }
 
-    if ( !isset($y) )
-      $y = "0%";
+    if ( !isset($y) ) {
+          $y = "0%";
+    }
 
     return array( 0 => $x, "x" => $x,
                   1 => $y, "y" => $y );
@@ -1477,8 +1509,9 @@ 
   function set_color($colour) {
     $col = $this->munge_colour($colour);
 
-    if ( is_null($col) )
-      $col = self::$_defaults["color"];
+    if ( is_null($col) ) {
+          $col = self::$_defaults["color"];
+    }
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
 	$this->_prop_cache["color"] = null;
@@ -1493,8 +1526,9 @@ 
    */
   function set_background_color($colour) {
     $col = $this->munge_colour($colour);
-    if ( is_null($col) )
-      $col = self::$_defaults["background_color"];
+    if ( is_null($col) ) {
+          $col = self::$_defaults["background_color"];
+    }
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
 	$this->_prop_cache["background_color"] = null;
@@ -1520,8 +1554,9 @@ 
    * @param string $val
    */
   function set_background_repeat($val) {
-    if ( is_null($val) )
-      $val = self::$_defaults["background_repeat"];
+    if ( is_null($val) ) {
+          $val = self::$_defaults["background_repeat"];
+    }
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
     $this->_prop_cache["background_repeat"] = null;
     $this->_props["background_repeat"] = $val;
@@ -1534,8 +1569,9 @@ 
    * @param string $val
    */
   function set_background_attachment($val) {
-    if ( is_null($val) )
-      $val = self::$_defaults["background_attachment"];
+    if ( is_null($val) ) {
+          $val = self::$_defaults["background_attachment"];
+    }
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
 	$this->_prop_cache["background_attachment"] = null;
@@ -1549,8 +1585,9 @@ 
    * @param string $val
    */
   function set_background_position($val) {
-    if ( is_null($val) )
-      $val = self::$_defaults["background_position"];
+    if ( is_null($val) ) {
+          $val = self::$_defaults["background_position"];
+    }
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
 	$this->_prop_cache["background_position"] = null;
@@ -1688,8 +1725,9 @@ 
    * @param string $break
    */
   function set_page_break_before($break) {
-    if ($break === "left" || $break === "right")
-      $break = "always";
+    if ($break === "left" || $break === "right") {
+          $break = "always";
+    }
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
 	$this->_prop_cache["page_break_before"] = null;
@@ -1697,8 +1735,9 @@ 
   }
 
   function set_page_break_after($break) {
-    if ($break === "left" || $break === "right")
-      $break = "always";
+    if ($break === "left" || $break === "right") {
+          $break = "always";
+    }
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
 	$this->_prop_cache["page_break_after"] = null;
@@ -1847,8 +1886,9 @@ 
 
     $arr = explode(" ", $val);
 
-    if ( count($arr) == 1 )
-      $arr[1] = $arr[0];
+    if ( count($arr) == 1 ) {
+          $arr[1] = $arr[0];
+    }
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
 	$this->_prop_cache["border_spacing"] = null;

Indentation +1073 added lines, -1073 removed lines

@@ -85,114 +85,114 @@ 
  */
 class Style {
 
-  /**
-   * Default font size, in points.
-   *
-   * @var float
-   */
-  static $default_font_size = 12;
-
-  /**
-   * Default line height, as a fraction of the font size.
-   *
-   * @var float
-   */
-  static $default_line_height = 1.2;
-
-  /**
-   * List of all inline types.  Should really be a constant.
-   *
-   * @var array
-   */
-  static $INLINE_TYPES = array("inline");
-
-  /**
-   * List of all block types.  Should really be a constant.
-   *
-   * @var array
-   */
-  static $BLOCK_TYPES = array("block","inline-block", "table-cell", "list-item");
-
-  /**
-   * List of all table types.  Should really be a constant.
-   *
-   * @var array;
-   */
-  static $TABLE_TYPES = array("table", "inline-table");
-
-  /**
-   * List of valid border styles.  Should also really be a constant.
-   *
-   * @var array
-   */
-  static $BORDER_STYLES = array("none", "hidden", "dotted", "dashed", "solid",
+    /**
+     * Default font size, in points.
+     *
+     * @var float
+     */
+    static $default_font_size = 12;
+
+    /**
+     * Default line height, as a fraction of the font size.
+     *
+     * @var float
+     */
+    static $default_line_height = 1.2;
+
+    /**
+     * List of all inline types.  Should really be a constant.
+     *
+     * @var array
+     */
+    static $INLINE_TYPES = array("inline");
+
+    /**
+     * List of all block types.  Should really be a constant.
+     *
+     * @var array
+     */
+    static $BLOCK_TYPES = array("block","inline-block", "table-cell", "list-item");
+
+    /**
+     * List of all table types.  Should really be a constant.
+     *
+     * @var array;
+     */
+    static $TABLE_TYPES = array("table", "inline-table");
+
+    /**
+     * List of valid border styles.  Should also really be a constant.
+     *
+     * @var array
+     */
+    static $BORDER_STYLES = array("none", "hidden", "dotted", "dashed", "solid",
                                 "double", "groove", "ridge", "inset", "outset");
 
-  /**
-   * Default style values.
-   *
-   * @link http://www.w3.org/TR/CSS21/propidx.html
-   *
-   * @var array
-   */
-  static protected $_defaults = null;
-
-  /**
-   * List of inherited properties
-   *
-   * @link http://www.w3.org/TR/CSS21/propidx.html
-   *
-   * @var array
-   */
-  static protected $_inherited = null;
-
-  /**
-   * The stylesheet this style belongs to
-   *
-   * @see Stylesheet
-   * @var Stylesheet
-   */
-  protected $_stylesheet; // stylesheet this style is attached to
-
-  /**
-   * Main array of all CSS properties & values
-   *
-   * @var array
-   */
-  protected $_props;
-
-  /* var instead of protected would allow access outside of class */
-  protected $_important_props;
-
-  /**
-   * Cached property values
-   *
-   * @var array
-   */
-  protected $_prop_cache;
+    /**
+     * Default style values.
+     *
+     * @link http://www.w3.org/TR/CSS21/propidx.html
+     *
+     * @var array
+     */
+    static protected $_defaults = null;
+
+    /**
+     * List of inherited properties
+     *
+     * @link http://www.w3.org/TR/CSS21/propidx.html
+     *
+     * @var array
+     */
+    static protected $_inherited = null;
+
+    /**
+     * The stylesheet this style belongs to
+     *
+     * @see Stylesheet
+     * @var Stylesheet
+     */
+    protected $_stylesheet; // stylesheet this style is attached to
+
+    /**
+     * Main array of all CSS properties & values
+     *
+     * @var array
+     */
+    protected $_props;
+
+    /* var instead of protected would allow access outside of class */
+    protected $_important_props;
+
+    /**
+     * Cached property values
+     *
+     * @var array
+     */
+    protected $_prop_cache;
   
-  /**
-   * Font size of parent element in document tree.  Used for relative font
-   * size resolution.
-   *
-   * @var float
-   */
-  protected $_parent_font_size; // Font size of parent element
+    /**
+     * Font size of parent element in document tree.  Used for relative font
+     * size resolution.
+     *
+     * @var float
+     */
+    protected $_parent_font_size; // Font size of parent element
   
-  // private members
-  /**
-   * True once the font size is resolved absolutely
-   *
-   * @var bool
-   */
-  private $__font_size_calculated; // Cache flag
+    // private members
+    /**
+     * True once the font size is resolved absolutely
+     *
+     * @var bool
+     */
+    private $__font_size_calculated; // Cache flag
   
-  /**
-   * Class constructor
-   *
-   * @param Stylesheet $stylesheet the stylesheet this Style is associated with.
-   */
-  function __construct(Stylesheet $stylesheet) {
+    /**
+     * Class constructor
+     *
+     * @param Stylesheet $stylesheet the stylesheet this Style is associated with.
+     */
+    function __construct(Stylesheet $stylesheet) {
     $this->_props = array();
     $this->_important_props = array();
     $this->_stylesheet = $stylesheet;
@@ -201,330 +201,330 @@ 
     
     if ( !isset(self::$_defaults) ) {
     
-      // Shorthand
-      $d =& self::$_defaults;
+        // Shorthand
+        $d =& self::$_defaults;
     
-      // All CSS 2.1 properties, and their default values
-      $d["azimuth"] = "center";
-      $d["background_attachment"] = "scroll";
-      $d["background_color"] = "transparent";
-      $d["background_image"] = "none";
-      $d["background_position"] = "0% 0%";
-      $d["background_repeat"] = "repeat";
-      $d["background"] = "";
-      $d["border_collapse"] = "separate";
-      $d["border_color"] = "";
-      $d["border_spacing"] = "0";
-      $d["border_style"] = "";
-      $d["border_top"] = "";
-      $d["border_right"] = "";
-      $d["border_bottom"] = "";
-      $d["border_left"] = "";
-      $d["border_top_color"] = "";
-      $d["border_right_color"] = "";
-      $d["border_bottom_color"] = "";
-      $d["border_left_color"] = "";
-      $d["border_top_style"] = "none";
-      $d["border_right_style"] = "none";
-      $d["border_bottom_style"] = "none";
-      $d["border_left_style"] = "none";
-      $d["border_top_width"] = "medium";
-      $d["border_right_width"] = "medium";
-      $d["border_bottom_width"] = "medium";
-      $d["border_left_width"] = "medium";
-      $d["border_width"] = "medium";
-      $d["border"] = "";
-      $d["bottom"] = "auto";
-      $d["caption_side"] = "top";
-      $d["clear"] = "none";
-      $d["clip"] = "auto";
-      $d["color"] = "#000000";
-      $d["content"] = "normal";
-      $d["counter_increment"] = "none";
-      $d["counter_reset"] = "none";
-      $d["cue_after"] = "none";
-      $d["cue_before"] = "none";
-      $d["cue"] = "";
-      $d["cursor"] = "auto";
-      $d["direction"] = "ltr";
-      $d["display"] = "inline";
-      $d["elevation"] = "level";
-      $d["empty_cells"] = "show";
-      $d["float"] = "none";
-      $d["font_family"] = "serif";
-      $d["font_size"] = "medium";
-      $d["font_style"] = "normal";
-      $d["font_variant"] = "normal";
-      $d["font_weight"] = "normal";
-      $d["font"] = "";
-      $d["height"] = "auto";
-      $d["left"] = "auto";
-      $d["letter_spacing"] = "normal";
-      $d["line_height"] = "normal";
-      $d["list_style_image"] = "none";
-      $d["list_style_position"] = "outside";
-      $d["list_style_type"] = "disc";
-      $d["list_style"] = "";
-      $d["margin_right"] = "0";
-      $d["margin_left"] = "0";
-      $d["margin_top"] = "0";
-      $d["margin_bottom"] = "0";
-      $d["margin"] = "";
-      $d["max_height"] = "none";
-      $d["max_width"] = "none";
-      $d["min_height"] = "0";
-      $d["min_width"] = "0";
-      $d["orphans"] = "2";
-      $d["outline_color"] = "invert";
-      $d["outline_style"] = "none";
-      $d["outline_width"] = "medium";
-      $d["outline"] = "";
-      $d["overflow"] = "visible";
-      $d["padding_top"] = "0";
-      $d["padding_right"] = "0";
-      $d["padding_bottom"] = "0";
-      $d["padding_left"] = "0";
-      $d["padding"] = "";
-      $d["page_break_after"] = "auto";
-      $d["page_break_before"] = "auto";
-      $d["page_break_inside"] = "auto";
-      $d["pause_after"] = "0";
-      $d["pause_before"] = "0";
-      $d["pause"] = "";
-      $d["pitch_range"] = "50";
-      $d["pitch"] = "medium";
-      $d["play_during"] = "auto";
-      $d["position"] = "static";
-      $d["quotes"] = "";
-      $d["richness"] = "50";
-      $d["right"] = "auto";
-      $d["speak_header"] = "once";
-      $d["speak_numeral"] = "continuous";
-      $d["speak_punctuation"] = "none";
-      $d["speak"] = "normal";
-      $d["speech_rate"] = "medium";
-      $d["stress"] = "50";
-      $d["table_layout"] = "auto";
-      $d["text_align"] = "left";
-      $d["text_decoration"] = "none";
-      $d["text_indent"] = "0";
-      $d["text_transform"] = "none";
-      $d["top"] = "auto";
-      $d["unicode_bidi"] = "normal";
-      $d["vertical_align"] = "baseline";
-      $d["visibility"] = "visible";
-      $d["voice_family"] = "";
-      $d["volume"] = "medium";
-      $d["white_space"] = "normal";
-      $d["widows"] = "2";
-      $d["width"] = "auto";
-      $d["word_spacing"] = "normal";
-      $d["z_index"] = "auto";
-
-      // Properties that inherit by default
-      self::$_inherited = array("azimuth",
-                                 "border_collapse",
-                                 "border_spacing",
-                                 "caption_side",
-                                 "color",
-                                 "cursor",
-                                 "direction",
-                                 "elevation",
-                                 "empty_cells",
-                                 "font_family",
-                                 "font_size",
-                                 "font_style",
-                                 "font_variant",
-                                 "font_weight",
-                                 "font",
-                                 "letter_spacing",
-                                 "line_height",
-                                 "list_style_image",
-                                 "list_style_position",
-                                 "list_style_type",
-                                 "list_style",
-                                 "orphans",
-                                 "page_break_inside",
-                                 "pitch_range",
-                                 "pitch",
-                                 "quotes",
-                                 "richness",
-                                 "speak_header",
-                                 "speak_numeral",
-                                 "speak_punctuation",
-                                 "speak",
-                                 "speech_rate",
-                                 "stress",
-                                 "text_align",
-                                 "text_indent",
-                                 "text_transform",
-                                 "visibility",
-                                 "voice_family",
-                                 "volume",
-                                 "white_space",
-                                 "widows",
-                                 "word_spacing");
-    }
-
-  }
-
-  /**
-   * "Destructor": forcibly free all references held by this object
-   */
-  function dispose() {
+        // All CSS 2.1 properties, and their default values
+        $d["azimuth"] = "center";
+        $d["background_attachment"] = "scroll";
+        $d["background_color"] = "transparent";
+        $d["background_image"] = "none";
+        $d["background_position"] = "0% 0%";
+        $d["background_repeat"] = "repeat";
+        $d["background"] = "";
+        $d["border_collapse"] = "separate";
+        $d["border_color"] = "";
+        $d["border_spacing"] = "0";
+        $d["border_style"] = "";
+        $d["border_top"] = "";
+        $d["border_right"] = "";
+        $d["border_bottom"] = "";
+        $d["border_left"] = "";
+        $d["border_top_color"] = "";
+        $d["border_right_color"] = "";
+        $d["border_bottom_color"] = "";
+        $d["border_left_color"] = "";
+        $d["border_top_style"] = "none";
+        $d["border_right_style"] = "none";
+        $d["border_bottom_style"] = "none";
+        $d["border_left_style"] = "none";
+        $d["border_top_width"] = "medium";
+        $d["border_right_width"] = "medium";
+        $d["border_bottom_width"] = "medium";
+        $d["border_left_width"] = "medium";
+        $d["border_width"] = "medium";
+        $d["border"] = "";
+        $d["bottom"] = "auto";
+        $d["caption_side"] = "top";
+        $d["clear"] = "none";
+        $d["clip"] = "auto";
+        $d["color"] = "#000000";
+        $d["content"] = "normal";
+        $d["counter_increment"] = "none";
+        $d["counter_reset"] = "none";
+        $d["cue_after"] = "none";
+        $d["cue_before"] = "none";
+        $d["cue"] = "";
+        $d["cursor"] = "auto";
+        $d["direction"] = "ltr";
+        $d["display"] = "inline";
+        $d["elevation"] = "level";
+        $d["empty_cells"] = "show";
+        $d["float"] = "none";
+        $d["font_family"] = "serif";
+        $d["font_size"] = "medium";
+        $d["font_style"] = "normal";
+        $d["font_variant"] = "normal";
+        $d["font_weight"] = "normal";
+        $d["font"] = "";
+        $d["height"] = "auto";
+        $d["left"] = "auto";
+        $d["letter_spacing"] = "normal";
+        $d["line_height"] = "normal";
+        $d["list_style_image"] = "none";
+        $d["list_style_position"] = "outside";
+        $d["list_style_type"] = "disc";
+        $d["list_style"] = "";
+        $d["margin_right"] = "0";
+        $d["margin_left"] = "0";
+        $d["margin_top"] = "0";
+        $d["margin_bottom"] = "0";
+        $d["margin"] = "";
+        $d["max_height"] = "none";
+        $d["max_width"] = "none";
+        $d["min_height"] = "0";
+        $d["min_width"] = "0";
+        $d["orphans"] = "2";
+        $d["outline_color"] = "invert";
+        $d["outline_style"] = "none";
+        $d["outline_width"] = "medium";
+        $d["outline"] = "";
+        $d["overflow"] = "visible";
+        $d["padding_top"] = "0";
+        $d["padding_right"] = "0";
+        $d["padding_bottom"] = "0";
+        $d["padding_left"] = "0";
+        $d["padding"] = "";
+        $d["page_break_after"] = "auto";
+        $d["page_break_before"] = "auto";
+        $d["page_break_inside"] = "auto";
+        $d["pause_after"] = "0";
+        $d["pause_before"] = "0";
+        $d["pause"] = "";
+        $d["pitch_range"] = "50";
+        $d["pitch"] = "medium";
+        $d["play_during"] = "auto";
+        $d["position"] = "static";
+        $d["quotes"] = "";
+        $d["richness"] = "50";
+        $d["right"] = "auto";
+        $d["speak_header"] = "once";
+        $d["speak_numeral"] = "continuous";
+        $d["speak_punctuation"] = "none";
+        $d["speak"] = "normal";
+        $d["speech_rate"] = "medium";
+        $d["stress"] = "50";
+        $d["table_layout"] = "auto";
+        $d["text_align"] = "left";
+        $d["text_decoration"] = "none";
+        $d["text_indent"] = "0";
+        $d["text_transform"] = "none";
+        $d["top"] = "auto";
+        $d["unicode_bidi"] = "normal";
+        $d["vertical_align"] = "baseline";
+        $d["visibility"] = "visible";
+        $d["voice_family"] = "";
+        $d["volume"] = "medium";
+        $d["white_space"] = "normal";
+        $d["widows"] = "2";
+        $d["width"] = "auto";
+        $d["word_spacing"] = "normal";
+        $d["z_index"] = "auto";
+
+        // Properties that inherit by default
+        self::$_inherited = array("azimuth",
+                                    "border_collapse",
+                                    "border_spacing",
+                                    "caption_side",
+                                    "color",
+                                    "cursor",
+                                    "direction",
+                                    "elevation",
+                                    "empty_cells",
+                                    "font_family",
+                                    "font_size",
+                                    "font_style",
+                                    "font_variant",
+                                    "font_weight",
+                                    "font",
+                                    "letter_spacing",
+                                    "line_height",
+                                    "list_style_image",
+                                    "list_style_position",
+                                    "list_style_type",
+                                    "list_style",
+                                    "orphans",
+                                    "page_break_inside",
+                                    "pitch_range",
+                                    "pitch",
+                                    "quotes",
+                                    "richness",
+                                    "speak_header",
+                                    "speak_numeral",
+                                    "speak_punctuation",
+                                    "speak",
+                                    "speech_rate",
+                                    "stress",
+                                    "text_align",
+                                    "text_indent",
+                                    "text_transform",
+                                    "visibility",
+                                    "voice_family",
+                                    "volume",
+                                    "white_space",
+                                    "widows",
+                                    "word_spacing");
+    }
+
+    }
+
+    /**
+     * "Destructor": forcibly free all references held by this object
+     */
+    function dispose() {
     unset($this->_stylesheet);
-  }
+    }
   
-  /**
-   * returns the {@link Stylesheet} this Style is associated with.
-   *
-   * @return Stylesheet
-   */
-  function get_stylesheet() { return $this->_stylesheet; }
+    /**
+     * returns the {@link Stylesheet} this Style is associated with.
+     *
+     * @return Stylesheet
+     */
+    function get_stylesheet() { return $this->_stylesheet; }
   
-  /**
-   * Converts any CSS length value into an absolute length in points.
-   *
-   * length_in_pt() takes a single length (e.g. '1em') or an array of
-   * lengths and returns an absolute length.  If an array is passed, then
-   * the return value is the sum of all elements.
-   *
-   * If a reference size is not provided, the default font size is used
-   * ({@link Style::$default_font_size}).
-   *
-   * @param float|array $length   the length or array of lengths to resolve
-   * @param float       $ref_size  an absolute reference size to resolve percentage lengths
-   * @return float
-   */
-  function length_in_pt($length, $ref_size = null) {
+    /**
+     * Converts any CSS length value into an absolute length in points.
+     *
+     * length_in_pt() takes a single length (e.g. '1em') or an array of
+     * lengths and returns an absolute length.  If an array is passed, then
+     * the return value is the sum of all elements.
+     *
+     * If a reference size is not provided, the default font size is used
+     * ({@link Style::$default_font_size}).
+     *
+     * @param float|array $length   the length or array of lengths to resolve
+     * @param float       $ref_size  an absolute reference size to resolve percentage lengths
+     * @return float
+     */
+    function length_in_pt($length, $ref_size = null) {
 
     if ( !is_array($length) )
-      $length = array($length);
+        $length = array($length);
 
     if ( !isset($ref_size) )
-      $ref_size = self::$default_font_size;
+        $ref_size = self::$default_font_size;
 
     $ret = 0;
     foreach ($length as $l) {
 
-      if ( $l === "auto" )
+        if ( $l === "auto" )
         return "auto";
       
-      if ( $l === "none" )
+        if ( $l === "none" )
         return "none";
 
-      // Assume numeric values are already in points
-      if ( is_numeric($l) ) {
+        // Assume numeric values are already in points
+        if ( is_numeric($l) ) {
         $ret += $l;
         continue;
-      }
+        }
         
-      if ( $l === "normal" ) {
+        if ( $l === "normal" ) {
         $ret += $ref_size;
         continue;
-      }
+        }
 
-      // Border lengths
-      if ( $l === "thin" ) {
+        // Border lengths
+        if ( $l === "thin" ) {
         $ret += 0.5;
         continue;
-      }
+        }
       
-      if ( $l === "medium" ) {
+        if ( $l === "medium" ) {
         $ret += 1.5;
         continue;
-      }
+        }
     
-      if ( $l === "thick" ) {
+        if ( $l === "thick" ) {
         $ret += 2.5;
         continue;
-      }
+        }
       
-      if ( ($i = mb_strpos($l, "pt"))  !== false ) {
+        if ( ($i = mb_strpos($l, "pt"))  !== false ) {
         $ret += mb_substr($l, 0, $i);
         continue;
-      }
+        }
 
-      if ( ($i = mb_strpos($l, "px"))  !== false ) {
+        if ( ($i = mb_strpos($l, "px"))  !== false ) {
         $ret += ( mb_substr($l, 0, $i)  * 72 ) / DOMPDF_DPI;
         continue;
-      }
+        }
 
-      if ( ($i = mb_strpos($l, "em"))  !== false ) {
+        if ( ($i = mb_strpos($l, "em"))  !== false ) {
         $ret += mb_substr($l, 0, $i) * $this->__get("font_size");
         continue;
-      }
+        }
       
-      // FIXME: em:ex ratio?
-      if ( ($i = mb_strpos($l, "ex"))  !== false ) {
+        // FIXME: em:ex ratio?
+        if ( ($i = mb_strpos($l, "ex"))  !== false ) {
         $ret += mb_substr($l, 0, $i) * $this->__get("font_size");
         continue;
-      }
+        }
       
-      if ( ($i = mb_strpos($l, "%"))  !== false ) {
+        if ( ($i = mb_strpos($l, "%"))  !== false ) {
         $ret += mb_substr($l, 0, $i)/100 * $ref_size;
         continue;
-      }
+        }
       
-      if ( ($i = mb_strpos($l, "in")) !== false ) {
+        if ( ($i = mb_strpos($l, "in")) !== false ) {
         $ret += mb_substr($l, 0, $i) * 72;
         continue;
-      }
+        }
           
-      if ( ($i = mb_strpos($l, "cm")) !== false ) {
+        if ( ($i = mb_strpos($l, "cm")) !== false ) {
         $ret += mb_substr($l, 0, $i) * 72 / 2.54;
         continue;
-      }
+        }
 
-      if ( ($i = mb_strpos($l, "mm")) !== false ) {
+        if ( ($i = mb_strpos($l, "mm")) !== false ) {
         $ret += mb_substr($l, 0, $i) * 72 / 25.4;
         continue;
-      }
+        }
           
-      if ( ($i = mb_strpos($l, "pc")) !== false ) {
+        if ( ($i = mb_strpos($l, "pc")) !== false ) {
         $ret += mb_substr($l, 0, $i) / 12;
         continue;
-      }
+        }
           
-      // Bogus value
-      $ret += $ref_size;
+        // Bogus value
+        $ret += $ref_size;
     }
 
     return $ret;
-  }
+    }
 
   
-  /**
-   * Set inherited properties in this style using values in $parent
-   *
-   * @param Style $parent
-   */
-  function inherit(Style $parent) {
+    /**
+     * Set inherited properties in this style using values in $parent
+     *
+     * @param Style $parent
+     */
+    function inherit(Style $parent) {
 
     // Set parent font size
     $this->_parent_font_size = $parent->get_font_size();
     
     foreach (self::$_inherited as $prop) {
-      //inherit the !important property also.
-      //if local property is also !important, don't inherit.
-      if ( isset($parent->_props[$prop]) &&
+        //inherit the !important property also.
+        //if local property is also !important, don't inherit.
+        if ( isset($parent->_props[$prop]) &&
            ( !isset($this->_props[$prop]) ||
              ( isset($parent->_important_props[$prop]) && !isset($this->_important_props[$prop]) )
-           )
-         ) {
+            )
+            ) {
         if ( isset($parent->_important_props[$prop]) ) {
-          $this->_important_props[$prop] = true;
+            $this->_important_props[$prop] = true;
         }
         //see __set and __get, on all assignments clear cache!
-		$this->_prop_cache[$prop] = null;
-		$this->_props[$prop] = $parent->_props[$prop];
-      }
+        $this->_prop_cache[$prop] = null;
+        $this->_props[$prop] = $parent->_props[$prop];
+        }
     }
       
     foreach (array_keys($this->_props) as $prop) {
-      if ( $this->_props[$prop] === "inherit" ) {
+        if ( $this->_props[$prop] === "inherit" ) {
         if ( isset($parent->_important_props[$prop]) ) {
-          $this->_important_props[$prop] = true;
+            $this->_important_props[$prop] = true;
         }
         //do not assign direct, but
         //implicite assignment through __set, redirect to specialized, get value with __get
@@ -532,58 +532,58 @@ 
         //Therefore do not directly assign the value without __set
         //set _important_props before that to be able to propagate.
         //see __set and __get, on all assignments clear cache!
-		//$this->_prop_cache[$prop] = null;
-		//$this->_props[$prop] = $parent->_props[$prop];
+        //$this->_prop_cache[$prop] = null;
+        //$this->_props[$prop] = $parent->_props[$prop];
         //props_set for more obvious explicite assignment not implemented, because
         //too many implicite uses.
         // $this->props_set($prop, $parent->$prop);
         $this->$prop = $parent->$prop;
-      }
+        }
     }
           
     return $this;
-  }
+    }
 
   
-  /**
-   * Override properties in this style with those in $style
-   *
-   * @param Style $style
-   */
-  function merge(Style $style) {
+    /**
+     * Override properties in this style with those in $style
+     *
+     * @param Style $style
+     */
+    function merge(Style $style) {
     //treat the !important attribute
     //if old rule has !important attribute, override with new rule only if
     //the new rule is also !important
     foreach($style->_props as $prop => $val ) {
-      if (isset($style->_important_props[$prop])) {
- 	    $this->_important_props[$prop] = true;
+        if (isset($style->_important_props[$prop])) {
+            $this->_important_props[$prop] = true;
         //see __set and __get, on all assignments clear cache!
-		$this->_prop_cache[$prop] = null;
- 	    $this->_props[$prop] = $val;
- 	  } else if ( !isset($this->_important_props[$prop]) ) {
+        $this->_prop_cache[$prop] = null;
+            $this->_props[$prop] = $val;
+        } else if ( !isset($this->_important_props[$prop]) ) {
         //see __set and __get, on all assignments clear cache!
-		$this->_prop_cache[$prop] = null;
- 	    $this->_props[$prop] = $val;
- 	  }
- 	}
+        $this->_prop_cache[$prop] = null;
+            $this->_props[$prop] = $val;
+        }
+        }
 
     if ( isset($style->_props["font_size"]) )
-      $this->__font_size_calculated = false;
-  }
+        $this->__font_size_calculated = false;
+    }
 
   
-  /**
-   * Returns an array(r, g, b, "r"=> r, "g"=>g, "b"=>b, "hex"=>"#rrggbb")
-   * based on the provided CSS colour value.
-   *
-   * @param string $colour
-   * @return array
-   */
-  function munge_colour($colour) {
+    /**
+     * Returns an array(r, g, b, "r"=> r, "g"=>g, "b"=>b, "hex"=>"#rrggbb")
+     * based on the provided CSS colour value.
+     *
+     * @param string $colour
+     * @return array
+     */
+    function munge_colour($colour) {
     if ( is_array($colour) )
-      // Assume the array has the right format...
-      // FIXME: should/could verify this.
-      return $colour;
+        // Assume the array has the right format...
+        // FIXME: should/could verify this.
+        return $colour;
     
     $r = 0;
     $g = 0;
@@ -594,78 +594,78 @@ 
 
     case "maroon":
       $r = 0x80;
-      break;
+        break;
 
     case "red":
       $r = 0xff;
-      break;
+        break;
 
     case "orange":
       $r = 0xff;
-      $g = 0xa5;
-      break;
+        $g = 0xa5;
+        break;
 
     case "yellow":
       $r = 0xff;
-      $g = 0xff;
-      break;
+        $g = 0xff;
+        break;
 
     case "olive":
       $r = 0x80;
-      $g = 0x80;
-      break;
+        $g = 0x80;
+        break;
 
     case "purple":
       $r = 0x80;
-      $b = 0x80;
-      break;
+        $b = 0x80;
+        break;
 
     case "fuchsia":
       $r = 0xff;
-      $b = 0xff;
-      break;
+        $b = 0xff;
+        break;
 
     case "white":
       $r = $g = $b = 0xff;
-      break;
+        break;
 
     case "lime":
       $g = 0xff;
-      break;
+        break;
 
     case "green":
       $g = 0x80;
-      break;
+        break;
 
     case "navy":
       $b = 0x80;
-      break;
+        break;
 
     case "blue":
       $b = 0xff;
-      break;
+        break;
 
     case "aqua":
       $g = 0xff;
-      $b = 0xff;
-      break;
+        $b = 0xff;
+        break;
 
     case "teal":
       $g = 0x80;
-      $b = 0x80;
-      break;
+        $b = 0x80;
+        break;
 
     case "black":
       break;
 
     case "sliver":
       $r = $g = $b = 0xc0;
-      break;
+        break;
 
     case "gray":
     case "grey":
       $r = $g = $b = 0x80;
-      break;
+        break;
 
     case "transparent":
       return "transparent";
@@ -677,177 +677,177 @@ 
         $g = hexdec($colour[2] . $colour[2]);
         $b = hexdec($colour[3] . $colour[3]);
 
-      } else if ( mb_strlen($colour) == 7 && $colour[0] === "#" ) {
+        } else if ( mb_strlen($colour) == 7 && $colour[0] === "#" ) {
         // #rrggbb format
         $r = hexdec(mb_substr($colour, 1, 2));
         $g = hexdec(mb_substr($colour, 3, 2));
         $b = hexdec(mb_substr($colour, 5, 2));
 
-      } else if ( mb_strpos($colour, "rgb") !== false ) {
+        } else if ( mb_strpos($colour, "rgb") !== false ) {
         // rgb( r,g,b ) format
         $i = mb_strpos($colour, "(");
         $j = mb_strpos($colour, ")");
         
         // Bad colour value
         if ($i === false || $j === false)
-          return null;
+            return null;
 
         $triplet = explode(",", mb_substr($colour, $i+1, $j-$i-1));
 
         if (count($triplet) != 3)
-          return null;
+            return null;
         
         foreach (array_keys($triplet) as $c) {
-          $triplet[$c] = trim($triplet[$c]);
+            $triplet[$c] = trim($triplet[$c]);
           
-          if ( $triplet[$c]{mb_strlen($triplet[$c]) - 1} === "%" )
+            if ( $triplet[$c]{mb_strlen($triplet[$c]) - 1} === "%" )
             $triplet[$c] = round($triplet[$c] * 0.255);
         }
 
         list($r, $g, $b) = $triplet;
 
-      } else {
+        } else {
         // Who knows?
         return null;
-      }
+        }
       
-      // Clip to 0 - 1
-      $r = $r < 0 ? 0 : ($r > 255 ? 255 : $r);
-      $g = $g < 0 ? 0 : ($g > 255 ? 255 : $g);
-      $b = $b < 0 ? 0 : ($b > 255 ? 255 : $b);
-      break;
+        // Clip to 0 - 1
+        $r = $r < 0 ? 0 : ($r > 255 ? 255 : $r);
+        $g = $g < 0 ? 0 : ($g > 255 ? 255 : $g);
+        $b = $b < 0 ? 0 : ($b > 255 ? 255 : $b);
+        break;
       
     }
     
     // Form array
     $arr = array(0 => $r / 0xff, 1 => $g / 0xff, 2 => $b / 0xff,
-                 "r"=>$r / 0xff, "g"=>$g / 0xff, "b"=>$b / 0xff,
-                 "hex" => sprintf("#%02X%02X%02X", $r, $g, $b));
+                    "r"=>$r / 0xff, "g"=>$g / 0xff, "b"=>$b / 0xff,
+                    "hex" => sprintf("#%02X%02X%02X", $r, $g, $b));
     return $arr;
       
-  }
+    }
 
   
-  /**
-   * Alias for {@link Style::munge_colour()}
-   *
-   * @param string $color
-   * @return array
-   */
-  function munge_color($color) { return CSS_Color::parse($color); }
-
-  /* direct access to _important_props array from outside would work only when declared as
+    /**
+     * Alias for {@link Style::munge_colour()}
+     *
+     * @param string $color
+     * @return array
+     */
+    function munge_color($color) { return CSS_Color::parse($color); }
+
+    /* direct access to _important_props array from outside would work only when declared as
    * 'var $_important_props;' instead of 'protected $_important_props;'
    * Don't call _set/__get on missing attribute. Therefore need a special access.
    * Assume that __set will be also called when this is called, so do not check validity again.
    * Only created, if !important exists -> always set true.
    */
-  function important_set($prop) {
-      $prop = str_replace("-", "_", $prop);
-      $this->_important_props[$prop] = true;
-  }
+    function important_set($prop) {
+        $prop = str_replace("-", "_", $prop);
+        $this->_important_props[$prop] = true;
+    }
 
-  function important_get($prop) {
-      isset($this->_important_props[$prop]);
-  }
+    function important_get($prop) {
+        isset($this->_important_props[$prop]);
+    }
 
-  /**
-   * PHP5 overloaded setter
-   *
-   * This function along with {@link Style::__get()} permit a user of the
-   * Style class to access any (CSS) property using the following syntax:
-   * <code>
-   *  Style->margin_top = "1em";
-   *  echo (Style->margin_top);
-   * </code>
-   *
-   * __set() automatically calls the provided set function, if one exists,
-   * otherwise it sets the property directly.  Typically, __set() is not
-   * called directly from outside of this class.
-   *
-   * On each modification clear cache to return accurate setting.
-   * Also affects direct settings not using __set
-   * For easier finding all assignments, attempted to allowing only explicite assignment:
-   * Very many uses, e.g. frame_reflower.cls.php -> for now leave as it is
-   * function __set($prop, $val) {
-   *   throw new DOMPDF_Exception("Implicite replacement of assignment by __set.  Not good.");
-   * }
-   * function props_set($prop, $val) { ... }
-   *
-   * @param string $prop  the property to set
-   * @param mixed  $val   the value of the property
-   *
-   */
-  function __set($prop, $val) {
+    /**
+     * PHP5 overloaded setter
+     *
+     * This function along with {@link Style::__get()} permit a user of the
+     * Style class to access any (CSS) property using the following syntax:
+     * <code>
+     *  Style->margin_top = "1em";
+     *  echo (Style->margin_top);
+     * </code>
+     *
+     * __set() automatically calls the provided set function, if one exists,
+     * otherwise it sets the property directly.  Typically, __set() is not
+     * called directly from outside of this class.
+     *
+     * On each modification clear cache to return accurate setting.
+     * Also affects direct settings not using __set
+     * For easier finding all assignments, attempted to allowing only explicite assignment:
+     * Very many uses, e.g. frame_reflower.cls.php -> for now leave as it is
+     * function __set($prop, $val) {
+     *   throw new DOMPDF_Exception("Implicite replacement of assignment by __set.  Not good.");
+     * }
+     * function props_set($prop, $val) { ... }
+     *
+     * @param string $prop  the property to set
+     * @param mixed  $val   the value of the property
+     *
+     */
+    function __set($prop, $val) {
     global $_dompdf_warnings;
 
     $prop = str_replace("-", "_", $prop);
     $this->_prop_cache[$prop] = null;
     
     if ( !isset(self::$_defaults[$prop]) ) {
-      $_dompdf_warnings[] = "'$prop' is not a valid CSS2 property.";
-      return;
+        $_dompdf_warnings[] = "'$prop' is not a valid CSS2 property.";
+        return;
     }
     
     if ( $prop !== "content" && is_string($val) && mb_strpos($val, "url") === false ) {
-      $val = mb_strtolower(trim(str_replace(array("\n", "\t"), array(" "), $val)));
-      $val = preg_replace("/([0-9]+) (pt|px|pc|em|ex|in|cm|mm|%)/S", "\\1\\2", $val);
+        $val = mb_strtolower(trim(str_replace(array("\n", "\t"), array(" "), $val)));
+        $val = preg_replace("/([0-9]+) (pt|px|pc|em|ex|in|cm|mm|%)/S", "\\1\\2", $val);
     }
     
     $method = "set_$prop";
 
     if ( method_exists($this, $method) )
-      $this->$method($val);
+        $this->$method($val);
     else
-      $this->_props[$prop] = $val;
+        $this->_props[$prop] = $val;
     
-  }
+    }
 
-  /**
-   * PHP5 overloaded getter
-   *
-   * Along with {@link Style::__set()} __get() provides access to all CSS
-   * properties directly.  Typically __get() is not called directly outside
-   * of this class.
-   *
-   * On each modification clear cache to return accurate setting.
-   * Also affects direct settings not using __set
-   *
-   * @param string $prop
-   * @return mixed
-   */
-  function __get($prop) {
+    /**
+     * PHP5 overloaded getter
+     *
+     * Along with {@link Style::__set()} __get() provides access to all CSS
+     * properties directly.  Typically __get() is not called directly outside
+     * of this class.
+     *
+     * On each modification clear cache to return accurate setting.
+     * Also affects direct settings not using __set
+     *
+     * @param string $prop
+     * @return mixed
+     */
+    function __get($prop) {
     
     if ( !isset(self::$_defaults[$prop]) )
-      throw new DOMPDF_Exception("'$prop' is not a valid CSS2 property.");
+        throw new DOMPDF_Exception("'$prop' is not a valid CSS2 property.");
 
     if ( isset($this->_prop_cache[$prop]) && $this->_prop_cache[$prop] != null)
-      return $this->_prop_cache[$prop];
+        return $this->_prop_cache[$prop];
     
     $method = "get_$prop";
 
     // Fall back on defaults if property is not set
     if ( !isset($this->_props[$prop]) )
-      $this->_props[$prop] = self::$_defaults[$prop];
+        $this->_props[$prop] = self::$_defaults[$prop];
 
     if ( method_exists($this, $method) )
-      return $this->_prop_cache[$prop] = $this->$method();
+        return $this->_prop_cache[$prop] = $this->$method();
 
 
     return $this->_prop_cache[$prop] = $this->_props[$prop];
-  }
+    }
 
 
-  /**
-   * Getter for the 'font-family' CSS property.
-   *
-   * Uses the {@link Font_Metrics} class to resolve the font family into an
-   * actual font file.
-   *
-   * @link http://www.w3.org/TR/CSS21/fonts.html#propdef-font-family
-   * @return string
-   */
-  function get_font_family() {
+    /**
+     * Getter for the 'font-family' CSS property.
+     *
+     * Uses the {@link Font_Metrics} class to resolve the font family into an
+     * actual font file.
+     *
+     * @link http://www.w3.org/TR/CSS21/fonts.html#propdef-font-family
+     * @return string
+     */
+    function get_font_family() {
   
     $DEBUGCSS=DEBUGCSS; //=DEBUGCSS; Allow override of global setting for ad hoc debug
 	
@@ -859,16 +859,16 @@ 
     
     if ( is_numeric($weight) ) {
 
-      if ( $weight < 600 )
+        if ( $weight < 600 )
         $weight = "normal";
-      else
+        else
         $weight = "bold";
 
     } else if ( $weight === "bold" || $weight === "bolder" ) {
-      $weight = "bold";
+        $weight = "bold";
 
     } else {
-      $weight = "normal";
+        $weight = "normal";
 
     }
 
@@ -876,18 +876,18 @@ 
     $font_style = $this->__get("font_style");
 
     if ( $weight === "bold" && ($font_style === "italic" || $font_style === "oblique") )
-      $subtype = "bold_italic";
+        $subtype = "bold_italic";
     else if ( $weight === "bold" && $font_style !== "italic" && $font_style !== "oblique" )
-      $subtype = "bold";
+        $subtype = "bold";
     else if ( $weight !== "bold" && ($font_style === "italic" || $font_style === "oblique") )
-      $subtype = "italic";
+        $subtype = "italic";
     else
-      $subtype = "normal";
+        $subtype = "normal";
     
     // Resolve the font family
     if ($DEBUGCSS) {
-      print "<pre>[get_font_family:";
-      print '('.$this->_props["font_family"].'.'.$font_style.'.'.$this->__get("font_weight").'.'.$weight.'.'.$subtype.')';
+        print "<pre>[get_font_family:";
+        print '('.$this->_props["font_family"].'.'.$font_style.'.'.$this->__get("font_weight").'.'.$weight.'.'.$subtype.')';
     }
     $families = explode(",", $this->_props["font_family"]);
     $families = array_map('trim',$families);
@@ -895,17 +895,17 @@ 
 
     $font = null;
     while ( current($families) ) {
-      list(,$family) = each($families);
-      //remove leading and trailing string delimiters, e.g. on font names with spaces;
-      //remove leading and trailing whitespace
-      $family=trim($family," \t\n\r\x0B\"'");
-      if ($DEBUGCSS) print '('.$family.')';
-      $font = Font_Metrics::get_font($family, $subtype);
-
-      if ( $font ) {
+        list(,$family) = each($families);
+        //remove leading and trailing string delimiters, e.g. on font names with spaces;
+        //remove leading and trailing whitespace
+        $family=trim($family," \t\n\r\x0B\"'");
+        if ($DEBUGCSS) print '('.$family.')';
+        $font = Font_Metrics::get_font($family, $subtype);
+
+        if ( $font ) {
         if ($DEBUGCSS)  print '('.$font.")get_font_family]\n</pre>";
         return $font;
-      }
+        }
     }
 
     $family = null;
@@ -913,63 +913,63 @@ 
     $font = Font_Metrics::get_font($family, $subtype);
 
     if ( $font ) {
-      if ($DEBUGCSS) print '('.$font.")get_font_family]\n</pre>";
-      return $font;
+        if ($DEBUGCSS) print '('.$font.")get_font_family]\n</pre>";
+        return $font;
     }
     throw new DOMPDF_Exception("Unable to find a suitable font replacement for: '" . $this->_props["font_family"] ."'");
     
-  }
+    }
 
-  /**
-   * Returns the resolved font size, in points
-   *
-   * @link http://www.w3.org/TR/CSS21/fonts.html#propdef-font-size
-   * @return float
-   */
-  function get_font_size() {
+    /**
+     * Returns the resolved font size, in points
+     *
+     * @link http://www.w3.org/TR/CSS21/fonts.html#propdef-font-size
+     * @return float
+     */
+    function get_font_size() {
 
     if ( $this->__font_size_calculated )
-      return $this->_props["font_size"];
+        return $this->_props["font_size"];
     
     if ( !isset($this->_props["font_size"]) )
-      $fs = self::$_defaults["font_size"];
+        $fs = self::$_defaults["font_size"];
     else
-      $fs = $this->_props["font_size"];
+        $fs = $this->_props["font_size"];
     
     if ( !isset($this->_parent_font_size) )
-      $this->_parent_font_size = self::$default_font_size;
+        $this->_parent_font_size = self::$default_font_size;
     
     switch ($fs) {
       
     case "xx-small":
       $fs = 3/5 * $this->_parent_font_size;
-      break;
+        break;
 
     case "x-small":
       $fs = 3/4 * $this->_parent_font_size;
-      break;
+        break;
 
     case "smaller":
     case "small":
       $fs = 8/9 * $this->_parent_font_size;
-      break;
+        break;
 
     case "medium":
       $fs = $this->_parent_font_size;
-      break;
+        break;
 
     case "larger":
     case "large":
       $fs = 6/5 * $this->_parent_font_size;
-      break;
+        break;
 
     case "x-large":
       $fs = 3/2 * $this->_parent_font_size;
-      break;
+        break;
 
     case "xx-large":
       $fs = 2/1 * $this->_parent_font_size;
-      break;
+        break;
 
     default:
       break;
@@ -977,82 +977,82 @@ 
 
     // Ensure relative sizes resolve to something
     if ( ($i = mb_strpos($fs, "em")) !== false )
-      $fs = mb_substr($fs, 0, $i) * $this->_parent_font_size;
+        $fs = mb_substr($fs, 0, $i) * $this->_parent_font_size;
 
     else if ( ($i = mb_strpos($fs, "ex")) !== false )
-      $fs = mb_substr($fs, 0, $i) * $this->_parent_font_size;
+        $fs = mb_substr($fs, 0, $i) * $this->_parent_font_size;
 
     else
-      $fs = $this->length_in_pt($fs);
+        $fs = $this->length_in_pt($fs);
 
     //see __set and __get, on all assignments clear cache!
-	$this->_prop_cache["font_size"] = null;
+    $this->_prop_cache["font_size"] = null;
     $this->_props["font_size"] = $fs;
     $this->__font_size_calculated = true;
     return $this->_props["font_size"];
 
-  }
+    }
 
-  /**
-   * @link http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing
-   * @return float
-   */
-  function get_word_spacing() {
+    /**
+     * @link http://www.w3.org/TR/CSS21/text.html#propdef-word-spacing
+     * @return float
+     */
+    function get_word_spacing() {
     if ( $this->_props["word_spacing"] === "normal" )
-      return 0;
+        return 0;
 
     return $this->_props["word_spacing"];
-  }
+    }
 
-  /**
-   * @link http://www.w3.org/TR/CSS21/visudet.html#propdef-line-height
-   * @return float
-   */
-  function get_line_height() {
+    /**
+     * @link http://www.w3.org/TR/CSS21/visudet.html#propdef-line-height
+     * @return float
+     */
+    function get_line_height() {
     if ( $this->_props["line_height"] === "normal" )
-      return self::$default_line_height * $this->get_font_size();
+        return self::$default_line_height * $this->get_font_size();
 
     if ( is_numeric($this->_props["line_height"]) )
-      return $this->length_in_pt( $this->_props["line_height"] . "%", $this->get_font_size());
+        return $this->length_in_pt( $this->_props["line_height"] . "%", $this->get_font_size());
     
     return $this->length_in_pt( $this->_props["line_height"], $this->get_font_size() );
-  }
+    }
 
-  /**
-   * Returns the colour as an array
-   *
-   * The array has the following format:
-   * <code>array(r,g,b, "r" => r, "g" => g, "b" => b, "hex" => "#rrggbb")</code>
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-color
-   * @return array
-   */
-  function get_color() {
+    /**
+     * Returns the colour as an array
+     *
+     * The array has the following format:
+     * <code>array(r,g,b, "r" => r, "g" => g, "b" => b, "hex" => "#rrggbb")</code>
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-color
+     * @return array
+     */
+    function get_color() {
     return $this->munge_color( $this->_props["color"] );
-  }
+    }
 
-  /**
-   * Returns the background colour as an array
-   *
-   * The returned array has the same format as {@link Style::get_color()}
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-color
-   * @return array
-   */
-  function get_background_color() {
+    /**
+     * Returns the background colour as an array
+     *
+     * The returned array has the same format as {@link Style::get_color()}
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-color
+     * @return array
+     */
+    function get_background_color() {
     return $this->munge_color( $this->_props["background_color"] );
-  }
+    }
   
-  /**
-   * Returns the background position as an array
-   *
-   * The returned array has the following format:
-   * <code>array(x,y, "x" => x, "y" => y)</code>
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-position
-   * @return array
-   */
-  function get_background_position() {
+    /**
+     * Returns the background position as an array
+     *
+     * The returned array has the following format:
+     * <code>array(x,y, "x" => x, "y" => y)</code>
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-position
+     * @return array
+     */
+    function get_background_position() {
     
     $tmp = explode(" ", $this->_props["background_position"]);
 
@@ -1060,119 +1060,119 @@ 
 
     case "left":
       $x = "0%";
-      break;
+        break;
 
     case "right":
       $x = "100%";
-      break;
+        break;
 
     case "top":
       $y = "0%";
-      break;
+        break;
 
     case "bottom":
       $y = "100%";
-      break;
+        break;
 
     case "center":
       $x = "50%";
-      $y = "50%";
-      break;
+        $y = "50%";
+        break;
 
     default:
       $x = $tmp[0];
-      break;
+        break;
     }
 
     if ( isset($tmp[1]) ) {
 
-      switch ($tmp[1]) {
-      case "left":
+        switch ($tmp[1]) {
+        case "left":
         $x = "0%";
         break;
         
-      case "right":
+        case "right":
         $x = "100%";
         break;
         
-      case "top":
+        case "top":
         $y = "0%";
         break;
         
-      case "bottom":
+        case "bottom":
         $y = "100%";
         break;
         
-      case "center":
+        case "center":
         if ( $tmp[0] === "left" || $tmp[0] === "right" || $tmp[0] === "center" )
-          $y = "50%";
+            $y = "50%";
         else
-          $x = "50%";
+            $x = "50%";
         break;
         
-      default:
+        default:
         $y = $tmp[1];
         break;
-      }
+        }
 
     } else {
-      $y = "50%";
+        $y = "50%";
     }
 
     if ( !isset($x) )
-      $x = "0%";
+        $x = "0%";
 
     if ( !isset($y) )
-      $y = "0%";
+        $y = "0%";
 
     return array( 0 => $x, "x" => $x,
-                  1 => $y, "y" => $y );
-  }
+                    1 => $y, "y" => $y );
+    }
 
 
-  /**
-   * Returns the background as it is currently stored
-   *
-   * (currently anyway only for completeness.
-   * not used for further processing)
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-attachment
-   * @return string
-   */
-  function get_background_attachment() {
+    /**
+     * Returns the background as it is currently stored
+     *
+     * (currently anyway only for completeness.
+     * not used for further processing)
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-attachment
+     * @return string
+     */
+    function get_background_attachment() {
     return $this->_props["background_attachment"];
-  }
+    }
 
 
-  /**
-   * Returns the background_repeat as it is currently stored
-   *
-   * (currently anyway only for completeness.
-   * not used for further processing)
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-repeat
-   * @return string
-   */
-  function get_background_repeat() {
+    /**
+     * Returns the background_repeat as it is currently stored
+     *
+     * (currently anyway only for completeness.
+     * not used for further processing)
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-repeat
+     * @return string
+     */
+    function get_background_repeat() {
     return $this->_props["background_repeat"];
-  }
+    }
 
 
-  /**
-   * Returns the background as it is currently stored
-   *
-   * (currently anyway only for completeness.
-   * not used for further processing, but the individual get_background_xxx)
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background
-   * @return string
-   */
-  function get_background() {
+    /**
+     * Returns the background as it is currently stored
+     *
+     * (currently anyway only for completeness.
+     * not used for further processing, but the individual get_background_xxx)
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background
+     * @return string
+     */
+    function get_background() {
     return $this->_props["background"];
-  }
+    }
 
 
-  /**#@+
+    /**#@+
    * Returns the border colour as an array
    *
    * See {@link Style::get_color()}
@@ -1180,112 +1180,112 @@ 
    * @link http://www.w3.org/TR/CSS21/box.html#border-color-properties
    * @return array
    */
-  function get_border_top_color() {
+    function get_border_top_color() {
     if ( $this->_props["border_top_color"] === "" ) {
-      //see __set and __get, on all assignments clear cache!
-      $this->_prop_cache["border_top_color"] = null;
-      $this->_props["border_top_color"] = $this->__get("color");
+        //see __set and __get, on all assignments clear cache!
+        $this->_prop_cache["border_top_color"] = null;
+        $this->_props["border_top_color"] = $this->__get("color");
     }
     return $this->munge_color($this->_props["border_top_color"]);
-  }
+    }
 
-  function get_border_right_color() {
+    function get_border_right_color() {
     if ( $this->_props["border_right_color"] === "" ) {
-      //see __set and __get, on all assignments clear cache!
-      $this->_prop_cache["border_right_color"] = null;
-      $this->_props["border_right_color"] = $this->__get("color");
+        //see __set and __get, on all assignments clear cache!
+        $this->_prop_cache["border_right_color"] = null;
+        $this->_props["border_right_color"] = $this->__get("color");
     }
     return $this->munge_color($this->_props["border_right_color"]);
-  }
+    }
 
-  function get_border_bottom_color() {
+    function get_border_bottom_color() {
     if ( $this->_props["border_bottom_color"] === "" ) {
-      //see __set and __get, on all assignments clear cache!
-      $this->_prop_cache["border_bottom_color"] = null;
-      $this->_props["border_bottom_color"] = $this->__get("color");
+        //see __set and __get, on all assignments clear cache!
+        $this->_prop_cache["border_bottom_color"] = null;
+        $this->_props["border_bottom_color"] = $this->__get("color");
     }
     return $this->munge_color($this->_props["border_bottom_color"]);;
-  }
+    }
 
-  function get_border_left_color() {
+    function get_border_left_color() {
     if ( $this->_props["border_left_color"] === "" ) {
-      //see __set and __get, on all assignments clear cache!
-      $this->_prop_cache["border_left_color"] = null;
-      $this->_props["border_left_color"] = $this->__get("color");
+        //see __set and __get, on all assignments clear cache!
+        $this->_prop_cache["border_left_color"] = null;
+        $this->_props["border_left_color"] = $this->__get("color");
     }
     return $this->munge_color($this->_props["border_left_color"]);
-  }
+    }
   
-  /**#@-*/
+    /**#@-*/
 
- /**#@+
+    /**#@+
    * Returns the border width, as it is currently stored
    *
    * @link http://www.w3.org/TR/CSS21/box.html#border-width-properties
    * @return float|string
    */
-  function get_border_top_width() {
+    function get_border_top_width() {
     $style = $this->__get("border_top_style");
     return $style !== "none" && $style !== "hidden" ? $this->length_in_pt($this->_props["border_top_width"]) : 0;
-  }
+    }
   
-  function get_border_right_width() {
+    function get_border_right_width() {
     $style = $this->__get("border_right_style");
     return $style !== "none" && $style !== "hidden" ? $this->length_in_pt($this->_props["border_right_width"]) : 0;
-  }
+    }
 
-  function get_border_bottom_width() {
+    function get_border_bottom_width() {
     $style = $this->__get("border_bottom_style");
     return $style !== "none" && $style !== "hidden" ? $this->length_in_pt($this->_props["border_bottom_width"]) : 0;
-  }
+    }
 
-  function get_border_left_width() {
+    function get_border_left_width() {
     $style = $this->__get("border_left_style");
     return $style !== "none" && $style !== "hidden" ? $this->length_in_pt($this->_props["border_left_width"]) : 0;
-  }
-  /**#@-*/
-
-  /**
-   * Return an array of all border properties.
-   *
-   * The returned array has the following structure:
-   * <code>
-   * array("top" => array("width" => [border-width],
-   *                      "style" => [border-style],
-   *                      "color" => [border-color (array)]),
-   *       "bottom" ... )
-   * </code>
-   *
-   * @return array
-   */
-  function get_border_properties() {
+    }
+    /**#@-*/
+
+    /**
+     * Return an array of all border properties.
+     *
+     * The returned array has the following structure:
+     * <code>
+     * array("top" => array("width" => [border-width],
+     *                      "style" => [border-style],
+     *                      "color" => [border-color (array)]),
+     *       "bottom" ... )
+     * </code>
+     *
+     * @return array
+     */
+    function get_border_properties() {
     return array("top" => array("width" => $this->__get("border_top_width"),
                                 "style" => $this->__get("border_top_style"),
                                 "color" => $this->__get("border_top_color")),
-                 "bottom" => array("width" => $this->__get("border_bottom_width"),
-                                   "style" => $this->__get("border_bottom_style"),
-                                   "color" => $this->__get("border_bottom_color")),
-                 "right" => array("width" => $this->__get("border_right_width"),
-                                  "style" => $this->__get("border_right_style"),
-                                  "color" => $this->__get("border_right_color")),
-                 "left" => array("width" => $this->__get("border_left_width"),
-                                 "style" => $this->__get("border_left_style"),
-                                 "color" => $this->__get("border_left_color")));
-  }
-
-  /**
-   * Return a single border property
-   *
-   * @return mixed
-   */
-  protected function _get_border($side) {
+                    "bottom" => array("width" => $this->__get("border_bottom_width"),
+                                    "style" => $this->__get("border_bottom_style"),
+                                    "color" => $this->__get("border_bottom_color")),
+                    "right" => array("width" => $this->__get("border_right_width"),
+                                    "style" => $this->__get("border_right_style"),
+                                    "color" => $this->__get("border_right_color")),
+                    "left" => array("width" => $this->__get("border_left_width"),
+                                    "style" => $this->__get("border_left_style"),
+                                    "color" => $this->__get("border_left_color")));
+    }
+
+    /**
+     * Return a single border property
+     *
+     * @return mixed
+     */
+    protected function _get_border($side) {
     $color = $this->__get("border_" . $side . "_color");
     
     return $this->__get("border_" . $side . "_width") . " " .
-      $this->__get("border_" . $side . "_style") . " " . $color["hex"];
-  }
+        $this->__get("border_" . $side . "_style") . " " . $color["hex"];
+    }
 
-  /**#@+
+    /**#@+
    * Return full border properties as a string
    *
    * Border properties are returned just as specified in CSS:
@@ -1295,28 +1295,28 @@ 
    * @link http://www.w3.org/TR/CSS21/box.html#border-shorthand-properties
    * @return string
    */
-  function get_border_top() { return $this->_get_border("top"); }
-  function get_border_right() { return $this->_get_border("right"); }
-  function get_border_bottom() { return $this->_get_border("bottom"); }
-  function get_border_left() { return $this->_get_border("left"); }
-  /**#@-*/
-
-
-  /**
-   * Returns border spacing as an array
-   *
-   * The array has the format (h_space,v_space)
-   *
-   * @link http://www.w3.org/TR/CSS21/tables.html#propdef-border-spacing
-   * @return array
-   */
-  function get_border_spacing() {
+    function get_border_top() { return $this->_get_border("top"); }
+    function get_border_right() { return $this->_get_border("right"); }
+    function get_border_bottom() { return $this->_get_border("bottom"); }
+    function get_border_left() { return $this->_get_border("left"); }
+    /**#@-*/
+
+
+    /**
+     * Returns border spacing as an array
+     *
+     * The array has the format (h_space,v_space)
+     *
+     * @link http://www.w3.org/TR/CSS21/tables.html#propdef-border-spacing
+     * @return array
+     */
+    function get_border_spacing() {
     return explode(" ", $this->_props["border_spacing"]);
-  }
+    }
 
 /*==============================*/
 
-  /*
+    /*
    !important attribute
    For basic functionality of the !important attribute with overloading
    of several styles of an element, changes in inherit(), merge() and _parse_properties()
@@ -1358,419 +1358,419 @@ 
    Related functionality for background, padding, margin, font, list_style
   */
 
-  /* Generalized set function for individual attribute of combined style.
+    /* Generalized set function for individual attribute of combined style.
    * With check for !important
    * Applicable for background, border, padding, margin, font, list_style
    * Note: $type has a leading underscore (or is empty), the others not.
    */
-  protected function _set_style_side_type($style,$side,$type,$val,$important) {
+    protected function _set_style_side_type($style,$side,$type,$val,$important) {
     if ( !isset($this->_important_props[$style.'_'.$side.$type]) || $important) {
-      //see __set and __get, on all assignments clear cache!
-      $this->_prop_cache[$style.'_'.$side.$type] = null;
-      if ($important) {
+        //see __set and __get, on all assignments clear cache!
+        $this->_prop_cache[$style.'_'.$side.$type] = null;
+        if ($important) {
         $this->_important_props[$style.'_'.$side.$type] = true;
-      }
-      $this->_props[$style.'_'.$side.$type] = $val;
+        }
+        $this->_props[$style.'_'.$side.$type] = $val;
+    }
     }
-  }
 
-  protected function _set_style_sides_type($style,$top,$right,$bottom,$left,$type,$important) {
-      $this->_set_style_side_type($style,'top',$type,$top,$important);
-      $this->_set_style_side_type($style,'right',$type,$right,$important);
-      $this->_set_style_side_type($style,'bottom',$type,$bottom,$important);
-      $this->_set_style_side_type($style,'left',$type,$left,$important);
-  }
+    protected function _set_style_sides_type($style,$top,$right,$bottom,$left,$type,$important) {
+        $this->_set_style_side_type($style,'top',$type,$top,$important);
+        $this->_set_style_side_type($style,'right',$type,$right,$important);
+        $this->_set_style_side_type($style,'bottom',$type,$bottom,$important);
+        $this->_set_style_side_type($style,'left',$type,$left,$important);
+    }
 
-  protected function _set_style_type($style,$type,$val,$important) {
+    protected function _set_style_type($style,$type,$val,$important) {
     $arr = explode(" ", $val);
     switch (count($arr)) {
     case 1:
       $this->_set_style_sides_type($style,$arr[0],$arr[0],$arr[0],$arr[0],$type,$important);
-      break;
+        break;
     case 2:
       $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[0],$arr[1],$type,$important);
-      break;
+        break;
     case 3:
       $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[1],$arr[2],$type,$important);
-      break;
+        break;
     case 4:
       $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[2],$arr[3],$type,$important);
-      break;
+        break;
     default:
       break;
     }
     //see __set and __get, on all assignments clear cache!
-	$this->_prop_cache[$style.$type] = null;
+    $this->_prop_cache[$style.$type] = null;
     $this->_props[$style.$type] = $val;
-  }
+    }
 
-  protected function _set_style_type_important($style,$type,$val) {
+    protected function _set_style_type_important($style,$type,$val) {
     $this->_set_style_type($style,$type,$val,isset($this->_important_props[$style.$type]));
-  }
+    }
 
-  /* Anyway only called if _important matches and is assigned
+    /* Anyway only called if _important matches and is assigned
    * E.g. _set_style_side_type($style,$side,'',str_replace("none", "0px", $val),isset($this->_important_props[$style.'_'.$side]));
    */
-  protected function _set_style_side_width_important($style,$side,$val) {
+    protected function _set_style_side_width_important($style,$side,$val) {
     //see __set and __get, on all assignments clear cache!
     $this->_prop_cache[$style.'_'.$side] = null;
     $this->_props[$style.'_'.$side] = str_replace("none", "0px", $val);
-  }
+    }
 
-  protected function _set_style($style,$val,$important) {
+    protected function _set_style($style,$val,$important) {
     if ( !isset($this->_important_props[$style]) || $important) {
-      if ($important) {
+        if ($important) {
         $this->_important_props[$style] = true;
-      }
-      //see __set and __get, on all assignments clear cache!
-	  $this->_prop_cache[$style] = null;
-      $this->_props[$style] = $val;
+        }
+        //see __set and __get, on all assignments clear cache!
+        $this->_prop_cache[$style] = null;
+        $this->_props[$style] = $val;
+    }
     }
-  }
 
-  protected function _image($val) {
+    protected function _image($val) {
     $DEBUGCSS=DEBUGCSS;
     
     if ( mb_strpos($val, "url") === false ) {
-      $path = "none"; //Don't resolve no image -> otherwise would prefix path and no longer recognize as none
+        $path = "none"; //Don't resolve no image -> otherwise would prefix path and no longer recognize as none
     } else {
-      $val = preg_replace("/url\(['\"]?([^'\")]+)['\"]?\)/","\\1", trim($val));
+        $val = preg_replace("/url\(['\"]?([^'\")]+)['\"]?\)/","\\1", trim($val));
 
-      // Resolve the url now in the context of the current stylesheet
-      $parsed_url = explode_url($val);
-      if ( $parsed_url["protocol"] == "" && $this->_stylesheet->get_protocol() == "" ) {
+        // Resolve the url now in the context of the current stylesheet
+        $parsed_url = explode_url($val);
+        if ( $parsed_url["protocol"] == "" && $this->_stylesheet->get_protocol() == "" ) {
         if ($parsed_url["path"]{0} === '/' || $parsed_url["path"]{0} === '\\' ) {
-          $path = $_SERVER["DOCUMENT_ROOT"].'/';
+            $path = $_SERVER["DOCUMENT_ROOT"].'/';
         } else {
-          $path = $this->_stylesheet->get_base_path();
+            $path = $this->_stylesheet->get_base_path();
         }
         $path .= $parsed_url["path"] . $parsed_url["file"];
         $path = realpath($path);
         // If realpath returns FALSE then specifically state that there is no background image
         if (!$path) { $path = 'none'; }
-      } else {
+        } else {
         $path = build_url($this->_stylesheet->get_protocol(),
-                          $this->_stylesheet->get_host(),
-                          $this->_stylesheet->get_base_path(),
-                          $val);
-      }
+                            $this->_stylesheet->get_host(),
+                            $this->_stylesheet->get_base_path(),
+                            $val);
+        }
     }
     if ($DEBUGCSS) {
-      print "<pre>[_image\n";
-      print_r($parsed_url);
-      print $this->_stylesheet->get_protocol()."\n".$this->_stylesheet->get_base_path()."\n".$path."\n";
-      print "_image]</pre>";;
+        print "<pre>[_image\n";
+        print_r($parsed_url);
+        print $this->_stylesheet->get_protocol()."\n".$this->_stylesheet->get_base_path()."\n".$path."\n";
+        print "_image]</pre>";;
     }
     return $path;
-  }
+    }
 
 /*======================*/
 
-  /**
-   * Sets colour
-   *
-   * The colour parameter can be any valid CSS colour value
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-color
-   * @param string $colour
-   */
-  function set_color($colour) {
+    /**
+     * Sets colour
+     *
+     * The colour parameter can be any valid CSS colour value
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-color
+     * @param string $colour
+     */
+    function set_color($colour) {
     $col = $this->munge_colour($colour);
 
     if ( is_null($col) )
-      $col = self::$_defaults["color"];
+        $col = self::$_defaults["color"];
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["color"] = null;
+    $this->_prop_cache["color"] = null;
     $this->_props["color"] = $col["hex"];
-  }
+    }
 
-  /**
-   * Sets the background colour
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-color
-   * @param string $colour
-   */
-  function set_background_color($colour) {
+    /**
+     * Sets the background colour
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-color
+     * @param string $colour
+     */
+    function set_background_color($colour) {
     $col = $this->munge_colour($colour);
     if ( is_null($col) )
-      $col = self::$_defaults["background_color"];
+        $col = self::$_defaults["background_color"];
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["background_color"] = null;
+    $this->_prop_cache["background_color"] = null;
     $this->_props["background_color"] = is_array($col) ? $col["hex"] : $col;
-  }
+    }
 
-  /**
-   * Set the background image url
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#background-properties
-   * @param string $url
-   */
-  function set_background_image($val) {
+    /**
+     * Set the background image url
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#background-properties
+     * @param string $url
+     */
+    function set_background_image($val) {
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["background_image"] = null;
+    $this->_prop_cache["background_image"] = null;
     $this->_props["background_image"] = $this->_image($val);
-  }
+    }
 
-  /**
-   * Sets the background repeat
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-repeat
-   * @param string $val
-   */
-  function set_background_repeat($val) {
+    /**
+     * Sets the background repeat
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-repeat
+     * @param string $val
+     */
+    function set_background_repeat($val) {
     if ( is_null($val) )
-      $val = self::$_defaults["background_repeat"];
+        $val = self::$_defaults["background_repeat"];
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
     $this->_prop_cache["background_repeat"] = null;
     $this->_props["background_repeat"] = $val;
-  }
+    }
 
-  /**
-   * Sets the background attachment
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-attachment
-   * @param string $val
-   */
-  function set_background_attachment($val) {
+    /**
+     * Sets the background attachment
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-attachment
+     * @param string $val
+     */
+    function set_background_attachment($val) {
     if ( is_null($val) )
-      $val = self::$_defaults["background_attachment"];
+        $val = self::$_defaults["background_attachment"];
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["background_attachment"] = null;
+    $this->_prop_cache["background_attachment"] = null;
     $this->_props["background_attachment"] = $val;
-  }
+    }
 
-  /**
-   * Sets the background position
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-position
-   * @param string $val
-   */
-  function set_background_position($val) {
+    /**
+     * Sets the background position
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background-position
+     * @param string $val
+     */
+    function set_background_position($val) {
     if ( is_null($val) )
-      $val = self::$_defaults["background_position"];
+        $val = self::$_defaults["background_position"];
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["background_position"] = null;
+    $this->_prop_cache["background_position"] = null;
     $this->_props["background_position"] = $val;
-  }
+    }
 
-  /**
-   * Sets the background - combined options
-   *
-   * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background
-   * @param string $val
-   */
-  function set_background($val) {
+    /**
+     * Sets the background - combined options
+     *
+     * @link http://www.w3.org/TR/CSS21/colors.html#propdef-background
+     * @param string $val
+     */
+    function set_background($val) {
     $col = null;
     $pos = array();
     $tmp = explode(" ", $val);
     $important = isset($this->_important_props["background"]);
     foreach($tmp as $attr) {
-	  if (mb_substr($attr, 0, 3) === "url" || $attr === "none") {
-   	    $this->_set_style("background_image", $this->_image($attr), $important);
-  	  } else if ($attr === "fixed" || $attr === "scroll") {
-   	    $this->_set_style("background_attachment", $attr, $important);
-  	  } else if ($attr === "repeat" || $attr === "repeat-x" || $attr === "repeat-y" || $attr === "no-repeat") {
-   	    $this->_set_style("background_repeat", $attr, $important);
-      } else if (($col = $this->munge_color($attr)) != null ) {
-   	    $this->_set_style("background_color", is_array($col) ? $col["hex"] : $col, $important);
-      } else {
- 		$pos[] = $attr;
- 	  }
- 	}
- 	if (count($pos)) {
- 	  $this->_set_style("background_position",implode(' ',$pos), $important);
- 	}
+        if (mb_substr($attr, 0, 3) === "url" || $attr === "none") {
+            $this->_set_style("background_image", $this->_image($attr), $important);
+        } else if ($attr === "fixed" || $attr === "scroll") {
+            $this->_set_style("background_attachment", $attr, $important);
+        } else if ($attr === "repeat" || $attr === "repeat-x" || $attr === "repeat-y" || $attr === "no-repeat") {
+            $this->_set_style("background_repeat", $attr, $important);
+        } else if (($col = $this->munge_color($attr)) != null ) {
+            $this->_set_style("background_color", is_array($col) ? $col["hex"] : $col, $important);
+        } else {
+            $pos[] = $attr;
+        }
+        }
+        if (count($pos)) {
+        $this->_set_style("background_position",implode(' ',$pos), $important);
+        }
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["background"] = null;
- 	$this->_props["background"] = $val;
-  }
+    $this->_prop_cache["background"] = null;
+        $this->_props["background"] = $val;
+    }
 
-  /**
-   * Sets the font size
-   *
-   * $size can be any acceptable CSS size
-   *
-   * @link http://www.w3.org/TR/CSS21/fonts.html#propdef-font-size
-   * @param string|float $size
-   */
-  function set_font_size($size) {
+    /**
+     * Sets the font size
+     *
+     * $size can be any acceptable CSS size
+     *
+     * @link http://www.w3.org/TR/CSS21/fonts.html#propdef-font-size
+     * @param string|float $size
+     */
+    function set_font_size($size) {
     $this->__font_size_calculated = false;
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["font_size"] = null;
+    $this->_prop_cache["font_size"] = null;
     $this->_props["font_size"] = $size;
-  }
+    }
 
-  /**
-   * Sets the font style
-   *
-   * combined attributes
-   * set individual attributes also, respecting !important mark
-   * exactly this order, separate by space. Multiple fonts separated by comma:
-   * font-style, font-variant, font-weight, font-size, line-height, font-family
-   *
-   * Other than with border and list, existing partial attributes should
-   * reset when starting here, even when not mentioned.
-   * If individual attribute is !important and explicite or implicite replacement is not,
-   * keep individual attribute
-   *
-   * require whitespace as delimiters for single value attributes
-   * On delimiter "/" treat first as font height, second as line height
-   * treat all remaining at the end of line as font
-   * font-style, font-variant, font-weight, font-size, line-height, font-family
-   *
-   * missing font-size and font-family might be not allowed, but accept it here and
-   * use default (medium size, enpty font name)
-   *
-   * @link http://www.w3.org/TR/CSS21/generate.html#propdef-list-style
-   * @param $val
-   */
-  function set_font($val) {
+    /**
+     * Sets the font style
+     *
+     * combined attributes
+     * set individual attributes also, respecting !important mark
+     * exactly this order, separate by space. Multiple fonts separated by comma:
+     * font-style, font-variant, font-weight, font-size, line-height, font-family
+     *
+     * Other than with border and list, existing partial attributes should
+     * reset when starting here, even when not mentioned.
+     * If individual attribute is !important and explicite or implicite replacement is not,
+     * keep individual attribute
+     *
+     * require whitespace as delimiters for single value attributes
+     * On delimiter "/" treat first as font height, second as line height
+     * treat all remaining at the end of line as font
+     * font-style, font-variant, font-weight, font-size, line-height, font-family
+     *
+     * missing font-size and font-family might be not allowed, but accept it here and
+     * use default (medium size, enpty font name)
+     *
+     * @link http://www.w3.org/TR/CSS21/generate.html#propdef-list-style
+     * @param $val
+     */
+    function set_font($val) {
     $this->__font_size_calculated = false;
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["font"] = null;
- 	$this->_props["font"] = $val;
+    $this->_prop_cache["font"] = null;
+        $this->_props["font"] = $val;
 
     $important = isset($this->_important_props["font"]);
 
-	if ( preg_match("/^(italic|oblique|normal)\s*(.*)$/i",$val,$match) ) {
-		$this->_set_style("font_style", $match[1], $important);
-		$val = $match[2];
-	} else {
-		$this->_set_style("font_style", self::$_defaults["font_style"], $important);
-	}
+    if ( preg_match("/^(italic|oblique|normal)\s*(.*)$/i",$val,$match) ) {
+        $this->_set_style("font_style", $match[1], $important);
+        $val = $match[2];
+    } else {
+        $this->_set_style("font_style", self::$_defaults["font_style"], $important);
+    }
 
-	if ( preg_match("/^(small-caps|normal)\s*(.*)$/i",$val,$match) ) {
-		$this->_set_style("font_variant", $match[1], $important);
-		$val = $match[2];
-	} else {
-		$this->_set_style("font_variant", self::$_defaults["font_variant"], $important);
-	}
+    if ( preg_match("/^(small-caps|normal)\s*(.*)$/i",$val,$match) ) {
+        $this->_set_style("font_variant", $match[1], $important);
+        $val = $match[2];
+    } else {
+        $this->_set_style("font_variant", self::$_defaults["font_variant"], $important);
+    }
 
     //matching numeric value followed by unit -> this is indeed a subsequent font size. Skip!
-	if ( preg_match("/^(bold|bolder|lighter|100|200|300|400|500|600|700|800|900|normal)\s*(.*)$/i",$val,$match) &&
+    if ( preg_match("/^(bold|bolder|lighter|100|200|300|400|500|600|700|800|900|normal)\s*(.*)$/i",$val,$match) &&
          !preg_match("/^(?:pt|px|pc|em|ex|in|cm|mm|%)/",$match[2])
-	   ) {
-		$this->_set_style("font_weight", $match[1], $important);
-		$val = $match[2];
-	} else {
-		$this->_set_style("font_weight", self::$_defaults["font_weight"], $important);
-	}
-
-	if ( preg_match("/^(xx-small|x-small|small|medium|large|x-large|xx-large|smaller|larger|\d+\s*(?:pt|px|pc|em|ex|in|cm|mm|%))\s*(.*)$/i",$val,$match) ) {
-		$this->_set_style("font_size", $match[1], $important);
-		$val = $match[2];
+        ) {
+        $this->_set_style("font_weight", $match[1], $important);
+        $val = $match[2];
+    } else {
+        $this->_set_style("font_weight", self::$_defaults["font_weight"], $important);
+    }
+
+    if ( preg_match("/^(xx-small|x-small|small|medium|large|x-large|xx-large|smaller|larger|\d+\s*(?:pt|px|pc|em|ex|in|cm|mm|%))\s*(.*)$/i",$val,$match) ) {
+        $this->_set_style("font_size", $match[1], $important);
+        $val = $match[2];
         if (preg_match("/^\/\s*(\d+\s*(?:pt|px|pc|em|ex|in|cm|mm|%))\s*(.*)$/i",$val,$match) ) {
-			$this->_set_style("line_height", $match[1], $important);
-			$val = $match[2];
+            $this->_set_style("line_height", $match[1], $important);
+            $val = $match[2];
         } else {
-			$this->_set_style("line_height", self::$_defaults["line_height"], $important);
+            $this->_set_style("line_height", self::$_defaults["line_height"], $important);
         }
-	} else {
- 		$this->_set_style("font_size", self::$_defaults["font_size"], $important);
-		$this->_set_style("line_height", self::$_defaults["line_height"], $important);
-	}
-
-	if(strlen($val) != 0) {
-	  $this->_set_style("font_family", $val, $important);
-	} else {
-	  $this->_set_style("font_family", self::$_defaults["font_family"], $important);
-	}
-  }
-
-  /**#@+
+    } else {
+            $this->_set_style("font_size", self::$_defaults["font_size"], $important);
+        $this->_set_style("line_height", self::$_defaults["line_height"], $important);
+    }
+
+    if(strlen($val) != 0) {
+        $this->_set_style("font_family", $val, $important);
+    } else {
+        $this->_set_style("font_family", self::$_defaults["font_family"], $important);
+    }
+    }
+
+    /**#@+
    * Sets page break properties
    *
    * @link http://www.w3.org/TR/CSS21/page.html#page-breaks
    * @param string $break
    */
-  function set_page_break_before($break) {
+    function set_page_break_before($break) {
     if ($break === "left" || $break === "right")
-      $break = "always";
+        $break = "always";
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["page_break_before"] = null;
+    $this->_prop_cache["page_break_before"] = null;
     $this->_props["page_break_before"] = $break;
-  }
+    }
 
-  function set_page_break_after($break) {
+    function set_page_break_after($break) {
     if ($break === "left" || $break === "right")
-      $break = "always";
+        $break = "always";
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["page_break_after"] = null;
+    $this->_prop_cache["page_break_after"] = null;
     $this->_props["page_break_after"] = $break;
-  }
-  /**#@-*/
+    }
+    /**#@-*/
     
-  //........................................................................
+    //........................................................................
 
-  /**#@+
+    /**#@+
    * Sets the margin size
    *
    * @link http://www.w3.org/TR/CSS21/box.html#margin-properties
    * @param $val
    */
-  function set_margin_top($val) {
+    function set_margin_top($val) {
     $this->_set_style_side_width_important('margin','top',$val);
-  }
+    }
 
-  function set_margin_right($val) {
+    function set_margin_right($val) {
     $this->_set_style_side_width_important('margin','right',$val);
-  }
+    }
 
-  function set_margin_bottom($val) {
+    function set_margin_bottom($val) {
     $this->_set_style_side_width_important('margin','bottom',$val);
-  }
+    }
 
-  function set_margin_left($val) {
+    function set_margin_left($val) {
     $this->_set_style_side_width_important('margin','left',$val);
-  }
+    }
   
-  function set_margin($val) {
+    function set_margin($val) {
     $val = str_replace("none", "0px", $val);
     $this->_set_style_type_important('margin','',$val);
-  }
-  /**#@-*/
+    }
+    /**#@-*/
 
-  /**#@+
+    /**#@+
    * Sets the padding size
    *
    * @link http://www.w3.org/TR/CSS21/box.html#padding-properties
    * @param $val
    */
-  function set_padding_top($val) {
+    function set_padding_top($val) {
     $this->_set_style_side_width_important('padding','top',$val);
-  }
+    }
 
-  function set_padding_right($val) {
+    function set_padding_right($val) {
     $this->_set_style_side_width_important('padding','right',$val);
-  }
+    }
 
-  function set_padding_bottom($val) {
+    function set_padding_bottom($val) {
     $this->_set_style_side_width_important('padding','bottom',$val);
-  }
+    }
 
-  function set_padding_left($val) {
+    function set_padding_left($val) {
     $this->_set_style_side_width_important('padding','left',$val);
-  }
+    }
 
-  function set_padding($val) {
+    function set_padding($val) {
     $val = str_replace("none", "0px", $val);
     $this->_set_style_type_important('padding','',$val);
-  }
-  /**#@-*/
-
-  /**
-   * Sets a single border
-   *
-   * @param string $side
-   * @param string $border_spec  ([width] [style] [color])
-   */
-  protected function _set_border($side, $border_spec, $important) {
+    }
+    /**#@-*/
+
+    /**
+     * Sets a single border
+     *
+     * @param string $side
+     * @param string $border_spec  ([width] [style] [color])
+     */
+    protected function _set_border($side, $border_spec, $important) {
     $border_spec = str_replace(",", " ", $border_spec);
     $arr = explode(" ", $border_spec);
 
@@ -1783,155 +1783,155 @@ 
     $this->_set_style_side_type('border',$side,'_color',self::$_defaults['border_'.$side.'_color'],$important);
 
     foreach ($arr as $value) {
-      $value = trim($value);
-      if ( in_array($value, self::$BORDER_STYLES) ) {
+        $value = trim($value);
+        if ( in_array($value, self::$BORDER_STYLES) ) {
         $this->_set_style_side_type('border',$side,'_style',$value,$important);
 
-      } else if ( preg_match("/[.0-9]+(?:px|pt|pc|em|ex|%|in|mm|cm)|(?:thin|medium|thick)/", $value ) ) {
+        } else if ( preg_match("/[.0-9]+(?:px|pt|pc|em|ex|%|in|mm|cm)|(?:thin|medium|thick)/", $value ) ) {
         $this->_set_style_side_type('border',$side,'_width',$value,$important);
 
-      } else {
+        } else {
         // must be colour
         $this->_set_style_side_type('border',$side,'_color',$value,$important);
-      }
+        }
     }
 
     //see __set and __get, on all assignments clear cache!
-	$this->_prop_cache['border_'.$side] = null;
+    $this->_prop_cache['border_'.$side] = null;
     $this->_props['border_'.$side] = $border_spec;
-  }
+    }
 
-  /**#@+
+    /**#@+
    * Sets the border styles
    *
    * @link http://www.w3.org/TR/CSS21/box.html#border-properties
    * @param string $val
    */
-  function set_border_top($val) { $this->_set_border("top", $val, isset($this->_important_props['border_top'])); }
-  function set_border_right($val) { $this->_set_border("right", $val, isset($this->_important_props['border_right'])); }
-  function set_border_bottom($val) { $this->_set_border("bottom", $val, isset($this->_important_props['border_bottom'])); }
-  function set_border_left($val) { $this->_set_border("left", $val, isset($this->_important_props['border_left'])); }
+    function set_border_top($val) { $this->_set_border("top", $val, isset($this->_important_props['border_top'])); }
+    function set_border_right($val) { $this->_set_border("right", $val, isset($this->_important_props['border_right'])); }
+    function set_border_bottom($val) { $this->_set_border("bottom", $val, isset($this->_important_props['border_bottom'])); }
+    function set_border_left($val) { $this->_set_border("left", $val, isset($this->_important_props['border_left'])); }
 
-  function set_border($val) {
+    function set_border($val) {
     $important = isset($this->_important_props["border"]);
     $this->_set_border("top", $val, $important);
     $this->_set_border("right", $val, $important);
     $this->_set_border("bottom", $val, $important);
     $this->_set_border("left", $val, $important);
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["border"] = null;
+    $this->_prop_cache["border"] = null;
     $this->_props["border"] = $val;
-  }
+    }
 
-  function set_border_width($val) {
+    function set_border_width($val) {
     $this->_set_style_type_important('border','_width',$val);
-  }
+    }
 
-  function set_border_color($val) {
+    function set_border_color($val) {
     $this->_set_style_type_important('border','_color',$val);
-  }
+    }
 
-  function set_border_style($val) {
+    function set_border_style($val) {
     $this->_set_style_type_important('border','_style',$val);
-  }
-  /**#@-*/
+    }
+    /**#@-*/
 
 
-  /**
-   * Sets the border spacing
-   *
-   * @link http://www.w3.org/TR/CSS21/box.html#border-properties
-   * @param float $val
-   */
-  function set_border_spacing($val) {
+    /**
+     * Sets the border spacing
+     *
+     * @link http://www.w3.org/TR/CSS21/box.html#border-properties
+     * @param float $val
+     */
+    function set_border_spacing($val) {
 
     $arr = explode(" ", $val);
 
     if ( count($arr) == 1 )
-      $arr[1] = $arr[0];
+        $arr[1] = $arr[0];
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["border_spacing"] = null;
+    $this->_prop_cache["border_spacing"] = null;
     $this->_props["border_spacing"] = $arr[0] . " " . $arr[1];
-  }
+    }
 
-  /**
-   * Sets the list style image
-   *
-   * @link http://www.w3.org/TR/CSS21/generate.html#propdef-list-style-image
-   * @param $val
-   */
-  function set_list_style_image($val) {
+    /**
+     * Sets the list style image
+     *
+     * @link http://www.w3.org/TR/CSS21/generate.html#propdef-list-style-image
+     * @param $val
+     */
+    function set_list_style_image($val) {
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["list_style_image"] = null;
+    $this->_prop_cache["list_style_image"] = null;
     $this->_props["list_style_image"] = $this->_image($val);
-  }
+    }
 
-  /**
-   * Sets the list style
-   *
-   * @link http://www.w3.org/TR/CSS21/generate.html#propdef-list-style
-   * @param $val
-   */
-  function set_list_style($val) {
+    /**
+     * Sets the list style
+     *
+     * @link http://www.w3.org/TR/CSS21/generate.html#propdef-list-style
+     * @param $val
+     */
+    function set_list_style($val) {
     $important = isset($this->_important_props["list_style"]);
     $arr = explode(" ", str_replace(",", " ", $val));
 
     static $types = array("disc", "circle", "square", "decimal",
-                   "decimal-leading-zero", "lower-roman",
-                   "upper-roman", "lower-greek", "lower-latin",
-                   "upper-latin", "armenian", "georgian",
-                   "lower-alpha", "upper-alpha", "hebrew",
-                   "cjk-ideographic", "hiragana", "katakana",
-                   "hiragana-iroha", "katakana-iroha", "none");
+                    "decimal-leading-zero", "lower-roman",
+                    "upper-roman", "lower-greek", "lower-latin",
+                    "upper-latin", "armenian", "georgian",
+                    "lower-alpha", "upper-alpha", "hebrew",
+                    "cjk-ideographic", "hiragana", "katakana",
+                    "hiragana-iroha", "katakana-iroha", "none");
 
     static $positions = array("inside", "outside");
 
     foreach ($arr as $value) {
-      /* http://www.w3.org/TR/CSS21/generate.html#list-style
+        /* http://www.w3.org/TR/CSS21/generate.html#list-style
        * A value of 'none' for the 'list-style' property sets both 'list-style-type' and 'list-style-image' to 'none'
        */
-      if ($value === "none") {
-   	    $this->_set_style("list_style_type", $value, $important);
-   	    $this->_set_style("list_style_image", $value, $important);
+        if ($value === "none") {
+            $this->_set_style("list_style_type", $value, $important);
+            $this->_set_style("list_style_image", $value, $important);
         continue;
-      }
+        }
 
-      //On setting or merging or inheriting list_style_image as well as list_style_type,
-      //and url exists, then url has precedence, otherwise fall back to list_style_type
-      //Firefox is wrong here (list_style_image gets overwritten on explicite list_style_type)
-      //Internet Explorer 7/8 and dompdf is right.
+        //On setting or merging or inheriting list_style_image as well as list_style_type,
+        //and url exists, then url has precedence, otherwise fall back to list_style_type
+        //Firefox is wrong here (list_style_image gets overwritten on explicite list_style_type)
+        //Internet Explorer 7/8 and dompdf is right.
        
-	  if (mb_substr($value, 0, 3) === "url") {
-   	    $this->_set_style("list_style_image", $this->_image($value), $important);
+        if (mb_substr($value, 0, 3) === "url") {
+            $this->_set_style("list_style_image", $this->_image($value), $important);
         continue;
-      }
+        }
 
-      if ( in_array($value, $types) ) {
-   	    $this->_set_style("list_style_type", $value, $important);
-      } else if ( in_array($value, $positions) ) {
-   	    $this->_set_style("list_style_position", $value, $important);
-      }
+        if ( in_array($value, $types) ) {
+            $this->_set_style("list_style_type", $value, $important);
+        } else if ( in_array($value, $positions) ) {
+            $this->_set_style("list_style_position", $value, $important);
+        }
     }
 
     //see __set and __get, on all assignments clear cache, not needed on direct set through __set
-	$this->_prop_cache["list_style"] = null;
- 	$this->_props["list_style"] = $val;
-  }
+    $this->_prop_cache["list_style"] = null;
+        $this->_props["list_style"] = $val;
+    }
 
-  /**
-   * Generate a string representation of the Style
-   *
-   * This dumps the entire property array into a string via print_r.  Useful
-   * for debugging.
-   *
-   * @return string
-   */
- /*DEBUGCSS print: see below additional debugging util*/
-  function __toString() {
+    /**
+     * Generate a string representation of the Style
+     *
+     * This dumps the entire property array into a string via print_r.  Useful
+     * for debugging.
+     *
+     * @return string
+     */
+    /*DEBUGCSS print: see below additional debugging util*/
+    function __toString() {
     return print_r(array_merge(array("parent_font_size" => $this->_parent_font_size),
-                               $this->_props), true);
-  }
+                                $this->_props), true);
+    }
 
 /*DEBUGCSS*/  function debug_print()
 /*DEBUGCSS*/  {

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

Doc Comments -1 removed lines

@@ -129,7 +129,6 @@
    * added to the clone.  This method is overidden in order to remove
    * frames from the cellmap properly.
    *
-   * @param Frame $row
    */
   function split($child = null) {
 

Spacing +18 added lines, -18 removed lines

@@ -133,15 +133,15 @@ 
    */
   function split($child = null) {
 
-    if ( is_null($child) ) {
+    if (is_null($child)) {
       parent::split();
       return;
     }
 
     // If $child is a header or if it is the first non-header row, do
     // not duplicate headers, simply move the table to the next page.
-    if ( count($this->_headers) && !in_array($child, $this->_headers, true) &&
-         !in_array($child->get_prev_sibling(), $this->_headers, true) ) {
+    if (count($this->_headers) && !in_array($child, $this->_headers, true) &&
+         !in_array($child->get_prev_sibling(), $this->_headers, true)) {
 
       $first_header = null;
 
@@ -150,7 +150,7 @@ 
 
         $new_header = $header->deep_copy();
 
-        if ( is_null($first_header) )
+        if (is_null($first_header))
           $first_header = $new_header;
 
         $this->insert_child_before($new_header, $child);
@@ -158,7 +158,7 @@ 
 
       parent::split($first_header);
 
-    } else if ( in_array($child->get_style()->display, self::$ROW_GROUPS) ) {
+    } else if (in_array($child->get_style()->display, self::$ROW_GROUPS)) {
 
       // Individual rows should have already been handled
       parent::split($child);
@@ -184,8 +184,8 @@ 
    */
   static function find_parent_table(Frame $frame) {
 
-    while ( $frame = $frame->get_parent() )
-      if ( in_array($frame->get_style()->display, Style::$TABLE_TYPES) )
+    while ($frame = $frame->get_parent())
+      if (in_array($frame->get_style()->display, Style::$TABLE_TYPES))
         break;
 
     return $frame;
@@ -237,15 +237,15 @@ 
     $erroneous_frames = array();
     $anon_row = false;
     $iter = $this->get_first_child();
-    while ( $iter ) {
+    while ($iter) {
       $child = $iter;
       $iter = $iter->get_next_sibling();
 
       $display = $child->get_style()->display;
 
-      if ( $anon_row ) {
+      if ($anon_row) {
 
-        if ( $display === "table-row" ) {
+        if ($display === "table-row") {
           // Add the previous anonymous row
           $this->insert_child_before($table_row, $child);
 
@@ -261,12 +261,12 @@ 
 
       } else {
 
-        if ( $display === "table-row" ) {
+        if ($display === "table-row") {
           $child->normalise();
           continue;
         }
 
-        if ( $display === "table-cell") {
+        if ($display === "table-cell") {
           // Create an anonymous table row
           $tr = $this->get_node()->ownerDocument->createElement("tr");
 
@@ -279,7 +279,7 @@ 
           // Lookup styles for tr tags.  If the user wants styles to work
           // better, they should make the tr explicit... I'm not going to
           // try to guess what they intended.
-          if ( $tr_style = $css->lookup("tr") )
+          if ($tr_style = $css->lookup("tr"))
             $style->merge($tr_style);
 
           // Okay, I have absolutely no idea why I need this clone here, but
@@ -295,27 +295,27 @@ 
           continue;
         }
 
-        if ( !in_array($display, self::$VALID_CHILDREN) ) {
+        if (!in_array($display, self::$VALID_CHILDREN)) {
           $erroneous_frames[] = $child;
           continue;
         }
 
         // Normalise other table parts (i.e. row groups)
         foreach ($child->get_children() as $grandchild) {
-          if ( $grandchild->get_style()->display === "table-row" )
+          if ($grandchild->get_style()->display === "table-row")
             $grandchild->normalise();
         }
 
         // Add headers and footers
-        if ( $display === "table-header-group" )
+        if ($display === "table-header-group")
           $this->_headers[] = $child;
 
-        else if ( $display === "table-footer-group" )
+        else if ($display === "table-footer-group")
           $this->_footers[] = $child;
       }
     }
 
-    if ( $anon_row ) {
+    if ($anon_row) {
       // Add the row to the table
       $this->_frame->append_child($table_row);
       $table_row->normalise();

Braces +20 added lines, -15 removed lines

@@ -150,8 +150,9 @@ 
 
         $new_header = $header->deep_copy();
 
-        if ( is_null($first_header) )
-          $first_header = $new_header;
+        if ( is_null($first_header) ) {
+                  $first_header = $new_header;
+        }
 
         $this->insert_child_before($new_header, $child);
       }
@@ -184,9 +185,10 @@ 
    */
   static function find_parent_table(Frame $frame) {
 
-    while ( $frame = $frame->get_parent() )
-      if ( in_array($frame->get_style()->display, Style::$TABLE_TYPES) )
+    while ( $frame = $frame->get_parent() ) {
+          if ( in_array($frame->get_style()->display, Style::$TABLE_TYPES) )
         break;
+    }
 
     return $frame;
   }
@@ -279,8 +281,9 @@ 
           // Lookup styles for tr tags.  If the user wants styles to work
           // better, they should make the tr explicit... I'm not going to
           // try to guess what they intended.
-          if ( $tr_style = $css->lookup("tr") )
-            $style->merge($tr_style);
+          if ( $tr_style = $css->lookup("tr") ) {
+                      $style->merge($tr_style);
+          }
 
           // Okay, I have absolutely no idea why I need this clone here, but
           // if it's omitted, php (as of 2004-07-28) segfaults.
@@ -302,16 +305,17 @@ 
 
         // Normalise other table parts (i.e. row groups)
         foreach ($child->get_children() as $grandchild) {
-          if ( $grandchild->get_style()->display === "table-row" )
-            $grandchild->normalise();
+          if ( $grandchild->get_style()->display === "table-row" ) {
+                      $grandchild->normalise();
+          }
         }
 
         // Add headers and footers
-        if ( $display === "table-header-group" )
-          $this->_headers[] = $child;
-
-        else if ( $display === "table-footer-group" )
-          $this->_footers[] = $child;
+        if ( $display === "table-header-group" ) {
+                  $this->_headers[] = $child;
+        } else if ( $display === "table-footer-group" ) {
+                  $this->_footers[] = $child;
+        }
       }
     }
 
@@ -322,8 +326,9 @@ 
       $this->_cellmap->add_row();
     }
 
-    foreach ($erroneous_frames as $frame)
-      $this->move_after($frame);
+    foreach ($erroneous_frames as $frame) {
+          $this->move_after($frame);
+    }
 
   }
 

Indentation +223 added lines, -224 removed lines

@@ -1,41 +1,40 @@ 
 <?php
 /**
- * DOMPDF - PHP5 HTML to PDF renderer
- *
- * File: $RCSfile: table_frame_decorator.cls.php,v $
- * Created on: 2004-06-04
- *
- * 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: table_frame_decorator.cls.php,v $
+     * Created on: 2004-06-04
+     *
+     * 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: table_frame_decorator.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
 
@@ -46,73 +45,73 @@ 
  * @package dompdf
  */
 class Table_Frame_Decorator extends Frame_Decorator {
-  static $VALID_CHILDREN = array("table-row-group",
-                                 "table-row",
-                                 "table-header-group",
-                                 "table-footer-group",
-                                 "table-column",
-                                 "table-column-group",
-                                 "table-caption",
-                                 "table-cell");
-
-  static $ROW_GROUPS = array('table-row-group',
-                             'table-header-group',
-                             'table-footer-group');
-
-  /**
-   * The Cellmap object for this table.  The cellmap maps table cells
-   * to rows and columns, and aids in calculating column widths.
-   *
-   * @var Cellmap
-   */
-  protected $_cellmap;
-
-  /**
-   * The minimum width of the table, in pt
-   *
-   * @var float
-   */
-  protected $_min_width;
-
-  /**
-   * The maximum width of the table, in pt
-   *
-   * @var float
-   */
-  protected $_max_width;
-
-  /**
-   * Table header rows.  Each table header is duplicated when a table
-   * spans pages.
-   *
-   * @var array
-   */
-  protected $_headers;
-
-  /**
-   * Table footer rows.  Each table footer is duplicated when a table
-   * spans pages.
-   *
-   * @var array
-   */
-  protected $_footers;
-
-  /**
-   * Class constructor
-   *
-   * @param Frame $frame the frame to decorate
-   */
-  function __construct(Frame $frame, DOMPDF $dompdf) {
+    static $VALID_CHILDREN = array("table-row-group",
+                                    "table-row",
+                                    "table-header-group",
+                                    "table-footer-group",
+                                    "table-column",
+                                    "table-column-group",
+                                    "table-caption",
+                                    "table-cell");
+
+    static $ROW_GROUPS = array('table-row-group',
+                                'table-header-group',
+                                'table-footer-group');
+
+    /**
+     * The Cellmap object for this table.  The cellmap maps table cells
+     * to rows and columns, and aids in calculating column widths.
+     *
+     * @var Cellmap
+     */
+    protected $_cellmap;
+
+    /**
+     * The minimum width of the table, in pt
+     *
+     * @var float
+     */
+    protected $_min_width;
+
+    /**
+     * The maximum width of the table, in pt
+     *
+     * @var float
+     */
+    protected $_max_width;
+
+    /**
+     * Table header rows.  Each table header is duplicated when a table
+     * spans pages.
+     *
+     * @var array
+     */
+    protected $_headers;
+
+    /**
+     * Table footer rows.  Each table footer is duplicated when a table
+     * spans pages.
+     *
+     * @var array
+     */
+    protected $_footers;
+
+    /**
+     * Class constructor
+     *
+     * @param Frame $frame the frame to decorate
+     */
+    function __construct(Frame $frame, DOMPDF $dompdf) {
     parent::__construct($frame, $dompdf);
     $this->_cellmap = new Cellmap($this);
     $this->_min_width = null;
     $this->_max_width = null;
     $this->_headers = array();
     $this->_footers = array();
-  }
+    }
 
 
-  function reset() {
+    function reset() {
     parent::reset();
     $this->_cellmap->reset();
     $this->_min_width = null;
@@ -120,22 +119,22 @@ 
     $this->_headers = array();
     $this->_footers = array();
     $this->_reflower->reset();
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * split the table at $row.  $row and all subsequent rows will be
-   * added to the clone.  This method is overidden in order to remove
-   * frames from the cellmap properly.
-   *
-   * @param Frame $row
-   */
-  function split($child = null) {
+    /**
+     * split the table at $row.  $row and all subsequent rows will be
+     * added to the clone.  This method is overidden in order to remove
+     * frames from the cellmap properly.
+     *
+     * @param Frame $row
+     */
+    function split($child = null) {
 
     if ( is_null($child) ) {
-      parent::split();
-      return;
+        parent::split();
+        return;
     }
 
     // If $child is a header or if it is the first non-header row, do
@@ -143,200 +142,200 @@ 
     if ( count($this->_headers) && !in_array($child, $this->_headers, true) &&
          !in_array($child->get_prev_sibling(), $this->_headers, true) ) {
 
-      $first_header = null;
+        $first_header = null;
 
-      // Insert copies of the table headers before $child
-      foreach ($this->_headers as $header) {
+        // Insert copies of the table headers before $child
+        foreach ($this->_headers as $header) {
 
         $new_header = $header->deep_copy();
 
         if ( is_null($first_header) )
-          $first_header = $new_header;
+            $first_header = $new_header;
 
         $this->insert_child_before($new_header, $child);
-      }
+        }
 
-      parent::split($first_header);
+        parent::split($first_header);
 
     } else if ( in_array($child->get_style()->display, self::$ROW_GROUPS) ) {
 
-      // Individual rows should have already been handled
-      parent::split($child);
+        // Individual rows should have already been handled
+        parent::split($child);
 
     } else {
 
-      $iter = $child;
+        $iter = $child;
 
-      while ($iter) {
+        while ($iter) {
         $this->_cellmap->remove_row($iter);
         $iter = $iter->get_next_sibling();
-      }
+        }
 
-      parent::split($child);
+        parent::split($child);
+    }
     }
-  }
 
-  /**
-   * Static function to locate the parent table of a frame
-   *
-   * @param Frame $frame
-   * @return Frame the table that is an ancestor of $frame
-   */
-  static function find_parent_table(Frame $frame) {
+    /**
+     * Static function to locate the parent table of a frame
+     *
+     * @param Frame $frame
+     * @return Frame the table that is an ancestor of $frame
+     */
+    static function find_parent_table(Frame $frame) {
 
     while ( $frame = $frame->get_parent() )
-      if ( in_array($frame->get_style()->display, Style::$TABLE_TYPES) )
+        if ( in_array($frame->get_style()->display, Style::$TABLE_TYPES) )
         break;
 
     return $frame;
-  }
-
-  /**
-   * Return this table's Cellmap
-   *
-   * @return Cellmap
-   */
-  function get_cellmap() { return $this->_cellmap; }
-
-  /**
-   * Return the minimum width of this table
-   *
-   * @return float
-   */
-  function get_min_width() { return $this->_min_width; }
-
-  /**
-   * Return the maximum width of this table
-   *
-   * @return float
-   */
-  function get_max_width() { return $this->_max_width; }
-
-  /**
-   * Set the minimum width of the table
-   *
-   * @param float $width the new minimum width
-   */
-  function set_min_width($width) { $this->_min_width = $width; }
-
-  /**
-   * Set the maximum width of the table
-   *
-   * @param float $width the new maximum width
-   */
-  function set_max_width($width) { $this->_max_width = $width; }
-
-  /**
-   * Restructure tree so that the table has the correct structure.
-   * Invalid children (i.e. all non-table-rows) are moved below the
-   * table.
-   */
-  function normalise() {
+    }
+
+    /**
+     * Return this table's Cellmap
+     *
+     * @return Cellmap
+     */
+    function get_cellmap() { return $this->_cellmap; }
+
+    /**
+     * Return the minimum width of this table
+     *
+     * @return float
+     */
+    function get_min_width() { return $this->_min_width; }
+
+    /**
+     * Return the maximum width of this table
+     *
+     * @return float
+     */
+    function get_max_width() { return $this->_max_width; }
+
+    /**
+     * Set the minimum width of the table
+     *
+     * @param float $width the new minimum width
+     */
+    function set_min_width($width) { $this->_min_width = $width; }
+
+    /**
+     * Set the maximum width of the table
+     *
+     * @param float $width the new maximum width
+     */
+    function set_max_width($width) { $this->_max_width = $width; }
+
+    /**
+     * Restructure tree so that the table has the correct structure.
+     * Invalid children (i.e. all non-table-rows) are moved below the
+     * table.
+     */
+    function normalise() {
 
     // Store frames generated by invalid tags and move them outside the table
     $erroneous_frames = array();
     $anon_row = false;
     $iter = $this->get_first_child();
     while ( $iter ) {
-      $child = $iter;
-      $iter = $iter->get_next_sibling();
+        $child = $iter;
+        $iter = $iter->get_next_sibling();
 
-      $display = $child->get_style()->display;
+        $display = $child->get_style()->display;
 
-      if ( $anon_row ) {
+        if ( $anon_row ) {
 
         if ( $display === "table-row" ) {
-          // Add the previous anonymous row
-          $this->insert_child_before($table_row, $child);
+            // Add the previous anonymous row
+            $this->insert_child_before($table_row, $child);
 
-          $table_row->normalise();
-          $child->normalise();
-          $anon_row = false;
-          continue;
+            $table_row->normalise();
+            $child->normalise();
+            $anon_row = false;
+            continue;
         }
 
         // add the child to the anonymous row
         $table_row->append_child($child);
         continue;
 
-      } else {
+        } else {
 
         if ( $display === "table-row" ) {
-          $child->normalise();
-          continue;
+            $child->normalise();
+            continue;
         }
 
         if ( $display === "table-cell") {
-          // Create an anonymous table row
-          $tr = $this->get_node()->ownerDocument->createElement("tr");
+            // Create an anonymous table row
+            $tr = $this->get_node()->ownerDocument->createElement("tr");
 
-          $frame = new Frame($tr);
+            $frame = new Frame($tr);
 
-          $css = $this->get_style()->get_stylesheet();
-          $style = $css->create_style();
-          $style->inherit($this->get_style());
+            $css = $this->get_style()->get_stylesheet();
+            $style = $css->create_style();
+            $style->inherit($this->get_style());
 
-          // Lookup styles for tr tags.  If the user wants styles to work
-          // better, they should make the tr explicit... I'm not going to
-          // try to guess what they intended.
-          if ( $tr_style = $css->lookup("tr") )
+            // Lookup styles for tr tags.  If the user wants styles to work
+            // better, they should make the tr explicit... I'm not going to
+            // try to guess what they intended.
+            if ( $tr_style = $css->lookup("tr") )
             $style->merge($tr_style);
 
-          // Okay, I have absolutely no idea why I need this clone here, but
-          // if it's omitted, php (as of 2004-07-28) segfaults.
-          $frame->set_style(clone $style);
-          $table_row = Frame_Factory::decorate_frame($frame, $this->_dompdf);
-          $table_row->set_root($this->_root);
+            // Okay, I have absolutely no idea why I need this clone here, but
+            // if it's omitted, php (as of 2004-07-28) segfaults.
+            $frame->set_style(clone $style);
+            $table_row = Frame_Factory::decorate_frame($frame, $this->_dompdf);
+            $table_row->set_root($this->_root);
 
-          // Add the cell to the row
-          $table_row->append_child($child);
+            // Add the cell to the row
+            $table_row->append_child($child);
 
-          $anon_row = true;
-          continue;
+            $anon_row = true;
+            continue;
         }
 
         if ( !in_array($display, self::$VALID_CHILDREN) ) {
-          $erroneous_frames[] = $child;
-          continue;
+            $erroneous_frames[] = $child;
+            continue;
         }
 
         // Normalise other table parts (i.e. row groups)
         foreach ($child->get_children() as $grandchild) {
-          if ( $grandchild->get_style()->display === "table-row" )
+            if ( $grandchild->get_style()->display === "table-row" )
             $grandchild->normalise();
         }
 
         // Add headers and footers
         if ( $display === "table-header-group" )
-          $this->_headers[] = $child;
+            $this->_headers[] = $child;
 
         else if ( $display === "table-footer-group" )
-          $this->_footers[] = $child;
-      }
+            $this->_footers[] = $child;
+        }
     }
 
     if ( $anon_row ) {
-      // Add the row to the table
-      $this->_frame->append_child($table_row);
-      $table_row->normalise();
-      $this->_cellmap->add_row();
+        // Add the row to the table
+        $this->_frame->append_child($table_row);
+        $table_row->normalise();
+        $this->_cellmap->add_row();
     }
 
     foreach ($erroneous_frames as $frame)
-      $this->move_after($frame);
+        $this->move_after($frame);
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  /**
-   * Moves the specified frame and it's corresponding node outside of
-   * the table.
-   *
-   * @param Frame $frame the frame to move
-   */
-  function move_after(Frame $frame) {
+    /**
+     * Moves the specified frame and it's corresponding node outside of
+     * the table.
+     *
+     * @param Frame $frame the frame to move
+     */
+    function move_after(Frame $frame) {
     $this->get_parent()->insert_child_after($frame, $this);
-  }
+    }
 
 }

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

Doc Comments +4 added lines, -4 removed lines

@@ -179,7 +179,7 @@ 
   /**
    * Sets the stroke colour
    *
-   * @param array $color
+   * @param array $colour
    */
   protected function _set_stroke_colour($colour) {
     $colour[0] = round(255 * $colour[0]);
@@ -196,7 +196,7 @@ 
   /**
    * Sets the fill colour
    *
-   * @param array $color
+   * @param array $colour
    */
   protected function _set_fill_colour($colour) {
     $colour[0] = round(255 * $colour[0]);
@@ -391,7 +391,7 @@ 
    * @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 integer $adjust word spacing adjustment
    */
   function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0){}
 
@@ -421,7 +421,7 @@ 
    * @param string $text the text to be sized
    * @param string $font the desired font
    * @param float  $size the desired font size
-   * @param float  $spacing word spacing, if any
+   * @param integer  $spacing word spacing, if any
    * @return float
    */
   function get_text_width($text, $font, $size, $spacing = 0){}

Indentation +328 added lines, -329 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: tcpdf_adapter.cls.php 217 2010-03-11 23:03:57Z ryan.masten $ */
@@ -57,98 +56,98 @@ 
  */
 class TCPDF_Adapter implements Canvas {
 
-  /**
-   * Dimensions of paper sizes in points
-   *
-   * @var array;
-   */
-  static public $PAPER_SIZES = array(); // Set to
+    /**
+     * Dimensions of paper sizes in points
+     *
+     * @var array;
+     */
+    static public $PAPER_SIZES = array(); // Set to
                                         // CPDF_Adapter::$PAPER_SIZES below.
 
 
-  /**
-   * Instance of the TCPDF class
-   *
-   * @var TCPDF
-   */
-  private $_pdf;
-
-  /**
-   * PDF width in points
-   *
-   * @var float
-   */
-  private $_width;
-
-  /**
-   * PDF height in points
-   *
-   * @var float
-   */
-  private $_height;
-
-  /**
-   * Last fill colour used
-   *
-   * @var array
-   */
-  private $_last_fill_color;
-
-  /**
-   * Last stroke colour used
-   *
-   * @var array
-   */
-  private $_last_stroke_color;
-
-  /**
-   * Last line width used
-   *
-   * @var float
-   */
-  private $_last_line_width;
+    /**
+     * Instance of the TCPDF class
+     *
+     * @var TCPDF
+     */
+    private $_pdf;
+
+    /**
+     * PDF width in points
+     *
+     * @var float
+     */
+    private $_width;
+
+    /**
+     * PDF height in points
+     *
+     * @var float
+     */
+    private $_height;
+
+    /**
+     * Last fill colour used
+     *
+     * @var array
+     */
+    private $_last_fill_color;
+
+    /**
+     * Last stroke colour used
+     *
+     * @var array
+     */
+    private $_last_stroke_color;
+
+    /**
+     * Last line width used
+     *
+     * @var float
+     */
+    private $_last_line_width;
   
-  /**
-   * Total number of pages
-   *
-   * @var int
-   */
-  private $_page_count;
-
-  /**
-   * Text to display on every page
-   *
-   * @var array
-   */
-  private $_page_text;
-
-  /**
-   * Array of pages for accessing after initial rendering is complete
-   *
-   * @var array
-   */
-  private $_pages;
-
-  /**
-   * Class constructor
-   *
-   * @param mixed $paper The size of paper to use either a string (see {@link CPDF_Adapter::$PAPER_SIZES}) or
-   *                     an array(xmin,ymin,xmax,ymax)
-   * @param string $orientation The orientation of the document (either 'landscape' or 'portrait')
-   */
-  function __construct($paper = "letter", $orientation = "portrait") {
+    /**
+     * Total number of pages
+     *
+     * @var int
+     */
+    private $_page_count;
+
+    /**
+     * Text to display on every page
+     *
+     * @var array
+     */
+    private $_page_text;
+
+    /**
+     * Array of pages for accessing after initial rendering is complete
+     *
+     * @var array
+     */
+    private $_pages;
+
+    /**
+     * Class constructor
+     *
+     * @param mixed $paper The size of paper to use either a string (see {@link CPDF_Adapter::$PAPER_SIZES}) or
+     *                     an array(xmin,ymin,xmax,ymax)
+     * @param string $orientation The orientation 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_SIZE[$paper];
+        $size = self::$PAPER_SIZE[$paper];
     else
-      $size = self::$PAPER_SIZE["letter"];
+        $size = self::$PAPER_SIZE["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->_width = $size[2] - $size[0];
@@ -163,135 +162,135 @@ 
     $this->_page_text = array();
 
     $this->_last_fill_color     =
-      $this->_last_stroke_color =
-      $this->_last_line_width   = null;
+        $this->_last_stroke_color =
+        $this->_last_line_width   = null;
 
-  }  
+    }  
   
-  /**
-   * Remaps y coords from 4th to 1st quadrant
-   *
-   * @param float $y
-   * @return float
-   */
-  protected function y($y) { return $this->_height - $y; }
-
-  /**
-   * Sets the stroke colour
-   *
-   * @param array $color
-   */
-  protected function _set_stroke_colour($colour) {
+    /**
+     * Remaps y coords from 4th to 1st quadrant
+     *
+     * @param float $y
+     * @return float
+     */
+    protected function y($y) { return $this->_height - $y; }
+
+    /**
+     * Sets the stroke colour
+     *
+     * @param array $color
+     */
+    protected function _set_stroke_colour($colour) {
     $colour[0] = round(255 * $colour[0]);
     $colour[1] = round(255 * $colour[1]);
     $colour[2] = round(255 * $colour[2]);
 
     if ( is_null($this->_last_stroke_color) || $color != $this->_last_stroke_color ) {
-      $this->_pdf->SetDrawColor($color[0],$color[1],$color[2]);
-      $this->_last_stroke_color = $color;
+        $this->_pdf->SetDrawColor($color[0],$color[1],$color[2]);
+        $this->_last_stroke_color = $color;
     }
 
-  }
+    }
 
-  /**
-   * Sets the fill colour
-   *
-   * @param array $color
-   */
-  protected function _set_fill_colour($colour) {
+    /**
+     * Sets the fill colour
+     *
+     * @param array $color
+     */
+    protected function _set_fill_colour($colour) {
     $colour[0] = round(255 * $colour[0]);
     $colour[1] = round(255 * $colour[1]);
     $colour[2] = round(255 * $colour[2]);
 
     if ( is_null($this->_last_fill_color) || $color != $this->_last_fill_color ) {
-      $this->_pdf->SetDrawColor($color[0],$color[1],$color[2]);
-      $this->_last_fill_color = $color;
+        $this->_pdf->SetDrawColor($color[0],$color[1],$color[2]);
+        $this->_last_fill_color = $color;
     }
 
-  }
+    }
 
-  /**
-   * Return the TCPDF instance
-   *
-   * @return TCPDF
-   */
-  function get_tcpdf() { return $this->_pdf; }
+    /**
+     * Return the TCPDF instance
+     *
+     * @return TCPDF
+     */
+    function get_tcpdf() { return $this->_pdf; }
   
-  /**
-   * Returns the current page number
-   *
-   * @return int
-   */
-  function get_page_number() {
+    /**
+     * Returns the current page number
+     *
+     * @return int
+     */
+    function get_page_number() {
     return $this->_page_number;
-  }
-
-  /**
-   * Returns the total number of pages
-   *
-   * @return int
-   */
-  function get_page_count() {
+    }
+
+    /**
+     * Returns the total number of pages
+     *
+     * @return int
+     */
+    function get_page_count() {
     return $this->_page_count;
-  }
-
-  /**
-   * Sets the total number of pages
-   *
-   * @param int $count
-   */
-  function set_page_count($count) {
+    }
+
+    /**
+     * Sets the total number of pages
+     *
+     * @param int $count
+     */
+    function set_page_count($count) {
     $this->_page_count = (int)$count;
-  }
-
-  /**
-   * Draws a line from x1,y1 to x2,y2
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   * See {@link Cpdf::setLineStyle()} for a description of the format of the
-   * $style parameter (aka dash).
-   *
-   * @param float $x1
-   * @param float $y1
-   * @param float $x2
-   * @param float $y2
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   */
-  function line($x1, $y1, $x2, $y2, $color, $width, $style = null) {
+    }
+
+    /**
+     * Draws a line from x1,y1 to x2,y2
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     * See {@link Cpdf::setLineStyle()} for a description of the format of the
+     * $style parameter (aka dash).
+     *
+     * @param float $x1
+     * @param float $y1
+     * @param float $x2
+     * @param float $y2
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     */
+    function line($x1, $y1, $x2, $y2, $color, $width, $style = null) {
 
     if ( is_null($this->_last_line_width) || $width != $this->_last_line_width ) {
-      $this->_pdf->SetLineWidth($width);
-      $this->_last_line_width = $width;
+        $this->_pdf->SetLineWidth($width);
+        $this->_last_line_width = $width;
     }
 
     $this->_set_stroke_colour($color);
 
     // FIXME: ugh, need to handle different styles here
     $this->_pdf->line($x1, $y1, $x2, $y2);
-  }
-
-  /**
-   * Draws a rectangle at x1,y1 with width w and height h
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   * See {@link Cpdf::setLineStyle()} for a description of the $style
-   * parameter (aka dash)
-   *
-   * @param float $x1
-   * @param float $y1
-   * @param float $w
-   * @param float $h
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   */   
-  function rectangle($x1, $y1, $w, $h, $color, $width, $style = null) {
+    }
+
+    /**
+     * Draws a rectangle at x1,y1 with width w and height h
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     * See {@link Cpdf::setLineStyle()} for a description of the $style
+     * parameter (aka dash)
+     *
+     * @param float $x1
+     * @param float $y1
+     * @param float $w
+     * @param float $h
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     */   
+    function rectangle($x1, $y1, $w, $h, $color, $width, $style = null) {
 
     if ( is_null($this->_last_line_width) || $width != $this->_last_line_width ) {
-      $this->_pdf->SetLineWidth($width);
-      $this->_last_line_width = $width;
+        $this->_pdf->SetLineWidth($width);
+        $this->_last_line_width = $width;
     }
 
     $this->_set_stroke_colour($color);
@@ -299,165 +298,165 @@ 
     // FIXME: ugh, need to handle styles here
     $this->_pdf->rect($x1, $y1, $w, $h);
     
-  }
-
-  /**
-   * Draws a filled rectangle at x1,y1 with width w and height h
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   *
-   * @param float $x1
-   * @param float $y1
-   * @param float $w
-   * @param float $h
-   * @param array $color
-   */   
-  function filled_rectangle($x1, $y1, $w, $h, $color) {
+    }
+
+    /**
+     * Draws a filled rectangle at x1,y1 with width w and height h
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     *
+     * @param float $x1
+     * @param float $y1
+     * @param float $w
+     * @param float $h
+     * @param array $color
+     */   
+    function filled_rectangle($x1, $y1, $w, $h, $color) {
 
     $this->_set_fill_colour($color);
     
     // FIXME: ugh, need to handle styles here
     $this->_pdf->rect($x1, $y1, $w, $h, "F");
-  }
-
-  /**
-   * Draws a polygon
-   *
-   * The polygon is formed by joining all the points stored in the $points
-   * array.  $points has the following structure:
-   * <code>
-   * array(0 => x1,
-   *       1 => y1,
-   *       2 => x2,
-   *       3 => y2,
-   *       ...
-   *       );
-   * </code>
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   * See {@link Cpdf::setLineStyle()} for a description of the $style
-   * parameter (aka dash)   
-   *
-   * @param array $points
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   * @param bool  $fill  Fills the polygon if true
-   */
-  function polygon($points, $color, $width = null, $style = null, $fill = false) {
+    }
+
+    /**
+     * Draws a polygon
+     *
+     * The polygon is formed by joining all the points stored in the $points
+     * array.  $points has the following structure:
+     * <code>
+     * array(0 => x1,
+     *       1 => y1,
+     *       2 => x2,
+     *       3 => y2,
+     *       ...
+     *       );
+     * </code>
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     * See {@link Cpdf::setLineStyle()} for a description of the $style
+     * parameter (aka dash)   
+     *
+     * @param array $points
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     * @param bool  $fill  Fills the polygon if true
+     */
+    function polygon($points, $color, $width = null, $style = null, $fill = false) {
     // FIXME: FPDF sucks
-  }
-
-  /**
-   * Draws a circle at $x,$y with radius $r
-   *
-   * See {@link Style::munge_colour()} for the format of the colour array.
-   * See {@link Cpdf::setLineStyle()} for a description of the $style
-   * parameter (aka dash)
-   *
-   * @param float $x
-   * @param float $y
-   * @param float $r
-   * @param array $color
-   * @param float $width
-   * @param array $style
-   * @param bool $fill Fills the circle if true   
-   */   
-  function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false){}
-
-  /**
-   * Add an image to the pdf.
-   *
-   * The image is placed at the specified x and y coordinates with the
-   * given width and height.
-   *
-   * @param string $img_url the path to the image
-   * @param string $img_type the type (e.g. extension) of the image
-   * @param float $x x position
-   * @param float $y y position
-   * @param int $w width (in pixels)
-   * @param int $h height (in pixels)
-   */
-  function image($img_url, $img_type, $x, $y, $w, $h){}
-
-  /**
-   * Writes text at the specified x and y coordinates
-   *
-   * 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
-   */
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0){}
-
-  function javascript($code){}
+    }
+
+    /**
+     * Draws a circle at $x,$y with radius $r
+     *
+     * See {@link Style::munge_colour()} for the format of the colour array.
+     * See {@link Cpdf::setLineStyle()} for a description of the $style
+     * parameter (aka dash)
+     *
+     * @param float $x
+     * @param float $y
+     * @param float $r
+     * @param array $color
+     * @param float $width
+     * @param array $style
+     * @param bool $fill Fills the circle if true   
+     */   
+    function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false){}
+
+    /**
+     * Add an image to the pdf.
+     *
+     * The image is placed at the specified x and y coordinates with the
+     * given width and height.
+     *
+     * @param string $img_url the path to the image
+     * @param string $img_type the type (e.g. extension) of the image
+     * @param float $x x position
+     * @param float $y y position
+     * @param int $w width (in pixels)
+     * @param int $h height (in pixels)
+     */
+    function image($img_url, $img_type, $x, $y, $w, $h){}
+
+    /**
+     * Writes text at the specified x and y coordinates
+     *
+     * 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
+     */
+    function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0){}
+
+    function javascript($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 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 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 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){}
   
-  /**
-   * Calculates text size, in points
-   *
-   * @param string $text the text to be sized
-   * @param string $font the desired font
-   * @param float  $size the desired font size
-   * @param float  $spacing word spacing, if any
-   * @return float
-   */
-  function get_text_width($text, $font, $size, $spacing = 0){}
-
-  /**
-   * Calculates font height, in points
-   *
-   * @param string $font
-   * @param float $size
-   * @return float
-   */
-  function get_font_height($font, $size){}
+    /**
+     * Calculates text size, in points
+     *
+     * @param string $text the text to be sized
+     * @param string $font the desired font
+     * @param float  $size the desired font size
+     * @param float  $spacing word spacing, if any
+     * @return float
+     */
+    function get_text_width($text, $font, $size, $spacing = 0){}
+
+    /**
+     * Calculates font height, in points
+     *
+     * @param string $font
+     * @param float $size
+     * @return float
+     */
+    function get_font_height($font, $size){}
 
   
-  /**
-   * Starts a new page
-   *
-   * Subsequent drawing operations will appear on the new page.
-   */
-  function new_page(){}
-
-  /**
-   * 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){}
-
-  /**
-   * Returns the PDF as a string
-   *
-   * @param array  $options associative array: 'compress' => 1 or 0
-   * @return string
-   */
-  function output($options = null){}
+    /**
+     * Starts a new page
+     *
+     * Subsequent drawing operations will appear on the new page.
+     */
+    function new_page(){}
+
+    /**
+     * 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){}
+
+    /**
+     * Returns the PDF as a string
+     *
+     * @param array  $options associative array: 'compress' => 1 or 0
+     * @return string
+     */
+    function output($options = null){}
   
 }
     

Spacing +22 added lines, -22 removed lines

@@ -39,7 +39,7 @@ 
 
 /* $Id: tcpdf_adapter.cls.php 217 2010-03-11 23:03:57Z ryan.masten $ */
 
-require_once(DOMPDF_LIB_DIR . '/tcpdf/tcpdf.php');
+require_once(DOMPDF_LIB_DIR.'/tcpdf/tcpdf.php');
 
 /**
  * TCPDF PDF Rendering interface
@@ -138,14 +138,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_SIZE[$paper];
     else
       $size = self::$PAPER_SIZE["letter"];
 
-    if ( mb_strtolower($orientation) === "landscape" ) {
+    if (mb_strtolower($orientation) === "landscape") {
       $a = $size[3];
       $size[3] = $size[2];
       $size[2] = $a;
@@ -186,8 +186,8 @@ 
     $colour[1] = round(255 * $colour[1]);
     $colour[2] = round(255 * $colour[2]);
 
-    if ( is_null($this->_last_stroke_color) || $color != $this->_last_stroke_color ) {
-      $this->_pdf->SetDrawColor($color[0],$color[1],$color[2]);
+    if (is_null($this->_last_stroke_color) || $color != $this->_last_stroke_color) {
+      $this->_pdf->SetDrawColor($color[0], $color[1], $color[2]);
       $this->_last_stroke_color = $color;
     }
 
@@ -203,8 +203,8 @@ 
     $colour[1] = round(255 * $colour[1]);
     $colour[2] = round(255 * $colour[2]);
 
-    if ( is_null($this->_last_fill_color) || $color != $this->_last_fill_color ) {
-      $this->_pdf->SetDrawColor($color[0],$color[1],$color[2]);
+    if (is_null($this->_last_fill_color) || $color != $this->_last_fill_color) {
+      $this->_pdf->SetDrawColor($color[0], $color[1], $color[2]);
       $this->_last_fill_color = $color;
     }
 
@@ -241,7 +241,7 @@ 
    * @param int $count
    */
   function set_page_count($count) {
-    $this->_page_count = (int)$count;
+    $this->_page_count = (int) $count;
   }
 
   /**
@@ -261,7 +261,7 @@ 
    */
   function line($x1, $y1, $x2, $y2, $color, $width, $style = null) {
 
-    if ( is_null($this->_last_line_width) || $width != $this->_last_line_width ) {
+    if (is_null($this->_last_line_width) || $width != $this->_last_line_width) {
       $this->_pdf->SetLineWidth($width);
       $this->_last_line_width = $width;
     }
@@ -289,7 +289,7 @@ 
    */   
   function rectangle($x1, $y1, $w, $h, $color, $width, $style = null) {
 
-    if ( is_null($this->_last_line_width) || $width != $this->_last_line_width ) {
+    if (is_null($this->_last_line_width) || $width != $this->_last_line_width) {
       $this->_pdf->SetLineWidth($width);
       $this->_last_line_width = $width;
     }
@@ -363,7 +363,7 @@ 
    * @param array $style
    * @param bool $fill Fills the circle if true   
    */   
-  function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false){}
+  function circle($x, $y, $r, $color, $width = null, $style = null, $fill = false) {}
 
   /**
    * Add an image to the pdf.
@@ -378,7 +378,7 @@ 
    * @param int $w width (in pixels)
    * @param int $h height (in pixels)
    */
-  function image($img_url, $img_type, $x, $y, $w, $h){}
+  function image($img_url, $img_type, $x, $y, $w, $h) {}
 
   /**
    * Writes text at the specified x and y coordinates
@@ -393,16 +393,16 @@ 
    * @param array $color
    * @param float $adjust word spacing adjustment
    */
-  function text($x, $y, $text, $font, $size, $color = array(0,0,0), $adjust = 0){}
+  function text($x, $y, $text, $font, $size, $color = array(0, 0, 0), $adjust = 0) {}
 
-  function javascript($code){}
+  function javascript($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){}
+  function add_named_dest($anchorname) {}
 
   /**
    * Add a link to the pdf
@@ -413,7 +413,7 @@ 
    * @param float  $width   The width of the link
    * @param float  $height   The height of the link
    */
-  function add_link($url, $x, $y, $width, $height){}
+  function add_link($url, $x, $y, $width, $height) {}
   
   /**
    * Calculates text size, in points
@@ -424,7 +424,7 @@ 
    * @param float  $spacing word spacing, if any
    * @return float
    */
-  function get_text_width($text, $font, $size, $spacing = 0){}
+  function get_text_width($text, $font, $size, $spacing = 0) {}
 
   /**
    * Calculates font height, in points
@@ -433,7 +433,7 @@ 
    * @param float $size
    * @return float
    */
-  function get_font_height($font, $size){}
+  function get_font_height($font, $size) {}
 
   
   /**
@@ -441,7 +441,7 @@ 
    *
    * Subsequent drawing operations will appear on the new page.
    */
-  function new_page(){}
+  function new_page() {}
 
   /**
    * Streams the PDF directly to the browser
@@ -449,7 +449,7 @@ 
    * @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){}
+  function stream($filename, $options = null) {}
 
   /**
    * Returns the PDF as a string
@@ -457,7 +457,7 @@ 
    * @param array  $options associative array: 'compress' => 1 or 0
    * @return string
    */
-  function output($options = null){}
+  function output($options = null) {}
   
 }
     

Braces +7 added lines, -6 removed lines

@@ -138,12 +138,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_SIZE[$paper];
-    else
-      $size = self::$PAPER_SIZE["letter"];
+    if ( is_array($paper) ) {
+          $size = $paper;
+    } else if ( isset(self::$PAPER_SIZES[mb_strtolower($paper)]) ) {
+          $size = self::$PAPER_SIZE[$paper];
+    } else {
+          $size = self::$PAPER_SIZE["letter"];
+    }
 
     if ( mb_strtolower($orientation) === "landscape" ) {
       $a = $size[3];