Merge pull request #16467 from calixteman/non_null_ultimate

Avoid to have a null fallback if none has been provided
This commit is contained in:
calixteman 2023-05-24 17:00:14 +02:00 committed by GitHub
commit 8d5da54cd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -484,10 +484,12 @@ function getFontSubstitution(
src.push(`local(${baseFontName})`); src.push(`local(${baseFontName})`);
} }
const { style, ultimate } = generateFont(substitution, src, localFontPath); const { style, ultimate } = generateFont(substitution, src, localFontPath);
const guessFallback = ultimate === null;
const fallback = guessFallback ? "" : `,${ultimate}`;
substitutionInfo = { substitutionInfo = {
css: `${loadedName},${ultimate}`, css: `${loadedName}${fallback}`,
guessFallback: false, guessFallback,
loadedName, loadedName,
baseFontName, baseFontName,
src: src.join(","), src: src.join(","),