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

Fix issue #387 #401

Merged
merged 2 commits into from
Mar 25, 2021
Merged

Fix issue #387 #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
594a650
Fix issue #387
Mar 9, 2021
7630338
Fix CS Rules
Mar 9, 2021
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
19 changes: 17 additions & 2 deletions src/Smalot/PdfParser/PDFObject.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,8 @@ public function getSectionsText($content)
$textCleaned = $this->cleanContent($content, '_');

// Extract text blocks.
if (preg_match_all('/\s+BT[\s|\(|\[]+(.*?)\s*ET/s', $textCleaned, $matches, \PREG_OFFSET_CAPTURE)) {
foreach ($matches[1] as $part) {
if (preg_match_all('/(\sQ)?\s+BT[\s|\(|\[]+(.*?)\s*ET(\sq)?/s', $textCleaned, $matches, \PREG_OFFSET_CAPTURE)) {
foreach ($matches[2] as $pos => $part) {
$text = $part[0];
if ('' === $text) {
continue;
Expand All @@ -224,6 +224,10 @@ public function getSectionsText($content)
// Removes BDC and EMC markup.
$section = preg_replace('/(\/[A-Za-z0-9]+\s*<<.*?)(>>\s*BDC)(.*?)(EMC\s+)/s', '${3}', $section.' ');

// Add Q and q flags if detected around BT/ET.
// @see: https://github.com/smalot/pdfparser/issues/387
$section = trim((!empty($matches[1][$pos][0]) ? "Q\n" : '').$section).(!empty($matches[3][$pos][0]) ? "\nq" : '');

$sections[] = $section;
}
}
Expand Down Expand Up @@ -270,6 +274,7 @@ public function getText(Page $page = null)
$text = '';
$sections = $this->getSectionsText($this->content);
$current_font = $this->getDefaultFont($page);
$clipped_font = $current_font;

$current_position_td = ['x' => false, 'y' => false];
$current_position_tm = ['x' => false, 'y' => false];
Expand Down Expand Up @@ -333,6 +338,16 @@ public function getText(Page $page = null)
}
break;

case 'Q':
// Use clip: restore font.
$current_font = $clipped_font;
break;

case 'q':
// Use clip: save font.
$clipped_font = $current_font;
break;

case "'":
case 'Tj':
$command[self::COMMAND] = [$command];
Expand Down
5 changes: 5 additions & 0 deletions src/Smalot/PdfParser/Page.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,7 @@ public function extractDecodedRawData($extractedRawData = null)
$extractedRawData = $this->extractRawData();
}
$currentFont = null;
$clippedFont = null;
foreach ($extractedRawData as &$command) {
if ('Tj' == $command['o'] || 'TJ' == $command['o']) {
$data = $command['c'];
Expand Down Expand Up @@ -382,6 +383,10 @@ public function extractDecodedRawData($extractedRawData = null)
$fontId = explode(' ', $command['c'])[0];
$currentFont = $this->getFont($fontId);
continue;
} elseif ('Q' == $command['o']) {
$currentFont = $clippedFont;
} elseif ('q' == $command['o']) {
$clippedFont = $currentFont;
}
}

Expand Down
3 changes: 2 additions & 1 deletion tests/Integration/PDFObjectTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,8 @@ public function testGetSectionText()
EMC
(ABC) Tj

[ (a)-4.5(b) 6(c)8.8 ( fsdfsdfsdf[ sd) ] TD ', '/TT1 1.5 Tf (BT )Tj '],
[ (a)-4.5(b) 6(c)8.8 ( fsdfsdfsdf[ sd) ] TD', '/TT1 1.5 Tf (BT )Tj
q'],
$sections
);
}
Expand Down