Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

fix(slide): support doc multiple font family (#7039)

VicKun1579d9f99208
diff --git a/packages/engine-render/src/components/docs/layout/shaping-engine/text-shaping.ts b/packages/engine-render/src/components/docs/layout/shaping-engine/text-shaping.ts
index 4227e6c62b..4f8ff06579 100644
--- a/packages/engine-render/src/components/docs/layout/shaping-engine/text-shaping.ts
+++ b/packages/engine-render/src/components/docs/layout/shaping-engine/text-shaping.ts
@@ -43,6 +43,51 @@ export interface IOpenTypeGlyphInfo {
const fontCache = new Map<string, Opentype.Font>();
const glyphCache: Map<string, IOpenTypeGlyphInfo[]> = new Map();
+const fontFamilyCache = new Map<string, string[]>();
+
+function trimOuterQuotes(value: string): string {
+ const firstChar = value.charCodeAt(0);
+ const lastChar = value.charCodeAt(value.length - 1);
+ const hasLeadingQuote = firstChar === 34 || firstChar === 39;
+ const hasTrailingQuote = lastChar === 34 || lastChar === 39;
+
+ if (hasLeadingQuote && hasTrailingQuote) {
+ return value.slice(1, -1);
+ }
+
+ if (hasLeadingQuote) {
+ return value.slice(1);
+ }
+
+ if (hasTrailingQuote) {
+ return value.slice(0, -1);
+ }
+
+ return value;
+}
+
+function expandFontFamilies(fontFamily: Nullable<string>): string[] {
+ if (!fontFamily?.trim()) {
+ return [];
+ }
+
+ let families = fontFamilyCache.get(fontFamily);
+
+ if (families) {
+ return families;
+ }
+
+ families = fontFamily
+ .split(',')
+ .map((family) => trimOuterQuotes(family.trim()))
+ .filter(Boolean);
+
+ fontFamilyCache.set(fontFamily, families);
+
+ return families;
+}
+
+const defaultFontFamilies = expandFontFamilies(DEFAULT_FONTFACE_PLANE);
function shapeChunk(
content: string,
@@ -197,9 +242,10 @@ export function textShape(body: IDocumentBody) {
for (const chunk of chunks) {
const { content, style = {} } = chunk;
- let fontFamilies = DEFAULT_FONTFACE_PLANE.split(',').map((family) => family.trim().replace(/["']/g, ''));
-
- fontFamilies.unshift(style.ff ?? 'Arial');
+ let fontFamilies = [
+ ...expandFontFamilies(style.ff ?? 'Arial'),
+ ...defaultFontFamilies,
+ ];
fontFamilies = fontLibrary.getValidFontFamilies(fontFamilies);