Revert "Use margin height instead of border height in vertical alignm…

…ent"

This reverts commit 96a9345. It seems
this was not an innocent fix as it seemed to be. Retain the existing
behavior, which unfortunately undoes the small improvement to #1946.

Fixes #2756

src/FrameReflower/Block.php

@@ -599,8 +599,8 @@ function vertical_align()
                         continue;
                     }
 
-                    $marginHeight = $frame->get_margin_height();
-                    $imageHeightDiff = $height * 0.8 - $marginHeight;
+                    $frameBox = $frame->get_border_box();
+                    $imageHeightDiff = $height * 0.8 - $frameBox["h"];
 
                     $align = $frame->get_style()->vertical_align;
                     if (in_array($align, Style::$vertical_align_keywords, true)) {
@@ -635,7 +635,7 @@ function vertical_align()
                                 break;
                         }
                     } else {
-                        $y_offset = $baseline - (float)$style->length_in_pt($align, $style->font_size) - $marginHeight;
+                        $y_offset = $baseline - (float)$style->length_in_pt($align, $style->font_size) - $frameBox["h"];
                     }
                 } else {
                     $parent = $frame->get_parent();