@kerebron/extension-odt 0.5.2 → 0.5.4

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.
Files changed (61) hide show
  1. package/README.md +2 -2
  2. package/esm/ExtensionOdt.d.ts.map +1 -1
  3. package/esm/ExtensionOdt.js +28 -77
  4. package/esm/ExtensionOdt.js.map +1 -1
  5. package/esm/OdtParser.d.ts +41 -7
  6. package/esm/OdtParser.d.ts.map +1 -1
  7. package/esm/OdtParser.js +26 -19
  8. package/esm/OdtParser.js.map +1 -1
  9. package/esm/lists.d.ts +9 -9
  10. package/esm/lists.d.ts.map +1 -1
  11. package/esm/lists.js +21 -7
  12. package/esm/lists.js.map +1 -1
  13. package/esm/node_handlers/basic_node_handlers.d.ts +1 -0
  14. package/esm/node_handlers/basic_node_handlers.d.ts.map +1 -1
  15. package/esm/node_handlers/basic_node_handlers.js +77 -9
  16. package/esm/node_handlers/basic_node_handlers.js.map +1 -1
  17. package/esm/node_handlers/list_node_handlers.d.ts.map +1 -1
  18. package/esm/node_handlers/list_node_handlers.js +61 -65
  19. package/esm/node_handlers/list_node_handlers.js.map +1 -1
  20. package/esm/postprocess/convertCodeParagraphsToCodeBlocks.d.ts.map +1 -1
  21. package/esm/postprocess/convertCodeParagraphsToCodeBlocks.js +40 -66
  22. package/esm/postprocess/convertCodeParagraphsToCodeBlocks.js.map +1 -1
  23. package/esm/postprocess/convertMathMl.d.ts.map +1 -1
  24. package/esm/postprocess/convertMathMl.js +1 -1
  25. package/esm/postprocess/convertMathMl.js.map +1 -1
  26. package/esm/postprocess/fixContinuedLists.d.ts.map +1 -1
  27. package/esm/postprocess/fixContinuedLists.js +80 -67
  28. package/esm/postprocess/fixContinuedLists.js.map +1 -1
  29. package/esm/postprocess/fixListsLevels.d.ts +3 -0
  30. package/esm/postprocess/fixListsLevels.d.ts.map +1 -0
  31. package/esm/postprocess/fixListsLevels.js +62 -0
  32. package/esm/postprocess/fixListsLevels.js.map +1 -0
  33. package/esm/postprocess/mergeCodeBlocks.d.ts +3 -0
  34. package/esm/postprocess/mergeCodeBlocks.d.ts.map +1 -0
  35. package/esm/postprocess/mergeCodeBlocks.js +83 -0
  36. package/esm/postprocess/mergeCodeBlocks.js.map +1 -0
  37. package/esm/postprocess/postProcess.d.ts.map +1 -1
  38. package/esm/postprocess/postProcess.js +5 -2
  39. package/esm/postprocess/postProcess.js.map +1 -1
  40. package/esm/postprocess/removeUnusedBookmarks.d.ts +1 -1
  41. package/esm/postprocess/removeUnusedBookmarks.d.ts.map +1 -1
  42. package/esm/postprocess/removeUnusedBookmarks.js +16 -19
  43. package/esm/postprocess/removeUnusedBookmarks.js.map +1 -1
  44. package/esm/postprocess/urlRewrite.d.ts +4 -0
  45. package/esm/postprocess/urlRewrite.d.ts.map +1 -0
  46. package/esm/postprocess/urlRewrite.js +60 -0
  47. package/esm/postprocess/urlRewrite.js.map +1 -0
  48. package/package.json +3 -3
  49. package/src/ExtensionOdt.ts +30 -114
  50. package/src/OdtParser.ts +86 -31
  51. package/src/lists.ts +24 -10
  52. package/src/node_handlers/basic_node_handlers.ts +82 -10
  53. package/src/node_handlers/list_node_handlers.ts +91 -90
  54. package/src/postprocess/convertCodeParagraphsToCodeBlocks.ts +44 -86
  55. package/src/postprocess/convertMathMl.ts +1 -2
  56. package/src/postprocess/fixContinuedLists.ts +95 -78
  57. package/src/postprocess/fixListsLevels.ts +93 -0
  58. package/src/postprocess/mergeCodeBlocks.ts +114 -0
  59. package/src/postprocess/postProcess.ts +5 -1
  60. package/src/postprocess/removeUnusedBookmarks.ts +33 -21
  61. package/src/postprocess/urlRewrite.ts +95 -0
@@ -1,4 +1,20 @@
1
+ import { NESTING_CLOSING, NESTING_OPENING } from '@kerebron/editor';
1
2
  import { iterateChildren } from '../OdtParser.js';
3
+ export function inchesToMm(value) {
4
+ if (!value) {
5
+ return 0;
6
+ }
7
+ if (value.endsWith('pt')) {
8
+ return parseFloat(value.substring(0, value.length - 2)) * 0.3528;
9
+ }
10
+ if (value.endsWith('in')) {
11
+ return parseFloat(value.substring(0, value.length - 2)) * 25.4;
12
+ }
13
+ if (value.endsWith('em')) {
14
+ return parseFloat(value.substring(0, value.length - 2)) / 0.125 * 25.4;
15
+ }
16
+ return 0;
17
+ }
2
18
  export function getInlineNodesHandlers() {
3
19
  return {
4
20
  '$text': (ctx, value) => {
@@ -22,22 +38,20 @@ export function getInlineNodesHandlers() {
22
38
  }
23
39
  },
24
40
  'rect': (ctx, odtElement) => {
25
- // if (odtElement['@rel-width'] === '100%') {
26
- // ctx.openNode();
27
- // ctx.closeNode('hr');
28
- // }
41
+ if (odtElement['@rel-width'] === '100%') {
42
+ ctx.openNode();
43
+ ctx.closeNode('hr');
44
+ }
29
45
  },
30
46
  'line-break': (ctx, odtElement) => {
31
47
  ctx.openNode();
32
48
  ctx.closeNode('br');
33
49
  },
34
50
  'soft-page-break': (ctx, odtElement) => {
35
- ctx.openNode();
36
- ctx.closeNode('br');
37
51
  },
38
52
  'bookmark': (ctx, element) => {
39
53
  ctx.openNode();
40
- ctx.closeNode('bookmark-node', {
54
+ ctx.closeNode('node_bookmark', {
41
55
  id: element['@name'],
42
56
  });
43
57
  },
@@ -57,6 +71,20 @@ export function getInlineNodesHandlers() {
57
71
  // : x
58
72
  // );
59
73
  },
74
+ 'change-start': (ctx, element) => {
75
+ ctx.openNode();
76
+ ctx.closeNode('comment', {
77
+ id: element['@change-id'],
78
+ nesting: NESTING_OPENING,
79
+ });
80
+ },
81
+ 'change-end': (ctx, element) => {
82
+ ctx.openNode();
83
+ ctx.closeNode('comment', {
84
+ id: element['@change-id'],
85
+ nesting: NESTING_CLOSING,
86
+ });
87
+ },
60
88
  };
61
89
  }
62
90
  export function getBasicNodesHandlers() {
@@ -89,13 +117,53 @@ export function getBasicNodesHandlers() {
89
117
  ctx.closeNode(nodeType, attrs);
90
118
  },
91
119
  'table-of-content': (ctx, value) => {
92
- ctx.openNode();
120
+ const levels = [];
121
+ let prevMarginLeft = -1;
93
122
  for (const pElem of value['index-body']['p']) {
123
+ const style = ctx.getElementStyle(pElem);
124
+ let marginLeft = 0;
125
+ if ('paragraph-properties' in style) {
126
+ marginLeft = inchesToMm(style['paragraph-properties']['@margin-left']);
127
+ }
128
+ if (prevMarginLeft < marginLeft) {
129
+ if (levels.length > 0) {
130
+ ctx.openNode(); // list_item
131
+ }
132
+ ctx.openNode(); // bullet_list
133
+ levels.push(marginLeft);
134
+ }
135
+ else {
136
+ for (let i = levels.length - 1; i >= 0; i--) {
137
+ if (levels[i] > marginLeft) {
138
+ ctx.closeNode('bullet_list', { odtMarginLeft: marginLeft });
139
+ if (i > 0) {
140
+ ctx.closeNode('list_item');
141
+ }
142
+ levels.pop();
143
+ }
144
+ else {
145
+ break;
146
+ }
147
+ }
148
+ }
94
149
  ctx.openNode();
95
150
  ctx.handle('p', pElem);
96
151
  ctx.closeNode('list_item');
152
+ prevMarginLeft = marginLeft;
153
+ }
154
+ for (let i = levels.length - 1; i >= 0; i--) {
155
+ const marginLeft = levels.pop();
156
+ if (i > 0) {
157
+ ctx.closeNode('bullet_list', { odtMarginLeft: marginLeft });
158
+ ctx.closeNode('list_item');
159
+ }
160
+ else {
161
+ ctx.closeNode('bullet_list', {
162
+ odtMarginLeft: marginLeft,
163
+ toc: true,
164
+ });
165
+ }
97
166
  }
98
- ctx.closeNode('bullet_list');
99
167
  },
100
168
  'span': (ctx, value) => {
101
169
  const style = ctx.getElementStyle(value);
@@ -1 +1 @@
1
- {"version":3,"file":"basic_node_handlers.js","sourceRoot":"","sources":["../../src/node_handlers/basic_node_handlers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"basic_node_handlers.js","sourceRoot":"","sources":["../../src/node_handlers/basic_node_handlers.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"list_node_handlers.d.ts","sourceRoot":"","sources":["../../src/node_handlers/list_node_handlers.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,WAAW,EAGZ,MAAM,iBAAiB,CAAC;AAEzB,wBAAgB,oBAAoB,IAAI,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CA0HlE"}
1
+ {"version":3,"file":"list_node_handlers.d.ts","sourceRoot":"","sources":["../../src/node_handlers/list_node_handlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,WAAW,EAGZ,MAAM,iBAAiB,CAAC;AAuEzB,wBAAgB,oBAAoB,IAAI,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAsDlE"}
@@ -1,82 +1,78 @@
1
- import { ListNumbering } from '../lists.js';
2
- import { iterateChildren, resolveStyle, } from '../OdtParser.js';
1
+ import { iterateChildren, resolveListStyle, } from '../OdtParser.js';
2
+ import { inchesToMm } from './basic_node_handlers.js';
3
+ // https://docs.oasis-open.org/office/OpenDocument/v1.4/OpenDocument-v1.4-part3-schema.html#a_19_880_22__text_list_
4
+ // The text:style-name attribute specifies the name of a list style that is applied to a list.
5
+ // If this attribute is not included and therefore no list style is specified, one of the following actions is taken:
6
+ // •If a list is contained within another list, the list style defaults to the style of the surrounding list.
7
+ // •If there is no list style specified for the surrounding list, but the list's list items contain paragraphs that have paragraph styles attached specifying a list style, that list style is used.
8
+ // •An implementation-dependent default list style is used.
9
+ // To determine which formatting properties are applied to a list, the list level and list style name are taken into account.
10
+ function processListStyle(ctx, level) {
11
+ const listTracker = ctx.listTracker;
12
+ const attrs = {};
13
+ let style = resolveListStyle(ctx.stylesTree, ctx.automaticStyles, '');
14
+ for (let i = listTracker.listStack.length - 1; i >= 0; i--) {
15
+ const list = listTracker.listStack[i];
16
+ if (!style['@name']) {
17
+ style = resolveListStyle(ctx.stylesTree, ctx.automaticStyles, list.styleName);
18
+ }
19
+ }
20
+ let nodeTypeName = 'bullet_list';
21
+ if (style) {
22
+ const numLevelStyle = style['list-level-style-number'].find((levelStyle) => parseInt(String(levelStyle['@level'])) === level);
23
+ if (numLevelStyle) {
24
+ attrs['type'] = numLevelStyle['@num-format'] || '1';
25
+ if (numLevelStyle['@start-value']) {
26
+ attrs['start'] = String(numLevelStyle['@start-value']);
27
+ }
28
+ nodeTypeName = 'ordered_list';
29
+ const marginLeft = numLevelStyle['list-level-properties']['list-level-label-alignment']['@margin-left'];
30
+ if (marginLeft) {
31
+ attrs['odtMarginLeft'] = inchesToMm(marginLeft);
32
+ }
33
+ }
34
+ const bulletLevelStyle = style['list-level-style-bullet'].find((levelStyle) => parseInt(String(levelStyle['@level'])) === level);
35
+ if (bulletLevelStyle) {
36
+ const marginLeft = bulletLevelStyle['list-level-properties']['list-level-label-alignment']['@margin-left'];
37
+ if (marginLeft) {
38
+ attrs['odtMarginLeft'] = inchesToMm(marginLeft);
39
+ }
40
+ }
41
+ }
42
+ return {
43
+ attrs,
44
+ nodeTypeName,
45
+ };
46
+ }
47
+ // https://docs.oasis-open.org/office/OpenDocument/v1.4/OpenDocument-v1.4-part3-schema.html#element-text_list
3
48
  export function getListNodesHandlers() {
4
49
  return {
5
50
  'list': (ctx, odtElement) => {
6
51
  const listTracker = ctx.listTracker;
7
- const list = {
8
- level: listTracker.listStack.length + 1,
9
- odtElement,
10
- };
11
- listTracker.listStack.push(list);
12
- let style = {};
13
- let listId = null;
14
- for (let i = listTracker.listStack.length - 1; i >= 0; i--) {
15
- const element = listTracker.listStack[i].odtElement;
16
- if (!listId) {
17
- if (element['@id']) {
18
- listId = element['@id'];
19
- }
20
- }
21
- if (!style['@style-name']) {
22
- style = ('object' === typeof element && element['@style-name'])
23
- ? resolveStyle(ctx.stylesTree, ctx.automaticStyles, element['@style-name'])
24
- : {};
25
- }
26
- }
27
- let nodeTypeName = 'bullet_list';
28
- const attrs = {};
29
- if (style) {
30
- const numLevelStyle = style['list-level-style-number'].find((levelStyle) => parseInt(levelStyle['@level']) === list.level);
31
- if (numLevelStyle) {
32
- attrs['type'] = numLevelStyle['@num-format'] || '1';
33
- nodeTypeName = 'ordered_list';
34
- }
35
- }
52
+ listTracker.pushList(odtElement['@xml:id'], odtElement['@style-name']);
53
+ const { nodeTypeName, attrs } = processListStyle(ctx, listTracker.getCurrentList().level);
36
54
  ctx.current.meta['list_type'] = nodeTypeName;
37
- let listNumbering = null;
38
- if (listId && listTracker.listNumberings.has(listId)) {
39
- listNumbering = listTracker.listNumberings.get(listId);
55
+ if (odtElement['@xml:id']) {
56
+ attrs['id'] = odtElement['@xml:id'];
40
57
  }
41
- let isContinue = false;
42
- if (odtElement['@continue-list'] &&
43
- listTracker.listNumberings.has(odtElement['@continue-list'])) {
44
- listNumbering = listTracker.listNumberings.get(odtElement['@continue-list']);
45
- isContinue = true;
58
+ if (odtElement['@continue-list']) {
59
+ attrs['continue'] = odtElement['@continue-list'];
46
60
  }
47
61
  if (odtElement['@continue-numbering']) {
48
- listNumbering = listTracker.lastNumbering;
49
- isContinue = true;
50
- }
51
- if (!listNumbering) {
52
- listNumbering = new ListNumbering();
53
- }
54
- if (isContinue) {
55
- listTracker.preserveMinLevel = 999;
56
- }
57
- if (listId) {
58
- listTracker.listNumberings.set(listId, listNumbering);
59
- }
60
- listTracker.lastNumbering = listNumbering;
61
- if (listTracker.preserveMinLevel <= list.level) {
62
- listNumbering.clearAbove(list.level - 1);
63
- }
64
- if (nodeTypeName === 'ordered_list') {
65
- attrs['start'] = listNumbering.levels[list.level] || 1;
62
+ attrs['continue'] = '_last';
66
63
  }
67
64
  ctx.openNode();
68
65
  const children = odtElement['list-item'].map((item) => ({
69
66
  'list-item': item,
70
67
  }));
71
- if (children) {
72
- iterateChildren(children, (child) => {
73
- ctx.handle(child.tag, child.value);
74
- });
75
- listNumbering.levels[list.level] += children.length;
68
+ iterateChildren(children, (child) => {
69
+ ctx.handle(child.tag, child.value);
70
+ });
71
+ if (ctx.current.content.length === 0) {
72
+ ctx.dropNode();
76
73
  }
77
- ctx.closeNode(nodeTypeName, attrs);
78
- if (listTracker.preserveMinLevel >= list.level) {
79
- listTracker.preserveMinLevel = list.level;
74
+ else {
75
+ ctx.closeNode(nodeTypeName, attrs);
80
76
  }
81
77
  listTracker.listStack.pop();
82
78
  },
@@ -1 +1 @@
1
- {"version":3,"file":"list_node_handlers.js","sourceRoot":"","sources":["../../src/node_handlers/list_node_handlers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"list_node_handlers.js","sourceRoot":"","sources":["../../src/node_handlers/list_node_handlers.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"convertCodeParagraphsToCodeBlocks.d.ts","sourceRoot":"","sources":["../../src/postprocess/convertCodeParagraphsToCodeBlocks.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AA8BzD,eAAO,MAAM,iCAAiC,EAAE,OAoF/C,CAAC"}
1
+ {"version":3,"file":"convertCodeParagraphsToCodeBlocks.d.ts","sourceRoot":"","sources":["../../src/postprocess/convertCodeParagraphsToCodeBlocks.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAEzD,eAAO,MAAM,iCAAiC,EAAE,OAsE/C,CAAC"}
@@ -1,82 +1,56 @@
1
- function onlyHasCodeMarkedText(paragraph, codeMarkType) {
2
- if (paragraph.content.size === 0) {
3
- return paragraph.marks.some((mark) => mark.type.name === codeMarkType.name);
4
- }
5
- let allAreCodeMarked = true;
6
- paragraph.content.forEach((child) => {
7
- if (!child.isText ||
8
- !child.marks.some((mark) => mark.type.name === codeMarkType.name)) {
9
- allAreCodeMarked = false;
10
- }
11
- });
12
- return allAreCodeMarked;
13
- }
14
1
  export const convertCodeParagraphsToCodeBlocks = (state, dispatch) => {
15
2
  const doc = state.doc;
16
3
  const schema = state.schema;
17
4
  let tr = state.tr;
18
- let paragraphsToMerge = null;
19
- function flushCodeBlock() {
20
- if (paragraphsToMerge === null) {
21
- return;
22
- }
23
- const textNode = schema.text(paragraphsToMerge.innerText);
24
- const codeBlock = schema.nodes.code_block.createAndFill(null, [textNode]);
25
- const startPos = tr.mapping.map(paragraphsToMerge.startPos);
26
- const endPos = tr.mapping.map(paragraphsToMerge.endPos);
27
- if (codeBlock) {
28
- tr.replaceRangeWith(startPos, endPos, codeBlock);
29
- }
30
- paragraphsToMerge = null;
31
- }
32
- function nodesToText(fragment) {
33
- if (fragment.content.length === 0) {
34
- return '';
35
- }
36
- let retVal = '';
37
- fragment.content.forEach((node) => {
38
- if (node.isText) {
39
- retVal += node.text;
40
- }
41
- else {
42
- retVal = '@TODO: node.type ' + node.type;
43
- }
44
- });
45
- return retVal;
46
- }
47
- doc.forEach((node, pos) => {
5
+ const markCodeType = schema.marks.code;
6
+ doc.descendants((node, pos) => {
48
7
  if (node.type.name === 'paragraph') {
49
- const isCodeOnly = onlyHasCodeMarkedText(node, schema.marks.code);
50
- const isEmpty = node.content.size === 0;
51
- if (isCodeOnly) {
52
- if (paragraphsToMerge === null) {
53
- paragraphsToMerge = {
54
- startPos: pos,
55
- endPos: pos + node.nodeSize,
56
- innerText: nodesToText(node.content),
57
- };
8
+ let codeText = '';
9
+ let codeSize = 0;
10
+ for (let childNo = 0; childNo < node.childCount; childNo++) {
11
+ const child = node.child(childNo);
12
+ const monospaced = child.marks.some((mark) => mark.type === markCodeType);
13
+ if (child.type.name === 'node_bookmark') {
14
+ codeText += '\n';
15
+ codeSize += child.nodeSize;
16
+ continue;
17
+ }
18
+ if (child.type.name === 'br') {
19
+ codeText += '\n';
20
+ codeSize += child.nodeSize;
21
+ continue;
22
+ }
23
+ if (monospaced) {
24
+ codeText += child.text || child.textBetween(0, child.content.size);
25
+ codeSize += child.nodeSize;
26
+ continue;
27
+ }
28
+ break;
29
+ }
30
+ if (codeSize > 0) {
31
+ const startPos = tr.mapping.map(pos);
32
+ const endPos = tr.mapping.map(pos + 1 + codeSize);
33
+ if (codeText) {
34
+ const textNode = schema.text(codeText);
35
+ const codeBlock = schema.nodes.code_block.createAndFill(null, [
36
+ textNode,
37
+ ]);
38
+ if (codeBlock) {
39
+ tr.replaceRangeWith(startPos, endPos, codeBlock);
40
+ }
58
41
  }
59
42
  else {
60
- paragraphsToMerge = {
61
- startPos: paragraphsToMerge.startPos,
62
- endPos: pos + node.nodeSize,
63
- innerText: paragraphsToMerge.innerText + '\n' +
64
- nodesToText(node.content),
65
- };
43
+ tr.replace(startPos, endPos);
66
44
  }
67
- return;
68
45
  }
69
- }
70
- if (paragraphsToMerge !== null) {
71
- flushCodeBlock();
46
+ if (codeSize > 0 && codeSize + 2 === node.nodeSize) {
47
+ // tr.deleteRange(tr.mapping.map(pos), tr.mapping.map(pos))
48
+ }
72
49
  }
73
50
  });
74
- if (paragraphsToMerge !== null) {
75
- flushCodeBlock();
76
- }
77
51
  if (dispatch) {
78
52
  dispatch(tr);
79
53
  }
80
- return tr.steps.length > 0;
54
+ return tr.docChanged;
81
55
  };
82
56
  //# sourceMappingURL=convertCodeParagraphsToCodeBlocks.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"convertCodeParagraphsToCodeBlocks.js","sourceRoot":"","sources":["../../src/postprocess/convertCodeParagraphsToCodeBlocks.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"convertCodeParagraphsToCodeBlocks.js","sourceRoot":"","sources":["../../src/postprocess/convertCodeParagraphsToCodeBlocks.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,MAAM,iCAAiC,GAAY,CACxD,KAAK,EACL,QAAQ,EACC,EAAE;IACX,MAAM,GAAG,GAAS,KAAK,CAAC,GAAG,CAAC;IAC5B,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAC5B,IAAI,EAAE,GAAgB,KAAK,CAAC,EAAE,CAAC;IAE/B,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;IAEvC,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;QAC5B,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YACnC,IAAI,QAAQ,GAAG,EAAE,CAAC;YAClB,IAAI,QAAQ,GAAG,CAAC,CAAC;YACjB,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,EAAE,CAAC;gBAC3D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBAClC,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAC3C,IAAI,CAAC,IAAI,KAAK,YAAY,CAC3B,CAAC;gBAEF,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;oBACxC,QAAQ,IAAI,IAAI,CAAC;oBACjB,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC;oBAC3B,SAAS;gBACX,CAAC;gBAED,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;oBAC7B,QAAQ,IAAI,IAAI,CAAC;oBACjB,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC;oBAC3B,SAAS;gBACX,CAAC;gBAED,IAAI,UAAU,EAAE,CAAC;oBACf,QAAQ,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;oBACnE,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC;oBAC3B,SAAS;gBACX,CAAC;gBAED,MAAM;YACR,CAAC;YAED,IAAI,QAAQ,GAAG,CAAC,EAAE,CAAC;gBACjB,MAAM,QAAQ,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACrC,MAAM,MAAM,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC;gBAElD,IAAI,QAAQ,EAAE,CAAC;oBACb,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBACvC,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,EAAE;wBAC5D,QAAQ;qBACT,CAAC,CAAC;oBAEH,IAAI,SAAS,EAAE,CAAC;wBACd,EAAE,CAAC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;oBACnD,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;gBAC/B,CAAC;YACH,CAAC;YAED,IAAI,QAAQ,GAAG,CAAC,IAAI,QAAQ,GAAG,CAAC,KAAK,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACnD,2DAA2D;YAC7D,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,QAAQ,EAAE,CAAC;QACb,QAAQ,CAAC,EAAE,CAAC,CAAC;IACf,CAAC;IAED,OAAO,EAAE,CAAC,UAAU,CAAC;AACvB,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"convertMathMl.d.ts","sourceRoot":"","sources":["../../src/postprocess/convertMathMl.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAI5C,eAAO,MAAM,aAAa,EAAE,OAiD3B,CAAC"}
1
+ {"version":3,"file":"convertMathMl.d.ts","sourceRoot":"","sources":["../../src/postprocess/convertMathMl.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAI5C,eAAO,MAAM,aAAa,EAAE,OAiD3B,CAAC"}
@@ -31,6 +31,6 @@ export const convertMathMl = (state, dispatch) => {
31
31
  if (dispatch) {
32
32
  dispatch(tr);
33
33
  }
34
- return true;
34
+ return tr.docChanged;
35
35
  };
36
36
  //# sourceMappingURL=convertMathMl.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"convertMathMl.js","sourceRoot":"","sources":["../../src/postprocess/convertMathMl.ts"],"names":[],"mappings":"AAIA,iBAAiB;AACjB,6BAA6B;AAC7B,MAAM,CAAC,MAAM,aAAa,GAAY,CAAC,KAAK,EAAE,QAAQ,EAAW,EAAE;IACjE,MAAM,GAAG,GAAS,KAAK,CAAC,GAAG,CAAC;IAC5B,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAC5B,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;IACnC,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC;IAE9C,IAAI,CAAC,QAAQ,IAAI,CAAC,aAAa,EAAE,CAAC;QAChC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,QAAQ,GAAG,KAAK,CAAC;IAErB,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;IAEpB,GAAG,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;QACxC,IAAI,UAAU,CAAC,UAAU,KAAK,CAAC,EAAE,CAAC;YAChC,OAAO;QACT,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,CAAC;QAEzB,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAEjC,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO;QACnC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAE5C,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,CACpC;YACE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;SACtB,EACD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAChC,CAAC;QAEF,EAAE,CAAC,WAAW,CACZ,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EACzB,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,GAAG,UAAU,CAAC,QAAQ,CAAC,EAC/C,SAAS,CACV,CAAC;QAEF,QAAQ,GAAG,IAAI,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,QAAQ;QAAE,OAAO,KAAK,CAAC;IAE5B,IAAI,QAAQ,EAAE,CAAC;QACb,QAAQ,CAAC,EAAE,CAAC,CAAC;IACf,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}
1
+ {"version":3,"file":"convertMathMl.js","sourceRoot":"","sources":["../../src/postprocess/convertMathMl.ts"],"names":[],"mappings":"AAGA,iBAAiB;AACjB,6BAA6B;AAC7B,MAAM,CAAC,MAAM,aAAa,GAAY,CAAC,KAAK,EAAE,QAAQ,EAAW,EAAE;IACjE,MAAM,GAAG,GAAS,KAAK,CAAC,GAAG,CAAC;IAC5B,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAC5B,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;IACnC,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC;IAE9C,IAAI,CAAC,QAAQ,IAAI,CAAC,aAAa,EAAE,CAAC;QAChC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,QAAQ,GAAG,KAAK,CAAC;IAErB,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;IAEpB,GAAG,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;QACxC,IAAI,UAAU,CAAC,UAAU,KAAK,CAAC,EAAE,CAAC;YAChC,OAAO;QACT,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,CAAC;QAEzB,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAEjC,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO;QACnC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAE5C,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,CACpC;YACE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;SACtB,EACD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAChC,CAAC;QAEF,EAAE,CAAC,WAAW,CACZ,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EACzB,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,GAAG,UAAU,CAAC,QAAQ,CAAC,EAC/C,SAAS,CACV,CAAC;QAEF,QAAQ,GAAG,IAAI,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,QAAQ;QAAE,OAAO,KAAK,CAAC;IAE5B,IAAI,QAAQ,EAAE,CAAC;QACb,QAAQ,CAAC,EAAE,CAAC,CAAC;IACf,CAAC;IAED,OAAO,EAAE,CAAC,UAAU,CAAC;AACvB,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"fixContinuedLists.d.ts","sourceRoot":"","sources":["../../src/postprocess/fixContinuedLists.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AA4D5C,eAAO,MAAM,iBAAiB,EAAE,OAmD/B,CAAC"}
1
+ {"version":3,"file":"fixContinuedLists.d.ts","sourceRoot":"","sources":["../../src/postprocess/fixContinuedLists.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAM5C,eAAO,MAAM,iBAAiB,EAAE,OA0H/B,CAAC"}