commonmarker 0.10.0 → 0.11.0

data/ext/commonmarker/cmark/src/node.h

@@ -9,6 +9,7 @@ extern "C" {
 #include <stdint.h>
 
 #include "cmark.h"
+#include "cmark_extension_api.h"
 #include "buffer.h"
 #include "chunk.h"
 
@@ -61,6 +62,7 @@ struct cmark_node {
   struct cmark_node *last_child;
 
   void *user_data;
+  cmark_free_func user_data_free_func;
 
   int start_line;
   int start_column;
@@ -69,6 +71,8 @@ struct cmark_node {
   uint16_t type;
   uint16_t flags;
 
+  cmark_syntax_extension *extension;
+
   union {
     cmark_chunk literal;
     cmark_list list;
@@ -77,6 +81,7 @@ struct cmark_node {
     cmark_link link;
     cmark_custom custom;
     int html_block_type;
+    void *opaque;
   } as;
 };
 
@@ -85,6 +90,24 @@ static CMARK_INLINE cmark_mem *cmark_node_mem(cmark_node *node) {
 }
 CMARK_EXPORT int cmark_node_check(cmark_node *node, FILE *out);
 
+static CMARK_INLINE bool CMARK_NODE_TYPE_BLOCK_P(cmark_node_type node_type) {
+	return (node_type & CMARK_NODE_TYPE_MASK) == CMARK_NODE_TYPE_BLOCK;
+}
+
+static CMARK_INLINE bool CMARK_NODE_BLOCK_P(cmark_node *node) {
+	return node != NULL && CMARK_NODE_TYPE_BLOCK_P((cmark_node_type) node->type);
+}
+
+static CMARK_INLINE bool CMARK_NODE_TYPE_INLINE_P(cmark_node_type node_type) {
+	return (node_type & CMARK_NODE_TYPE_MASK) == CMARK_NODE_TYPE_INLINE;
+}
+
+static CMARK_INLINE bool CMARK_NODE_INLINE_P(cmark_node *node) {
+	return node != NULL && CMARK_NODE_TYPE_INLINE_P((cmark_node_type) node->type);
+}
+
+CMARK_EXPORT bool cmark_node_can_contain_type(cmark_node *node, cmark_node_type child_type);
+
 #ifdef __cplusplus
 }
 #endif

data/ext/commonmarker/cmark/src/parser.h

@@ -1,5 +1,5 @@
-#ifndef CMARK_AST_H
-#define CMARK_AST_H
+#ifndef CMARK_PARSER_H
+#define CMARK_PARSER_H
 
 #include <stdio.h>
 #include "node.h"
@@ -14,22 +14,39 @@ extern "C" {
 
 struct cmark_parser {
   struct cmark_mem *mem;
+  /* A hashtable of urls in the current document for cross-references */
   struct cmark_reference_map *refmap;
+  /* The root node of the parser, always a CMARK_NODE_DOCUMENT */
   struct cmark_node *root;
+  /* The last open block after a line is fully processed */
   struct cmark_node *current;
+  /* See the documentation for cmark_parser_get_line_number() in cmark.h */
   int line_number;
+  /* See the documentation for cmark_parser_get_offset() in cmark.h */
   bufsize_t offset;
+  /* See the documentation for cmark_parser_get_column() in cmark.h */
   bufsize_t column;
+  /* See the documentation for cmark_parser_get_first_nonspace() in cmark.h */
   bufsize_t first_nonspace;
+  /* See the documentation for cmark_parser_get_first_nonspace_column() in cmark.h */
   bufsize_t first_nonspace_column;
+  /* See the documentation for cmark_parser_get_indent() in cmark.h */
   int indent;
+  /* See the documentation for cmark_parser_is_blank() in cmark.h */
   bool blank;
+  /* See the documentation for cmark_parser_has_partially_consumed_tab() in cmark.h */
   bool partially_consumed_tab;
+  /* Contains the currently processed line */
   cmark_strbuf curline;
+  /* See the documentation for cmark_parser_get_last_line_length() in cmark.h */
   bufsize_t last_line_length;
+  /* FIXME: not sure about the difference with curline */
   cmark_strbuf linebuf;
+  /* Options set by the user, see the Options section in cmark.h */
   int options;
   bool last_buffer_ended_with_cr;
+  cmark_llist *syntax_extensions;
+  cmark_llist *inline_syntax_extensions;
 };
 
 #ifdef __cplusplus

data/ext/commonmarker/cmark/src/plugin.c

@@ -0,0 +1,33 @@
+#include <stdlib.h>
+
+#include "plugin.h"
+
+int cmark_plugin_register_syntax_extension(cmark_plugin    * plugin,
+                                        cmark_syntax_extension * extension) {
+  plugin->syntax_extensions = cmark_llist_append(plugin->syntax_extensions, extension);
+  return 1;
+}
+
+cmark_plugin *
+cmark_plugin_new(void) {
+  cmark_plugin *res = (cmark_plugin *) malloc(sizeof(cmark_plugin));
+
+  res->syntax_extensions = NULL;
+
+  return res;
+}
+
+void
+cmark_plugin_free(cmark_plugin *plugin) {
+  cmark_llist_free_full(plugin->syntax_extensions,
+                        (cmark_free_func) cmark_syntax_extension_free);
+  free(plugin);
+}
+
+cmark_llist *
+cmark_plugin_steal_syntax_extensions(cmark_plugin *plugin) {
+  cmark_llist *res = plugin->syntax_extensions;
+
+  plugin->syntax_extensions = NULL;
+  return res;
+}

data/ext/commonmarker/cmark/src/plugin.h

@@ -0,0 +1,34 @@
+#ifndef CMARK_PLUGIN_H
+#define CMARK_PLUGIN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "cmark.h"
+#include "cmark_extension_api.h"
+
+/**
+ * cmark_plugin:
+ *
+ * A plugin structure, which should be filled by plugin's
+ * init functions.
+ */
+struct cmark_plugin {
+  cmark_llist *syntax_extensions;
+};
+
+cmark_llist *
+cmark_plugin_steal_syntax_extensions(cmark_plugin *plugin);
+
+cmark_plugin *
+cmark_plugin_new(void);
+
+void
+cmark_plugin_free(cmark_plugin *plugin);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

data/ext/commonmarker/cmark/src/registry.c

@@ -0,0 +1,60 @@
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "config.h"
+#include "cmark.h"
+#include "syntax_extension.h"
+#include "registry.h"
+#include "plugin.h"
+
+
+static cmark_llist *syntax_extensions = NULL;
+
+void cmark_register_plugin(cmark_plugin_init_func reg_fn) {
+  cmark_plugin *plugin = cmark_plugin_new();
+
+  if (!reg_fn(plugin)) {
+    cmark_plugin_free(plugin);
+    return;
+  }
+
+  cmark_llist *syntax_extensions_list = cmark_plugin_steal_syntax_extensions(plugin),
+              *it;
+
+  for (it = syntax_extensions_list; it; it = it->next) {
+    syntax_extensions = cmark_llist_append(syntax_extensions, it->data);
+  }
+
+  cmark_llist_free(syntax_extensions_list);
+  cmark_plugin_free(plugin);
+}
+
+void cmark_release_plugins(void) {
+  if (syntax_extensions) {
+    cmark_llist_free_full(syntax_extensions,
+        (cmark_free_func) cmark_syntax_extension_free);
+    syntax_extensions = NULL;
+  }
+}
+
+cmark_llist *cmark_list_syntax_extensions(void) {
+  cmark_llist *it;
+  cmark_llist *res = NULL;
+
+  for (it = syntax_extensions; it; it = it->next) {
+    res = cmark_llist_append(res, it->data);
+  }
+  return res;
+}
+
+cmark_syntax_extension *cmark_find_syntax_extension(const char *name) {
+  cmark_llist *tmp;
+
+  for (tmp = syntax_extensions; tmp; tmp = tmp->next) {
+    cmark_syntax_extension *ext = (cmark_syntax_extension *) tmp->data;
+    if (!strcmp(ext->name, name))
+      return ext;
+  }
+  return NULL;
+}

data/ext/commonmarker/cmark/src/registry.h

@@ -0,0 +1,24 @@
+#ifndef CMARK_REGISTRY_H
+#define CMARK_REGISTRY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "cmark.h"
+#include "plugin.h"
+
+CMARK_EXPORT
+void cmark_register_plugin(cmark_plugin_init_func reg_fn);
+
+CMARK_EXPORT
+void cmark_release_plugins(void);
+
+CMARK_EXPORT
+cmark_llist *cmark_list_syntax_extensions(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

data/ext/commonmarker/cmark/src/render.h

@@ -32,6 +32,15 @@ struct cmark_renderer {
 
 typedef struct cmark_renderer cmark_renderer;
 
+struct cmark_html_renderer {
+  cmark_strbuf *html;
+  cmark_node *plain;
+  cmark_llist *filter_extensions;
+  void *opaque;
+};
+
+typedef struct cmark_html_renderer cmark_html_renderer;
+
 void cmark_render_ascii(cmark_renderer *renderer, const char *s);
 
 void cmark_render_code_point(cmark_renderer *renderer, uint32_t c);

data/ext/commonmarker/cmark/src/scanners.c

@@ -1,7 +1,7 @@
 /* Generated by re2c 0.15.3 */
-#include <stdlib.h>
-#include "chunk.h"
 #include "scanners.h"
+#include "chunk.h"
+#include <stdlib.h>
 
 bufsize_t _scan_at(bufsize_t (*scanner)(const unsigned char *), cmark_chunk *c,
                    bufsize_t offset) {
@@ -29,38 +29,30 @@ bufsize_t _scan_scheme(const unsigned char *p) {
   {
     unsigned char yych;
     yych = *(marker = p);
-    if (yych <= 0x7F) {
-      if (yych <= ' ') {
+    if (yych <= 0xC1) {
+      if (yych <= 'Z') {
         if (yych == '\n')
           goto yy2;
-        if (yych <= 0x1F)
+        if (yych <= '@')
           goto yy4;
         goto yy3;
       } else {
-        if (yych <= 'Z') {
-          if (yych <= '@')
-            goto yy4;
+        if (yych <= '`')
+          goto yy4;
+        if (yych <= 'z')
           goto yy3;
-        } else {
-          if (yych <= '`')
-            goto yy4;
-          if (yych <= 'z')
-            goto yy3;
+        if (yych <= 0x7F)
           goto yy4;
-        }
       }
     } else {
       if (yych <= 0xED) {
-        if (yych <= 0xDF) {
-          if (yych >= 0xC2)
-            goto yy5;
-        } else {
-          if (yych <= 0xE0)
-            goto yy7;
-          if (yych <= 0xEC)
-            goto yy8;
-          goto yy12;
-        }
+        if (yych <= 0xDF)
+          goto yy5;
+        if (yych <= 0xE0)
+          goto yy7;
+        if (yych <= 0xEC)
+          goto yy8;
+        goto yy12;
       } else {
         if (yych <= 0xF0) {
           if (yych <= 0xEF)
@@ -77,14 +69,22 @@ bufsize_t _scan_scheme(const unsigned char *p) {
   yy2 : { return 0; }
   yy3:
     yych = *(marker = ++p);
-    if (yych <= '.') {
-      if (yych == '+')
+    if (yych <= '/') {
+      if (yych <= '+') {
+        if (yych <= '*')
+          goto yy2;
         goto yy13;
-      if (yych <= ',')
+      } else {
+        if (yych <= ',')
+          goto yy2;
+        if (yych <= '.')
+          goto yy13;
         goto yy2;
-      goto yy13;
+      }
     } else {
       if (yych <= 'Z') {
+        if (yych <= '9')
+          goto yy13;
         if (yych <= '@')
           goto yy2;
         goto yy13;
@@ -153,16 +153,14 @@ bufsize_t _scan_scheme(const unsigned char *p) {
   yy13:
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
-          goto yy6;
-        goto yy16;
-      } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych <= '.')
+      if (yych <= ',') {
+        if (yych == '+')
           goto yy16;
         goto yy6;
+      } else {
+        if (yych == '/')
+          goto yy6;
+        goto yy16;
       }
     } else {
       if (yych <= 'Z') {
@@ -185,13 +183,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
   yy16:
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -209,13 +205,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -233,13 +227,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -257,13 +249,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -281,13 +271,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -305,13 +293,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -329,13 +315,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -353,13 +337,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -377,13 +359,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -401,13 +381,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -425,13 +403,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -449,13 +425,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -473,13 +447,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -497,13 +469,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -521,13 +491,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -545,13 +513,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -569,13 +535,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -593,13 +557,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -617,13 +579,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -641,13 +601,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -665,13 +623,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -689,13 +645,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -713,13 +667,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -737,13 +689,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -761,13 +711,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -785,13 +733,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -809,13 +755,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -833,13 +777,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -857,13 +799,11 @@ bufsize_t _scan_scheme(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy6;
       } else {
-        if (yych <= ',')
-          goto yy6;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy6;
       }
     } else {
@@ -915,38 +855,30 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
         0,   0,   0,   0,
     };
     yych = *(marker = p);
-    if (yych <= 0x7F) {
-      if (yych <= ' ') {
+    if (yych <= 0xC1) {
+      if (yych <= 'Z') {
         if (yych == '\n')
           goto yy48;
-        if (yych <= 0x1F)
+        if (yych <= '@')
           goto yy50;
         goto yy49;
       } else {
-        if (yych <= 'Z') {
-          if (yych <= '@')
-            goto yy50;
+        if (yych <= '`')
+          goto yy50;
+        if (yych <= 'z')
           goto yy49;
-        } else {
-          if (yych <= '`')
-            goto yy50;
-          if (yych <= 'z')
-            goto yy49;
+        if (yych <= 0x7F)
           goto yy50;
-        }
       }
     } else {
       if (yych <= 0xED) {
-        if (yych <= 0xDF) {
-          if (yych >= 0xC2)
-            goto yy51;
-        } else {
-          if (yych <= 0xE0)
-            goto yy53;
-          if (yych <= 0xEC)
-            goto yy54;
-          goto yy58;
-        }
+        if (yych <= 0xDF)
+          goto yy51;
+        if (yych <= 0xE0)
+          goto yy53;
+        if (yych <= 0xEC)
+          goto yy54;
+        goto yy58;
       } else {
         if (yych <= 0xF0) {
           if (yych <= 0xEF)
@@ -963,14 +895,22 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
   yy48 : { return 0; }
   yy49:
     yych = *(marker = ++p);
-    if (yych <= '.') {
-      if (yych == '+')
+    if (yych <= '/') {
+      if (yych <= '+') {
+        if (yych <= '*')
+          goto yy48;
         goto yy59;
-      if (yych <= ',')
+      } else {
+        if (yych <= ',')
+          goto yy48;
+        if (yych <= '.')
+          goto yy59;
         goto yy48;
-      goto yy59;
+      }
     } else {
       if (yych <= 'Z') {
+        if (yych <= '9')
+          goto yy59;
         if (yych <= '@')
           goto yy48;
         goto yy59;
@@ -1039,16 +979,14 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
   yy59:
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
-          goto yy52;
-        goto yy62;
-      } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych <= '.')
+      if (yych <= ',') {
+        if (yych == '+')
           goto yy62;
         goto yy52;
+      } else {
+        if (yych == '/')
+          goto yy52;
+        goto yy62;
       }
     } else {
       if (yych <= 'Z') {
@@ -1103,13 +1041,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
   yy62:
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -1127,13 +1063,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -1151,13 +1085,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -1175,13 +1107,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -1199,13 +1129,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -1223,13 +1151,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -1247,13 +1173,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -1271,13 +1195,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -1295,13 +1217,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -1319,13 +1239,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -1343,13 +1261,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -1367,13 +1283,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -1391,13 +1305,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -1415,13 +1327,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -1439,13 +1349,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -1463,13 +1371,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -1487,13 +1393,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -1511,13 +1415,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -1535,13 +1437,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -1559,13 +1459,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -1583,13 +1481,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -1607,13 +1503,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -1631,13 +1525,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -1655,13 +1547,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -1679,13 +1569,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -1703,13 +1591,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -1727,13 +1613,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -1751,13 +1635,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -1775,13 +1657,11 @@ bufsize_t _scan_autolink_uri(const unsigned char *p) {
     }
     yych = *++p;
     if (yych <= '9') {
-      if (yych <= '+') {
-        if (yych <= '*')
+      if (yych <= ',') {
+        if (yych != '+')
           goto yy52;
       } else {
-        if (yych <= ',')
-          goto yy52;
-        if (yych >= '/')
+        if (yych == '/')
           goto yy52;
       }
     } else {
@@ -8258,45 +8138,37 @@ bufsize_t _scan_html_tag(const unsigned char *p) {
     unsigned char yych;
     static const unsigned char yybm[] = {
         /* table 1 .. 8: 0 */
-        0,   230, 230, 230, 230, 230, 230, 230, 230, 199, 199, 199, 199, 199,
+        0, 230, 230, 230, 230, 230, 230, 230, 230, 199, 199, 199, 199, 199, 230,
         230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230,
-        230, 230, 230, 230, 199, 230, 70,  230, 230, 230, 230, 134, 230, 230,
-        230, 230, 230, 254, 246, 230, 254, 254, 254, 254, 254, 254, 254, 254,
-        254, 254, 246, 230, 198, 198, 196, 230, 230, 254, 254, 254, 254, 254,
+        230, 230, 230, 199, 230, 70, 230, 230, 230, 230, 134, 230, 230, 230,
+        230, 230, 254, 246, 230, 254, 254, 254, 254, 254, 254, 254, 254, 254,
+        254, 246, 230, 198, 198, 196, 230, 230, 254, 254, 254, 254, 254, 254,
         254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254,
-        254, 254, 254, 254, 254, 254, 254, 230, 230, 226, 230, 246, 198, 254,
+        254, 254, 254, 254, 254, 254, 230, 230, 226, 230, 246, 198, 254, 254,
         254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254,
-        254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 230, 230, 230,
-        230, 230, 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,   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,   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,   0,   0,
-        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-        0,   0,   0,   0,
+        254, 254, 254, 254, 254, 254, 254, 254, 254, 254, 230, 230, 230, 230,
+        230, 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, 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, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         /* table 9 .. 11: 256 */
-        0,   160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
+        0, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
         160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
         160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
-        160, 160, 160, 32,  160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
-        160, 160, 160, 160, 160, 160, 160, 128, 160, 224, 224, 224, 224, 224,
+        160, 160, 32, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
+        160, 160, 160, 160, 160, 160, 128, 160, 224, 224, 224, 224, 224, 224,
         224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224,
-        224, 224, 224, 224, 224, 224, 224, 160, 160, 160, 160, 160, 160, 160,
+        224, 224, 224, 224, 224, 224, 160, 160, 160, 160, 160, 160, 160, 160,
         160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
         160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
-        160, 160, 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,   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,   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,   0,   0,
-        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-        0,   0,   0,   0,
+        160, 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, 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, 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, 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 <= '`') {
@@ -10582,7 +10454,9 @@ bufsize_t _scan_html_block_start(const unsigned char *p) {
     yych = *++p;
     if (yych <= 'S') {
       if (yych <= 'D') {
-        if (yych == '1')
+        if (yych <= '0')
+          goto yy525;
+        if (yych <= '6')
           goto yy564;
         goto yy525;
       } else {