# This patch file was generated by NetBeans IDE
--
# Following Index: paths are relative to: C:\Users\john\Documents\dev\dompdf\dompdf\include
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: block_frame_reflower.cls.php
--- block_frame_reflower.cls.php Base (BASE)
+++ block_frame_reflower.cls.php Locally Modified (Based On LOCAL)
@@ -224,7 +224,7 @@
* Determine the frame's restricted height
* @return array
*/
-  protected function _calculate_restricted_height() {
+  protected function _calculate_height() {
$frame = $this->_frame;
$style = $frame->get_style();
$content_height = $this->_calculate_content_height();
@@ -349,49 +349,12 @@
} else {
 
// Expand the height if overflow is visible
-      if ( $height === "auto" && $content_height > $height /* && $style->overflow === "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
-
-      // 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"]);
-
-        } else if ( isset($cb["w"]) ) {
-
-          if ( mb_strpos($min_height, "%") !== false )
-            $min_height = 0;
-          else
-            $min_height = $style->length_in_pt($min_height, $cb["w"]);
-
-          if ( mb_strpos($max_height, "%") !== false )
-            $max_height = "none";
-          else
-            $max_height = $style->length_in_pt($max_height, $cb["w"]);
+	  $height = $this->_calculate_restricted_height($height);
}
 
-        if ( $max_height !== "none" && $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;
-
-        if ( $height < $min_height )
-          $height = $min_height;
-      }
-
-    }
-
return array($height, $margin_top, $margin_bottom, $top, $bottom);
 
}
@@ -737,7 +700,7 @@
}
 
// Determine our height
-    list($height, $margin_top, $margin_bottom, $top, $bottom) = $this->_calculate_restricted_height();
+    list($height, $margin_top, $margin_bottom, $top, $bottom) = $this->_calculate_height();
$style->height = $height;
$style->margin_top = $margin_top;
$style->margin_bottom = $margin_bottom;

# This patch file was generated by NetBeans IDE
--
# Following Index: paths are relative to: C:\Users\john\Documents\dev\dompdf\dompdf\include
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: frame_reflower.cls.php
--- frame_reflower.cls.php Base (BASE)
+++ frame_reflower.cls.php Locally Modified (Based On LOCAL)
@@ -411,4 +411,55 @@
$frame->append_child($new_frame);
}
}
+
+  /*
+   * modify height based on max_heigh and min_height
+   * http://www.w3.org/TR/CSS21/visudet.html#min-max-heights
+   *
+   * @param mixed height
+   *
+   * @return corrected height
+   */
+  protected function _calculate_restricted_height($height){
+    $frame = $this->_frame;
+    $style = $frame->get_style();
+    $cb = $frame->get_containing_block();
+
+    if ( isset($cb["h"]) ) {
+      $min_height = $style->length_in_pt($style->min_height, $cb["h"]);
+      $max_height = $style->length_in_pt($style->max_height, $cb["h"]);
+    } else {
+      /* The percentage is calculated with respect to the height of the generated box's containing block.
+       * If the height of the containing block is not specified explicitly
+       * (i.e., it depends on content height), and this element is not absolutely positioned,
+       * the percentage value is treated as '0' (for 'min-height') or 'none' (for 'max-height').
+       */
+      if ( mb_strpos($min_height, "%") !== false ){
+        $min_height = 0;
+      } else {
+        $min_height = $style->length_in_pt($style->min_height);
}
+
+      if ( mb_strpos($max_height, "%") !== false ) {
+        $max_height = "none";
+      } else {
+        $max_height = $style->length_in_pt($style->max_height);
+      }
+    }
+
+    //values cannot be negative
+    if ($min_height < 0 ) $min_height = 0;
+    if ($max_height < 0 ) $max_height = "none";
+
+    // Only handle max height if the height is independent of the frame's content
+    if ( $max_height !== "none" && $height > $max_height && $style->overflow !== "visible" )
+      $height = $max_height;
+
+    if ( $height < $min_height )
+      $height = $min_height;
+
+    return $height;
+
+  }
+
+}