highmark-markdown 0.0.403 → 0.0.405

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "highmark-markdown",
   "author": "James Smith",
-  "version": "0.0.403",
+  "version": "0.0.405",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/highmark-markdown",
   "description": "Highmark's Markdown and Markdown Style languages.",

package/src/example/view.js

@@ -17,7 +17,7 @@ import MarkdownContainerDiv from "./view/div/container/markdown";
 import MarkdownStyleContainerDiv from "./view/div/container/markdownStyle";
 
 import { postprocess } from "../utilities/markdown";
-import { LINES_PER_PAGE, CONTENTS_DEPTH, CHARACTERS_PER_LINE, INTRODUCTION_CLASS_NAME } from "./constants";
+import { CONTENTS_DEPTH, CHARACTERS_PER_LINE, INTRODUCTION_CLASS_NAME } from "./constants";
 
 const markdownLexer = MarkdownLexer.fromNothing(),
       markdownParser = MarkdownParser.fromNothing(),
@@ -86,9 +86,11 @@ class View extends Element {
       divisionMarkdownNode.setDivisionClassName(divisionClassName);
 
       const charactersPerLine = CHARACTERS_PER_LINE,
+            contentsDepth = CONTENTS_DEPTH,
             context = {
               tokens,
               importer,
+              contentsDepth,
               charactersPerLine
             },
             divisionMarkdownNodes = postprocess(divisionMarkdownNode, context);
@@ -254,13 +256,15 @@ class View extends Element {
     className: "view"
   };
 
-  static initialMarkdown = `Occam [^occam].
+  static initialMarkdown = `## Contents
 
-[^occam]: Occam footnote.
+@contents
+
+@include introduction.md
 
-@embed introduction.md
-  
 @footnotes
+
+@pageNumber
 `;
 
   static initialMarkdownStyle = `width: 100%;
@@ -277,7 +281,9 @@ export default withStyle(View)`
 `;
 
 function importer(filePath, context) {
-  const content = `Florence [^florence].
+  const content = `# Introduction
+  
+Florence [^florence].
 
 [^florence]: Florence footnote.  
 `,

package/src/markdown/bnf.js

@@ -49,15 +49,7 @@ const bnf = `
   
                                | footnotesDirective
                                
-                               | (
-                               
-                                   ( embedDirective 
-                                   
-                                   | includeDirective ) ( endOfLine ( embedDirective 
-                                   
-                                                                    | includeDirective ) )* 
-                               
-                                 )
+                               | ( embedDirective | includeDirective ) ( endOfLine ( embedDirective | includeDirective ) )* 
                                
                                ; 
   

package/src/node/markdown/division.js

@@ -155,7 +155,7 @@ export default class DivisionMarkdownNode extends MarkdownNode {
 
       if (importedReplacement !== null) {
         const childNode = embedDirectiveMarkdownNode,  ///
-              parentNode = this.findParentNode(childNode);
+              parentNode = this.retrieveParentNode(childNode);
 
         importedReplacement.replaceEmbedDirectiveMarkdownNode(embedDirectiveMarkdownNode, parentNode, context);
       }
@@ -201,22 +201,22 @@ export default class DivisionMarkdownNode extends MarkdownNode {
   }
 
   removeSubDivisionMarkdownNode(SubDivisionReplacement, context) {
-    const divisionMarkdownNode = this,  ///
+    const divisionMarkdownNode = this,  //
           subDivisionReplacement = this.findSubDivisionReplacement(SubDivisionReplacement, context);
 
     if (subDivisionReplacement !== null) {
-      subDivisionReplacement.removeFromDivisionMarkdownNode(divisionMarkdownNode, context);
+      subDivisionReplacement.removeFromMarkdownNode(divisionMarkdownNode, context);
     }
 
     return subDivisionReplacement;
   }
 
   removeSubDivisionMarkdownNodes(SubDivisionReplacement, context) {
-    const divisionMarkdownNode = this,  ///
+    const divisionMarkdownNode = this,  //
           subDivisionReplacements = this.findSubDivisionReplacements(SubDivisionReplacement, context);
 
     subDivisionReplacements.forEach((subDivisionReplacement) => {
-      subDivisionReplacement.removeFromDivisionMarkdownNode(divisionMarkdownNode, context);
+      subDivisionReplacement.removeFromMarkdownNode(divisionMarkdownNode, context);
     });
 
     return subDivisionReplacements;

package/src/node/markdown.js

@@ -132,7 +132,7 @@ class MarkdownNode extends NonTerminalNode {
     });
   }
 
-  findParentNode(childNode, node = this) {
+  retrieveParentNode(childNode, node = this) {
     let parentNode = null;
 
     const nodeNonTerminalNode = node.isNonTerminalNode();
@@ -148,7 +148,7 @@ class MarkdownNode extends NonTerminalNode {
         const nodes = childNodes; ///
 
         nodes.some((node) => {
-          parentNode = this.findParentNode(childNode, node);
+          parentNode = this.retrieveParentNode(childNode, node);
 
           if (parentNode !== null) {
             return true;

package/src/replacement/subDivision/pageNumberDirective.js

@@ -5,6 +5,12 @@ import SubDivisionReplacement from "../../replacement/subDivision";
 import { pageNumberDirectiveMarkdownNodeFromNode } from "../../utilities/query";
 
 export default class PageNumberDirectiveSubDivisionReplacement extends SubDivisionReplacement {
+  appendToDivisionMarkdownNode(divisionMarkdownNode, context) {
+    const parentNode = divisionMarkdownNode;  ///
+
+    super.appendTo(parentNode, context);
+  }
+
   static fromSubDivisionMarkdownNode(subDivisionMarkdownNode, context) {
     let pageNumberDirectiveSubDivisionReplacement = null;
 

package/src/replacement/subDivision.js

@@ -13,14 +13,9 @@ export default class SubDivisionReplacement extends Replacement {
     return this.removedNode;
   }
 
-  appendToDivisionMarkdownNode(divisionMarkdownNode, context) {
-    const parentNode = divisionMarkdownNode;  ///
-
-    super.appendTo(parentNode, context);
-  }
-
-  removeFromDivisionMarkdownNode(divisionMarkdownNode, context) {
-    const parentNode = divisionMarkdownNode;  ///
+  removeFromMarkdownNode(divisionMarkdownNode, context) {
+    const childNode = this.removedNode, ///
+          parentNode = divisionMarkdownNode.retrieveParentNode(childNode);
 
     super.removeFrom(this.removedNode, parentNode, context);
   }