Merge pull request #6 from revdavethompson/4-includes-inside-markdown

4 includes inside markdown
worlduniting · Mar 13, 2023 · 8641cf4 · 8641cf4
2 parents 4b12d6a + e9e53de
commit 8641cf4
Show file tree

Hide file tree

Showing 14 changed files with 4,563 additions and 912 deletions.
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,21 @@
+Licensed under the standard MIT license:
+
+Copyright 2023 World Uniting International.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/WUI-LICENSE b/WUI-LICENSE
diff --git a/book.yaml b/book.yaml
@@ -4,5 +4,4 @@
  isbn: 9023890424159
  toc: true
  files:
-   - index.md
-   - more-content.md
+   - index.md
diff --git a/build/html/index.html b/build/html/index.html
@@ -1,13 +1,19 @@
 <html>
 <body>
-<h1>My Newest Document</h1>
-<p>Here is some content for you.</p>
+<h1>My Test Document</h1>
+<p>Here is some content.</p>
+<h2>More Content</h2>
+<p>This is some more content.</p>
+<h2>Sub Content</h2>
+<p>This is even more content.</p>
+<h2>Nested Content</h2>
+<p>This is some nested content.</p>
+<h3>GFM Example</h3>
 <pre><code class="language-javascript">    function () {
         this is a function
     }
     // Here's a comment
 </code></pre>
-<h2>More Content</h2>
-<p>This is some more content.</p>
+<p>the close</p>
 </body>
 </html>
diff --git a/lib/convertGfmToHtml.mjs b/lib/convertGfmToHtml.mjs
@@ -4,6 +4,7 @@ import { unified } from 'unified';
 import remarkParse from 'remark-parse';
 import remarkHtml from 'remark-html';
 import remarkGfm from 'remark-gfm';
+import includerjs from '@worlduniting/includerjs';
 import yaml from 'js-yaml';
 
 // Define __dirname for ES module - so we can use it like CommonJS
@@ -30,19 +31,24 @@ export default function convertGfmToHtml() {
     const markdownDocument = files
         .map(file => fs.readFileSync(path.join(manuscriptDir, file), 'utf8'))
         .join('\n\n');
+
+    // Process @include statements using the includer module
+    const processedMarkdown = includerjs(markdownDocument, { basePath: manuscriptDir });
+
     // Convert the markdown document to HTML using Remark
     const html = unified()
         // convert markdown to a MD-AST syntax tree
         .use(remarkParse)
         // convert md-ast to gfm-ast
         .use(remarkGfm)
         // convert gfm-ast to html-ast
-        // but don't git rid of none-markdown syntax (sanitize)
+        // but don't git rid of none-markdown syntax
         .use(remarkHtml, { sanitize: false, handlers: {} })
-        .processSync(markdownDocument)
+        .processSync(processedMarkdown)
         .toString();
+
     // Write the HTML output to the output file
     fs.writeFileSync(outputFile, html);
 
     console.log(`HTML file written to ${outputFile}`);
-}
+}
diff --git a/manuscript/close.md b/manuscript/close.md
@@ -0,0 +1,4 @@
+the close
+
+</body>
+</html>