@univerjs/engine-render 0.1.3 → 0.1.4

package/lib/types/basics/document-node-tools.d.ts

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 import type { IDocumentBody, Nullable } from '@univerjs/core';
-import type { IDocumentSkeletonSpan } from './i-document-skeleton-cached';
-export declare function hasListSpan(span: Nullable<IDocumentSkeletonSpan>): boolean;
-export declare function isIndentBySpan(span: Nullable<IDocumentSkeletonSpan>, body?: IDocumentBody): boolean;
-export declare function isLastSpan(span: Nullable<IDocumentSkeletonSpan>): boolean;
-export declare function isFirstSpan(span: Nullable<IDocumentSkeletonSpan>): boolean;
-export declare function getParagraphBySpan(span: Nullable<IDocumentSkeletonSpan>, body?: IDocumentBody): import("@univerjs/core").IParagraph | undefined;
-export declare function isPlaceholderOrSpace(span: Nullable<IDocumentSkeletonSpan>): boolean;
-export declare function isSameLine(span1: Nullable<IDocumentSkeletonSpan>, span2: Nullable<IDocumentSkeletonSpan>): boolean;
+import type { IDocumentSkeletonGlyph } from './i-document-skeleton-cached';
+export declare function hasListGlyph(glyph: Nullable<IDocumentSkeletonGlyph>): boolean;
+export declare function isIndentByGlyph(glyph: Nullable<IDocumentSkeletonGlyph>, body?: IDocumentBody): boolean;
+export declare function isLastGlyph(glyph: Nullable<IDocumentSkeletonGlyph>): boolean;
+export declare function isFirstGlyph(glyph: Nullable<IDocumentSkeletonGlyph>): boolean;
+export declare function getParagraphByGlyph(glyph: Nullable<IDocumentSkeletonGlyph>, body?: IDocumentBody): import("@univerjs/core").IParagraph | undefined;
+export declare function isPlaceholderOrSpace(glyph: Nullable<IDocumentSkeletonGlyph>): boolean;
+export declare function isSameLine(glyph1: Nullable<IDocumentSkeletonGlyph>, glyph2: Nullable<IDocumentSkeletonGlyph>): boolean;

package/lib/types/basics/i-document-skeleton-cached.d.ts

@@ -115,7 +115,7 @@ export interface IDocumentSkeletonLine {
     parent?: IDocumentSkeletonColumn;
 }
 export interface IDocumentSkeletonDivide {
-    spanGroup: IDocumentSkeletonSpan[];
+    glyphGroup: IDocumentSkeletonGlyph[];
     width: number;
     left: number;
     paddingLeft: number;
@@ -124,16 +124,22 @@ export interface IDocumentSkeletonDivide {
     ed: number;
     parent?: IDocumentSkeletonLine;
 }
-export interface IDocumentSkeletonSpan {
-    eId?: string;
-    spanType: SpanType;
+export interface IAdjustability {
+    stretchability: [number, number];
+    shrinkability: [number, number];
+}
+export interface IDocumentSkeletonGlyph {
+    glyphId?: string;
+    glyphType: GlyphType;
     streamType: DataStreamTreeTokenType;
     width: number;
     bBox: IDocumentSkeletonBoundingBox;
-    paddingLeft: number;
+    xOffset: number;
     left: number;
     count: number;
     content: string;
+    adjustability: IAdjustability;
+    isJustifiable: boolean;
     ts?: ITextStyle;
     fontStyle?: IDocumentSkeletonFontStyle;
     parent?: IDocumentSkeletonDivide;
@@ -179,7 +185,7 @@ export interface IDocumentSkeletonBoundingBox {
     spo: number;
 }
 export declare enum SkeletonType {
-    SPAN = 0,
+    GLYPH = 0,
     DIVIDE = 1,
     LINE = 2,
     COLUMN = 3,
@@ -200,7 +206,7 @@ export declare enum LineType {
     PARAGRAPH = 0,
     BLOCK = 1
 }
-export declare enum SpanType {
+export declare enum GlyphType {
     LETTER = 0,
     WORD = 1,
     LIST = 2,

package/lib/types/basics/interfaces.d.ts

@@ -15,7 +15,7 @@
  */
 import type { BooleanNumber, GridType, IDocStyleBase, IDocumentLayout, IOffset, IParagraphStyle, IReferenceSource, IScale, ISectionBreakBase, ISize, ITextStyle, ITransformState, LocaleService } from '@univerjs/core';
 import type { DocumentViewModel } from '../components/docs/view-model/document-view-model';
-import type { IDocumentSkeletonBullet, IDocumentSkeletonDrawing, IDocumentSkeletonDrawingAnchor, IDocumentSkeletonFontStyle, IDocumentSkeletonFooter, IDocumentSkeletonHeader, IDocumentSkeletonSpan } from './i-document-skeleton-cached';
+import type { IDocumentSkeletonBullet, IDocumentSkeletonDrawing, IDocumentSkeletonDrawingAnchor, IDocumentSkeletonFontStyle, IDocumentSkeletonFooter, IDocumentSkeletonGlyph, IDocumentSkeletonHeader } from './i-document-skeleton-cached';
 import type { Vector2 } from './vector2';
 export interface IObjectFullState extends ITransformState {
     strokeWidth?: number;
@@ -99,12 +99,12 @@ export interface IFontCreateConfig {
     pageWidth?: number;
 }
 export interface INodeInfo {
-    node: IDocumentSkeletonSpan;
+    node: IDocumentSkeletonGlyph;
     ratioX: number;
     ratioY: number;
 }
 export interface INodeSearch {
-    span: number;
+    glyph: number;
     divide: number;
     line: number;
     column: number;

package/lib/types/basics/tools.d.ts

@@ -66,6 +66,7 @@ export declare function getFontStyleString(textStyle?: IStyleBase, localeService
 };
 export declare function hasCJKText(text: string): boolean;
 export declare function hasCJK(text: string): boolean;
+export declare function hasCJKPunctuation(text: string): boolean;
 export declare function hasAllLatin(text: string): boolean;
 export declare function hasBasicLatin(text: string): boolean;
 export declare function hasLatinOneSupplement(text: string): boolean;
@@ -76,6 +77,9 @@ export declare function startWithEmoji(text: string): boolean;
 export declare function hasArabic(text: string): boolean;
 export declare function hasTibetan(text: string): boolean;
 export declare function hasSpace(text: string): boolean;
+export declare function isCjkLeftAlignedPunctuation(text: string): boolean;
+export declare function isCjkRightAlignedPunctuation(text: string): boolean;
+export declare function isCjkCenterAlignedPunctuation(text: string): boolean;
 export declare function getDPI(): number;
 export declare function ptToPx(pt: number): number;
 export declare function pxToPt(px: number): number;

package/lib/types/{components/docs/block/index.d.ts → basics/viewport-subtract.d.ts}

@@ -13,6 +13,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export * from './block-error';
-export * from './paragraph';
-export * from './section';
+import type { IRange } from '@univerjs/core';
+export declare function subtractViewportRange(range1: IRange, range2: IRange): IRange[];

package/lib/types/components/docs/doc-component.d.ts

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 import type { Nullable } from '@univerjs/core';
-import type { IDocumentSkeletonLine, IDocumentSkeletonSpan } from '../../basics/i-document-skeleton-cached';
+import type { IDocumentSkeletonGlyph, IDocumentSkeletonLine } from '../../basics/i-document-skeleton-cached';
 import { PageLayoutType } from '../../basics/i-document-skeleton-cached';
 import type { INodeInfo } from '../../basics/interfaces';
 import type { IBoundRectNoAngle, IViewportBound } from '../../basics/vector2';
 import type { UniverRenderingContext } from '../../context';
 import { RenderComponent } from '../component';
 import type { DOCS_EXTENSION_TYPE } from './doc-extension';
-import type { DocumentSkeleton } from './doc-skeleton';
-export declare class DocComponent extends RenderComponent<IDocumentSkeletonSpan | IDocumentSkeletonLine, DOCS_EXTENSION_TYPE, IBoundRectNoAngle[]> {
+import type { DocumentSkeleton } from './layout/doc-skeleton';
+export declare class DocComponent extends RenderComponent<IDocumentSkeletonGlyph | IDocumentSkeletonLine, DOCS_EXTENSION_TYPE, IBoundRectNoAngle[]> {
     private _skeleton?;
     pageMarginLeft: number;
     pageMarginTop: number;
@@ -39,7 +39,7 @@ export declare class DocComponent extends RenderComponent<IDocumentSkeletonSpan
     syncSelection(): void;
     remainActiveSelection(): void;
     findNodeByCoord(offsetX: number, offsetY: number): Nullable<INodeInfo>;
-    findCoordByNode(span: IDocumentSkeletonSpan): void;
+    findCoordByNode(glyph: IDocumentSkeletonGlyph): void;
     protected _getBounding(bounds?: IViewportBound): void;
     protected _draw(ctx: UniverRenderingContext, bounds?: IViewportBound): void;
 }

package/lib/types/components/docs/doc-extension.d.ts

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { IDocumentSkeletonLine, IDocumentSkeletonSpan } from '../../basics/i-document-skeleton-cached';
+import type { IDocumentSkeletonGlyph, IDocumentSkeletonLine } from '../../basics/i-document-skeleton-cached';
 import type { IBoundRectNoAngle } from '../../basics/vector2';
 import { ComponentExtension } from '../extension';
 export declare enum DOCS_EXTENSION_TYPE {
     SPAN = 0,
     LINE = 1
 }
-export declare class docExtension extends ComponentExtension<IDocumentSkeletonSpan | IDocumentSkeletonLine, DOCS_EXTENSION_TYPE, IBoundRectNoAngle> {
+export declare class docExtension extends ComponentExtension<IDocumentSkeletonGlyph | IDocumentSkeletonLine, DOCS_EXTENSION_TYPE, IBoundRectNoAngle> {
     type: DOCS_EXTENSION_TYPE;
     translateX: number;
     translateY: number;

package/lib/types/components/docs/document.d.ts

@@ -23,7 +23,7 @@ import type { IViewportBound } from '../../basics/vector2';
 import type { UniverRenderingContext } from '../../context';
 import type { Scene } from '../../scene';
 import { DocComponent } from './doc-component';
-import type { DocumentSkeleton } from './doc-skeleton';
+import type { DocumentSkeleton } from './layout/doc-skeleton';
 interface IPageMarginLayout {
     pageMarginLeft: number;
     pageMarginTop: number;
@@ -63,5 +63,6 @@ export declare class Documents extends DocComponent {
     private _startRotation;
     private _resetRotation;
     private _initialDefaultExtension;
+    private _isSkipByDiffBounds;
 }
 export {};

package/lib/types/components/docs/extensions/background.d.ts

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 import type { IScale } from '@univerjs/core';
-import type { IDocumentSkeletonSpan } from '../../../basics/i-document-skeleton-cached';
+import type { IDocumentSkeletonGlyph } from '../../../basics/i-document-skeleton-cached';
 import type { UniverRenderingContext } from '../../../context';
 import { docExtension } from '../doc-extension';
 export declare class Background extends docExtension {
     uKey: string;
     Z_INDEX: number;
     private _preBackgroundColor;
-    draw(ctx: UniverRenderingContext, parentScale: IScale, span: IDocumentSkeletonSpan): void;
+    draw(ctx: UniverRenderingContext, parentScale: IScale, span: IDocumentSkeletonGlyph): void;
     clearCache(): void;
 }

package/lib/types/components/docs/extensions/border.d.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import type { IScale } from '@univerjs/core';
-import type { IDocumentSkeletonSpan } from '../../../basics/i-document-skeleton-cached';
+import type { IDocumentSkeletonGlyph } from '../../../basics/i-document-skeleton-cached';
 import type { UniverRenderingContext } from '../../../context';
 import { docExtension } from '../doc-extension';
 export declare class Border extends docExtension {
@@ -22,7 +22,7 @@ export declare class Border extends docExtension {
     Z_INDEX: number;
     private _preBorderStyle;
     private _preBorderColor;
-    draw(ctx: UniverRenderingContext, parentScale: IScale, span: IDocumentSkeletonSpan): void;
+    draw(ctx: UniverRenderingContext, parentScale: IScale, glyph: IDocumentSkeletonGlyph): void;
     clearCache(): void;
     private _createBorderCache;
 }

package/lib/types/components/docs/extensions/font-and-base-line.d.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import type { IScale } from '@univerjs/core';
-import type { IDocumentSkeletonSpan } from '../../../basics/i-document-skeleton-cached';
+import type { IDocumentSkeletonGlyph } from '../../../basics/i-document-skeleton-cached';
 import type { UniverRenderingContext } from '../../../context';
 import { docExtension } from '../doc-extension';
 export declare class FontAndBaseLine extends docExtension {
@@ -22,7 +22,7 @@ export declare class FontAndBaseLine extends docExtension {
     Z_INDEX: number;
     private _preFontString;
     private _preFontColor;
-    draw(ctx: UniverRenderingContext, parentScale: IScale, span: IDocumentSkeletonSpan): void;
+    draw(ctx: UniverRenderingContext, parentScale: IScale, glyph: IDocumentSkeletonGlyph): void;
     private _fillText;
     clearCache(): void;
 }

package/lib/types/components/docs/extensions/line.d.ts

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 import type { IScale } from '@univerjs/core';
-import type { IDocumentSkeletonSpan } from '../../../basics/i-document-skeleton-cached';
+import type { IDocumentSkeletonGlyph } from '../../../basics/i-document-skeleton-cached';
 import type { UniverRenderingContext } from '../../../context';
 import { docExtension } from '../doc-extension';
 export declare class Line extends docExtension {
     uKey: string;
     Z_INDEX: number;
     private _preBackgroundColor;
-    draw(ctx: UniverRenderingContext, parentScale: IScale, span: IDocumentSkeletonSpan): void;
+    draw(ctx: UniverRenderingContext, parentScale: IScale, span: IDocumentSkeletonGlyph): void;
     clearCache(): void;
     private _drawLine;
     private _setLineType;

package/lib/types/components/docs/{block → layout/block}/paragraph/bullet.d.ts

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 import type { IBullet, ILists, LocaleService, Nullable } from '@univerjs/core';
-import type { IDocumentSkeletonBullet } from '../../../../basics/i-document-skeleton-cached';
+import type { IDocumentSkeletonBullet } from '../../../../../basics/i-document-skeleton-cached';
 export declare function dealWithBullet(bullet?: IBullet, lists?: ILists, listLevelAncestors?: Array<Nullable<IDocumentSkeletonBullet>>, localeService?: LocaleService): IDocumentSkeletonBullet | undefined;
 export declare function getDefaultBulletSke(listId: string, startIndex?: number): IDocumentSkeletonBullet;

package/lib/types/components/docs/{block → layout/block}/paragraph/inline-drawing.d.ts

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 import type { IDrawing, LocaleService } from '@univerjs/core';
-import type { IDocumentSkeletonPage } from '../../../../basics/i-document-skeleton-cached';
-import type { IParagraphConfig, ISectionBreakConfig } from '../../../../basics/interfaces';
+import type { IDocumentSkeletonPage } from '../../../../../basics/i-document-skeleton-cached';
+import type { IParagraphConfig, ISectionBreakConfig } from '../../../../../basics/interfaces';
 export declare function dealWidthInlineDrawing(drawing: IDrawing, sectionBreakConfig: ISectionBreakConfig, allPages?: IDocumentSkeletonPage[], paragraphConfig?: IParagraphConfig, localeService?: LocaleService): never[];

package/lib/types/components/docs/{block → layout/block}/paragraph/language-ruler.d.ts

@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 import type { IParagraphStyle } from '@univerjs/core';
-import type { ISectionBreakConfig } from '../../../../basics/interfaces';
-import type { DataStreamTreeNode } from '../../view-model/data-stream-tree-node';
-import type { DocumentViewModel } from '../../view-model/document-view-model';
+import type { ISectionBreakConfig } from '../../../../../basics/interfaces';
+import type { DataStreamTreeNode } from '../../../view-model/data-stream-tree-node';
+import type { DocumentViewModel } from '../../../view-model/document-view-model';
 export declare function otherHandler(index: number, charArray: string, bodyModel: DocumentViewModel, paragraphNode: DataStreamTreeNode, sectionBreakConfig: ISectionBreakConfig, paragraphStyle: IParagraphStyle): {
     step: number;
-    spanGroup: import("../../../..").IDocumentSkeletonSpan[];
+    glyphGroup: import("../../../../..").IDocumentSkeletonGlyph[];
 };
 export declare function ArabicHandler(index: number, charArray: string, bodyModel: DocumentViewModel, paragraphNode: DataStreamTreeNode, sectionBreakConfig: ISectionBreakConfig, paragraphStyle: IParagraphStyle): {
     step: number;
-    spanGroup: import("../../../..").IDocumentSkeletonSpan[];
+    glyphGroup: import("../../../../..").IDocumentSkeletonGlyph[];
 };
 export declare function emojiHandler(index: number, charArray: string, bodyModel: DocumentViewModel, paragraphNode: DataStreamTreeNode, sectionBreakConfig: ISectionBreakConfig, paragraphStyle: IParagraphStyle): {
     step: number;
-    spanGroup: import("../../../..").IDocumentSkeletonSpan[];
+    glyphGroup: import("../../../../..").IDocumentSkeletonGlyph[];
 };
 export declare function TibetanHandler(index: number, charArray: string, bodyModel: DocumentViewModel, paragraphNode: DataStreamTreeNode, sectionBreakConfig: ISectionBreakConfig, paragraphStyle: IParagraphStyle): {
     step: number;
-    spanGroup: import("../../../..").IDocumentSkeletonSpan[];
+    glyphGroup: import("../../../../..").IDocumentSkeletonGlyph[];
 };

package/lib/types/components/docs/{block → layout/block}/paragraph/layout-ruler.d.ts

@@ -13,6 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { IDocumentSkeletonPage, IDocumentSkeletonSpan } from '../../../../basics/i-document-skeleton-cached';
-import type { IParagraphConfig, ISectionBreakConfig } from '../../../../basics/interfaces';
-export declare function calculateParagraphLayout(spanGroup: IDocumentSkeletonSpan[], pages: IDocumentSkeletonPage[], sectionBreakConfig: ISectionBreakConfig, paragraphConfig: IParagraphConfig, paragraphStart?: boolean): IDocumentSkeletonPage[];
+import type { IDocumentSkeletonGlyph, IDocumentSkeletonPage } from '../../../../../basics/i-document-skeleton-cached';
+import type { IParagraphConfig, ISectionBreakConfig } from '../../../../../basics/interfaces';
+export declare function layoutParagraph(glyphGroup: IDocumentSkeletonGlyph[], pages: IDocumentSkeletonPage[], sectionBreakConfig: ISectionBreakConfig, paragraphConfig: IParagraphConfig, paragraphStart?: boolean): IDocumentSkeletonPage[];

package/lib/types/components/docs/{block/paragraph/paragraph.d.ts → layout/block/paragraph/layout.d.ts}

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { IDocumentSkeletonPage, ISkeletonResourceReference } from '../../../../basics/i-document-skeleton-cached';
-import type { ISectionBreakConfig } from '../../../../basics/interfaces';
-import type { DataStreamTreeNode } from '../../view-model/data-stream-tree-node';
-import type { DocumentViewModel } from '../../view-model/document-view-model';
+import type { IDocumentSkeletonPage, ISkeletonResourceReference } from '../../../../../basics/i-document-skeleton-cached';
+import type { ISectionBreakConfig } from '../../../../../basics/interfaces';
+import type { DataStreamTreeNode } from '../../../view-model/data-stream-tree-node';
+import type { DocumentViewModel } from '../../../view-model/document-view-model';
 export declare function dealWidthParagraph(bodyModel: DocumentViewModel, paragraphNode: DataStreamTreeNode, curPage: IDocumentSkeletonPage, sectionBreakConfig: ISectionBreakConfig, skeletonResourceReference: ISkeletonResourceReference): IDocumentSkeletonPage[];

package/lib/types/components/docs/{block/paragraph/index.d.ts → layout/block/paragraph/line-adjustment.d.ts}

@@ -13,9 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export * from './bullet';
-export * from './bullet-ruler';
-export * from './inline-drawing';
-export * from './language-ruler';
-export * from './layout-ruler';
-export * from './paragraph';
+import type { IParagraph } from '@univerjs/core';
+import type { IDocumentSkeletonPage } from '../../../../../basics/i-document-skeleton-cached';
+export declare function lineAdjustment(pages: IDocumentSkeletonPage[], paragraph: IParagraph): void;

package/lib/types/components/docs/layout/block/paragraph/linebreaking.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import type { IDocumentSkeletonPage, ISkeletonResourceReference } from '../../../../../basics/i-document-skeleton-cached';
+import type { DataStreamTreeNode } from '../../../view-model/data-stream-tree-node';
+import type { DocumentViewModel } from '../../../view-model/document-view-model';
+import type { ISectionBreakConfig } from '../../../../../basics/interfaces';
+import type { IShapedText } from './shaping';
+export declare function lineBreaking(shapedTextList: IShapedText[], curPage: IDocumentSkeletonPage, bodyModel: DocumentViewModel, paragraphNode: DataStreamTreeNode, sectionBreakConfig: ISectionBreakConfig, skeletonResourceReference: ISkeletonResourceReference): IDocumentSkeletonPage[];

package/lib/types/components/docs/layout/block/paragraph/shaping.d.ts

@@ -0,0 +1,25 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import type { IParagraphStyle } from '@univerjs/core';
+import type { IDocumentSkeletonGlyph } from '../../../../../basics/i-document-skeleton-cached';
+import type { DataStreamTreeNode } from '../../../view-model/data-stream-tree-node';
+import type { DocumentViewModel } from '../../../view-model/document-view-model';
+import type { ISectionBreakConfig } from '../../../../../basics/interfaces';
+export interface IShapedText {
+    text: string;
+    glyphs: IDocumentSkeletonGlyph[];
+}
+export declare function shaping(content: string, bodyModel: DocumentViewModel, paragraphNode: DataStreamTreeNode, sectionBreakConfig: ISectionBreakConfig, paragraphStyle: IParagraphStyle): IShapedText[];

package/lib/types/components/docs/{block → layout/block}/section.d.ts

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { IDocumentSkeletonPage, ISkeletonResourceReference } from '../../../basics/i-document-skeleton-cached';
-import type { ISectionBreakConfig } from '../../../basics/interfaces';
-import type { DataStreamTreeNode } from '../view-model/data-stream-tree-node';
-import type { DocumentViewModel } from '../view-model/document-view-model';
-export declare function dealWithSections(bodyModel: DocumentViewModel, sectionNode: DataStreamTreeNode, curPage: IDocumentSkeletonPage, sectionBreakConfig: ISectionBreakConfig, skeletonResourceReference: ISkeletonResourceReference, preRenderedBlockIdMap?: Map<string, boolean>): {
+import type { IDocumentSkeletonPage, ISkeletonResourceReference } from '../../../../basics/i-document-skeleton-cached';
+import type { ISectionBreakConfig } from '../../../../basics/interfaces';
+import type { DataStreamTreeNode } from '../../view-model/data-stream-tree-node';
+import type { DocumentViewModel } from '../../view-model/document-view-model';
+export declare function dealWithSections(bodyModel: DocumentViewModel, sectionNode: DataStreamTreeNode, curPage: IDocumentSkeletonPage, sectionBreakConfig: ISectionBreakConfig, skeletonResourceReference: ISkeletonResourceReference, _preRenderedBlockIdMap?: Map<string, boolean>): {
     pages: IDocumentSkeletonPage[];
     renderedBlockIdMap: Map<string, boolean>;
 };

package/lib/types/components/docs/{doc-skeleton.d.ts → layout/doc-skeleton.d.ts}

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 import type { LocaleService, Nullable } from '@univerjs/core';
-import type { IDocumentSkeletonCached, IDocumentSkeletonSpan } from '../../basics/i-document-skeleton-cached';
-import { PageLayoutType } from '../../basics/i-document-skeleton-cached';
-import type { INodeInfo, INodePosition, INodeSearch } from '../../basics/interfaces';
-import type { IViewportBound, Vector2 } from '../../basics/vector2';
-import { Skeleton } from '../skeleton';
-import type { DocumentViewModel } from './view-model/document-view-model';
+import type { IDocumentSkeletonCached, IDocumentSkeletonGlyph } from '../../../basics/i-document-skeleton-cached';
+import { PageLayoutType } from '../../../basics/i-document-skeleton-cached';
+import type { INodeInfo, INodePosition, INodeSearch } from '../../../basics/interfaces';
+import type { IViewportBound, Vector2 } from '../../../basics/vector2';
+import { Skeleton } from '../../skeleton';
+import type { DocumentViewModel } from '../view-model/document-view-model';
 export declare enum DocumentSkeletonState {
     PENDING = "pending",
     CALCULATING = "calculating",
@@ -42,10 +42,10 @@ export declare class DocumentSkeleton extends Skeleton {
     };
     private _getPageActualWidth;
     getPageSize(): import("@univerjs/core").ISize | undefined;
-    findPositionBySpan(span: IDocumentSkeletonSpan): Nullable<INodeSearch>;
+    findPositionByGlyph(glyph: IDocumentSkeletonGlyph): Nullable<INodeSearch>;
     findNodePositionByCharIndex(charIndex: number, isBack?: boolean): Nullable<INodePosition>;
-    findNodeByCharIndex(charIndex: number): Nullable<IDocumentSkeletonSpan>;
-    findSpanByPosition(position: Nullable<INodePosition>): IDocumentSkeletonSpan | undefined;
+    findNodeByCharIndex(charIndex: number): Nullable<IDocumentSkeletonGlyph>;
+    findGlyphByPosition(position: Nullable<INodePosition>): IDocumentSkeletonGlyph | undefined;
     findNodeByCoord(coord: Vector2, pageLayoutType: PageLayoutType, pageMarginLeft: number, pageMarginTop: number): Nullable<INodeInfo>;
     private _getNearestNode;
     private _getPageBoundingBox;

package/lib/types/components/docs/layout/model/__test__/glyph.spec.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export {};

package/lib/types/components/docs/{common → layout/model}/column.d.ts

@@ -15,5 +15,5 @@
  */
 import type { ISectionColumnProperties } from '@univerjs/core';
 import { ColumnSeparatorType } from '@univerjs/core';
-import type { IDocumentSkeletonColumn } from '../../../basics/i-document-skeleton-cached';
+import type { IDocumentSkeletonColumn } from '../../../../basics/i-document-skeleton-cached';
 export declare function createSkeletonColumn(columnIndex: number | undefined, columnProperties: ISectionColumnProperties[], columnSeparatorType?: ColumnSeparatorType, pageWidth?: number): IDocumentSkeletonColumn;

package/lib/types/components/docs/layout/model/glyph.d.ts

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import type { IAdjustability, IDocumentSkeletonBullet, IDocumentSkeletonDivide, IDocumentSkeletonGlyph } from '../../../../basics/i-document-skeleton-cached';
+import { GlyphType } from '../../../../basics/i-document-skeleton-cached';
+import type { IFontCreateConfig } from '../../../../basics/interfaces';
+export declare function isSpace(char: string): boolean;
+export declare function isJustifiable(content: string): boolean;
+export declare function baseAdjustability(content: string, width: number): IAdjustability;
+export declare function createSkeletonWordGlyph(content: string, config: IFontCreateConfig, glyphWidth?: number): IDocumentSkeletonGlyph;
+export declare function createSkeletonLetterGlyph(content: string, config: IFontCreateConfig, glyphWidth?: number): IDocumentSkeletonGlyph;
+export declare function createSkeletonTabGlyph(config: IFontCreateConfig, glyphWidth?: number): IDocumentSkeletonGlyph;
+export declare function _createSkeletonWordOrLetter(glyphType: GlyphType, content: string, config: IFontCreateConfig, glyphWidth?: number): IDocumentSkeletonGlyph;
+export declare function createSkeletonBulletGlyph(glyph: IDocumentSkeletonGlyph, bulletSkeleton: IDocumentSkeletonBullet, charSpaceApply: number): IDocumentSkeletonGlyph;
+export declare function setGlyphGroupLeft(glyphGroup: IDocumentSkeletonGlyph[], left?: number): void;
+export declare function setGlyphLeft(glyph: IDocumentSkeletonGlyph, left?: number): void;
+export declare function addGlyphToDivide(divide: IDocumentSkeletonDivide, glyphGroup: IDocumentSkeletonGlyph[], offsetLeft?: number): void;
+export declare function glyphShrinkRight(glyph: IDocumentSkeletonGlyph, amount: number): void;
+export declare function glyphShrinkLeft(glyph: IDocumentSkeletonGlyph, amount: number): void;

package/lib/types/components/docs/{common → layout/model}/line.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { IDocumentSkeletonDivide, IDocumentSkeletonDrawing, IDocumentSkeletonDrawingAnchor, IDocumentSkeletonLine, LineType } from '../../../basics/i-document-skeleton-cached';
+import type { IDocumentSkeletonDivide, IDocumentSkeletonDrawing, IDocumentSkeletonDrawingAnchor, IDocumentSkeletonLine, LineType } from '../../../../basics/i-document-skeleton-cached';
 interface ILineBoundingBox {
     lineHeight: number;
     lineTop: number;

package/lib/types/components/docs/{common → layout/model}/page.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { IDocumentSkeletonPage, ISkeletonResourceReference } from '../../../basics/i-document-skeleton-cached';
-import { BreakType } from '../../../basics/i-document-skeleton-cached';
-import type { ISectionBreakConfig } from '../../../basics/interfaces';
+import type { IDocumentSkeletonPage, ISkeletonResourceReference } from '../../../../basics/i-document-skeleton-cached';
+import { BreakType } from '../../../../basics/i-document-skeleton-cached';
+import type { ISectionBreakConfig } from '../../../../basics/interfaces';
 export declare function createSkeletonPage(sectionBreakConfig: ISectionBreakConfig, skeletonResourceReference: ISkeletonResourceReference, pageNumber?: number, breakType?: BreakType): IDocumentSkeletonPage;

package/lib/types/components/docs/{common → layout/model}/section.d.ts

@@ -15,6 +15,6 @@
  */
 import type { ISectionColumnProperties } from '@univerjs/core';
 import { ColumnSeparatorType } from '@univerjs/core';
-import type { IDocumentSkeletonColumn, IDocumentSkeletonSection } from '../../../basics/i-document-skeleton-cached';
+import type { IDocumentSkeletonColumn, IDocumentSkeletonSection } from '../../../../basics/i-document-skeleton-cached';
 export declare function createSkeletonSection(columnProperties?: ISectionColumnProperties[], columnSeparatorType?: ColumnSeparatorType, top?: number, left?: number, sectionWidth?: number, sectionHeight?: number): IDocumentSkeletonSection;
 export declare function setColumnFullState(column: IDocumentSkeletonColumn, state: boolean): void;

package/lib/types/components/docs/{common → layout}/tools.d.ts

@@ -15,7 +15,7 @@
  */
 import type { INumberUnit, IParagraphStyle, ITextStyle, ObjectPositionH, ObjectPositionV } from '@univerjs/core';
 import { BooleanNumber, GridType, SpacingRule } from '@univerjs/core';
-import type { IDocumentSkeletonColumn, IDocumentSkeletonDivide, IDocumentSkeletonLine, IDocumentSkeletonPage, IDocumentSkeletonSpan } from '../../../basics/i-document-skeleton-cached';
+import type { IDocumentSkeletonColumn, IDocumentSkeletonDivide, IDocumentSkeletonGlyph, IDocumentSkeletonLine, IDocumentSkeletonPage } from '../../../basics/i-document-skeleton-cached';
 import type { IParagraphConfig, ISectionBreakConfig } from '../../../basics/interfaces';
 import type { DataStreamTreeNode } from '../view-model/data-stream-tree-node';
 import type { DocumentViewModel } from '../view-model/document-view-model';
@@ -39,7 +39,7 @@ export declare function getLastNotFullDivideInfo(page: IDocumentSkeletonPage): {
 } | undefined;
 export declare function getNextDivide(curLine: IDocumentSkeletonLine, curDivide: IDocumentSkeletonDivide): IDocumentSkeletonDivide | undefined;
 export declare function getLastRemainingDivide(curLine: IDocumentSkeletonLine): IDocumentSkeletonDivide | undefined;
-export declare function getLastSpan(page: IDocumentSkeletonPage): IDocumentSkeletonSpan | undefined;
+export declare function getLastSpan(page: IDocumentSkeletonPage): IDocumentSkeletonGlyph | undefined;
 export declare function isColumnFull(page: IDocumentSkeletonPage): boolean;
 export declare function isBlankPage(page: IDocumentSkeletonPage): boolean;
 export declare function isBlankColumn(column: IDocumentSkeletonColumn): boolean;
@@ -62,12 +62,12 @@ export declare function getCharSpaceConfig(sectionBreakConfig: ISectionBreakConf
     snapToGrid: BooleanNumber;
 };
 export declare function updateBlockIndex(pages: IDocumentSkeletonPage[], start?: number): void;
-export declare function spanIterator(pages: IDocumentSkeletonPage[], iteratorFunction: (span: IDocumentSkeletonSpan) => void): void;
+export declare function spanIterator(pages: IDocumentSkeletonPage[], iteratorFunction: (glyph: IDocumentSkeletonGlyph) => void): void;
 export declare function lineIterator(pages: IDocumentSkeletonPage[], iteratorFunction: (line: IDocumentSkeletonLine) => void): void;
 export declare function columnIterator(pages: IDocumentSkeletonPage[], iteratorFunction: (column: IDocumentSkeletonColumn) => void): void;
 export declare function getPositionHorizon(positionH: ObjectPositionH, column: IDocumentSkeletonColumn, page: IDocumentSkeletonPage, objectWidth: number, isPageBreak?: boolean): number | undefined;
 export declare function getPositionVertical(positionV: ObjectPositionV, page: IDocumentSkeletonPage, lineTop: number, lineHeight: number, objectHeight: number, blockAnchorTop?: number, isPageBreak?: boolean): number | undefined;
-export declare function getSpanGroupWidth(divide: IDocumentSkeletonDivide): number;
+export declare function getGlyphGroupWidth(divide: IDocumentSkeletonDivide): number;
 interface IFontCreateConfig {
     fontStyle: {
         fontString: string;

package/lib/types/components/docs/{common/liquid.d.ts → liquid.d.ts}

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { IDocumentSkeletonColumn, IDocumentSkeletonDivide, IDocumentSkeletonLine, IDocumentSkeletonPage, IDocumentSkeletonSection, IDocumentSkeletonSpan } from '../../../basics/i-document-skeleton-cached';
-import { PageLayoutType } from '../../../basics/i-document-skeleton-cached';
+import type { IDocumentSkeletonColumn, IDocumentSkeletonDivide, IDocumentSkeletonGlyph, IDocumentSkeletonLine, IDocumentSkeletonPage, IDocumentSkeletonSection } from '../../basics/i-document-skeleton-cached';
+import { PageLayoutType } from '../../basics/i-document-skeleton-cached';
 export declare class Liquid {
     private _translateX;
     private _translateY;
@@ -28,7 +28,7 @@ export declare class Liquid {
     translateRestore(): void;
     translatePagePadding(page: IDocumentSkeletonPage): void;
     restorePagePadding(page: IDocumentSkeletonPage): void;
-    translatePage(page: IDocumentSkeletonPage, type?: PageLayoutType, left?: number, top?: number, right?: number, bottom?: number): {
+    translatePage(page: IDocumentSkeletonPage, type?: PageLayoutType, left?: number, top?: number, _right?: number, _bottom?: number): {
         x: number;
         y: number;
     };
@@ -48,7 +48,7 @@ export declare class Liquid {
         x: number;
         y: number;
     };
-    translateSpan(span: IDocumentSkeletonSpan): {
+    translateSpan(glyph: IDocumentSkeletonGlyph): {
         x: number;
         y: number;
     };