commonmarker 0.21.2 → 0.23.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac3365deb1dd8288503331626fc20ec583a5f96a23e25d330f4ff47e526bfc54
-  data.tar.gz: 975bcb958eb2e994a15090311088ff95870af95b1fc2d73bc1c4eb216fe69388
+  metadata.gz: e9994d57ada57273f14d8098d2dbce3c923adf271fd7cbbc57d617cd3b78922a
+  data.tar.gz: 49911d1ce9bf022eb5b6f4698da9d3839476c20dffc2d2a3910784b483d74481
 SHA512:
-  metadata.gz: 531cda0280a75a40c139969287106646c8b2cef181b48249055f3a896bc4329485a0f70ac59f6f3a85eed00247c15f4a6785f478b957ebd3594be3074a9d25a9
-  data.tar.gz: 3bb88a326ea1e0e7f99da2b459b90cac2ea748e57d933029c11278f230064a433a00889c93d65851dfef4b131ba46562a33d4597ef677f3e382325a712b0ffe6
+  metadata.gz: a79d35be4e6046cc07ba6061ef8f3563ae31a78ee24e114675cf98c1188c13b40bec8eed1265ccd11ae39eef6032bc91d57ce8254f9b676f198c2a057c6ea7d3
+  data.tar.gz: bb887c9aa1d34dc200622b001b6a09ecb53625807de66a226331afe090db4d2d61fd5edce9be7b61fdd27e23ed1c8a70b41089f088e93936115b9f517b6bef03

data/README.md

@@ -1,6 +1,6 @@
 # CommonMarker
 
-[![Build Status](https://travis-ci.org/gjtorikian/commonmarker.svg)](https://travis-ci.org/gjtorikian/commonmarker) [![Gem Version](https://badge.fury.io/rb/commonmarker.svg)](http://badge.fury.io/rb/commonmarker)
+![Build Status](https://github.com/gjtorikian/commonmarker/workflows/CI/badge.svg) [![Gem Version](https://badge.fury.io/rb/commonmarker.svg)](http://badge.fury.io/rb/commonmarker)
 
 Ruby wrapper for [libcmark-gfm](https://github.com/github/cmark),
 GitHub's fork of the reference parser for CommonMark. It passes all of the C tests, and is therefore spec-complete. It also includes extensions to the CommonMark spec as documented in the [GitHub Flavored Markdown spec](http://github.github.com/gfm/), such as support for tables, strikethroughs, and autolinking.
@@ -130,26 +130,31 @@ CommonMarker accepts the same options that CMark does, as symbols. Note that the
 | Name                          | Description
 | ----------------------------- | -----------
 | `:DEFAULT`                    | The default parsing system.
+| `:SOURCEPOS`                  | Include source position in nodes
 | `:UNSAFE`                     | Allow raw/custom HTML and unsafe links.
-| `:FOOTNOTES`                  | Parse footnotes.
-| `:LIBERAL_HTML_TAG`           | Support liberal parsing of inline HTML tags.
+| `:VALIDATE_UTF8`              | Replace illegal sequences with the replacement character `U+FFFD`.
 | `:SMART`                      | Use smart punctuation (curly quotes, etc.).
+| `:LIBERAL_HTML_TAG`           | Support liberal parsing of inline HTML tags.
+| `:FOOTNOTES`                  | Parse footnotes.
 | `:STRIKETHROUGH_DOUBLE_TILDE` | Parse strikethroughs by double tildes (compatibility with [redcarpet](https://github.com/vmg/redcarpet))
-| `:VALIDATE_UTF8`              | Replace illegal sequences with the replacement character `U+FFFD`.
 
 ### Render options
 
 | Name                             | Description                                                     |
 | ------------------               | -----------                                                     |
 | `:DEFAULT`                       | The default rendering system.                                   |
-| `:UNSAFE`                        | Allow raw/custom HTML and unsafe links.                         |
-| `:GITHUB_PRE_LANG`               | Use GitHub-style `<pre lang>` for fenced code blocks.           |
+| `:SOURCEPOS`                     | Include source position in rendered HTML.                       |
 | `:HARDBREAKS`                    | Treat `\n` as hardbreaks (by adding `<br/>`).                   |
+| `:UNSAFE`                        | Allow raw/custom HTML and unsafe links.                         |
 | `:NOBREAKS`                      | Translate `\n` in the source to a single whitespace.            |
-| `:SOURCEPOS`                     | Include source position in rendered HTML.                       |
+| `:VALIDATE_UTF8`                 | Replace illegal sequences with the replacement character `U+FFFD`. |
+| `:SMART`                         | Use smart punctuation (curly quotes, etc.).                     |
+| `:GITHUB_PRE_LANG`               | Use GitHub-style `<pre lang>` for fenced code blocks.           |
+| `:LIBERAL_HTML_TAG`              | Support liberal parsing of inline HTML tags.                    |
+| `:FOOTNOTES`                     | Render footnotes.                                               |
+| `:STRIKETHROUGH_DOUBLE_TILDE`    | Parse strikethroughs by double tildes (compatibility with [redcarpet](https://github.com/vmg/redcarpet)) |
 | `:TABLE_PREFER_STYLE_ATTRIBUTES` | Use `style` insted of `align` for table cells.                  |
 | `:FULL_INFO_STRING`              | Include full info strings of code blocks in separate attribute. |
-| `:FOOTNOTES`                     | Render footnotes.                                               |
 
 ### Passing options
 
@@ -180,6 +185,76 @@ The available extensions are:
 * `:autolink` - This provides support for automatically converting URLs to anchor tags.
 * `:tagfilter` - This escapes [several "unsafe" HTML tags](https://github.github.com/gfm/#disallowed-raw-html-extension-), causing them to not have any effect.
 
+## Output formats
+
+Like CMark, CommonMarker can generate output in several formats: HTML, XML, plaintext, and commonmark are currently supported.
+
+### HTML
+
+The default output format, HTML, will be generated when calling `to_html` or using `--to=html` on the command line.
+
+```ruby
+doc = CommonMarker.render_doc('*Hello* world!', :DEFAULT)
+puts(doc.to_html)
+
+<p><em>Hello</em> world!</p>
+```
+
+### XML
+
+XML will be generated when calling `to_xml` or using `--to=xml` on the command line.
+
+```ruby
+doc = CommonMarker.render_doc('*Hello* world!', :DEFAULT)
+puts(doc.to_xml)
+
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE document SYSTEM "CommonMark.dtd">
+<document xmlns="http://commonmark.org/xml/1.0">
+  <paragraph>
+    <emph>
+      <text xml:space="preserve">Hello</text>
+    </emph>
+    <text xml:space="preserve"> world!</text>
+  </paragraph>
+</document>
+```
+
+### Plaintext
+
+Plaintext will be generated when calling `to_plaintext` or using `--to=plaintext` on the command line.
+
+```ruby
+doc = CommonMarker.render_doc('*Hello* world!', :DEFAULT)
+puts(doc.to_plaintext)
+
+Hello world!
+```
+
+### Commonmark
+
+Commonmark will be generated when calling `to_commonmark` or using `--to=commonmark` on the command line.
+
+``` ruby
+text = <<-TEXT
+1. I am a numeric list.
+2. I continue the list.
+* Suddenly, an unordered list!
+* What fun!
+TEXT
+
+doc = CommonMarker.render_doc(text, :DEFAULT)
+puts(doc.to_commonmark)
+
+1.  I am a numeric list.
+2.  I continue the list.
+
+<!-- end list -->
+
+  - Suddenly, an unordered list\!
+  - What fun\!
+```
+
 ## Developing locally
 
 After cloning the repo:

data/bin/commonmarker

@@ -13,15 +13,18 @@ $LOAD_PATH.unshift File.expand_path('lib', root)
 def parse_options
   options = OpenStruct.new
   extensions = CommonMarker.extensions
-  parse_options = CommonMarker::Config::Parse
-  render_options = CommonMarker::Config::Render
+  parse_options = CommonMarker::Config::OPTS.fetch(:parse)
+  render_options = CommonMarker::Config::OPTS.fetch(:render)
+  format_options = CommonMarker::Config::OPTS.fetch(:format)
 
   options.active_extensions = []
   options.active_parse_options = [:DEFAULT]
   options.active_render_options = [:DEFAULT]
+  options.output_format = :html
 
   option_parser = OptionParser.new do |opts|
     opts.banner = 'Usage: commonmarker [--html-renderer] [--extension=EXTENSION]'
+    opts.separator '                    [--to=FORMAT]'
     opts.separator '                    [--parse-option=OPTION]'
     opts.separator '                    [--render-option=OPTION]'
     opts.separator '                    [FILE..]'
@@ -43,6 +46,7 @@ def parse_options
     opts.on('-h', '--help', 'Prints this help') do
       puts opts
       puts
+      puts "Available formats: #{format_options.join(', ')}"
       puts "Available extentions: #{extensions.join(', ')}"
       puts "Available parse options: #{parse_options.keys.join(', ')}"
       puts "Available render options: #{render_options.keys.join(', ')}"
@@ -51,7 +55,16 @@ def parse_options
       exit
     end
 
-    opts.on('--html-renderer', 'Use the HtmlRenderer renderer rather than the native C renderer') do
+    opts.on('-tFORMAT', '--to=FORMAT', String, 'Specify output FORMAT') do |value|
+      value = value.to_sym
+      if format_options.include?(value)
+        options.output_format = value
+      else
+        abort("format '#{value}' not found")
+      end
+    end
+
+    opts.on('--html-renderer', 'Use the HtmlRenderer renderer rather than the native C renderer (only valid when format is html)') do
       options.renderer = true
     end
 
@@ -88,11 +101,23 @@ end
 
 options = parse_options
 
+abort("format '#{options.output_format}' does not support using the HtmlRenderer renderer") if
+  options.renderer && options.output_format != :html
+
 doc = CommonMarker.render_doc(ARGF.read, options.active_parse_options, options.active_extensions)
 
-if options.renderer
-  renderer = CommonMarker::HtmlRenderer.new(extensions: options.active_extensions)
-  $stdout.write(renderer.render(doc))
-else
-  $stdout.write(doc.to_html(options.active_render_options, options.active_extensions))
+case options.output_format
+when :html
+  if options.renderer
+    renderer = CommonMarker::HtmlRenderer.new(options: options.active_render_options, extensions: options.active_extensions)
+    $stdout.write(renderer.render(doc))
+  else
+    $stdout.write(doc.to_html(options.active_render_options, options.active_extensions))
+  end
+when :xml
+  $stdout.write(doc.to_xml(options.active_render_options))
+when :commonmark
+  $stdout.write(doc.to_commonmark(options.active_render_options))
+when :plaintext
+  $stdout.write(doc.to_plaintext(options.active_render_options))
 end

data/commonmarker.gemspec

@@ -21,12 +21,10 @@ Gem::Specification.new do |s|
 
   s.executables = ['commonmarker']
   s.require_paths = %w[lib ext]
-  s.required_ruby_version = ['>= 2.4.10', '< 4.0']
+  s.required_ruby_version = ['>= 2.6', '< 4.0']
 
   s.rdoc_options += ['-x', 'ext/commonmarker/cmark/.*']
 
-  s.add_dependency 'ruby-enum', '~> 0.5'
-
   s.add_development_dependency 'awesome_print'
   s.add_development_dependency 'json', '~> 2.3'
   s.add_development_dependency 'minitest', '~> 5.6'

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/commonmarker.c

@@ -45,6 +45,13 @@ static VALUE encode_utf8_string(const char *c_string) {
   return string;
 }
 
+/* Encode a C string using the encoding from Ruby string +source+. */
+static VALUE encode_source_string(const char *c_string, VALUE source) {
+  VALUE string = rb_str_new2(c_string);
+  rb_enc_copy(string, source);
+  return string;
+}
+
 static void rb_mark_c_struct(void *data) {
   cmark_node *node = data;
   cmark_node *child;
@@ -179,6 +186,40 @@ static VALUE rb_markdown_to_html(VALUE self, VALUE rb_text, VALUE rb_options, VA
   return ruby_html;
 }
 
+/*
+ * Internal: Parses a Markdown string into an HTML string.
+ *
+ */
+static VALUE rb_markdown_to_xml(VALUE self, VALUE rb_text, VALUE rb_options, VALUE rb_extensions) {
+  char *str, *xml;
+  int len;
+  cmark_parser *parser;
+  cmark_node *doc;
+  Check_Type(rb_text, T_STRING);
+  Check_Type(rb_options, T_FIXNUM);
+
+  parser = prepare_parser(rb_options, rb_extensions, cmark_get_arena_mem_allocator());
+
+  str = (char *)RSTRING_PTR(rb_text);
+  len = RSTRING_LEN(rb_text);
+
+  cmark_parser_feed(parser, str, len);
+  doc = cmark_parser_finish(parser);
+  if (doc == NULL) {
+    cmark_arena_reset();
+    rb_raise(rb_eNodeError, "error parsing document");
+  }
+
+  cmark_mem *default_mem = cmark_get_default_mem_allocator();
+  xml = cmark_render_xml_with_mem(doc, FIX2INT(rb_options), default_mem);
+  cmark_arena_reset();
+
+  VALUE ruby_xml = rb_str_new2(xml);
+  default_mem->free(xml);
+
+  return ruby_xml;
+}
+
 /*
  * Internal: Creates a node based on a node type.
  *
@@ -567,6 +608,28 @@ static VALUE rb_render_html(VALUE self, VALUE rb_options, VALUE rb_extensions) {
   return ruby_html;
 }
 
+/* Internal: Convert the node to an XML string.
+ *
+ * Returns a {String}.
+ */
+static VALUE rb_render_xml(VALUE self, VALUE rb_options) {
+  int options;
+  int i;
+  cmark_node *node;
+  Check_Type(rb_options, T_FIXNUM);
+
+  options = FIX2INT(rb_options);
+
+  Data_Get_Struct(self, cmark_node, node);
+
+  char *xml = cmark_render_xml(node, options);
+  VALUE ruby_xml = rb_str_new2(xml);
+
+  free(xml);
+
+  return ruby_xml;
+}
+
 /* Internal: Convert the node to a CommonMark string.
  *
  * Returns a {String}.
@@ -1130,7 +1193,8 @@ static VALUE rb_html_escape_href(VALUE self, VALUE rb_text) {
   if (houdini_escape_href(&buf, (const uint8_t *)RSTRING_PTR(rb_text),
                           RSTRING_LEN(rb_text))) {
     result = (char *)cmark_strbuf_detach(&buf);
-    return rb_str_new2(result);
+    return encode_source_string(result, rb_text);
+
   }
 
   return rb_text;
@@ -1150,7 +1214,7 @@ static VALUE rb_html_escape_html(VALUE self, VALUE rb_text) {
   if (houdini_escape_html0(&buf, (const uint8_t *)RSTRING_PTR(rb_text),
                            RSTRING_LEN(rb_text), 0)) {
     result = (char *)cmark_strbuf_detach(&buf);
-    return rb_str_new2(result);
+    return encode_source_string(result, rb_text);
   }
 
   return rb_text;
@@ -1208,6 +1272,8 @@ __attribute__((visibility("default"))) void Init_commonmarker() {
   rb_cNode = rb_define_class_under(module, "Node", rb_cObject);
   rb_define_singleton_method(rb_cNode, "markdown_to_html", rb_markdown_to_html,
                              3);
+  rb_define_singleton_method(rb_cNode, "markdown_to_xml", rb_markdown_to_xml,
+                             3);
   rb_define_singleton_method(rb_cNode, "new", rb_node_new, 1);
   rb_define_singleton_method(rb_cNode, "parse_document", rb_parse_document, 4);
   rb_define_method(rb_cNode, "string_content", rb_node_get_string_content, 0);
@@ -1220,6 +1286,7 @@ __attribute__((visibility("default"))) void Init_commonmarker() {
   rb_define_method(rb_cNode, "next", rb_node_next, 0);
   rb_define_method(rb_cNode, "insert_before", rb_node_insert_before, 1);
   rb_define_method(rb_cNode, "_render_html", rb_render_html, 2);
+  rb_define_method(rb_cNode, "_render_xml", rb_render_xml, 1);
   rb_define_method(rb_cNode, "_render_commonmark", rb_render_commonmark, -1);
   rb_define_method(rb_cNode, "_render_plaintext", rb_render_plaintext, -1);
   rb_define_method(rb_cNode, "insert_after", rb_node_insert_after, 1);

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); }
   }