diff -r 6d1fc2895273 -r ed9ec17aa67f java/alt2xml-lib-input/src/cz/frantovo/alt2xml/AbstractAlt2XmlReader.java
--- a/java/alt2xml-lib-input/src/cz/frantovo/alt2xml/AbstractAlt2XmlReader.java	Sat Sep 06 15:06:41 2014 +0200
+++ b/java/alt2xml-lib-input/src/cz/frantovo/alt2xml/AbstractAlt2XmlReader.java	Sat Sep 06 17:17:37 2014 +0200
@@ -17,6 +17,7 @@
  */
 package cz.frantovo.alt2xml;
 
+import cz.frantovo.alt2xml.in.Alt2ContentHandler;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
@@ -38,7 +39,7 @@
 public abstract class AbstractAlt2XmlReader implements XMLReader {
 
 	private static final String PROPERTY_BASE_URL = "https://alt2xml.globalcode.info/sax-property/";
-	protected ContentHandler contentHandler;
+	protected Alt2ContentHandler contentHandler;
 	protected ErrorHandler errorHandler;
 	protected DTDHandler dtdHandler;
 	protected EntityResolver entityResolver;
@@ -113,11 +114,11 @@
 
 	@Override
 	public void setContentHandler(ContentHandler contentHandler) {
-		this.contentHandler = contentHandler;
+		this.contentHandler = new Alt2ContentHandler(contentHandler);
 	}
 
 	@Override
-	public ContentHandler getContentHandler() {
+	public Alt2ContentHandler getContentHandler() {
 		return contentHandler;
 	}