diff --git a/assets/webui/ofdgo.js b/assets/webui/ofdgo.js
index 27b17fb..bb9a8c5 100644
--- a/assets/webui/ofdgo.js
+++ b/assets/webui/ofdgo.js
@@ -24,7 +24,7 @@ const batchElements = Object.fromEntries(["Button", "Panel", "Form", "Input", "A
const fontBinding = { font: null, choices: [], sequence: 0 };
const fontBindingElements = Object.fromEntries(["Panel", "Form", "Title", "Name", "SourceRow", "Source", "File", "Hint", "Status", "Cancel", "Submit"].map(name => [name, document.querySelector(`#fontBinding${name}`)]));
const resourceElements = Object.fromEntries(["ManageButton", "Panel", "Form", "Kind", "List", "Empty", "Reference", "Actions", "Add", "Preview", "Export", "Rename", "Replace", "Delete", "Locate", "Close", "Binding", "BindingActions", "Page", "Object", "Pick", "Bind", "Unbind", "Viewer", "Status", "File"].map(name => [name, document.querySelector(`#resource${name}`)]));
-const resourceManager = { items: [], selected: null, targets: [], pick: null, busy: false, sequence: 0, url: null, font: null, fileAction: null };
+const resourceManager = { items: [], selected: null, targets: [], pick: null, busy: false, sequence: 0, url: null, fileAction: null };
const settingsElements = Object.fromEntries(["Button", "Panel", "Form", "Title", "Kind", "Context", "Content", "Actions", "Status"].map(name => [name, document.querySelector(`#settings${name}`)]));
const settings = { sequence: 0, busy: false, page: 0, scope: "document", object: "", path: [], selected: -1, data: null, actions: [], drafts: new Map(), view: "", baseline: {}, suspended: false };
@@ -6216,8 +6216,7 @@ function releaseResourcePreview() {
resourceElements.Viewer.replaceChildren();
resourceElements.Viewer.hidden = true;
if (resourceManager.url) URL.revokeObjectURL(resourceManager.url);
- if (resourceManager.font) document.fonts.delete(resourceManager.font);
- resourceManager.url = resourceManager.font = null;
+ resourceManager.url = null;
}
async function previewManagedResource() {
@@ -6232,33 +6231,29 @@ async function previewManagedResource() {
const sequence = resourceManager.sequence, openSeq = state.openSeq;
let result;
try {
- result = await callWASM("ofdgoExportResource", JSON.stringify([item.kind, item.id]), null);
+ result = item.kind === "Font"
+ ? await callWASM("ofdgoFontPreview", item.id)
+ : await callWASM("ofdgoExportResource", JSON.stringify([item.kind, item.id]), null);
+ } catch (error) {
+ if (sequence !== resourceManager.sequence || openSeq !== state.openSeq || !resourceElements.Panel.open) return;
+ if (item.kind === "Font") throw new Error("字体无法预览", {cause: error});
+ throw error;
} finally {
state.exportRequestID = 0;
el.cancelExportButton.hidden = true;
}
if (sequence !== resourceManager.sequence || openSeq !== state.openSeq || !resourceElements.Panel.open) return;
- const format = item.format.toLowerCase();
- const mime = {mp3: "audio/mpeg", wav: "audio/wav", ogg: "audio/ogg", m4a: "audio/mp4", mp4: "video/mp4", webm: "video/webm", png: "image/png", jpeg: "image/jpeg", jpg: "image/jpeg", bmp: "image/bmp"}[format] || "application/octet-stream";
- resourceManager.url = URL.createObjectURL(new Blob([result.blob], {type: mime}));
- let element;
- if (item.kind === "Font") {
- const font = new FontFace("OFDResourcePreview", `url("${resourceManager.url}")`);
- await font.load();
- if (sequence !== resourceManager.sequence) return;
- document.fonts.add(font);
- resourceManager.font = font;
- element = document.createElement("span");
- element.style.fontFamily = '"OFDResourcePreview"';
- element.style.fontSize = "24px";
- element.textContent = "Aa 0123 字体预览";
- } else {
- element = document.createElement(item.kind === "Image" ? "img" : item.kind === "Audio" ? "audio" : "video");
- element.src = resourceManager.url;
- if (item.kind === "Image") element.alt = item.name;
- else { element.controls = true; element.preload = "metadata"; }
- element.addEventListener("error", () => { resourceElements.Status.textContent = "浏览器无法预览此格式"; });
- }
+ const format = item.kind === "Font" ? "svg" : item.format.toLowerCase();
+ const mime = {svg: "image/svg+xml", mp3: "audio/mpeg", wav: "audio/wav", ogg: "audio/ogg", m4a: "audio/mp4", mp4: "video/mp4", webm: "video/webm", png: "image/png", jpeg: "image/jpeg", jpg: "image/jpeg", bmp: "image/bmp"}[format] || "application/octet-stream";
+ resourceManager.url = URL.createObjectURL(new Blob([result.bytes || result.blob], {type: mime}));
+ const image = item.kind === "Image" || item.kind === "Font";
+ const element = document.createElement(image ? "img" : item.kind === "Audio" ? "audio" : "video");
+ element.src = resourceManager.url;
+ if (image) element.alt = item.name;
+ else { element.controls = true; element.preload = "metadata"; }
+ element.addEventListener("error", () => {
+ if (sequence === resourceManager.sequence && openSeq === state.openSeq) resourceElements.Status.textContent = "浏览器无法预览此格式";
+ });
resourceElements.Viewer.append(element);
resourceElements.Viewer.hidden = false;
}
diff --git a/internal/webui/wasm.go b/internal/webui/wasm.go
index 3c1e955..d6d6262 100644
--- a/internal/webui/wasm.go
+++ b/internal/webui/wasm.go
@@ -236,6 +236,7 @@ func RunWASM() {
registerCallback("ofdgoResources", documentResources)
registerCallback("ofdgoResourceTargets", resourceTargets)
registerCallback("ofdgoResourceLocations", resourceLocations)
+ registerCallback("ofdgoFontPreview", fontPreview)
registerCallback("ofdgoChangeResource", changeResource)
registerAsyncCallback("ofdgoExportResource", exportResource)
registerCallback("ofdgoImages", documentImages)
@@ -841,6 +842,20 @@ func resourceLocations(args []js.Value) (any, error) {
return currentSession.Renderer.ResourceLocations(context.Background(), args[0].String(), args[1].String(), args[2].Int())
}
+// fontPreview 使用当前文档和版本的字形轮廓生成独立预览
+// 入参: args 字体资源标识
+// 返回: any SVG数据, error 字体或绘制错误
+func fontPreview(args []js.Value) (any, error) {
+ if currentSession == nil || len(args) != 1 {
+ return nil, fmt.Errorf("ofd document is not opened")
+ }
+ var output bytes.Buffer
+ if err := currentSession.Renderer.RenderFontPreview(context.Background(), args[0].String(), &output); err != nil {
+ return nil, err
+ }
+ return successResult(map[string]any{"bytes": bytesToJS(output.Bytes())}), nil
+}
+
// changeResource 调用库层资源编辑，浏览器不改写资源声明和包路径
// 入参: args 操作、类型、标识、格式、数据、页码和图元标识
// 返回: any 编辑状态, error 资源操作错误
diff --git a/ofdgo_render_preview.go b/ofdgo_render_preview.go
index b853074..798c991 100644
--- a/ofdgo_render_preview.go
+++ b/ofdgo_render_preview.go
@@ -16,6 +16,7 @@ package ofdgo
import (
"bytes"
+ "context"
"crypto/sha256"
"fmt"
"io"
@@ -55,3 +56,70 @@ func (r *Renderer) RenderPreview(page *PageContent, writer io.Writer, options Pr
}
return SVGResources{Images: []SVGImage{{Name: name, MIME: "image/png", Data: pixels.Bytes()}}}, nil
}
+
+// RenderFontPreview 将指定字体的前32个可见字形绘制为独立SVG，不依赖字符映射或浏览器字体
+// 排除缺字字形，外部字体须精确匹配，不修改原始资源或使用无关回退字体
+// 入参: ctx 取消上下文, id 字体资源标识, writer 输出流
+// 返回: error 字体、轮廓、取消或写入错误
+func (r *Renderer) RenderFontPreview(ctx context.Context, id string, writer io.Writer) error {
+ if err := ctx.Err(); err != nil {
+ return err
+ }
+ view := *r
+ view.pageContext = ctx
+ resolved, err := view.ResolveFont(id, true)
+ if err != nil {
+ return err
+ }
+ font := &PreparedFont{ResolvedFont: resolved}
+ if definition := view.Reader.fontDefinition(id); definition != nil && definition.FontFile != "" {
+ font, err = view.PrepareFont(id)
+ if err != nil {
+ return err
+ }
+ }
+ metrics, err := view.preparedMetrics(font)
+ if err != nil {
+ return err
+ }
+ outlines, ok := metrics.(FontOutlines)
+ if !ok {
+ return fmt.Errorf("font outlines: %w", ErrBackendUnavailable)
+ }
+ var paths bytes.Buffer
+ count := 0
+ for glyph := uint16(1); glyph < metrics.NumGlyphs() && count < 32; glyph++ {
+ if err := ctx.Err(); err != nil {
+ return err
+ }
+ outline, err := outlines.GlyphOutline(glyph, 24)
+ if err != nil {
+ return err
+ }
+ box, err := outline.Bounds()
+ if err != nil {
+ return err
+ }
+ if box.W <= 0 || box.H <= 0 {
+ continue
+ }
+ path, err := outline.SVG()
+ if err != nil {
+ return err
+ }
+ scale := min(1.0, 28/box.W, 32/box.H)
+ x := float64(count%8)*36 + (36-box.W*scale)/2 - box.X*scale
+ y := float64(count/8)*40 + (40-box.H*scale)/2 - box.Y*scale
+ fmt.Fprintf(&paths, ``, x, y, scale, path)
+ count++
+ }
+ if err := ctx.Err(); err != nil {
+ return err
+ }
+ if count == 0 {
+ return fmt.Errorf("font has no visible glyphs")
+ }
+ width, height := min(count, 8)*36, (count+7)/8*40
+ _, err = fmt.Fprintf(writer, ``, width, height, width, height, paths.Bytes())
+ return err
+}
diff --git a/ofdgo_resource_location.go b/ofdgo_resource_location.go
index 6752195..b43ae1d 100644
--- a/ofdgo_resource_location.go
+++ b/ofdgo_resource_location.go
@@ -102,9 +102,14 @@ func (r *Renderer) ResourceLocations(ctx context.Context, kind, id string, refer
if slices.Contains([]string{"Thumbnail", "Substitution"}, node.name.Local) {
add(node.name.Local, strings.TrimSpace(editorImportText(file.data, node)))
}
- if owner != "" && node.parent != nil && node.parent.matchesOFD("Layer") {
- layer := editorResourceID(node.parent.attr("ID"))
- users[layer] = append(users[layer], owner)
+ parent := node.parent
+ for parent != nil && parent.matchesOFD("PageBlock") {
+ parent = parent.parent
+ }
+ if owner != "" && parent != nil && parent.matchesOFD("Layer") {
+ if layer := editorResourceID(parent.attr("ID")); layer != "" && layer != owner {
+ users[layer] = append(users[layer], owner)
+ }
}
for _, child := range node.children {
if err := visit(child, object); err != nil {