Skip to content

Clean up page/document arguments as page already has access to the document #482

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

Merged
PrinsFrank merged 1 commit into from
Jul 24, 2026
+10 −12
Merged

Clean up page/document arguments as page already has access to the document #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 6 additions & 7 deletions src/Document/ContentStream/PositionedText/PositionedTextElement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace PrinsFrank\PdfParser\Document\ContentStream\PositionedText;

use PrinsFrank\PdfParser\Document\ContentStream\PositionedText\TextSegment\TextSegment;
use PrinsFrank\PdfParser\Document\Document;
use PrinsFrank\PdfParser\Document\Object\Decorator\Font;
use PrinsFrank\PdfParser\Document\Object\Decorator\Page;
use PrinsFrank\PdfParser\Exception\ParseFailureException;
Expand All @@ -18,18 +17,18 @@ public function __construct(
public TextState $textState,
) {}

public function getFont(Document $document, Page $page): Font {
public function getFont(Page $page): Font {
if ($this->textState->fontName === null) {
throw new ParseFailureException('Unable to locate font for text element');
}

return $page->getFontDictionary()?->getObjectForReference($document, $this->textState->fontName, Font::class)
return $page->getFontDictionary()?->getObjectForReference($page->document, $this->textState->fontName, Font::class)
?? throw new ParseFailureException(sprintf('Unable to locate font with reference "/%s"', $this->textState->fontName->value));
}

/** @throws ParseFailureException */
public function getText(Document $document, Page $page): string {
$font = $this->getFont($document, $page);
public function getText(Page $page): string {
$font = $this->getFont($page);
$differences = $font->getDifferences();
$encoding = $font->getEncoding();
$toUnicodeCMap = $font->getToUnicodeCMap() ?? $font->getToUnicodeCMapDescendantFont();
Expand Down Expand Up @@ -76,8 +75,8 @@ public function getHeight(): float {
*
* Reconstructed here because Tj/TJ do not advance the text matrix in this parser.
*/
public function getAdvanceWidth(Document $document, Page $page): float {
$font = $this->getFont($document, $page);
public function getAdvanceWidth(Page $page): float {
$font = $this->getFont($page);
$scaleX = $this->absoluteMatrix->scaleX;
$fontSize = $this->textState->getFontSize();

Expand Down
2 changes: 1 addition & 1 deletion src/Document/Object/Decorator/Page.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public function getPositionedTextElements(): array {

/** @throws PdfParserException */
public function getText(): string {
return TextExtractor::extractText($this->getPositionedTextElements(), $this->document, $this);
return TextExtractor::extractText($this->getPositionedTextElements(), $this);
}

/** @throws PdfParserException */
Expand Down
7 changes: 3 additions & 4 deletions src/Extraction/Text/TextExtractor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace PrinsFrank\PdfParser\Extraction\Text;

use PrinsFrank\PdfParser\Document\ContentStream\PositionedText\PositionedTextElement;
use PrinsFrank\PdfParser\Document\Document;
use PrinsFrank\PdfParser\Document\Object\Decorator\Page;
use PrinsFrank\PdfParser\Exception\PdfParserException;
use PrinsFrank\PdfParser\Extraction\Text\TextGrouping\LineGrouping\TextOverlapStrategy;
Expand All @@ -13,7 +12,7 @@ class TextExtractor {
* @param list<PositionedTextElement> $positionedTextElements
* @throws PdfParserException
*/
public static function extractText(array $positionedTextElements, Document $document, Page $page): string {
public static function extractText(array $positionedTextElements, Page $page): string {
$lineGroupedElements = TextOverlapStrategy::group($positionedTextElements);

$text = '';
Expand All @@ -24,7 +23,7 @@ public static function extractText(array $positionedTextElements, Document $docu

$previousTextElementOnLine = null;
foreach ($positionedTextElementsForLine as $positionedTextElement) {
$elementText = $positionedTextElement->getText($document, $page);
$elementText = $positionedTextElement->getText($page);
if ($elementText === '') {
$previousTextElementOnLine = $positionedTextElement;
continue;
Expand All @@ -33,7 +32,7 @@ public static function extractText(array $positionedTextElements, Document $docu
if ($previousTextElementOnLine !== null) {
$gap = $positionedTextElement->absoluteMatrix->offsetX
- $previousTextElementOnLine->absoluteMatrix->offsetX
- $previousTextElementOnLine->getAdvanceWidth($document, $page);
- $previousTextElementOnLine->getAdvanceWidth($page);

$wordBreakThreshold = $previousTextElementOnLine->textState->getFontSize()
* $previousTextElementOnLine->absoluteMatrix->scaleX
Expand Down
Loading