devexpress-richedit 24.2.7-build-25107-0104 → 24.2.8-build-25135-0103

package/index.d.ts

@@ -1,6 +1,6 @@
 /**
 * DevExpress WebRichEdit (index.d.ts)
-* Version: 24.2.7
+* Version: 24.2.8
 * Copyright (c) 2012 - 2025 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs
 */

package/index.js

@@ -1,6 +1,6 @@
 /**
 * DevExpress WebRichEdit (index.js)
-* Version: 24.2.7
+* Version: 24.2.8
 * Copyright (c) 2012 - 2025 Developer Express Inc. ALL RIGHTS RESERVED
 * License: https://www.devexpress.com/Support/EULAs
 */

package/lib/client/client-rich-edit.js

@@ -61,8 +61,8 @@ export class ClientRichEdit {
         this.rawDataSource = settings.rawDataSource;
         this.contextMenuSettings = settings.contextMenuSettings;
         this.fullScreenHelper = new FullScreenHelper(element);
-        if ("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaVZqWlNVWEpJWkdZelVXRmlNbGQ1YldsWlpIZFlUU0lLZlE9PS53aEFZRnYvUVRDWlVKalVITm14M25DLzVnWE9aV09wQmFYbm9JMlg1MHJadTdrbm9Mc2lIRUs0REoyZWlQZi9tSEExRk9ySlltanFtSWdKWTZpQ2prSTVtYlVnN1N6ZEI0SUIvektuMTdlQlRUQit0YThVZDNzSThNK3NES2ZRd3NMNU5tdz09In0=")
-            config(JSON.parse(atob("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaVZqWlNVWEpJWkdZelVXRmlNbGQ1YldsWlpIZFlUU0lLZlE9PS53aEFZRnYvUVRDWlVKalVITm14M25DLzVnWE9aV09wQmFYbm9JMlg1MHJadTdrbm9Mc2lIRUs0REoyZWlQZi9tSEExRk9ySlltanFtSWdKWTZpQ2prSTVtYlVnN1N6ZEI0SUIvektuMTdlQlRUQit0YThVZDNzSThNK3NES2ZRd3NMNU5tdz09In0=")));
+        if ("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaVVUTmhiM0ZJYzFKRU0zWllaVlZOVUdSWVNEZHhOU0lLZlE9PS5rMTA4KzRjbVFYSU96S1F1bUlqUE5oQkw0ejc5N0VSNlByVkkxcTB3V1QwbnkwUTVNZnkzRkJONlV5Zk9PV2p1eUJwaDR1ZllMM0llb0g4UHhNUU5wQUhUb3VUTTFFOHZaM01CM0lac2c1L1ZoOXhUNkg4TFJQSGZoQk00Rk5HUE5zNkY0dz09In0=")
+            config(JSON.parse(atob("eyJsaWNlbnNlS2V5IjoiZXdvZ0lDSm1iM0p0WVhRaU9pQXhMQW9nSUNKcGJuUmxjbTVoYkZWellXZGxTV1FpT2lBaVVUTmhiM0ZJYzFKRU0zWllaVlZOVUdSWVNEZHhOU0lLZlE9PS5rMTA4KzRjbVFYSU96S1F1bUlqUE5oQkw0ejc5N0VSNlByVkkxcTB3V1QwbnkwUTVNZnkzRkJONlV5Zk9PV2p1eUJwaDR1ZllMM0llb0g4UHhNUU5wQUhUb3VUTTFFOHZaM01CM0lac2c1L1ZoOXhUNkg4TFJQSGZoQk00Rk5HUE5zNkY0dz09In0=")));
         this.prepareElement(element, settings);
         this.initDefaultFontsAndStyles();
         this.initBars(settings.ribbon, settings.fonts);

package/lib/client/commands/mail-merge-command.js

@@ -44,7 +44,8 @@ export class MailMergeCommand extends CommandBase {
         return true;
     }
     executeCore(_state, options) {
-        const docxExporter = new DocxExporter(this.control.modelManager.modelManipulator, new DocxExportOptions());
+        const exportModelOptions = this.control.getExportModelOptions();
+        const docxExporter = new DocxExporter(exportModelOptions, new DocxExportOptions());
         docxExporter.exportToBlob((blob) => {
             const docxImporter = new Importer(new ImporterOptions());
             docxImporter.importFromFile(blob, this.control.modelManager.richOptions, (documentModel, formatImagesImporter) => {

package/lib/client/formats/docx/export/data.d.ts

@@ -23,6 +23,9 @@ import { BaseSubDocumentExporter } from './exporters/sub-document/base-sub-docum
 import { TextBoxSubDocumentExporter } from './exporters/sub-document/text-box-content-exporter';
 import { IdGenerator } from './utils/id-generator';
 import { WriterHelper } from './utils/writer-helper';
+import { Grid } from '../../../../common/layout-formatter/table/grid-engine/grid';
+import { IExportModelOptions } from '../../../../common/formats/i-document-exporter';
+import { Table } from '../../../../common/model/tables/main-structures/table';
 export declare class Data {
     get writer(): XmlWriter;
     set writer(val: XmlWriter);
@@ -30,6 +33,7 @@ export declare class Data {
     get relationExporter(): RelationCollectionExporter;
     get mainSubDocumentRelations(): DocumentRelationsExporter;
     model: DocumentModel;
+    grids: Map<Table, Grid>;
     options: DocxExportOptions;
     headerCounter: number;
     footerCounter: number;
@@ -58,7 +62,7 @@ export declare class Data {
     endNotes: Map<SubDocument, number>;
     private writerStack;
     private relationExporters;
-    constructor(model: DocumentModel, options: DocxExportOptions);
+    constructor(exportModelOptions: IExportModelOptions, options: DocxExportOptions);
     popWriter(): void;
     pushRelationExporter(exporter: RelationCollectionExporter): void;
     popRelationExporter(): void;

package/lib/client/formats/docx/export/data.js

@@ -23,11 +23,12 @@ export class Data {
     get subDocumentExporter() { return this.subDocumentExporterStack.last; }
     get relationExporter() { return ListUtils.last(this.relationExporters); }
     get mainSubDocumentRelations() { return this.relationExporters[0]; }
-    constructor(model, options) {
+    constructor(exportModelOptions, options) {
         this.drawingElementId = 1;
         this.exportSubDocumentsList = [];
         this.relationExporters = [];
-        this.model = model;
+        this.model = exportModelOptions.modelManager.model;
+        this.grids = exportModelOptions.grids;
         this.options = options;
         this.constants = new DocxConstants();
         this.writerStack = new Stack();

package/lib/client/formats/docx/export/exporter.d.ts

@@ -1,11 +1,10 @@
-import { IDocumentExporter } from '../../../../common/formats/i-document-exporter';
-import { ModelManipulator } from '../../../../common/model/manipulators/model-manipulator';
+import { IDocumentExporter, IExportModelOptions } from '../../../../common/formats/i-document-exporter';
 import { DocxExportOptions } from './docx-export-options';
 export declare class DocxExporter implements IDocumentExporter {
     private data;
     private modelManipulator;
     private options;
-    constructor(modelManipulator: ModelManipulator, options: DocxExportOptions);
+    constructor(exportModelOptions: IExportModelOptions, options: DocxExportOptions);
     exportToBlob(callback: (blob: Blob) => void): void;
     exportToBase64(callback: (base64: string) => void): void;
     private exportInner;

package/lib/client/formats/docx/export/exporter.js

@@ -9,10 +9,10 @@ import { MainSubDocumentExporter } from './exporters/sub-document/main-sub-docum
 import { ThemeExporter } from './exporters/theme';
 import { EndNoteExporter, FootNoteExporter } from './exporters/sub-document/note-sub-document-exporter';
 export class DocxExporter {
-    constructor(modelManipulator, options) {
-        this.modelManipulator = modelManipulator;
+    constructor(exportModelOptions, options) {
+        this.modelManipulator = exportModelOptions.modelManager.modelManipulator;
         this.options = options;
-        this.data = new Data(modelManipulator.model, options);
+        this.data = new Data(exportModelOptions, options);
     }
     exportToBlob(callback) {
         this.modelManipulator.picture.loader.ensureAllPicturesLoaded(this.options.ensurePictureLoadedTimeout, (_loaded) => {

package/lib/client/formats/docx/export/exporters/base/sections.d.ts

@@ -11,7 +11,6 @@ export declare class SectionExporter extends BaseExporter {
     private exportSectionHeadersFootersCore;
     private exportSectionPropertiesCore;
     private exportSectionPage;
-    private shouldExportSectionPage;
     private exportSectionMargins;
     private exportSectionLineNumbering;
     private exportSectionPageNumbering;

package/lib/client/formats/docx/export/exporters/base/sections.js

@@ -75,21 +75,13 @@ export class SectionExporter extends BaseExporter {
         this.exportSectionGeneralSettings(props);
     }
     exportSectionPage(props) {
-        if (!this.shouldExportSectionPage(props))
-            return;
         this.writer.writeWpStartElement('pgSz');
-        if (props.pageSize.width != SectionExporter.defaultProps.pageSize.width)
-            this.writer.writeWpIntAttr('w', props.pageSize.width);
-        if (props.pageSize.height != SectionExporter.defaultProps.pageSize.height)
-            this.writer.writeWpIntAttr('h', props.pageSize.height);
+        this.writer.writeWpIntAttr('w', props.pageSize.width);
+        this.writer.writeWpIntAttr('h', props.pageSize.height);
         if (props.landscape)
             this.writer.writeWpStringAttr('orient', props.landscape ? 'landscape' : 'portrait');
         this.writer.endElement();
     }
-    shouldExportSectionPage(props) {
-        return !props.pageSize.equals(SectionExporter.defaultProps.pageSize) ||
-            props.landscape != SectionExporter.defaultProps.landscape;
-    }
     exportSectionMargins(props) {
         this.writer.writeWpStartElement('pgMar');
         this.writer.writeWpIntAttr('left', props.marginLeft);

package/lib/client/formats/docx/export/exporters/base/table/table.d.ts

@@ -8,7 +8,7 @@ export declare class TableExporter extends BaseExporter {
     private initTableDeferred;
     init(): void;
     checkTable(pos: number, allowInitNextTable: boolean): void;
-    getTableGrid(table: Table): number[];
+    private getTableGrid;
     private initNewTables;
     private closeTables;
     private handleNextCell;

package/lib/client/formats/docx/export/exporters/base/table/table.js

@@ -6,6 +6,7 @@ import { ListUtils } from '@devexpress/utils/lib/utils/list';
 import { BaseExporter } from '../../base';
 import { TableCellPropertiesExporter } from './table-cell-properties';
 import { TableRowPropertiesExporter } from './table-row-properties';
+import { UnitConverter } from '@devexpress/utils/lib/class/unit-converter';
 export class TableExporter extends BaseExporter {
     constructor() {
         super(...arguments);
@@ -35,10 +36,9 @@ export class TableExporter extends BaseExporter {
         }
     }
     getTableGrid(table) {
-        if (table.rows[0].logicColumnCount < 64)
-            return [];
-        const colGrid = [];
-        return colGrid;
+        var _a, _b;
+        const grid = this.data.grids.get(table);
+        return ((_b = (_a = grid === null || grid === void 0 ? void 0 : grid.columns) === null || _a === void 0 ? void 0 : _a.width) === null || _b === void 0 ? void 0 : _b.map(UnitConverter.pixelsToTwips)) || [];
     }
     initNewTables(newIndexes, allowInitNextTable) {
         for (let levelIndex = this.tableIndexes.length; levelIndex < newIndexes.length; levelIndex++) {

package/lib/client/formats/docx/import/destination/paragraph-properties/properties/paragraph-spacing-destination.js

@@ -12,10 +12,12 @@ export class ParagraphSpacingDestination extends ParagraphFormattingLeafElementD
             const spacingBefore = this.data.readerHelper.getWpSTIntegerValue(reader, 'before', Constants.MIN_SAFE_INTEGER);
             if (spacingBefore >= 0)
                 this.paragraphProperties.setValue(ParagraphPropertyDescriptor.spacingBefore, spacingBefore);
-            this.paragraphProperties.setValue(ParagraphPropertyDescriptor.beforeAutoSpacing, spacingBefore == -1 ||
-                this.data.readerHelper.getWpSTOnOffValue(reader, new WordProcessingMLValue('beforeAutospacing', 'before-autospacing').openXmlValue, false));
-            this.paragraphProperties.setValue(ParagraphPropertyDescriptor.afterAutoSpacing, spacingAfter == -1 ||
-                this.data.readerHelper.getWpSTOnOffValue(reader, new WordProcessingMLValue('afterAutospacing', 'after-autospacing').openXmlValue, false));
+            const beforeAutoSpacing = this.data.readerHelper.getWpSTOnOffValue(reader, 'beforeAutospacing', null);
+            if (spacingBefore == -1 || beforeAutoSpacing != null)
+                this.paragraphProperties.setValue(ParagraphPropertyDescriptor.beforeAutoSpacing, spacingBefore == -1 || beforeAutoSpacing);
+            const afterAutoSpacing = this.data.readerHelper.getWpSTOnOffValue(reader, 'afterAutospacing', null);
+            if (spacingAfter == -1 || afterAutoSpacing != null)
+                this.paragraphProperties.setValue(ParagraphPropertyDescriptor.afterAutoSpacing, spacingAfter == -1 || afterAutoSpacing);
             const lineSpacing = this.data.readerHelper.getWpSTIntegerValue(reader, 'line', Constants.MIN_SAFE_INTEGER);
             if (lineSpacing != Constants.MIN_SAFE_INTEGER && lineSpacing > 0) {
                 const attribute = new WordProcessingMLValue('lineRule', 'line-rule');

package/lib/client/model-api/formats/exporter.js

@@ -15,8 +15,8 @@ export function exportModelToBlob(exportModelOptions, callback) {
 function getExporter(exportModelOptions) {
     const { modelManipulator } = exportModelOptions.modelManager;
     switch (exportModelOptions.documentFormat) {
-        case DocumentFormat.OpenXml: return new DocxExporter(modelManipulator, new DocxExportOptions());
-        case DocumentFormat.Rtf: return new RtfExporter(modelManipulator, new RtfDocumentExporterOptions());
+        case DocumentFormat.OpenXml: return new DocxExporter(exportModelOptions, new DocxExportOptions());
+        case DocumentFormat.Rtf: return new RtfExporter(exportModelOptions, new RtfDocumentExporterOptions());
         case DocumentFormat.PlainText: return new TxtExporter(modelManipulator, new DocumentExporterOptions());
         case DocumentFormat.Html: return new HtmlDocumentExporter(exportModelOptions, new DocumentExporterOptions());
         default:

package/lib/client/model-api/sub-document.js

@@ -211,7 +211,7 @@ export class SubDocumentApi {
     }
     getRtf(interval) {
         const coreInterval = this._checkInterval(interval);
-        return getRtfFromSubDocumentPublic(this._processor.modelManager.richOptions, this._subDocument, coreInterval);
+        return getRtfFromSubDocumentPublic(this._processor, this._subDocument, coreInterval);
     }
     insertContent(position, content, documentFormat, callback) {
         position = ApiParametersChecker.check(position, 1, false, [

package/lib/common/formats/i-document-exporter.d.ts

@@ -1,6 +1,8 @@
 import { IPictureRenderer } from "../canvas/picture-renderer";
 import { DocumentFormat } from "../document-format";
+import { Grid } from "../layout-formatter/table/grid-engine/grid";
 import { IModelManager } from "../model-manager";
+import { Table } from "../model/tables/main-structures/table";
 import { IRichEditUnitConverter } from "../utils/unit-converter";
 export interface IDocumentExporter {
     exportToBlob(callback: (blob: Blob) => void): any;
@@ -14,5 +16,6 @@ export interface IExportModelOptions {
     sessionGuid: string;
     clientGuid: string;
     lastMaxNumPages?: number;
+    grids?: Map<Table, Grid>;
     pageIndex?: number;
 }

package/lib/common/formats/rtf/export/exporter.d.ts

@@ -1,7 +1,6 @@
-import { IDocumentExporter } from '../../i-document-exporter';
+import { IDocumentExporter, IExportModelOptions } from '../../i-document-exporter';
 import { ColorModelInfo } from '../../../model/color/color-model-info';
 import { DocumentModel } from '../../../model/document-model';
-import { ModelManipulator } from '../../../model/manipulators/model-manipulator';
 import { RtfContentExporter } from './exporters/rtf-content-exporter';
 import { RtfExportHelper } from './helpers/rtf-export-helper';
 import { RtfBuilder } from './rtf-builder';
@@ -13,7 +12,7 @@ export declare class RtfExporter implements IDocumentExporter {
     contentExporter: RtfContentExporter;
     private modelManipulator;
     get documentModel(): DocumentModel;
-    constructor(modelManipulator: ModelManipulator, options: RtfDocumentExporterOptions);
+    constructor(exportModelOptions: IExportModelOptions, options: RtfDocumentExporterOptions);
     exportToBlob(callback: (blob: Blob) => void): void;
     exportToBase64(callback: (base64: string) => void): void;
     exportAsString(): string;

package/lib/common/formats/rtf/export/exporter.js

@@ -11,11 +11,11 @@ import { RtfContentExporter } from './exporters/rtf-content-exporter';
 import { RtfExportHelper } from './helpers/rtf-export-helper';
 export class RtfExporter {
     get documentModel() { return this.modelManipulator.model; }
-    constructor(modelManipulator, options) {
-        this.modelManipulator = modelManipulator;
+    constructor(exportModelOptions, options) {
+        this.modelManipulator = exportModelOptions.modelManager.modelManipulator;
         this.options = options;
         this.rtfExportHelper = new RtfExportHelper();
-        this.contentExporter = new RtfContentExporter(this.documentModel, options, this.rtfExportHelper);
+        this.contentExporter = new RtfContentExporter(exportModelOptions, options, this.rtfExportHelper);
         this.rtfBuilder = this.contentExporter.createRtfBuilder();
     }
     exportToBlob(callback) {

package/lib/common/formats/rtf/export/exporters/rtf-content-exporter.d.ts

@@ -8,6 +8,7 @@ import { Section } from '../../../../model/section/section';
 import { SubDocument } from '../../../../model/sub-document';
 import { FooterSubDocumentInfo, HeaderSubDocumentInfo } from '../../../../model/sub-document-infos';
 import { ConditionalTableStyleFormatting } from '../../../../model/tables/secondary-structures/table-base-structures';
+import { IExportModelOptions } from '../../../../formats/i-document-exporter';
 import { RtfExportHelper } from '../helpers/rtf-export-helper';
 import { PieceTableNumberingListCountersManager } from '../piece-table-numbering-list-counters-manager';
 import { RtfBuilder } from '../rtf-builder';
@@ -17,7 +18,7 @@ import { RtfParagraphPropertiesExporter } from './rtf-paragraph-properties-expor
 import { RtfSectionPropertiesExporter } from './rtf-section-properties-exporter';
 export type RunHandler = (run: RunBase, runText: string, absolutePosition: number) => void;
 export declare class RtfContentExporter {
-    documentModel: DocumentModel;
+    exportModelOptions: IExportModelOptions;
     subDocument: SubDocument;
     currentSection: Section;
     static readonly verticalAlignmentTypes: Record<number, string>;
@@ -44,9 +45,10 @@ export declare class RtfContentExporter {
     private bookmarksIterator;
     private permissionsIterator;
     tableIterator: TableIterator;
+    get documentModel(): DocumentModel;
     private startSectionParagraphIndex;
     private shouldFourceUpdateIterators;
-    constructor(documentModel: DocumentModel, options: RtfDocumentExporterOptions, rtfExportHelper: RtfExportHelper);
+    constructor(exportModelOptions: IExportModelOptions, options: RtfDocumentExporterOptions, rtfExportHelper: RtfExportHelper);
     createRtfBuilder(): RtfBuilder;
     export(): void;
     shouldSplitRuns(): boolean;

package/lib/common/formats/rtf/export/exporters/rtf-content-exporter.js

@@ -37,17 +37,18 @@ import { RtfTableExporter } from './table/rtf-table-exporter';
 export class RtfContentExporter {
     get shouldExportHiddenText() { return true; }
     ;
-    constructor(documentModel, options, rtfExportHelper) {
+    get documentModel() { return this.exportModelOptions.modelManager.modelManipulator.model; }
+    constructor(exportModelOptions, options, rtfExportHelper) {
         this.shouldFourceUpdateIterators = false;
-        this.documentModel = documentModel;
+        this.exportModelOptions = exportModelOptions;
         this.subDocument = this.documentModel.mainSubDocument;
         this.pieceTableNumberingListCounters = new PieceTableNumberingListCountersManager();
         this.rtfExportHelper = rtfExportHelper;
         this.options = options;
         this.rtfBuilder = this.createRtfBuilder();
-        this.paragraphPropertiesExporter = new RtfParagraphPropertiesExporter(documentModel, rtfExportHelper, this.rtfBuilder);
-        this.characterPropertiesExporter = new RtfCharacterPropertiesExporter(documentModel, rtfExportHelper, this.rtfBuilder, options);
-        this.sectionPropertiesExporter = new RtfSectionPropertiesExporter(documentModel, rtfExportHelper, this.rtfBuilder);
+        this.paragraphPropertiesExporter = new RtfParagraphPropertiesExporter(this.documentModel, rtfExportHelper, this.rtfBuilder);
+        this.characterPropertiesExporter = new RtfCharacterPropertiesExporter(this.documentModel, rtfExportHelper, this.rtfBuilder, options);
+        this.sectionPropertiesExporter = new RtfSectionPropertiesExporter(this.documentModel, rtfExportHelper, this.rtfBuilder);
         this.runHandlerMap = new MapCreator()
             .add(RunType.TextRun, this.exportTextRun)
             .add(RunType.FieldCodeStartRun, this.fieldCodeStartRunHandler)
@@ -257,7 +258,7 @@ export class RtfContentExporter {
             value = "00000000";
         }
         else {
-            const view = new DataView(hash, 0);
+            const view = new DataView(hash.buffer, 0);
             const hashValue = view.getInt32(0);
             value = this.documentModel.simpleFormattersManager.formatString("{0:x8}", hashValue);
         }
@@ -433,11 +434,14 @@ export class RtfContentExporter {
             this.exportSingleParagraph(paragraph);
             return paragraphIndex;
         }
-        else
-            return RtfTableExporter.exportTable(this, tablesInfo[0].table.getTopLevelParent()) - this.startSectionParagraphIndex;
+        else {
+            const table = tablesInfo[0].table.getTopLevelParent();
+            const grid = this.exportModelOptions.grids.get(table);
+            return RtfTableExporter.exportTable(this, table, grid) - this.startSectionParagraphIndex;
+        }
     }
     exportSingleParagraph(paragraph) {
-        this.exportParagraphCore(paragraph, 0, 0, -1);
+        this.exportParagraphCore(paragraph, 0, ConditionalTableStyleFormatting.None, -1);
         this.finishParagraph(paragraph);
     }
     finishParagraph(paragraph) {

package/lib/common/formats/rtf/export/exporters/table/rtf-table-exporter.d.ts

@@ -1,6 +1,7 @@
+import { Grid } from '../../../../../layout-formatter/table/grid-engine/grid';
 import { Table } from '../../../../../model/tables/main-structures/table';
 import { RtfContentExporter } from '../rtf-content-exporter';
 export declare class RtfTableExporter {
-    static exportTable(rtfContentExporter: RtfContentExporter, table: Table): number;
-    static exportNestedTable(rtfContentExporter: RtfContentExporter, table: Table, nestingLevel: number): number;
+    static exportTable(rtfContentExporter: RtfContentExporter, table: Table, grid: Grid): number;
+    static exportNestedTable(rtfContentExporter: RtfContentExporter, table: Table, grid: Grid, nestingLevel: number): number;
 }

package/lib/common/formats/rtf/export/exporters/table/rtf-table-exporter.js

@@ -1,13 +1,13 @@
 import { RtfNestedTableExporterState } from './states/rtf-nested-table-exporter-state';
 import { RtfTableExporterState } from './states/rtf-table-exporter-state';
 export class RtfTableExporter {
-    static exportTable(rtfContentExporter, table) {
-        new RtfTableExporterState(rtfContentExporter, table).export();
+    static exportTable(rtfContentExporter, table, grid) {
+        new RtfTableExporterState(rtfContentExporter, table, grid).export();
         rtfContentExporter.tableIterator.update(table.getEndPosition());
         return rtfContentExporter.subDocument.getParagraphIndexByPosition(table.getEndPosition() - 1);
     }
-    static exportNestedTable(rtfContentExporter, table, nestingLevel) {
-        new RtfNestedTableExporterState(rtfContentExporter, table, nestingLevel).export();
+    static exportNestedTable(rtfContentExporter, table, grid, nestingLevel) {
+        new RtfNestedTableExporterState(rtfContentExporter, table, grid, nestingLevel).export();
         rtfContentExporter.tableIterator.update(table.getEndPosition());
         return rtfContentExporter.subDocument.getParagraphIndexByPosition(table.getEndPosition() - 1);
     }

package/lib/common/formats/rtf/export/exporters/table/states/rtf-nested-table-exporter-state.d.ts

@@ -1,9 +1,10 @@
+import { Grid } from '../../../../../../layout-formatter/table/grid-engine/grid';
 import { Table } from '../../../../../../model/tables/main-structures/table';
 import { TableRow } from '../../../../../../model/tables/main-structures/table-row';
 import { RtfContentExporter } from '../../rtf-content-exporter';
 import { RtfTableExporterStateBase } from './rtf-table-exporter-state-base';
 export declare class RtfNestedTableExporterState extends RtfTableExporterStateBase {
-    constructor(rtfExporter: RtfContentExporter, table: Table, nestingLevel: number);
+    constructor(rtfExporter: RtfContentExporter, table: Table, grid: Grid, nestingLevel: number);
     export(): void;
     protected writeParagraphEndMark(): void;
     protected exportRow(row: TableRow, rowIndex: number): void;

package/lib/common/formats/rtf/export/exporters/table/states/rtf-nested-table-exporter-state.js

@@ -1,8 +1,8 @@
 import { RtfExportSR } from '../../../../translation-table/rtf-export-sr';
 import { RtfTableExporterStateBase } from './rtf-table-exporter-state-base';
 export class RtfNestedTableExporterState extends RtfTableExporterStateBase {
-    constructor(rtfExporter, table, nestingLevel) {
-        super(rtfExporter, table, nestingLevel);
+    constructor(rtfExporter, table, grid, nestingLevel) {
+        super(rtfExporter, table, grid, nestingLevel);
     }
     export() {
         super.exportBase();

package/lib/common/formats/rtf/export/exporters/table/states/rtf-table-exporter-state-base.d.ts

@@ -6,6 +6,7 @@ import { TableCell } from '../../../../../../model/tables/main-structures/table-
 import { TableRow } from '../../../../../../model/tables/main-structures/table-row';
 import { ConditionalTableStyleFormatting } from '../../../../../../model/tables/secondary-structures/table-base-structures';
 import { TableWidthUnit } from '../../../../../../model/tables/secondary-structures/table-units';
+import { Grid } from '../../../../../../layout-formatter/table/grid-engine/grid';
 import { RtfBuilder } from '../../../rtf-builder';
 import { RtfContentExporter } from '../../rtf-content-exporter';
 import { RtfTableCellPropertiesExporter } from '../rtf-table-cell-properties-exporter';
@@ -17,10 +18,11 @@ export declare abstract class RtfTableExporterStateBase {
     tableStyleIndex: number;
     rowLeftOffset: number;
     readonly table: Table;
+    readonly grid: Grid;
     readonly tableRowPropertiesExporter: RtfTableRowPropertiesExporter;
     readonly tableCellPropertiesExporter: RtfTableCellPropertiesExporter;
     readonly tablePropertiesExporter: RtfTablePropertiesExporter;
-    protected constructor(rtfExporter: RtfContentExporter, table: Table, nestingLevel: number);
+    protected constructor(rtfExporter: RtfContentExporter, table: Table, grid: Grid, nestingLevel: number);
     protected get rtfBuilder(): RtfBuilder;
     protected get documentModel(): DocumentModel;
     protected get subDocument(): SubDocument;
@@ -36,7 +38,7 @@ export declare abstract class RtfTableExporterStateBase {
     protected abstract exportRow(row: TableRow, rowIndex: number): void;
     protected abstract writeParagraphEndMark(): void;
     exportRowProperties(row: TableRow, rowIndex: number): void;
-    getCellWidth(virtualColumnIndex: number): number;
+    getCellWidth(leftSideIndex: number, columnSpan: number): number;
     calculateRowLeft(row: TableRow, indent: TableWidthUnit): number;
     protected calculateRowLeftOffset(row: TableRow): number;
     getActualWidth(unit: TableWidthUnit): number;

package/lib/common/formats/rtf/export/exporters/table/states/rtf-table-exporter-state-base.js

@@ -4,6 +4,7 @@ import { TableCellMergingState, TableLookTypes } from '../../../../../../model/t
 import { TableWidthUnitType } from '../../../../../../model/tables/secondary-structures/table-units';
 import { Errors } from '@devexpress/utils/lib/errors';
 import { ListUtils } from '@devexpress/utils/lib/utils/list';
+import { UnitConverter } from '@devexpress/utils/lib/class/unit-converter';
 import { RtfExportSR } from '../../../../translation-table/rtf-export-sr';
 import { RtfTableCellPropertiesMerger } from '../../../../utils/mergers/rtf-table-cell-properties-merger';
 import { RtfTablePropertiesMerger } from '../../../../utils/mergers/rtf-table-properties-merger';
@@ -14,10 +15,11 @@ import { RtfTableExporter } from '../rtf-table-exporter';
 import { RtfTablePropertiesExporter } from '../rtf-table-properties-exporter';
 import { RtfTableRowPropertiesExporter } from '../rtf-table-row-properties-exporter';
 export class RtfTableExporterStateBase {
-    constructor(rtfExporter, table, nestingLevel) {
+    constructor(rtfExporter, table, grid, nestingLevel) {
         this.rtfExporter = rtfExporter;
         this._nestingLevel = nestingLevel;
         this.table = table;
+        this.grid = grid;
         this.tableRowPropertiesExporter = new RtfTableRowPropertiesExporter(rtfExporter.documentModel, rtfExporter.rtfExportHelper, rtfExporter.rtfBuilder);
         this.tableCellPropertiesExporter = new RtfTableCellPropertiesExporter(rtfExporter.documentModel, rtfExporter.rtfExportHelper, rtfExporter.rtfBuilder);
         this.tablePropertiesExporter = new RtfTablePropertiesExporter(rtfExporter.documentModel, rtfExporter.rtfExportHelper, rtfExporter.rtfBuilder);
@@ -92,7 +94,7 @@ export class RtfTableExporterStateBase {
         while (parentCell !== nestedTable.parentCell) {
             nestedTable = nestedTable.parentCell.parentRow.parentTable;
         }
-        return RtfTableExporter.exportNestedTable(this.rtfExporter, nestedTable, this.nestingLevel + 1);
+        return RtfTableExporter.exportNestedTable(this.rtfExporter, nestedTable, this.grid, this.nestingLevel + 1);
     }
     exportRowProperties(row, rowIndex) {
         const rowLeft = this.calculateRowLeft(row, row.parentTable.getActualTableIndent(this.documentModel.defaultTableProperties));
@@ -100,20 +102,25 @@ export class RtfTableExporterStateBase {
         let cellRightVirtualColInd = row.gridBefore;
         for (const cell of row.cells) {
             cellRightVirtualColInd += cell.columnSpan;
-            const cellRight = rowLeft + this.getCellWidth(cellRightVirtualColInd);
+            const cellWidth = this.getCellWidth(row.gridBefore, cellRightVirtualColInd);
+            const cellRight = UnitConverter.pixelsToTwips(rowLeft + cellWidth);
             this.exportCellProperties(cell, cellRight);
         }
     }
-    getCellWidth(virtualColumnIndex) {
-        if (virtualColumnIndex < 0)
+    getCellWidth(leftSideIndex, columnSpan) {
+        if (leftSideIndex < 0 || columnSpan < 0)
             throw new Error(Errors.InternalException);
-        const minVirtualColumnWidth = 10;
-        return virtualColumnIndex * minVirtualColumnWidth;
+        let result = 0;
+        for (let i = 0; i < columnSpan; i++)
+            result += Math.max(this.grid.columns.width[i + leftSideIndex], 1);
+        return result;
     }
     calculateRowLeft(row, indent) {
-        const widthBefore = row.gridBefore > 0 ? this.getCellWidth(row.gridBefore) : 0;
+        var _a;
+        const widthBefore = row.gridBefore > 0 ? this.getCellWidth(0, row.gridBefore) : 0;
         const offset = this.getActualWidth(indent) + widthBefore;
-        return offset - (this.rowLeftOffset != null ? this.rowLeftOffset : this.calculateRowLeftOffset(row));
+        const rowLeftOffset = (_a = this.rowLeftOffset) !== null && _a !== void 0 ? _a : this.calculateRowLeftOffset(row);
+        return offset - rowLeftOffset;
     }
     calculateRowLeftOffset(row) {
         const borderWidth = row.cells[0].properties.borders.left.width;

package/lib/common/formats/rtf/export/exporters/table/states/rtf-table-exporter-state.d.ts

@@ -1,9 +1,10 @@
+import { Grid } from '../../../../../../layout-formatter/table/grid-engine/grid';
 import { Table } from '../../../../../../model/tables/main-structures/table';
 import { TableRow } from '../../../../../../model/tables/main-structures/table-row';
 import { RtfContentExporter } from '../../rtf-content-exporter';
 import { RtfTableExporterStateBase } from './rtf-table-exporter-state-base';
 export declare class RtfTableExporterState extends RtfTableExporterStateBase {
-    constructor(rtfExporter: RtfContentExporter, table: Table);
+    constructor(rtfExporter: RtfContentExporter, table: Table, grid: Grid);
     export(): void;
     protected writeParagraphEndMark(): void;
     protected exportRow(row: TableRow, rowIndex: number): void;

package/lib/common/formats/rtf/export/exporters/table/states/rtf-table-exporter-state.js

@@ -1,8 +1,8 @@
 import { RtfExportSR } from '../../../../translation-table/rtf-export-sr';
 import { RtfTableExporterStateBase } from './rtf-table-exporter-state-base';
 export class RtfTableExporterState extends RtfTableExporterStateBase {
-    constructor(rtfExporter, table) {
-        super(rtfExporter, table, 1);
+    constructor(rtfExporter, table, grid) {
+        super(rtfExporter, table, grid, 1);
     }
     export() {
         super.exportBase();

package/lib/common/formats/rtf/importer-in-subdocument.d.ts

@@ -1,6 +1,5 @@
 import { FixedInterval } from "@devexpress/utils/lib/intervals/fixed";
-import { RichOptions } from "../../model/options/rich-options";
 import { SubDocument } from "../../model/sub-document";
 import { IProcessor } from "../../processor";
-export declare function getRtfFromSubDocumentPublic(richOptions: RichOptions, subDocument: SubDocument, coreInterval: FixedInterval): string;
+export declare function getRtfFromSubDocumentPublic(processor: IProcessor, subDocument: SubDocument, coreInterval: FixedInterval): string;
 export declare function insertRtfInSubDocumentPublic(processor: IProcessor, subDocument: SubDocument, position: number, rtf: string, callback: (interval: FixedInterval, isRtfValid: boolean) => void): void;

package/lib/common/formats/rtf/importer-in-subdocument.js

@@ -7,10 +7,11 @@ import { RtfDocumentExporterOptions } from "./export/rtf-document-exporter-optio
 import { RtfImporterOptions } from "./import/importer-options";
 import { RtfImporter } from "./import/rtf-importer";
 import { getAfterInsertCallback, getAfterInsertReject } from "../callback-helpers";
-export function getRtfFromSubDocumentPublic(richOptions, subDocument, coreInterval) {
+export function getRtfFromSubDocumentPublic(processor, subDocument, coreInterval) {
     const rangeCopy = RangeCopy.create(new SubDocumentIntervals(subDocument, [coreInterval]));
-    const newModelManager = new ClientModelManager(rangeCopy.model, richOptions, new EmptyBatchUpdatableObject());
-    return new RtfExporter(newModelManager.modelManipulator, new RtfDocumentExporterOptions()).exportAsString();
+    const newModelManager = new ClientModelManager(rangeCopy.model, processor.modelManager.richOptions, new EmptyBatchUpdatableObject());
+    const exportModelOptions = processor.getExportModelOptions({ modelManager: newModelManager });
+    return new RtfExporter(exportModelOptions, new RtfDocumentExporterOptions()).exportAsString();
 }
 export function insertRtfInSubDocumentPublic(processor, subDocument, position, rtf, callback) {
     const options = new RtfImporterOptions(() => { });

package/lib/common/layout/document-layout.d.ts

@@ -2,6 +2,8 @@ import { DocumentModel } from '../model/document-model';
 import { PositionManager } from '../model/position/position-manager';
 import { LayoutAnchoredObjectBox } from './main-structures/layout-boxes/layout-anchored-object-box';
 import { LayoutPage } from './main-structures/layout-page';
+import { Grid } from '../layout-formatter/table/grid-engine/grid';
+import { Table } from '../model/tables/main-structures/table';
 export declare class ModelPositionHolder {
     private pos;
     private posManager;
@@ -25,6 +27,7 @@ export declare class DocumentLayout {
     isFullyFormatted: boolean;
     anchorObjectsPositionInfo: AnchorObjectsPositionInfo;
     pageColor: number;
+    get grids(): Map<Table, Grid>;
     constructor(anchorObjectsPositionInfo: AnchorObjectsPositionInfo);
     setEmptyLayout(pageColor: number): void;
     getLastValidPage(): LayoutPage;

package/lib/common/layout/document-layout.js

@@ -37,6 +37,12 @@ export class AnchorObjectsPositionInfo {
     }
 }
 export class DocumentLayout {
+    get grids() {
+        return this.pages.reduce((res, page) => {
+            page.grids.forEach((grid, table) => res.set(table, grid));
+            return res;
+        }, new Map());
+    }
     constructor(anchorObjectsPositionInfo) {
         this.anchorObjectsPositionInfo = anchorObjectsPositionInfo;
         this.setEmptyLayout(ColorHelper.NO_COLOR);

package/lib/common/layout/main-structures/layout-page-area.d.ts

@@ -1,10 +1,13 @@
 import { Rectangle } from '@devexpress/utils/lib/geometry/rectangle';
 import { SubDocument } from '../../model/sub-document';
 import { LayoutColumn } from './layout-column';
+import { Grid } from '../../layout-formatter/table/grid-engine/grid';
+import { Table } from '../../model/tables/main-structures/table';
 export declare class LayoutPageArea extends Rectangle {
     subDocument: SubDocument;
     columns: LayoutColumn[];
     pageOffset: number;
+    get grids(): Map<Table, Grid>;
     constructor(subDocument: SubDocument);
     getEndPosition(): number;
     getLastColumn(): LayoutColumn;