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

Jump to bottom

Printing unknown white space char #550

Merged
merged 1 commit into from
Aug 17, 2018
Merged

Printing unknown white space char #550

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
20 changes: 14 additions & 6 deletions src/image-manipulation/text.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,21 +67,27 @@ function drawCharacter(image, font, x, y, char) {
return image;
}

function printText(font, x, y, text) {
function printText(font, x, y, text, defaultCharWidth) {
for (let i = 0; i < text.length; i++) {
let char;

if (font.chars[text[i]]) {
char = text[i];
} else if (/\s/.test(text[i])) {
char = '';
} else {
char = '?';
}

drawCharacter(this, font, x, y, font.chars[char]);
const fontChar = font.chars[char] || {};
const fontKerning = font.kernings[char];

drawCharacter(this, font, x, y, fontChar || {});

x +=
(font.kernings[char] && font.kernings[char][text[i + 1]]
? font.kernings[char][text[i + 1]]
: 0) + (font.chars[char].xadvance || 0);
(fontKerning && fontKerning[text[i + 1]]
? fontKerning[text[i + 1]]
: 0) + (fontChar.xadvance || defaultCharWidth);
}
}

Expand Down Expand Up @@ -165,6 +171,7 @@ export function print(font, x, y, text, maxWidth, maxHeight, cb) {

const words = text.split(' ');
let line = '';
const defaultCharWidth = font.chars[0].xadvance;

for (let n = 0; n < words.length; n++) {
const testLine = line + words[n] + ' ';
Expand All @@ -189,7 +196,8 @@ export function print(font, x, y, text, maxWidth, maxHeight, cb) {
font,
x + xOffsetBasedOnAlignment(font, line, maxWidth, alignmentX),
y,
line
line,
defaultCharWidth
);

if (isNodePattern(cb)) {
Expand Down