Update devel

.github/workflows/test.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        nim-version: ['1.4.8', 'stable']
+        nim-version: ['stable', 'devel']
     steps:
       - uses: actions/checkout@v1
       - uses: jiro4989/setup-nim-action@v1

.gitignore

@@ -1,5 +1,7 @@
 *.exe
-nimcache/**
+*.dll
+.vscode/*
+**/nimcache/**
 cache/**
 outputGotten.txt
 *~

docs/nimdoc.out.css

@@ -14,6 +14,9 @@ Modified by Boyd Greenfield and narimiran
   --primary-background: #fff;
   --secondary-background: ghostwhite;
   --third-background: #e8e8e8;
+  --info-background: #50c050;
+  --warning-background: #c0a000;
+  --error-background: #e04040;
   --border: #dde;
   --text: #222;
   --anchor: #07b;
@@ -32,13 +35,18 @@ Modified by Boyd Greenfield and narimiran
   --escapeSequence: #c4891b;
   --number: #252dbe;
   --literal: #a4255b;
+  --program: #6060c0;
+  --option: #508000;
   --raw-data: #a4255b;
 }
 
 [data-theme="dark"] {
   --primary-background: #171921;
   --secondary-background: #1e202a;
   --third-background: #2b2e3b;
+  --info-background: #008000;
+  --warning-background: #807000;
+  --error-background: #c03000;
   --border: #0e1014;
   --text: #fff;
   --anchor: #8be9fd;
@@ -57,6 +65,8 @@ Modified by Boyd Greenfield and narimiran
   --escapeSequence: #bd93f9;
   --number: #bd93f9;
   --literal: #f1fa8c;
+  --program: #9090c0;
+  --option: #90b010;
   --raw-data: #8be9fd;
 }
 
@@ -224,6 +234,12 @@ select:focus {
 }
 
 /* Docgen styles */
+
+:target {
+  border: 2px solid #B5651D;
+  border-style: dotted;
+}
+
 /* Links */
 a {
   color: var(--anchor);
@@ -378,6 +394,7 @@ h2 {
   margin-top: 2em; }
 
 h2.subtitle {
+  margin-top: 0em;
   text-align: center; }
 
 h3 {
@@ -491,6 +508,45 @@ hr {
   border: 0;
   border-top: 1px solid #aaa; }
 
+hr.footnote {
+  width: 25%;
+  border-top: 0.15em solid #999;
+  margin-bottom: 0.15em;
+  margin-top: 0.15em;
+}
+div.footnote-group {
+  margin-left: 1em; }
+div.footnote-label {
+  display: inline-block;
+  min-width: 1.7em;
+}
+
+div.option-list {
+  border: 0.1em solid var(--border);
+}
+div.option-list-item {
+  padding-left: 12em;
+  padding-right: 0;
+  padding-bottom: 0.3em;
+  padding-top: 0.3em;
+}
+div.odd {
+  background-color: var(--secondary-background);
+}
+div.option-list-label {
+  margin-left: -11.5em;
+  margin-right: 0em;
+  min-width: 11.5em;
+  display: inline-block;
+  vertical-align: top;
+}
+div.option-list-description {
+  width: calc(100% - 1em);
+  padding-left: 1em;
+  padding-right: 0;
+  display: inline-block;
+}
+
 blockquote {
   font-size: 0.9em;
   font-style: italic;
@@ -499,7 +555,7 @@ blockquote {
   border-left: 5px solid #bbc;
 }
 
-.pre {
+.pre, span.tok {
   font-family: "Source Code Pro", Monaco, Menlo, Consolas, "Courier New", monospace;
   font-weight: 500;
   font-size: 0.85em;
@@ -510,6 +566,12 @@ blockquote {
   border-radius: 4px;
 }
 
+span.tok {
+  border: 1px solid #808080;
+  padding-bottom: 0.1em;
+  margin-right: 0.2em;
+}
+
 pre {
   font-family: "Source Code Pro", Monaco, Menlo, Consolas, "Courier New", monospace;
   color: var(--text);
@@ -561,6 +623,7 @@ table.line-nums-table {
 .line-nums-table td.blob-line-nums pre {
   color: #b0b0b0;
   -webkit-filter: opacity(75%);
+  filter: opacity(75%);
   text-align: right;
   border-color: transparent;
   background-color: transparent;
@@ -609,6 +672,34 @@ table.borderless td, table.borderless th {
      The right padding separates the table cells. */
   padding: 0 0.5em 0 0 !important; }
 
+.admonition {
+    padding: 0.3em;
+    background-color: var(--secondary-background);
+    border-left: 0.4em solid #7f7f84;
+    margin-bottom: 0.5em;
+    -webkit-box-shadow: 0 5px 8px -6px rgba(0,0,0,.2);
+       -moz-box-shadow: 0 5px 8px -6px rgba(0,0,0,.2);
+            box-shadow: 0 5px 8px -6px rgba(0,0,0,.2);
+}
+.admonition-info {
+    border-color: var(--info-background);
+}
+.admonition-info-text {
+    color: var(--info-background);
+}
+.admonition-warning {
+    border-color: var(--warning-background);
+}
+.admonition-warning-text {
+    color: var(--warning-background);
+}
+.admonition-error {
+    border-color: var(--error-background);
+}
+.admonition-error-text {
+    color: var(--error-background);
+}
+
 .first {
   /* Override more specific margin styles with "! important". */
   margin-top: 0 !important; }
@@ -768,9 +859,6 @@ span.classifier {
 span.classifier-delimiter {
   font-weight: bold; }
 
-span.option {
-  white-space: nowrap; }
-
 span.problematic {
   color: #b30000; }
 
@@ -850,6 +938,29 @@ span.Preprocessor {
 span.Directive {
   color: #252dbe; }
 
+span.option {
+  font-weight: bold;
+  font-family: "Source Code Pro", Monaco, Menlo, Consolas, "Courier New", monospace;
+  color: var(--option);
+}
+
+span.Prompt {
+  font-weight: bold;
+  color: red; }
+
+span.ProgramOutput {
+  font-weight: bold;
+  color: #808080; }
+
+span.program {
+  font-weight: bold;
+  color: var(--program);
+  text-decoration: underline;
+  text-decoration-color: var(--hint);
+  text-decoration-thickness: 0.05em;
+  text-underline-offset: 0.15em;
+}
+
 span.Command, span.Rule, span.Hyperlink, span.Label, span.Reference,
 span.Other {
   color: var(--other); }
@@ -872,6 +983,7 @@ dt pre > span.Operator ~ span.Identifier, dt pre > span.Other ~ span.Identifier
   background-position: 0 0;
   background-size: 51px 14px;
   -webkit-filter: opacity(50%);
+  filter: opacity(50%);
   background-repeat: no-repeat;
   background-image: var(--nim-sprite-base64);
   margin-bottom: 5px; }

docs/nimja.html

@@ -34,7 +34,6 @@
     }
   }
 
-  const toggleSwitch = document.querySelector('.theme-switch input[type="checkbox"]');
   function switchTheme(e) {
       if (e.target.checked) {
           document.documentElement.setAttribute('data-theme', 'dark');
@@ -45,21 +44,29 @@
       }
   }
 
-  toggleSwitch.addEventListener('change', switchTheme, false);
+  const toggleSwitch = document.querySelector('.theme-switch input[type="checkbox"]');
+  if (toggleSwitch !== null) {
+    toggleSwitch.addEventListener('change', switchTheme, false);
+  }
 
-  const currentTheme = localStorage.getItem('theme') ? localStorage.getItem('theme') : null;
+  var currentTheme = localStorage.getItem('theme');
+  if (!currentTheme && window.matchMedia('(prefers-color-scheme: dark)').matches) {
+    currentTheme = 'dark';
+  }
   if (currentTheme) {
     document.documentElement.setAttribute('data-theme', currentTheme);
 
-    if (currentTheme === 'dark') {
+    if (currentTheme === 'dark' && toggleSwitch !== null) {
       toggleSwitch.checked = true;
     }
   }
 }
+
+window.addEventListener('DOMContentLoaded', main);
 </script>
 
 </head>
-<body onload="main()">
+<body>
 <div class="document" id="documentId">
   <div class="container">
     <h1 class="title">nimja</h1>
@@ -107,19 +114,20 @@ <h1 class="title">nimja</h1>
 </ul>
 
   </div>
+
   <div class="nine columns" id="content">
   <div id="tocRoot"></div>
 
   <p class="module-desc"></p>
   <div class="section" id="6">
 <h1><a class="toc-backref" href="#6">Imports</a></h1>
 <dl class="item">
-<a class="reference external" href="nimja/parser.html">nimja/parser</a>
+<a class="reference external" href="nimja/parser.html">nimja/parser</a>, <a class="reference external" href="nimja/nimjautils.html">nimja/nimjautils</a>
 </dl></div>
 <div class="section" id="19">
 <h1><a class="toc-backref" href="#19">Exports</a></h1>
 <dl class="item">
-<a href="nimja/parser.html#compileTemplateStr.m,typed"><span class="Identifier">compileTemplateStr</span></a>, <a href="nimja/parser.html#compileTemplateFile.m,staticstring"><span class="Identifier">compileTemplateFile</span></a>, <a href="nimja/parser.html#getScriptDir.t"><span class="Identifier">getScriptDir</span></a>
+<a href="nimja/parser.html#compileTemplateStr.m,typed,staticbool,staticstring,untyped"><span class="Identifier">compileTemplateStr</span></a>, <a href="nimja/parser.html#compileTemplateFile.m,staticstring,staticbool,staticstring,untyped"><span class="Identifier">compileTemplateFile</span></a>, <a href="nimja/sharedhelper.html#getScriptDir.t"><span class="Identifier">getScriptDir</span></a>, <a href="nimja/parser.html#tmpls.m,staticstring,untyped"><span class="Identifier">tmpls</span></a>, <a href="nimja/parser.html#tmplf.m,staticstring,untyped"><span class="Identifier">tmplf</span></a>, <a href="nimja/nimjautils.html#Loop"><span class="Identifier">Loop</span></a>, <a href="nimja/nimjautils.html#includeRaw,string"><span class="Identifier">includeRaw</span></a>, <a href="nimja/nimjautils.html#slugify,string,string"><span class="Identifier">slugify</span></a>, <a href="nimja/nimjautils.html#|.m,untyped,untyped"><span class="Identifier">|</span></a>, <a href="nimja/nimjautils.html#Loopable"><span class="Identifier">Loopable</span></a>, <a href="nimja/nimjautils.html#allowedCharsInSlug"><span class="Identifier">allowedCharsInSlug</span></a>, <a href="nimja/nimjautils.html#loop.i,openArray[T]"><span class="Identifier">loop</span></a>, <a href="nimja/nimjautils.html#nl2br,string"><span class="Identifier">nl2br</span></a>, <a href="nimja/nimjautils.html#includeStaticAsDataurl,staticstring,staticstring"><span class="Identifier">includeStaticAsDataurl</span></a>, <a href="nimja/nimjautils.html#includeRawStatic,staticstring"><span class="Identifier">includeRawStatic</span></a>, <a href="nimja/nimjautils.html#~.t,untyped,untyped"><span class="Identifier">~</span></a>, <a href="nimja/nimjautils.html#?.t,untyped,untyped"><span class="Identifier">?</span></a>, <a href="nimja/nimjautils.html#cycle,Loop,openArray[T]"><span class="Identifier">cycle</span></a>, <a href="nimja/nimjautils.html#truncate,string,Natural,string"><span class="Identifier">truncate</span></a>, <a href="nimja/nimjautils.html#spaceless,string"><span class="Identifier">spaceless</span></a>
 </dl></div>
 
   </div>
@@ -129,7 +137,7 @@ <h1><a class="toc-backref" href="#19">Exports</a></h1>
       <div class="twelve-columns footer">
         <span class="nim-sprite"></span>
         <br/>
-        <small style="color: var(--hint);">Made with Nim. Generated: 2021-08-17 21:13:33 UTC</small>
+        <small style="color: var(--hint);">Made with Nim. Generated: 2022-09-14 19:09:04 UTC</small>
       </div>
     </div>
   </div>