chamilo / chamilo-lms

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

Indentation +267 added lines, -268 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: attribute_translator.cls.php 219 2010-03-11 23:18:31Z ryan.masten $ */
@@ -47,84 +46,84 @@ 
  */
 class Attribute_Translator {
   
-  // Munged data originally from
-  // http://www.w3.org/TR/REC-html40/index/attributes.html
-  //
-  // thank you var_export() :D
-  static private $__ATTRIBUTE_LOOKUP =
+    // Munged data originally from
+    // http://www.w3.org/TR/REC-html40/index/attributes.html
+    //
+    // thank you var_export() :D
+    static private $__ATTRIBUTE_LOOKUP =
     array (//'caption' => array ( 'align' => '', ),
-           'img_inner' =>  // img tags actually end up wrapping img_inner elements
-           array ('align' => array('bottom' => 'vertical-align: baseline;',
-                                   'middle' => 'vertical-align: middle;',
-                                   'top' => 'vertical-align: top;',
-                                   'left' => 'float: left;',
-                                   'right' => 'float: right;'),
-                  'border' => 'border-width: %0.2f px;',
-                  'height' => 'height: %s px;',
-                  'hspace' => 'padding-left: %1$0.2f px; padding-right: %1$0.2f px;',
-                  'vspace' => 'padding-top: %1$0.2f px; padding-bottom: %1$0.2f px;',
-                  'width' => 'width: %s px;',
-                  ),
-           'table' =>
-           array ("align" => array('left' => 'margin-left: 0; margin-right: auto;',
+            'img_inner' =>  // img tags actually end up wrapping img_inner elements
+            array ('align' => array('bottom' => 'vertical-align: baseline;',
+                                    'middle' => 'vertical-align: middle;',
+                                    'top' => 'vertical-align: top;',
+                                    'left' => 'float: left;',
+                                    'right' => 'float: right;'),
+                    'border' => 'border-width: %0.2f px;',
+                    'height' => 'height: %s px;',
+                    'hspace' => 'padding-left: %1$0.2f px; padding-right: %1$0.2f px;',
+                    'vspace' => 'padding-top: %1$0.2f px; padding-bottom: %1$0.2f px;',
+                    'width' => 'width: %s px;',
+                    ),
+            'table' =>
+            array ("align" => array('left' => 'margin-left: 0; margin-right: auto;',
                         'center' => 'margin-left: auto; margin-right: auto;',
                         'right' => 'margin-left: auto; margin-right: 0;'
                         ),
-                  'bgcolor' => 'background-color: %s;',
-                  'border' => '!set_table_border',
-                  'cellpadding' => '!set_table_cellpadding',
-                  'cellspacing' => 'border-spacing: %0.2f; border-collapse: separate;',
-                  'frame' => array('void' => 'border-style: none;',
-                                   'above' => 'border-top-style: solid;',
-                                   'below' => 'border-bottom-style: solid;',
-                                   'hsides' => 'border-left-style: solid; border-right-style: solid;',
-                                   'vsides' => 'border-top-style: solid; border-bottom-style: solid;',
-                                   'lhs' => 'border-left-style: solid;',
-                                   'rhs' => 'border-right-style: solid;',
-                                   'box' => 'border-style: solid;',
-                                   'border' => 'border-style: solid;'),
-                  'rules' => '!set_table_rules',
-                  'width' => 'width: %s;',
-                  ),
-           'hr' =>
-           array (
-                  'align' => '!set_hr_align', // Need to grab width to set 'left' & 'right' correctly
-                  'noshade' => 'border-style: solid;',
-                  'size' => 'border-width: %0.2f px;',
-                  'width' => 'width: %s;',
-                  ),
-           'div' =>
-           array (
-                  'align' => 'text-align: %s;',
-                  ),
-           'h1' =>
-           array (
-                  'align' => 'text-align: %s;',
-                  ),
-           'h2' =>
-           array (
-                  'align' => 'text-align: %s;',
-                  ),
-           'h3' =>
-           array (
-                  'align' => 'text-align: %s;',
-                  ),
-           'h4' =>
-           array (
-                  'align' => 'text-align: %s;',
-                  ),
-           'h5' =>
-           array (
-                  'align' => 'text-align: %s;',
-                  ),
-           'h6' =>
-           array (
-                  'align' => 'text-align: %s;',
-                  ),
-           'p' =>
-           array (
-                  'align' => 'text-align: %s;',
-                  ),
+                    'bgcolor' => 'background-color: %s;',
+                    'border' => '!set_table_border',
+                    'cellpadding' => '!set_table_cellpadding',
+                    'cellspacing' => 'border-spacing: %0.2f; border-collapse: separate;',
+                    'frame' => array('void' => 'border-style: none;',
+                                    'above' => 'border-top-style: solid;',
+                                    'below' => 'border-bottom-style: solid;',
+                                    'hsides' => 'border-left-style: solid; border-right-style: solid;',
+                                    'vsides' => 'border-top-style: solid; border-bottom-style: solid;',
+                                    'lhs' => 'border-left-style: solid;',
+                                    'rhs' => 'border-right-style: solid;',
+                                    'box' => 'border-style: solid;',
+                                    'border' => 'border-style: solid;'),
+                    'rules' => '!set_table_rules',
+                    'width' => 'width: %s;',
+                    ),
+            'hr' =>
+            array (
+                    'align' => '!set_hr_align', // Need to grab width to set 'left' & 'right' correctly
+                    'noshade' => 'border-style: solid;',
+                    'size' => 'border-width: %0.2f px;',
+                    'width' => 'width: %s;',
+                    ),
+            'div' =>
+            array (
+                    'align' => 'text-align: %s;',
+                    ),
+            'h1' =>
+            array (
+                    'align' => 'text-align: %s;',
+                    ),
+            'h2' =>
+            array (
+                    'align' => 'text-align: %s;',
+                    ),
+            'h3' =>
+            array (
+                    'align' => 'text-align: %s;',
+                    ),
+            'h4' =>
+            array (
+                    'align' => 'text-align: %s;',
+                    ),
+            'h5' =>
+            array (
+                    'align' => 'text-align: %s;',
+                    ),
+            'h6' =>
+            array (
+                    'align' => 'text-align: %s;',
+                    ),
+            'p' =>
+            array (
+                    'align' => 'text-align: %s;',
+                    ),
 //            'col' =>
 //            array (
 //                   'align' => '',
@@ -135,219 +134,219 @@ 
 //                   'align' => '',
 //                   'valign' => '',
 //                   ),
-           'tbody' =>
-           array (
-                  'align' => '!set_table_row_align',
-                  'valign' => '!set_table_row_valign',
-                  ),
-           'td' =>
-           array (
-                  'align' => 'text-align: %s;',
-                  'bgcolor' => 'background-color: %s;',
-                  'height' => 'height: %s;',
-                  'nowrap' => 'white-space: nowrap;',
-                  'valign' => 'vertical-align: %s;',
-                  'width' => 'width: %s;',
-                  ),
-           'tfoot' =>
-           array (
-                  'align' => '!set_table_row_align',
-                  'valign' => '!set_table_row_valign',
-                  ),
-           'th' =>
-           array (
-                  'align' => 'text-align: %s;',
-                  'bgcolor' => 'background-color: %s;',
-                  'height' => 'height: %s;',
-                  'nowrap' => 'white-space: nowrap;',
-                  'valign' => 'vertical-align: %s;',
-                  'width' => 'width: %s;',
-                  ),
-           'thead' =>
-           array (
-                  'align' => '!set_table_row_align',
-                  'valign' => '!set_table_row_valign',
-                  ),
-           'tr' =>
-           array (
-                  'align' => '!set_table_row_align',
-                  'bgcolor' => '!set_table_row_bgcolor',
-                  'valign' => '!set_table_row_valign',
-                  ),
-           'body' =>
-           array (
-                  'background' => 'background-image: url(%s);',
-                  'bgcolor' => 'background-color: %s;',
-                  'link' => '!set_body_link',
-                  'text' => 'color: %s;',
-                  ),
-           'br' =>
-           array (
-                  'clear' => 'clear: %s;',
-                  ),
-           'basefont' =>
-           array (
-                  'color' => 'color: %s;',
-                  'face' => 'font-family: %s;',
-                  'size' => '!set_basefont_size',
-                  ),
-           'font' =>
-           array (
-                  'color' => 'color: %s;',
-                  'face' => 'font-family: %s;',
-                  'size' => '!set_font_size',
-                  ),
-           'dir' =>
-           array (
-                  'compact' => 'margin: 0.5em 0;',
-                  ),
-           'dl' =>
-           array (
-                  'compact' => 'margin: 0.5em 0;',
-                  ),
-           'menu' =>
-           array (
-                  'compact' => 'margin: 0.5em 0;',
-                  ),
-           'ol' =>
-           array (
-                  'compact' => 'margin: 0.5em 0;',
-                  'start' => 'counter-reset: -dompdf-default-counter %d;',
-                  'type' => 'list-style-type: %s;',
-                  ),
-           'ul' =>
-           array (
-                  'compact' => 'margin: 0.5em 0;',
-                  'type' => 'list-style-type: %s;',
-                  ),
-           'li' =>
-           array (
-                  'type' => 'list-style-type: %s;',
-                  'value' => 'counter-reset: -dompdf-default-counter %d;',
-                  ),
-           'pre' =>
-           array (
-                  'width' => 'width: %s;',
-                  ),
-           );
+            'tbody' =>
+            array (
+                    'align' => '!set_table_row_align',
+                    'valign' => '!set_table_row_valign',
+                    ),
+            'td' =>
+            array (
+                    'align' => 'text-align: %s;',
+                    'bgcolor' => 'background-color: %s;',
+                    'height' => 'height: %s;',
+                    'nowrap' => 'white-space: nowrap;',
+                    'valign' => 'vertical-align: %s;',
+                    'width' => 'width: %s;',
+                    ),
+            'tfoot' =>
+            array (
+                    'align' => '!set_table_row_align',
+                    'valign' => '!set_table_row_valign',
+                    ),
+            'th' =>
+            array (
+                    'align' => 'text-align: %s;',
+                    'bgcolor' => 'background-color: %s;',
+                    'height' => 'height: %s;',
+                    'nowrap' => 'white-space: nowrap;',
+                    'valign' => 'vertical-align: %s;',
+                    'width' => 'width: %s;',
+                    ),
+            'thead' =>
+            array (
+                    'align' => '!set_table_row_align',
+                    'valign' => '!set_table_row_valign',
+                    ),
+            'tr' =>
+            array (
+                    'align' => '!set_table_row_align',
+                    'bgcolor' => '!set_table_row_bgcolor',
+                    'valign' => '!set_table_row_valign',
+                    ),
+            'body' =>
+            array (
+                    'background' => 'background-image: url(%s);',
+                    'bgcolor' => 'background-color: %s;',
+                    'link' => '!set_body_link',
+                    'text' => 'color: %s;',
+                    ),
+            'br' =>
+            array (
+                    'clear' => 'clear: %s;',
+                    ),
+            'basefont' =>
+            array (
+                    'color' => 'color: %s;',
+                    'face' => 'font-family: %s;',
+                    'size' => '!set_basefont_size',
+                    ),
+            'font' =>
+            array (
+                    'color' => 'color: %s;',
+                    'face' => 'font-family: %s;',
+                    'size' => '!set_font_size',
+                    ),
+            'dir' =>
+            array (
+                    'compact' => 'margin: 0.5em 0;',
+                    ),
+            'dl' =>
+            array (
+                    'compact' => 'margin: 0.5em 0;',
+                    ),
+            'menu' =>
+            array (
+                    'compact' => 'margin: 0.5em 0;',
+                    ),
+            'ol' =>
+            array (
+                    'compact' => 'margin: 0.5em 0;',
+                    'start' => 'counter-reset: -dompdf-default-counter %d;',
+                    'type' => 'list-style-type: %s;',
+                    ),
+            'ul' =>
+            array (
+                    'compact' => 'margin: 0.5em 0;',
+                    'type' => 'list-style-type: %s;',
+                    ),
+            'li' =>
+            array (
+                    'type' => 'list-style-type: %s;',
+                    'value' => 'counter-reset: -dompdf-default-counter %d;',
+                    ),
+            'pre' =>
+            array (
+                    'width' => 'width: %s;',
+                    ),
+            );
 
   
-  static protected $_last_basefont_size = 3;
-  static protected $_font_size_lookup = array(1=>"xx-small",
-                                              2=>"x-small",
-                                              3=>"medium",
-                                              4=>"large",
-                                              5=>"x-large",
-                                              6=>"xx-large",
-                                              7=>"300%");
+    static protected $_last_basefont_size = 3;
+    static protected $_font_size_lookup = array(1=>"xx-small",
+                                                2=>"x-small",
+                                                3=>"medium",
+                                                4=>"large",
+                                                5=>"x-large",
+                                                6=>"xx-large",
+                                                7=>"300%");
   
   
-  static function translate_attributes($frame) {
+    static function translate_attributes($frame) {
     $node = $frame->get_node();
     $tag = $node->tagName;
 
     if ( !isset(self::$__ATTRIBUTE_LOOKUP[$tag]) )
-      return;
+        return;
 
     $valid_attrs = self::$__ATTRIBUTE_LOOKUP[$tag];
     $attrs = $node->attributes;
     $style = rtrim($node->getAttribute("style"), "; ");
     if ( $style != "" )
-      $style .= ";";
+        $style .= ";";
 
     foreach ($attrs as $attr => $attr_node ) {
-      if ( !isset($valid_attrs[$attr]) )
+        if ( !isset($valid_attrs[$attr]) )
         continue;
 
-      $value = $attr_node->value;
+        $value = $attr_node->value;
 
-      $target = $valid_attrs[$attr];
+        $target = $valid_attrs[$attr];
       
-      // Look up $value in $target, if $target is an array:
-      if ( is_array($target) ) {
+        // Look up $value in $target, if $target is an array:
+        if ( is_array($target) ) {
 
         if ( isset($target[$value]) )
-          $style .= " " . self::_resolve_target($node, $target[$value], $value);
+            $style .= " " . self::_resolve_target($node, $target[$value], $value);
 
-      } else {
+        } else {
         // otherwise use target directly
         $style .= " " . self::_resolve_target($node, $target, $value);
-      }
+        }
     }
     if ( !is_null($style) ) {
-      $style = ltrim($style);
-      $node->setAttribute("style", $style);
+        $style = ltrim($style);
+        $node->setAttribute("style", $style);
     }
     
-  }
+    }
 
-  static protected function _resolve_target($node, $target, $value) {
+    static protected function _resolve_target($node, $target, $value) {
     if ( $target[0] === "!" ) {
-      // Function call
-      $func = "_" . mb_substr($target, 1);
-      return self::$func($node, $value);
+        // Function call
+        $func = "_" . mb_substr($target, 1);
+        return self::$func($node, $value);
     }
     
     return $value ? sprintf($target, $value) : "";
-  }
+    }
 
-  //.....................................................................
+    //.....................................................................
 
-  static protected function _set_table_cellpadding($node, $value) {
+    static protected function _set_table_cellpadding($node, $value) {
 
     $td_list = $node->getElementsByTagName("td");
     foreach ($td_list as $td) {
-      $style = rtrim($td->getAttribute("style"), ";");
-      $style .= "; padding: $value" . "px;";
-      $style = ltrim($style, ";");
-      $td->setAttribute("style", $style);
+        $style = rtrim($td->getAttribute("style"), ";");
+        $style .= "; padding: $value" . "px;";
+        $style = ltrim($style, ";");
+        $td->setAttribute("style", $style);
     }
     return null;
-  }
+    }
 
-  static protected function _set_table_border($node, $value) {
+    static protected function _set_table_border($node, $value) {
     $td_list = $node->getElementsByTagName("td");
     foreach ($td_list as $td) {
-      $style = $td->getAttribute("style");
-      if ( strpos($style, "border") !== false )
+        $style = $td->getAttribute("style");
+        if ( strpos($style, "border") !== false )
         continue;
-      $style = rtrim($style, ";");
-      $style .= "; border-width: $value" . "px; border-style: ridge;";
-      $style = ltrim($style, ";");
-      $td->setAttribute("style", $style);
+        $style = rtrim($style, ";");
+        $style .= "; border-width: $value" . "px; border-style: ridge;";
+        $style = ltrim($style, ";");
+        $td->setAttribute("style", $style);
     }
     $th_list = $node->getElementsByTagName("th");
     foreach ($th_list as $th) {
-      $style = $th->getAttribute("style");
-      if ( strpos($style, "border") !== false )
+        $style = $th->getAttribute("style");
+        if ( strpos($style, "border") !== false )
         continue;
-      $style = rtrim($style, ";");
-      $style .= "; border-width: $value" . "px; border-style: ridge;";
-      $style = ltrim($style, ";");
-      $th->setAttribute("style", $style);
+        $style = rtrim($style, ";");
+        $style .= "; border-width: $value" . "px; border-style: ridge;";
+        $style = ltrim($style, ";");
+        $th->setAttribute("style", $style);
     }
     
     return null;
-  }
+    }
 
-  static protected function _set_table_cellspacing($node, $value) {
+    static protected function _set_table_cellspacing($node, $value) {
     $style = rtrim($td->getAttribute($style), ";");
 
     if ( $value == 0 )
-      $style .= "; border-collapse: collapse;";
+        $style .= "; border-collapse: collapse;";
       
     else
-      $style = "; border-collapse: separate;";
+        $style = "; border-collapse: separate;";
       
     return ltrim($style, ";");
-  }
+    }
   
-  static protected function _set_table_rules($node, $value) {
+    static protected function _set_table_rules($node, $value) {
     $new_style = "; border-collapse: collapse;";
     switch ($value) {
     case "none":
       $new_style .= "border-style: none;";
-      break;
+        break;
 
     case "groups":
       // FIXME: unsupported
@@ -355,15 +354,15 @@ 
 
     case "rows":
       $new_style .= "border-style: solid none solid none; border-width: 1px; ";
-      break;
+        break;
 
     case "cols":
       $new_style .= "border-style: none solid none solid; border-width: 1px; ";
-      break;
+        break;
 
     case "all":
       $new_style .= "border-style: solid; border-width: 1px; ";
-      break;
+        break;
       
     default:
       // Invalid value
@@ -373,118 +372,118 @@ 
     $td_list = $node->getElementsByTagName("td");
     
     foreach ($td_list as $td) {
-      $style = $td->getAttribute("style");
-      $style .= $new_style;
-      $td->setAttribute("style", $style);
+        $style = $td->getAttribute("style");
+        $style .= $new_style;
+        $td->setAttribute("style", $style);
     }
     return null;
-  }
+    }
 
-  static protected function _set_hr_align($node, $value) {
+    static protected function _set_hr_align($node, $value) {
 
     $style = rtrim($node->getAttribute("style"),";");
     $width = $node->getAttribute("width");
     if ( $width == "" )
-      $width = "100%";
+        $width = "100%";
 
     $remainder = 100 - (double)rtrim($width, "% ");
     
     switch ($value) {
     case "left":
       $style .= "; margin-right: $remainder %;";
-      break;
+        break;
 
     case "right":
       $style .= "; margin-left: $remainder %;";
-      break;
+        break;
 
     case "center":
       $style .= "; margin-left: auto; margin-right: auto;";
-      break;
+        break;
 
     default:
       return null;
     }
     return ltrim($style, "; ");
     
-  }
+    }
 
-  static protected function _set_table_row_align($node, $value) {
+    static protected function _set_table_row_align($node, $value) {
 
     $td_list = $node->getElementsByTagName("td");
 
     foreach ($td_list as $td) {
-      $style = rtrim($td->getAttribute("style"), ";");
-      $style .= "; text-align: $value;";
-      $style = ltrim($style, "; ");
-      $td->setAttribute("style", $style);
+        $style = rtrim($td->getAttribute("style"), ";");
+        $style .= "; text-align: $value;";
+        $style = ltrim($style, "; ");
+        $td->setAttribute("style", $style);
     }
 
     return null;
-  }
+    }
 
-  static protected function _set_table_row_valign($node, $value) {
+    static protected function _set_table_row_valign($node, $value) {
 
     $td_list = $node->getElementsByTagName("td");
 
     foreach ($td_list as $td) {
-      $style = rtrim($td->getAttribute("style"), ";");
-      $style .= "; vertical-align: $value;";
-      $style = ltrim($style, "; ");
-      $td->setAttribute("style", $style);
+        $style = rtrim($td->getAttribute("style"), ";");
+        $style .= "; vertical-align: $value;";
+        $style = ltrim($style, "; ");
+        $td->setAttribute("style", $style);
     }
 
     return null;
-  }
+    }
 
-  static protected function _set_table_row_bgcolor($node, $value) {
+    static protected function _set_table_row_bgcolor($node, $value) {
 
     $td_list = $node->getElementsByTagName("td");
 
     foreach ($td_list as $td) {
-      $style = rtrim($td->getAttribute("style"), ";");
-      $style .= "; background-color: $value;";
-      $style = ltrim($style, "; ");
-      $td->setAttribute("style", $style);
+        $style = rtrim($td->getAttribute("style"), ";");
+        $style .= "; background-color: $value;";
+        $style = ltrim($style, "; ");
+        $td->setAttribute("style", $style);
     }
 
     return null;
-  }
+    }
 
-  static protected function _set_body_link($node, $value) {
+    static protected function _set_body_link($node, $value) {
 
     $a_list = $node->getElementsByTagName("a");
 
     foreach ($a_list as $a) {
-      $style = rtrim($a->getAttribute("style"), ";");
-      $style .= "; color: $value;";
-      $style = ltrim($style, "; ");
-      $a->setAttribute("style", $style);
+        $style = rtrim($a->getAttribute("style"), ";");
+        $style .= "; color: $value;";
+        $style = ltrim($style, "; ");
+        $a->setAttribute("style", $style);
     }
 
     return null;
-  }
+    }
 
-  static protected function _set_basefont_size($node, $value) {
+    static protected function _set_basefont_size($node, $value) {
     // FIXME: ? we don't actually set the font size of anything here, just
     // the base size for later modification by <font> tags.
     self::$_last_basefont_size = $value;
     return null;
-  }
+    }
   
-  static protected function _set_font_size($node, $value) {
+    static protected function _set_font_size($node, $value) {
     $style = $node->getAttribute("style");
 
     if ( $value[0] === "-" || $value[0] === "+" )
-      $value = self::$_last_basefont_size + (int)$value;
+        $value = self::$_last_basefont_size + (int)$value;
 
     if ( isset(self::$_font_size_lookup[$value]) )
-      $style .= "; font-size: " . self::$_font_size_lookup[$value] . ";";
+        $style .= "; font-size: " . self::$_font_size_lookup[$value] . ";";
     else
-      $style .= "; font-size: $value;";
+        $style .= "; font-size: $value;";
 
     return ltrim($style, "; ");
     
-  }
+    }
 
 }

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

Indentation +4 added lines, -5 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: table_cell_positioner.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,15 +46,15 @@ 
  */
 class Table_Cell_Positioner extends Positioner {
 
-  function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
+    function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
   
-  //........................................................................
+    //........................................................................
 
-  function position() {
+    function position() {
 
     $table = Table_Frame_Decorator::find_parent_table($this->_frame);
     $cellmap = $table->get_cellmap();
     $this->_frame->set_position($cellmap->get_frame_position($this->_frame));
 
-  }
+    }
 }

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

Indentation +478 added lines, -478 removed lines

@@ -71,201 +71,201 @@ 
 
 
 
-  /**
-   * the location of the default built-in CSS file.
-   *
-   */
-  const DEFAULT_STYLESHEET = __DEFAULT_STYLESHEET; // Hack: can't
-                                                   // concatenate stuff in
-                                                   // const declarations,
-                                                   // but I can do this?
-  // protected members
-
-  /**
-   *  array of currently defined styles
-   *  @var array
-   */
-  private $_styles;
-
-  /**
-   * base protocol of the document being parsed
-   *
-   * Used to handle relative urls.
-   *
-   * @var string
-   */
-  private $_protocol;
-
-  /**
-   * base hostname of the document being parsed
-   *
-   * Used to handle relative urls.
-   * @var string
-   */
-  private $_base_host;
-
-  /**
-   * base path of the document being parsed
-   *
-   * Used to handle relative urls.
-   * @var string
-   */
-  private $_base_path;
-
-
-  /**
-   * the style defined by @page rules
-   *
-   * @var Style
-   */
-  private $_page_style;
-
-
-  /**
-   * list of loaded files, used to prevent recursion
-   *
-   * @var array
-   */
-  private $_loaded_files;
-
-  /**
-   * accepted CSS media types
-   * List of types and parsing rules for future extensions:
-   * http://www.w3.org/TR/REC-html40/types.html
-   *   screen, tty, tv, projection, handheld, print, braille, aural, all
-   * The following are non standard extensions for undocumented specific environments.
-   *   static, visual, bitmap, paged
-   * Note, even though the generated pdf file is intended for print output,
-   * the desired content might be different (e.g. screen or projection view of html file).
-   * Therefore allow specification of content by dompdf setting DOMPDF_DEFAULT_MEDIA_TYPE.
-   * If given, replace media "print" by DOMPDF_DEFAULT_MEDIA_TYPE.
-   * (Previous version $ACCEPTED_MEDIA_TYPES = $ACCEPTED_GENERIC_MEDIA_TYPES + $ACCEPTED_DEFAULT_MEDIA_TYPE)
-   */
-  static $ACCEPTED_DEFAULT_MEDIA_TYPE = "print";
-  static $ACCEPTED_GENERIC_MEDIA_TYPES = array("all", "static", "visual", "bitmap", "paged");
-
-  /**
-   * The class constructor.
-   *
-   * The base protocol, host & path are initialized to those of
-   * the current script.
-   */
-  function __construct() {
+    /**
+     * the location of the default built-in CSS file.
+     *
+     */
+    const DEFAULT_STYLESHEET = __DEFAULT_STYLESHEET; // Hack: can't
+                                                    // concatenate stuff in
+                                                    // const declarations,
+                                                    // but I can do this?
+    // protected members
+
+    /**
+     *  array of currently defined styles
+     *  @var array
+     */
+    private $_styles;
+
+    /**
+     * base protocol of the document being parsed
+     *
+     * Used to handle relative urls.
+     *
+     * @var string
+     */
+    private $_protocol;
+
+    /**
+     * base hostname of the document being parsed
+     *
+     * Used to handle relative urls.
+     * @var string
+     */
+    private $_base_host;
+
+    /**
+     * base path of the document being parsed
+     *
+     * Used to handle relative urls.
+     * @var string
+     */
+    private $_base_path;
+
+
+    /**
+     * the style defined by @page rules
+     *
+     * @var Style
+     */
+    private $_page_style;
+
+
+    /**
+     * list of loaded files, used to prevent recursion
+     *
+     * @var array
+     */
+    private $_loaded_files;
+
+    /**
+     * accepted CSS media types
+     * List of types and parsing rules for future extensions:
+     * http://www.w3.org/TR/REC-html40/types.html
+     *   screen, tty, tv, projection, handheld, print, braille, aural, all
+     * The following are non standard extensions for undocumented specific environments.
+     *   static, visual, bitmap, paged
+     * Note, even though the generated pdf file is intended for print output,
+     * the desired content might be different (e.g. screen or projection view of html file).
+     * Therefore allow specification of content by dompdf setting DOMPDF_DEFAULT_MEDIA_TYPE.
+     * If given, replace media "print" by DOMPDF_DEFAULT_MEDIA_TYPE.
+     * (Previous version $ACCEPTED_MEDIA_TYPES = $ACCEPTED_GENERIC_MEDIA_TYPES + $ACCEPTED_DEFAULT_MEDIA_TYPE)
+     */
+    static $ACCEPTED_DEFAULT_MEDIA_TYPE = "print";
+    static $ACCEPTED_GENERIC_MEDIA_TYPES = array("all", "static", "visual", "bitmap", "paged");
+
+    /**
+     * The class constructor.
+     *
+     * The base protocol, host & path are initialized to those of
+     * the current script.
+     */
+    function __construct() {
     $this->_styles = array();
     $this->_loaded_files = array();
     list($this->_protocol, $this->_base_host, $this->_base_path) = explode_url($_SERVER["SCRIPT_FILENAME"]);
     $this->_page_style = null;
-  }
-
-  /**
-   * Set the base protocol
-   *
-   * @param string $proto
-   */
-  function set_protocol($proto) { $this->_protocol = $proto; }
-
-  /**
-   * Set the base host
-   *
-   * @param string $host
-   */
-  function set_host($host) { $this->_base_host = $host; }
-
-  /**
-   * Set the base path
-   *
-   * @param string $path
-   */
-  function set_base_path($path) { $this->_base_path = $path; }
-
-
-  /**
-   * Return the base protocol for this stylesheet
-   *
-   * @return string
-   */
-  function get_protocol() { return $this->_protocol; }
-
-  /**
-   * Return the base host for this stylesheet
-   *
-   * @return string
-   */
-  function get_host() { return $this->_base_host; }
-
-  /**
-   * Return the base path for this stylesheet
-   *
-   * @return string
-   */
-  function get_base_path() { return $this->_base_path; }
-
-  /**
-   * add a new Style object to the stylesheet
-   *
-   * add_style() adds a new Style object to the current stylesheet, or
-   * merges a new Style with an existing one.
-   *
-   * @param string $key   the Style's selector
-   * @param Style $style  the Style to be added
-   */
-  function add_style($key, Style $style) {
+    }
+
+    /**
+     * Set the base protocol
+     *
+     * @param string $proto
+     */
+    function set_protocol($proto) { $this->_protocol = $proto; }
+
+    /**
+     * Set the base host
+     *
+     * @param string $host
+     */
+    function set_host($host) { $this->_base_host = $host; }
+
+    /**
+     * Set the base path
+     *
+     * @param string $path
+     */
+    function set_base_path($path) { $this->_base_path = $path; }
+
+
+    /**
+     * Return the base protocol for this stylesheet
+     *
+     * @return string
+     */
+    function get_protocol() { return $this->_protocol; }
+
+    /**
+     * Return the base host for this stylesheet
+     *
+     * @return string
+     */
+    function get_host() { return $this->_base_host; }
+
+    /**
+     * Return the base path for this stylesheet
+     *
+     * @return string
+     */
+    function get_base_path() { return $this->_base_path; }
+
+    /**
+     * add a new Style object to the stylesheet
+     *
+     * add_style() adds a new Style object to the current stylesheet, or
+     * merges a new Style with an existing one.
+     *
+     * @param string $key   the Style's selector
+     * @param Style $style  the Style to be added
+     */
+    function add_style($key, Style $style) {
     if (!is_string($key))
-      throw new DOMPDF_Exception("CSS rule must be keyed by a string.");
+        throw new DOMPDF_Exception("CSS rule must be keyed by a string.");
 
     if ( isset($this->_styles[$key]) )
-      $this->_styles[$key]->merge($style);
+        $this->_styles[$key]->merge($style);
     else
-      $this->_styles[$key] = clone $style;
-  }
-
-
-  /**
-   * lookup a specifc Style object
-   *
-   * lookup() returns the Style specified by $key, or null if the Style is
-   * not found.
-   *
-   * @param string $key   the selector of the requested Style
-   * @return Style
-   */
-  function lookup($key) {
+        $this->_styles[$key] = clone $style;
+    }
+
+
+    /**
+     * lookup a specifc Style object
+     *
+     * lookup() returns the Style specified by $key, or null if the Style is
+     * not found.
+     *
+     * @param string $key   the selector of the requested Style
+     * @return Style
+     */
+    function lookup($key) {
     if ( !isset($this->_styles[$key]) )
-      return null;
+        return null;
 
     return $this->_styles[$key];
-  }
-
-  /**
-   * create a new Style object associated with this stylesheet
-   *
-   * @param Style $parent The style of this style's parent in the DOM tree
-   * @return Style
-   */
-  function create_style($parent = null) {
+    }
+
+    /**
+     * create a new Style object associated with this stylesheet
+     *
+     * @param Style $parent The style of this style's parent in the DOM tree
+     * @return Style
+     */
+    function create_style($parent = null) {
     return new Style($this, $parent);
-  }
+    }
 
 
-  /**
-   * load and parse a CSS string
-   *
-   * @param string $css
-   */
-  function load_css(&$css) { $this->_parse_css($css); }
+    /**
+     * load and parse a CSS string
+     *
+     * @param string $css
+     */
+    function load_css(&$css) { $this->_parse_css($css); }
 
 
-  /**
-   * load and parse a CSS file
-   *
-   * @param string $file
-   */
-  function load_css_file($file) {
+    /**
+     * load and parse a CSS file
+     *
+     * @param string $file
+     */
+    function load_css_file($file) {
     global $_dompdf_warnings;
 
     // Prevent circular references
     if ( isset($this->_loaded_files[$file]) )
-      return;
+        return;
 
     $this->_loaded_files[$file] = true;
     $parsed_url = explode_url($file);
@@ -274,36 +274,36 @@ 
 
     if ( !DOMPDF_ENABLE_REMOTE &&
          ($this->_protocol != "" && $this->_protocol !== "file://") ) {
-      record_warnings(E_USER_WARNING, "Remote CSS file '$file' requested, but DOMPDF_ENABLE_REMOTE is false.", __FILE__, __LINE__);
-      return;
+        record_warnings(E_USER_WARNING, "Remote CSS file '$file' requested, but DOMPDF_ENABLE_REMOTE is false.", __FILE__, __LINE__);
+        return;
     }
 
     // Fix submitted by Nick Oostveen for aliased directory support:
     if ( $this->_protocol == "" )
-      $file = $this->_base_path . $filename;
+        $file = $this->_base_path . $filename;
     else
-      $file = build_url($this->_protocol, $this->_base_host, $this->_base_path, $filename);
+        $file = build_url($this->_protocol, $this->_base_host, $this->_base_path, $filename);
 
     set_error_handler("record_warnings");
     $css = file_get_contents($file);
     restore_error_handler();
 
     if ( $css == "" ) {
-      record_warnings(E_USER_WARNING, "Unable to load css file $file", __FILE__, __LINE__);;
-      return;
+        record_warnings(E_USER_WARNING, "Unable to load css file $file", __FILE__, __LINE__);;
+        return;
     }
 
     $this->_parse_css($css);
 
-  }
+    }
 
-  /**
-   * @link http://www.w3.org/TR/CSS21/cascade.html#specificity}
-   *
-   * @param string $selector
-   * @return int
-   */
-  private function _specificity($selector) {
+    /**
+     * @link http://www.w3.org/TR/CSS21/cascade.html#specificity}
+     *
+     * @param string $selector
+     * @return int
+     */
+    private function _specificity($selector) {
     // http://www.w3.org/TR/CSS21/cascade.html#specificity
     // ignoring the ":" pseudoclass modifyers
     // also ignored in _css_selector_to_xpath
@@ -325,26 +325,26 @@ 
     //see _css_selector_to_xpath
 
     if ( !in_array($selector[0], array(" ", ">", ".", "#", "+", ":", "[")) ) {
-    	$d++;
+        $d++;
     }
 
     if (DEBUGCSS) {
-      /*DEBUGCSS*/	print "<pre>\n";
-      /*DEBUGCSS*/	printf("_specificity(): 0x%08x \"%s\"\n", ($a << 24) | ($b << 16) | ($c << 8) | ($d), $selector);
-      /*DEBUGCSS*/	print "</pre>";
+        /*DEBUGCSS*/	print "<pre>\n";
+        /*DEBUGCSS*/	printf("_specificity(): 0x%08x \"%s\"\n", ($a << 24) | ($b << 16) | ($c << 8) | ($d), $selector);
+        /*DEBUGCSS*/	print "</pre>";
     }
 
     return ($a << 24) | ($b << 16) | ($c << 8) | ($d);
-  }
+    }
 
 
-  /**
-   * converts a CSS selector to an XPath query.
-   *
-   * @param string $selector
-   * @return string
-   */
-  private function _css_selector_to_xpath($selector) {
+    /**
+     * converts a CSS selector to an XPath query.
+     *
+     * @param string $selector
+     * @return string
+     */
+    private function _css_selector_to_xpath($selector) {
 
     // Collapse white space and strip whitespace around delimiters
 //     $search = array("/\\s+/", "/\\s+([.>#+:])\\s+/");
@@ -362,7 +362,7 @@ 
     // Add an implicit space at the beginning of the selector if there is no
     // delimiter there already.
     if ( !in_array($selector[0], $delimiters) )
-      $selector = " $selector";
+        $selector = " $selector";
 
     $tok = "";
     $len = mb_strlen($selector);
@@ -370,37 +370,37 @@ 
 
     while ( $i < $len ) {
 
-      $s = $selector[$i];
-      $i++;
+        $s = $selector[$i];
+        $i++;
 
-      // Eat characters up to the next delimiter
-      $tok = "";
+        // Eat characters up to the next delimiter
+        $tok = "";
 
-      while ($i < $len) {
+        while ($i < $len) {
         if ( in_array($selector[$i], $delimiters) )
-          break;
+            break;
         $tok .= $selector[$i++];
-      }
+        }
 
-      switch ($s) {
+        switch ($s) {
 
-      case " ":
+        case " ":
       case ">":
         // All elements matching the next token that are direct children of
         // the current token
         $expr = $s === " " ? "descendant" : "child";
 
         if ( mb_substr($query, -1, 1) !== "/" )
-          $query .= "/";
+            $query .= "/";
 
         if ( !$tok )
-          $tok = "*";
+            $tok = "*";
 
         $query .= "$expr::$tok";
         $tok = "";
         break;
 
-      case ".":
+        case ".":
       case "#":
         // All elements matching the current token with a class/id equal to
         // the _next_ token.
@@ -409,7 +409,7 @@ 
 
         // empty class/id == *
         if ( mb_substr($query, -1, 1) === "/" )
-          $query .= "*";
+            $query .= "*";
 
         // Match multiple classes: $tok contains the current selected
         // class.  Search for class attributes with class="$tok",
@@ -423,28 +423,28 @@ 
         $tok = "";
         break;
 
-      case "+":
+        case "+":
         // All sibling elements that folow the current token
         if ( mb_substr($query, -1, 1) !== "/" )
-          $query .= "/";
+            $query .= "/";
 
         $query .= "following-sibling::$tok";
         $tok = "";
         break;
 
-      case ":":
+        case ":":
         // Pseudo-classes
         switch ($tok) {
 
         case "first-child":
           $query .= "[1]";
-          $tok = "";
-          break;
+            $tok = "";
+            break;
 
         case "link":
           $query .= "[@href]";
-          $tok = "";
-          break;
+            $tok = "";
+            break;
 
         case "first-line":
           break;
@@ -462,7 +462,7 @@ 
 
         break;
 
-      case "[":
+        case "[":
         // Attribute selectors.  All with an attribute matching the following token(s)
         $attr_delimiters = array("=", "]", "~", "|");
         $tok_len = mb_strlen($tok);
@@ -473,9 +473,9 @@ 
         $value = "";
 
         while ( $j < $tok_len ) {
-          if ( in_array($tok[$j], $attr_delimiters) )
+            if ( in_array($tok[$j], $attr_delimiters) )
             break;
-          $attr .= $tok[$j++];
+            $attr .= $tok[$j++];
         }
 
         switch ( $tok[$j] ) {
@@ -484,67 +484,67 @@ 
         case "|":
           $op .= $tok[$j++];
 
-          if ( $tok[$j] !== "=" )
+            if ( $tok[$j] !== "=" )
             throw new DOMPDF_Exception("Invalid CSS selector syntax: invalid attribute selector: $selector");
 
-          $op .= $tok[$j];
-          break;
+            $op .= $tok[$j];
+            break;
 
         case "=":
           $op = "=";
-          break;
+            break;
 
         }
 
         // Read the attribute value, if required
         if ( $op != "" ) {
-          $j++;
-          while ( $j < $tok_len ) {
+            $j++;
+            while ( $j < $tok_len ) {
             if ( $tok[$j] === "]" )
-              break;
+                break;
             $value .= $tok[$j++];
-          }
+            }
         }
 
         if ( $attr == "" )
-          throw new DOMPDF_Exception("Invalid CSS selector syntax: missing attribute name");
+            throw new DOMPDF_Exception("Invalid CSS selector syntax: missing attribute name");
 
         switch ( $op ) {
 
         case "":
           $query .=  "[@$attr]";
-          break;
+            break;
 
         case "=":
           $query .= "[@$attr$op\"$value\"]";
-          break;
+            break;
 
         case "~=":
           // FIXME: this will break if $value contains quoted strings
           // (e.g. [type~="a b c" "d e f"])
           $values = explode(" ", $value);
-          $query .=  "[";
+            $query .=  "[";
 
-          foreach ( $values as $val )
+            foreach ( $values as $val )
             $query .= "@$attr=\"$val\" or ";
 
-          $query = rtrim($query, " or ") . "]";
-          break;
+            $query = rtrim($query, " or ") . "]";
+            break;
 
         case "|=":
           $values = explode("-", $value);
-          $query .= "[";
+            $query .= "[";
 
-          foreach ($values as $val)
+            foreach ($values as $val)
             $query .= "starts-with(@$attr, \"$val\") or ";
 
-          $query = rtrim($query, " or ") . "]";
-          break;
+            $query = rtrim($query, " or ") . "]";
+            break;
 
         }
 
         break;
-      }
+        }
     }
     $i++;
 
@@ -571,21 +571,21 @@ 
 
     // Trim the trailing '/' from the query
     if ( mb_strlen($query) > 2 )
-      $query = rtrim($query, "/");
+        $query = rtrim($query, "/");
 
     return $query;
-  }
-
-  /**
-   * applies all current styles to a particular document tree
-   *
-   * apply_styles() applies all currently loaded styles to the provided
-   * {@link Frame_Tree}.  Aside from parsing CSS, this is the main purpose
-   * of this class.
-   *
-   * @param Frame_Tree $tree
-   */
-  function apply_styles(Frame_Tree $tree) {
+    }
+
+    /**
+     * applies all current styles to a particular document tree
+     *
+     * apply_styles() applies all currently loaded styles to the provided
+     * {@link Frame_Tree}.  Aside from parsing CSS, this is the main purpose
+     * of this class.
+     *
+     * @param Frame_Tree $tree
+     */
+    function apply_styles(Frame_Tree $tree) {
 
     // Use XPath to select nodes.  This would be easier if we could attach
     // Frame objects directly to DOMNodes using the setUserData() method, but
@@ -605,67 +605,67 @@ 
     // Apply all styles in stylesheet
     foreach ($this->_styles as $selector => $style) {
 
-      $query = $this->_css_selector_to_xpath($selector);
+        $query = $this->_css_selector_to_xpath($selector);
 //       pre_var_dump($selector);
 //       pre_var_dump($query);
 //        echo ($style);
 
-      // Retrieve the nodes
-      $nodes = $xp->query($query);
+        // Retrieve the nodes
+        $nodes = $xp->query($query);
 
-      foreach ($nodes as $node) {
+        foreach ($nodes as $node) {
         //echo $node->nodeName . "\n";
         // Retrieve the node id
         if ( $node->nodeType != 1 ) // Only DOMElements get styles
-          continue;
+            continue;
 
         $id = $node->getAttribute("frame_id");
 
         // Assign the current style to the scratch array
         $spec = $this->_specificity($selector);
         $styles[$id][$spec][] = $style;
-      }
+        }
     }
 
     // Now create the styles and assign them to the appropriate frames.  (We
     // iterate over the tree using an implicit Frame_Tree iterator.)
     $root_flg = false;
     foreach ($tree->get_frames() as $frame) {
-      // pre_r($frame->get_node()->nodeName . ":");
-      if ( !$root_flg && $this->_page_style ) {
+        // pre_r($frame->get_node()->nodeName . ":");
+        if ( !$root_flg && $this->_page_style ) {
         $style = $this->_page_style;
         $root_flg = true;
-      } else
+        } else
         $style = $this->create_style();
 
-      // Find nearest DOMElement parent
-      $p = $frame;
-      while ( $p = $p->get_parent() )
+        // Find nearest DOMElement parent
+        $p = $frame;
+        while ( $p = $p->get_parent() )
         if ($p->get_node()->nodeType == 1 )
-          break;
+            break;
 
-      // Styles can only be applied directly to DOMElements; anonymous
-      // frames inherit from their parent
-      if ( $frame->get_node()->nodeType != 1 ) {
+        // Styles can only be applied directly to DOMElements; anonymous
+        // frames inherit from their parent
+        if ( $frame->get_node()->nodeType != 1 ) {
         if ( $p )
-          $style->inherit($p->get_style());
+            $style->inherit($p->get_style());
         $frame->set_style($style);
         continue;
-      }
+        }
 
-      $id = $frame->get_id();
+        $id = $frame->get_id();
 
-      // Handle HTML 4.0 attributes
-      Attribute_Translator::translate_attributes($frame);
+        // Handle HTML 4.0 attributes
+        Attribute_Translator::translate_attributes($frame);
 
-      // Locate any additional style attributes
-      if ( ($str = $frame->get_node()->getAttribute("style")) !== "" ) {
+        // Locate any additional style attributes
+        if ( ($str = $frame->get_node()->getAttribute("style")) !== "" ) {
         $spec = $this->_specificity("!style attribute");
         $styles[$id][$spec][] = $this->_parse_properties($str);
-      }
+        }
 
-      // Grab the applicable styles
-      if ( isset($styles[$id]) ) {
+        // Grab the applicable styles
+        if ( isset($styles[$id]) ) {
 
         $applied_styles = $styles[ $frame->get_id() ];
 
@@ -673,101 +673,101 @@ 
         ksort($applied_styles);
 
         if (DEBUGCSS) {
-          $debug_nodename = $frame->get_node()->nodeName;
-          print "<pre>\n[$debug_nodename\n";
-          foreach ($applied_styles as $spec => $arr) {
+            $debug_nodename = $frame->get_node()->nodeName;
+            print "<pre>\n[$debug_nodename\n";
+            foreach ($applied_styles as $spec => $arr) {
             printf("specificity: 0x%08x\n",$spec);
             foreach ($arr as $s) {
-              print "[\n";
-              $s->debug_print();
-              print "]\n";
+                print "[\n";
+                $s->debug_print();
+                print "]\n";
+            }
             }
-          }
         }
         
         // Merge the new styles with the inherited styles
         foreach ($applied_styles as $arr) {
-          foreach ($arr as $s)
+            foreach ($arr as $s)
             $style->merge($s);
         }
-      }
+        }
 
-      // Inherit parent's styles if required
-      if ( $p ) {
+        // Inherit parent's styles if required
+        if ( $p ) {
 
         if (DEBUGCSS) {
-          print "inherit:\n";
-          print "[\n";
-          $p->get_style()->debug_print();
-          print "]\n";
+            print "inherit:\n";
+            print "[\n";
+            $p->get_style()->debug_print();
+            print "]\n";
         }
 
         $style->inherit( $p->get_style() );
-      }
+        }
 
-      if (DEBUGCSS) {
+        if (DEBUGCSS) {
         print "DomElementStyle:\n";
         print "[\n";
         $style->debug_print();
         print "]\n";
         print "/$debug_nodename]\n</pre>";
-      }
+        }
 
-      /*DEBUGCSS print: see below different print debugging method
+        /*DEBUGCSS print: see below different print debugging method
       pre_r($frame->get_node()->nodeName . ":");
       echo "<pre>";
       echo $style;
       echo "</pre>";*/
-      $frame->set_style($style);
+        $frame->set_style($style);
 
     }
 
     // We're done!  Clean out the registry of all styles since we
     // won't be needing this later.
     foreach ( array_keys($this->_styles) as $key ) {
-      unset($this->_styles[$key]);
+        unset($this->_styles[$key]);
     }
 
-  }
+    }
 
 
-  /**
-   * parse a CSS string using a regex parser
-   *
-   * Called by {@link Stylesheet::parse_css()}
-   *
-   * @param string $str
-   */
-  private function _parse_css($str) {
+    /**
+     * parse a CSS string using a regex parser
+     *
+     * Called by {@link Stylesheet::parse_css()}
+     *
+     * @param string $str
+     */
+    private function _parse_css($str) {
 
     $str = trim($str);
     
     // Destroy comments and remove HTML comments
     $css = preg_replace(array(
-      "'/\*.*?\*/'si", 
-      "/^<!--/",
-      "/-->$/"
+        "'/\*.*?\*/'si", 
+        "/^<!--/",
+        "/-->$/"
     ), "", $str);
 
     // FIXME: handle '{' within strings, e.g. [attr="string {}"]
 
     // Something more legible:
     $re =
-      "/\s*                                   # Skip leading whitespace                             \n".
-      "( @([^\s]+)\s+([^{;]*) (?:;|({)) )?    # Match @rules followed by ';' or '{'                 \n".
-      "(?(1)                                  # Only parse sub-sections if we're in an @rule...     \n".
-      "  (?(4)                                # ...and if there was a leading '{'                   \n".
-      "    \s*( (?:(?>[^{}]+) ({)?            # Parse rulesets and individual @page rules           \n".
-      "            (?(6) (?>[^}]*) }) \s*)+?  \n".
-      "       )                               \n".
-      "   })                                  # Balancing '}'                                \n".
-      "|                                      # Branch to match regular rules (not preceeded by '@')\n".
-      "([^{]*{[^}]*}))                        # Parse normal rulesets\n".
-      "/xs";
+        "/\s*                                   # Skip leading whitespace                             \n".
+        "( @([^\s]+)\s+([^{;]*) (?:;|({)) )?    # Match @rules followed by ';' or '{'                 \n".
+        "(?(1)                                  # Only parse sub-sections if we're in an @rule...     \n".
+        "  (?(4)                                # ...and if there was a leading '{'                   \n".
+        "    \s*( (?:(?>[^{}]+) ({)?            # Parse rulesets and individual @page rules           \n".
+        "            (?(6) (?>[^}]*) }) \s*)+?  \n".
+        "       )                               \n".
+        "   })                                  # Balancing '}'                                \n".
+        "|                                      # Branch to match regular rules (not preceeded by '@')\n".
+        "([^{]*{[^}]*}))                        # Parse normal rulesets\n".
+        "/xs";
 
     if ( preg_match_all($re, $css, $matches, PREG_SET_ORDER) === false )
-      // An error occured
-      throw new DOMPDF_Exception("Error parsing css file: preg_match_all() failed.");
+        // An error occured
+        throw new DOMPDF_Exception("Error parsing css file: preg_match_all() failed.");
 
     // After matching, the array indicies are set as follows:
     //
@@ -782,27 +782,27 @@ 
     //
     //pre_r($matches);
     foreach ( $matches as $match ) {
-      $match[2] = trim($match[2]);
+        $match[2] = trim($match[2]);
 
-      if ( $match[2] !== "" ) {
+        if ( $match[2] !== "" ) {
         // Handle @rules
         switch ($match[2]) {
 
         case "import":
           $this->_parse_import($match[3]);
-          break;
+            break;
 
         case "media":
           $acceptedmedia = self::$ACCEPTED_GENERIC_MEDIA_TYPES;
-          if ( defined("DOMPDF_DEFAULT_MEDIA_TYPE") ) {
+            if ( defined("DOMPDF_DEFAULT_MEDIA_TYPE") ) {
             $acceptedmedia[] = DOMPDF_DEFAULT_MEDIA_TYPE;
-          } else {
+            } else {
             $acceptedmedia[] = self::$ACCEPTED_DEFAULT_MEDIA_TYPE;
-          }
-          if ( in_array(mb_strtolower(trim($match[3])), $acceptedmedia ) ) {
+            }
+            if ( in_array(mb_strtolower(trim($match[3])), $acceptedmedia ) ) {
             $this->_parse_sections($match[5]);
-          }
-          break;
+            }
+            break;
 
         case "page":
           //This handles @page to be applied to page oriented media
@@ -827,9 +827,9 @@ 
           // Store the style for later...
           if ( is_null($this->_page_style) )
             $this->_page_style = $this->_parse_properties($match[5]);
-          else
+            else
             $this->_page_style->merge($this->_parse_properties($match[5]));
-          break;
+            break;
 
         default:
           // ignore everything else
@@ -837,118 +837,118 @@ 
         }
 
         continue;
-      }
+        }
 
-      if ( $match[7] !== "" )
+        if ( $match[7] !== "" )
         $this->_parse_sections($match[7]);
 
     }
-  }
+    }
 
-  /* See also style.cls Style::_image(), refactoring?, works also for imported css files */
-  protected function _image($val) {
+    /* See also style.cls Style::_image(), refactoring?, works also for imported css files */
+    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->get_protocol() == "" ) {
+        // Resolve the url now in the context of the current stylesheet
+        $parsed_url = explode_url($val);
+        if ( $parsed_url["protocol"] == "" && $this->get_protocol() == "" ) {
         if ($parsed_url["path"]{0} === '/' || $parsed_url["path"]{0} === '\\' ) {
-          $path = $_SERVER["DOCUMENT_ROOT"].'/';
+            $path = $_SERVER["DOCUMENT_ROOT"].'/';
         } else {
-          $path = $this->get_base_path();
+            $path = $this->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->get_protocol(),
-                          $this->get_host(),
-                          $this->get_base_path(),
-                          $val);
-      }
+                            $this->get_host(),
+                            $this->get_base_path(),
+                            $val);
+        }
     }
     if ($DEBUGCSS) {
-      print "<pre>[_image\n";
-      print_r($parsed_url);
-      print $this->get_protocol()."\n".$this->get_base_path()."\n".$path."\n";
-      print "_image]</pre>";;
+        print "<pre>[_image\n";
+        print_r($parsed_url);
+        print $this->get_protocol()."\n".$this->get_base_path()."\n".$path."\n";
+        print "_image]</pre>";;
     }
     return $path;
-  }
-
-  /**
-   * parse @import{} sections
-   *
-   * @param string $url  the url of the imported CSS file
-   */
-  private function _parse_import($url) {
+    }
+
+    /**
+     * parse @import{} sections
+     *
+     * @param string $url  the url of the imported CSS file
+     */
+    private function _parse_import($url) {
     $arr = preg_split("/[\s\n,]/", $url,-1, PREG_SPLIT_NO_EMPTY);
     $url = array_shift($arr);
     $accept = false;
 
     if ( count($arr) > 0 ) {
 
-      $acceptedmedia = self::$ACCEPTED_GENERIC_MEDIA_TYPES;
-      if ( defined("DOMPDF_DEFAULT_MEDIA_TYPE") ) {
+        $acceptedmedia = self::$ACCEPTED_GENERIC_MEDIA_TYPES;
+        if ( defined("DOMPDF_DEFAULT_MEDIA_TYPE") ) {
         $acceptedmedia[] = DOMPDF_DEFAULT_MEDIA_TYPE;
-      } else {
+        } else {
         $acceptedmedia[] = self::$ACCEPTED_DEFAULT_MEDIA_TYPE;
-      }
+        }
               
-      // @import url media_type [media_type...]
-      foreach ( $arr as $type ) {
+        // @import url media_type [media_type...]
+        foreach ( $arr as $type ) {
         if ( in_array(mb_strtolower(trim($type)), $acceptedmedia) ) {
-          $accept = true;
-          break;
+            $accept = true;
+            break;
+        }
         }
-      }
 
     } else {
-      // unconditional import
-      $accept = true;
+        // unconditional import
+        $accept = true;
     }
 
     if ( $accept ) {
-      // Store our current base url properties in case the new url is elsewhere
-      $protocol = $this->_protocol;
-      $host = $this->_base_host;
-      $path = $this->_base_path;
+        // Store our current base url properties in case the new url is elsewhere
+        $protocol = $this->_protocol;
+        $host = $this->_base_host;
+        $path = $this->_base_path;
       
-      // $url = str_replace(array('"',"url", "(", ")"), "", $url);
-      // If the protocol is php, assume that we will import using file://
-      // $url = build_url($protocol == "php://" ? "file://" : $protocol, $host, $path, $url);
-      // Above does not work for subfolders and absolute urls.
-      // Todo: As above, do we need to replace php or file to an empty protocol for local files?
+        // $url = str_replace(array('"',"url", "(", ")"), "", $url);
+        // If the protocol is php, assume that we will import using file://
+        // $url = build_url($protocol == "php://" ? "file://" : $protocol, $host, $path, $url);
+        // Above does not work for subfolders and absolute urls.
+        // Todo: As above, do we need to replace php or file to an empty protocol for local files?
       
-      $url = $this->_image($url);
+        $url = $this->_image($url);
       
-      $this->load_css_file($url);
+        $this->load_css_file($url);
+
+        // Restore the current base url
+        $this->_protocol = $protocol;
+        $this->_base_host = $host;
+        $this->_base_path = $path;
+    }
 
-      // Restore the current base url
-      $this->_protocol = $protocol;
-      $this->_base_host = $host;
-      $this->_base_path = $path;
     }
 
-  }
-
-  /**
-   * parse regular CSS blocks
-   *
-   * _parse_properties() creates a new Style object based on the provided
-   * CSS rules.
-   *
-   * @param string $str  CSS rules
-   * @return Style
-   */
-  private function _parse_properties($str) {
+    /**
+     * parse regular CSS blocks
+     *
+     * _parse_properties() creates a new Style object based on the provided
+     * CSS rules.
+     *
+     * @param string $str  CSS rules
+     * @return Style
+     */
+    private function _parse_properties($str) {
     $properties = explode(";", $str);
 
     if (DEBUGCSS) print '[_parse_properties';
@@ -956,71 +956,71 @@ 
     // Create the style
     $style = new Style($this);
     foreach ($properties as $prop) {
-      //A css property can have " ! important" appended (whitespace optional)
-      //strip this off to decode core of the property correctly.
-      //Pass on in the style to allow proper handling:
-      //!important properties can only be overridden by other !important ones.
-      //$style->$prop_name = is a shortcut of $style->__set($prop_name,$value);.
-      //If no specific set function available, set _props["prop_name"]
-      //style is always copied completely, or $_props handled separately
-      //Therefore set a _important_props["prop_name"]=true to indicate the modifier
-
-      /* Instead of short code, prefer the typical case with fast code
+        //A css property can have " ! important" appended (whitespace optional)
+        //strip this off to decode core of the property correctly.
+        //Pass on in the style to allow proper handling:
+        //!important properties can only be overridden by other !important ones.
+        //$style->$prop_name = is a shortcut of $style->__set($prop_name,$value);.
+        //If no specific set function available, set _props["prop_name"]
+        //style is always copied completely, or $_props handled separately
+        //Therefore set a _important_props["prop_name"]=true to indicate the modifier
+
+        /* Instead of short code, prefer the typical case with fast code
 	  $important = preg_match("/(.*?)!\s*important/",$prop,$match);
       if ( $important ) {
       	$prop = $match[1];
       }
       $prop = trim($prop);
       */
-      if (DEBUGCSS) print '(';
- 	  $important = false;
-      $prop = trim($prop);
-      if (substr($prop,-9) === 'important') {
-      	$prop_tmp = rtrim(substr($prop,0,-9));
-      	if (substr($prop_tmp,-1) === '!') {
-      		$prop = rtrim(substr($prop_tmp,0,-1));
-      		$important = true;
-      	}
-      }
+        if (DEBUGCSS) print '(';
+        $important = false;
+        $prop = trim($prop);
+        if (substr($prop,-9) === 'important') {
+            $prop_tmp = rtrim(substr($prop,0,-9));
+            if (substr($prop_tmp,-1) === '!') {
+                $prop = rtrim(substr($prop_tmp,0,-1));
+                $important = true;
+            }
+        }
 
-      if ($prop == "") {
+        if ($prop == "") {
         if (DEBUGCSS) print 'empty)';
         continue;
-      }
+        }
 
-      $i = mb_strpos($prop, ":");
-      if ( $i === false ) {
+        $i = mb_strpos($prop, ":");
+        if ( $i === false ) {
         if (DEBUGCSS) print 'novalue'.$prop.')';
         continue;
-      }
+        }
 
-      $prop_name = rtrim(mb_strtolower(mb_substr($prop, 0, $i)));
-      $value = ltrim(mb_substr($prop, $i+1));
-      if (DEBUGCSS) print $prop_name.':='.$value.($important?'!IMPORTANT':'').')';
-      //New style, anyway empty
-      //if ($important || !$style->important_get($prop_name) ) {
-      //$style->$prop_name = array($value,$important);
-      //assignment might be replaced by overloading through __set,
-      //and overloaded functions might check _important_props,
-      //therefore set _important_props first.
-      if ($important) {
+        $prop_name = rtrim(mb_strtolower(mb_substr($prop, 0, $i)));
+        $value = ltrim(mb_substr($prop, $i+1));
+        if (DEBUGCSS) print $prop_name.':='.$value.($important?'!IMPORTANT':'').')';
+        //New style, anyway empty
+        //if ($important || !$style->important_get($prop_name) ) {
+        //$style->$prop_name = array($value,$important);
+        //assignment might be replaced by overloading through __set,
+        //and overloaded functions might check _important_props,
+        //therefore set _important_props first.
+        if ($important) {
         $style->important_set($prop_name);
-      }
-      //For easier debugging, don't use overloading of assignments with __set
-      $style->$prop_name = $value;
-      //$style->props_set($prop_name, $value);
+        }
+        //For easier debugging, don't use overloading of assignments with __set
+        $style->$prop_name = $value;
+        //$style->props_set($prop_name, $value);
     }
     if (DEBUGCSS) print '_parse_properties]';
 
     return $style;
-  }
-
-  /**
-   * parse selector + rulesets
-   *
-   * @param string $str  CSS selectors and rulesets
-   */
-  private function _parse_sections($str) {
+    }
+
+    /**
+     * parse selector + rulesets
+     *
+     * @param string $str  CSS selectors and rulesets
+     */
+    private function _parse_sections($str) {
     // Pre-process: collapse all whitespace and strip whitespace around '>',
     // '.', ':', '+', '#'
 
@@ -1031,43 +1031,43 @@ 
     $sections = explode("}", $str);
     if (DEBUGCSS) print '[_parse_sections';
     foreach ($sections as $sect) {
-      $i = mb_strpos($sect, "{");
+        $i = mb_strpos($sect, "{");
 
-      $selectors = explode(",", mb_substr($sect, 0, $i));
-      if (DEBUGCSS) print '[section';
-      $style = $this->_parse_properties(trim(mb_substr($sect, $i+1)));
+        $selectors = explode(",", mb_substr($sect, 0, $i));
+        if (DEBUGCSS) print '[section';
+        $style = $this->_parse_properties(trim(mb_substr($sect, $i+1)));
       
-      // Assign it to the selected elements
-      foreach ($selectors as $selector) {
+        // Assign it to the selected elements
+        foreach ($selectors as $selector) {
         $selector = trim($selector);
 
         if ($selector == "") {
-          if (DEBUGCSS) print '#empty#';
-          continue;
+            if (DEBUGCSS) print '#empty#';
+            continue;
         }
         if (DEBUGCSS) print '#'.$selector.'#';
         //if (DEBUGCSS) { if (strpos($selector,'p') !== false) print '!!!p!!!#'; }
 
         $this->add_style($selector, $style);
-      }
-      if (DEBUGCSS) print 'section]';
+        }
+        if (DEBUGCSS) print 'section]';
     }
     if (DEBUGCSS) print '_parse_sections]';
-  }
-
-  /**
-   * dumps the entire stylesheet as a string
-   *
-   * Generates a string of each selector and associated style in the
-   * Stylesheet.  Useful for debugging.
-   *
-   * @return string
-   */
-  function __toString() {
+    }
+
+    /**
+     * dumps the entire stylesheet as a string
+     *
+     * Generates a string of each selector and associated style in the
+     * Stylesheet.  Useful for debugging.
+     *
+     * @return string
+     */
+    function __toString() {
     $str = "";
     foreach ($this->_styles as $selector => $style)
-      $str .= "$selector => " . $style->__toString() . "\n";
+        $str .= "$selector => " . $style->__toString() . "\n";
 
     return $str;
-  }
+    }
 }

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

Indentation +8 added lines, -9 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: dompdf_internal_exception.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -46,14 +45,14 @@ 
  */
 class DOMPDF_Internal_Exception extends Exception {
 
-  /**
-   * Class constructor
-   *
-   * @param string $message Error message
-   * @param int $code Error code
-   */
-  function __construct($message = NULL, $code = 0) {
+    /**
+     * Class constructor
+     *
+     * @param string $message Error message
+     * @param int $code Error code
+     */
+    function __construct($message = NULL, $code = 0) {
     parent::__construct($message, $code);
-  }
+    }
 
 }

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

Indentation +7 added lines, -8 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: block_positioner.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -48,24 +47,24 @@ 
 class Block_Positioner extends Positioner {
 
 
-  function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
+    function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
   
-  //........................................................................
+    //........................................................................
 
-  function position() {
+    function position() {
     $cb = $this->_frame->get_containing_block();
 
     $p = $this->_frame->find_block_parent();
     
     if ( $p ) {
-      $p->add_line();
-      $y = $p->get_current_line("y");
+        $p->add_line();
+        $y = $p->get_current_line("y");
       
     } else
-      $y = $cb["y"];
+        $y = $cb["y"];
 
     $x = $cb["x"];
     
     $this->_frame->set_position($x, $y);
-  }
+    }
 }

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

Indentation +16 added lines, -17 removed lines

@@ -35,7 +35,6 @@ 
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @contributor Helmut Tischer <htischer@weihenstephan.org>
  * @package dompdf
-
  *
  * Changes
  * @contributor Helmut Tischer <htischer@weihenstephan.org>
@@ -53,11 +52,11 @@ 
  */
 class List_Bullet_Positioner extends Positioner {
 
-  function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
+    function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
   
-  //........................................................................
+    //........................................................................
 
-  function position() {
+    function position() {
     
     // Bullets & friends are positioned an absolute distance to the left of
     // the content edge of their parent element
@@ -75,19 +74,19 @@ 
     // This is a bit of a hack...
     $n = $this->_frame->get_next_sibling();
     if ( $n ) {
-      $style = $n->get_style();
-      $y += $style->length_in_pt( array($style->margin_top, $style->padding_top),
-                                  $n->get_containing_block("w") );
+        $style = $n->get_style();
+        $y += $style->length_in_pt( array($style->margin_top, $style->padding_top),
+                                    $n->get_containing_block("w") );
     }
 
-	// Now the position is the left top of the block which should be marked with the bullet.
-	// We tried to find out the y of the start of the first text character within the block.
-	// But the top margin/padding does not fit, neither from this nor from the next sibling
-	// The "bit of a hack" above does not work also.
+    // Now the position is the left top of the block which should be marked with the bullet.
+    // We tried to find out the y of the start of the first text character within the block.
+    // But the top margin/padding does not fit, neither from this nor from the next sibling
+    // The "bit of a hack" above does not work also.
 	
-	// Instead let's position the bullet vertically centered to the block which should be marked.
-	// But for get_next_sibling() the get_containing_block is all zero, and for find_block_parent()
-	// the get_containing_block is paper width and the entire list as height.
+    // Instead let's position the bullet vertically centered to the block which should be marked.
+    // But for get_next_sibling() the get_containing_block is all zero, and for find_block_parent()
+    // the get_containing_block is paper width and the entire list as height.
 	
     // if ($p) {
     //   //$cb = $n->get_containing_block();
@@ -96,8 +95,8 @@ 
     // print 'cb:'.$cb["x"].':'.$cb["y"].':'.$cb["w"].':'.$cb["h"].':';
     // }	 
 
-	// Todo:
-	// For now give up on the above. Use Guesswork with font y-pos in the middle of the line spacing
+    // Todo:
+    // For now give up on the above. Use Guesswork with font y-pos in the middle of the line spacing
 
     $style = $p->get_style();
     $font_size = $style->get_font_size();
@@ -107,5 +106,5 @@ 
     //Position is x-end y-top of character position of the bullet.    
     $this->_frame->set_position($x, $y);
     
-  }
+    }
 }

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

Indentation +13 added lines, -14 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: table_row_frame_decorator.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,35 +46,35 @@ 
  */
 class Table_Row_Frame_Decorator extends Frame_Decorator {
 
-  // protected members
+    // protected members
   
-  function __construct(Frame $frame, DOMPDF $dompdf) {
+    function __construct(Frame $frame, DOMPDF $dompdf) {
     parent::__construct($frame, $dompdf);
-  }
+    }
   
-  //........................................................................ 
+    //........................................................................ 
 
-  /**
-   * Remove all non table-cell frames from this row and move them after
-   * the table.
-   */
-  function normalise() {
+    /**
+     * Remove all non table-cell frames from this row and move them after
+     * the table.
+     */
+    function normalise() {
 
     // Find our table parent
     $p = Table_Frame_Decorator::find_parent_table($this);
     
     $erroneous_frames = array();
     foreach ($this->get_children() as $child) {      
-      $display = $child->get_style()->display;
+        $display = $child->get_style()->display;
 
-      if ( $display !== "table-cell" )
+        if ( $display !== "table-cell" )
         $erroneous_frames[] = $child;
     }
     
     //  dump the extra nodes after the table.
     foreach ($erroneous_frames as $frame) 
-      $p->move_after($frame);
-  }
+        $p->move_after($frame);
+    }
   
   
 }

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

Indentation +172 added lines, -173 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: block_frame_reflower.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -46,17 +45,17 @@ 
  * @package dompdf
  */
 class Block_Frame_Reflower extends Frame_Reflower {
-  const MIN_JUSTIFY_WIDTH = 0.80;  // (Minimum line width to justify, as
-                                   // fraction of available width)
+    const MIN_JUSTIFY_WIDTH = 0.80;  // (Minimum line width to justify, as
+                                    // fraction of available width)
 
-  function __construct(Block_Frame_Decorator $frame) { parent::__construct($frame); }
+    function __construct(Block_Frame_Decorator $frame) { parent::__construct($frame); }
 
-  //........................................................................
+    //........................................................................
 
-  // Calculate the ideal used value for the width property as per:
-  // http://www.w3.org/TR/CSS21/visudet.html#Computing_widths_and_margins
+    // Calculate the ideal used value for the width property as per:
+    // http://www.w3.org/TR/CSS21/visudet.html#Computing_widths_and_margins
 
-  protected function _calculate_width($width) {
+    protected function _calculate_width($width) {
     $style = $this->_frame->get_style();
     $w = $this->_frame->get_containing_block("w");
 
@@ -68,20 +67,20 @@ 
     
     // Handle 'auto' values
     $dims = array($style->border_left_width,
-                  $style->border_right_width,
-                  $style->padding_left,
-                  $style->padding_right,
-                  $width !== "auto" ? $width : 0,
-                  $rm !== "auto" ? $rm : 0,
-                  $lm !== "auto" ? $lm : 0);
+                    $style->border_right_width,
+                    $style->padding_left,
+                    $style->padding_right,
+                    $width !== "auto" ? $width : 0,
+                    $rm !== "auto" ? $rm : 0,
+                    $lm !== "auto" ? $lm : 0);
 
     // absolutely positioned boxes take the 'left' and 'right' properties into account
     if ( $style->position === "absolute" || $style->position === "fixed" ) {
-      $absolute = true;
-      $dims[] = $left !== "auto" ? $left : 0;
-      $dims[] = $right !== "auto" ? $right : 0;
+        $absolute = true;
+        $dims[] = $left !== "auto" ? $left : 0;
+        $dims[] = $right !== "auto" ? $right : 0;
     } else {
-      $absolute = false;
+        $absolute = false;
     }
 
     $sum = $style->length_in_pt($dims, $w);
@@ -91,99 +90,99 @@ 
 
     if ( $diff > 0 ) {
 
-      if ( $absolute ) {
+        if ( $absolute ) {
 
         // resolve auto properties: see
         // http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width
 
         if ( $width === "auto" && $left === "auto" && $right === "auto" ) {
 
-          if ( $lm === "auto" )
+            if ( $lm === "auto" )
             $lm = 0;
-          if ( $rm === "auto" )
+            if ( $rm === "auto" )
             $rm = 0;
 
-          // Technically, the width should be "shrink-to-fit" i.e. based on the
-          // preferred width of the content...  a little too costly here as a
-          // special case.  Just get the width to take up the slack:
-          $left = 0;
-          $right = 0;
-          $width = $diff;
+            // Technically, the width should be "shrink-to-fit" i.e. based on the
+            // preferred width of the content...  a little too costly here as a
+            // special case.  Just get the width to take up the slack:
+            $left = 0;
+            $right = 0;
+            $width = $diff;
 
         } else if ( $width === "auto" ) {
 
-          if ( $lm === "auto" )
+            if ( $lm === "auto" )
             $lm = 0;
-          if ( $rm === "auto" )
+            if ( $rm === "auto" )
             $rm = 0;
-          if ( $left === "auto" )
+            if ( $left === "auto" )
             $left = 0;
-          if ( $right === "auto" )
+            if ( $right === "auto" )
             $right = 0;
 
-          $width = $diff;
+            $width = $diff;
 
         } else if ( $left === "auto" ) {
-          if ( $lm === "auto" )
+            if ( $lm === "auto" )
             $lm = 0;
-          if ( $rm === "auto" )
+            if ( $rm === "auto" )
             $rm = 0;
-          if ( $right === "auto" )
+            if ( $right === "auto" )
             $right = 0;
 
-          $left = $diff;
+            $left = $diff;
 
         } else if ( $right === "auto" ) {
 
-          if ( $lm === "auto" )
+            if ( $lm === "auto" )
             $lm = 0;
-          if ( $rm === "auto" )
+            if ( $rm === "auto" )
             $rm = 0;
 
-          $right = $diff;
+            $right = $diff;
         }
 
-      } else {
+        } else {
 
         // Find auto properties and get them to take up the slack
         if ( $width === "auto" )
-          $width = $diff;
+            $width = $diff;
 
         else if ( $lm === "auto" && $rm === "auto" )
-          $lm = $rm = round($diff / 2);
+            $lm = $rm = round($diff / 2);
 
         else if ( $lm === "auto" )
-          $lm = $diff;
+            $lm = $diff;
 
         else if ( $rm === "auto" )
-          $rm = $diff;
-      }
+            $rm = $diff;
+        }
 
     } else if ($diff < 0) {
 
-      // We are over constrained--set margin-right to the difference
-      $rm = $diff;
+        // We are over constrained--set margin-right to the difference
+        $rm = $diff;
 
     }
 
     $ret = array("width"=> $width, "margin_left" => $lm, "margin_right" => $rm, "left" => $left, "right" => $right);
 
     return $ret;
-  }
+    }
 
-  // Call the above function, but resolve max/min widths
-  protected function _calculate_restricted_width() {
+    // Call the above function, but resolve max/min widths
+    protected function _calculate_restricted_width() {
     $style = $this->_frame->get_style();
     $cb = $this->_frame->get_containing_block();
 
     if ( !isset($cb["w"]) )
-      throw new DOMPDF_Exception("Box property calculation requires containing block width");
+        throw new DOMPDF_Exception("Box property calculation requires containing block width");
 
     // Treat width 100% as auto
     if ( $style->width === "100%" )
-      $width = "auto";
+        $width = "auto";
     else
-      $width = $style->length_in_pt($style->width, $cb["w"]);
+        $width = $style->length_in_pt($style->width, $cb["w"]);
 
     extract($this->_calculate_width($width));
 
@@ -192,37 +191,37 @@ 
     $max_width = $style->length_in_pt($style->max_width, $cb["w"]);
 
     if ( $max_width !== "none" && $min_width > $max_width)
-      // Swap 'em
-      list($max_width, $min_width) = array($min_width, $max_width);
+        // Swap 'em
+        list($max_width, $min_width) = array($min_width, $max_width);
 
     if ( $max_width !== "none" && $width > $max_width )
-      extract($this->_calculate_width($max_width));
+        extract($this->_calculate_width($max_width));
 
     if ( $width < $min_width )
-      extract($this->_calculate_width($min_width));
+        extract($this->_calculate_width($min_width));
 
     return array($width, $margin_left, $margin_right, $left, $right);
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  // Determine the unrestricted height of content within the block
-  protected function _calculate_content_height() {
+    // Determine the unrestricted height of content within the block
+    protected function _calculate_content_height() {
 
     // Calculate the actual height
     $height = 0;
     
     // Add the height of all lines
     foreach ($this->_frame->get_lines() as $line)
-      $height += $line["h"];
+        $height += $line["h"];
 
     return $height;
 
-  }
+    }
 
-  // Determine the frame's restricted height
-  protected function _calculate_restricted_height() {
+    // Determine the frame's restricted height
+    protected function _calculate_restricted_height() {
     $style = $this->_frame->get_style();
     $content_height = $this->_calculate_content_height();
     $cb = $this->_frame->get_containing_block();
@@ -237,9 +236,9 @@ 
 
     if ( $style->position === "absolute" || $style->position === "fixed" ) {
 
-      // see http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-height
+        // see http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-height
 
-      $dims = array($top !== "auto" ? $top : 0,
+        $dims = array($top !== "auto" ? $top : 0,
                     $style->margin_top !== "auto" ? $style->margin_top : 0,
                     $style->padding_top,
                     $style->border_top_width,
@@ -249,153 +248,153 @@ 
                     $style->margin_bottom !== "auto" ? $style->margin_bottom : 0,
                     $bottom !== "auto" ? $bottom : 0);
 
-      $sum = $style->length_in_pt($dims, $cb["h"]);
+        $sum = $style->length_in_pt($dims, $cb["h"]);
 
-      $diff = $cb["h"] - $sum; 
+        $diff = $cb["h"] - $sum; 
 
-      if ( $diff > 0 ) {
+        if ( $diff > 0 ) {
 
         if ( $height === "auto" && $top === "auto" && $bottom === "auto" ) {
 
-          if ( $margin_top === "auto" ) 
+            if ( $margin_top === "auto" ) 
             $margin_top = 0;
-          if ( $margin_bottom === "auto" )
+            if ( $margin_bottom === "auto" )
             $margin_bottom = 0;
 
-          $height = $diff;
+            $height = $diff;
 
         } else if ( $height === "auto" && $top === "auto" ) {
 
-          if ( $margin_top === "auto" ) 
+            if ( $margin_top === "auto" ) 
             $margin_top = 0;
-          if ( $margin_bottom === "auto" )
+            if ( $margin_bottom === "auto" )
             $margin_bottom = 0;
 
-          $height = $content_height;
-          $top = $diff - $content_height;
+            $height = $content_height;
+            $top = $diff - $content_height;
 
         } else if ( $height === "auto" && $bottom === "auto" ) {
 
-          if ( $margin_top === "auto" ) 
+            if ( $margin_top === "auto" ) 
             $margin_top = 0;
-          if ( $margin_bottom === "auto" )
+            if ( $margin_bottom === "auto" )
             $margin_bottom = 0;
 
-          $height = $content_height;
-          $bottom = $diff - $content_height;
+            $height = $content_height;
+            $bottom = $diff - $content_height;
 
         } else if ( $top === "auto" && $bottom === "auto" ) {
 
-          if ( $margin_top === "auto" ) 
+            if ( $margin_top === "auto" ) 
             $margin_top = 0;
-          if ( $margin_bottom === "auto" )
+            if ( $margin_bottom === "auto" )
             $margin_bottom = 0;
 
-          $bottom = $diff;
+            $bottom = $diff;
 
         } else if ( $top === "auto" ) {
 
-          if ( $margin_top === "auto" ) 
+            if ( $margin_top === "auto" ) 
             $margin_top = 0;
-          if ( $margin_bottom === "auto" )
+            if ( $margin_bottom === "auto" )
             $margin_bottom = 0;
 
-          $top = $diff;
+            $top = $diff;
 
         } else if ( $height === "auto" ) {
 
-          if ( $margin_top === "auto" ) 
+            if ( $margin_top === "auto" ) 
             $margin_top = 0;
-          if ( $margin_bottom === "auto" )
+            if ( $margin_bottom === "auto" )
             $margin_bottom = 0;
 
-          $height = $diff;
+            $height = $diff;
 
         } else if ( $bottom === "auto" ) {
 
-          if ( $margin_top === "auto" ) 
+            if ( $margin_top === "auto" ) 
             $margin_top = 0;
-          if ( $margin_bottom === "auto" )
+            if ( $margin_bottom === "auto" )
             $margin_bottom = 0;
 
-          $bottom = $diff;
+            $bottom = $diff;
 
         } else {
 
-          if ( $style->overflow === "visible" ) {
+            if ( $style->overflow === "visible" ) {
 
             // set all autos to zero
             if ( $margin_top === "auto" ) 
-              $margin_top = 0;
+                $margin_top = 0;
             if ( $margin_bottom === "auto" )
-              $margin_bottom = 0;
+                $margin_bottom = 0;
             if ( $top === "auto" )
-              $top = 0;
+                $top = 0;
             if ( $bottom === "auto" )
-              $bottom = 0;
+                $bottom = 0;
             if ( $height === "auto" )
-              $height = $content_height;
+                $height = $content_height;
 
-          }
+            }
 
-          // FIXME: overflow hidden
+            // FIXME: overflow hidden
         }
 
-      }
+        }
 
     } else {
 
-      // Expand the height if overflow is visible
-      if ( $height == "auto" && $content_height > $height && $style->overflow === "visible" )
+        // Expand the height if overflow is visible
+        if ( $height == "auto" && $content_height > $height && $style->overflow === "visible" )
         $height = $content_height;
 
-      // FIXME: this should probably be moved to a seperate function as per
-      // _calculate_restricted_width
+        // FIXME: this should probably be moved to a seperate function as per
+        // _calculate_restricted_width
       
-      // Only handle min/max height if the height is independent of the frame's content
-      if ( !($style->overflow === "visible" ||
+        // Only handle min/max height if the height is independent of the frame's content
+        if ( !($style->overflow === "visible" ||
              ($style->overflow === "hidden" && $height === "auto")) ) {
 
         $min_height = $style->min_height;
         $max_height = $style->max_height;
 
         if ( isset($cb["h"]) ) {
-          $min_height = $style->length_in_pt($min_height, $cb["h"]);
-          $max_height = $style->length_in_pt($max_height, $cb["h"]);
+            $min_height = $style->length_in_pt($min_height, $cb["h"]);
+            $max_height = $style->length_in_pt($max_height, $cb["h"]);
 
         } else if ( isset($cb["w"]) ) {
 
-          if ( mb_strpos($min_height, "%") !== false )
+            if ( mb_strpos($min_height, "%") !== false )
             $min_height = 0;
-          else
+            else
             $min_height = $style->length_in_pt($min_height, $cb["w"]);
 
-          if ( mb_strpos($max_height, "%") !== false )
+            if ( mb_strpos($max_height, "%") !== false )
             $max_height = "none";
-          else
+            else
             $max_height = $style->length_in_pt($max_height, $cb["w"]);
         }
 
         if ( $max_height !== "none" && $min_height > $max_height )
-          // Swap 'em
-          list($max_height, $min_height) = array($min_height, $max_height);
+            // Swap 'em
+            list($max_height, $min_height) = array($min_height, $max_height);
 
         if ( $max_height !== "none" && $height > $max_height )
-          $height = $max_height;
+            $height = $max_height;
 
         if ( $height < $min_height )
-          $height = $min_height;
-      }
+            $height = $min_height;
+        }
 
     }
 
     return array($height, $margin_top, $margin_bottom, $top, $bottom);
 
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
-  protected function _text_align() {
+    protected function _text_align() {
     $style = $this->_frame->get_style();
     $w = $this->_frame->get_containing_block("w");
     $width = $style->length_in_pt($style->width, $w);
@@ -414,10 +413,10 @@ 
         // Move each child over by $dx
         $dx = $width - $line["w"];
         foreach($line["frames"] as $frame)
-          $frame->set_position( $frame->get_position("x") + $dx );
+            $frame->set_position( $frame->get_position("x") + $dx );
 
-      }
-      break;
+        }
+        break;
 
 
     case "justify":
@@ -426,28 +425,28 @@ 
         // Only set the spacing if the line is long enough.  This is really
         // just an aesthetic choice ;)
         if ( $line["w"] > self::MIN_JUSTIFY_WIDTH * $width ) {
-          // Set the spacing for each child
-          if ( $line["wc"] > 1 )
+            // Set the spacing for each child
+            if ( $line["wc"] > 1 )
             $spacing = ($width - $line["w"]) / ($line["wc"] - 1);
-          else
+            else
             $spacing = 0;
 
-          $dx = 0;
-          foreach($line["frames"] as $frame) {
+            $dx = 0;
+            foreach($line["frames"] as $frame) {
             if ( !$frame instanceof Text_Frame_Decorator )
-              continue;
+                continue;
 
             $frame->set_position( $frame->get_position("x") + $dx );
             $frame->set_text_spacing($spacing);
             $dx += mb_substr_count($frame->get_text(), " ") * $spacing;
-          }
+            }
 
-          // The line (should) now occupy the entire width
-          $this->_frame->set_line($i, null, $width);
+            // The line (should) now occupy the entire width
+            $this->_frame->set_line($i, null, $width);
 
         }
-      }
-      break;
+        }
+        break;
 
     case "center":
     case "centre":
@@ -455,24 +454,24 @@ 
         // Centre each line by moving each frame in the line by:
         $dx = ($width - $line["w"]) / 2;
         foreach ($line["frames"] as $frame)
-          $frame->set_position( $frame->get_position("x") + $dx );
-      }
-      break;
+            $frame->set_position( $frame->get_position("x") + $dx );
+        }
+        break;
     }
 
-  }
-  /**
-   * Align inline children vertically
-   */
-  function vertical_align() {
+    }
+    /**
+     * Align inline children vertically
+     */
+    function vertical_align() {
     // Align each child vertically after each line is reflowed
     foreach ( $this->_frame->get_lines() as $i => $line ) {
 
-      foreach ( $line["frames"] as $frame ) {
+        foreach ( $line["frames"] as $frame ) {
         $style = $frame->get_style();
 
         if ( $style->display !== "inline" && $style->display !== "text" )
-          continue;
+            continue;
 
         $align = $style->vertical_align;
 
@@ -482,41 +481,41 @@ 
 
         case "baseline":
           $y = $line["y"] + $line["h"] - $frame_h;
-          break;
+            break;
 
         case "middle":
           $y = $line["y"] + ($line["h"] + $frame_h) / 2;
-          break;
+            break;
 
         case "sub":
           $y = $line["y"] + 0.9 * $line["h"];
-          break;
+            break;
 
         case "super":
           $y = $line["y"] + 0.1 * $line["h"];
-          break;
+            break;
 
         case  "text-top":
         case "top": // Not strictly accurate, but good enough for now
           $y = $line["y"];
-          break;
+            break;
 
         case "text-bottom":
         case "bottom":
           $y = $line["y"] + $line["h"] - $frame_h;
-          break;
+            break;
         }
 
         $x = $frame->get_position("x");
         $frame->set_position($x, $y);
 
-      }
+        }
+    }
     }
-  }
 
-  //........................................................................
+    //........................................................................
 
-  function reflow() {
+    function reflow() {
 
     // Check if a page break is forced
     $page = $this->_frame->get_root();
@@ -524,7 +523,7 @@ 
 
     // Bail if the page is full
     if ( $page->is_full() )
-      return;
+        return;
 
     // Collapse margins if required
     $this->_collapse_margins();
@@ -553,12 +552,12 @@ 
 
     // Determine the content edge
     $top = $style->length_in_pt(array($style->margin_top,
-                                      $style->padding_top,
-                                      $style->border_top_width), $cb["h"]);
+                                        $style->padding_top,
+                                        $style->border_top_width), $cb["h"]);
 
     $bottom = $style->length_in_pt(array($style->border_bottom_width,
-                                         $style->margin_bottom,
-                                         $style->padding_bottom), $cb["h"]);
+                                            $style->margin_bottom,
+                                            $style->padding_bottom), $cb["h"]);
 
     $cb_x = $x + $left_margin +
       $style->length_in_pt($style->border_left_width, $cb["w"]) +
@@ -574,23 +573,23 @@ 
     // Set the containing blocks and reflow each child
     foreach ( $this->_frame->get_children() as $child ) {
 
-      // Bail out if the page is full
-      if ( $page->is_full() )
+        // Bail out if the page is full
+        if ( $page->is_full() )
         break;
       
-      $child->set_containing_block($cb_x, $cb_y, $w, $cb_h);
-      $child->reflow();
+        $child->set_containing_block($cb_x, $cb_y, $w, $cb_h);
+        $child->reflow();
 
-      // Don't add the child to the line if a page break has occurred
-      if ( $page->check_page_break($child) )
+        // Don't add the child to the line if a page break has occurred
+        if ( $page->check_page_break($child) )
         break;
 
-      // If the frame is not absolutely positioned, It's okay to add the frame
-      // to the line
-      if ( $child->get_style()->position !== "absolute" &&
+        // If the frame is not absolutely positioned, It's okay to add the frame
+        // to the line
+        if ( $child->get_style()->position !== "absolute" &&
            $child->get_style()->position !== "fixed" ) {
         $this->_frame->add_frame_to_line( $child );
-      }
+        }
     }
 
     // Determine our height
@@ -604,8 +603,8 @@ 
     $this->_text_align();
 
     $this->vertical_align();
-  }
+    }
 
-  //........................................................................
+    //........................................................................
 
 }

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

Indentation +6 added lines, -7 removed lines

@@ -34,7 +34,6 @@ 
  * @copyright 2004 Benj Carson
  * @author Benj Carson <benjcarson@digitaljunkies.ca>
  * @package dompdf
-
  */
 
 /* $Id: list_bullet_frame_reflower.cls.php 216 2010-03-11 22:49:18Z ryan.masten $ */
@@ -47,20 +46,20 @@ 
  */
 class List_Bullet_Frame_Reflower extends Frame_Reflower {
 
-  function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
+    function __construct(Frame_Decorator $frame) { parent::__construct($frame); }
     
-  //........................................................................
+    //........................................................................
 
-  function reflow() {
+    function reflow() {
     $style = $this->_frame->get_style();
 
     $style->width = $this->_frame->get_width();
     $this->_frame->position();
 
     if ( $style->list_style_position === "inside" ) {
-      $p = $this->_frame->find_block_parent();
-      $p->add_frame_to_line($this->_frame);
+        $p = $this->_frame->find_block_parent();
+        $p->add_frame_to_line($this->_frame);
     }
 
-  }
+    }
 }