diff --git a/assets/excalidraw-fonts.zip b/assets/excalidraw-fonts.zip index 83a0df7..a3e3b17 100644 Binary files a/assets/excalidraw-fonts.zip and b/assets/excalidraw-fonts.zip differ diff --git a/src/constants/constants.ts b/src/constants/constants.ts index a55a32d..9f8e5d6 100644 --- a/src/constants/constants.ts +++ b/src/constants/constants.ts @@ -107,6 +107,7 @@ export const { } = excalidrawLib; export const FONTS_STYLE_ID = "excalidraw-custom-fonts"; +export const CJK_STYLE_ID = "excalidraw-cjk-fonts"; export function JSON_parse(x: string): any { return JSON.parse(x.replaceAll("[", "[")); diff --git a/src/lang/locale/en.ts b/src/lang/locale/en.ts index 91f1239..029fede 100644 --- a/src/lang/locale/en.ts +++ b/src/lang/locale/en.ts @@ -5,6 +5,7 @@ import { import { TAG_AUTOEXPORT, TAG_MDREADINGMODE, TAG_PDFEXPORT } from "src/constants/constSettingsTags"; import { labelALT, labelCTRL, labelMETA, labelSHIFT } from "src/utils/ModifierkeyHelper"; +const CJK_FONTS = "CJK Fonts"; // English export default { // main.ts @@ -229,15 +230,6 @@ export default { "You can access your scripts from Excalidraw via the Obsidian Command Palette. Assign " + "hotkeys to your favorite scripts just like to any other Obsidian command. " + "The folder may not be the root folder of your Vault. ", - ASSETS_FOLDER_NAME: "Local Font Assets Folder (cAsE sENsiTIvE!)", - ASSETS_FOLDER_DESC: `Since version 2.5.3, following the implementation of CJK font support, Excalidraw downloads fonts from the internet. - If you prefer to keep Excalidraw fully local, allowing it to work without internet access, or if your internet connection is slow - and you want to improve performance, you can download the necessary - font assets from GitHub. - After downloading, unzip the contents into a folder within your Vault.
- You can specify the location of that folder here. For example, you may choose to place it under Excalidraw/FontAssets.

- Important: Do not set this to the Vault root! Ensure that no other files are placed in this folder.

- Note: If you're using Obsidian Sync and want to synchronize these font files across your devices, ensure that Obsidian Sync is set to synchronize "All other file types".`, AI_HEAD: "AI Settings - Experimental", AI_DESC: `In the "AI" settings, you can configure options for using OpenAI's GPT API. ` + `While the OpenAI API is in beta, its use is strictly limited — as such we require you use your own API key. ` + @@ -756,6 +748,8 @@ FILENAME_HEAD: "Filename", "Enabling this feature simplifies the use of Excalidraw front matter properties, allowing you to leverage many powerful settings. If you prefer not to load these properties automatically, " + "you can disable this feature, but you will need to manually remove any unwanted properties from the suggester. " + "Note that turning on this setting requires restarting the plugin as properties are loaded at startup.", + FONTS_HEAD: "Fonts", + FONTS_DESC: "Configure local fontfaces and downloaded CJK fonts for Excalidraw.", CUSTOM_FONT_HEAD: "Local font", ENABLE_FOURTH_FONT_NAME: "Enable local font option", ENABLE_FOURTH_FONT_DESC: @@ -769,6 +763,20 @@ FILENAME_HEAD: "Filename", "If no file is selected, Excalidraw will default to the Virgil font. " + "For optimal performance, it is recommended to use a .woff2 file, as Excalidraw will encode only the necessary glyphs when exporting images to SVG. " + "Other font formats will embed the entire font in the exported file, potentially resulting in significantly larger file sizes.", + OFFLINE_CJK_NAME: "Offline CJK font support", + OFFLINE_CJK_DESC: + `Changes you make here will only take effect after restarting Obsidian.
+ Excalidraw.com offers handwritten CJK fonts. By default these fonts are not included in the plugin locally, but are served from the Internet. + If you prefer to keep Excalidraw fully local, allowing it to work without Internet access you can download the necessary font files from GitHub. + After downloading, unzip the contents into a folder within your Vault.
+ Pre-loading fonts will impact startup performance. For this reason you can select which fonts to load.`, + CJK_ASSETS_FOLDER_NAME: "CJK Font Folder (cAsE sENsiTIvE!)", + CJK_ASSETS_FOLDER_DESC: `You can set the location of the CJK fonts folder here. For example, you may choose to place it under Excalidraw/CJK Fonts.

+ Important: Do not set this folder to the Vault root! Do not put other fonts in this folder.

+ Note: If you're using Obsidian Sync and want to synchronize these font files across your devices, ensure that Obsidian Sync is set to synchronize "All other file types".`, + LOAD_CHINESE_FONTS_NAME: "Load Chinese fonts from file at startup", + LOAD_JAPANESE_FONTS_NAME: "Load Japanese fonts from file at startup", + LOAD_KOREAN_FONTS_NAME: "Load Korean fonts frome file at startup", SCRIPT_SETTINGS_HEAD: "Settings for installed Scripts", SCRIPT_SETTINGS_DESC: "Some of the Excalidraw Automate Scripts include settings. Settings are organized by script. Settings will only become visible in this list after you have executed the newly downloaded script once.", TASKBONE_HEAD: "Taskbone Optical Character Recogntion", @@ -831,9 +839,8 @@ FILENAME_HEAD: "Filename", FONT_INFO_DETAILED: `

To improve Obsidian's startup time and manage the large CJK font family, - I've moved the fonts out of the plugin's main.js. Starting with version 2.5.3, - fonts will be loaded from the internet. This typically shouldn't cause issues as Obsidian caches - these files after first use. + I've moved the CJK fonts out of the plugin's main.js. CJK fonts will be loaded from the internet by default. + This typically shouldn't cause issues as Obsidian caches these files after first use.

If you prefer to keep Obsidian 100% local or experience performance issues, you can download the font assets. @@ -841,7 +848,7 @@ FILENAME_HEAD: "Filename",

Instructions:

  1. Download the fonts from GitHub.
    2. -
  2. Unzip and copy files into a Vault folder (default: Excalidraw/FontAssets; folder names are cAse-senSITive).
    3. +
  3. Unzip and copy files into a Vault folder (default: Excalidraw/${CJK_FONTS}; folder names are cAse-senSITive).
  4. DO NOT set this folder to the Vault root or mix with other local fonts.

For Obsidian Sync Users:

diff --git a/src/main.ts b/src/main.ts index 446153e..f7de6be 100644 --- a/src/main.ts +++ b/src/main.ts @@ -45,6 +45,7 @@ import { DEVICE, sceneCoordsToViewportCoords, FONTS_STYLE_ID, + CJK_STYLE_ID, } from "./constants/constants"; import ExcalidrawView, { TextMode, getTextMode } from "./ExcalidrawView"; import { @@ -140,6 +141,7 @@ import { Rank, SwordColors } from "./menu/ActionIcons"; import { RankMessage } from "./dialogs/RankMessage"; import { initCompressionWorker, terminateCompressionWorker } from "./workers/compression-worker"; import { WeakArray } from "./utils/WeakArray"; +import { getCJKDataURLs } from "./utils/CJKLoader"; declare let EXCALIDRAW_PACKAGES:string; declare let react:any; @@ -193,6 +195,7 @@ export default class ExcalidrawPlugin extends Plugin { //private slob:string; private ribbonIcon:HTMLElement; public loadTimestamp:number; + private isLocalCJKFontAvailabe:boolean = undefined constructor(app: App, manifest: PluginManifest) { super(app, manifest); @@ -313,8 +316,27 @@ export default class ExcalidrawPlugin extends Plugin { }; }*/ - public async loadFontFromFile(fontName: string): Promise { + public getCJKFontSettings() { const assetsFoler = this.settings.fontAssetsPath; + if(typeof this.isLocalCJKFontAvailabe === "undefined") { + this.isLocalCJKFontAvailabe = this.app.vault.getFiles().some(f=>f.path.startsWith(assetsFoler)); + } + if(!this.isLocalCJKFontAvailabe) { + return { c: false, j: false, k: false }; + } + return { + c: this.settings.loadChineseFonts, + j: this.settings.loadJapaneseFonts, + k: this.settings.loadKoreanFonts, + } + } + + public async loadFontFromFile(fontName: string): Promise { + const assetsFoler = this.settings.fontAssetsPath; + + if(!this.isLocalCJKFontAvailabe) { + return; + } const file = this.app.vault.getAbstractFileByPath(normalizePath(assetsFoler + "/" + fontName)); if(!file || !(file instanceof TFile)) { return; @@ -417,6 +439,17 @@ export default class ExcalidrawPlugin extends Plugin { this.app.workspace.onLayoutReady(async () => { (process.env.NODE_ENV === 'development') && DEBUGGING && debug(this.initializeFonts, `ExcalidrawPlugin.initializeFonts > app.workspace.onLayoutReady`); + const cjkFontDataURLs = await getCJKDataURLs(this); + if(cjkFontDataURLs) { + const fontDeclarations = cjkFontDataURLs.map(dataURL => + `@font-face { font-family: 'Xiaolai'; src: url("${dataURL}"); font-display: swap; font-weight: 400; }` + ); + for(const ownerDocument of this.getOpenObsidianDocuments()) { + await this.addFonts(fontDeclarations, ownerDocument, CJK_STYLE_ID); + }; + new Notice("Excalidraw: CJK Fonts loaded"); + } + const font = await getFontDataURL( this.app, this.settings.experimantalFourthFont, @@ -458,12 +491,12 @@ export default class ExcalidrawPlugin extends Plugin { }); } - public async addFonts(declarations: string[],ownerDocument:Document = document) { + public async addFonts(declarations: string[],ownerDocument:Document = document, styleId:string = FONTS_STYLE_ID) { // replace the old local font