highmark-markdown 1.1.138 → 1.2.4

package/src/node/html/line/block.js

@@ -16,7 +16,7 @@ export default class BlockLineHTMLNode extends LineHTMLNode {
     return content;
   }
 
-  static lines = 2;
+  static lines = 1;
 
   static tagName = "span";
 

package/src/node/html/line.js

@@ -1,7 +1,6 @@
 "use strict";
 
 import HTMLNode from "../../node/html";
-import PlainTextHTMLNode from "./text/plain";
 
 import { remove, insertAfterwards } from "../../utilities/dom";
 import { EMPTY_STRING, CARRIAGE_RETURN, DEFAULT_MAXIMUM_LINE_CHARACTERS } from "../../constants";
@@ -17,9 +16,25 @@ export default class LineHTMLNode extends HTMLNode {
     return lines;
   }
 
+  prepare(context) {
+    const markdownNode = this.getMarkdownNode(),
+          firstTokenIndex = markdownNode.getFirstTokenIndex(context),
+          tokenIndex = firstTokenIndex; ///
+
+    Object.assign(context, {
+      tokenIndex
+    });
+  }
+
+  dispose(context) {
+    delete context.tokenIndex;
+  }
+
   mount(parentDOMElement, siblingDOMElement, context) {
     let domElement;
 
+    this.prepare(context);
+
     super.mount(parentDOMElement, siblingDOMElement, context);
 
     domElement = this.getDOMElement();
@@ -27,7 +42,7 @@ export default class LineHTMLNode extends HTMLNode {
     parentDOMElement = domElement;  ///
 
     const content = CARRIAGE_RETURN,
-      textNode = document.createTextNode(content);
+          textNode = document.createTextNode(content);
 
     domElement = textNode;  ///
 
@@ -37,6 +52,8 @@ export default class LineHTMLNode extends HTMLNode {
 
     siblingDOMElement = domElement; ///
 
+    this.dispose(context);
+
     return siblingDOMElement;
   }
 
@@ -57,46 +74,40 @@ export default class LineHTMLNode extends HTMLNode {
     super.unmount(parentDOMElement);
   }
 
-  childNodesAsHTML(indent, context) {
-    let childNodesHTML;
+  asHTML(indent, context) {
+    let html;
 
-    let previousChildNode = null;
+    this.prepare(context);
 
-    childNodesHTML = this.reduceChildNode((childNodesHTML, childNode) => {
-      const previousChildNodePlainTextHTMLNode = (previousChildNode instanceof PlainTextHTMLNode);
+    indent = this.adjustIndent(indent);
 
-      if (previousChildNodePlainTextHTMLNode) {
-        const childNodePlainTextHTMLNode = (childNode instanceof PlainTextHTMLNode);
+    const childNodesHTML = this.childNodesAsHTML(indent, context);
 
-        if (!childNodePlainTextHTMLNode) {
-          childNodesHTML = `${childNodesHTML}
+    const startingTag = this.startingTag(context),
+          closingTag = this.closingTag(context);
+
+    html = `${indent}${startingTag}${childNodesHTML}${closingTag}
 `;
-        }
-      }
 
-      const childNodeHTML = childNode.asHTML(indent, context);
+    this.dispose(context);
 
-      childNodesHTML = `${childNodesHTML}${childNodeHTML}`;
+    return html;
+  }
 
-      previousChildNode = childNode;  ///
+  asPlainText(context) {
+    let plainText;
 
-      return childNodesHTML;
-    }, EMPTY_STRING);
+    this.prepare(context);
 
-    const previousChildNodePlainTextHTMLNode = (previousChildNode instanceof PlainTextHTMLNode);
+    plainText = super.asPlainText(context);
 
-    if (previousChildNodePlainTextHTMLNode) {
-      childNodesHTML = `${childNodesHTML}
-`;
-    }
+    this.dispose(context);
 
-    return childNodesHTML;
+    return plainText;
   }
 
   childNodesAsPlainText(context) {
-    let childNodesPlainText;
-
-    childNodesPlainText = this.reduceChildNode((childNodesPlainText, childNode) => {
+    const childNodesPlainText = this.reduceChildNode((childNodesPlainText, childNode) => {
       const childNodePlainText = childNode.asPlainText(context);
 
       childNodesPlainText = `${childNodesPlainText}${childNodePlainText}`;

package/src/node/html/link/email.js

@@ -40,6 +40,12 @@ export default class EmailLinkHTMLNode extends HTMLNode {
     return attributeValue;
   }
 
+  adjustIndent(indent) {
+    indent = null;
+
+    return indent;
+  }
+
   mount(parentDOMElement, siblingDOMElement, context) {
     let domElement;
 
@@ -126,8 +132,7 @@ export default class EmailLinkHTMLNode extends HTMLNode {
     if (simple) {
       const emailAddress = this.emailAddress(context);
 
-      childNodesHTML = `${emailAddress}
-`;
+      childNodesHTML = `${emailAddress}`;
     } else {
       childNodesHTML = super.childNodesAsHTML(indent, context);
     }

package/src/node/html/link/footnote.js

@@ -53,6 +53,12 @@ export default class FootnoteLinkHTMLNode extends HTMLNode {
     return attributeValue;
   }
 
+  adjustIndent(indent) {
+    indent = null;
+
+    return indent;
+  }
+
   mount(parentDOMElement, siblingDOMElement, context) {
     const domElement = this.createDOMElement(context);
 
@@ -79,25 +85,6 @@ export default class FootnoteLinkHTMLNode extends HTMLNode {
     this.resetDOMElement();
   }
 
-  asHTML(indent, context) {
-    let html;
-
-    if (this.number === null) {
-      html = EMPTY_STRING;
-    } else {
-      indent = this.adjustIndent(indent);
-
-      const childNodesHTML = this.childNodesAsHTML(indent, context),
-            startingTag = this.startingTag(context),
-            closingTag = this.closingTag(context);
-
-      html = `${indent}${startingTag}${childNodesHTML}${closingTag}
-`;
-    }
-
-    return html;
-  }
-
   asPlainText(context) {
     const plainText = EMPTY_STRING;
 

package/src/node/html/link/hyper.js

@@ -40,6 +40,12 @@ export default class HyperlinkHTMLNode extends HTMLNode {
     return attributeValue;
   }
 
+  adjustIndent(indent) {
+    indent = null;
+
+    return indent;
+  }
+
   mount(parentDOMElement, siblingDOMElement, context) {
     let domElement;
 
@@ -126,8 +132,7 @@ export default class HyperlinkHTMLNode extends HTMLNode {
     if (simple) {
       const url = this.url(context);
 
-      childNodesHTML = `${url}
-`;
+      childNodesHTML = `${url}`;
     } else {
       childNodesHTML = super.childNodesAsHTML(indent, context);
     }

package/src/node/html/link/index.js

@@ -78,6 +78,12 @@ export default class IndexLinkHTMLNode extends HTMLNode {
     super.unmount(parentDOMElement);
   }
 
+  adjustIndent(indent) {
+    indent = null;
+
+    return indent;
+  }
+
   asPlainText(context) {
     const plainText = EMPTY_STRING;
 
@@ -85,8 +91,7 @@ export default class IndexLinkHTMLNode extends HTMLNode {
   }
 
   childNodesAsHTML(indent, context) {
-    const childNodesHTML = `${this.pageNumber}
-`;
+    const childNodesHTML = this.pageNumber; ///
 
     return childNodesHTML;
   }

package/src/node/html/listing/inline.js

@@ -12,6 +12,12 @@ export default class InlineListingHTMLNode extends HTMLNode {
     return content;
   }
 
+  adjustIndent(indent) {
+    indent = null;
+
+    return indent;
+  }
+
   createDOMElement(context) {
     let domElement;
 
@@ -31,21 +37,6 @@ export default class InlineListingHTMLNode extends HTMLNode {
     return domElement;
   }
 
-  asHTML(indent, context) {
-    let html;
-
-    indent = this.adjustIndent(indent);
-
-    const childNodesHTML = this.childNodesAsHTML(indent, context),
-          startingTag = this.startingTag(context),
-          closingTag = this.closingTag(context);
-
-    html = `${indent}${startingTag}${childNodesHTML}${closingTag}
-`;
-
-    return html;
-  }
-
   childNodesAsHTML(indent, context) {
     const content = this.content(context),
           childNodesHTML = content; ///

package/src/node/html/pageNumber.js

@@ -63,6 +63,22 @@ export default class PageNumberHTMLNode extends HTMLNode {
     super.unmount(parentDOMElement);
   }
 
+  asHTML(indent, context) {
+    let html;
+
+    indent = this.adjustIndent(indent);
+
+    const childNodesHTML = this.childNodesAsHTML(indent, context);
+
+    const startingTag = this.startingTag(context),
+          closingTag = this.closingTag(context);
+
+    html = `${indent}${startingTag}${childNodesHTML}${closingTag}
+`;
+
+    return html;
+  }
+
   asPlainText(context) {
     const plainText = EMPTY_STRING;
 
@@ -70,8 +86,7 @@ export default class PageNumberHTMLNode extends HTMLNode {
   }
 
   childNodesAsHTML(indent, context) {
-    const childNodesHTML = `${this.pageNumber}
-`;
+    const childNodesHTML = this.pageNumber; ///
 
     return childNodesHTML;
   }

package/src/node/html/text/comma.js

@@ -13,7 +13,7 @@ export default class CommaTextHTMLNode extends TextHTMLNode {
   }
 
   text(context) {
-    const text = COMMA;
+    const text = COMMA; ///
 
     return text;
   }

package/src/node/html/text/emphasised.js

@@ -3,6 +3,12 @@
 import HTMLNode from "../../../node/html";
 
 export default class EmphasisedTextHTMLNode extends HTMLNode {
+  adjustIndent(indent) {
+    indent = null;
+
+    return indent;
+  }
+
   static tagName = "em";
 
   static className = null;

package/src/node/html/text/index.js

@@ -22,8 +22,7 @@ export default class IndexTextHTMLNode extends TextHTMLNode {
   }
 
   text(context) {
-    const text = `${this.wordOrPhrase}
-`;
+    const text = this.wordOrPhrase; ///
 
     return text;
   }

package/src/node/html/text/inline.js

@@ -26,17 +26,6 @@ export default class InlineTextHTMLNode extends HTMLNode {
     return html;
   }
 
-  childNodesAsHTML(indent, context) {
-    let childNodesHTML;
-
-    childNodesHTML = super.childNodesAsHTML(indent, context);
-
-    childNodesHTML = `${childNodesHTML}
-`;
-
-    return childNodesHTML;
-  }
-
   childNodesAsPlainText(context) {
     const childNodesPlainText = this.reduceChildNode((childNodesPlainText, childNode) => {
       const childNodePlainText = childNode.asPlainText(context);

package/src/node/html/text/strong.js

@@ -3,6 +3,12 @@
 import HTMLNode from "../../../node/html";
 
 export default class StrongTextHTMLNode extends HTMLNode {
+  adjustIndent(indent) {
+    indent = null;
+
+    return indent;
+  }
+
   static tagName = "strong";
 
   static className = null;

package/src/node/html/text/stronglyEmphasised.js

@@ -29,6 +29,12 @@ export default class StronglyEmphasisedTextHTMLNode extends HTMLNode {
     return domElement;
   }
 
+  adjustIndent(indent) {
+    indent = null;
+
+    return indent;
+  }
+
   mount(parentDOMElement, siblingDOMElement, context) {
     let domElement;
 
@@ -85,9 +91,7 @@ export default class StronglyEmphasisedTextHTMLNode extends HTMLNode {
 
     const startingTag = `<${strongTextTagName}>`,
           closingTag = `</${strongTextTagName}>`,
-          html = `${indent}${startingTag}
-${childNodesHTML}${indent}${closingTag}
-`;
+          html = `${startingTag}${childNodesHTML}${closingTag}`;
 
     childNodesHTML = html;  ///
 

package/src/node/html.js

@@ -152,9 +152,9 @@ class HTMLNode extends Node {
   }
 
   adjustIndent(indent) {
-    indent = (indent === null) ?
-               EMPTY_STRING :
-                `${DOUBLE_SPACE}${indent}`;
+    if (indent !== null) {
+      indent = `${DOUBLE_SPACE}${indent}`;
+    }
 
     return indent;
   }
@@ -321,13 +321,17 @@ class HTMLNode extends Node {
       const startingTag = this.startingTag(context),
             closingTag = this.closingTag(context);
 
-      html = `${indent}${startingTag}
+      html = (indent === null) ?
+               `${startingTag}${childNodesHTML}${closingTag}` :
+                 `${indent}${startingTag}
 ${childNodesHTML}${indent}${closingTag}
 `;
     } else {
       const selfClosingTag = this.selfClosingTag(context);
 
-      html = `${indent}${selfClosingTag}
+      html = (indent === null) ?
+               `${selfClosingTag}` :
+                 `${indent}${selfClosingTag}
 `;
     }
 
@@ -335,11 +339,8 @@ ${childNodesHTML}${indent}${closingTag}
   }
 
   asPlainText(context) {
-    let plainText;
-
-    const childNodesPlainText = this.childNodesAsPlainText(context);
-
-    plainText = childNodesPlainText;  ///
+    const childNodesPlainText = this.childNodesAsPlainText(context),
+          plainText = childNodesPlainText;  ///
 
     return plainText;
   }

package/src/node/markdown/text.js

@@ -22,25 +22,51 @@ export default class TextMarkdownNode extends MarkdownNode {
         text = text.substring(start);
       }
 
+      let { tokenIndex } = context;
+
       const { tokens } = context,
+            tokensLength = tokens.length,
+            minimumTokenIndex = 0,
+            maximumTokenIndex = tokensLength - 1,
             significantTokenIndex = tokens.indexOf(significantToken),
-            lastIndex = significantTokenIndex - 1,
-            firstIndex = 0;
+            previousTokenIndex = significantTokenIndex - 1,
+            nextTokenIndex = significantTokenIndex + 1,
+            lastTokenIndex = tokenIndex;  ///
+
+      for (tokenIndex = previousTokenIndex; tokenIndex >= minimumTokenIndex; tokenIndex--) {
+        if (tokenIndex === lastTokenIndex) {
+          break;
+        }
 
-      for (let index = lastIndex; index >= firstIndex; index++) {
-        const token = tokens[index],
+        const token = tokens[tokenIndex],
               tokenWhitespaceToken = token.isWhitespaceToken();
 
         if (!tokenWhitespaceToken) {
           break;
         }
 
-        const whitespaceToken = token,
-              whitespaceTokenContent = whitespaceToken.getContent();
+        const whitespaceTokenContent = token.getContent();
 
         text = `${whitespaceTokenContent}${text}`;
       }
 
+      for (tokenIndex = nextTokenIndex; tokenIndex <= maximumTokenIndex; tokenIndex++) {
+        const token = tokens[tokenIndex],
+              tokenWhitespaceToken = token.isWhitespaceToken();
+
+        if (!tokenWhitespaceToken) {
+          break;
+        }
+
+        const whitespaceTokenContent = token.getContent();
+
+        text = `${text}${whitespaceTokenContent}`;
+      }
+
+      Object.assign(context, {
+        tokenIndex
+      });
+
       return text;
     });
 

package/src/node/markdown.js

@@ -3,6 +3,7 @@
 import { NonTerminalNode } from "occam-parsers";
 
 import nodeMixins from "../mixins/node";
+import tokenMixins from "../mixins/token";
 
 class MarkdownNode extends NonTerminalNode {
   getParentMarkdownNode() {
@@ -54,5 +55,6 @@ class MarkdownNode extends NonTerminalNode {
 }
 
 Object.assign(MarkdownNode.prototype, nodeMixins);
+Object.assign(MarkdownNode.prototype, tokenMixins);
 
 export default MarkdownNode;

package/src/node/markdownStyle/content.js

@@ -7,13 +7,12 @@ import { EMPTY_STRING, CARRIAGE_RETURN } from "../../constants";
 
 export default class ContentMarkdownStyleNode extends MarkdownStyleNode {
   content(context) {
-    let { tokens } = context;
+    const firstTokenIndex = this.getFirstTokenIndex(context),
+          lastTokenIndex = this.getLastTokenIndex(context),
+          start = firstTokenIndex,  ///
+          end = lastTokenIndex + 1;
 
-    const nonTerminalNode = this, ///
-          firstSignificantTokenIndex = nonTerminalNode.getFirstSignificantTokenIndex(tokens),
-          lastSignificantTokenIndex = nonTerminalNode.getLastSignificantTokenIndex(tokens),
-          start = firstSignificantTokenIndex,
-          end = lastSignificantTokenIndex + 1;
+    let { tokens } = context;
 
     tokens = tokens.slice(start, end);
 

package/src/node/markdownStyle.js

@@ -3,8 +3,10 @@
 import { NonTerminalNode } from "occam-parsers";
 
 import nodeMixins from "../mixins/node";
+import tokenMixins from "../mixins/token";
 
 class MarkdownStyleNode extends NonTerminalNode {
+
   static fromRuleNameChildNodesOpacityAndPrecedence(Class, ruleName, childNodes, opacity, precedence, ...remainingArguments) {
     if (precedence === undefined) {
       precedence = opacity; ///
@@ -25,5 +27,6 @@ class MarkdownStyleNode extends NonTerminalNode {
 }
 
 Object.assign(MarkdownStyleNode.prototype, nodeMixins);
+Object.assign(MarkdownStyleNode.prototype, tokenMixins);
 
 export default MarkdownStyleNode;

package/src/style/defaultMarkdown.js

@@ -154,6 +154,7 @@ stronglyEmphasisedText {
 }
 
 contentsList {
+  padding-left: 0;
   list-style-type: none;
 
   contentsList {

package/src/utilities/grammar.js

@@ -132,9 +132,7 @@ export function htmlFromMarkdownOptionsAndImporter(markdown, options, importer)
       divisionHTMLNOdes.forEach((divisionHTMLNOde) => {
         const divisionHTMLNOdeHTML = divisionHTMLNOde.asHTML(context);
 
-        html = `${html}
-
-${divisionHTMLNOdeHTML}`;
+        html = `${html}${divisionHTMLNOdeHTML}`;
       });
     }
   }