@kerebron/extension-odt 0.1.0 → 0.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm/editor/src/CoreEditor.d.ts.map +1 -1
- package/esm/editor/src/CoreEditor.js +5 -5
- package/esm/editor/src/nodeToTreeString.d.ts.map +1 -1
- package/esm/editor/src/nodeToTreeString.js +5 -2
- package/esm/editor/src/utilities/createNodeFromContent.d.ts.map +1 -1
- package/esm/editor/src/utilities/createNodeFromContent.js +1 -1
- package/esm/extension-odt/src/ExtensionOdt.d.ts.map +1 -1
- package/esm/extension-odt/src/ExtensionOdt.js +1 -1
- package/esm/extension-odt/src/OdtParser.d.ts.map +1 -1
- package/esm/extension-odt/src/OdtParser.js +37 -27
- package/esm/extension-odt/src/postprocess/convertCodeParagraphsToCodeBlocks.d.ts.map +1 -1
- package/esm/extension-odt/src/postprocess/convertCodeParagraphsToCodeBlocks.js +14 -7
- package/esm/extension-odt/src/postprocess/fixContinuedLists.d.ts.map +1 -1
- package/esm/extension-odt/src/postprocess/fixContinuedLists.js +1 -1
- package/esm/extension-odt/src/postprocess/postProcess.js +1 -1
- package/esm/extension-odt/src/postprocess/removeUnusedBookmarks.d.ts.map +1 -1
- package/esm/extension-odt/src/postprocess/removeUnusedBookmarks.js +2 -2
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CoreEditor.d.ts","sourceRoot":"","sources":["../../../src/editor/src/CoreEditor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,
|
|
1
|
+
{"version":3,"file":"CoreEditor.d.ts","sourceRoot":"","sources":["../../../src/editor/src/CoreEditor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,IAAI,IAAI,eAAe,EAAE,KAAK,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAGzE,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAE7D,OAAO,EAAE,eAAe,EAAkB,MAAM,8BAA8B,CAAC;AAgC/E,qBAAa,UAAW,SAAQ,WAAW;IACzC,SAAgB,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,CAG7C;IACF,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,cAAc,CAAiB;IAChC,IAAI,EAAG,UAAU,CAAC;IAClB,KAAK,EAAG,WAAW,CAAC;gBAEf,OAAO,GAAE,OAAO,CAAC,aAAa,CAAM;IAyBhD,IAAW,MAAM,qBAEhB;IAEM,KAAK,IAAI,eAAe;IAIxB,GAAG,IAAI,eAAe;IAI7B,OAAO,CAAC,UAAU;IAaX,mBAAmB,CAAC,WAAW,EAAE,WAAW;IAcnD,OAAO,CAAC,YAAY;IAcb,WAAW,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,SAAS,CAAC,EAAE,MAAM;IAwC7C,WAAW,CAAC,SAAS,CAAC,EAAE,MAAM;IAkB9B,OAAO,IAAI,WAAW;IAItB,KAAK,CAAC,OAAO,GAAE,OAAO,CAAC,aAAa,CAAM,GAAG,UAAU;IAOvD,KAAK,CAAC,GAAG,CAAC,EAAE,eAAe;CAMnC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { EditorView } from 'prosemirror-view';
|
|
2
|
-
import { Node as ProseMirrorNode
|
|
2
|
+
import { Node as ProseMirrorNode } from 'prosemirror-model';
|
|
3
3
|
import { ExtensionManager } from './ExtensionManager.js';
|
|
4
4
|
import { EditorState } from 'prosemirror-state';
|
|
5
5
|
import { createNodeFromContent } from './utilities/createNodeFromContent.js';
|
|
@@ -21,12 +21,12 @@ function ensureDocSchema(doc, schema) {
|
|
|
21
21
|
};
|
|
22
22
|
// TODO fix readonly warnings
|
|
23
23
|
doc.type = findNode(doc.type.name);
|
|
24
|
-
doc.marks.forEach(mark => {
|
|
24
|
+
doc.marks.forEach((mark) => {
|
|
25
25
|
mark.type = findMark(mark.type.name);
|
|
26
26
|
});
|
|
27
|
-
doc.descendants(node => {
|
|
27
|
+
doc.descendants((node) => {
|
|
28
28
|
node.type = findNode(node.type.name);
|
|
29
|
-
node.marks.forEach(mark => {
|
|
29
|
+
node.marks.forEach((mark) => {
|
|
30
30
|
mark.type = findMark(mark.type.name);
|
|
31
31
|
});
|
|
32
32
|
});
|
|
@@ -182,7 +182,7 @@ export class CoreEditor extends EventTarget {
|
|
|
182
182
|
clone(options = {}) {
|
|
183
183
|
return new CoreEditor({
|
|
184
184
|
...options,
|
|
185
|
-
extensions: [...this.options.extensions]
|
|
185
|
+
extensions: [...this.options.extensions],
|
|
186
186
|
});
|
|
187
187
|
}
|
|
188
188
|
debug(doc) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nodeToTreeString.d.ts","sourceRoot":"","sources":["../../../src/editor/src/nodeToTreeString.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"nodeToTreeString.d.ts","sourceRoot":"","sources":["../../../src/editor/src/nodeToTreeString.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAYzC,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,GAAG,IAAI,EAAE,GAAG,SAAS,IAAI,EAAE,EACrC,KAAK,SAAI,EACT,UAAU,SAAI,UA0Df;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,EAAE,QAE5C"}
|
|
@@ -13,7 +13,9 @@ export function nodeToTreeString(node, level = 0, currentPos = 0) {
|
|
|
13
13
|
let output = '';
|
|
14
14
|
if (Array.isArray(node)) {
|
|
15
15
|
for (const child of node) {
|
|
16
|
-
output += delim +
|
|
16
|
+
output += delim +
|
|
17
|
+
nodeToTreeString(child, level + 1, currentPos).replace(/\s+$/gm, '') +
|
|
18
|
+
'\n';
|
|
17
19
|
}
|
|
18
20
|
return output;
|
|
19
21
|
}
|
|
@@ -44,7 +46,8 @@ export function nodeToTreeString(node, level = 0, currentPos = 0) {
|
|
|
44
46
|
output += (delim + ' "' + trimText(node.text) + '"') + '\n';
|
|
45
47
|
}
|
|
46
48
|
node.forEach((child, offset) => {
|
|
47
|
-
output +=
|
|
49
|
+
output +=
|
|
50
|
+
nodeToTreeString(child, level + 1, currentPos + offset + 1).replace(/\s+$/gm, '') + '\n'; // + (node.isLeaf ? 1 : 2)
|
|
48
51
|
});
|
|
49
52
|
return output;
|
|
50
53
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createNodeFromContent.d.ts","sourceRoot":"","sources":["../../../../src/editor/src/utilities/createNodeFromContent.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"createNodeFromContent.d.ts","sourceRoot":"","sources":["../../../../src/editor/src/utilities/createNodeFromContent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,IAAI,IAAI,eAAe,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE9E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,MAAM,4BAA4B,GAAG;IACzC,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC,CAAC;AAEF,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,OAAO,GAAG,eAAe,GAAG,QAAQ,EAC7C,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,4BAA4B,GACrC,eAAe,GAAG,QAAQ,CAiC5B;AAED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,GAAG,eAAe,GAAG,QAAQ,EAC7C,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,4BAA4B,GACrC,eAAe,GAAG,QAAQ,CAY5B"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Fragment, Node as ProseMirrorNode
|
|
1
|
+
import { Fragment, Node as ProseMirrorNode } from 'prosemirror-model';
|
|
2
2
|
export function createNodeFromObject(content, schema, options) {
|
|
3
3
|
try {
|
|
4
4
|
// if the JSON Content is an array of nodes, create a fragment for each node
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExtensionOdt.d.ts","sourceRoot":"","sources":["../../../src/extension-odt/src/ExtensionOdt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,UAAU,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAMrF,MAAM,WAAW,SAAS;IACxB,gBAAgB,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;CACzC;AAED,qBAAa,YAAa,SAAQ,SAAS;IAG7B,SAAS,CAAC,MAAM,EAAE,SAAS;IAFvC,IAAI,SAAS;gBAES,MAAM,GAAE,SAAc;IAI5C,aAAa,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"ExtensionOdt.d.ts","sourceRoot":"","sources":["../../../src/extension-odt/src/ExtensionOdt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,UAAU,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAMrF,MAAM,WAAW,SAAS;IACxB,gBAAgB,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;CACzC;AAED,qBAAa,YAAa,SAAQ,SAAS;IAG7B,SAAS,CAAC,MAAM,EAAE,SAAS;IAFvC,IAAI,SAAS;gBAES,MAAM,GAAE,SAAc;IAI5C,aAAa,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC;CA0C7E"}
|
|
@@ -38,7 +38,7 @@ export class ExtensionOdt extends Extension {
|
|
|
38
38
|
if (filterCommands.length > 0) {
|
|
39
39
|
subEditor.setDocument(doc);
|
|
40
40
|
for (const filter of filterCommands) {
|
|
41
|
-
filter(subEditor.state, tr => subEditor.dispatchTransaction(tr));
|
|
41
|
+
filter(subEditor.state, (tr) => subEditor.dispatchTransaction(tr));
|
|
42
42
|
}
|
|
43
43
|
return subEditor.getDocument();
|
|
44
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OdtParser.d.ts","sourceRoot":"","sources":["../../../src/extension-odt/src/OdtParser.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,IAAI,EACJ,QAAQ,EACR,IAAI,EACJ,QAAQ,EACR,MAAM,EACP,MAAM,mBAAmB,CAAC;AAI3B,UAAU,UAAU;CACnB;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,UAAU,EAAE,CAAC;IAE9C,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,UAAU,KAAK,IAAI,CAAC;IAE9D,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,MAAM,CAAC;IAEpC,KAAK,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IAE9D,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IAErB,QAAQ,CAAC,EAAE,CACT,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,KAAK,KACT,KAAK,GAAG,IAAI,CAAC;IAElB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AASD,UAAU,SAAS;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,KAAK;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,UAAU;IAClB,MAAM,EAAE;QACN,YAAY,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;QAC/B,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;KACvB,CAAC;CACH;AAED,UAAU,eAAe;IACvB,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;CACvB;AAkDD,UAAU,QAAQ;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACxC;AAED,cAAM,aAAa;IAWf,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,QAAQ,CAAC,MAAM,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE;IAC9C,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAblC,KAAK,EAAE;QACL,IAAI,EAAE,QAAQ,CAAC;QACf,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;QACpB,OAAO,EAAE,IAAI,EAAE,CAAC;QAChB,KAAK,EAAE,SAAS,IAAI,EAAE,CAAC;KACxB,EAAE,CAAC;IACJ,SAAS,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAa;IACrC,aAAa,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAa;gBAG9B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,EAC7B,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,eAAe;IAMnD,GAAG;cAlBK,QAAQ;eACP,KAAK,GAAG,IAAI;iBACV,IAAI,EAAE;eACR,SAAS,IAAI,EAAE;;IAmBxB,IAAI,CAAC,GAAG,EAAE,IAAI;IAMd,OAAO,CAAC,IAAI,EAAE,MAAM;IAyBpB,QAAQ,CAAC,IAAI,EAAE,IAAI;IAOnB,SAAS,CAAC,IAAI,EAAE,QAAQ;IAMxB,OAAO,
|
|
1
|
+
{"version":3,"file":"OdtParser.d.ts","sourceRoot":"","sources":["../../../src/extension-odt/src/OdtParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -146,7 +146,7 @@ class OdtParseState {
|
|
|
146
146
|
type: type,
|
|
147
147
|
attrs: attrs,
|
|
148
148
|
content: [],
|
|
149
|
-
marks: Mark.none
|
|
149
|
+
marks: Mark.none,
|
|
150
150
|
});
|
|
151
151
|
}
|
|
152
152
|
// Close and return the node that is currently on top of the stack.
|
|
@@ -165,14 +165,16 @@ class OdtParseState {
|
|
|
165
165
|
return;
|
|
166
166
|
}
|
|
167
167
|
const children = spec.children ? spec.children(element) : [];
|
|
168
|
-
const style = ('object' === typeof element && element['@style-name'])
|
|
168
|
+
const style = ('object' === typeof element && element['@style-name'])
|
|
169
|
+
? resolveStyle(this.stylesTree, this.automaticStyles, element['@style-name'])
|
|
170
|
+
: {};
|
|
169
171
|
const markToClose = [];
|
|
170
172
|
const textProperties = style && style['text-properties'] || {};
|
|
171
173
|
const marks = [];
|
|
172
174
|
if (COURIER_FONTS.indexOf(textProperties['@font-name'] || '') > -1) {
|
|
173
175
|
this.textMarks.add({
|
|
174
176
|
markName: 'code',
|
|
175
|
-
markAttributes: {}
|
|
177
|
+
markAttributes: {},
|
|
176
178
|
});
|
|
177
179
|
const markType = this.schema.mark('code');
|
|
178
180
|
marks.push(markType);
|
|
@@ -232,7 +234,7 @@ class OdtParseState {
|
|
|
232
234
|
this.closeMark(markType);
|
|
233
235
|
}
|
|
234
236
|
if (COURIER_FONTS.indexOf(textProperties['@font-name'] || '') > -1) {
|
|
235
|
-
this.textMarks.forEach(x => x.markName === 'code' ? this.textMarks.delete(x) : x);
|
|
237
|
+
this.textMarks.forEach((x) => x.markName === 'code' ? this.textMarks.delete(x) : x);
|
|
236
238
|
}
|
|
237
239
|
}
|
|
238
240
|
}
|
|
@@ -248,7 +250,7 @@ function iterateChildren(nodes, callback) {
|
|
|
248
250
|
value = child;
|
|
249
251
|
}
|
|
250
252
|
else {
|
|
251
|
-
const keys = Object.keys(child).filter(key => key !== 'annotation');
|
|
253
|
+
const keys = Object.keys(child).filter((key) => key !== 'annotation');
|
|
252
254
|
key = keys[0];
|
|
253
255
|
value = child[key];
|
|
254
256
|
}
|
|
@@ -370,7 +372,7 @@ export class OdtParser {
|
|
|
370
372
|
custom: (state, odtElement) => {
|
|
371
373
|
const list = {
|
|
372
374
|
level: this.listStack.length + 1,
|
|
373
|
-
odtElement
|
|
375
|
+
odtElement,
|
|
374
376
|
};
|
|
375
377
|
this.listStack.push(list);
|
|
376
378
|
let style = {};
|
|
@@ -383,13 +385,15 @@ export class OdtParser {
|
|
|
383
385
|
}
|
|
384
386
|
}
|
|
385
387
|
if (!style['@style-name']) {
|
|
386
|
-
style = ('object' === typeof element && element['@style-name'])
|
|
388
|
+
style = ('object' === typeof element && element['@style-name'])
|
|
389
|
+
? resolveStyle(stylesTree, automaticStyles, element['@style-name'])
|
|
390
|
+
: {};
|
|
387
391
|
}
|
|
388
392
|
}
|
|
389
393
|
let nodeTypeName = 'bullet_list';
|
|
390
394
|
const attrs = {};
|
|
391
395
|
if (style) {
|
|
392
|
-
const numLevelStyle = style['list-level-style-number'].find(levelStyle => parseInt(levelStyle['@level']) === list.level);
|
|
396
|
+
const numLevelStyle = style['list-level-style-number'].find((levelStyle) => parseInt(levelStyle['@level']) === list.level);
|
|
393
397
|
if (numLevelStyle) {
|
|
394
398
|
attrs['type'] = numLevelStyle['@num-format'] || '1';
|
|
395
399
|
nodeTypeName = 'ordered_list';
|
|
@@ -400,7 +404,8 @@ export class OdtParser {
|
|
|
400
404
|
listNumbering = this.listNumberings.get(listId);
|
|
401
405
|
}
|
|
402
406
|
let isContinue = false;
|
|
403
|
-
if (odtElement['@continue-list'] &&
|
|
407
|
+
if (odtElement['@continue-list'] &&
|
|
408
|
+
this.listNumberings.has(odtElement['@continue-list'])) {
|
|
404
409
|
listNumbering = this.listNumberings.get(odtElement['@continue-list']);
|
|
405
410
|
isContinue = true;
|
|
406
411
|
}
|
|
@@ -426,7 +431,9 @@ export class OdtParser {
|
|
|
426
431
|
}
|
|
427
432
|
let nodeType = this.schema.nodeType(nodeTypeName);
|
|
428
433
|
state.openNode(nodeType, attrs);
|
|
429
|
-
const children = odtElement['list-item'].map((item) => ({
|
|
434
|
+
const children = odtElement['list-item'].map((item) => ({
|
|
435
|
+
'list-item': item,
|
|
436
|
+
}));
|
|
430
437
|
if (children) {
|
|
431
438
|
iterateChildren(children, (nodeType, node) => {
|
|
432
439
|
state.handleElement(nodeType, node);
|
|
@@ -438,7 +445,7 @@ export class OdtParser {
|
|
|
438
445
|
this.preserveMinLevel = list.level;
|
|
439
446
|
}
|
|
440
447
|
this.listStack.pop();
|
|
441
|
-
}
|
|
448
|
+
},
|
|
442
449
|
},
|
|
443
450
|
'list-item': {
|
|
444
451
|
block: 'list_item',
|
|
@@ -487,10 +494,10 @@ export class OdtParser {
|
|
|
487
494
|
text: (odtElement) => '\t',
|
|
488
495
|
},
|
|
489
496
|
'line-break': {
|
|
490
|
-
block: 'br'
|
|
497
|
+
block: 'br',
|
|
491
498
|
},
|
|
492
499
|
'soft-page-break': {
|
|
493
|
-
block: 'br'
|
|
500
|
+
block: 'br',
|
|
494
501
|
},
|
|
495
502
|
'table-of-content': {
|
|
496
503
|
block: 'paragraph',
|
|
@@ -500,14 +507,14 @@ export class OdtParser {
|
|
|
500
507
|
custom(state) {
|
|
501
508
|
state.textMarks.add({
|
|
502
509
|
markName: 'change',
|
|
503
|
-
markAttributes: {}
|
|
510
|
+
markAttributes: {},
|
|
504
511
|
});
|
|
505
|
-
}
|
|
512
|
+
},
|
|
506
513
|
},
|
|
507
514
|
'change-end': {
|
|
508
515
|
custom(state) {
|
|
509
|
-
state.textMarks.forEach(x => x.markName === 'change' ? state.textMarks.delete(x) : x);
|
|
510
|
-
}
|
|
516
|
+
state.textMarks.forEach((x) => x.markName === 'change' ? state.textMarks.delete(x) : x);
|
|
517
|
+
},
|
|
511
518
|
},
|
|
512
519
|
'frame': {
|
|
513
520
|
custom: (state, odtElement) => {
|
|
@@ -530,10 +537,10 @@ export class OdtParser {
|
|
|
530
537
|
const alt = odtElement.description?.value || '';
|
|
531
538
|
state.addNode(nodeType, {
|
|
532
539
|
src: odtElement.image['@href'],
|
|
533
|
-
alt
|
|
540
|
+
alt,
|
|
534
541
|
}, []);
|
|
535
542
|
}
|
|
536
|
-
}
|
|
543
|
+
},
|
|
537
544
|
},
|
|
538
545
|
'rect': {
|
|
539
546
|
ignore: true,
|
|
@@ -543,25 +550,28 @@ export class OdtParser {
|
|
|
543
550
|
state.nextTextMarks.add({
|
|
544
551
|
markName: 'bookmark',
|
|
545
552
|
markAttributes: {
|
|
546
|
-
id: element['@name']
|
|
547
|
-
}
|
|
553
|
+
id: element['@name'],
|
|
554
|
+
},
|
|
548
555
|
});
|
|
549
|
-
}
|
|
556
|
+
},
|
|
550
557
|
},
|
|
551
558
|
'bookmark-start': {
|
|
552
559
|
custom(state, element) {
|
|
553
560
|
state.textMarks.add({
|
|
554
561
|
markName: 'bookmark',
|
|
555
562
|
markAttributes: {
|
|
556
|
-
id: element['@name']
|
|
557
|
-
}
|
|
563
|
+
id: element['@name'],
|
|
564
|
+
},
|
|
558
565
|
});
|
|
559
|
-
}
|
|
566
|
+
},
|
|
560
567
|
},
|
|
561
568
|
'bookmark-end': {
|
|
562
569
|
custom(state, element) {
|
|
563
|
-
state.textMarks.forEach(x => x.markName === 'bookmark' &&
|
|
564
|
-
|
|
570
|
+
state.textMarks.forEach((x) => x.markName === 'bookmark' &&
|
|
571
|
+
x.markAttributes.id === element['@name']
|
|
572
|
+
? state.textMarks.delete(x)
|
|
573
|
+
: x);
|
|
574
|
+
},
|
|
565
575
|
},
|
|
566
576
|
'annotation': {
|
|
567
577
|
ignore: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convertCodeParagraphsToCodeBlocks.d.ts","sourceRoot":"","sources":["../../../../src/extension-odt/src/postprocess/convertCodeParagraphsToCodeBlocks.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"convertCodeParagraphsToCodeBlocks.d.ts","sourceRoot":"","sources":["../../../../src/extension-odt/src/postprocess/convertCodeParagraphsToCodeBlocks.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAe,MAAM,mBAAmB,CAAC;AAwBzD,eAAO,MAAM,iCAAiC,EAAE,OAkF/C,CAAC"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
function onlyHasCodeMarkedText(paragraph, codeMarkType) {
|
|
2
2
|
if (paragraph.content.size === 0) {
|
|
3
|
-
return paragraph.marks.some(mark => mark.type.name === codeMarkType.name);
|
|
3
|
+
return paragraph.marks.some((mark) => mark.type.name === codeMarkType.name);
|
|
4
4
|
}
|
|
5
5
|
let allAreCodeMarked = true;
|
|
6
|
-
paragraph.content.forEach(child => {
|
|
6
|
+
paragraph.content.forEach((child) => {
|
|
7
7
|
if (!child.isText ||
|
|
8
|
-
!child.marks.some(mark => mark.type.name === codeMarkType.name)) {
|
|
8
|
+
!child.marks.some((mark) => mark.type.name === codeMarkType.name)) {
|
|
9
9
|
allAreCodeMarked = false;
|
|
10
10
|
}
|
|
11
11
|
});
|
|
@@ -32,7 +32,7 @@ export const convertCodeParagraphsToCodeBlocks = (state, dispatch) => {
|
|
|
32
32
|
return '';
|
|
33
33
|
}
|
|
34
34
|
let retVal = '';
|
|
35
|
-
fragment.content.forEach(node => {
|
|
35
|
+
fragment.content.forEach((node) => {
|
|
36
36
|
if (node.isText) {
|
|
37
37
|
retVal += node.text;
|
|
38
38
|
}
|
|
@@ -48,11 +48,18 @@ export const convertCodeParagraphsToCodeBlocks = (state, dispatch) => {
|
|
|
48
48
|
const isEmpty = node.content.size === 0;
|
|
49
49
|
if (isCodeOnly) {
|
|
50
50
|
if (paragraphsToMerge === null) {
|
|
51
|
-
paragraphsToMerge = {
|
|
51
|
+
paragraphsToMerge = {
|
|
52
|
+
startPos: pos,
|
|
53
|
+
endPos: pos + node.nodeSize,
|
|
54
|
+
innerText: nodesToText(node.content),
|
|
55
|
+
};
|
|
52
56
|
}
|
|
53
57
|
else {
|
|
54
|
-
paragraphsToMerge = {
|
|
55
|
-
|
|
58
|
+
paragraphsToMerge = {
|
|
59
|
+
startPos: paragraphsToMerge.startPos,
|
|
60
|
+
endPos: pos + node.nodeSize,
|
|
61
|
+
innerText: paragraphsToMerge.innerText + '\n' +
|
|
62
|
+
nodesToText(node.content),
|
|
56
63
|
};
|
|
57
64
|
}
|
|
58
65
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fixContinuedLists.d.ts","sourceRoot":"","sources":["../../../../src/extension-odt/src/postprocess/fixContinuedLists.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fixContinuedLists.d.ts","sourceRoot":"","sources":["../../../../src/extension-odt/src/postprocess/fixContinuedLists.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AA4D5C,eAAO,MAAM,iBAAiB,EAAE,OAsD/B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"removeUnusedBookmarks.d.ts","sourceRoot":"","sources":["../../../../src/extension-odt/src/postprocess/removeUnusedBookmarks.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"removeUnusedBookmarks.d.ts","sourceRoot":"","sources":["../../../../src/extension-odt/src/postprocess/removeUnusedBookmarks.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,eAAO,MAAM,qBAAqB,EAAE,OAgCnC,CAAC"}
|
|
@@ -2,11 +2,11 @@ export const removeUnusedBookmarks = (state, dispatch) => {
|
|
|
2
2
|
return false;
|
|
3
3
|
function condition(mark) {
|
|
4
4
|
console.log('rrrr', mark.type.name);
|
|
5
|
-
return mark.type.name ===
|
|
5
|
+
return mark.type.name === 'bookmark';
|
|
6
6
|
}
|
|
7
7
|
if (node.marks) {
|
|
8
8
|
// For text nodes, filter out the marks that match the condition
|
|
9
|
-
const newMarks = node.marks.filter(mark => !condition(mark));
|
|
9
|
+
const newMarks = node.marks.filter((mark) => !condition(mark));
|
|
10
10
|
// If marks were removed, return a new text node with the remaining marks
|
|
11
11
|
if (newMarks.length !== node.marks.length) {
|
|
12
12
|
return node.mark(newMarks);
|