Skip to content

Reuse font instead of reretrieving it #562

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 3 commits into from
Oct 3, 2026
Merged

Reuse font instead of reretrieving it #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f916db4
Pass font to getText method as it's reused later
PrinsFrank Oct 3, 2026
23c0489
Move font retrieval out of PositionedTextElement
PrinsFrank Oct 3, 2026
22fab18
Implement fontCache for text extractior to reuse existing font object…
PrinsFrank Oct 3, 2026
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
16 changes: 3 additions & 13 deletions src/Document/ContentStream/PositionedText/PositionedTextElement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

use PrinsFrank\PdfParser\Document\ContentStream\PositionedText\TextSegment\TextSegment;
use PrinsFrank\PdfParser\Document\Object\Decorator\Font;
use PrinsFrank\PdfParser\Document\Object\Decorator\Page;
use PrinsFrank\PdfParser\Exception\ParseFailureException;

readonly class PositionedTextElement {
Expand All @@ -18,21 +17,12 @@ public function __construct(
public TextState $textState,
) {}

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

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

/** @throws ParseFailureException */
public function getText(Page $page): string {
$font = $this->getFont($page);
public function getText(Font $font): string {
$differences = $font->getDifferences();
$encoding = $font->getEncoding();
$toUnicodeCMap = $font->getToUnicodeCMap() ?? $font->getToUnicodeCMapDescendantFont();
$toUnicodeCMap = $font->getToUnicodeCMap()
?? $font->getToUnicodeCMapDescendantFont();

$text = '';
$previousOffset = null;
Expand Down
12 changes: 9 additions & 3 deletions src/Extraction/MarkdownExtractor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
use PrinsFrank\MarkDownDom\Node\Inline\Text;
use PrinsFrank\PdfParser\Document\ContentStream\PositionedText\PositionedTextElement;
use PrinsFrank\PdfParser\Document\Object\Decorator\Page;
use PrinsFrank\PdfParser\Exception\ParseFailureException;
use PrinsFrank\PdfParser\Exception\PdfParserException;
use PrinsFrank\PdfParser\Extraction\SpaceDetection\SpaceDetector;
use PrinsFrank\PdfParser\Extraction\TextGrouping\LineGrouping\TextOverlapStrategy;
Expand All @@ -25,7 +26,7 @@ class MarkdownExtractor {
public static function extractContent(array $positionedTextElements, Page $page): Document {
$lineGroupedElements = TextOverlapStrategy::group($positionedTextElements);

$blockNodes = $inLineNodes = [];
$blockNodes = $inLineNodes = $fontCache = [];
$textBuffer = '';
$previousElementIsBold = $previousElementIsItalic = false;
$previousHeadingLevel = null;
Expand All @@ -48,8 +49,13 @@ public static function extractContent(array $positionedTextElements, Page $page)
$previousFontOnLine = null;
$previousTextElementEndsWithSpace = false;
foreach ($positionedTextElementsForLine as $positionedTextElement) {
$elementText = $positionedTextElement->getText($page);
$font = $positionedTextElement->getFont($page);
if ($positionedTextElement->textState->fontName === null) {
throw new ParseFailureException('Unable to locate font');
}

$font = $fontCache[$positionedTextElement->textState->fontName->value] ??= $page->getFont($positionedTextElement->textState->fontName)
?? throw new ParseFailureException(sprintf('Unable to locate font with reference "/%s"', $positionedTextElement->textState->fontName->value));
$elementText = $positionedTextElement->getText($font);
if ($elementText === '') {
$previousTextElementOnLine = $positionedTextElement;
$previousFontOnLine = $font;
Expand Down
11 changes: 9 additions & 2 deletions src/Extraction/TextExtractor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use PrinsFrank\PdfParser\Document\ContentStream\PositionedText\PositionedTextElement;
use PrinsFrank\PdfParser\Document\Object\Decorator\Page;
use PrinsFrank\PdfParser\Exception\ParseFailureException;
use PrinsFrank\PdfParser\Exception\PdfParserException;
use PrinsFrank\PdfParser\Extraction\SpaceDetection\SpaceDetector;
use PrinsFrank\PdfParser\Extraction\TextGrouping\LineGrouping\TextOverlapStrategy;
Expand All @@ -16,6 +17,7 @@ class TextExtractor {
public static function extractContent(array $positionedTextElements, Page $page): string {
$lineGroupedElements = TextOverlapStrategy::group($positionedTextElements);

$fontCache = [];
$textBuffer = '';
foreach ($lineGroupedElements as $i => $positionedTextElementsForLine) {
if ($i !== 0) {
Expand All @@ -26,8 +28,13 @@ public static function extractContent(array $positionedTextElements, Page $page)
$previousFontOnLine = null;
$previousTextElementEndsWithSpace = false;
foreach ($positionedTextElementsForLine as $positionedTextElement) {
$elementText = $positionedTextElement->getText($page);
$font = $positionedTextElement->getFont($page);
if ($positionedTextElement->textState->fontName === null) {
throw new ParseFailureException('Unable to locate font');
}

$font = $fontCache[$positionedTextElement->textState->fontName->value] ??= $page->getFont($positionedTextElement->textState->fontName)
?? throw new ParseFailureException(sprintf('Unable to locate font with reference "/%s"', $positionedTextElement->textState->fontName->value));
$elementText = $positionedTextElement->getText($font);
if ($elementText === '') {
$previousTextElementOnLine = $positionedTextElement;
$previousFontOnLine = $font;
Expand Down
Loading