@@ -198,7 +198,8 @@ |
||
198 | 198 | //-- footer |
199 | 199 | echo '</div>'; |
200 | 200 | //echo '<script>document.getElementById("bodydiv").style.height="', $this->maxY, 'pt";</script>'; |
201 | - if ($this->Y < 200) { //heuristic guess! |
|
201 | + if ($this->Y < 200) { |
|
202 | +//heuristic guess! |
|
202 | 203 | echo '<div id="bottommargin" style="position: relative; top: auto; height: ', $this->bottom_margin - $this->footer_margin, 'pt;width:', $this->noMarginWidth, 'pt;"></div>'; |
203 | 204 | echo '<div id="footerdiv" style="position: relative; top: auto; width: ', $this->noMarginWidth, 'pt;height:auto;">'; |
204 | 205 | } else { |
@@ -346,7 +346,7 @@ |
||
346 | 346 | '_MBON', |
347 | 347 | '_NMR', |
348 | 348 | '_SEPR', |
349 | - '_SP_DEAT', // only used internally, not exported to a gedcom file |
|
349 | + '_SP_DEAT', // only used internally, not exported to a gedcom file |
|
350 | 350 | ]; |
351 | 351 | |
352 | 352 | public const CUSTOM_INDIVIDUAL_TAGS = [ |
@@ -1138,7 +1138,7 @@ |
||
1138 | 1138 | $value = str_replace("\n", "<br>", $value); |
1139 | 1139 | //$value = strip_tags(Registry::markdownFactory()->autolink($value, $this->tree), ['br']); |
1140 | 1140 | } |
1141 | - $value = strtr($value, [MarkdownFactory::BREAK => ' ']); |
|
1141 | + $value = strtr($value, [MarkdownFactory::break => ' ']); |
|
1142 | 1142 | } |
1143 | 1143 | |
1144 | 1144 | if (isset($attrs['lcfirst'])) { |
@@ -1021,7 +1021,7 @@ discard block |
||
1021 | 1021 | $this->current_element->addText(I18N::translate('Private')); |
1022 | 1022 | } elseif ($nameselect == 'latest') { |
1023 | 1023 | $tmp = $record->getAllNames(); |
1024 | - $name = strip_tags($tmp[count($tmp) - 1]['full']); |
|
1024 | + $name = strip_tags($tmp[count($tmp) - 1]['full']); |
|
1025 | 1025 | $this->current_element->addText(trim($name)); |
1026 | 1026 | } elseif ($nameselect == 'combined') { |
1027 | 1027 | $tmp = $record->getAllNames(); |
@@ -1102,7 +1102,7 @@ discard block |
||
1102 | 1102 | $value = $this->getGedcomValue($tag, $level, $this->gedrec); |
1103 | 1103 | switch (end($tags)) { |
1104 | 1104 | case 'DATE': |
1105 | - $tmp = new Date($value); |
|
1105 | + $tmp = new Date($value); |
|
1106 | 1106 | $dfmt = "%j %F %Y"; |
1107 | 1107 | if (!empty($attrs['truncate'])) { |
1108 | 1108 | if ($attrs['truncate'] === "d") { |
@@ -1142,7 +1142,7 @@ discard block |
||
1142 | 1142 | |
1143 | 1143 | if (isset($attrs['lcfirst'])) { |
1144 | 1144 | $value = lcfirst($value); |
1145 | - $value = str_replace(["Å","Ä","Ö"], ["å","ä","ö"], $value); |
|
1145 | + $value = str_replace(["Å", "Ä", "Ö"], ["å", "ä", "ö"], $value); |
|
1146 | 1146 | } |
1147 | 1147 | |
1148 | 1148 | if (!empty($attrs['truncate'])) { |
@@ -1026,7 +1026,8 @@ discard block |
||
1026 | 1026 | } elseif ($nameselect == 'combined') { |
1027 | 1027 | $tmp = $record->getAllNames(); |
1028 | 1028 | $name = $tmp[count($tmp) - 1]['full']; |
1029 | - if ($ix1 = strpos($name, '<span class="starredname">')) { // '«' and '»' mark text for underlining |
|
1029 | + if ($ix1 = strpos($name, '<span class="starredname">')) { |
|
1030 | +// '«' and '»' mark text for underlining |
|
1030 | 1031 | $name = substr_replace($name, '«', $ix1, 26); |
1031 | 1032 | $ix1 = strpos($name, '</span>', $ix1); |
1032 | 1033 | $name = substr_replace($name, '»', $ix1, 7); |
@@ -1501,7 +1502,8 @@ discard block |
||
1501 | 1502 | // Resort facts in chronological order, if possible |
1502 | 1503 | $m = count($this->repeats) - 1; |
1503 | 1504 | $prevd = 0; |
1504 | - for ($i = 0; $i <= $m; $i++) { // keep undated events after previous dated event |
|
1505 | + for ($i = 0; $i <= $m; $i++) { |
|
1506 | +// keep undated events after previous dated event |
|
1505 | 1507 | if ($jdarr[$i] === 0) { |
1506 | 1508 | $jdarr[$i] = $prevd; |
1507 | 1509 | } else { |
@@ -1746,7 +1748,8 @@ discard block |
||
1746 | 1748 | } elseif (preg_match('/^I18N::translateContext\(\'(.+)\', *\'(.+)\'\)$/', $value, $match)) { |
1747 | 1749 | $value = I18N::translateContext($match[1], $match[2]); |
1748 | 1750 | } |
1749 | - if (isset($attrs['lcfirst'])) { // set 1st char to lower case |
|
1751 | + if (isset($attrs['lcfirst'])) { |
|
1752 | +// set 1st char to lower case |
|
1750 | 1753 | $value = lcfirst($value); |
1751 | 1754 | } |
1752 | 1755 |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | $lastelement = $element; |
70 | 70 | } |
71 | 71 | } elseif ($element instanceof ReportHtmlImage) { |
72 | - $lastelement = $element; |
|
72 | + $lastelement = $element; |
|
73 | 73 | } elseif ($element instanceof ReportHtmlFootnote) { |
74 | 74 | // Check if the Footnote has been set with it’s link number |
75 | 75 | $renderer->checkFootnote($element); |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | $this->top += 222000; |
142 | 142 | } |
143 | 143 | if ($this->top < -10000) { // <= -100000: both pdf and html; -100000 -- -90000: only html |
144 | - $this->top += 90000; //= ReportBaseElement::CURRENT_POSITION; |
|
144 | + $this->top += 90000; //= ReportBaseElement::CURRENT_POSITION; |
|
145 | 145 | if ($this->top < -9000) { |
146 | 146 | $this->top += 10000; |
147 | 147 | } |
@@ -137,10 +137,12 @@ |
||
137 | 137 | // If current position (top) |
138 | 138 | $align_Y = false; |
139 | 139 | $topstr = ""; |
140 | - if ($this->top < -110000) { // pos='abs' |
|
140 | + if ($this->top < -110000) { |
|
141 | +// pos='abs' |
|
141 | 142 | $this->top += 222000; |
142 | 143 | } |
143 | - if ($this->top < -10000) { // <= -100000: both pdf and html; -100000 -- -90000: only html |
|
144 | + if ($this->top < -10000) { |
|
145 | +// <= -100000: both pdf and html; -100000 -- -90000: only html |
|
144 | 146 | $this->top += 90000; //= ReportBaseElement::CURRENT_POSITION; |
145 | 147 | if ($this->top < -9000) { |
146 | 148 | $this->top += 10000; |
@@ -356,7 +356,7 @@ |
||
356 | 356 | $curr_P = $renderer->tcpdf->getPage(); |
357 | 357 | // New line and some clean up |
358 | 358 | if (!$this->newline) { |
359 | - $renderer->tcpdf->setXY($cX + $cW, $cY); // $curr_Y); |
|
359 | + $renderer->tcpdf->setXY($cX + $cW, $cY); // $curr_Y); |
|
360 | 360 | $renderer->lastCellHeight = $cH; |
361 | 361 | } else { |
362 | 362 | // addMarginX() also updates X |
@@ -139,10 +139,12 @@ |
||
139 | 139 | // If current position (top) |
140 | 140 | $align_Y = false; |
141 | 141 | $curr_P = $renderer->tcpdf->getPage(); |
142 | - if ($this->top < -95000) { // 90000: only html; 100000: both pdf and html |
|
142 | + if ($this->top < -95000) { |
|
143 | +// 90000: only html; 100000: both pdf and html |
|
143 | 144 | $align_Y = true; |
144 | 145 | } |
145 | - if ($this->top < -200000) { // pos="abs" |
|
146 | + if ($this->top < -200000) { |
|
147 | +// pos="abs" |
|
146 | 148 | $this->top += 222000; |
147 | 149 | } else { |
148 | 150 | $this->top = ReportBaseElement::CURRENT_POSITION; |