wikity 1.3.5 → 1.3.6

package/dist/compile.js

@@ -49,7 +49,7 @@ function compile(dir = '.', config = {}) {
         // Create TOC
         if (!metadata.notoc && (metadata.toc || (((_a = outText.match(/<h\d[^>]*>/g)) === null || _a === void 0 ? void 0 : _a.length) || 0) > 3)) {
             let toc = '';
-            let headings = Array.from(parsedContent.match(/<h\d[^>]*>.+?<\/h\d>/gs) || []);
+            let headings = Array.from(parsedContent.match(/<h\d auto[^>]*>.+?<\/h\d>/gs) || []);
             headings.forEach(match => {
                 var _a;
                 const headingInner = match.replace(/\s*<\/?h\d[^>]*>\s*/g, '');
@@ -59,25 +59,29 @@ function compile(dir = '.', config = {}) {
             });
             toc = toc.replace(/<\/ol>\s*<ol>/g, '');
             const tocElem = (0, dedent_1.default) `
-                <div id="page+toc">
-                    <span id="page+toc+heading">
+                <div id="page_toc">
+                    <span id="page_toc_heading">
                         <strong>Contents</strong>
                         [<a href="javascript:void(0)" onclick="
-                            document.getElementById('page+toc+contents').setAttribute('style', this.innerText === 'hide' ? 'display: none;' : '');
+                            document.getElementById('page_toc_contents').setAttribute('style', this.innerText === 'hide' ? 'display: none;' : '');
                             this.innerText = this.innerText === 'hide' ? 'show' : 'hide';
                         ">hide</a>]
                     </span>
-                    <ol id="page+toc+contents">${toc}</ol>
+                    <ol id="page_toc_contents">${toc}</ol>
                 </div>
             `;
             // Set TOC on page
-            if (outText.includes('<toc></toc>'))
+            if (outText.includes('<toc></toc>')) {
+                // put TOC where explicitly declared
                 outText = outText.replace('<toc></toc>', tocElem);
-            else
-                outText = outText.replace(/<h\d[^>]*>/, tocElem + '$&');
+            }
+            else {
+                // put TOC above first auto heading
+                outText = outText.replace(/<h[1-6] auto/, tocElem + '$&');
+            }
         }
         // Create plaintext of HTML for use as description/metadata property.
-        const plaintextData = parsedContent.replace(/<.+?>/gs, ' ');
+        const plaintextData = parsedContent.replace(/<.+?>/gs, '');
         // Create HTML
         const folderUpCount = file.split(/[\/\\]/).length - dir.split(/[\/\\]/).length; // number of folders to go up by to get to root
         const html = (0, dedent_1.default) `

package/dist/parse.js

@@ -121,7 +121,7 @@ function parse(data, config = {}) {
                             image-${imageData.type || 'default'}
                         "
                         style="
-                            display: inline-block;
+                            margin: 8px;
                             float: ${imageData.float || 'none'};
                             clear: ${imageData.float || 'none'};
                             vertical-align: ${imageData.align || 'unset'};
@@ -309,7 +309,7 @@ function parse(data, config = {}) {
             // Headings: ==heading==
             .replace((0, common_1.RegExpBuilder)(r `^ (=+) \s* (.+?) \s* \1 \s* $`), (_, lvl, txt) => {
             const linkForm = encodeURI(txt.replace(/ /g, '_').replace(/<.+?>/g, ''));
-            return `<h${lvl.length} id="${linkForm}">${txt}</h${lvl.length}>`;
+            return `<h${lvl.length} auto id="${linkForm}">${txt}</h${lvl.length}>`;
         })
             // Bulleted list: *item
             .replace((0, common_1.RegExpBuilder)(r `^ (\*+) (.+?) $`), (_, lvl, content) => {
@@ -369,14 +369,8 @@ function parse(data, config = {}) {
             if (!ref)
                 return _;
             ref.i++;
-            const content = `
-                    <sup class="refnote">
-                        <a id="cite-${ref.id}${ref.i > 0 ? `_${ref.i}` : ''}" class="ref" href="#ref-${ref.id}">
-                            [${ref.id}]
-                        </a>
-                    </sup>
-                `;
-            return content;
+            const citeId = `cite-${ref.id}${ref.i > 0 ? `_${ref.i}` : ''}`;
+            return `<sup class="refnote"><a id="${citeId}" class="ref" href="#ref-${ref.id}">[${ref.id}]</a></sup>`;
         })
             // Nonstandard: ``code`` and ```code blocks```
             .replace((0, common_1.RegExpBuilder)(r ` \`\`\` ([^\`]+?) \`\`\` `), '<pre>$1</pre>')
@@ -397,7 +391,7 @@ function parse(data, config = {}) {
             let multiRefContent = '';
             if (refdata.i > 0) {
                 for (let i = 0; i <= refdata.i; i++) {
-                    multiRefContent += `<sup><a href="#cite-${refdata.id}${i > 0 ? `_${i}` : ''}">${i + 1}</a></sup>`;
+                    multiRefContent += `<sup><a href="#cite-${refdata.id}${i > 0 ? `_${i}` : ''}">${i + 1}</a></sup>&nbsp;`;
                 }
             }
             const refline = `

package/dist/wiki.css.js

@@ -8,7 +8,7 @@ ul, ol {margin: 0.3em 0 0 1.6em; padding: 0;}
 dt {font-weight: bold;}
 dd, dl dl {margin-block: 0; margin-inline-start: 30px;}
 
-figure {margin: 1em;}
+figure {margin: 1em; width: 300px;}
 .image-thumb, .image-frame {padding: 6px; border: 1px solid gray;}
 .image-default {margin: 0;}
 figcaption {padding-top: 6px;}
@@ -26,9 +26,9 @@ a.external-link::after {content: '\1f855';}
 a.redlink {color: #d33;}
 a.redlink:visited {color: #b44;}
 
-#page+toc {border: 1px solid #aab; padding: 8px; width: fit-content; background-color: #f8f8f8; font-size: 95%;}
-#page+toc-heading {display: block; text-align: center;}
-#page+toc ol {margin: 0 0 0 1.3em;}
+#page_toc {border: 1px solid #aab; padding: 8px; width: fit-content; background-color: #f8f8f8; font-size: 95%;}
+#page_toc_heading {display: block; text-align: center;}
+#page_toc ol {margin: 0 0 0 1.3em;}
 
 #infobox {float: right; clear: right; margin: 0 0 1em 1em; width: 300px; padding: 2px; border: 1px solid #CCC; overflow: auto; font-size: 90%;}
 #infobox tr:first-child :first-child {padding: 10px; text-align: center; font-weight: bold; font-size: 120%;}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "wikity",
-  "version": "1.3.5",
-  "description": "Compile wikitext to HTML: wikitext as a templating language.",
+  "version": "1.3.6",
+  "description": "Compile wikitext to HTML! Supporst use of wikitext as a templating language.",
   "main": "dist/index.js",
   "scripts": {
     "test": "tsc && cd test && eleventy"

package/readme.md

@@ -8,6 +8,10 @@
 
 This package comes with built-in support for compilation using [Eleventy](https://11ty.dev).
 
+## Exemplar
+
+See the `example` folder for a template on making your own wiki site!
+
 ## Install
 
 Wikity is available [on npm](https://www.npmjs.com/package/wikity).