nokogiri 1.13.6 → 1.14.2

data/ext/nokogiri/xml_xpath_context.c

@@ -6,15 +6,15 @@ VALUE cNokogiriXmlXpathContext;
  * these constants have matching declarations in
  * ext/java/nokogiri/internals/NokogiriNamespaceContext.java
  */
+static const xmlChar *NOKOGIRI_PREFIX = (const xmlChar *)"nokogiri";
+static const xmlChar *NOKOGIRI_URI = (const xmlChar *)"http://www.nokogiri.org/default_ns/ruby/extensions_functions";
 static const xmlChar *NOKOGIRI_BUILTIN_PREFIX = (const xmlChar *)"nokogiri-builtin";
 static const xmlChar *NOKOGIRI_BUILTIN_URI = (const xmlChar *)"https://www.nokogiri.org/default_ns/ruby/builtins";
 
 static void
-deallocate(xmlXPathContextPtr ctx)
+xml_xpath_context_deallocate(xmlXPathContextPtr ctx)
 {
-  NOKOGIRI_DEBUG_START(ctx);
   xmlXPathFreeContext(ctx);
-  NOKOGIRI_DEBUG_END(ctx);
 }
 
 /* find a CSS class in an HTML element's `class` attribute */
@@ -113,7 +113,7 @@ xpath_builtin_local_name_is(xmlXPathParserContextPtr ctxt, int nargs)
  * Register the namespace with +prefix+ and +uri+.
  */
 static VALUE
-register_ns(VALUE self, VALUE prefix, VALUE uri)
+rb_xml_xpath_context_register_ns(VALUE self, VALUE prefix, VALUE uri)
 {
   xmlXPathContextPtr ctx;
   Data_Get_Struct(self, xmlXPathContext, ctx);
@@ -132,7 +132,7 @@ register_ns(VALUE self, VALUE prefix, VALUE uri)
  * Register the variable +name+ with +value+.
  */
 static VALUE
-register_variable(VALUE self, VALUE name, VALUE value)
+rb_xml_xpath_context_register_variable(VALUE self, VALUE name, VALUE value)
 {
   xmlXPathContextPtr ctx;
   xmlXPathObjectPtr xmlValue;
@@ -154,28 +154,28 @@ register_variable(VALUE self, VALUE name, VALUE value)
  *  returns Qundef if no conversion was possible.
  */
 static VALUE
-xpath2ruby(xmlXPathObjectPtr xobj, xmlXPathContextPtr xctx)
+xpath2ruby(xmlXPathObjectPtr c_xpath_object, xmlXPathContextPtr ctx)
 {
-  VALUE retval;
+  VALUE rb_retval;
 
-  assert(xctx->doc);
-  assert(DOC_RUBY_OBJECT_TEST(xctx->doc));
+  assert(ctx->doc);
+  assert(DOC_RUBY_OBJECT_TEST(ctx->doc));
 
-  switch (xobj->type) {
+  switch (c_xpath_object->type) {
     case XPATH_STRING:
-      retval = NOKOGIRI_STR_NEW2(xobj->stringval);
-      xmlFree(xobj->stringval);
-      return retval;
+      rb_retval = NOKOGIRI_STR_NEW2(c_xpath_object->stringval);
+      xmlFree(c_xpath_object->stringval);
+      return rb_retval;
 
     case XPATH_NODESET:
-      return noko_xml_node_set_wrap(xobj->nodesetval,
-                                    DOC_RUBY_OBJECT(xctx->doc));
+      return noko_xml_node_set_wrap(c_xpath_object->nodesetval,
+                                    DOC_RUBY_OBJECT(ctx->doc));
 
     case XPATH_NUMBER:
-      return rb_float_new(xobj->floatval);
+      return rb_float_new(c_xpath_object->floatval);
 
     case XPATH_BOOLEAN:
-      return (xobj->boolval == 1) ? Qtrue : Qfalse;
+      return (c_xpath_object->boolval == 1) ? Qtrue : Qfalse;
 
     default:
       return Qundef;
@@ -183,52 +183,51 @@ xpath2ruby(xmlXPathObjectPtr xobj, xmlXPathContextPtr xctx)
 }
 
 void
-Nokogiri_marshal_xpath_funcall_and_return_values(xmlXPathParserContextPtr ctx, int nargs, VALUE handler,
-    const char *function_name)
+Nokogiri_marshal_xpath_funcall_and_return_values(
+  xmlXPathParserContextPtr ctx,
+  int argc,
+  VALUE rb_xpath_handler,
+  const char *method_name
+)
 {
-  VALUE result, doc;
+  VALUE rb_retval;
   VALUE *argv;
-  VALUE node_set = Qnil;
-  xmlNodeSetPtr xml_node_set = NULL;
-  xmlXPathObjectPtr obj;
+  VALUE rb_node_set = Qnil;
+  xmlNodeSetPtr c_node_set = NULL;
+  xmlXPathObjectPtr c_xpath_object;
 
   assert(ctx->context->doc);
   assert(DOC_RUBY_OBJECT_TEST(ctx->context->doc));
 
-  argv = (VALUE *)calloc((size_t)nargs, sizeof(VALUE));
-  for (int j = 0 ; j < nargs ; ++j) {
+  argv = (VALUE *)ruby_xcalloc((size_t)argc, sizeof(VALUE));
+  for (int j = 0 ; j < argc ; ++j) {
     rb_gc_register_address(&argv[j]);
   }
 
-  doc = DOC_RUBY_OBJECT(ctx->context->doc);
-
-  for (int j = nargs - 1 ; j >= 0 ; --j) {
-    obj = valuePop(ctx);
-    argv[j] = xpath2ruby(obj, ctx->context);
+  for (int j = argc - 1 ; j >= 0 ; --j) {
+    c_xpath_object = valuePop(ctx);
+    argv[j] = xpath2ruby(c_xpath_object, ctx->context);
     if (argv[j] == Qundef) {
-      argv[j] = NOKOGIRI_STR_NEW2(xmlXPathCastToString(obj));
+      argv[j] = NOKOGIRI_STR_NEW2(xmlXPathCastToString(c_xpath_object));
     }
-    xmlXPathFreeNodeSetList(obj);
+    xmlXPathFreeNodeSetList(c_xpath_object);
   }
 
-  result = rb_funcall2(handler, rb_intern((const char *)function_name), nargs, argv);
+  rb_retval = rb_funcall2(rb_xpath_handler, rb_intern((const char *)method_name), argc, argv);
 
-  for (int j = 0 ; j < nargs ; ++j) {
+  for (int j = 0 ; j < argc ; ++j) {
     rb_gc_unregister_address(&argv[j]);
   }
-  free(argv);
+  ruby_xfree(argv);
 
-  switch (TYPE(result)) {
+  switch (TYPE(rb_retval)) {
     case T_FLOAT:
     case T_BIGNUM:
     case T_FIXNUM:
-      xmlXPathReturnNumber(ctx, NUM2DBL(result));
+      xmlXPathReturnNumber(ctx, NUM2DBL(rb_retval));
       break;
     case T_STRING:
-      xmlXPathReturnString(
-        ctx,
-        xmlCharStrdup(StringValueCStr(result))
-      );
+      xmlXPathReturnString(ctx, xmlCharStrdup(StringValueCStr(rb_retval)));
       break;
     case T_TRUE:
       xmlXPathReturnTrue(ctx);
@@ -239,19 +238,17 @@ Nokogiri_marshal_xpath_funcall_and_return_values(xmlXPathParserContextPtr ctx, i
     case T_NIL:
       break;
     case T_ARRAY: {
-      VALUE args[2];
-      args[0] = doc;
-      args[1] = result;
-      node_set = rb_class_new_instance(2, args, cNokogiriXmlNodeSet);
-      Data_Get_Struct(node_set, xmlNodeSet, xml_node_set);
-      xmlXPathReturnNodeSet(ctx, xmlXPathNodeSetMerge(NULL, xml_node_set));
+      VALUE construct_args[2] = { DOC_RUBY_OBJECT(ctx->context->doc), rb_retval };
+      rb_node_set = rb_class_new_instance(2, construct_args, cNokogiriXmlNodeSet);
+      Data_Get_Struct(rb_node_set, xmlNodeSet, c_node_set);
+      xmlXPathReturnNodeSet(ctx, xmlXPathNodeSetMerge(NULL, c_node_set));
     }
     break;
     case T_DATA:
-      if (rb_obj_is_kind_of(result, cNokogiriXmlNodeSet)) {
-        Data_Get_Struct(result, xmlNodeSet, xml_node_set);
+      if (rb_obj_is_kind_of(rb_retval, cNokogiriXmlNodeSet)) {
+        Data_Get_Struct(rb_retval, xmlNodeSet, c_node_set);
         /* Copy the node set, otherwise it will get GC'd. */
-        xmlXPathReturnNodeSet(ctx, xmlXPathNodeSetMerge(NULL, xml_node_set));
+        xmlXPathReturnNodeSet(ctx, xmlXPathNodeSetMerge(NULL, c_node_set));
         break;
       }
     default:
@@ -260,47 +257,56 @@ Nokogiri_marshal_xpath_funcall_and_return_values(xmlXPathParserContextPtr ctx, i
 }
 
 static void
-ruby_funcall(xmlXPathParserContextPtr ctx, int nargs)
+method_caller(xmlXPathParserContextPtr ctx, int argc)
 {
-  VALUE handler = Qnil;
-  const char *function = NULL ;
+  VALUE rb_xpath_handler = Qnil;
+  const char *method_name = NULL ;
 
   assert(ctx);
   assert(ctx->context);
   assert(ctx->context->userData);
   assert(ctx->context->function);
 
-  handler = (VALUE)(ctx->context->userData);
-  function = (const char *)(ctx->context->function);
+  rb_xpath_handler = (VALUE)(ctx->context->userData);
+  method_name = (const char *)(ctx->context->function);
 
-  Nokogiri_marshal_xpath_funcall_and_return_values(ctx, nargs, handler, function);
+  Nokogiri_marshal_xpath_funcall_and_return_values(ctx, argc, rb_xpath_handler, method_name);
 }
 
 static xmlXPathFunction
-lookup(void *ctx,
-       const xmlChar *name,
-       const xmlChar *ns_uri)
+handler_lookup(void *ctx, const xmlChar *c_name, const xmlChar *c_ns_uri)
 {
-  VALUE xpath_handler = (VALUE)ctx;
-  if (rb_respond_to(xpath_handler, rb_intern((const char *)name))) {
-    return ruby_funcall;
+  VALUE rb_xpath_handler = (VALUE)ctx;
+  if (rb_respond_to(rb_xpath_handler, rb_intern((const char *)c_name))) {
+    return method_caller;
   }
 
   return NULL;
 }
 
-NORETURN(static void xpath_generic_exception_handler(void *ctx, const char *msg, ...));
+PRINTFLIKE_DECL(2, 3)
 static void
-xpath_generic_exception_handler(void *ctx, const char *msg, ...)
+generic_exception_pusher(void *ctx, const char *msg, ...)
 {
-  char *message;
+  VALUE rb_errors = (VALUE)ctx;
+  VALUE rb_message;
+  VALUE rb_exception;
+
+  Check_Type(rb_errors, T_ARRAY);
 
+#ifdef TRUFFLERUBY_NOKOGIRI_SYSTEM_LIBRARIES
+  /* It is not currently possible to pass var args from native
+     functions to sulong, so we work around the issue here. */
+  rb_message = rb_sprintf("generic_exception_pusher: %s", msg);
+#else
   va_list args;
   va_start(args, msg);
-  vasprintf(&message, msg, args);
+  rb_message = rb_vsprintf(msg, args);
   va_end(args);
+#endif
 
-  rb_raise(rb_eRuntimeError, "%s", message);
+  rb_exception = rb_exc_new_str(cNokogiriXmlXpathSyntaxError, rb_message);
+  rb_ary_push(rb_errors, rb_exception);
 }
 
 /*
@@ -310,13 +316,14 @@ xpath_generic_exception_handler(void *ctx, const char *msg, ...)
  * Evaluate the +search_path+ returning an XML::XPath object.
  */
 static VALUE
-evaluate(int argc, VALUE *argv, VALUE self)
+rb_xml_xpath_context_evaluate(int argc, VALUE *argv, VALUE self)
 {
   VALUE search_path, xpath_handler;
   VALUE retval = Qnil;
   xmlXPathContextPtr ctx;
   xmlXPathObjectPtr xpath;
   xmlChar *query;
+  VALUE errors = rb_ary_new();
 
   Data_Get_Struct(self, xmlXPathContext, ctx);
 
@@ -329,23 +336,19 @@ evaluate(int argc, VALUE *argv, VALUE self)
   if (Qnil != xpath_handler) {
     /* FIXME: not sure if this is the correct place to shove private data. */
     ctx->userData = (void *)xpath_handler;
-    xmlXPathRegisterFuncLookup(ctx, lookup, (void *)xpath_handler);
+    xmlXPathRegisterFuncLookup(ctx, handler_lookup, (void *)xpath_handler);
   }
 
-  xmlResetLastError();
-  xmlSetStructuredErrorFunc(NULL, Nokogiri_error_raise);
-
-  /* For some reason, xmlXPathEvalExpression will blow up with a generic error */
-  /* when there is a non existent function. */
-  xmlSetGenericErrorFunc(NULL, xpath_generic_exception_handler);
+  xmlSetStructuredErrorFunc((void *)errors, Nokogiri_error_array_pusher);
+  xmlSetGenericErrorFunc((void *)errors, generic_exception_pusher);
 
   xpath = xmlXPathEvalExpression(query, ctx);
+
   xmlSetStructuredErrorFunc(NULL, NULL);
   xmlSetGenericErrorFunc(NULL, NULL);
 
   if (xpath == NULL) {
-    xmlErrorPtr error = xmlGetLastError();
-    rb_exc_raise(Nokogiri_wrap_xml_syntax_error(error));
+    rb_exc_raise(rb_ary_entry(errors, 0));
   }
 
   retval = xpath2ruby(xpath, ctx);
@@ -365,26 +368,30 @@ evaluate(int argc, VALUE *argv, VALUE self)
  * Create a new XPathContext with +node+ as the reference point.
  */
 static VALUE
-new (VALUE klass, VALUE nodeobj)
+rb_xml_xpath_context_new(VALUE klass, VALUE nodeobj)
 {
   xmlNodePtr node;
   xmlXPathContextPtr ctx;
   VALUE self;
 
-  Data_Get_Struct(nodeobj, xmlNode, node);
+  Noko_Node_Get_Struct(nodeobj, xmlNode, node);
 
+#if LIBXML_VERSION < 21000
+  /* deprecated in 40483d0 */
   xmlXPathInit();
+#endif
 
   ctx = xmlXPathNewContext(node->doc);
   ctx->node = node;
 
+  xmlXPathRegisterNs(ctx, NOKOGIRI_PREFIX, NOKOGIRI_URI);
   xmlXPathRegisterNs(ctx, NOKOGIRI_BUILTIN_PREFIX, NOKOGIRI_BUILTIN_URI);
   xmlXPathRegisterFuncNS(ctx, (const xmlChar *)"css-class", NOKOGIRI_BUILTIN_URI,
                          xpath_builtin_css_class);
   xmlXPathRegisterFuncNS(ctx, (const xmlChar *)"local-name-is", NOKOGIRI_BUILTIN_URI,
                          xpath_builtin_local_name_is);
 
-  self = Data_Wrap_Struct(klass, 0, deallocate, ctx);
+  self = Data_Wrap_Struct(klass, 0, xml_xpath_context_deallocate, ctx);
   return self;
 }
 
@@ -398,9 +405,9 @@ noko_init_xml_xpath_context(void)
 
   rb_undef_alloc_func(cNokogiriXmlXpathContext);
 
-  rb_define_singleton_method(cNokogiriXmlXpathContext, "new", new, 1);
+  rb_define_singleton_method(cNokogiriXmlXpathContext, "new", rb_xml_xpath_context_new, 1);
 
-  rb_define_method(cNokogiriXmlXpathContext, "evaluate", evaluate, -1);
-  rb_define_method(cNokogiriXmlXpathContext, "register_variable", register_variable, 2);
-  rb_define_method(cNokogiriXmlXpathContext, "register_ns", register_ns, 2);
+  rb_define_method(cNokogiriXmlXpathContext, "evaluate", rb_xml_xpath_context_evaluate, -1);
+  rb_define_method(cNokogiriXmlXpathContext, "register_variable", rb_xml_xpath_context_register_variable, 2);
+  rb_define_method(cNokogiriXmlXpathContext, "register_ns", rb_xml_xpath_context_register_ns, 2);
 }

data/ext/nokogiri/xslt_stylesheet.c

@@ -12,27 +12,28 @@ static void
 dealloc(nokogiriXsltStylesheetTuple *wrapper)
 {
   xsltStylesheetPtr doc = wrapper->ss;
-
-  NOKOGIRI_DEBUG_START(doc);
-  xsltFreeStylesheet(doc); /* commented out for now. */
-  NOKOGIRI_DEBUG_END(doc);
-
-  free(wrapper);
+  xsltFreeStylesheet(doc);
+  ruby_xfree(wrapper);
 }
 
+PRINTFLIKE_DECL(2, 3)
 static void
 xslt_generic_error_handler(void *ctx, const char *msg, ...)
 {
-  char *message;
+  VALUE message;
 
+#ifdef TRUFFLERUBY_NOKOGIRI_SYSTEM_LIBRARIES
+  /* It is not currently possible to pass var args from native
+     functions to sulong, so we work around the issue here. */
+  message = rb_sprintf("xslt_generic_error_handler: %s", msg);
+#else
   va_list args;
   va_start(args, msg);
-  vasprintf(&message, msg, args);
+  message = rb_vsprintf(msg, args);
   va_end(args);
+#endif
 
-  rb_str_cat2((VALUE)ctx, message);
-
-  free(message);
+  rb_str_concat((VALUE)ctx, message);
 }
 
 VALUE
@@ -248,7 +249,7 @@ transform(int argc, VALUE *argv, VALUE self)
   Data_Get_Struct(self, nokogiriXsltStylesheetTuple, wrapper);
 
   param_len = RARRAY_LEN(paramobj);
-  params = calloc((size_t)param_len + 1, sizeof(char *));
+  params = ruby_xcalloc((size_t)param_len + 1, sizeof(char *));
   for (j = 0 ; j < param_len ; j++) {
     VALUE entry = rb_ary_entry(paramobj, j);
     const char *ptr = StringValueCStr(entry);
@@ -261,7 +262,7 @@ transform(int argc, VALUE *argv, VALUE self)
   xmlSetGenericErrorFunc((void *)errstr, xslt_generic_error_handler);
 
   result = xsltApplyStylesheet(wrapper->ss, xml, params);
-  free(params);
+  ruby_xfree(params);
 
   xsltSetGenericErrorFunc(NULL, NULL);
   xmlSetGenericErrorFunc(NULL, NULL);
@@ -347,7 +348,7 @@ registr(VALUE self, VALUE uri, VALUE obj)
 }
 
 void
-noko_init_xslt_stylesheet()
+noko_init_xslt_stylesheet(void)
 {
   rb_define_singleton_method(mNokogiriXslt, "register", registr, 2);
   rb_iv_set(mNokogiriXslt, "@modules", rb_hash_new());

data/gumbo-parser/Makefile

@@ -13,8 +13,18 @@ LDFLAGS := -pthread
 
 all: check
 
+# don't try to regenerate ragel or gperf files in CI, that should be a development-only action and
+# the generated files should be committed to SCM
+ifneq ($(CI),true)
+src/foreign_attrs.c: src/foreign_attrs.gperf
+	gperf -m100 -n $< | ./gperf-filter.sed > $@
+
+src/%.c: src/%.gperf
+	gperf -m100 $< | ./gperf-filter.sed > $@
+
 src/%.c: src/%.rl
 	ragel -F1 -o $@ $<
+endif
 
 build/src:
 	mkdir -p $@

data/gumbo-parser/src/attribute.h

@@ -1,7 +1,7 @@
 #ifndef GUMBO_ATTRIBUTE_H_
 #define GUMBO_ATTRIBUTE_H_
 
-#include "gumbo.h"
+#include "nokogiri_gumbo.h"
 
 #ifdef __cplusplus
 extern "C" {

data/gumbo-parser/src/error.c

@@ -21,7 +21,7 @@
 #include <string.h>
 #include "ascii.h"
 #include "error.h"
-#include "gumbo.h"
+#include "nokogiri_gumbo.h"
 #include "macros.h"
 #include "parser.h"
 #include "string_buffer.h"
@@ -96,7 +96,7 @@ static void print_tag_stack (
     if (i) {
       print_message(output, ", ");
     }
-    GumboTag tag = (GumboTag) error->tag_stack.data[i];
+    GumboTag tag = (GumboTag)(intptr_t) error->tag_stack.data[i];
     print_message(output, "%s", gumbo_normalized_tagname(tag));
   }
   gumbo_string_buffer_append_codepoint('.', output);

data/gumbo-parser/src/error.h

@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-#include "gumbo.h"
+#include "nokogiri_gumbo.h"
 #include "insertion_mode.h"
 #include "string_buffer.h"
 #include "token_type.h"

data/gumbo-parser/src/foreign_attrs.c

@@ -1,7 +1,7 @@
 /* ANSI-C code produced by gperf version 3.1 */
-/* Command-line: gperf -m100 -n lib/foreign_attrs.gperf  */
+/* Command-line: gperf -m100 -n src/foreign_attrs.gperf  */
 /* Computed positions: -k'2,8' */
-/* Filtered by: mk/gperf-filter.sed */
+/* Filtered by: gperf-filter.sed */
 
 #include "replacement.h"
 #include "macros.h"

data/gumbo-parser/src/{gumbo.h → nokogiri_gumbo.h}

@@ -292,6 +292,7 @@ typedef enum {
   GUMBO_TAG_TT,
   GUMBO_TAG_RTC,
   GUMBO_TAG_DIALOG,
+  GUMBO_TAG_SEARCH,
   // Used for all tags that don't have special handling in HTML.
   GUMBO_TAG_UNKNOWN,
   // A marker value to indicate the end of the enum, for iterating over it.

data/gumbo-parser/src/parser.c

@@ -24,7 +24,7 @@
 #include "ascii.h"
 #include "attribute.h"
 #include "error.h"
-#include "gumbo.h"
+#include "nokogiri_gumbo.h"
 #include "insertion_mode.h"
 #include "macros.h"
 #include "parser.h"
@@ -537,7 +537,7 @@ static GumboInsertionMode get_current_template_insertion_mode (
   if (modes->length == 0) {
     return GUMBO_INSERTION_MODE_INITIAL;
   }
-  return (GumboInsertionMode) modes->data[(modes->length - 1)];
+  return (GumboInsertionMode)(intptr_t) modes->data[(modes->length - 1)];
 }
 
 // Returns true if the specified token is either a start or end tag
@@ -2940,7 +2940,7 @@ static void handle_in_body(GumboParser* parser, GumboToken* token) {
       TAG(DETAILS), TAG(DIALOG), TAG(DIR), TAG(DIV), TAG(DL), TAG(FIELDSET),
       TAG(FIGCAPTION), TAG(FIGURE), TAG(FOOTER), TAG(HEADER), TAG(HGROUP),
       TAG(MAIN), TAG(MENU), TAG(NAV), TAG(OL), TAG(P), TAG(SECTION),
-      TAG(SUMMARY), TAG(UL)
+      TAG(SUMMARY), TAG(UL), TAG(SEARCH)
     })
   ) {
     maybe_implicitly_close_p_tag(parser, token);
@@ -3018,7 +3018,7 @@ static void handle_in_body(GumboParser* parser, GumboToken* token) {
       TAG(CENTER), TAG(DETAILS), TAG(DIALOG), TAG(DIR), TAG(DIV), TAG(DL),
       TAG(FIELDSET), TAG(FIGCAPTION), TAG(FIGURE), TAG(FOOTER), TAG(HEADER),
       TAG(HGROUP), TAG(LISTING), TAG(MAIN), TAG(MENU), TAG(NAV), TAG(OL),
-      TAG(PRE), TAG(SECTION), TAG(SUMMARY), TAG(UL)
+      TAG(PRE), TAG(SECTION), TAG(SUMMARY), TAG(UL), TAG(SEARCH)
     })
   ) {
     GumboTag tag = token->v.end_tag.tag;
@@ -3057,6 +3057,9 @@ static void handle_in_body(GumboParser* parser, GumboToken* token) {
         ignore_token(parser);
         return;
       }
+      // Since we remove the form node without popping, we need to make sure
+      // that we flush any text nodes at the end of the form.
+      maybe_flush_text_node_buffer(parser);
       // This differs from implicitly_close_tags because we remove *only* the
       // <form> element; other nodes are left in scope.
       generate_implied_end_tags(parser, GUMBO_TAG_LAST, NULL);
@@ -3434,7 +3437,7 @@ static void handle_in_table(GumboParser* parser, GumboToken* token) {
      || token->type == GUMBO_TOKEN_WHITESPACE
      || token->type == GUMBO_TOKEN_NULL)
     && node_tag_in_set(get_current_node(parser), &(const TagSet) {
-      TAG(TABLE), TAG(TBODY), TAG(TFOOT), TAG(THEAD), TAG(TR)
+      TAG(TABLE), TAG(TBODY), TAG(TEMPLATE), TAG(TFOOT), TAG(THEAD), TAG(TR)
     })
   ) {
     // The "pending table character tokens" list described in the spec is

data/gumbo-parser/src/replacement.h

@@ -2,7 +2,7 @@
 #define GUMBO_REPLACEMENT_H_
 
 #include <stddef.h>
-#include "gumbo.h"
+#include "nokogiri_gumbo.h"
 
 typedef struct {
   const char *const from;

data/gumbo-parser/src/string_buffer.h

@@ -4,7 +4,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-#include "gumbo.h"
+#include "nokogiri_gumbo.h"
 
 #ifdef __cplusplus
 extern "C" {

data/gumbo-parser/src/string_piece.c

@@ -17,7 +17,7 @@
 
 #include <stddef.h>
 #include <string.h>
-#include "gumbo.h"
+#include "nokogiri_gumbo.h"
 #include "ascii.h"
 
 bool gumbo_string_equals (

data/gumbo-parser/src/svg_attrs.c

@@ -1,7 +1,7 @@
 /* ANSI-C code produced by gperf version 3.1 */
-/* Command-line: gperf -m100 lib/svg_attrs.gperf  */
+/* Command-line: gperf -m100 src/svg_attrs.gperf  */
 /* Computed positions: -k'1,10,$' */
-/* Filtered by: mk/gperf-filter.sed */
+/* Filtered by: gperf-filter.sed */
 
 #include "replacement.h"
 #include "macros.h"

data/gumbo-parser/src/svg_tags.c

@@ -1,7 +1,7 @@
 /* ANSI-C code produced by gperf version 3.1 */
-/* Command-line: gperf -m100 lib/svg_tags.gperf  */
+/* Command-line: gperf -m100 src/svg_tags.gperf  */
 /* Computed positions: -k'3,7' */
-/* Filtered by: mk/gperf-filter.sed */
+/* Filtered by: gperf-filter.sed */
 
 #include "replacement.h"
 #include "macros.h"

data/gumbo-parser/src/tag.c

@@ -14,7 +14,7 @@
  limitations under the License.
 */
 
-#include "gumbo.h"
+#include "nokogiri_gumbo.h"
 #include "util.h"
 #include "tag_lookup.h"
 
@@ -172,6 +172,7 @@ static const char kGumboTagNames[GUMBO_TAG_LAST+1][15] = {
     [GUMBO_TAG_TT] = "tt",
     [GUMBO_TAG_RTC] = "rtc",
     [GUMBO_TAG_DIALOG] = "dialog",
+    [GUMBO_TAG_SEARCH] = "search",
 
     [GUMBO_TAG_UNKNOWN] = "",
     [GUMBO_TAG_LAST] = "",

data/gumbo-parser/src/tag_lookup.c

@@ -1,14 +1,14 @@
 /* ANSI-C code produced by gperf version 3.1 */
-/* Command-line: gperf -m100 lib/tag_lookup.gperf  */
+/* Command-line: gperf -m100 src/tag_lookup.gperf  */
 /* Computed positions: -k'1-2,$' */
-/* Filtered by: mk/gperf-filter.sed */
+/* Filtered by: gperf-filter.sed */
 
 #include "tag_lookup.h"
 #include "macros.h"
 #include "ascii.h"
 #include <string.h>
 
-#define TOTAL_KEYWORDS 150
+#define TOTAL_KEYWORDS 151
 #define MIN_WORD_LENGTH 1
 #define MAX_WORD_LENGTH 14
 #define MIN_HASH_VALUE 9
@@ -26,7 +26,7 @@ hash (register const char *str, register size_t len)
       272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
       272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
       272, 272, 272, 272, 272, 272, 272, 272, 272, 272,
-      272, 272, 272, 272, 272, 272, 272, 272, 272,   9,
+      272, 272, 272, 272, 272, 272, 272, 272, 272,  11,
         7,   6,   4,   4,   3,   4,   3,   3, 272, 272,
       272, 272, 272, 272, 272,  70,  83, 152,   7,  16,
        61,  98,   5,  76, 102, 126,  12,  19,  54,  54,
@@ -69,7 +69,7 @@ gumbo_tag_lookup (register const char *str, register size_t len)
   static const unsigned char lengthtable[] =
     {
        0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  2,
-       2,  2,  2,  6,  2,  6,  2,  4,  0,  7,  6,  3,  0,  3,
+       2,  2,  2,  6,  2,  6,  6,  4,  2,  7,  6,  3,  0,  3,
        0,  6,  6,  8,  5,  0,  0,  4,  5,  5,  8,  0,  2,  4,
        5,  2,  0,  5,  4,  2,  0,  7,  0,  8,  5,  0,  0,  0,
        0,  0,  0,  5,  3,  4,  5,  1,  4,  0,  4,  1,  2,  8,
@@ -111,9 +111,9 @@ gumbo_tag_lookup (register const char *str, register size_t len)
       {"spacer", GUMBO_TAG_SPACER},
       {"h2", GUMBO_TAG_H2},
       {"header", GUMBO_TAG_HEADER},
-      {"h1", GUMBO_TAG_H1},
+      {"search", GUMBO_TAG_SEARCH},
       {"head", GUMBO_TAG_HEAD},
-      {(char*)0,GUMBO_TAG_UNKNOWN},
+      {"h1", GUMBO_TAG_H1},
       {"details", GUMBO_TAG_DETAILS},
       {"select", GUMBO_TAG_SELECT},
       {"dir", GUMBO_TAG_DIR},

data/gumbo-parser/src/tag_lookup.gperf

@@ -167,3 +167,4 @@ spacer, GUMBO_TAG_SPACER
 tt, GUMBO_TAG_TT
 rtc, GUMBO_TAG_RTC
 dialog, GUMBO_TAG_DIALOG
+search, GUMBO_TAG_SEARCH