Skip to content

Fix: Only break text into several spans if the font fallback is not the same (in _preProcessSpans) #1744

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: Only break text into several spans if the font fallback is not the same (in _preProcessSpans) #1744

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
91 changes: 43 additions & 48 deletions pdf/lib/src/widgets/text.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,64 +794,63 @@ class RichText extends Widget with SpanningWidget {
return true;
}

final font = style!.font!.getFont(context);

var text = span.text!.runes.toList();
final baseFont = style!.font!.getFont(context);
final accumulatedRunes = <int>[];
var currentFont = baseFont;
var currentTextStyle = style;

void flushAccumulatedRunes() {
if (accumulatedRunes.isNotEmpty) {
spans.add(_addText(
text: accumulatedRunes,
style: currentTextStyle,
baseline: span.baseline,
annotation: annotation,
));
accumulatedRunes.clear();
}
}

final text = span.text!.runes.toList();
for (var index = 0; index < text.length; index++) {
final rune = text[index];
const spaces = {
0x0a, 0x09, 0x00A0, 0x1680, 0x2000, 0x2001, 0x2002, 0x2003, 0x2004, //
0x2005, 0x2006, 0x2007, 0x2008, 0x2009, 0x200A, 0x202F, 0x205F, 0x3000
};

if (spaces.contains(rune)) {
accumulatedRunes.add(rune);
continue;
}

if (!font.isRuneSupported(rune)) {
if (index > 0) {
spans.add(_addText(
text: text,
end: index,
style: style,
baseline: span.baseline,
annotation: annotation,
));
}
// Check if the current font supports the rune
if (!currentFont.isRuneSupported(rune)) {
var found = false;
for (final fb in style.fontFallback) {
final font = fb.getFont(context);
if (font.isRuneSupported(rune)) {
if (font is PdfTtfFont) {
final bitmap = font.font.getBitmap(rune);
if (bitmap != null) {
spans.add(_addEmoji(
bitmap: bitmap,
style: style,
baseline: span.baseline,
annotation: annotation,
));
found = true;
break;
}
for (final fallback in style.fontFallback) {
final fallbackFont = fallback.getFont(context);

if (fallbackFont.isRuneSupported(rune)) {
// Check if the font has changed; only flush if the font is different
if (currentFont != fallbackFont) {
flushAccumulatedRunes();
currentFont = fallbackFont;
currentTextStyle = style.copyWith(
font: fallback,
fontNormal: fallback,
fontBold: fallback,
fontBoldItalic: fallback,
fontItalic: fallback,
);
}
spans.add(_addText(
text: [rune],
style: style.copyWith(
font: fb,
fontNormal: fb,
fontBold: fb,
fontBoldItalic: fb,
fontItalic: fb,
),
baseline: span.baseline,
annotation: annotation,
));
accumulatedRunes.add(rune);
found = true;
break;
}
}

if (!found) {
flushAccumulatedRunes(); // Flush before adding placeholder
spans.add(_addPlaceholder(
style: style,
baseline: span.baseline,
Expand All @@ -863,17 +862,13 @@ class RichText extends Widget with SpanningWidget {
return true;
}());
}
text = text.sublist(index + 1);
index = -1;
} else {
accumulatedRunes.add(rune); // Accumulate runes supported by current font
}
}

spans.add(_addText(
text: text,
style: style,
baseline: span.baseline,
annotation: annotation,
));
// Flush any remaining runes
flushAccumulatedRunes();

return true;
}, defaultStyle, null);
Expand Down
Loading