Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A workaround for #275 and a patch for #416 #417

Closed
wants to merge 4 commits into from
Closed

A workaround for #275 and a patch for #416 #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
54d1c26
Update P.php
u07 Oct 30, 2020
f9ef3b1
Update P.php
u07 Oct 30, 2020
cfd3cb6
Update renderer.php
u07 Oct 30, 2020
12d8d97
A patch for issue #416
u07 Oct 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 28 additions & 24 deletions renderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,34 +149,38 @@ function locallink($hash, $name = null, $returnonly = false) {
$this->doc .= '</a>';
}

/**
* Wrap centered media in a div to center it
*
* @param string $src media ID
* @param string $title descriptive text
* @param string $align left|center|right
* @param int $width width of media in pixel
* @param int $height height of media in pixel
* @param string $cache cache|recache|nocache
* @param bool $render should the media be embedded inline or just linked
* @return string
*/
function _media($src, $title = NULL, $align = NULL, $width = NULL,
$height = NULL, $cache = NULL, $render = true) {

$out = '';
if($align == 'center') {
$out .= '<div align="center" style="text-align: center">';

// Center-align images with their corresponding links
function internalmedia($src, $title = null, $align = null, $width = null,
$height = null, $cache = null, $linking = null, $return = false) {

$out = parent::internalmedia($src, $title, $align, $width, $height, $cache, $linking, true);

if($align == 'center') {
$out = '<div align="center" style="text-align: center">' .$out. '</div>';
}

$out .= parent::_media($src, $title, $align, $width, $height, $cache, $render);

if($align == 'center') {
$out .= '</div>';

if($return) return $out;
else $this->doc .= $out;
}


// Center-align external images with their corresponding links
function externalmedia($src, $title = null, $align = null, $width = null,
$height = null, $cache = null, $linking = null, $return = false) {

$out = parent::externalmedia($src, $title, $align, $width, $height, $cache, $linking, true);

if($align == 'center') {
$out = '<div align="center" style="text-align: center">' .$out. '</div>';
}

if($return) return $out;
else $this->doc .= $out;
}

return $out;
}


/**
* hover info makes no sense in PDFs, so drop acronyms
Expand Down
22 changes: 19 additions & 3 deletions vendor/mpdf/mpdf/src/Tag/P.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,25 @@
<?php

namespace Mpdf\Tag;

class P extends InlineTag
{

public function open($attr, &$ahtml, &$ihtml)
{

class P extends BlockTag
{
parent::open($attr, $ahtml, $ihtml);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change the behavior of P elements for everybody, is that a correct interpretation?
Then you probably fixed this problem by creating an problem at another place?

Another problem is that the library has to be fixed manually on every update of the library. So is there not an alternative approach that solves the issue in a manner that does not need manual fixes of the library each update?

Copy link
Author

@u07 u07 Dec 1, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct. This will make paragraphs inline, as it should be in HTML. That makes pictures float.

I've being using it for a year, works fine on my setup, but sure it requires more different tests. The most questionable thing is that we replace a natural paragraph line break with a BR element which has different stylesheet. For example, slightly bigger top/bottom margins. So, it is a workaround, but it makes things work.

I wish there were something better than patching mpdf. Well... may be we can patch "p" at runtime from the plugin? Can PHP substitute a whole existing class?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do no understand why mpdf would do this, and therefore i do also not know if this change is right.
Changes for mpdf library should be proposed in the https://github.com/mpdf/mpdf repository.


}

public function close(&$ahtml, &$ihtml)
{

parent::close($ahtml, $ihtml);

$this->mpdf->_saveTextBuffer("\n");
$this->mpdf->_saveTextBuffer("\n");

}

}