#720

Author: mvladic

packages/eez-studio-ui/_stylesheets/project-editor.less

@@ -4316,4 +4316,8 @@
     .btn-toolbar {
         display: flex;
     }
+}
+
+.EezStudio_ArrayElementProperty_Body_Property>.editGlyphs>div>div:first-child {
+    display: none;
 }

packages/project-editor/core/object.ts

@@ -299,6 +299,8 @@ export interface PropertyInfo {
 
     showArrayCollapsedByDefaultInPropertyGrid?: boolean;
     hideElementIndexInPropertyGrid?: boolean;
+
+    noColSpanForArray?: boolean;
 }
 
 export type InheritedValue =

packages/project-editor/features/font/GlyphSelectFieldType.tsx

@@ -16,7 +16,7 @@ import {
     FontRenderingEngine,
     IFontExtract,
     createFontExtract,
-    Params
+    ExtractFontParams
 } from "project-editor/features/font/font-extract";
 import { ProjectContext } from "project-editor/project/context";
 import { IFieldComponentProps } from "eez-studio-ui/generic-dialog";
@@ -37,7 +37,7 @@ export const GlyphSelectFieldType = observer(
         static contextType = ProjectContext;
         declare context: React.ContextType<typeof ProjectContext>;
 
-        params: Params | undefined;
+        params: ExtractFontParams | undefined;
         fontExtract: IFontExtract | undefined;
         selectedEncoding = observable.box<number | undefined>();
         isLoading: boolean;

packages/project-editor/features/font/font-extract/freetype.ts

@@ -1,5 +1,5 @@
 import type {
-    Params,
+    ExtractFontParams,
     FontProperties,
     GlyphProperties,
     IFontExtract
@@ -37,7 +37,7 @@ export class ExtractFont implements IFontExtract {
     fontProperties: FontProperties;
 
     // size is in pt's
-    constructor(private params: Params) {}
+    constructor(private params: ExtractFontParams) {}
 
     async start() {
         if (!wasmModule) {

packages/project-editor/features/font/font-extract/index.ts

@@ -54,7 +54,16 @@ export interface EncodingRange {
     mapped_from?: number;
 }
 
-export interface Params {
+export interface AdditionalFontSourceParams {
+    absoluteFilePath: string;
+    embeddedFontFile?: string;
+    relativeFilePath: string;
+    size: number;
+    encodings?: EncodingRange[];
+    symbols?: string;
+}
+
+export interface ExtractFontParams {
     name?: string;
     absoluteFilePath: string;
     embeddedFontFile?: string;
@@ -73,6 +82,7 @@ export interface Params {
     lvglInclude?: string;
     opts_string?: string;
     lv_fallback?: string;
+    additionalSources?: AdditionalFontSourceParams[];
 }
 
 export interface IFontExtract {
@@ -84,7 +94,7 @@ export interface IFontExtract {
     allEncodings: number[];
 }
 
-export async function createFontExtract(params: Params): Promise<IFontExtract> {
+export async function createFontExtract(params: ExtractFontParams): Promise<IFontExtract> {
     let renderingEngineModule;
 
     if (params.renderingEngine == "freetype") {
@@ -104,7 +114,7 @@ export async function createFontExtract(params: Params): Promise<IFontExtract> {
     return new renderingEngineModule.ExtractFont(params);
 }
 
-export async function extractFont(params: Params) {
+export async function extractFont(params: ExtractFontParams) {
     const extractFont = await createFontExtract(params);
     try {
         await extractFont.start();

packages/project-editor/features/font/font-extract/lvgl.ts

@@ -1,5 +1,5 @@
 import type {
-    Params,
+    ExtractFontParams,
     FontProperties,
     GlyphProperties,
     IFontExtract
@@ -18,7 +18,7 @@ export class ExtractFont implements IFontExtract {
     allEncodings: number[];
     fontData: any;
 
-    constructor(private params: Params) {}
+    constructor(private params: ExtractFontParams) {}
 
     async start() {
         let source_bin = this.params.embeddedFontFile
@@ -36,7 +36,7 @@ export class ExtractFont implements IFontExtract {
 
         const symbols = this.params.symbols ?? "";
 
-        const font = [
+        const font: any[] = [
             {
                 source_path: this.params.absoluteFilePath,
                 source_bin,
@@ -49,6 +49,38 @@ export class ExtractFont implements IFontExtract {
             }
         ];
 
+        if (this.params.additionalSources) {
+            for (const additionalSource of this.params.additionalSources) {
+                const addSourceBin = additionalSource.embeddedFontFile
+                    ? Buffer.from(additionalSource.embeddedFontFile, "base64")
+                    : fs.readFileSync(additionalSource.absoluteFilePath);
+
+                const addRange: number[] = [];
+                if (additionalSource.encodings) {
+                    additionalSource.encodings.map(encodingRange =>
+                        addRange.push(
+                            encodingRange.from,
+                            encodingRange.to,
+                            encodingRange.mapped_from ?? encodingRange.from
+                        )
+                    );
+                }
+
+                const addSymbols = additionalSource.symbols ?? "";
+
+                font.push({
+                    source_path: additionalSource.absoluteFilePath,
+                    source_bin: addSourceBin,
+                    ranges: [
+                        {
+                            range: addRange,
+                            symbols: addSymbols
+                        }
+                    ]
+                });
+            }
+        }
+
         const output = getName(
             "ui_font_",
             this.params.name || "",

packages/project-editor/features/font/font-extract/opentype.ts

@@ -3,7 +3,7 @@ import { load, parse, Font as OpenTypeFont } from "opentype.js";
 
 import { toArrayBuffer } from "project-editor/features/font/utils";
 import type {
-    Params,
+    ExtractFontParams,
     FontProperties,
     GlyphProperties,
     IFontExtract
@@ -20,7 +20,7 @@ export class ExtractFont implements IFontExtract {
     fontProperties: FontProperties;
     allEncodings: number[];
 
-    constructor(private params: Params) { }
+    constructor(private params: ExtractFontParams) { }
 
     async start() {
         return new Promise<void>((resolve, reject) => {