ox 2.4.0 → 2.4.1

data/ext/ox/sax.c

@@ -50,11 +50,11 @@ static char		read_element_start(SaxDrive dr);
 static char		read_element_end(SaxDrive dr);
 static char		read_text(SaxDrive dr);
 static char		read_jump(SaxDrive dr, const char *pat);
-static char		read_attrs(SaxDrive dr, char c, char termc, char term2, int is_xml, int eq_req);
+static char		read_attrs(SaxDrive dr, char c, char termc, char term2, int is_xml, int eq_req, Hint h);
 static char		read_name_token(SaxDrive dr);
 static char		read_quoted_value(SaxDrive dr);
 
-static void		end_element_cb(SaxDrive dr, VALUE name, int pos, int line, int col);
+static void		end_element_cb(SaxDrive dr, VALUE name, int pos, int line, int col, Hint h);
 
 static void		hint_clear_empty(SaxDrive dr);
 static Nv		hint_try_close(SaxDrive dr, const char *name);
@@ -181,8 +181,9 @@ sax_drive_init(SaxDrive dr, VALUE handler, VALUE io, SaxOptions options) {
 #endif
     rb_gc_register_address(&dr->value_obj);
     dr->options = *options;
-    dr->hints = 0;
     dr->err = 0;
+    dr->blocked = 0;
+    dr->abort = false;
     has_init(&dr->has, handler);
 #if HAS_ENCODING_SUPPORT
     if ('\0' == *ox_default_options.encoding) {
@@ -355,7 +356,7 @@ parse(SaxDrive dr) {
 		break;
 	    case '/': /* element end */
 		parent = stack_peek(&dr->stack);
-		if (0 != parent && 0 == parent->childCnt && dr->has.text) {
+		if (0 != parent && 0 == parent->childCnt && dr->has.text && !dr->blocked) {
 		    VALUE	args[1];
 		    int		pos = dr->buf.pos;
 		    int		line = dr->buf.line;
@@ -407,6 +408,9 @@ parse(SaxDrive dr) {
 	}
     }
  DONE:
+    if (dr->abort) {
+	return;
+    }
     if (dr->stack.head < dr->stack.tail) {
 	char	msg[256];
 	Nv	sp;
@@ -423,12 +427,15 @@ parse(SaxDrive dr) {
 	for (sp = dr->stack.tail - 1; dr->stack.head <= sp; sp--) {
 	    snprintf(msg, sizeof(msg) - 1, "%selement '%s' not closed", EL_MISMATCH, sp->name);
 	    ox_sax_drive_error_at(dr, msg, dr->buf.pos, dr->buf.line, dr->buf.col);
-	    if (dr->has.end_element) {
+	    if (dr->has.end_element && 0 >= dr->blocked && (NULL == sp->hint || ActiveOverlay == sp->hint->overlay)) {
 		VALUE       args[1];
 
 		args[0] = sp->val;
 		rb_funcall2(dr->handler, ox_end_element_id, 1, args);
 	    }
+	    if (dr->blocked && NULL != sp->hint && BlockOverlay == sp->hint->overlay) {
+		dr->blocked--;
+	    }
         }
     }
 }
@@ -504,7 +511,7 @@ read_instruction(SaxDrive dr) {
     cend = dr->buf.tail;
     buf_reset(&dr->buf);
     dr->err = 0;
-    c = read_attrs(dr, c, '?', '?', is_xml, 1);
+    c = read_attrs(dr, c, '?', '?', is_xml, 1, NULL);
     if (dr->has.attrs_done) {
 	rb_funcall(dr->handler, ox_attrs_done_id, 0);
     }
@@ -626,10 +633,10 @@ read_doctype(SaxDrive dr) {
     buf_backup(&dr->buf); /* back up to the start in case the doctype is empty */
     buf_protect(&dr->buf);
     read_delimited(dr, '>');
-    if (dr->options.smart && 0 == dr->hints) {
+    if (dr->options.smart && 0 == dr->options.hints) {
 	for (s = dr->buf.str; is_white(*s); s++) { }
 	if (0 == strncasecmp("HTML", s, 4)) {
-	    dr->hints = ox_hints_html();
+	    dr->options.hints = ox_hints_html();
 	}
     }
     *(dr->buf.tail - 1) = '\0';
@@ -669,6 +676,7 @@ read_cdata(SaxDrive dr) {
     struct _CheckPt	cp = CHECK_PT_INIT;
     Nv			parent = stack_peek(&dr->stack);
 
+    // TBD check parent overlay
     if (0 != parent) {
 	parent->childCnt++;
     }
@@ -716,29 +724,31 @@ read_cdata(SaxDrive dr) {
 	}
     }
  CB:
-    if (dr->has.cdata) {
-        VALUE       args[1];
+    if (!dr->blocked && (NULL == parent || NULL == parent->hint || OffOverlay != parent->hint->overlay)) {
+	if (dr->has.cdata) {
+	    VALUE       args[1];
 
-        args[0] = rb_str_new2(dr->buf.str);
+	    args[0] = rb_str_new2(dr->buf.str);
 #if HAS_ENCODING_SUPPORT
-        if (0 != dr->encoding) {
-            rb_enc_associate(args[0], dr->encoding);
-        }
+	    if (0 != dr->encoding) {
+		rb_enc_associate(args[0], dr->encoding);
+	    }
 #elif HAS_PRIVATE_ENCODING
-        if (Qnil != dr->encoding) {
-	    rb_funcall(args[0], ox_force_encoding_id, 1, dr->encoding);
-        }
+	    if (Qnil != dr->encoding) {
+		rb_funcall(args[0], ox_force_encoding_id, 1, dr->encoding);
+	    }
 #endif
-	if (dr->has.pos) {
-	    rb_ivar_set(dr->handler, ox_at_pos_id, LONG2NUM(pos));
-	}
-	if (dr->has.line) {
-	    rb_ivar_set(dr->handler, ox_at_line_id, LONG2NUM(line));
-	}
-	if (dr->has.column) {
-	    rb_ivar_set(dr->handler, ox_at_column_id, LONG2NUM(col));
+	    if (dr->has.pos) {
+		rb_ivar_set(dr->handler, ox_at_pos_id, LONG2NUM(pos));
+	    }
+	    if (dr->has.line) {
+		rb_ivar_set(dr->handler, ox_at_line_id, LONG2NUM(line));
+	    }
+	    if (dr->has.column) {
+		rb_ivar_set(dr->handler, ox_at_column_id, LONG2NUM(col));
+	    }
+	    rb_funcall2(dr->handler, ox_cdata_id, 1, args);
 	}
-        rb_funcall2(dr->handler, ox_cdata_id, 1, args);
     }
     if ('\0' != zero) {
 	*(dr->buf.tail - 1) = zero;
@@ -804,29 +814,33 @@ read_comment(SaxDrive dr) {
 	}
     }
  CB:
-    if (dr->has.comment) {
-        VALUE       args[1];
+    // TBD check parent overlay
+    if (dr->has.comment && !dr->blocked) {
+        VALUE	args[1];
+	Nv	parent = stack_peek(&dr->stack);
 
-        args[0] = rb_str_new2(dr->buf.str);
+	if (NULL == parent || NULL == parent->hint || OffOverlay != parent->hint->overlay) {
+	    args[0] = rb_str_new2(dr->buf.str);
 #if HAS_ENCODING_SUPPORT
-        if (0 != dr->encoding) {
-            rb_enc_associate(args[0], dr->encoding);
-        }
+	    if (0 != dr->encoding) {
+		rb_enc_associate(args[0], dr->encoding);
+	    }
 #elif HAS_PRIVATE_ENCODING
-        if (Qnil != dr->encoding) {
-	    rb_funcall(args[0], ox_force_encoding_id, 1, dr->encoding);
-        }
+	    if (Qnil != dr->encoding) {
+		rb_funcall(args[0], ox_force_encoding_id, 1, dr->encoding);
+	    }
 #endif
-	if (dr->has.pos) {
-	    rb_ivar_set(dr->handler, ox_at_pos_id, LONG2NUM(pos));
-	}
-	if (dr->has.line) {
-	    rb_ivar_set(dr->handler, ox_at_line_id, LONG2NUM(line));
-	}
-	if (dr->has.column) {
-	    rb_ivar_set(dr->handler, ox_at_column_id, LONG2NUM(col));
+	    if (dr->has.pos) {
+		rb_ivar_set(dr->handler, ox_at_pos_id, LONG2NUM(pos));
+	    }
+	    if (dr->has.line) {
+		rb_ivar_set(dr->handler, ox_at_line_id, LONG2NUM(line));
+	    }
+	    if (dr->has.column) {
+		rb_ivar_set(dr->handler, ox_at_column_id, LONG2NUM(col));
+	    }
+	    rb_funcall2(dr->handler, ox_comment_id, 1, args);
 	}
-        rb_funcall2(dr->handler, ox_comment_id, 1, args);
     }
     if ('\0' != zero) {
 	*(dr->buf.tail - 1) = zero;
@@ -848,7 +862,7 @@ read_element_start(SaxDrive dr) {
     int			pos = dr->buf.pos;
     int			line = dr->buf.line;
     int			col = dr->buf.col;
-    Hint		h = 0;
+    Hint		h = NULL;
     int			stackless = 0;
     Nv			parent = stack_peek(&dr->stack);
 
@@ -866,32 +880,45 @@ read_element_start(SaxDrive dr) {
     if (0 != parent) {
 	parent->childCnt++;
     }
-    if (dr->options.smart && 0 == dr->hints && stack_empty(&dr->stack) && 0 == strcasecmp("html", dr->buf.str)) {
-	dr->hints = ox_hints_html();
+    if (dr->options.smart && 0 == dr->options.hints && stack_empty(&dr->stack) && 0 == strcasecmp("html", dr->buf.str)) {
+	dr->options.hints = ox_hints_html();
     }
-    if (0 != dr->hints) {
+    if (NULL != dr->options.hints) {
 	hint_clear_empty(dr);
-	h = ox_hint_find(dr->hints, dr->buf.str);
-	if (0 == h) {
-	    char	msg[100];
+	h = ox_hint_find(dr->options.hints, dr->buf.str);
+	if (NULL == h) {
+	    char	msg[256];
 
-	    sprintf(msg, "%s%s is not a valid element type for a %s document type.", INV_ELEMENT, dr->buf.str, dr->hints->name);
+	    snprintf(msg, sizeof(msg), "%s%s is not a valid element type for a %s document type.", INV_ELEMENT, dr->buf.str, dr->options.hints->name);
 	    ox_sax_drive_error(dr, msg);
 	} else {
 	    Nv	top_nv = stack_peek(&dr->stack);
 
+	    if (AbortOverlay == h->overlay) {
+		if (rb_respond_to(dr->handler, ox_abort_id)) {
+		    VALUE	args[1];
+
+		    args[0] = str2sym(dr, dr->buf.str, NULL);
+		    rb_funcall2(dr->handler, ox_abort_id, 1, args);
+		}
+		dr->abort = true;
+		return '\0';
+	    }
+	    if (BlockOverlay == h->overlay) {
+		dr->blocked++;
+	    }
 	    if (h->empty) {
 		stackless = 1;
 	    }
 	    if (0 != top_nv) {
 		char	msg[256];
-
+	
 		if (!h->nest && 0 == strcasecmp(top_nv->name, h->name)) {
 		    snprintf(msg, sizeof(msg) - 1, "%s%s can not be nested in a %s document, closing previous.",
-			     INV_ELEMENT, dr->buf.str, dr->hints->name);
+			     INV_ELEMENT, dr->buf.str, dr->options.hints->name);
 		    ox_sax_drive_error(dr, msg);
 		    stack_pop(&dr->stack);
-		    end_element_cb(dr, top_nv->val, pos, line, col);
+		    end_element_cb(dr, top_nv->val, pos, line, col, top_nv->hint);
 		    top_nv = stack_peek(&dr->stack);
 		}
 		if (0 != h->parents) {
@@ -906,7 +933,7 @@ read_element_start(SaxDrive dr) {
 		    }
 		    if (!ok) {
 			snprintf(msg, sizeof(msg) - 1, "%s%s can not be a child of a %s in a %s document.",
-				 INV_ELEMENT, h->name, top_nv->name, dr->hints->name);
+				 INV_ELEMENT, h->name, top_nv->name, dr->options.hints->name);
 			ox_sax_drive_error(dr, msg);
 		    }
 		}
@@ -914,7 +941,7 @@ read_element_start(SaxDrive dr) {
 	}
     }
     name = str2sym(dr, dr->buf.str, &ename);
-    if (dr->has.start_element) {
+    if (dr->has.start_element && 0 >= dr->blocked && (NULL == h || ActiveOverlay == h->overlay)) {
         VALUE       args[1];
 
 	if (dr->has.pos) {
@@ -935,13 +962,13 @@ read_element_start(SaxDrive dr) {
         closed = 0;
     } else {
 	buf_protect(&dr->buf);
-        c = read_attrs(dr, c, '/', '>', 0, 0);
+        c = read_attrs(dr, c, '/', '>', 0, 0, h);
 	if (is_white(c)) {
 	    c = buf_next_non_white(&dr->buf);
 	}
 	closed = ('/' == c);
     }
-    if (dr->has.attrs_done) {
+    if (dr->has.attrs_done && 0 >= dr->blocked && (NULL == h || ActiveOverlay == h->overlay)) {
 	rb_funcall(dr->handler, ox_attrs_done_id, 0);
     }
     if (closed) {
@@ -949,9 +976,9 @@ read_element_start(SaxDrive dr) {
 	pos = dr->buf.pos;
 	line = dr->buf.line;
 	col = dr->buf.col;
-	end_element_cb(dr, name, pos, line, col);
+	end_element_cb(dr, name, pos, line, col, h);
     } else if (stackless) {
-	end_element_cb(dr, name, pos, line, col);
+	end_element_cb(dr, name, pos, line, col, h);
     } else if (0 != h && h->jump) {
 	stack_push(&dr->stack, ename, name, h);
 	if ('>' != c) {
@@ -992,7 +1019,8 @@ read_element_end(SaxDrive dr) {
     int		line = dr->buf.line;
     int		col = dr->buf.col - 1;
     Nv		nv;
-
+    Hint	h = NULL;
+    
     if ('\0' == (c = read_name_token(dr))) {
         return '\0';
     }
@@ -1004,6 +1032,7 @@ read_element_end(SaxDrive dr) {
     nv = stack_peek(&dr->stack);
     if (0 != nv && 0 == strcmp(dr->buf.str, nv->name)) {
 	name = nv->val;
+	h = nv->hint;
 	stack_pop(&dr->stack);
     } else {
 	// Mismatched start and end
@@ -1012,9 +1041,8 @@ read_element_end(SaxDrive dr) {
 
 	if (0 == match) {
 	    // Not found so open and close element.
-	    Hint	h = ox_hint_find(dr->hints, dr->buf.str);
-
-	    if (0 != h && h->empty) {
+	    h = ox_hint_find(dr->options.hints, dr->buf.str);
+	    if (NULL != h && h->empty) {
 		// Just close normally
 		name = str2sym(dr, dr->buf.str, 0);
 		snprintf(msg, sizeof(msg) - 1, "%selement '%s' should not have a separate close element", EL_MISMATCH, dr->buf.str);
@@ -1024,7 +1052,7 @@ read_element_end(SaxDrive dr) {
 		snprintf(msg, sizeof(msg) - 1, "%selement '%s' closed but not opened", EL_MISMATCH, dr->buf.str);
 		ox_sax_drive_error_at(dr, msg, pos, line, col);
 		name = str2sym(dr, dr->buf.str, 0);
-		if (dr->has.start_element) {
+		if (dr->has.start_element && 0 >= dr->blocked && (NULL == h || ActiveOverlay == h->overlay)) {
 		    VALUE       args[1];
 
 		    if (dr->has.pos) {
@@ -1039,6 +1067,9 @@ read_element_end(SaxDrive dr) {
 		    args[0] = name;
 		    rb_funcall2(dr->handler, ox_start_element_id, 1, args);
 		}
+		if (NULL != h && BlockOverlay == h->overlay && 0 < dr->blocked) {
+		    dr->blocked--;
+		}
 	    }
 	} else {
 	    // Found a match so close all up to the found element in stack.
@@ -1046,6 +1077,7 @@ read_element_end(SaxDrive dr) {
 
 	    if (0 != (n2 = hint_try_close(dr, dr->buf.str))) {
 		name = n2->val;
+		h = n2->hint;
 	    } else {
 		snprintf(msg, sizeof(msg) - 1, "%selement '%s' close does not match '%s' open", EL_MISMATCH, dr->buf.str, nv->name);
 		ox_sax_drive_error_at(dr, msg, pos, line, col);
@@ -1059,15 +1091,19 @@ read_element_end(SaxDrive dr) {
 		    rb_ivar_set(dr->handler, ox_at_column_id, LONG2NUM(col));
 		}
 		for (nv = stack_pop(&dr->stack); match < nv; nv = stack_pop(&dr->stack)) {
-		    if (dr->has.end_element) {
+		    if (dr->has.end_element && 0 >= dr->blocked && (NULL == nv->hint || ActiveOverlay == nv->hint->overlay)) {
 			rb_funcall(dr->handler, ox_end_element_id, 1, nv->val);
 		    }
+		    if (NULL != nv->hint && BlockOverlay == nv->hint->overlay && 0 < dr->blocked) {
+			dr->blocked--;
+		    }
 		}
 		name = nv->val;
+		h = nv->hint;
 	    }
 	}
     }
-    end_element_cb(dr, name, pos, line, col);
+    end_element_cb(dr, name, pos, line, col, h);
 
     return c;
 }
@@ -1119,52 +1155,54 @@ read_text(SaxDrive dr) {
     if (0 != parent) {
 	parent->childCnt++;
     }
-    if (dr->has.value) {
-	if (dr->has.pos) {
-	    rb_ivar_set(dr->handler, ox_at_pos_id, LONG2NUM(pos));
-	}
-	if (dr->has.line) {
-	    rb_ivar_set(dr->handler, ox_at_line_id, LONG2NUM(line));
-	}
-	if (dr->has.column) {
-	    rb_ivar_set(dr->handler, ox_at_column_id, LONG2NUM(col));
-	}
-	*args = dr->value_obj;
-        rb_funcall2(dr->handler, ox_value_id, 1, args);
-    } else if (dr->has.text) {
-        if (dr->options.convert_special) {
-            ox_sax_collapse_special(dr, dr->buf.str, pos, line, col);
-        }
-	switch (dr->options.skip) {
-	case CrSkip:
-	    buf_collapse_return(dr->buf.str);
-	    break;
-	case SpcSkip:
-	    buf_collapse_white(dr->buf.str);
-	    break;
-	default:
-	    break;
-	}
-        args[0] = rb_str_new2(dr->buf.str);
+    if (!dr->blocked && (NULL == parent || NULL == parent->hint || OffOverlay != parent->hint->overlay)) {
+	if (dr->has.value) {
+	    if (dr->has.pos) {
+		rb_ivar_set(dr->handler, ox_at_pos_id, LONG2NUM(pos));
+	    }
+	    if (dr->has.line) {
+		rb_ivar_set(dr->handler, ox_at_line_id, LONG2NUM(line));
+	    }
+	    if (dr->has.column) {
+		rb_ivar_set(dr->handler, ox_at_column_id, LONG2NUM(col));
+	    }
+	    *args = dr->value_obj;
+	    rb_funcall2(dr->handler, ox_value_id, 1, args);
+	} else if (dr->has.text) {
+	    if (dr->options.convert_special) {
+		ox_sax_collapse_special(dr, dr->buf.str, pos, line, col);
+	    }
+	    switch (dr->options.skip) {
+	    case CrSkip:
+		buf_collapse_return(dr->buf.str);
+		break;
+	    case SpcSkip:
+		buf_collapse_white(dr->buf.str);
+		break;
+	    default:
+		break;
+	    }
+	    args[0] = rb_str_new2(dr->buf.str);
 #if HAS_ENCODING_SUPPORT
-        if (0 != dr->encoding) {
-            rb_enc_associate(args[0], dr->encoding);
-        }
+	    if (0 != dr->encoding) {
+		rb_enc_associate(args[0], dr->encoding);
+	    }
 #elif HAS_PRIVATE_ENCODING
-        if (Qnil != dr->encoding) {
-	    rb_funcall(args[0], ox_force_encoding_id, 1, dr->encoding);
-        }
+	    if (Qnil != dr->encoding) {
+		rb_funcall(args[0], ox_force_encoding_id, 1, dr->encoding);
+	    }
 #endif
-	if (dr->has.pos) {
-	    rb_ivar_set(dr->handler, ox_at_pos_id, LONG2NUM(pos));
-	}
-	if (dr->has.line) {
-	    rb_ivar_set(dr->handler, ox_at_line_id, LONG2NUM(line));
-	}
-	if (dr->has.column) {
-	    rb_ivar_set(dr->handler, ox_at_column_id, LONG2NUM(col));
+	    if (dr->has.pos) {
+		rb_ivar_set(dr->handler, ox_at_pos_id, LONG2NUM(pos));
+	    }
+	    if (dr->has.line) {
+		rb_ivar_set(dr->handler, ox_at_line_id, LONG2NUM(line));
+	    }
+	    if (dr->has.column) {
+		rb_ivar_set(dr->handler, ox_at_column_id, LONG2NUM(col));
+	    }
+	    rb_funcall2(dr->handler, ox_text_id, 1, args);
 	}
-        rb_funcall2(dr->handler, ox_text_id, 1, args);
     }
     dr->buf.str = 0;
 
@@ -1228,7 +1266,8 @@ read_jump(SaxDrive dr, const char *pat) {
     if (0 != parent) {
 	parent->childCnt++;
     }
-    if (dr->has.text) {
+    // TBD check parent overlay
+    if (dr->has.text && !dr->blocked) {
         args[0] = rb_str_new2(dr->buf.str);
 #if HAS_ENCODING_SUPPORT
         if (0 != dr->encoding) {
@@ -1258,7 +1297,7 @@ read_jump(SaxDrive dr, const char *pat) {
 }
 
 static char
-read_attrs(SaxDrive dr, char c, char termc, char term2, int is_xml, int eq_req) {
+read_attrs(SaxDrive dr, char c, char termc, char term2, int is_xml, int eq_req, Hint h) {
     VALUE       name = Qnil;
     int         is_encoding = 0;
     int		pos;
@@ -1318,49 +1357,51 @@ read_attrs(SaxDrive dr, char c, char termc, char term2, int is_xml, int eq_req)
 		is_encoding = 0;
 	    }
 	}
-        if (dr->has.attr_value) {
-            VALUE       args[2];
-
-	    if (dr->has.pos) {
-		rb_ivar_set(dr->handler, ox_at_pos_id, LONG2NUM(pos));
-	    }
-	    if (dr->has.line) {
-		rb_ivar_set(dr->handler, ox_at_line_id, LONG2NUM(line));
-	    }
-	    if (dr->has.column) {
-		rb_ivar_set(dr->handler, ox_at_column_id, LONG2NUM(col));
-	    }
-            args[0] = name;
-            args[1] = dr->value_obj;
-            rb_funcall2(dr->handler, ox_attr_value_id, 2, args);
-	} else if (dr->has.attr) {
-            VALUE       args[2];
+	if (0 >= dr->blocked && (NULL == h || ActiveOverlay == h->overlay)) {
+	    if (dr->has.attr_value) {
+		VALUE       args[2];
 
-            args[0] = name;
-	    if (dr->options.convert_special) {
-		ox_sax_collapse_special(dr, dr->buf.str, pos, line, col);
-	    }
-            args[1] = rb_str_new2(attr_value);
+		if (dr->has.pos) {
+		    rb_ivar_set(dr->handler, ox_at_pos_id, LONG2NUM(pos));
+		}
+		if (dr->has.line) {
+		    rb_ivar_set(dr->handler, ox_at_line_id, LONG2NUM(line));
+		}
+		if (dr->has.column) {
+		    rb_ivar_set(dr->handler, ox_at_column_id, LONG2NUM(col));
+		}
+		args[0] = name;
+		args[1] = dr->value_obj;
+		rb_funcall2(dr->handler, ox_attr_value_id, 2, args);
+	    } else if (dr->has.attr) {
+		VALUE       args[2];
+
+		args[0] = name;
+		if (dr->options.convert_special) {
+		    ox_sax_collapse_special(dr, dr->buf.str, pos, line, col);
+		}
+		args[1] = rb_str_new2(attr_value);
 #if HAS_ENCODING_SUPPORT
-            if (0 != dr->encoding) {
-                rb_enc_associate(args[1], dr->encoding);
-            }
+		if (0 != dr->encoding) {
+		    rb_enc_associate(args[1], dr->encoding);
+		}
 #elif HAS_PRIVATE_ENCODING
-	    if (Qnil != dr->encoding) {
-		rb_funcall(args[1], ox_force_encoding_id, 1, dr->encoding);
-	    }
+		if (Qnil != dr->encoding) {
+		    rb_funcall(args[1], ox_force_encoding_id, 1, dr->encoding);
+		}
 #endif
-	    if (dr->has.pos) {
-		rb_ivar_set(dr->handler, ox_at_pos_id, LONG2NUM(pos));
-	    }
-	    if (dr->has.line) {
-		rb_ivar_set(dr->handler, ox_at_line_id, LONG2NUM(line));
-	    }
-	    if (dr->has.column) {
-		rb_ivar_set(dr->handler, ox_at_column_id, LONG2NUM(col));
+		if (dr->has.pos) {
+		    rb_ivar_set(dr->handler, ox_at_pos_id, LONG2NUM(pos));
+		}
+		if (dr->has.line) {
+		    rb_ivar_set(dr->handler, ox_at_line_id, LONG2NUM(line));
+		}
+		if (dr->has.column) {
+		    rb_ivar_set(dr->handler, ox_at_column_id, LONG2NUM(col));
+		}
+		rb_funcall2(dr->handler, ox_attr_id, 2, args);
 	    }
-            rb_funcall2(dr->handler, ox_attr_id, 2, args);
-        }
+	}
 	if (is_white(c)) {
 	    c = buf_next_non_white(&dr->buf);
 	}
@@ -1450,7 +1491,7 @@ read_quoted_value(SaxDrive dr) {
     while ('\0' != (c = buf_get(&dr->buf))) {
 	switch (c) {
 	case ' ':
-	case '/':
+	    //case '/':
 	case '>':
 	case '?': // for instructions
 	case '\t':
@@ -1623,7 +1664,7 @@ hint_clear_empty(SaxDrive dr) {
 	    break;
 	}
 	if (nv->hint->empty) {
-	    end_element_cb(dr, nv->val, dr->buf.pos, dr->buf.line, dr->buf.col);
+	    end_element_cb(dr, nv->val, dr->buf.pos, dr->buf.line, dr->buf.col, nv->hint);
 	    stack_pop(&dr->stack);
 	} else {
 	    break;
@@ -1633,7 +1674,7 @@ hint_clear_empty(SaxDrive dr) {
 
 static Nv
 hint_try_close(SaxDrive dr, const char *name) {
-    Hint	h = ox_hint_find(dr->hints, name);
+    Hint	h = ox_hint_find(dr->options.hints, name);
     Nv		nv;
 
     if (0 == h) {
@@ -1648,7 +1689,7 @@ hint_try_close(SaxDrive dr, const char *name) {
 	    break;
 	}
 	if (nv->hint->empty) {
-	    end_element_cb(dr, nv->val, dr->buf.pos, dr->buf.line, dr->buf.col);
+	    end_element_cb(dr, nv->val, dr->buf.pos, dr->buf.line, dr->buf.col, nv->hint);
 	    dr->stack.tail = nv;
 	} else {
 	    break;
@@ -1658,8 +1699,8 @@ hint_try_close(SaxDrive dr, const char *name) {
 }
 
 static void
-end_element_cb(SaxDrive dr, VALUE name, int pos, int line, int col) {
-    if (dr->has.end_element) {
+end_element_cb(SaxDrive dr, VALUE name, int pos, int line, int col, Hint h) {
+    if (dr->has.end_element && 0 >= dr->blocked && (NULL == h || ActiveOverlay == h->overlay)) {
 	if (dr->has.pos) {
 	    rb_ivar_set(dr->handler, ox_at_pos_id, LONG2NUM(pos));
 	}
@@ -1671,4 +1712,7 @@ end_element_cb(SaxDrive dr, VALUE name, int pos, int line, int col) {
 	}
 	rb_funcall(dr->handler, ox_end_element_id, 1, name);
     }
+    if (NULL != h && BlockOverlay == h->overlay && 0 < dr->blocked) {
+	dr->blocked--;
+    }
 }