Report additions

app/Gedcom.php

@@ -594,8 +594,8 @@
             'INDI:BARM:DATE'             => new DateValue(I18N::translate('Date of bar mitzvah')),
             'INDI:BARM:PLAC'             => new PlaceName(I18N::translate('Place of bar mitzvah')),
             'INDI:BASM'                  => new BasMitzvah(I18N::translate('Bat mitzvah')),
-            'INDI:BASM:DATE'             => new DateValue(I18N::translate('Date of bat mitzvah')),
-            'INDI:BASM:PLAC'             => new PlaceName(I18N::translate('Place of bat mitzvah')),
+            'INDI:BASM:DATE'             => new BasMitzvah(I18N::translate('Date of bat mitzvah')),
+            'INDI:BASM:PLAC'             => new DateValue(I18N::translate('Place of bat mitzvah')),
             'INDI:BIRT'                  => new Birth(I18N::translate('Birth')),
             'INDI:BIRT:DATE'             => new DateValue(I18N::translate('Date of birth')),
             'INDI:BIRT:FAMC'             => new XrefFamily(I18N::translate('Birth parents')),

app/Report/HtmlRenderer.php

@@ -169,7 +169,7 @@ public function run(): void
         //-- header divider
         echo '</style>', PHP_EOL;
         echo '<div id="headermargin" style="position: relative; top: auto; height: ', $this->header_margin, 'pt; width: ', $this->noMarginWidth, 'pt;"></div>';
-        echo '<div id="headerdiv" style="position: relative; top: auto; width: ', $this->noMarginWidth, 'pt;">';
+        echo '<div id="headerdiv" style="position: relative; top: auto; width: ', $this->noMarginWidth, 'pt;margin-bottom:10pt;text-align:center;">';
         foreach ($this->headerElements as $element) {
             if ($element instanceof ReportBaseElement) {
                 $element->render($this);
@@ -196,9 +196,8 @@ public function run(): void
         }
         //-- footer
         echo '</div>';
-        echo '<script>document.getElementById("bodydiv").style.height="', $this->maxY, 'pt";</script>';
-        echo '<div id="bottommargin" style="position: relative; top: auto; height: ', $this->bottom_margin - $this->footer_margin, 'pt;width:', $this->noMarginWidth, 'pt;"></div>';
-        echo '<div id="footerdiv" style="position: relative; top: auto; width: ', $this->noMarginWidth, 'pt;height:auto;">';
+        echo '<div id="bottommargin" style="position: relative; z-index: -1; top: ' . $this->Y . 'pt; height: ', $this->bottom_margin - $this->footer_margin, 'pt;width:', $this->noMarginWidth, 'pt;"></div>';
+        echo '<div id="footerdiv" style="position: relative; top: ' . $this->Y . 'pt; width: ', $this->noMarginWidth, 'pt;height:auto;">';
         $this->Y    = 0;
         $this->X    = 0;
         $this->maxY = 0;
@@ -212,8 +211,12 @@ public function run(): void
             }
         }
         echo '</div>';
-        echo '<script>document.getElementById("footerdiv").style.height="', $this->maxY, 'pt";</script>';
-        echo '<div id="footermargin" style="position: relative; top: auto; height: ', $this->footer_margin, 'pt;width:', $this->noMarginWidth, 'pt;"></div>';
+        if ($this->show_generated_by) {
+            echo '<script>document.getElementsByClassName("genby")[0].style.height="15pt";';
+            echo 'document.getElementsByClassName("date")[0].style.top="15pt";';
+            echo '</script>';
+        }
+        echo '<div id="footermargin" style="position: relative; z-index: -1; top: auto; height: ', $this->footer_margin, 'pt;width:', $this->noMarginWidth, 'pt;"></div>';
     }
 
     /**
@@ -524,7 +527,9 @@ public function getStringWidth(string $text): float
     {
         $style = $this->getStyle($this->currentStyle);
 
-        return mb_strlen($text) * $style['size'] / 2;
+        // &#x..; is counted as 6 chars, not one. Many such chars will force too early line breaks
+        $txt2 = str_replace(['&#xA0;', '&#x2570;', '&nbsp;', '&mdash;'], ["#", "#", "#", "#"], $text);
+        return mb_strlen($txt2) * ($style['size'] / 2);
     }
 
     /**
@@ -715,10 +720,12 @@ public function write(string $text, string $color = '', bool $useclass = true):
             "\n",
             '> ',
             ' <',
+            "\xA0",
         ], [
             '<br>',
             '>&nbsp;',
             '&nbsp;<',
+            '&nbsp;',
         ], $htmlcode);
         echo $htmlcode;
     }

app/Report/PdfRenderer.php

@@ -74,6 +74,7 @@
      */
     public function header(): void
     {
+        $this->tcpdf->AddPage();
         foreach ($this->headerElements as $element) {
             if ($element instanceof ReportBaseElement) {
                 $element->render($this);
@@ -363,8 +364,8 @@
             'UTF-8',
             self::DISK_CACHE
         );
-
-        $this->tcpdf->setMargins($this->left_margin, $this->top_margin, $this->right_margin);
+        $this->tcpdf->setPrintFooter(true);
+        $this->tcpdf->setMargins($this->left_margin, 55.5 /*$this->top_margin*/, $this->right_margin); // header-height?
         $this->tcpdf->setHeaderMargin($this->header_margin);
         $this->tcpdf->setFooterMargin($this->footer_margin);
         $this->tcpdf->setAutoPageBreak(true, $this->bottom_margin);

app/Report/ReportHtmlText.php

@@ -97,7 +97,11 @@ public function render($renderer, bool $attrib = true): void
      */
     public function getHeight($renderer): float
     {
-        $ct = substr_count($this->text, "\n");
+        $txt2 = $this->text;
+        if (substr($txt2, -1) == "\n") {
+            $txt2 = substr($txt2, 0, -1);
+        }
+        $ct = substr_count($txt2, "\n");
         if ($ct > 0) {
             $ct += 1;
         }

app/Report/ReportHtmlTextbox.php

@@ -40,9 +40,10 @@
      */
     public function render($renderer): void
     {
+        static $lastBoxYfinal;
         // checkFootnote
         $newelements      = [];
-        $lastelement      = [];
+        $lastelement      = null;
         $footnote_element = [];
         // Element counter
         $cE = count($this->elements);
@@ -58,22 +59,23 @@
                         }
                         $footnote_element = [];
                     }
-                    if (empty($lastelement)) {
+                    if (!isset($lastelement)) {
                         $lastelement = $element;
-                    } elseif ($element->getStyleName() === $lastelement->getStyleName()) {
-                        // Checking if the Text has the same style
+                    } elseif (($element instanceof ReportBaseText && $lastelement instanceof ReportBaseText) && ($element->getStyleName() === $lastelement->getStyleName())) {
                         $lastelement->addText(str_replace("\n", '<br>', $element->getValue()));
                     } else {
                         $newelements[] = $lastelement;
                         $lastelement   = $element;
                     }
+                } elseif ($element instanceof ReportHtmlImage) {
+                    $lastelement   = $element;
                 } elseif ($element instanceof ReportHtmlFootnote) {
                     // Check if the Footnote has been set with it’s link number
                     $renderer->checkFootnote($element);
                     // Save first the last element if any
-                    if (!empty($lastelement)) {
+                    if (isset($lastelement)) {
                         $newelements[] = $lastelement;
-                        $lastelement   = [];
+                        $lastelement   = null;
                     }
                     // Save the Footnote with it’s link number as key for sorting later
                     $footnote_element[$element->num] = $element;
@@ -86,16 +88,16 @@
                         }
                         $footnote_element = [];
                     }
-                    if (!empty($lastelement)) {
+                    if (isset($lastelement)) {
                         $newelements[] = $lastelement;
-                        $lastelement   = [];
+                        $lastelement   = null;
                     }
                     $newelements[] = $element;
                 }
             } else {
-                if (!empty($lastelement)) {
+                if (isset($lastelement)) {
                     $newelements[] = $lastelement;
-                    $lastelement   = [];
+                    $lastelement   = null;
                 }
                 if (!empty($footnote_element)) {
                     ksort($footnote_element);
@@ -107,7 +109,7 @@
                 $newelements[] = $element;
             }
         }
-        if (!empty($lastelement)) {
+        if (isset($lastelement)) {
             $newelements[] = $lastelement;
         }
         if (!empty($footnote_element)) {
@@ -132,6 +134,19 @@
             $renderer->setX($cX);
         }
         // If current position (top)
+        $align_Y = false;
+        $topstr = "";
+        if ($this->top < -110000) { // pos='abs'
+            $this->top += 222000;
+        }
+        if ($this->top < -10000) { // <= -100000: both pdf and html; -100000 -- -90000: only html
+            $this->top += 90000;  //= ReportBaseElement::CURRENT_POSITION;
+            if ($this->top < -9000) {
+                $this->top += 10000;
+            }
+            $topstr = "top:" . $this->top . "pt;";
+            $align_Y = true;
+        }
         if ($this->top === ReportBaseElement::CURRENT_POSITION) {
             $this->top = $renderer->getY();
         } else {
@@ -192,7 +207,8 @@
         }
 
         // Add up what’s the final height
-        $cH = $this->height;
+        //$cH = $this->height;
+        $cH = 0;
         // If any element exist
         if ($cE > 0) {
             // Check if this is text or some other element, like images
@@ -225,7 +241,12 @@
         $renderer->addMaxY($this->top + $cH);
 
         // Start to print HTML
-        echo '<div style="position:absolute;top:', $this->top, 'pt;';
+        if (!$align_Y) {
+            echo '<div style="position:absolute;top:', $this->top, 'pt;';
+        } else {
+            echo '<div style="position:relative;top:', $this->top, 'pt;';
+        }
+        //echo '<div style="position:relative;';
         // LTR (left) or RTL (right)
         echo $renderer->alignRTL, ':', $cX, 'pt;';
         // Background color
@@ -240,9 +261,17 @@
         // Border setup
         if ($this->border) {
             echo ' border:solid black 1pt;';
-            echo 'width:', $this->width - 1 - $cP * 2, 'pt;height:', $cH - 1, 'pt;';
+            if (!$align_Y) {
+                echo 'width:', $this->width - 1 - $cP * 2, 'pt;height:', $cH - 1, 'pt;';
+            } else {
+                echo 'width:', $this->width - 1 - $cP * 2, 'pt;height:auto;';
+            } // height:',$this->height,'pt;'; //,$topstr;
         } else {
-            echo 'width:', $this->width - $cP * 2, 'pt;height:', $cH, 'pt;';
+            if (!$align_Y) {
+                echo 'width:', $this->width - $cP * 2, 'pt;height:', $cH, 'pt;';
+            } else {
+                echo 'width:', $this->width - $cP * 2, 'pt;height:auto;';
+            } //height:',$this->height,'pt;'; //,$topstr;
         }
         echo '">';
 
@@ -280,5 +309,8 @@
             $renderer->setXy(0, $this->top + $cH + $cP * 2);
             $renderer->lastCellHeight = 0;
         }
+        // This will make images in textboxes to ignore images in previous textboxes
+        // Without this trick the $lastpicbottom in the previos textbox will be used in ReportHtmlImage
+        $renderer->pageN++;
     }
 }