highmark-markdown 0.0.409 → 0.0.411
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/example.js +36 -34
- package/lib/example/view/div/preview.js +2 -2
- package/lib/node/markdown/division.js +19 -15
- package/lib/node/markdown.js +1 -10
- package/lib/replacement/footnotesList.js +7 -7
- package/lib/utilities/childNodes.js +4 -4
- package/lib/utilities/footnotes.js +3 -3
- package/lib/utilities/processing.js +8 -8
- package/package.json +1 -1
- package/src/example/view/div/preview.js +3 -1
- package/src/node/markdown/division.js +22 -15
- package/src/node/markdown.js +0 -8
- package/src/replacement/footnotesList.js +5 -5
- package/src/utilities/childNodes.js +3 -3
- package/src/utilities/footnotes.js +2 -2
- package/src/utilities/processing.js +7 -7
|
@@ -129,34 +129,34 @@ export default class DivisionMarkdownNode extends MarkdownNode {
|
|
|
129
129
|
return contentsCreated;
|
|
130
130
|
}
|
|
131
131
|
|
|
132
|
-
createFootnotes(
|
|
132
|
+
createFootnotes(footnoteReplacementMap, context) {
|
|
133
133
|
const footnotesDirectiveSubDivisionReplacement = this.removeSubDivisionMarkdownNode(FootnotesDirectiveSubDivisionReplacement, context);
|
|
134
134
|
|
|
135
135
|
if (footnotesDirectiveSubDivisionReplacement !== null) {
|
|
136
136
|
const divisionMarkdownNode = this, ///
|
|
137
|
-
footnotesListReplacement = FootnotesListReplacement.
|
|
137
|
+
footnotesListReplacement = FootnotesListReplacement.fromDivisionMarkdownNodeAndFootnoteReplacementMap(divisionMarkdownNode, footnoteReplacementMap, context);
|
|
138
138
|
|
|
139
139
|
if (footnotesListReplacement !== null) {
|
|
140
140
|
footnotesListReplacement.appendToDivisionMarkdownNode(divisionMarkdownNode, context);
|
|
141
141
|
}
|
|
142
142
|
|
|
143
|
-
renumberLinkMarkdownNodes(divisionMarkdownNode,
|
|
143
|
+
renumberLinkMarkdownNodes(divisionMarkdownNode, footnoteReplacementMap, callback, context);
|
|
144
144
|
}
|
|
145
145
|
|
|
146
|
-
function callback() {
|
|
146
|
+
function callback(linkMarkdownNode) {
|
|
147
147
|
///
|
|
148
148
|
}
|
|
149
149
|
}
|
|
150
150
|
|
|
151
|
-
prepareFootnotes(
|
|
151
|
+
prepareFootnotes(footnoteReplacementMap, context) {
|
|
152
152
|
const footnoteSubDivisionReplacements = this.removeSubDivisionMarkdownNodes(FootnoteSubDivisionReplacement, context);
|
|
153
153
|
|
|
154
154
|
footnoteSubDivisionReplacements.forEach((footnoteSubDivisionReplacement) => {
|
|
155
155
|
const footnoteReplacement = FootnoteReplacement.fromFootnoteSubDivisionReplacement(footnoteSubDivisionReplacement),
|
|
156
156
|
identifier = footnoteSubDivisionReplacement.identifier(context);
|
|
157
157
|
|
|
158
|
-
|
|
159
|
-
})
|
|
158
|
+
footnoteReplacementMap[identifier] = footnoteReplacement;
|
|
159
|
+
});
|
|
160
160
|
}
|
|
161
161
|
|
|
162
162
|
resolveIncludes(context) {
|
|
@@ -237,14 +237,21 @@ export default class DivisionMarkdownNode extends MarkdownNode {
|
|
|
237
237
|
return subDivisionReplacements;
|
|
238
238
|
}
|
|
239
239
|
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
240
|
+
createFootnotesListReplacement(footnoteReplacementMap, context) {
|
|
241
|
+
const footnoteSubDivisionReplacements = this.findSubDivisionReplacements(FootnoteSubDivisionReplacement, context);
|
|
242
|
+
|
|
243
|
+
footnoteSubDivisionReplacements.forEach((footnoteSubDivisionReplacement) => {
|
|
244
|
+
const footnoteReplacement = FootnoteReplacement.fromFootnoteSubDivisionReplacement(footnoteSubDivisionReplacement),
|
|
245
|
+
identifier = footnoteSubDivisionReplacement.identifier(context);
|
|
246
|
+
|
|
247
|
+
footnoteReplacementMap[identifier] = footnoteReplacement;
|
|
248
|
+
});
|
|
249
|
+
|
|
250
|
+
const divisionMarkdownNode = this, ///
|
|
251
|
+
footnotesListReplacement = FootnotesListReplacement.fromDivisionMarkdownNodeAndFootnoteReplacementMap(divisionMarkdownNode, footnoteReplacementMap, context);
|
|
252
|
+
|
|
253
|
+
return footnotesListReplacement;
|
|
254
|
+
}
|
|
248
255
|
|
|
249
256
|
asHTML(context) {
|
|
250
257
|
let html = null;
|
package/src/node/markdown.js
CHANGED
|
@@ -23,14 +23,6 @@ class MarkdownNode extends NonTerminalNode {
|
|
|
23
23
|
this.domElement = domElement;
|
|
24
24
|
}
|
|
25
25
|
|
|
26
|
-
getDOMElements() {
|
|
27
|
-
const domElements = (this.domElement === null) ?
|
|
28
|
-
[] :
|
|
29
|
-
[this.domElement];
|
|
30
|
-
|
|
31
|
-
return domElements;
|
|
32
|
-
}
|
|
33
|
-
|
|
34
26
|
tagName(context) {
|
|
35
27
|
const { tagName } = elementMap[this.ruleName];
|
|
36
28
|
|
|
@@ -13,11 +13,11 @@ export default class FootnotesListReplacement extends Replacement {
|
|
|
13
13
|
super.appendTo(parentNode, context);
|
|
14
14
|
}
|
|
15
15
|
|
|
16
|
-
static
|
|
16
|
+
static fromDivisionMarkdownNodeAndFootnoteReplacementMap(divisionMarkdownNode, footnoteReplacementMap, context) {
|
|
17
17
|
let footnotesListReplacement = null;
|
|
18
18
|
|
|
19
19
|
const node = divisionMarkdownNode, ///
|
|
20
|
-
start =
|
|
20
|
+
start = startFromFootnoteReplacementMap(footnoteReplacementMap),
|
|
21
21
|
linkMarkdownNodes = linkMarkdownNodesFromNode(node),
|
|
22
22
|
footnotesItemReplacements = [];
|
|
23
23
|
|
|
@@ -25,7 +25,7 @@ export default class FootnotesListReplacement extends Replacement {
|
|
|
25
25
|
|
|
26
26
|
linkMarkdownNodes.forEach((linkMarkdownNode) => {
|
|
27
27
|
const identifier = linkMarkdownNode.identifier(context),
|
|
28
|
-
footnoteReplacement =
|
|
28
|
+
footnoteReplacement = footnoteReplacementMap[identifier] || null;
|
|
29
29
|
|
|
30
30
|
if (footnoteReplacement !== null) {
|
|
31
31
|
const footnoteReplacementUnnumbered = footnoteReplacement.isUnnumbered();
|
|
@@ -59,8 +59,8 @@ export default class FootnotesListReplacement extends Replacement {
|
|
|
59
59
|
}
|
|
60
60
|
}
|
|
61
61
|
|
|
62
|
-
function
|
|
63
|
-
const footnoteReplacements = Object.values(
|
|
62
|
+
function startFromFootnoteReplacementMap(footnoteReplacementMap) {
|
|
63
|
+
const footnoteReplacements = Object.values(footnoteReplacementMap), ///
|
|
64
64
|
numberedFootnoteReplacements = footnoteReplacements.filter((footnoteReplacement) => {
|
|
65
65
|
const footnoteReplacementNumbered = footnoteReplacement.isNumbered();
|
|
66
66
|
|
|
@@ -5,7 +5,7 @@ import { arrayUtilities } from "necessary";
|
|
|
5
5
|
import { EMPTY_STRING } from "../constants";
|
|
6
6
|
import { contentFromNodes } from "../utilities/content";
|
|
7
7
|
|
|
8
|
-
const { first, last,
|
|
8
|
+
const { first, last, clear } = arrayUtilities;
|
|
9
9
|
|
|
10
10
|
export function htmlFromChildNodes(childNodes, context) {
|
|
11
11
|
const htmls = [],
|
|
@@ -133,9 +133,9 @@ export function domElementsFromChildNodes(childNodes, context) {
|
|
|
133
133
|
|
|
134
134
|
markdownNode.createDOMElement(context);
|
|
135
135
|
|
|
136
|
-
const
|
|
136
|
+
const domElement = markdownNode.getDOMElement();
|
|
137
137
|
|
|
138
|
-
push(
|
|
138
|
+
domElements.push(domElement);
|
|
139
139
|
}
|
|
140
140
|
}
|
|
141
141
|
});
|
|
@@ -2,13 +2,13 @@
|
|
|
2
2
|
|
|
3
3
|
import { linkMarkdownNodesFromNode } from "../utilities/query";
|
|
4
4
|
|
|
5
|
-
export function renumberLinkMarkdownNodes(divisionMarkdownNode,
|
|
5
|
+
export function renumberLinkMarkdownNodes(divisionMarkdownNode, footnoteReplacementMap, callback, context) {
|
|
6
6
|
const node = divisionMarkdownNode, ///
|
|
7
7
|
linkMarkdownNodes = linkMarkdownNodesFromNode(node);
|
|
8
8
|
|
|
9
9
|
linkMarkdownNodes.forEach((linkMarkdownNode) => {
|
|
10
10
|
const identifier = linkMarkdownNode.identifier(context),
|
|
11
|
-
footnoteReplacement =
|
|
11
|
+
footnoteReplacement = footnoteReplacementMap[identifier] || null;
|
|
12
12
|
|
|
13
13
|
if (footnoteReplacement !== null) {
|
|
14
14
|
const number = footnoteReplacement.getNumber();
|
|
@@ -7,11 +7,11 @@ export function postprocess(divisionMarkdownNode, context) {
|
|
|
7
7
|
|
|
8
8
|
resolveEmbeddings(divisionMarkdownNodes, context);
|
|
9
9
|
|
|
10
|
-
const
|
|
10
|
+
const footnoteReplacementMap = prepareFootnotes(divisionMarkdownNodes, context);
|
|
11
11
|
|
|
12
12
|
divisionMarkdownNodes = paginate(divisionMarkdownNodes, context);
|
|
13
13
|
|
|
14
|
-
createFootnotes(divisionMarkdownNodes,
|
|
14
|
+
createFootnotes(divisionMarkdownNodes, footnoteReplacementMap, context);
|
|
15
15
|
|
|
16
16
|
createContents(divisionMarkdownNodes, context);
|
|
17
17
|
|
|
@@ -46,9 +46,9 @@ function createContents(divisionMarkdownNodes, context) {
|
|
|
46
46
|
});
|
|
47
47
|
}
|
|
48
48
|
|
|
49
|
-
function createFootnotes(divisionMarkdownNodes,
|
|
49
|
+
function createFootnotes(divisionMarkdownNodes, footnoteReplacementMap, context) {
|
|
50
50
|
divisionMarkdownNodes.forEach((divisionMarkdownNode) => {
|
|
51
|
-
divisionMarkdownNode.createFootnotes(
|
|
51
|
+
divisionMarkdownNode.createFootnotes(footnoteReplacementMap, context);
|
|
52
52
|
});
|
|
53
53
|
}
|
|
54
54
|
|
|
@@ -73,13 +73,13 @@ function resolveIncludes(divisionMarkdownNode, context) {
|
|
|
73
73
|
}
|
|
74
74
|
|
|
75
75
|
function prepareFootnotes(divisionMarkdownNodes, context) {
|
|
76
|
-
const
|
|
76
|
+
const footnoteReplacementMap = {};
|
|
77
77
|
|
|
78
78
|
divisionMarkdownNodes.forEach((divisionMarkdownNode) => {
|
|
79
|
-
divisionMarkdownNode.prepareFootnotes(
|
|
79
|
+
divisionMarkdownNode.prepareFootnotes(footnoteReplacementMap, context);
|
|
80
80
|
});
|
|
81
81
|
|
|
82
|
-
return
|
|
82
|
+
return footnoteReplacementMap;
|
|
83
83
|
}
|
|
84
84
|
|
|
85
85
|
function resolveEmbeddings(divisionMarkdownNodes, context) {
|