funnelweave

oasis-tcs · Nov 15, 2024 · e8dbd6e · e8dbd6e
1 parent 2e9e89c
commit e8dbd6e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 172 deletions.
diff --git a/lib/fw.js b/lib/fw.js
diff --git a/lib/fwprettier.js b/lib/fwprettier.js
diff --git a/lib/number.js b/lib/number.js
@@ -31,6 +31,8 @@ class Number {
     this.meta = meta;
     this.meta["pandoc-version"] = pandoc;
     if (meta.name) builders[meta.name] = this;
+    if (this.meta.funnelweb)
+      this.funnelweb = new (require(this.meta.funnelweb))(this.meta.name);
   }
 
   secno(type) {
@@ -41,9 +43,12 @@ class Number {
   }
 
   skip(line) {
-    if (!this.meta.funnelweb && !(this.fence && this.skipping === true)) {
-      if (/^@(\$|o|!\{)/.test(line)) return (this.skipping = "fw");
-      if (/^@(\}|!\})/.test(line)) {
+    if (
+      (!this.funnelweb || this.funnelweb.skipcode()) &&
+      this.skipping !== true
+    ) {
+      if (/^@[o$]/.test(line)) return (this.skipping = "fw");
+      if (/^@\}/.test(line)) {
         this.skipping = false;
         return true;
       }
@@ -57,12 +62,14 @@ class Number {
       }
       return this.skipping;
     }
-    var m = line.match(/^(:+)\s+(?:\{\.)?var(\S+)/);
+    var m = line.match(/^(:+)\s+(?:\{\.)?(var(\S+)|funnelweb)/);
     if (m) {
       this.fence = m[1];
-      if (this.variant !== m[2]) {
+      if (
+        (m[3] && m[3] !== this.variant) ||
+        (m[2] === "funnelweb" && !this.funnelweb)
+      )
         return (this.skipping = true);
-      }
       return this.fence.length < 3;
     }
     return this.skipping;
@@ -83,10 +90,7 @@ class Number {
             function (line) {
               lineno++;
               if (this.skip(line)) return;
-              if (this.meta.funnelweb)
-                line = line
-                  .replace(/@!.*$/, "")
-                  .replace(/^@[$o]@\<(.*?)@\>.*?@\{/, " ##fwisec $1");
+              if (this.funnelweb) line = this.funnelweb.phase1(line);
               try {
                 for (
                   var m, regex = /\[.*?\]\{id=(.*?)\}/g;
@@ -169,6 +173,10 @@ class Number {
             "line",
             function (line) {
               lineno++;
+              if (this.funnelweb) {
+                const code = this.funnelweb.code(line);
+                if (code) out.write(code);
+              }
               if (this.skip(line)) return;
               try {
                 var extraline;
@@ -193,22 +201,11 @@ class Number {
                 if (m1)
                   this.tableofcontents(this.toc[m1[1]]?.sub || [], out, "");
                 else {
-                  if (this.meta.funnelweb)
-                    line = line
-                      .replace(/^@!\{/, "::: funnelweb")
-                      .replace(/^@!\}/, ":::")
-                      .replace(/@!.*$/, "")
-                      .replace(
-                        /^@[$o]@\<(.*?)@\>.*?@\{/,
-                        function (m, p) {
-                          extraline = "::::\n```" + this.meta.funnelweb;
-                          return "::: funnelweb\n:::: caption\n ##fwisec " + p;
-                        }.bind(this),
-                      )
-                      .replace(/^@\}/, function (m) {
-                        extraline = ":::";
-                        return "```";
-                      });
+                  if (this.funnelweb) {
+                    const l = this.funnelweb.phase2(line);
+                    line = l.line;
+                    extraline = l.extraline;
+                  }
                   line = line.replace(
                     /\$\$\$(.*?)\$\$\$/g,
                     function (m, p) {
@@ -292,21 +289,12 @@ class Number {
     this.toc = { "": { sub: [] } };
     this.match = 0;
     for (var c of this.chapters) await this.phase1(c);
-    if (this.meta.funnelweb && this.toc.fwisec) {
-      this.toc.fwisec.sub.sort(function (a, b) {
-        if (a.name.toLowerCase() < b.name.toLowerCase()) return -1;
-        if (a.name.toLowerCase() > b.name.toLowerCase()) return 1;
-        return 0;
-      });
-      for (var i = 1; i < this.toc.fwisec.sub.length; )
-        if (this.toc.fwisec.sub[i].name === this.toc.fwisec.sub[i - 1].name) {
-          this.toc.fwisec.sub[i - 1].sub.push(this.toc.fwisec.sub[i]);
-          this.toc.fwisec.sub.splice(i, 1);
-        } else i++;
-    }
+    if (this.funnelweb && this.toc.fwisec)
+      this.funnelweb.sortindex(this.toc.fwisec);
   }
 
   async write(out) {
+    if (this.funnelweb) await this.funnelweb.weave();
     this.match = 0;
     for (var c of this.chapters) {
       await this.phase2(c, out);

diff --git a/styles/odata.css b/styles/odata.css
@@ -178,6 +178,7 @@ td > code {
 
 .example pre,
 .funnelweb pre,
+.funnelweb p,
 .rep {
   margin-left: var(--indent);
 }