commonmarker 0.23.1 → 0.23.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f620ec82d102c4726e551911d21a5d87e7185010ba711f6ddc35495184c90ba
-  data.tar.gz: cf14b3a68481564facd7fbb46c90c822757d168db7eb41786b3a2d0ee3173e66
+  metadata.gz: e9994d57ada57273f14d8098d2dbce3c923adf271fd7cbbc57d617cd3b78922a
+  data.tar.gz: 49911d1ce9bf022eb5b6f4698da9d3839476c20dffc2d2a3910784b483d74481
 SHA512:
-  metadata.gz: 6a4d50388ad098dd9ccfd7e733e9a1274841e4b5d929d76e4f2e75ec10c55889ee85ef55afdb5ef5665214e6abde73e75bcd647fd2a53c6aa985a9396922992b
-  data.tar.gz: a1e587570999fbc0c5f6423f7dcf375a8b2ffee2339939e2ca80807b5950c042656a498ea4acfaf3b60ba45d14fdc8f4655a0a936a06d966a89d3f9133a32188
+  metadata.gz: a79d35be4e6046cc07ba6061ef8f3563ae31a78ee24e114675cf98c1188c13b40bec8eed1265ccd11ae39eef6032bc91d57ce8254f9b676f198c2a057c6ea7d3
+  data.tar.gz: bb887c9aa1d34dc200622b001b6a09ecb53625807de66a226331afe090db4d2d61fd5edce9be7b61fdd27e23ed1c8a70b41089f088e93936115b9f517b6bef03

data/ext/commonmarker/blocks.c

@@ -468,7 +468,6 @@ static void process_footnotes(cmark_parser *parser) {
   while ((ev_type = cmark_iter_next(iter)) != CMARK_EVENT_DONE) {
     cur = cmark_iter_get_node(iter);
     if (ev_type == CMARK_EVENT_EXIT && cur->type == CMARK_NODE_FOOTNOTE_DEFINITION) {
-      cmark_node_unlink(cur);
       cmark_footnote_create(map, cur);
     }
   }
@@ -485,6 +484,15 @@ static void process_footnotes(cmark_parser *parser) {
         if (!footnote->ix)
           footnote->ix = ++ix;
 
+        // store a reference to this footnote reference's footnote definition
+        // this is used by renderers when generating label ids
+        cur->parent_footnote_def = footnote->node;
+
+        // keep track of a) count of how many times this footnote def has been
+        // referenced, and b) which reference index this footnote ref is at.
+        // this is used by renderers when generating links and backreferences.
+        cur->footnote.ref_ix = ++footnote->node->footnote.def_count;
+
         char n[32];
         snprintf(n, sizeof(n), "%d", footnote->ix);
         cmark_chunk_free(parser->mem, &cur->as.literal);
@@ -515,13 +523,16 @@ static void process_footnotes(cmark_parser *parser) {
     qsort(map->sorted, map->size, sizeof(cmark_map_entry *), sort_footnote_by_ix);
     for (unsigned int i = 0; i < map->size; ++i) {
       cmark_footnote *footnote = (cmark_footnote *)map->sorted[i];
-      if (!footnote->ix)
+      if (!footnote->ix) {
+        cmark_node_unlink(footnote->node);
         continue;
+      }
       cmark_node_append_child(parser->root, footnote->node);
       footnote->node = NULL;
     }
   }
 
+  cmark_unlink_footnotes_map(map);
   cmark_map_free(map);
 }
 

data/ext/commonmarker/cmark-gfm_version.h

@@ -1,7 +1,7 @@
 #ifndef CMARK_GFM_VERSION_H
 #define CMARK_GFM_VERSION_H
 
-#define CMARK_GFM_VERSION ((0 << 24) | (29 << 16) | (0 << 8) | 0)
-#define CMARK_GFM_VERSION_STRING "0.29.0.gfm.0"
+#define CMARK_GFM_VERSION ((0 << 24) | (29 << 16) | (0 << 8) | 2)
+#define CMARK_GFM_VERSION_STRING "0.29.0.gfm.2"
 
 #endif

data/ext/commonmarker/commonmark.c

@@ -477,7 +477,13 @@ static int S_render_node(cmark_renderer *renderer, cmark_node *node,
   case CMARK_NODE_FOOTNOTE_REFERENCE:
     if (entering) {
       LIT("[^");
-      OUT(cmark_chunk_to_cstr(renderer->mem, &node->as.literal), false, LITERAL);
+
+      char *footnote_label = renderer->mem->calloc(node->parent_footnote_def->as.literal.len + 1, sizeof(char));
+      memmove(footnote_label, node->parent_footnote_def->as.literal.data, node->parent_footnote_def->as.literal.len);
+
+      OUT(footnote_label, false, LITERAL);
+      renderer->mem->free(footnote_label);
+
       LIT("]");
     }
     break;
@@ -486,9 +492,13 @@ static int S_render_node(cmark_renderer *renderer, cmark_node *node,
     if (entering) {
       renderer->footnote_ix += 1;
       LIT("[^");
-      char n[32];
-      snprintf(n, sizeof(n), "%d", renderer->footnote_ix);
-      OUT(n, false, LITERAL);
+
+      char *footnote_label = renderer->mem->calloc(node->as.literal.len + 1, sizeof(char));
+      memmove(footnote_label, node->as.literal.data, node->as.literal.len);
+
+      OUT(footnote_label, false, LITERAL);
+      renderer->mem->free(footnote_label);
+
       LIT("]:\n");
 
       cmark_strbuf_puts(renderer->prefix, "    ");

data/ext/commonmarker/ext_scanners.c

@@ -1,4 +1,5 @@
-/* Generated by re2c 1.1.1 */
+/* Generated by re2c 1.3 */
+
 #include "ext_scanners.h"
 #include <stdlib.h>
 
@@ -39,265 +40,180 @@ bufsize_t _scan_table_start(const unsigned char *p) {
         0, 0,   0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0,   0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0,  0,
     };
-    yych = *(marker = p);
-    if (yych <= '{') {
-      if (yych <= 0x1F) {
-        if (yych <= '\t') {
-          if (yych <= 0x08)
-            goto yy3;
+    yych = *p;
+    if (yych <= ' ') {
+      if (yych <= '\n') {
+        if (yych == '\t')
           goto yy4;
-        } else {
-          if (yych <= '\n')
-            goto yy2;
-          if (yych <= '\f')
-            goto yy4;
-          goto yy3;
-        }
       } else {
-        if (yych <= '-') {
-          if (yych <= ' ')
-            goto yy4;
-          if (yych <= ',')
-            goto yy3;
-          goto yy5;
-        } else {
-          if (yych == ':')
-            goto yy6;
-          goto yy3;
-        }
+        if (yych <= '\f')
+          goto yy4;
+        if (yych >= ' ')
+          goto yy4;
       }
     } else {
-      if (yych <= 0xEC) {
-        if (yych <= 0xC1) {
-          if (yych <= '|')
-            goto yy4;
-          if (yych <= 0x7F)
-            goto yy3;
-        } else {
-          if (yych <= 0xDF)
-            goto yy7;
-          if (yych <= 0xE0)
-            goto yy9;
-          goto yy10;
-        }
+      if (yych <= '9') {
+        if (yych == '-')
+          goto yy5;
       } else {
-        if (yych <= 0xF0) {
-          if (yych <= 0xED)
-            goto yy11;
-          if (yych <= 0xEF)
-            goto yy10;
-          goto yy12;
-        } else {
-          if (yych <= 0xF3)
-            goto yy13;
-          if (yych <= 0xF4)
-            goto yy14;
-        }
+        if (yych <= ':')
+          goto yy6;
+        if (yych == '|')
+          goto yy4;
       }
     }
-  yy2 : { return 0; }
-  yy3:
     ++p;
-    goto yy2;
+  yy3 : { return 0; }
   yy4:
     yych = *(marker = ++p);
     if (yybm[0 + yych] & 64) {
-      goto yy15;
+      goto yy7;
     }
     if (yych == '-')
-      goto yy17;
+      goto yy10;
     if (yych == ':')
-      goto yy19;
-    goto yy2;
+      goto yy12;
+    goto yy3;
   yy5:
     yych = *(marker = ++p);
     if (yybm[0 + yych] & 128) {
-      goto yy17;
+      goto yy10;
     }
     if (yych <= ' ') {
       if (yych <= 0x08)
-        goto yy2;
+        goto yy3;
       if (yych <= '\r')
-        goto yy21;
+        goto yy14;
       if (yych <= 0x1F)
-        goto yy2;
-      goto yy21;
+        goto yy3;
+      goto yy14;
     } else {
       if (yych <= ':') {
         if (yych <= '9')
-          goto yy2;
-        goto yy20;
+          goto yy3;
+        goto yy13;
       } else {
         if (yych == '|')
-          goto yy21;
-        goto yy2;
+          goto yy14;
+        goto yy3;
       }
     }
   yy6:
     yych = *(marker = ++p);
     if (yybm[0 + yych] & 128) {
-      goto yy17;
+      goto yy10;
     }
-    goto yy2;
+    goto yy3;
   yy7:
-    yych = *++p;
-    if (yych <= 0x7F)
-      goto yy8;
-    if (yych <= 0xBF)
-      goto yy3;
-  yy8:
-    p = marker;
-    goto yy2;
-  yy9:
-    yych = *++p;
-    if (yych <= 0x9F)
-      goto yy8;
-    if (yych <= 0xBF)
-      goto yy7;
-    goto yy8;
-  yy10:
-    yych = *++p;
-    if (yych <= 0x7F)
-      goto yy8;
-    if (yych <= 0xBF)
-      goto yy7;
-    goto yy8;
-  yy11:
-    yych = *++p;
-    if (yych <= 0x7F)
-      goto yy8;
-    if (yych <= 0x9F)
-      goto yy7;
-    goto yy8;
-  yy12:
-    yych = *++p;
-    if (yych <= 0x8F)
-      goto yy8;
-    if (yych <= 0xBF)
-      goto yy10;
-    goto yy8;
-  yy13:
-    yych = *++p;
-    if (yych <= 0x7F)
-      goto yy8;
-    if (yych <= 0xBF)
-      goto yy10;
-    goto yy8;
-  yy14:
-    yych = *++p;
-    if (yych <= 0x7F)
-      goto yy8;
-    if (yych <= 0x8F)
-      goto yy10;
-    goto yy8;
-  yy15:
     yych = *++p;
     if (yybm[0 + yych] & 64) {
-      goto yy15;
+      goto yy7;
     }
     if (yych == '-')
-      goto yy17;
+      goto yy10;
     if (yych == ':')
-      goto yy19;
-    goto yy8;
-  yy17:
+      goto yy12;
+  yy9:
+    p = marker;
+    goto yy3;
+  yy10:
     yych = *++p;
     if (yybm[0 + yych] & 128) {
-      goto yy17;
+      goto yy10;
     }
     if (yych <= 0x1F) {
       if (yych <= '\n') {
         if (yych <= 0x08)
-          goto yy8;
+          goto yy9;
         if (yych <= '\t')
-          goto yy20;
-        goto yy22;
+          goto yy13;
+        goto yy15;
       } else {
         if (yych <= '\f')
-          goto yy20;
+          goto yy13;
         if (yych <= '\r')
-          goto yy24;
-        goto yy8;
+          goto yy17;
+        goto yy9;
       }
     } else {
       if (yych <= ':') {
         if (yych <= ' ')
-          goto yy20;
+          goto yy13;
         if (yych <= '9')
-          goto yy8;
-        goto yy20;
+          goto yy9;
+        goto yy13;
       } else {
         if (yych == '|')
-          goto yy25;
-        goto yy8;
+          goto yy18;
+        goto yy9;
       }
     }
-  yy19:
+  yy12:
     yych = *++p;
     if (yybm[0 + yych] & 128) {
-      goto yy17;
+      goto yy10;
     }
-    goto yy8;
-  yy20:
+    goto yy9;
+  yy13:
     yych = *++p;
-  yy21:
+  yy14:
     if (yych <= '\r') {
       if (yych <= '\t') {
         if (yych <= 0x08)
-          goto yy8;
-        goto yy20;
+          goto yy9;
+        goto yy13;
       } else {
         if (yych <= '\n')
-          goto yy22;
+          goto yy15;
         if (yych <= '\f')
-          goto yy20;
-        goto yy24;
+          goto yy13;
+        goto yy17;
       }
     } else {
       if (yych <= ' ') {
         if (yych <= 0x1F)
-          goto yy8;
-        goto yy20;
+          goto yy9;
+        goto yy13;
       } else {
         if (yych == '|')
-          goto yy25;
-        goto yy8;
+          goto yy18;
+        goto yy9;
       }
     }
-  yy22:
+  yy15:
     ++p;
     { return (bufsize_t)(p - start); }
-  yy24:
+  yy17:
     yych = *++p;
     if (yych == '\n')
-      goto yy22;
-    goto yy8;
-  yy25:
+      goto yy15;
+    goto yy9;
+  yy18:
     yych = *++p;
     if (yybm[0 + yych] & 128) {
-      goto yy17;
+      goto yy10;
     }
     if (yych <= '\r') {
       if (yych <= '\t') {
         if (yych <= 0x08)
-          goto yy8;
-        goto yy25;
+          goto yy9;
+        goto yy18;
       } else {
         if (yych <= '\n')
-          goto yy22;
+          goto yy15;
         if (yych <= '\f')
-          goto yy25;
-        goto yy24;
+          goto yy18;
+        goto yy17;
       }
     } else {
       if (yych <= ' ') {
         if (yych <= 0x1F)
-          goto yy8;
-        goto yy25;
+          goto yy9;
+        goto yy18;
       } else {
         if (yych == ':')
-          goto yy19;
-        goto yy8;
+          goto yy12;
+        goto yy9;
       }
     }
   }
@@ -309,6 +225,7 @@ bufsize_t _scan_table_cell(const unsigned char *p) {
 
   {
     unsigned char yych;
+    unsigned int yyaccept = 0;
     static const unsigned char yybm[] = {
         64, 64, 64,  64, 64, 64, 64, 64, 64, 64, 0,  64, 64, 0,  64, 64, 64, 64,
         64, 64, 64,  64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
@@ -326,53 +243,51 @@ bufsize_t _scan_table_cell(const unsigned char *p) {
         0,  0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
         0,  0,  0,   0,
     };
-    yych = *(marker = p);
+    yych = *p;
     if (yybm[0 + yych] & 64) {
-      goto yy30;
+      goto yy22;
     }
-    if (yych <= 0xE0) {
-      if (yych <= '\\') {
-        if (yych <= '\n')
-          goto yy29;
+    if (yych <= 0xEC) {
+      if (yych <= 0xC1) {
         if (yych <= '\r')
-          goto yy32;
-        goto yy34;
+          goto yy25;
+        if (yych <= '\\')
+          goto yy27;
+        goto yy25;
       } else {
-        if (yych <= '|')
-          goto yy32;
-        if (yych <= 0xC1)
-          goto yy29;
         if (yych <= 0xDF)
-          goto yy36;
-        goto yy38;
+          goto yy29;
+        if (yych <= 0xE0)
+          goto yy30;
+        goto yy31;
       }
     } else {
-      if (yych <= 0xEF) {
-        if (yych == 0xED)
-          goto yy40;
-        goto yy39;
+      if (yych <= 0xF0) {
+        if (yych <= 0xED)
+          goto yy32;
+        if (yych <= 0xEF)
+          goto yy31;
+        goto yy33;
       } else {
-        if (yych <= 0xF0)
-          goto yy41;
         if (yych <= 0xF3)
-          goto yy42;
+          goto yy34;
         if (yych <= 0xF4)
-          goto yy43;
+          goto yy35;
+        goto yy25;
       }
     }
-  yy29 : { return (bufsize_t)(p - start); }
-  yy30:
+  yy22:
+    yyaccept = 0;
     yych = *(marker = ++p);
     if (yybm[0 + yych] & 64) {
-      goto yy30;
+      goto yy22;
     }
     if (yych <= 0xEC) {
       if (yych <= 0xC1) {
         if (yych <= '\r')
-          goto yy29;
+          goto yy24;
         if (yych <= '\\')
-          goto yy34;
-        goto yy29;
+          goto yy27;
       } else {
         if (yych <= 0xDF)
           goto yy36;
@@ -392,29 +307,31 @@ bufsize_t _scan_table_cell(const unsigned char *p) {
           goto yy42;
         if (yych <= 0xF4)
           goto yy43;
-        goto yy29;
       }
     }
-  yy32:
+  yy24 : { return (bufsize_t)(p - start); }
+  yy25:
     ++p;
-    { return 0; }
-  yy34:
+  yy26 : { return 0; }
+  yy27:
+    yyaccept = 0;
     yych = *(marker = ++p);
     if (yybm[0 + yych] & 128) {
-      goto yy34;
+      goto yy27;
     }
     if (yych <= 0xDF) {
       if (yych <= '\f') {
         if (yych == '\n')
-          goto yy29;
-        goto yy30;
+          goto yy24;
+        goto yy22;
       } else {
         if (yych <= '\r')
-          goto yy29;
+          goto yy24;
         if (yych <= 0x7F)
-          goto yy30;
+          goto yy22;
         if (yych <= 0xC1)
-          goto yy29;
+          goto yy24;
+        goto yy36;
       }
     } else {
       if (yych <= 0xEF) {
@@ -430,18 +347,77 @@ bufsize_t _scan_table_cell(const unsigned char *p) {
           goto yy42;
         if (yych <= 0xF4)
           goto yy43;
-        goto yy29;
+        goto yy24;
       }
     }
+  yy29:
+    yych = *++p;
+    if (yych <= 0x7F)
+      goto yy26;
+    if (yych <= 0xBF)
+      goto yy22;
+    goto yy26;
+  yy30:
+    yyaccept = 1;
+    yych = *(marker = ++p);
+    if (yych <= 0x9F)
+      goto yy26;
+    if (yych <= 0xBF)
+      goto yy36;
+    goto yy26;
+  yy31:
+    yyaccept = 1;
+    yych = *(marker = ++p);
+    if (yych <= 0x7F)
+      goto yy26;
+    if (yych <= 0xBF)
+      goto yy36;
+    goto yy26;
+  yy32:
+    yyaccept = 1;
+    yych = *(marker = ++p);
+    if (yych <= 0x7F)
+      goto yy26;
+    if (yych <= 0x9F)
+      goto yy36;
+    goto yy26;
+  yy33:
+    yyaccept = 1;
+    yych = *(marker = ++p);
+    if (yych <= 0x8F)
+      goto yy26;
+    if (yych <= 0xBF)
+      goto yy39;
+    goto yy26;
+  yy34:
+    yyaccept = 1;
+    yych = *(marker = ++p);
+    if (yych <= 0x7F)
+      goto yy26;
+    if (yych <= 0xBF)
+      goto yy39;
+    goto yy26;
+  yy35:
+    yyaccept = 1;
+    yych = *(marker = ++p);
+    if (yych <= 0x7F)
+      goto yy26;
+    if (yych <= 0x8F)
+      goto yy39;
+    goto yy26;
   yy36:
     yych = *++p;
     if (yych <= 0x7F)
       goto yy37;
     if (yych <= 0xBF)
-      goto yy30;
+      goto yy22;
   yy37:
     p = marker;
-    goto yy29;
+    if (yyaccept == 0) {
+      goto yy24;
+    } else {
+      goto yy26;
+    }
   yy38:
     yych = *++p;
     if (yych <= 0x9F)
@@ -488,12 +464,10 @@ bufsize_t _scan_table_cell(const unsigned char *p) {
 }
 
 bufsize_t _scan_table_cell_end(const unsigned char *p) {
-  const unsigned char *marker = NULL;
   const unsigned char *start = p;
 
   {
     unsigned char yych;
-    unsigned int yyaccept = 0;
     static const unsigned char yybm[] = {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 128, 128, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0,   128, 0, 0, 0, 0, 0, 0, 0,
@@ -509,115 +483,17 @@ bufsize_t _scan_table_cell_end(const unsigned char *p) {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0,   0,   0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0,   0,   0, 0, 0,
     };
-    yych = *(marker = p);
-    if (yych <= 0xDF) {
-      if (yych <= '{') {
-        if (yych != '\n')
-          goto yy47;
-      } else {
-        if (yych <= '|')
-          goto yy48;
-        if (yych <= 0x7F)
-          goto yy47;
-        if (yych >= 0xC2)
-          goto yy51;
-      }
-    } else {
-      if (yych <= 0xEF) {
-        if (yych <= 0xE0)
-          goto yy53;
-        if (yych == 0xED)
-          goto yy55;
-        goto yy54;
-      } else {
-        if (yych <= 0xF0)
-          goto yy56;
-        if (yych <= 0xF3)
-          goto yy57;
-        if (yych <= 0xF4)
-          goto yy58;
-      }
-    }
-  yy46 : { return 0; }
-  yy47:
+    yych = *p;
+    if (yych == '|')
+      goto yy48;
     ++p;
-    goto yy46;
+    { return 0; }
   yy48:
-    yyaccept = 1;
-    yych = *(marker = ++p);
+    yych = *++p;
     if (yybm[0 + yych] & 128) {
       goto yy48;
     }
-    if (yych <= 0x08)
-      goto yy50;
-    if (yych <= '\n')
-      goto yy59;
-    if (yych <= '\r')
-      goto yy60;
-  yy50 : { return (bufsize_t)(p - start); }
-  yy51:
-    yych = *++p;
-    if (yych <= 0x7F)
-      goto yy52;
-    if (yych <= 0xBF)
-      goto yy47;
-  yy52:
-    p = marker;
-    if (yyaccept == 0) {
-      goto yy46;
-    } else {
-      goto yy50;
-    }
-  yy53:
-    yych = *++p;
-    if (yych <= 0x9F)
-      goto yy52;
-    if (yych <= 0xBF)
-      goto yy51;
-    goto yy52;
-  yy54:
-    yych = *++p;
-    if (yych <= 0x7F)
-      goto yy52;
-    if (yych <= 0xBF)
-      goto yy51;
-    goto yy52;
-  yy55:
-    yych = *++p;
-    if (yych <= 0x7F)
-      goto yy52;
-    if (yych <= 0x9F)
-      goto yy51;
-    goto yy52;
-  yy56:
-    yych = *++p;
-    if (yych <= 0x8F)
-      goto yy52;
-    if (yych <= 0xBF)
-      goto yy54;
-    goto yy52;
-  yy57:
-    yych = *++p;
-    if (yych <= 0x7F)
-      goto yy52;
-    if (yych <= 0xBF)
-      goto yy54;
-    goto yy52;
-  yy58:
-    yych = *++p;
-    if (yych <= 0x7F)
-      goto yy52;
-    if (yych <= 0x8F)
-      goto yy54;
-    goto yy52;
-  yy59:
-    ++p;
-    goto yy50;
-  yy60:
-    yych = *++p;
-    if (yych == '\n')
-      goto yy59;
-    goto yy52;
+    { return (bufsize_t)(p - start); }
   }
 }
 
@@ -642,138 +518,62 @@ bufsize_t _scan_table_row_end(const unsigned char *p) {
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0,   0,   0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0,   0,   0, 0, 0,
     };
-    yych = *(marker = p);
-    if (yych <= 0xC1) {
-      if (yych <= '\f') {
-        if (yych <= 0x08)
-          goto yy64;
-        if (yych == '\n')
-          goto yy66;
-        goto yy65;
-      } else {
-        if (yych <= 0x1F) {
-          if (yych <= '\r')
-            goto yy68;
-          goto yy64;
-        } else {
-          if (yych <= ' ')
-            goto yy65;
-          if (yych <= 0x7F)
-            goto yy64;
-        }
-      }
+    yych = *p;
+    if (yych <= '\f') {
+      if (yych <= 0x08)
+        goto yy53;
+      if (yych == '\n')
+        goto yy56;
+      goto yy55;
     } else {
-      if (yych <= 0xED) {
-        if (yych <= 0xDF)
-          goto yy69;
-        if (yych <= 0xE0)
-          goto yy71;
-        if (yych <= 0xEC)
-          goto yy72;
-        goto yy73;
-      } else {
-        if (yych <= 0xF0) {
-          if (yych <= 0xEF)
-            goto yy72;
-          goto yy74;
-        } else {
-          if (yych <= 0xF3)
-            goto yy75;
-          if (yych <= 0xF4)
-            goto yy76;
-        }
-      }
+      if (yych <= '\r')
+        goto yy58;
+      if (yych == ' ')
+        goto yy55;
     }
-  yy63 : { return 0; }
-  yy64:
+  yy53:
     ++p;
-    goto yy63;
-  yy65:
+  yy54 : { return 0; }
+  yy55:
     yych = *(marker = ++p);
     if (yych <= 0x08)
-      goto yy63;
+      goto yy54;
     if (yych <= '\r')
-      goto yy78;
+      goto yy60;
     if (yych == ' ')
-      goto yy78;
-    goto yy63;
-  yy66:
+      goto yy60;
+    goto yy54;
+  yy56:
     ++p;
     { return (bufsize_t)(p - start); }
-  yy68:
+  yy58:
     yych = *++p;
     if (yych == '\n')
-      goto yy66;
-    goto yy63;
-  yy69:
-    yych = *++p;
-    if (yych <= 0x7F)
-      goto yy70;
-    if (yych <= 0xBF)
-      goto yy64;
-  yy70:
-    p = marker;
-    goto yy63;
-  yy71:
-    yych = *++p;
-    if (yych <= 0x9F)
-      goto yy70;
-    if (yych <= 0xBF)
-      goto yy69;
-    goto yy70;
-  yy72:
-    yych = *++p;
-    if (yych <= 0x7F)
-      goto yy70;
-    if (yych <= 0xBF)
-      goto yy69;
-    goto yy70;
-  yy73:
-    yych = *++p;
-    if (yych <= 0x7F)
-      goto yy70;
-    if (yych <= 0x9F)
-      goto yy69;
-    goto yy70;
-  yy74:
-    yych = *++p;
-    if (yych <= 0x8F)
-      goto yy70;
-    if (yych <= 0xBF)
-      goto yy72;
-    goto yy70;
-  yy75:
-    yych = *++p;
-    if (yych <= 0x7F)
-      goto yy70;
-    if (yych <= 0xBF)
-      goto yy72;
-    goto yy70;
-  yy76:
-    yych = *++p;
-    if (yych <= 0x7F)
-      goto yy70;
-    if (yych <= 0x8F)
-      goto yy72;
-    goto yy70;
-  yy77:
+      goto yy56;
+    goto yy54;
+  yy59:
     yych = *++p;
-  yy78:
+  yy60:
     if (yybm[0 + yych] & 128) {
-      goto yy77;
+      goto yy59;
     }
     if (yych <= 0x08)
-      goto yy70;
+      goto yy61;
     if (yych <= '\n')
-      goto yy66;
-    if (yych >= 0x0E)
-      goto yy70;
+      goto yy56;
+    if (yych <= '\r')
+      goto yy62;
+  yy61:
+    p = marker;
+    goto yy54;
+  yy62:
     yych = *++p;
     if (yych == '\n')
-      goto yy66;
-    goto yy70;
+      goto yy56;
+    goto yy61;
   }
 }
+
 bufsize_t _scan_tasklist(const unsigned char *p) {
   const unsigned char *marker = NULL;
   const unsigned char *start = p;
@@ -798,361 +598,281 @@ bufsize_t _scan_tasklist(const unsigned char *p) {
         0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 0,  0,  0, 0, 0,
         0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 0,  0,  0, 0, 0,
     };
-    yych = *(marker = p);
-    if (yych <= '/') {
-      if (yych <= 0x1F) {
-        if (yych <= '\t') {
-          if (yych <= 0x08)
-            goto yy83;
-          goto yy84;
-        } else {
-          if (yych <= '\n')
-            goto yy82;
-          if (yych <= '\f')
-            goto yy84;
-          goto yy83;
-        }
+    yych = *p;
+    if (yych <= ' ') {
+      if (yych <= '\n') {
+        if (yych == '\t')
+          goto yy67;
       } else {
-        if (yych <= '+') {
-          if (yych <= ' ')
-            goto yy84;
-          if (yych <= ')')
-            goto yy83;
-          goto yy85;
-        } else {
-          if (yych == '-')
-            goto yy85;
-          goto yy83;
-        }
+        if (yych <= '\f')
+          goto yy67;
+        if (yych >= ' ')
+          goto yy67;
       }
     } else {
-      if (yych <= 0xEC) {
-        if (yych <= 0xC1) {
-          if (yych <= '9')
-            goto yy86;
-          if (yych <= 0x7F)
-            goto yy83;
-        } else {
-          if (yych <= 0xDF)
-            goto yy87;
-          if (yych <= 0xE0)
-            goto yy89;
-          goto yy90;
-        }
+      if (yych <= ',') {
+        if (yych <= ')')
+          goto yy65;
+        if (yych <= '+')
+          goto yy68;
       } else {
-        if (yych <= 0xF0) {
-          if (yych <= 0xED)
-            goto yy91;
-          if (yych <= 0xEF)
-            goto yy90;
-          goto yy92;
-        } else {
-          if (yych <= 0xF3)
-            goto yy93;
-          if (yych <= 0xF4)
-            goto yy94;
-        }
+        if (yych <= '-')
+          goto yy68;
+        if (yych <= '/')
+          goto yy65;
+        if (yych <= '9')
+          goto yy69;
       }
     }
-  yy82 : { return 0; }
-  yy83:
+  yy65:
     ++p;
-    goto yy82;
-  yy84:
+  yy66 : { return 0; }
+  yy67:
     yych = *(marker = ++p);
     if (yybm[0 + yych] & 64) {
-      goto yy95;
+      goto yy70;
     }
     if (yych <= ',') {
       if (yych <= ')')
-        goto yy82;
+        goto yy66;
       if (yych <= '+')
-        goto yy97;
-      goto yy82;
+        goto yy73;
+      goto yy66;
     } else {
       if (yych <= '-')
-        goto yy97;
+        goto yy73;
       if (yych <= '/')
-        goto yy82;
+        goto yy66;
       if (yych <= '9')
-        goto yy98;
-      goto yy82;
+        goto yy74;
+      goto yy66;
     }
-  yy85:
+  yy68:
     yych = *(marker = ++p);
     if (yych <= '\n') {
       if (yych == '\t')
-        goto yy99;
-      goto yy82;
+        goto yy75;
+      goto yy66;
     } else {
       if (yych <= '\f')
-        goto yy99;
+        goto yy75;
       if (yych == ' ')
-        goto yy99;
-      goto yy82;
+        goto yy75;
+      goto yy66;
     }
-  yy86:
+  yy69:
     yych = *(marker = ++p);
     if (yych <= 0x1F) {
       if (yych <= '\t') {
         if (yych <= 0x08)
-          goto yy102;
-        goto yy97;
+          goto yy78;
+        goto yy73;
       } else {
         if (yych <= '\n')
-          goto yy82;
+          goto yy66;
         if (yych <= '\f')
-          goto yy97;
-        goto yy102;
+          goto yy73;
+        goto yy78;
       }
     } else {
       if (yych <= 0x7F) {
         if (yych <= ' ')
-          goto yy97;
-        goto yy102;
+          goto yy73;
+        goto yy78;
       } else {
         if (yych <= 0xC1)
-          goto yy82;
+          goto yy66;
         if (yych <= 0xF4)
-          goto yy102;
-        goto yy82;
+          goto yy78;
+        goto yy66;
       }
     }
-  yy87:
-    yych = *++p;
-    if (yych <= 0x7F)
-      goto yy88;
-    if (yych <= 0xBF)
-      goto yy83;
-  yy88:
-    p = marker;
-    goto yy82;
-  yy89:
-    yych = *++p;
-    if (yych <= 0x9F)
-      goto yy88;
-    if (yych <= 0xBF)
-      goto yy87;
-    goto yy88;
-  yy90:
-    yych = *++p;
-    if (yych <= 0x7F)
-      goto yy88;
-    if (yych <= 0xBF)
-      goto yy87;
-    goto yy88;
-  yy91:
-    yych = *++p;
-    if (yych <= 0x7F)
-      goto yy88;
-    if (yych <= 0x9F)
-      goto yy87;
-    goto yy88;
-  yy92:
-    yych = *++p;
-    if (yych <= 0x8F)
-      goto yy88;
-    if (yych <= 0xBF)
-      goto yy90;
-    goto yy88;
-  yy93:
-    yych = *++p;
-    if (yych <= 0x7F)
-      goto yy88;
-    if (yych <= 0xBF)
-      goto yy90;
-    goto yy88;
-  yy94:
-    yych = *++p;
-    if (yych <= 0x7F)
-      goto yy88;
-    if (yych <= 0x8F)
-      goto yy90;
-    goto yy88;
-  yy95:
+  yy70:
     yych = *++p;
     if (yybm[0 + yych] & 64) {
-      goto yy95;
+      goto yy70;
     }
     if (yych <= ',') {
       if (yych <= ')')
-        goto yy88;
-      if (yych >= ',')
-        goto yy88;
+        goto yy72;
+      if (yych <= '+')
+        goto yy73;
     } else {
       if (yych <= '-')
-        goto yy97;
+        goto yy73;
       if (yych <= '/')
-        goto yy88;
+        goto yy72;
       if (yych <= '9')
-        goto yy98;
-      goto yy88;
+        goto yy74;
     }
-  yy97:
+  yy72:
+    p = marker;
+    goto yy66;
+  yy73:
     yych = *++p;
     if (yych == '[')
-      goto yy88;
-    goto yy100;
-  yy98:
+      goto yy72;
+    goto yy76;
+  yy74:
     yych = *++p;
     if (yych <= '\n') {
       if (yych == '\t')
-        goto yy97;
-      goto yy102;
+        goto yy73;
+      goto yy78;
     } else {
       if (yych <= '\f')
-        goto yy97;
+        goto yy73;
       if (yych == ' ')
-        goto yy97;
-      goto yy102;
+        goto yy73;
+      goto yy78;
     }
-  yy99:
+  yy75:
     yych = *++p;
-  yy100:
+  yy76:
     if (yych <= '\f') {
       if (yych == '\t')
-        goto yy99;
+        goto yy75;
       if (yych <= '\n')
-        goto yy88;
-      goto yy99;
+        goto yy72;
+      goto yy75;
     } else {
       if (yych <= ' ') {
         if (yych <= 0x1F)
-          goto yy88;
-        goto yy99;
+          goto yy72;
+        goto yy75;
       } else {
         if (yych == '[')
-          goto yy110;
-        goto yy88;
+          goto yy86;
+        goto yy72;
       }
     }
-  yy101:
+  yy77:
     yych = *++p;
-  yy102:
+  yy78:
     if (yybm[0 + yych] & 128) {
-      goto yy101;
+      goto yy77;
     }
     if (yych <= 0xC1) {
       if (yych <= '\f') {
         if (yych <= 0x08)
-          goto yy97;
+          goto yy73;
         if (yych == '\n')
-          goto yy88;
-        goto yy99;
+          goto yy72;
+        goto yy75;
       } else {
         if (yych == ' ')
-          goto yy99;
+          goto yy75;
         if (yych <= 0x7F)
-          goto yy97;
-        goto yy88;
+          goto yy73;
+        goto yy72;
       }
     } else {
       if (yych <= 0xED) {
         if (yych <= 0xDF)
-          goto yy103;
+          goto yy79;
         if (yych <= 0xE0)
-          goto yy104;
+          goto yy80;
         if (yych <= 0xEC)
-          goto yy105;
-        goto yy106;
+          goto yy81;
+        goto yy82;
       } else {
         if (yych <= 0xF0) {
           if (yych <= 0xEF)
-            goto yy105;
-          goto yy107;
+            goto yy81;
+          goto yy83;
         } else {
           if (yych <= 0xF3)
-            goto yy108;
+            goto yy84;
           if (yych <= 0xF4)
-            goto yy109;
-          goto yy88;
+            goto yy85;
+          goto yy72;
         }
       }
     }
-  yy103:
+  yy79:
     yych = *++p;
     if (yych <= 0x7F)
-      goto yy88;
+      goto yy72;
     if (yych <= 0xBF)
-      goto yy97;
-    goto yy88;
-  yy104:
+      goto yy73;
+    goto yy72;
+  yy80:
     yych = *++p;
     if (yych <= 0x9F)
-      goto yy88;
+      goto yy72;
     if (yych <= 0xBF)
-      goto yy103;
-    goto yy88;
-  yy105:
+      goto yy79;
+    goto yy72;
+  yy81:
     yych = *++p;
     if (yych <= 0x7F)
-      goto yy88;
+      goto yy72;
     if (yych <= 0xBF)
-      goto yy103;
-    goto yy88;
-  yy106:
+      goto yy79;
+    goto yy72;
+  yy82:
     yych = *++p;
     if (yych <= 0x7F)
-      goto yy88;
+      goto yy72;
     if (yych <= 0x9F)
-      goto yy103;
-    goto yy88;
-  yy107:
+      goto yy79;
+    goto yy72;
+  yy83:
     yych = *++p;
     if (yych <= 0x8F)
-      goto yy88;
+      goto yy72;
     if (yych <= 0xBF)
-      goto yy105;
-    goto yy88;
-  yy108:
+      goto yy81;
+    goto yy72;
+  yy84:
     yych = *++p;
     if (yych <= 0x7F)
-      goto yy88;
+      goto yy72;
     if (yych <= 0xBF)
-      goto yy105;
-    goto yy88;
-  yy109:
+      goto yy81;
+    goto yy72;
+  yy85:
     yych = *++p;
     if (yych <= 0x7F)
-      goto yy88;
+      goto yy72;
     if (yych <= 0x8F)
-      goto yy105;
-    goto yy88;
-  yy110:
+      goto yy81;
+    goto yy72;
+  yy86:
     yych = *++p;
     if (yych <= 'W') {
       if (yych != ' ')
-        goto yy88;
+        goto yy72;
     } else {
       if (yych <= 'X')
-        goto yy111;
+        goto yy87;
       if (yych != 'x')
-        goto yy88;
+        goto yy72;
     }
-  yy111:
+  yy87:
     yych = *++p;
     if (yych != ']')
-      goto yy88;
+      goto yy72;
     yych = *++p;
     if (yych <= '\n') {
       if (yych != '\t')
-        goto yy88;
+        goto yy72;
     } else {
       if (yych <= '\f')
-        goto yy113;
+        goto yy89;
       if (yych != ' ')
-        goto yy88;
+        goto yy72;
     }
-  yy113:
+  yy89:
     yych = *++p;
     if (yych <= '\n') {
       if (yych == '\t')
-        goto yy113;
+        goto yy89;
     } else {
       if (yych <= '\f')
-        goto yy113;
+        goto yy89;
       if (yych == ' ')
-        goto yy113;
+        goto yy89;
     }
     { return (bufsize_t)(p - start); }
   }