diff --git a/build.xml b/build.xml
index 47c1d06..5bcff48 100644
--- a/build.xml
+++ b/build.xml
@@ -63,7 +63,7 @@
 	</target>	
 
 
-	<!-- *********** dotest ******** -->
+	<!-- *********** runtest ******** -->
 	<target name="test" depends="dist_test">
 	        <java  classname="xid.test.Test" maxmemory="20m" fork="true">
 			<classpath>
diff --git a/demo/XidDemo.java b/demo/XidDemo.java
index b453616..26a0a09 100644
--- a/demo/XidDemo.java
+++ b/demo/XidDemo.java
@@ -1,37 +1,39 @@
-import java.util.*;
-import java.io.*;
+/**
+ * XidDemo
+ */
+
 import fr.devinsy.xid.*;
 
 /**
  *
  */
-class Demo
+class XidDemo
 {
-  static private org.apache.log4j.Logger log;
+  static private org.apache.log4j.Logger logger;
 
   static
     { 
-      // Initialize log.
+      // Initialize logger.
       org.apache.log4j.Logger log = null;
       
       org.apache.log4j.BasicConfigurator.configure ();
 
 
       log = org.apache.log4j.Logger.getRootLogger ();
-      //log.setLevel (org.apache.log4j.Level.INFO);
-      log.setLevel (org.apache.log4j.Level.INFO);
+      //logger.setLevel (org.apache.log4j.Level.INFO);
+      logger.setLevel (org.apache.log4j.Level.INFO);
       
-      log.info ("Enter");
+      logger.info ("Enter");
       
       //
-      log.info ("Set the log file format...");
+      logger.info ("Set the log file format...");
        
       
       // log = org.apache.log4j.Category.getInstance(Application.class.getName());
-      log.info ("... done.");
+      logger.info ("... done.");
       
-      log.debug ("Exit");
-      log = org.apache.log4j.Logger.getLogger (Demo.class);
+      logger.debug ("Exit");
+      log = org.apache.log4j.Logger.getLogger (XidDemo.class);
     }
 
 
diff --git a/src/xid/Attributes.java b/src/xid/Attributes.java
deleted file mode 100644
index cad8b68..0000000
--- a/src/xid/Attributes.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package xid;
-
-import java.util.*;
-import java.io.*;
-
-
-
-/**
- *
- * Note: no more AttrValue as in Brill, because the exception of style is managed
- * in the attribute merging on the "style" string detection.
- */
-public class Attributes extends HashMap<String, String>
-{
-  /*
-   *
-   */
-  public Attributes ()
-  {
-    super ();
-  }
-
-
-  /*
-   * Useful for the merge attributes.
-   */
-  public Attributes (Attributes attributes)
-  {
-    super (attributes);
-  }
-
-
-  /*
-   *
-   */
-  public void setAttribute (String label, String value)
-  {
-    this.put (label, value);
-  }
-  
-
-  /*
-   * Add a value to an existing value. This is useful to the 'style' attribute.
-   *
-   */
-  public void appendAttribute (String label, String value)
-  {
-    if (this.containsKey (label))
-      {
-	this.put (label, this.get (label) + value);
-      }
-    else
-      {
-	this.put (label, value);
-      }
-  }
-  
-
-  /*
-   *
-   */
-  public String getAttribute (String label)
-  {
-    String result;
-
-    if (this.containsKey (label))
-      {
-	result = this.get (label);
-      }
-    else
-      {
-	result = null;
-      }
-
-    //
-    return (result);
-  }
-
-}
diff --git a/src/xid/Data.java b/src/xid/Data.java
deleted file mode 100644
index 7d312e8..0000000
--- a/src/xid/Data.java
+++ /dev/null
@@ -1,383 +0,0 @@
-package xid;
-
-import java.util.*;
-import java.io.*;
-
-/*
- *
- */
-public class Data
-{
-  protected IdsDataById idsDataById;
-  protected TagsDataById tagsDataById;
-
-
-  /**
-   *
-   */
-  public Data ()
-  {
-    this.idsDataById = new IdsDataById ();
-    this.tagsDataById = new TagsDataById ();
-  }
-
-
-  /**
-   *
-   */
-  public IdsDataById getIdsDataById ()
-  {
-    IdsDataById result;
-
-    result = this.idsDataById;
-
-    //
-    return (result);
-  }
-
-
-  /**
-   *
-   */
-  public TagsDataById getTagsDataById ()
-  {
-    TagsDataById result;
-
-    result = this.tagsDataById;
-
-    //
-    return (result);
-  }
-
-
-  /**
-   *
-   */
-  public IdData getIdData (String id)
-  {
-    IdData result;
-
-    // Be sure that IdData is existing and get item.
-    result = (IdData) this.idsDataById.getId (id);
-
-    if (result == null)
-      {
-	this.idsDataById.setId (id, new IdData ());
-
-	result = (IdData) this.idsDataById.getId (id);
-      }
-
-
-    //
-    return (result);
-  }
-
-
-  /**
-   *
-   */
-  public IdData getIdData (String id, int line)
-  {
-    IdData result;
-
-    // Be sure that IdsData are existing.
-    IdsDataByIndex tags = (IdsDataByIndex) this.idsDataById.getId (id);
-    if (tags == null)
-      {
-	this.idsDataById.setId (id, new IdsDataByIndex ());
-
-	tags = (IdsDataByIndex) this.idsDataById.getId (id);
-      }
-
-    // Be sure that lines are existing.
-    int nbLines = tags.size ();
-    for (int nLine = nbLines; nLine < line + 1; nLine++)
-      {
-	tags.add (nLine, new IdData ());
-      }
-
-    // Get item.
-    result = (IdData) tags.elementAt (line);
-
-    //
-    return (result);
-  }
-
-
-  /**
-   *
-   */
-  public IdData getIdData (String id, int line, String column)
-  {
-    IdData result;
-
-    // Be sure that IdsData are existing.
-    IdsDataByIndex tags = (IdsDataByIndex) this.idsDataById.getId (id);
-    if (tags == null)
-      {
-	this.idsDataById.setId (id, new IdsDataByIndex ());
-	
-	tags = (IdsDataByIndex) this.idsDataById.getId (id);
-      }
-
-    // Be sure that lines are existing.
-    int nbLines = tags.size ();
-    for (int nLine = nbLines; nLine < line + 1; nLine++)
-      {
-	tags.add (nLine, new IdsDataById ());
-      }
-
-    // Get item.
-    IdsDataById lineData = (IdsDataById) tags.elementAt (line);
-
-    result = (IdData) lineData.get (column);
-
-    if (result == null)
-      {
-	lineData.put (column, new IdData ());
-
-	result = (IdData) lineData.get (column);
-      }
-
-    //
-    return (result);
-  }
-
-
-  /**
-   *
-   */
-  public void setIterationStrategy (String id, IdData.IterationStrategy strategy)
-  {
-    IdData tag = (IdData) this.getIdData (id);
-
-    tag.setIterationStrategy (strategy);
-  }
-
-
-
-  /**
-   *
-   */
-  public void setContent (String id, String content)
-  {
-    if (id.startsWith ("<"))
-      {
-	String tagName = id.substring (1, id.length () - 1);
-	
-	TagData tag = this.tagsDataById.getId (tagName);
-	if (tag == null)
-	  {
-	    tag = new TagData ();
-	    this.tagsDataById.setId (tagName, tag);
-	  }
-
-	tag.setContent (content);
-      }
-    else
-      {
-	IdData idData = this.getIdData (id);
-
-	idData.setContent (content);
-      }
-  }
-
-
-  /**
-   *
-   */
-  public void setContent (String id, int content)
-  {
-    setContent (id, (new Integer (content)).toString ());
-  }
-
-
-  /**
-   *
-   */
-  public void setContent (String id, int line, String content)
-  {
-    IdData tag = this.getIdData (id, line);
-    
-    tag.setContent (content);
-  }
-
-
-  /**
-   *
-   */
-  public void setContent (String id, int line, int content)
-  {
-    setContent (id, line, (new Integer (content)).toString ());
-  }
-
-
-  /**
-   *
-   */
-  public void setContent (String id, int line, String column, String content)
-  {
-    IdData tag = this.getIdData (id, line, column);
-
-    tag.setContent (content);
-  }
-
-
-  /**
-   *
-   */
-  public void setContent (String id, int line, String column, int content)
-  {
-    setContent (id, line, column, (new Integer (content)).toString ());
-  }
-
-
-  /**
-   *
-   */
-  public void setAttribute (String id, String label, String value)
-  {
-    if (id.startsWith ("<"))
-      {
-	String tagName = id.substring (1, id.length () - 1);
-	
-	TagData tag = this.tagsDataById.getId (tagName);
-	if (tag == null)
-	  {
-	    tag = new TagData ();
-	    this.tagsDataById.setId (tagName, tag);
-	  }
-
-	tag.getAttributes ().setAttribute (label, value);
-      }
-    else
-      {
-	IdData tag = this.getIdData (id);
-
-	tag.getAttributes ().setAttribute (label, value);
-      }
-  }
-
-
-  /**
-   *
-   */
-  public void setAttribute (String id, String label, int value)
-  {
-    setAttribute (id, label, (new Integer (value)).toString ());
-  }
-
-
-  /**
-   *
-   */
-  public void setAttribute (String id, int line, String label, String value)
-  {
-    IdData tag = this.getIdData (id, line);
-
-    tag.getAttributes ().setAttribute (label, value);
-  }
-
-
-  /**
-   *
-   */
-  public void setAttribute (String id, int line, String label, int value)
-  {
-    setAttribute (id, line, label, (new Integer (value)).toString ());
-  }
-
-
-  /**
-   *
-   */
-  public void setAttribute (String id, int line, String column, String label, String value)
-  {
-    IdData tag = this.getIdData (id, line, column);
-
-    tag.getAttributes ().setAttribute (label, value);
-  }
-
-
-  /**
-   *
-   */
-  public void setAttribute (String id, int line, String column, String label, int value)
-  {
-    setAttribute (id, line, column, label, (new Integer (value)).toString ());
-  }
-
-
-  /**
-   *
-   */
-  public void appendAttribute (String id, int line, String column, String label, String value)
-  {
-    org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger (Data.class);
-
-
-    IdData tag = this.getIdData (id, line, column);
-
-    tag.getAttributes ().appendAttribute (label, value);
-  }
-
-
-  /**
-   *
-   */
-  public void appendAttribute (String id, String label, String value)
-  {
-    IdData tag = this.getIdData (id);
-
-    tag.getAttributes ().appendAttribute (label, value);
-  }
-
-
-  /**
-   *
-   */
-  public void appendAttribute (String id, String label, int value)
-  {
-    appendAttribute (id, label, (new Integer (value)).toString ());
-  }
-
-
-  /**
-   *
-   */
-  public void appendContent (String id, int line, String value)
-  {
-    IdData tag = this.getIdData (id, line);
-
-    tag.appendContent (value);
-  }
-
-
-  /**
-   *
-   */
-  public void appendContent (String id, int line, int value)
-  {
-    appendContent (id, line, (new Integer (value)).toString ());
-  }
-
-
-  /**
-   *
-   */
-  public void appendContent (String id, int line, String column, String value)
-  {
-    IdData tag = this.getIdData (id, line, column);
-
-    tag.appendContent (value);
-  }
-
-
-  /**
-   *
-   */
-  public void appendContent (String id, int line, String column, int value)
-  {
-    appendContent (id, line, column, (new Integer (value)).toString ());
-  }
-}
diff --git a/src/xid/DomPresenter.java b/src/xid/DomPresenter.java
deleted file mode 100644
index bb2d242..0000000
--- a/src/xid/DomPresenter.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package xid;
-
-import java.util.*;
-import java.io.*;
-import javax.xml.parsers.*;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.validation.Schema;
-import org.xml.sax.*;
-import org.w3c.dom.*;
-/**
- *
- */
-public class DomPresenter extends Presenter
-{
-  static final public char INDEX_SEPARATOR = '_';
-
-  static protected org.apache.log4j.Logger log;
-  static
-  { 
-    log = org.apache.log4j.Logger.getLogger (DomPresenter.class);
-  }
-
-  static protected String staticRootPath;
-  static
-  { 
-    staticRootPath = null;
-  }
-
-
-  protected String webappPath;
-  protected Document doc;
-
-  /*
-   *
-   */
-  public DomPresenter ()
-  {
-    this.webappPath = Presenter.staticRootPath;
-    this.doc = null;
-  }
-
-
-  /*
-   *
-   */
-  public DomPresenter (Document doc)
-  {
-    this.webappPath = Presenter.staticRootPath;
-    this.doc = doc;
-    DomPresenter.addMetaTag (this.doc, "generator", "XID 0.0");
-  }
-
-
-  /*
-   *
-   */
-  public DomPresenter (String webappPath, Document doc)
-  {
-    if ((webappPath == null) || (webappPath.equals ("")))
-      {
-	this.webappPath = Presenter.staticRootPath;
-      }
-    else
-      {
-	this.webappPath = webappPath;
-      }
-
-    this.doc = doc;
-    DomPresenter.addMetaTag (this.doc, "generator", "XID 0.0");
-  }
-
-
-  /*
-   *
-   */
-  public String getWebappPath ()
-  {
-    String result;
-
-    result = this.webappPath;
-
-    //
-    return (result);
-  }
-
-  /*
-   *
-   */
-  public void setWebappPath (String path)
-  {
-    this.webappPath = path;
-  }
-
-
-  /**
-   *
-   */
-  public Document getDom ()
-  {
-    Document result;
-
-    result = this.doc;
-
-    //
-    return (result);
-  }
-
-
-  /**
-   *
-   */
-  public void setDom (Document doc)
-  {
-    this.doc = doc;
-  }
-
-
-  /*
-   *
-   */
-  public void setSource (Document doc)
-  {
-    this.doc = doc;
-
-    Presenter.addMetaTag (this.doc, "generator", "XID 0.0");
-  }
-
-
-  /*
-   *
-   */
-  public Object getSource ()
-  {
-    Object result;
-
-    result = this.doc;
-
-    //
-    return (result);
-  }
-
-
-  /*
-   *
-   */
-  public StringBuffer doXid (Data datas, StringBuffer errorOutput)
-  {
-    return (doXid (datas.getIdsDataById (), datas.getTagsDataById (), errorOutput));
-  }
-
-  /*
-   *
-   */
-  public StringBuffer doXid (IdsDataById datas, TagsDataById tagsData, StringBuffer errorOutput)
-  {
-    StringBuffer result;
-
-    if (this.doc == null)
-      {
-	String errorMessage = "source not defined";
-	errorOutput.append (errorMessage);
-	log.error (errorMessage);
-	result = null;
-      }
-    else
-      {
-	// Build the web page.
-	result = Presenter.doXid (this.doc, datas, tagsData, this.webappPath, errorOutput);
-      }
-
-    //
-    return (result);
-  }
-
-
-  /*
-   * Xid a file with data.
-   */
-  static public StringBuffer doXid (Document doc, IdsDataById datas, String webappPath, StringBuffer errorOutput)
-  {
-    return (doXid (doc, datas, null, webappPath, errorOutput));
-  }
-
-  /*
-   * Xid a file with data.
-   */
-  static public StringBuffer doXid (Document doc, IdsDataById datas, TagsDataById tagsData, String webappPath, StringBuffer errorOutput)
-  {
-    StringBuffer result;
-
-    result = Presenter.process (doc, datas, tagsData, webappPath, errorOutput);
-
-    //
-    return (result);
-  }
-}
diff --git a/src/xid/FilePresenter.java b/src/xid/FilePresenter.java
deleted file mode 100644
index 2adbe82..0000000
--- a/src/xid/FilePresenter.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package xid;
-
-import java.util.*;
-import java.io.*;
-import javax.xml.parsers.*;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.validation.Schema;
-import org.xml.sax.*;
-import org.w3c.dom.*;
-/**
- *
- */
-public class FilePresenter extends DomPresenter
-{
-  static protected org.apache.log4j.Logger log;
-  static
-  { 
-    log = org.apache.log4j.Logger.getLogger (FilePresenter.class);
-  }
-
-  protected String sourceFileName;
-  protected long sourceFileTime;
-
-  /*
-   *
-   */
-  public FilePresenter ()
-  {
-    this.webappPath = Presenter.staticRootPath;
-    this.sourceFileName = null;
-    this.sourceFileTime = 0;
-    this.doc = null;
-  }
-
-
-  /*
-   *
-   */
-  public FilePresenter (String fileName)
-  {
-    this.webappPath = Presenter.staticRootPath;
-    this.sourceFileName = fileName;
-    this.sourceFileTime = 0;
-    this.doc = null;
-  }
-
-
-  /*
-   *
-   */
-  public FilePresenter (String webappPath, String fileName)
-  {
-    if ((webappPath == null) || (webappPath.equals ("")))
-      {
-	this.webappPath = Presenter.staticRootPath;
-      }
-    else
-      {
-	this.webappPath = webappPath;
-      }
-    this.sourceFileName = fileName;
-    this.sourceFileTime = 0;
-    this.doc = null;
-  }
-
-
-  /*
-   *
-   */
-  public void setSource (String fileName)
-  {
-    this.sourceFileName = fileName;
-    this.sourceFileTime = 0;
-    this.doc = null;
-  }
-
-
-  /*
-   *
-   */
-  public String getSource ()
-  {
-    String result;
-
-    result = this.sourceFileName;
-
-    //
-    return (result);
-  }
-
-
-  /*
-   *
-   */
-  public StringBuffer doXid (Data datas, StringBuffer errorOutput)
-  {
-    return (doXid (datas.getIdsDataById (), datas.getTagsDataById (), errorOutput));
-  }
-
-
-  /*
-   *
-   */
-  public StringBuffer doXid (IdsDataById datas, TagsDataById tagsData, StringBuffer errorOutput)
-  {
-    StringBuffer result;
-
-    String sourceFilePath = this.webappPath + File.separator + this.sourceFileName;
-
-    // Get the good tree.
-    File source = new File (sourceFilePath);
-
-    if (source == null)
-      {
-	String errorMessage = "source file not defined";
-	errorOutput.append (errorMessage);
-	log.error (errorMessage);
-	result = null;
-      }
-    else if (!source.exists ())
-      {
-	String errorMessage = "source file defined but not found (" + sourceFilePath + ")";
-	errorOutput.append (errorMessage);
-	log.error (errorMessage);
-	result = null;
-      }
-    else if ((this.doc == null) ||
-	     (this.sourceFileTime != source.lastModified ()))
-      {
-	this.sourceFileTime = source.lastModified ();
-	this.doc = Presenter.fileToTree (sourceFilePath, errorOutput);
-
-	if (this.doc != null)
-	  {
-	    Presenter.addMetaTag (doc, "generator", "XID 0.0");
-	  }
-      }
-
-    // Build the web page.
-    result = Presenter.doXid (doc, datas, tagsData, this.webappPath, errorOutput);
-
-    //
-    return (result);
-  }
-
-
-  /*
-   * Xid a file without data.
-   */
-  static public StringBuffer doXid (String fileName,  String webappPath, StringBuffer errorOutput)
-  {
-    StringBuffer result;
-
-    Document doc = Presenter.fileToTree (fileName, errorOutput);
-
-    if (doc == null)
-      {
-	result = null;
-      }
-    else
-      {
-	Presenter.addMetaTag (doc, "generator", "XID 0.0");
-	
-	result = Presenter.doXid (doc, null, null, webappPath, errorOutput);
-      }
-
-    //
-    return (result);
-  }
-}
diff --git a/src/xid/IdData.java b/src/xid/IdData.java
deleted file mode 100644
index 708e8bb..0000000
--- a/src/xid/IdData.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package xid;
-
-import java.util.*;
-import java.io.*;
-
-/**
- * IdData class is used to hold application data and
- * the business logic that operates on the data.
- *
- * The only requirement of a IdData class is that it must implement a
- * display method. The display method must return a text representation
- * of the data, suitable for display in a web page.
- *
- * XID provides a User Input IdData, Text IdData and ...
- * application may also implement it's own IdData classes.
- *
- */
-public class IdData implements Serializable, IdDataCore
-{
-  public enum IterationStrategy {ONLY_FIRST_ROW, ONLY_FIRST_TWO_ROWS, ONLY_ROWS_WITH_ID, ONLY_ROWS_WITHOUT_ID, ALL_ROWS}
- 
- protected IterationStrategy iterationStrategy;
-
-
-  public enum MODE {REPLACE, APPEND, IGNORE};
-
-  protected Attributes attributes;
-  protected boolean excludeSection;
-  protected MODE displayMode = MODE.REPLACE;
-  protected String content;
-  
-  /*
-   *
-   */
-  public IdData ()
-  {
-    this.attributes = null;
-    this.excludeSection = false;
-    this.displayMode = MODE.REPLACE;
-    this.content = null;
-    this.iterationStrategy = IterationStrategy.ALL_ROWS;
-  }
-
-
-  /*
-   *
-   */
-  public IdData (String text)
-  {
-    this.attributes = null;
-    this.excludeSection = false;
-    this.displayMode = MODE.REPLACE;
-    this.content = text;
-    this.iterationStrategy = IterationStrategy.ALL_ROWS;
-  }
-
-
-  /*
-   *
-   */
-  public String display ()
-  {
-    String result;
-    
-    result = this.content;
-    
-    //
-    return (result);
-  }
-
-
-  /*
-   *
-   */
-  public void setContent (String text)
-  {
-    this.content = text;
-  }
-
-
-  /*
-   *
-   */
-  public void appendContent (String text)
-  {
-    if (this.content == null)
-      {
-	this.content = text;
-      }
-    else
-      {
-	this.content += text;
-      }
-  }
-
-
-  /*
-   *
-   */
-  public void setDisplayMode(MODE displayMode)
-  {
-    this.displayMode = displayMode;
-  }
-
-
-  /*
-   *
-   */
-  public MODE getDisplayMode()
-  {
-    MODE result;
-
-    result = this.displayMode;
-
-    return (result);
-  }
-  
-
-  /*
-   *
-   */
-  public Attributes getAttributes ()
-  {
-    Attributes result;
-
-    if (this.attributes == null)
-      {
-	this.attributes = new Attributes ();
-      }
-
-    result = this.attributes;
-
-    //
-    return (result);
-  }
-  
-
-  /*
-   *
-   */
-  public void setExcludeSection(boolean excludeSection)
-  {
-    this.excludeSection = excludeSection;
-  }
-  
-
-  /*
-   *
-   */
-  public boolean getExcludeSection()
-  {
-    return excludeSection;
-  }
-
-  
-  /**
-   *
-   */
-  public void setIterationStrategy (IterationStrategy strategy)
-  {
-    this.iterationStrategy = strategy;
-  }
-
-
-  /**
-   *
-   */
-  public IterationStrategy getIterationStrategy ()
-  {
-    IterationStrategy result;
-
-    result = this.iterationStrategy;
-    
-    //
-    return (result);
-  }
-}
diff --git a/src/xid/IdDataCore.java b/src/xid/IdDataCore.java
deleted file mode 100644
index 5fa290c..0000000
--- a/src/xid/IdDataCore.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package xid;
-
-import java.util.*;
-import java.io.*;
-
-/*
- * Xid uses three class to describe data:
- * - TagData
- * - TagsData
- * - TagsDataById
- * Others class that doesn't extends these won't be use by Xid.
- *
- * This interface helps to express this fact.
- *
- */
-public interface IdDataCore
-{
-}
diff --git a/src/xid/IdsDataById.java b/src/xid/IdsDataById.java
deleted file mode 100644
index e9f1d1c..0000000
--- a/src/xid/IdsDataById.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package xid;
-
-import java.util.*;
-import java.io.*;
-
-/*
- *
- */
-public class IdsDataById extends HashMap<String, IdDataCore> implements IdDataCore
-{
-  /*
-   *
-   */
-  public IdsDataById ()
-  {
-    super ();
-  }
-
-  /*
-   *
-   */
-  public void setId (String id, IdDataCore data)
-  {
-    this.put (id, data);
-  }
-  
-  /*
-   *
-   */
-  public IdDataCore getId (String id)
-  {
-    IdDataCore result;
-
-    result = this.get (id);
-    
-    //
-    return (result);
-  }
-
-}
diff --git a/src/xid/IdsDataByIndex.java b/src/xid/IdsDataByIndex.java
deleted file mode 100644
index 5466783..0000000
--- a/src/xid/IdsDataByIndex.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package xid;
-
-import java.util.*;
-import java.io.*;
-
-/*
- *
- */
-public class IdsDataByIndex extends Vector<IdDataCore> implements IdDataCore
-{
-  /**
-   *
-   */
-  public IdsDataByIndex ()
-  {
-    super ();
-  }
-}
diff --git a/src/xid/ParserErrorHandler.java b/src/xid/ParserErrorHandler.java
deleted file mode 100644
index 83b0e3e..0000000
--- a/src/xid/ParserErrorHandler.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package xid;
-
-import org.xml.sax.*;
-import java.util.*;
-
-/**
- * Extract from org.xml.sax Interface ErrorHandler:
- * "If a SAX application needs to implement customized error handling,
- * it must implement this interface and then register an instance with
- * the XML reader using the setErrorHandler  method. The parser will
- * then report all errors and warnings through this interface."
- *
- */
-public class ParserErrorHandler implements ErrorHandler
-{
-  Vector<String> messages;
-  int fatalErrorsCount;
-  int errorsCount;
-  int warningCount;
-  
-  public ParserErrorHandler ()
-  {
-    fatalErrorsCount = 0;
-    errorsCount = 0;
-    warningCount = 0;
-    messages = new Vector<String> ();
-  }
-  
-
-  /**
-   *
-   */
-  public int fatalErrorsCount ()
-  {
-    int result;
-
-    result = this.fatalErrorsCount;
-
-    //
-    return (result);
-  }
-
-  /**
-   *
-   */
-  public int errorsCount ()
-  {
-    int result;
-
-    result = this.errorsCount;
-
-    //
-    return (result);
-  }
-
-  /**
-   *
-   */
-  public int warningCount ()
-  {
-    int result;
-
-    result = this.warningCount;
-
-    //
-    return (result);
-  }
-
-  /**
-   *
-   */
-  public int allErrorsCount ()
-  {
-    int result;
-
-    result = fatalErrorsCount () + errorsCount () + warningCount ();
-
-    //
-    return (result);
-  }
-
-  /**
-   *
-   */
-  public boolean hasError ()
-  {
-    boolean result;
-
-    if (allErrorsCount () == 0)
-      {
-	result = false;
-      }
-    else
-      {
-	result = true;
-      }
-
-    //
-    return (result);
-  }
-
-
-  /**
-   * Called by the XML parser to handle fatal errors.
-   * @param ex Parse Excpetion. Contains the warning text and the line number.
-   */
-  public void error (SAXParseException exception)
-  {
-    String message = "Error at line " + exception.getLineNumber() + " : " + exception.getMessage();
-
-    this.errorsCount += 1;
-    this.messages.add (message);
-  }
-  
-  /**
-   * Called by the XML parser to handle fatal errors.
-   * @param ex Parse Excpetion. Contains the error text and the line number.
-   * When a fatal parse error occurs, the parse does not return a document.
-   */
-  public void fatalError (SAXParseException exception)
-  {
-    String message = "Fatal error at line " + exception.getLineNumber() + " : " + exception.getMessage();
-    
-    this.fatalErrorsCount += 1;
-    this.messages.add (message);
-  }
-  
-  /**
-   * Called by the XML parser to handle warnings.
-   * @param ex Parse Excpetion. Contains the warning text and the line number.
-   */
-  public void warning(SAXParseException exception)
-  {
-    String message = "Warning at line " + exception.getLineNumber() + " : " + exception.getMessage();
-    
-    this.warningCount += 1;
-    this.messages.add (message);
-  }
-
-
-  /**
-   *
-   */
-  public String toString ()
-  {
-    StringBuffer result;
-
-    result = new StringBuffer ();
-
-    for (String message : messages)
-      {
-	result.append (message);
-	result.append ('\n');
-      }
-
-    //
-    return (result.toString ());
-  }
-}
diff --git a/src/xid/Presenter.java b/src/xid/Presenter.java
deleted file mode 100644
index 60f5517..0000000
--- a/src/xid/Presenter.java
+++ /dev/null
@@ -1,1330 +0,0 @@
-package xid;
-
-import java.util.*;
-import java.io.*;
-import javax.xml.parsers.*;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.validation.Schema;
-import org.xml.sax.*;
-import org.w3c.dom.*;
-/**
- *
- */
-public class Presenter
-{
-  static final public char INDEX_SEPARATOR = '_';
-
-  static protected org.apache.log4j.Logger log;
-  static
-  { 
-    log = org.apache.log4j.Logger.getLogger (Presenter.class);
-  }
-
-  static protected String staticRootPath;
-  static
-  { 
-    staticRootPath = null;
-  }
-
-
-  /*
-   *
-   */
-  static public void setStaticRootPath (String path)
-  {
-    Presenter.staticRootPath = path;
-  }
-
-
-  /*
-   *
-   */
-  static public String getStaticRootPath ()
-  {
-    String result;
-
-    result = Presenter.staticRootPath;
-
-    //
-    return (result);
-  }
-
-  /*
-   * Xid a file with data.
-   */
-  static public StringBuffer doXid (Document doc, IdsDataById datas, String webappPath, StringBuffer errorOutput)
-  {
-    return (doXid (doc, datas, null, webappPath, errorOutput));
-  }
-
-  /*
-   * Xid a file with data.
-   */
-  static public StringBuffer doXid (Document doc, IdsDataById datas, TagsDataById tagsData, String webappPath, StringBuffer errorOutput)
-  {
-    StringBuffer result;
-
-    result = Presenter.process (doc, datas, tagsData, webappPath, errorOutput);
-
-    //
-    return (result);
-  }
-
-
-  /*
-   *
-   */
-  static public String getClassAttributeValue (Node node)
-  {
-    String result;
-    
-    NamedNodeMap attributes = node.getAttributes ();
-    if (attributes == null)
-      {
-	result = null;
-      }
-    else
-      {
-	Node nameAttribute = attributes.getNamedItem ("class");
-	
-	if (nameAttribute == null)
-	  {
-	    result = null;
-	  }
-	else
-	  {
-	    result = nameAttribute.getNodeValue ();
-	  }
-      }
-
-    //
-    return (result);
-  }
-
-
-  /**
-   *
-   */
-  static public Attributes mergeAttributes (Attributes target, Attributes source)
-  {
-    Attributes result;
-
-    //
-    if (target == null)
-      {
-	result = source;
-      }
-    else if (source == null)
-      {
-	result = target;
-      }
-    else
-      {
-	result = new Attributes (target);
-
-	Iterator iterator = source.entrySet().iterator();
-	
-	while (iterator.hasNext())
-	  {
-	    Map.Entry<String, String> attribute = (Map.Entry<String, String>) iterator.next();
-
-	    String currentValue = target.get (attribute.getKey ());
-
-	    if (currentValue == null)
-	      {
-		result.put (attribute.getKey (), attribute.getValue ());
-	      }
-	    else if (attribute.getKey ().equals ("style"))
-	      {
-		result.put (attribute.getKey (), currentValue + attribute.getValue ());
-	      }
-	    else
-	      {
-		result.put (attribute.getKey (), attribute.getValue ());
-	      }
-	  }
-      }
-
-    //
-    return (result);
-  }
-
-  /*
-   *
-   */
-  static protected StringBuffer processChildren (Node node, IdsDataById datas,  TagsDataById tagsData, String webappPath, StringBuffer errorOutput)
-  {
-    StringBuffer result;
-
-    result = processChildren (node, datas, tagsData, webappPath, "", errorOutput);
-
-    //
-    return (result);
-  }
-
-
-  /*
-   *
-   */
-  static protected StringBuffer processChildren (Node node,
-						 IdsDataById datas,
-						 TagsDataById tagsData,
-						 String webappPath,
-						 String suffix,
-						 StringBuffer errorOutput)
-  {
-    StringBuffer result;
-    result = new StringBuffer ();
-    
-    // Get the iteration strategy.
-    IdData.IterationStrategy strategy;
-
-    NamedNodeMap attributes = node.getAttributes ();
-    if (attributes == null)
-      {
-	strategy = IdData.IterationStrategy.ALL_ROWS;
-      }
-    else
-      {
-	Node id = attributes.getNamedItem ("id");
-
-	if (id == null)
-	  {
-	    strategy = IdData.IterationStrategy.ALL_ROWS;
-	  }
-	else
-	  {
-	    IdDataCore dataCore = datas.getId (id.getNodeValue ());
-	    if (dataCore == null)
-	      {
-		strategy = IdData.IterationStrategy.ALL_ROWS;
-	      }
-	    else if (dataCore instanceof IdData)
-	      {
-		IdData data = (IdData) dataCore;
-		strategy = data.getIterationStrategy ();
-	      }
-	    else
-	      {
-		strategy = IdData.IterationStrategy.ALL_ROWS;
-	      }
-	  }
-      }
-
-
-    // Iterate.
-    NodeList children = node.getChildNodes();
-    int childrenCount = children.getLength ();
-    
-    switch (strategy)
-      {
-      case ONLY_FIRST_ROW:
-	int lineCounter = 0;
-	for (int childIndex = 0; childIndex < childrenCount; childIndex++)
-	  {
-	    if (children.item (childIndex).getNodeType () == Node.ELEMENT_NODE)
-	      {
-		lineCounter += 1;
-		if (lineCounter == 1)
-		  {
-		    result.append (process (children.item (childIndex), datas, tagsData, webappPath, suffix, errorOutput));
-		  }
-	      }
-	    else
-	      {
-		result.append (process (children.item (childIndex), datas, tagsData, webappPath, suffix, errorOutput));
-	      }	    
-	  }
-	break;
-	
-      case ONLY_FIRST_TWO_ROWS:
-	lineCounter = 0;
-	for (int childIndex = 0; childIndex < childrenCount; childIndex++)
-	  {
-	    if (children.item (childIndex).getNodeType () == Node.ELEMENT_NODE)
-	      {
-		lineCounter += 1;
-
-		if ((lineCounter == 1) || (lineCounter == 2))
-		  {
-		    result.append (process (children.item (childIndex), datas, tagsData, webappPath, suffix, errorOutput));
-		  }
-	      }
-	    else
-	      {
-		result.append (process (children.item (childIndex), datas, tagsData, webappPath, suffix, errorOutput));
-	      }
-	  }
-	break;
-	
-      case ONLY_ROWS_WITH_ID:
-	for (int childIndex = 0; childIndex < childrenCount; childIndex++)
-	  {
-	    if (children.item (childIndex).getNodeType () == Node.ELEMENT_NODE)
-	      {
-		NamedNodeMap attrs2 = children.item (childIndex).getAttributes ();
-		
-		if ((attrs2 != null) &&
-		    (attrs2.getNamedItem ("id") != null))
-		  {
-		    result.append (process (children.item (childIndex), datas, tagsData, webappPath, suffix, errorOutput));
-		  }
-	      }
-	    else
-	      {
-		result.append (process (children.item (childIndex), datas, tagsData, webappPath, suffix, errorOutput));
-	      }
-	  }
-	break;
-
-      case ONLY_ROWS_WITHOUT_ID:
-	for (int childIndex = 0; childIndex < childrenCount; childIndex++)
-	  {
-	    if (children.item (childIndex).getNodeType () == Node.ELEMENT_NODE)
-	      {
-		NamedNodeMap attrs2 = children.item (childIndex).getAttributes ();
-		if ((attrs2 == null) ||
-		    (attrs2.getNamedItem ("id") == null))
-		  {
-		    result.append (process (children.item(childIndex), datas, tagsData, webappPath, suffix, errorOutput));
-		  }
-	      }
-	    else
-	      {
-		result.append (process (children.item (childIndex), datas, tagsData, webappPath, suffix, errorOutput));
-	      }
-	  }
-	break;
-	
-      case ALL_ROWS:
-	for (int childIndex = 0; childIndex < childrenCount; childIndex++)
-	  {
-	    result.append (process (children.item(childIndex), datas, tagsData, webappPath, suffix, errorOutput));
-	  }
-	break;
-      }
-
-    //
-    return (result);
-  }
-
-
-
-  /**
-   * Includes another file into the current page.
-   * 
-   * @param node
-   * @param attrMap
-   * @param idAttr
-   */
-  static protected StringBuffer processObjectTag (Node node,
-						  NamedNodeMap attrMap,
-						  Node idAttr,
-						  IdsDataById datas,
-						  TagsDataById tagsData,
-						  String webappPath,
-						  StringBuffer errorOutput)
-  {
-    StringBuffer result;
-
-    result = new StringBuffer ();
-
-    // Find codetype.
-    String codetype;
-    if (attrMap == null)
-      {
-	codetype = null;
-      }
-    else if (attrMap.getNamedItem ("codetype") == null)
-      {
-	codetype = null;
-      }
-    else
-      {
-	codetype = attrMap.getNamedItem ("codetype").getNodeValue ();
-      }
-
-    // Check tag requirements.
-    if ((attrMap == null) ||
-	(codetype == null) ||
-	(!codetype.equals ("application/xid")) ||
-	(attrMap.getNamedItem ("data") == null))
-      {
-	// STU: do default action.
-	Presenter.processElementBasically (node, datas, tagsData, webappPath, errorOutput);
-      }
-    else
-      {
-	log.debug ("object action");
-	result.append ("<!-- STARTING INCLUDE XID FILE " + attrMap.getNamedItem ("data") + " -->");
-
-	// Build the file name.
-	String htmlFileName = webappPath + attrMap.getNamedItem ("data").getNodeValue ();
-	
-
-	// Load file in tree.
-	Document childDoc = null;
-	try
-	  {
-	    childDoc = fileToTree (htmlFileName, errorOutput);
-	  }
-	catch (Exception ex)
-	  {
-	    errorOutput.append ("unable to build the file tree");
-	    log.debug ("unable to build the file tree");
-	  }
-	
-	// Extract the 'body' section.
-	Node body = null;
-	try
-	  {
-	    NodeList nodes = childDoc.getElementsByTagName ("body");
-	    
-	    if (nodes.getLength () == 0)
-	      {
-		errorOutput.append ("no body tag in include html");
-		log.debug ("no body tag in include html");
-	      }
-	    else
-	      {		
-		  body = nodes.item(0);
-	      }
-	  }
-	catch (Exception e)
-	  {
-	    errorOutput.append ("error getting child");
-	    log.debug ("error getting child");
-	  }
-	
-	// Process the body child as part of the primary tree.
-	if (body == null)
-	  {
-	    errorOutput.append ("xid object body empty.");
-	  }
-	else
-	  {
-	    NodeList bodyChildren = body.getChildNodes ();
-	    
-	    if (bodyChildren != null)
-	      {
-		int childCount = bodyChildren.getLength ();
-		for (int childCounter = 0; childCounter < childCount; childCounter++)
-		  {
-		    result.append (process (bodyChildren.item (childCounter), datas, tagsData, webappPath, errorOutput));
-		  }
-	      }
-	  }
-
-	//
-	result.append ("<!-- ENDING INCLUDE XID FILE " + attrMap.getNamedItem ("data") + " -->");
-      }
-    log.debug ("end of object action");
-    //
-    return (result);
-  }
-
-  
-
-  /**
-   * Processes a node that has dynamic content. Calls the appropriate code
-   * generator method, depending on the tag.
-   * 
-   * @param node
-   *            Current node.
-   * @param attrs
-   *            The tag attributes.
-   * @param idAttr
-   *            The ID.
-   */
-  static protected StringBuffer processElementWithId (Node node,
-						      NamedNodeMap attrs,
-						      Node idAttr,
-						      IdsDataById datas,
-						      String webappPath,
-						      StringBuffer errorOutput)
-
-  {
-    StringBuffer result;
-
-    result = processElementWithId (node, attrs, idAttr, datas, null, "", webappPath, errorOutput);
-
-    //
-    return (result);
-  }
-
-
-  /**
-   * Processes a node that has dynamic content. Calls the appropriate code
-   * generator method, depending on the tag.
-   * 
-   * @param node
-   *            Current node.
-   * @param attrs
-   *            The tag attributes.
-   * @param idAttr
-   *            The ID.
-   */
-  static protected StringBuffer processElementWithId (Node node,
-						      NamedNodeMap attrs,
-						      Node idAttr,
-						      IdsDataById datas,
-						      TagsDataById tagsData,
-						      String webappPath,
-						      String suffix,
-						      StringBuffer errorOutput)
-  {
-    StringBuffer result;
-    result = new StringBuffer ();
-
-    String tag = node.getNodeName();
-
-    if (tag.equals ("object"))
-      {
-	result.append (processObjectTag (node, attrs, idAttr, datas, tagsData, webappPath, errorOutput));
-      }
-    else
-      {
-	String idValue = idAttr.getNodeValue();
-	
-	log.debug ("tag=" + tag);
-	
-	// Get data of this id.
-	IdDataCore dataCore = datas.get (idAttr.getNodeValue ());
-	
-	if (dataCore == null)
-	  {
-	    result.append (Presenter.processElementBasically (node, datas, tagsData, webappPath, suffix, errorOutput));
-	  }
-	else if (dataCore instanceof IdData)
-	  {
-	    IdData data = (IdData) dataCore;
-	    
-	    String theClass;
-	    if (data == null)
-	      {
-		theClass = null;
-	      }
-	    else
-	      {
-		theClass = data.getAttributes ().getAttribute ("class");
-	      }
-	    
-	    if ((theClass == null) ||
-		(!theClass.equals ("xid:nodisplay")))
-	      {
-		// Open the tag.
-		result.append ("<");
-		result.append (node.getNodeName());
-		
-		// Build attributes.
-		Attributes tagAttributes;
-		if (tagsData == null)
-		  {
-		    tagAttributes = null;
-		  }
-		else
-		  {
-		    TagData tagData = tagsData.getId (node.getNodeName ());
-		    if (tagData == null)
-		      {
-			tagAttributes = null;
-		      }
-		    else
-		      {
-			tagAttributes = tagData.getAttributes ();
-		      }
-		  }
-		
-		result.append (processAttributes (attrs, data.getAttributes (), tagAttributes, suffix));
-		
-		if ((node.getChildNodes () == null) &&
-		    ((data == null) || (data.display () == null)))
-		  {
-		    // Close the tag.
-		    result.append (" />");
-		  }
-		else
-		  {
-		    result.append ('>');
-		    
-		    // CHANGED, cpm:
-
-		    // Insert data.
-		    if ((data == null) ||
-		    	(data.display () == null))
-		      {
-			result.append (processChildren (node, datas, tagsData, webappPath, suffix, errorOutput));
-		      }
-		    else
-		      {
-			result.append (data.display ());
-		      }
-		    
-		    // Close the tag.
-		    result.append ("</");
-		    result.append (node.getNodeName());
-		    result.append ('>');
-		  }
-	      }
-	  }
-	else if (dataCore instanceof IdsDataByIndex)
-	  {
-	    IdsDataByIndex tags = (IdsDataByIndex) dataCore;
-	    
-	    int nbLines = tags.size ();
-	    for (int nLine = 0; nLine < nbLines; nLine++)
-	      {
-		if (tags.elementAt (nLine) instanceof IdData)
-		  {
-		    IdData data = (IdData) tags.elementAt (nLine);
-		    
-		    // Open the tag.
-		    result.append ("<");
-		    result.append (node.getNodeName());
-		    
-		    // Build attributes.
-		    Attributes tagAttributes;
-		    if (tagsData == null)
-		      {
-			tagAttributes = null;
-		      }
-		    else
-		      {
-			TagData tagData = tagsData.getId (node.getNodeName ());
-			if (tagData == null)
-			  {
-			    tagAttributes = null;
-			  }
-			else
-			  {
-			    tagAttributes = tagData.getAttributes ();
-			  }
-		      }
-		    
-		    result.append (processAttributes (attrs, data.getAttributes (), tagAttributes, Integer.toString (nLine)));
-		    
-		    if ((node.getChildNodes () == null) &&
-			((data == null) || (data.display () == null)))
-		      {
-			// Close the tag.
-			result.append (" />\n");
-		      }
-		    else
-		      {
-			result.append ('>');
-			
-
-			// CHANGED, cpm
-
-			// Insert data.
-			if ((data == null) || (data.display () == null))
-			  {
-			    result.append (processChildren (node, datas, tagsData, webappPath, suffix, errorOutput));
-			  }
-			else
-			  {
-			    result.append (data.display ());
-			  }
-			
-			// Close the tag.
-			result.append ("</");
-			result.append (node.getNodeName());
-			result.append (">\n");
-		      }
-		  }
-		else
-		  {
-		    // Manage a Hashmap.
-		    IdsDataById data = (IdsDataById) tags.elementAt (nLine);
-		    
-		    result.append (Presenter.processElementWithId (node, attrs, idAttr, data, tagsData, webappPath, Integer.toString (nLine), errorOutput));
-		    result.append ('\n');
-		  }
-	      }
-	  }
-	else
-	  {
-	    log.warn ("Unknow type of IdDataId");
-	  }
-      }
-
-    //
-    log.debug ("Exit");
-    return (result);
-  }
-
-
-
-  /**
-   * 
-   */
-  static protected StringBuffer process (Node node, IdsDataById datas,  TagsDataById tagsData, String webappPath, StringBuffer errorOutput)
-  {
-    StringBuffer result;
-
-    result = Presenter.process (node, datas, tagsData, webappPath, "", errorOutput);
-
-    //
-    return (result);
-  }
-
-
-  /**
-   * Recursive method that processes a node and any child nodes.
-   * 
-   */
-  static protected StringBuffer process (Node node, IdsDataById datas,  TagsDataById tagsData, String webappPath, String suffix, StringBuffer errorOutput)
-  {
-    log.debug ("Enter");
-    String TRANSITIONAL_DTD = "xhtml1-transitional.dtd";
-    String TRANSITIONAL_DOCTYPE = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 "
-      + "Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
-
-    StringBuffer result;
-    result = new StringBuffer ();
-
-    // Is there anything to do?
-    if (node != null)
-      {
-	log.debug ("nodeName=" + node.getNodeName ());
-	// Find the name attribute value.
-	String name;
-	name = getClassAttributeValue (node);
-
-	if ((name == null) ||
-	    ((name != null) &&
-	     (!name.equals ("xid:nodisplay"))))
-	  {
-	    int type = node.getNodeType();
-	    switch (type)
-	      {
-	      case Node.DOCUMENT_NODE:
-		{
-		  log.debug ("case Node.DOCUMENT_NODE");
-		  DocumentType dt = ((Document) node).getDoctype();
-
-		  if (dt != null)
-		    {
-		      String publicId = dt.getPublicId();
-		      String systemId = dt.getSystemId();
-		      
-		      if (systemId.equals(TRANSITIONAL_DTD))
-			{
-			  result.append(TRANSITIONAL_DOCTYPE);
-			}
-		      
-		      // Log.write(Log.TRACE,"publicId = " + publicId);
-		      // Log.write(Log.TRACE,"systemId = " + systemId);
-		    }
-
-		  result.append (Presenter.process (((Document) node).getDocumentElement(), datas, tagsData, webappPath, suffix, errorOutput));
-		      
-		  break;
-		}
-		
-	      case Node.ELEMENT_NODE:
-		{
-		  log.debug ("case Node.ELEMENT_NODE");
-		  
-		  NamedNodeMap attrs = node.getAttributes ();
-		  Node idAttr = attrs.getNamedItem ("id");
-
-		  if (idAttr != null)
-		    {
-		      result.append (Presenter.processElementWithId (node,
-								     attrs,
-								     idAttr,
-								     datas,
-								     tagsData,
-								     webappPath,
-								     suffix,
-								     errorOutput));
-		    }
-		  else
-		    {
-
-		      String tag = node.getNodeName();
-		      
-		      if (tag.equals ("object"))
-			{
-			  result.append (processObjectTag (node, attrs, idAttr, datas, tagsData, webappPath, errorOutput));
-			}
-		      else
-			{
-			  result.append (Presenter.processElementBasically (node, datas, tagsData, webappPath, suffix, errorOutput));
-			}
-		    }
-		  
-		  break;
-		}
-		
-		// handle entity reference nodes
-	      case Node.ENTITY_REFERENCE_NODE:
-		{
-		  log.debug ("case Node.ENTITY_REFERENCE_NODE");
-		  
-		  result.append ('&');
-		  result.append (node.getNodeName());
-		  result.append (';');
-		  break;
-		}
-		
-		// print cdata sections
-	      case Node.CDATA_SECTION_NODE:
-		{
-		  log.debug ("case Node.CDATA_SECTION_NODE");
-		  
-		  result.append ("<![CDATA[");
-		  result.append (node.getNodeValue());
-		  result.append ("]]>");
-	      
-		  break;
-		}
-	    
-		// print text
-	      case Node.TEXT_NODE:
-		{
-		  log.debug ("case Node.TEXTE_NODE");
-		  result.append (restoreEntities (new StringBuffer(node.getNodeValue())));
-		  break;
-		}
-
-		// print processing instruction
-	      case Node.PROCESSING_INSTRUCTION_NODE:
-		{
-		  log.debug ("Node.PROCESSING_INSTRUCTION_NODE");
-
-		  result.append ("<?");
-		  result.append (node.getNodeName());
-		  String data = node.getNodeValue();
-		  if ((data != null) && (data.length () > 0))
-		    {
-		      result.append (' ');
-		      result.append (data);
-		    }
-		  result.append ("?>");
-		  break;
-		}
-	      }
-	  }
-      }
-
-    //
-    //log.info ("result=" + result);
-    log.debug ("Exit");
-    return (result);
-  }
-  
-
-  /*
-   *
-   */
-  static StringBuffer processElementBasically (Node node, IdsDataById datas,  TagsDataById tagsData, String webappPath, StringBuffer errorOutput)
-  {
-    StringBuffer result;
-
-    result = processElementBasically (node, datas, tagsData, webappPath, "", errorOutput);
-
-    //
-    return (result);
-  }
-
-
-  /*
-   *
-   */
-  static StringBuffer processElementBasically (Node node, IdsDataById datas,  TagsDataById tagsData, String webappPath, String suffix, StringBuffer errorOutput)
-  {
-    StringBuffer result;
-    result = new StringBuffer ();
-
-    // Open the tag.
-    result.append ('<');
-    result.append (node.getNodeName());
-    
-    // Build the tag attributes.
-    Attributes tagAttributes;
-    if (tagsData == null)
-      {
-	tagAttributes = null;
-      }
-    else
-      {
-	TagData tagData = tagsData.getId (node.getNodeName ());
-	if (tagData == null)
-	  {
-	    tagAttributes = null;
-	  }
-	else
-	  {
-	    tagAttributes = tagData.getAttributes ();
-	  }
-      }
-    
-    result.append (processAttributes (node.getAttributes (),
-				      tagAttributes,
-				      null,
-				      suffix));
-
-    //
-    if (node.getChildNodes () == null)
-      {
-	result.append(" />");
-      }
-    else
-      {
-	result.append('>');
-	
-	result.append (processChildren (node, datas, tagsData, webappPath, suffix, errorOutput));
-	
-	result.append("</");
-	result.append(node.getNodeName());
-	result.append('>');
-      }
-   
-    
-    //
-    return (result);
-  }
-
-
-
-  /*
-   *
-   */
-  static protected Document buildTree (InputStream source, StringBuffer errorOutput)
-  {
-    Document result;
-    
-    try
-      {
-	// Create a DocumentBuilderFactory and configure it.
-	DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance ();
-	
-	// Set various configuration options.
-	dbf.setValidating (true);
-	dbf.setIgnoringComments (true);
-	dbf.setIgnoringElementContentWhitespace (false);
-	dbf.setCoalescing (false);
-	
-	// Keep entity references as they are.
-	dbf.setExpandEntityReferences(false);
-	
-	// Create a DocumentBuilder that satisfies the constraints
-	// specified by the DocumentBuilderFactory.
-	DocumentBuilder db = dbf.newDocumentBuilder ();
-	
-	ParserErrorHandler errorHandler;
-	errorHandler = new ParserErrorHandler();
-	
-	// Set the error handler.
-	db.setErrorHandler (errorHandler);
-	
-	Schema schema = db.getSchema ();
-	log.debug ("schema=" + schema);
-	
-	// Parse the input file.
-	result = db.parse (source);
-
-	if (errorHandler.hasError ())
-	  {
-	    errorOutput.append (errorHandler.toString ());
-	  }
-	else
-	  {
-	    DomPresenter.addMetaTag (result, "generator", "XID 0.0");
-	  }
-      }
-    catch (ParserConfigurationException exception)
-      {
-	String errorMessage = "Parser configuration exception: " + exception.getMessage ();
-	errorOutput.append (errorMessage);
-	log.error (errorMessage);
-	result = null;
-      }
-    catch (SAXException exception)
-      {
-	String errorMessage = "Error during SAX parsing: " + exception.getMessage ();
-	errorOutput.append (errorMessage);
-	log.error (errorMessage);
-	result = null;
-      }
-    catch (IOException exception)
-      {
-	String errorMessage = "IOError during parsing." + exception.getMessage ();
-	errorOutput.append (errorMessage);
-	log.error (errorMessage);
-	result = null;
-      }
-  
-    //
-    return (result);
-  }
-
-
-
-
-  /*
-   *
-   */
-  static protected void addMetaTag (Document doc, String name, String content)
-  {
-    // Find head tag.
-    
-    Node headNode = Presenter.findHeadNode (doc);
-    
-    Node metaNode = doc.createElement ("meta");
-    
-    NamedNodeMap attrMap = metaNode.getAttributes();
-    Node attrNode = doc.createAttribute("name");
-    attrMap.setNamedItem(attrNode);
-    attrNode.setNodeValue(name);
-    
-    attrNode = doc.createAttribute("content");
-    attrMap.setNamedItem(attrNode);
-    attrNode.setNodeValue(content);
-    headNode.insertBefore(metaNode, headNode.getFirstChild());
-  }
-
-
-  /**
-   * Finds the node containing the &lt;head&gt; tag.
-   * 
-   * @param node
-   *            Document node.
-   * @return The head tag node
-   */
-  static protected Node findHeadNode (Node node)
-  {
-    Node headNode = null;
-    
-    int type = node.getNodeType();
-    switch (type)
-      {
-	// print document
-      case Node.DOCUMENT_NODE:
-	{
-	  headNode = findHeadNode(((Document) node).getDocumentElement());
-	  break;
-	}
-	
-      case Node.ELEMENT_NODE:
-	{
-	  String tag = node.getNodeName();
-	  
-	  if ("head".equals(tag))
-	    {
-	      headNode = node;
-	      break;
-	    }
-	  
-	  NodeList children = node.getChildNodes();
-	  int numChildren = 0;
-	  
-	  if (children != null)
-	    numChildren = children.getLength();
-	  
-	  for (int i = 0; i < numChildren; i++)
-	    {
-	      headNode = findHeadNode(children.item(i));
-	      if (headNode != null)
-		break;
-	    }
-	  break;
-	}
-      }
-    return headNode;
-  }
-
-
-  /**
-   * Any ampersand lt;, ampersand gt; and ampersand amp; sequences in text
-   * nodes get read in as symbols. This method converts them back to entities.
-   * 
-   * @param s String that is to have the entities restored..
-   * @return The processed string.
-   */
-  static public String restoreEntities (StringBuffer s)
-  {
-    String result;
-
-    if (s == null)
-      {
-	result = null;
-      }
-    else
-      {
-	StringBuffer str = new StringBuffer();
-	
-	int len = (s != null) ? s.length() : 0;
-	for (int i = 0; i < len; i++)
-	  {
-	    char ch = s.charAt(i);
-	    switch (ch)
-	      {
-	      case '<':
-		{
-		  str.append("&lt;");
-		  break;
-		}
-		
-	      case '>':
-		{
-		  str.append("&gt;");
-		  break;
-		}
-		
-	      case '&':
-		{
-		  str.append("&amp;");
-		  break;
-		}
-		
-	      default:
-		{
-		  str.append(ch);
-		}
-	      }
-	  }
-	result = str.toString ();
-      }
-
-
-    //
-    return (result);
-  }
-
-
-  /**
-   * Get the text for an element. Converts new lines to spaces.
-   *
-   * @param node
-   */
-  static protected String getElementText (Node node)
-  {
-    String result;
-    result = ""; // Grrrr, Java ...
-
-    NodeList children = node.getChildNodes();
-    if (children == null)
-      {
-	result = "";
-      }
-    else
-      {
-	boolean ended = false;
-	int childCounter = 0;
-	int childCount = children.getLength ();
-	while (!ended)
-	  {
-	    if (childCounter >= childCount)
-	      {
-		ended = true;
-		result = "";
-	      }
-	    else
-	      {
-		Node child = children.item (childCounter);
-		if (child.getNodeType () == Node.TEXT_NODE)
-		  {
-		    result = newLinesToSpaces (child.getNodeValue ()); // STU (+=, newLines...)
-		    ended = true;
-		  }
-		else
-		  {
-		    childCounter += 1;
-		  }
-	      }
-	  }
-      }
-
-    //
-    return (result);
-  }
-
-
-  /**
-   * Converts New Line characters to spaces. This is used when for example
-   * the text in a div tag goes over serveral lines.
-   *
-   * @param text String
-   * @return String
-   */
-  static protected String newLinesToSpaces (String text)
-  {
-    StringBuffer result = new StringBuffer (text);
-    
-    for (int i = 0; i < result.length(); i++)
-      {
-	if (result.charAt (i) == '\n')
-	  {
-	    result.setCharAt (i,' ');
-	  }
-      }
-    
-    //
-    return (result.toString());
-  }
-
-
-  /*
-   *
-   */
-  static protected StringBuffer processAttributes (NamedNodeMap attrs, Attributes dataAttributes, Attributes namedDataAttributes, String suffix)
-  {
-    StringBuffer result;
-
-    result = processAttributes (attrs, mergeAttributes (dataAttributes, namedDataAttributes), suffix);
-
-    //
-    return (result);
-  }
-
-
-  /*
-   *
-   */
-  static protected StringBuffer processAttributes (NamedNodeMap attrs, Attributes dataAttributes)
-  {
-    StringBuffer result;
-
-    result = processAttributes (attrs, dataAttributes, "");
-
-    //
-    return (result);
-  }
-
-
-  /*
-   *
-   */
-  static protected StringBuffer processAttributes (NamedNodeMap attrs)
-  {
-    StringBuffer result;
-
-    result = processAttributes (attrs, null, null, "");
-
-    //
-    return (result);
-  }
-
-
-  /*
-   *
-   */
-  static protected StringBuffer processAttributes (NamedNodeMap attrs, Attributes dataAttributes, String suffix)
-  {
-    StringBuffer result;
-
-    result = new StringBuffer ();
-
-    // Build the original attributes list.
-    HashMap<String, String> mergedAttributes;
-    mergedAttributes = new HashMap<String, String> ();
-    for (int attributeCounter = 0; attributeCounter < attrs.getLength(); attributeCounter++)
-      {
-	Attr attr = (Attr) attrs.item (attributeCounter);
-	mergedAttributes.put (attr.getNodeName(), attr.getNodeValue ());
-      }
-
-
-    // Put model attributes in the merged attributes list.
-    if (dataAttributes != null)
-      {
-	Iterator iterator = dataAttributes.entrySet().iterator();
-	
-	while (iterator.hasNext())
-	  {
-	    Map.Entry<String, String> attribute = (Map.Entry<String, String>) iterator.next();
-	    
-	    if (mergedAttributes.containsKey (attribute.getKey ()))
-	      {
-		if (attribute.getKey ().equalsIgnoreCase ("style"))
-		  {
-		    mergedAttributes.put (attribute.getKey (), mergedAttributes.get (attribute.getKey ()) + attribute.getValue ());
-		  }
-		else
-		  {
-		    mergedAttributes.put (attribute.getKey (), attribute.getValue ());
-		  }
-	      }
-	    else
-	      {
-		    mergedAttributes.put (attribute.getKey (), attribute.getValue ());
-	      }
-	  }
-      }
-    
-    // Display the attributes
-    Iterator iterator = mergedAttributes.entrySet().iterator();
-    while (iterator.hasNext ())
-      {
-	Map.Entry<String, String> attribute = (Map.Entry<String, String>) iterator.next();
-
-	if ((attribute.getKey ().equals ("id")) && (suffix.length () != 0))
-	  {
-	    result.append(" " + attribute.getKey () + "=\"" + attribute.getValue () + Presenter.INDEX_SEPARATOR + suffix + "\"");
-	  }
-	else
-	  {
-	    result.append(" " + attribute.getKey () + "=\"" + attribute.getValue ()+ "\"");
-	  }
-      }    
-    
-    //
-    return (result);    
-  }
-
-
-  /*
-  *
-  */
-  static public String extractBodyContent (StringBuffer data)
-  {
-    String result = null;
-
-    // Extract the body content.
-    String dataLowerCase = data.toString ().toLowerCase ();
-
-    int startBody = dataLowerCase.indexOf ("<body>");
-    int endBody = dataLowerCase.indexOf ("</body>");
-
-    // Note: as failed search is improbable, no care about complexity
-    // in failed search case.
-    if ((startBody == -1) || (endBody == -1))
-      {
-	result = null;
-      }
-    else
-      {
-	result = data.substring (startBody + 6, endBody).trim ();
-      }
-
-    //
-    return (result);
-  }
-
-
-  /*
-   * Define in Presnter cause <object> needs this possibility.
-   */
-  static protected Document fileToTree (String fileName, StringBuffer errorOutput)
-  {
-    Document result;
-
-    try
-      {
-	result = buildTree (new FileInputStream (new File (fileName)), errorOutput);
-      }
-    catch (IOException exception)
-      {
-	String errorMessage = "IOError during parsing." + exception.getMessage ();
-	errorOutput.append (errorMessage);
-	log.error (errorMessage);
-	result = null;
-      }
-
-    //
-    return (result);
-  }
-}
diff --git a/src/xid/StringPresenter.java b/src/xid/StringPresenter.java
deleted file mode 100644
index c82fb4c..0000000
--- a/src/xid/StringPresenter.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package xid;
-
-import java.util.*;
-import java.io.*;
-import javax.xml.parsers.*;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.validation.Schema;
-import org.xml.sax.*;
-import org.w3c.dom.*;
-/**
- *
- */
-public class StringPresenter extends DomPresenter
-{
-  static protected org.apache.log4j.Logger log;
-  static
-  { 
-    log = org.apache.log4j.Logger.getLogger (StringPresenter.class);
-  }
-
-  protected String html;
-
-  /*
-   *
-   */
-  public StringPresenter ()
-  {
-    super ();
-    this.webappPath = Presenter.staticRootPath;
-    this.doc = null;
-    this.html = null;
-  }
-
-
-  /*
-   *
-   */
-  public StringPresenter (String html)
-  {
-    this.webappPath = Presenter.staticRootPath;
-    this.doc = null;
-    this.html = html;
-  }
-
-
-  /*
-   *
-   */
-  public StringPresenter (String webappPath, String html)
-  {
-    if ((webappPath == null) || (webappPath.equals ("")))
-      {
-	this.webappPath = Presenter.staticRootPath;
-      }
-    else
-      {
-	this.webappPath = webappPath;
-      }
-    this.doc = null;
-    this.html = html;
-  }
-
-
-  /*
-   *
-   */
-  public void setSource (String html)
-  {
-    this.html = html;
-    this.doc = null;
-  }
-
-
-  /*
-   *
-   */
-  public String getSource ()
-  {
-    String result;
-
-    result = this.html;
-
-    //
-    return (result);
-  }
-
-
-  /*
-   *
-   */
-  public StringBuffer doXid (Data datas, StringBuffer errorOutput)
-  {
-    return (doXid (datas.getIdsDataById (), datas.getTagsDataById (), errorOutput));
-  }
-
-  /*
-   *
-   */
-  public StringBuffer doXid (IdsDataById datas, TagsDataById tagsData, StringBuffer errorOutput)
-  {
-    StringBuffer result;
-
-    if (this.doc == null)
-      {
-	// Build doc from this.html.
-	String htmlSource;
-	if ((this.html.startsWith ("<!DOCTYPE")) ||
-	    (this.html.startsWith ("<!doctype")) ||
-	    (this.html.startsWith ("<html>")) ||
-	    (this.html.startsWith ("<HTML>")))
-	  {
-	    htmlSource = html;
-	  }
-	else
-	  {
-	    htmlSource = "<html><head></head><body>\n" + html + "</body></html>";
-	  }
-	
-	// StringBufferInputStream is deprecated so we use another solution.
-	// (see http://www.developpez.net/forums/archive/index.php/t-14101.html).
-	doc = buildTree (new ByteArrayInputStream (htmlSource.getBytes ()), errorOutput);
-      }
-
-    StringBuffer htmlTarget;
-    htmlTarget = Presenter.doXid (doc, datas, tagsData, this.webappPath, errorOutput);
-
-    if (htmlTarget == null)
-      {
-	result = null;
-      }
-    else if ((this.html.startsWith ("<!DOCTYPE")) ||
-	     (this.html.startsWith ("<!doctype")) ||
-	     (this.html.startsWith ("<html>")) ||
-	     (this.html.startsWith ("<HTML>")))
-      {
-	result = htmlTarget;
-      }
-    else
-      {
-	String bodyContent = extractBodyContent (htmlTarget);
-	
-	if (bodyContent == null)
-	  {
-	    result = null;
-	  }
-	else
-	  {
-	    result = new StringBuffer (bodyContent);
-	  }
-      }
-
-    //
-    return (result);
-  }
-
-
-  /*
-   *
-   */
-  static public StringBuffer doXid (String html, Data datas, StringBuffer errorOutput)
-  {
-    return (doXid (html, datas.getIdsDataById (), datas.getTagsDataById (), "", errorOutput));
-  }
-
-
-  /*
-   *
-   */
-  static public StringBuffer doXid (String html, Data datas, String webappPath, StringBuffer errorOutput)
-  {
-    return (doXid (html, datas.getIdsDataById (), datas.getTagsDataById (), webappPath, errorOutput));
-  }
-
-
-  /*
-   * Xid a string with html in.
-   */
-  static public StringBuffer doXid (String html, IdsDataById datas, String webappPath, StringBuffer errorOutput)
-  {
-    return (doXid (html, datas, null, webappPath, errorOutput));
-  }
-
-
-  /*
-   * Xid a string with html in.
-   */
-  static public StringBuffer doXid (String html, IdsDataById datas, TagsDataById tagsData, String webappPath, StringBuffer errorOutput)
-  {
-    StringBuffer result;
-
-    StringPresenter presenter = new StringPresenter (webappPath, html);
-
-    result = presenter.doXid (datas, tagsData, errorOutput);
-
-    //
-    return (result);
-  }
-}
diff --git a/src/xid/TagData.java b/src/xid/TagData.java
deleted file mode 100644
index 66b54f6..0000000
--- a/src/xid/TagData.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package xid;
-
-import java.util.*;
-import java.io.*;
-
-/**
- * IdData class is used to hold application data and
- * the business logic that operates on the data.
- *
- * The only requirement of a IdData class is that it must implement a
- * display method. The display method must return a text representation
- * of the data, suitable for display in a web page.
- *
- * XID provides a User Input IdData, Text IdData and ...
- * application may also implement it's own IdData classes.
- *
- */
-public class TagData extends IdData implements Serializable 
-{
-  /*
-   *
-   */
-  public TagData ()
-  {
-    super ();
-  }
-  
-  
-  /*
-   *
-   */
-  public TagData (String text)
-  {
-    super (text);
-  }
-}
diff --git a/src/xid/TagsDataById.java b/src/xid/TagsDataById.java
deleted file mode 100644
index 8b7d47b..0000000
--- a/src/xid/TagsDataById.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package xid;
-
-import java.util.*;
-import java.io.*;
-
-/*
- *
- */
-public class TagsDataById extends HashMap<String, TagData>
-{
-  /*
-   *
-   */
-  public TagsDataById ()
-  {
-    super ();
-  }
-
-  /*
-   *
-   */
-  public void setId (String id, TagData data)
-  {
-    this.put (id, data);
-  }
-  
-  /*
-   *
-   */
-  public TagData getId (String id)
-  {
-    TagData result;
-
-    result = this.get (id);
-    
-    //
-    return (result);
-  }
-
-}
diff --git a/src/xid/testXid.html b/src/xid/testXid.html
deleted file mode 100644
index 78a308e..0000000
--- a/src/xid/testXid.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE html SYSTEM "xhtml1-transitional.dtd">
-<html>
-  <head>
-    <title>test</title>
-  </head>
-  <body>
-    Test 01: No id attribute
-    XHTML:  Hello <b title="a">world</b>.
-    no Java code
-    Result: Hello <b title="a">world</b>.
-
-    Test 02: id attribute with empty model
-    XHTML: Hello <b id="test02-original" title="b">world</b>.
-    no Java code
-    Result: Hello <b id="test02" title="b">world</b>.
-
-
-    Test 03: model changing the text
-    XHTML: Hello <b id="test03-original" title="c">world</b>.
-    // Populate attributes of Test 03.
-    text = new TextModel ();
-    text.getAttributes ().appendAttribute ("style", "background: blue;");
-    text.getAttributes ().appendAttribute ("style", "foreground: red;");
-    text.getAttributes ().setAttribute ("class", "totoClass");
-    text.setText ("mummy");
-    datas.put ("test03", text);
-    Result: Hello <b id="test03" title="c">world</b>.
-
-
-    Test 04: model changing title
-    XHTML: Hello <b id="test04-original" title="d">world</b>.
-    // Populate attributes of Test 04.
-    text = new TextModel ();
-    text.getAttributes ().setAttribute ("title", "another title");
-    datas.put ("test04", text);
-    Result: Hello <b id="test04" title="d">world</b>.
-
-
-    Test 05: model adding style attributes
-    XHTML: Hello <b id="test05-original" title="d">world</b>.
-    // Populate attributes of Test 05.
-    text = new TextModel ();
-    text.getAttributes ().appendAttribute ("style", "background: blue;");
-    text.getAttributes ().appendAttribute ("style", "foreground: red;");
-    text.getAttributes ().setAttribute ("class", "aClass");
-    datas.put ("test05", text);
-    Result: Hello <b id="test05" title="d">world</b>.
-
-
-    Test 06: model appending style attributes
-    XHTML: Hello <b id="test06-original" title="d" style="background:yellow;">world</b>.
-    // Populate attributes of Test 06.
-    text = new TextModel ();
-    text.getAttributes ().appendAttribute ("style", "foreground: red;");
-    text.getAttributes ().setAttribute ("class", "aClass");
-    datas.put ("test06", text);
-    Result: Hello <b id="test06" title="d" style="background:yellow;">world</b>.
-
-
-    Test 07: image
-    XHTML: A picture <img id="test07-original" src="http://www.ocmland.org/tmp/floatingb.jpg" alt="pinguoin flottant" />.
-    // Populate attributes of Test 07.
-    text = new TextModel ();
-    text.getAttributes ().setAttribute ("width", "50%");
-    datas.put ("test07", text);
-    Result: A picture <img id="test07" src="http://www.ocmland.org/tmp/floatingb.jpg" alt="pinguoin flottant" />.
-
-
-    Test 08: xhtml source contains no display order in a tag.
-    XHTML: Hello <b class="xid:nodisplay_">you</b> there.
-    Result: Hello <b class="xid:nodisplay">you</b> there.
-
-
-    Test 09: dynamic addition of the nodisplay order.
-    XHTML: Hello <b id="test09-original">you</b> there.
-    Result: Hello <b id="test09">you</b> there.
-
-  </body>
-</html>
\ No newline at end of file
diff --git a/src/xid/testXid.t b/src/xid/testXid.t
deleted file mode 100644
index 9037424..0000000
--- a/src/xid/testXid.t
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE html SYSTEM "xhtml1-transitional.dtd">
-<html>
-  <head>
-    <title>test</title>
-  </head>
-  <body>
-    Test 01: No id attribute
-    XHTML:  Hello <b title="a">world</b>.
-    no Java code
-    Result: Hello <b title="a">world</b>.
-
-    Test 02: id attribute with empty model
-    XHTML: Hello <b id="test02-original" title="b">world</b>.
-    no Java code
-    Result: Hello <b id="test02" title="b">world</b>.
-
-
-    Test 03: model changing the text
-    XHTML: Hello <b id="test03-original" title="c">world</b>.
-    // Populate attributes of Test 03.
-    text = new TextModel ();
-    text.getAttributes ().appendAttribute ("style", "background: blue;");
-    text.getAttributes ().appendAttribute ("style", "foreground: red;");
-    text.getAttributes ().setAttribute ("class", "totoClass");
-    text.setText ("mummy");
-    datas.put ("test03", text);
-    Result: Hello <b id="test03" title="c">world</b>.
-
-
-    Test 04: model changing title
-    XHTML: Hello <b id="test04-original" title="d">world</b>.
-    // Populate attributes of Test 04.
-    text = new TextModel ();
-    text.getAttributes ().setAttribute ("title", "another title");
-    datas.put ("test04", text);
-    Result: Hello <b id="test04" title="d">world</b>.
-
-
-    Test 05: model adding style attributes
-    XHTML: Hello <b id="test05-original" title="d">world</b>.
-    // Populate attributes of Test 05.
-    text = new TextModel ();
-    text.getAttributes ().appendAttribute ("style", "background: blue;");
-    text.getAttributes ().appendAttribute ("style", "foreground: red;");
-    text.getAttributes ().setAttribute ("class", "aClass");
-    datas.put ("test05", text);
-    Result: Hello <b id="test05" title="d">world</b>.
-
-
-    Test 06: model appending style attributes
-    XHTML: Hello <b id="test06-original" title="d" style="background:yellow;">world</b>.
-    // Populate attributes of Test 06.
-    text = new TextModel ();
-    text.getAttributes ().appendAttribute ("style", "foreground: red;");
-    text.getAttributes ().setAttribute ("class", "aClass");
-    datas.put ("test06", text);
-    Result: Hello <b id="test06" title="d" style="background:yellow;">world</b>.
-
-
-    Test 07: image
-    XHTML: A picture <img id="test07-original" src="http://www.ocmland.org/tmp/floatingb.jpg" alt="pinguoin flottant" />.
-    // Populate attributes of Test 07.
-    text = new TextModel ();
-    text.getAttributes ().setAttribute ("width", "50%");
-    datas.put ("test07", text);
-    Result: A picture <img id="test07" src="http://www.ocmland.org/tmp/floatingb.jpg" alt="pinguoin flottant" />.
-
-  </body>
-</html>
\ No newline at end of file
diff --git a/src/xid/xhtml-lat1.ent b/src/xid/xhtml-lat1.ent
deleted file mode 100644
index ffee223..0000000
--- a/src/xid/xhtml-lat1.ent
+++ /dev/null
@@ -1,196 +0,0 @@
-<!-- Portions (C) International Organization for Standardization 1986
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-<!-- Character entity set. Typical invocation:
-    <!ENTITY % HTMLlat1 PUBLIC
-       "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent">
-    %HTMLlat1;
--->
-
-<!ENTITY nbsp   "&#160;"> <!-- no-break space = non-breaking space,
-                                  U+00A0 ISOnum -->
-<!ENTITY iexcl  "&#161;"> <!-- inverted exclamation mark, U+00A1 ISOnum -->
-<!ENTITY cent   "&#162;"> <!-- cent sign, U+00A2 ISOnum -->
-<!ENTITY pound  "&#163;"> <!-- pound sign, U+00A3 ISOnum -->
-<!ENTITY curren "&#164;"> <!-- currency sign, U+00A4 ISOnum -->
-<!ENTITY yen    "&#165;"> <!-- yen sign = yuan sign, U+00A5 ISOnum -->
-<!ENTITY brvbar "&#166;"> <!-- broken bar = broken vertical bar,
-                                  U+00A6 ISOnum -->
-<!ENTITY sect   "&#167;"> <!-- section sign, U+00A7 ISOnum -->
-<!ENTITY uml    "&#168;"> <!-- diaeresis = spacing diaeresis,
-                                  U+00A8 ISOdia -->
-<!ENTITY copy   "&#169;"> <!-- copyright sign, U+00A9 ISOnum -->
-<!ENTITY ordf   "&#170;"> <!-- feminine ordinal indicator, U+00AA ISOnum -->
-<!ENTITY laquo  "&#171;"> <!-- left-pointing double angle quotation mark
-                                  = left pointing guillemet, U+00AB ISOnum -->
-<!ENTITY not    "&#172;"> <!-- not sign = angled dash,
-                                  U+00AC ISOnum -->
-<!ENTITY shy    "&#173;"> <!-- soft hyphen = discretionary hyphen,
-                                  U+00AD ISOnum -->
-<!ENTITY reg    "&#174;"> <!-- registered sign = registered trade mark sign,
-                                  U+00AE ISOnum -->
-<!ENTITY macr   "&#175;"> <!-- macron = spacing macron = overline
-                                  = APL overbar, U+00AF ISOdia -->
-<!ENTITY deg    "&#176;"> <!-- degree sign, U+00B0 ISOnum -->
-<!ENTITY plusmn "&#177;"> <!-- plus-minus sign = plus-or-minus sign,
-                                  U+00B1 ISOnum -->
-<!ENTITY sup2   "&#178;"> <!-- superscript two = superscript digit two
-                                  = squared, U+00B2 ISOnum -->
-<!ENTITY sup3   "&#179;"> <!-- superscript three = superscript digit three
-                                  = cubed, U+00B3 ISOnum -->
-<!ENTITY acute  "&#180;"> <!-- acute accent = spacing acute,
-                                  U+00B4 ISOdia -->
-<!ENTITY micro  "&#181;"> <!-- micro sign, U+00B5 ISOnum -->
-<!ENTITY para   "&#182;"> <!-- pilcrow sign = paragraph sign,
-                                  U+00B6 ISOnum -->
-<!ENTITY middot "&#183;"> <!-- middle dot = Georgian comma
-                                  = Greek middle dot, U+00B7 ISOnum -->
-<!ENTITY cedil  "&#184;"> <!-- cedilla = spacing cedilla, U+00B8 ISOdia -->
-<!ENTITY sup1   "&#185;"> <!-- superscript one = superscript digit one,
-                                  U+00B9 ISOnum -->
-<!ENTITY ordm   "&#186;"> <!-- masculine ordinal indicator,
-                                  U+00BA ISOnum -->
-<!ENTITY raquo  "&#187;"> <!-- right-pointing double angle quotation mark
-                                  = right pointing guillemet, U+00BB ISOnum -->
-<!ENTITY frac14 "&#188;"> <!-- vulgar fraction one quarter
-                                  = fraction one quarter, U+00BC ISOnum -->
-<!ENTITY frac12 "&#189;"> <!-- vulgar fraction one half
-                                  = fraction one half, U+00BD ISOnum -->
-<!ENTITY frac34 "&#190;"> <!-- vulgar fraction three quarters
-                                  = fraction three quarters, U+00BE ISOnum -->
-<!ENTITY iquest "&#191;"> <!-- inverted question mark
-                                  = turned question mark, U+00BF ISOnum -->
-<!ENTITY Agrave "&#192;"> <!-- latin capital letter A with grave
-                                  = latin capital letter A grave,
-                                  U+00C0 ISOlat1 -->
-<!ENTITY Aacute "&#193;"> <!-- latin capital letter A with acute,
-                                  U+00C1 ISOlat1 -->
-<!ENTITY Acirc  "&#194;"> <!-- latin capital letter A with circumflex,
-                                  U+00C2 ISOlat1 -->
-<!ENTITY Atilde "&#195;"> <!-- latin capital letter A with tilde,
-                                  U+00C3 ISOlat1 -->
-<!ENTITY Auml   "&#196;"> <!-- latin capital letter A with diaeresis,
-                                  U+00C4 ISOlat1 -->
-<!ENTITY Aring  "&#197;"> <!-- latin capital letter A with ring above
-                                  = latin capital letter A ring,
-                                  U+00C5 ISOlat1 -->
-<!ENTITY AElig  "&#198;"> <!-- latin capital letter AE
-                                  = latin capital ligature AE,
-                                  U+00C6 ISOlat1 -->
-<!ENTITY Ccedil "&#199;"> <!-- latin capital letter C with cedilla,
-                                  U+00C7 ISOlat1 -->
-<!ENTITY Egrave "&#200;"> <!-- latin capital letter E with grave,
-                                  U+00C8 ISOlat1 -->
-<!ENTITY Eacute "&#201;"> <!-- latin capital letter E with acute,
-                                  U+00C9 ISOlat1 -->
-<!ENTITY Ecirc  "&#202;"> <!-- latin capital letter E with circumflex,
-                                  U+00CA ISOlat1 -->
-<!ENTITY Euml   "&#203;"> <!-- latin capital letter E with diaeresis,
-                                  U+00CB ISOlat1 -->
-<!ENTITY Igrave "&#204;"> <!-- latin capital letter I with grave,
-                                  U+00CC ISOlat1 -->
-<!ENTITY Iacute "&#205;"> <!-- latin capital letter I with acute,
-                                  U+00CD ISOlat1 -->
-<!ENTITY Icirc  "&#206;"> <!-- latin capital letter I with circumflex,
-                                  U+00CE ISOlat1 -->
-<!ENTITY Iuml   "&#207;"> <!-- latin capital letter I with diaeresis,
-                                  U+00CF ISOlat1 -->
-<!ENTITY ETH    "&#208;"> <!-- latin capital letter ETH, U+00D0 ISOlat1 -->
-<!ENTITY Ntilde "&#209;"> <!-- latin capital letter N with tilde,
-                                  U+00D1 ISOlat1 -->
-<!ENTITY Ograve "&#210;"> <!-- latin capital letter O with grave,
-                                  U+00D2 ISOlat1 -->
-<!ENTITY Oacute "&#211;"> <!-- latin capital letter O with acute,
-                                  U+00D3 ISOlat1 -->
-<!ENTITY Ocirc  "&#212;"> <!-- latin capital letter O with circumflex,
-                                  U+00D4 ISOlat1 -->
-<!ENTITY Otilde "&#213;"> <!-- latin capital letter O with tilde,
-                                  U+00D5 ISOlat1 -->
-<!ENTITY Ouml   "&#214;"> <!-- latin capital letter O with diaeresis,
-                                  U+00D6 ISOlat1 -->
-<!ENTITY times  "&#215;"> <!-- multiplication sign, U+00D7 ISOnum -->
-<!ENTITY Oslash "&#216;"> <!-- latin capital letter O with stroke
-                                  = latin capital letter O slash,
-                                  U+00D8 ISOlat1 -->
-<!ENTITY Ugrave "&#217;"> <!-- latin capital letter U with grave,
-                                  U+00D9 ISOlat1 -->
-<!ENTITY Uacute "&#218;"> <!-- latin capital letter U with acute,
-                                  U+00DA ISOlat1 -->
-<!ENTITY Ucirc  "&#219;"> <!-- latin capital letter U with circumflex,
-                                  U+00DB ISOlat1 -->
-<!ENTITY Uuml   "&#220;"> <!-- latin capital letter U with diaeresis,
-                                  U+00DC ISOlat1 -->
-<!ENTITY Yacute "&#221;"> <!-- latin capital letter Y with acute,
-                                  U+00DD ISOlat1 -->
-<!ENTITY THORN  "&#222;"> <!-- latin capital letter THORN,
-                                  U+00DE ISOlat1 -->
-<!ENTITY szlig  "&#223;"> <!-- latin small letter sharp s = ess-zed,
-                                  U+00DF ISOlat1 -->
-<!ENTITY agrave "&#224;"> <!-- latin small letter a with grave
-                                  = latin small letter a grave,
-                                  U+00E0 ISOlat1 -->
-<!ENTITY aacute "&#225;"> <!-- latin small letter a with acute,
-                                  U+00E1 ISOlat1 -->
-<!ENTITY acirc  "&#226;"> <!-- latin small letter a with circumflex,
-                                  U+00E2 ISOlat1 -->
-<!ENTITY atilde "&#227;"> <!-- latin small letter a with tilde,
-                                  U+00E3 ISOlat1 -->
-<!ENTITY auml   "&#228;"> <!-- latin small letter a with diaeresis,
-                                  U+00E4 ISOlat1 -->
-<!ENTITY aring  "&#229;"> <!-- latin small letter a with ring above
-                                  = latin small letter a ring,
-                                  U+00E5 ISOlat1 -->
-<!ENTITY aelig  "&#230;"> <!-- latin small letter ae
-                                  = latin small ligature ae, U+00E6 ISOlat1 -->
-<!ENTITY ccedil "&#231;"> <!-- latin small letter c with cedilla,
-                                  U+00E7 ISOlat1 -->
-<!ENTITY egrave "&#232;"> <!-- latin small letter e with grave,
-                                  U+00E8 ISOlat1 -->
-<!ENTITY eacute "&#233;"> <!-- latin small letter e with acute,
-                                  U+00E9 ISOlat1 -->
-<!ENTITY ecirc  "&#234;"> <!-- latin small letter e with circumflex,
-                                  U+00EA ISOlat1 -->
-<!ENTITY euml   "&#235;"> <!-- latin small letter e with diaeresis,
-                                  U+00EB ISOlat1 -->
-<!ENTITY igrave "&#236;"> <!-- latin small letter i with grave,
-                                  U+00EC ISOlat1 -->
-<!ENTITY iacute "&#237;"> <!-- latin small letter i with acute,
-                                  U+00ED ISOlat1 -->
-<!ENTITY icirc  "&#238;"> <!-- latin small letter i with circumflex,
-                                  U+00EE ISOlat1 -->
-<!ENTITY iuml   "&#239;"> <!-- latin small letter i with diaeresis,
-                                  U+00EF ISOlat1 -->
-<!ENTITY eth    "&#240;"> <!-- latin small letter eth, U+00F0 ISOlat1 -->
-<!ENTITY ntilde "&#241;"> <!-- latin small letter n with tilde,
-                                  U+00F1 ISOlat1 -->
-<!ENTITY ograve "&#242;"> <!-- latin small letter o with grave,
-                                  U+00F2 ISOlat1 -->
-<!ENTITY oacute "&#243;"> <!-- latin small letter o with acute,
-                                  U+00F3 ISOlat1 -->
-<!ENTITY ocirc  "&#244;"> <!-- latin small letter o with circumflex,
-                                  U+00F4 ISOlat1 -->
-<!ENTITY otilde "&#245;"> <!-- latin small letter o with tilde,
-                                  U+00F5 ISOlat1 -->
-<!ENTITY ouml   "&#246;"> <!-- latin small letter o with diaeresis,
-                                  U+00F6 ISOlat1 -->
-<!ENTITY divide "&#247;"> <!-- division sign, U+00F7 ISOnum -->
-<!ENTITY oslash "&#248;"> <!-- latin small letter o with stroke,
-                                  = latin small letter o slash,
-                                  U+00F8 ISOlat1 -->
-<!ENTITY ugrave "&#249;"> <!-- latin small letter u with grave,
-                                  U+00F9 ISOlat1 -->
-<!ENTITY uacute "&#250;"> <!-- latin small letter u with acute,
-                                  U+00FA ISOlat1 -->
-<!ENTITY ucirc  "&#251;"> <!-- latin small letter u with circumflex,
-                                  U+00FB ISOlat1 -->
-<!ENTITY uuml   "&#252;"> <!-- latin small letter u with diaeresis,
-                                  U+00FC ISOlat1 -->
-<!ENTITY yacute "&#253;"> <!-- latin small letter y with acute,
-                                  U+00FD ISOlat1 -->
-<!ENTITY thorn  "&#254;"> <!-- latin small letter thorn,
-                                  U+00FE ISOlat1 -->
-<!ENTITY yuml   "&#255;"> <!-- latin small letter y with diaeresis,
-                                  U+00FF ISOlat1 -->
diff --git a/src/xid/xhtml-special.ent b/src/xid/xhtml-special.ent
deleted file mode 100644
index cead4e8..0000000
--- a/src/xid/xhtml-special.ent
+++ /dev/null
@@ -1,82 +0,0 @@
-<!-- Special characters for XHTML -->
-
-<!-- Character entity set. Typical invocation:
-     <!ENTITY % HTMLspecial PUBLIC
-        "-//W3C//ENTITIES Special for XHTML//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent">
-     %HTMLspecial;
--->
-
-<!-- Portions (C) International Organization for Standardization 1986:
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-
-<!-- Relevant ISO entity set is given unless names are newly introduced.
-     New names (i.e., not in ISO 8879 list) do not clash with any
-     existing ISO 8879 entity names. ISO 10646 character numbers
-     are given for each character, in hex. values are decimal
-     conversions of the ISO 10646 values and refer to the document
-     character set. Names are Unicode names. 
--->
-
-<!-- C0 Controls and Basic Latin -->
-
-<!-- CB 10/03/2003 Commented out as these are already defined in XML -->
-<!-- ENTITY quot    "&#34;">   quotation mark, U+0022 ISOnum -->
-<!-- ENTITY amp     "&#38;#38;">   ampersand, U+0026 ISOnum -->
-<!-- ENTITY lt      "&#38;#60;">   less-than sign, U+003C ISOnum -->
-<!-- ENTITY gt      "&#62;">   greater-than sign, U+003E ISOnum -->
-<!-- ENTITY apos	 "&#39;">   apostrophe = APL quote, U+0027 ISOnum -->
-
-<!-- Latin Extended-A -->
-<!ENTITY OElig   "&#338;"> <!--  latin capital ligature OE,
-                                    U+0152 ISOlat2 -->
-<!ENTITY oelig   "&#339;"> <!--  latin small ligature oe, U+0153 ISOlat2 -->
-<!-- ligature is a misnomer, this is a separate character in some languages -->
-<!ENTITY Scaron  "&#352;"> <!--  latin capital letter S with caron,
-                                    U+0160 ISOlat2 -->
-<!ENTITY scaron  "&#353;"> <!--  latin small letter s with caron,
-                                    U+0161 ISOlat2 -->
-<!ENTITY Yuml    "&#376;"> <!--  latin capital letter Y with diaeresis,
-                                    U+0178 ISOlat2 -->
-
-<!-- Spacing Modifier Letters -->
-<!ENTITY circ    "&#710;"> <!--  modifier letter circumflex accent,
-                                    U+02C6 ISOpub -->
-<!ENTITY tilde   "&#732;"> <!--  small tilde, U+02DC ISOdia -->
-
-<!-- General Punctuation -->
-<!ENTITY ensp    "&#8194;"> <!-- en space, U+2002 ISOpub -->
-<!ENTITY emsp    "&#8195;"> <!-- em space, U+2003 ISOpub -->
-<!ENTITY thinsp  "&#8201;"> <!-- thin space, U+2009 ISOpub -->
-<!ENTITY zwnj    "&#8204;"> <!-- zero width non-joiner,
-                                    U+200C NEW RFC 2070 -->
-<!ENTITY zwj     "&#8205;"> <!-- zero width joiner, U+200D NEW RFC 2070 -->
-<!ENTITY lrm     "&#8206;"> <!-- left-to-right mark, U+200E NEW RFC 2070 -->
-<!ENTITY rlm     "&#8207;"> <!-- right-to-left mark, U+200F NEW RFC 2070 -->
-<!ENTITY ndash   "&#8211;"> <!-- en dash, U+2013 ISOpub -->
-<!ENTITY mdash   "&#8212;"> <!-- em dash, U+2014 ISOpub -->
-<!ENTITY lsquo   "&#8216;"> <!-- left single quotation mark,
-                                    U+2018 ISOnum -->
-<!ENTITY rsquo   "&#8217;"> <!-- right single quotation mark,
-                                    U+2019 ISOnum -->
-<!ENTITY sbquo   "&#8218;"> <!-- single low-9 quotation mark, U+201A NEW -->
-<!ENTITY ldquo   "&#8220;"> <!-- left double quotation mark,
-                                    U+201C ISOnum -->
-<!ENTITY rdquo   "&#8221;"> <!-- right double quotation mark,
-                                    U+201D ISOnum -->
-<!ENTITY bdquo   "&#8222;"> <!-- double low-9 quotation mark, U+201E NEW -->
-<!ENTITY dagger  "&#8224;"> <!-- dagger, U+2020 ISOpub -->
-<!ENTITY Dagger  "&#8225;"> <!-- double dagger, U+2021 ISOpub -->
-<!ENTITY permil  "&#8240;"> <!-- per mille sign, U+2030 ISOtech -->
-<!ENTITY lsaquo  "&#8249;"> <!-- single left-pointing angle quotation mark,
-                                    U+2039 ISO proposed -->
-<!-- lsaquo is proposed but not yet ISO standardized -->
-<!ENTITY rsaquo  "&#8250;"> <!-- single right-pointing angle quotation mark,
-                                    U+203A ISO proposed -->
-<!-- rsaquo is proposed but not yet ISO standardized -->
-
-<!-- Currency Symbols -->
-<!ENTITY euro   "&#8364;"> <!--  euro sign, U+20AC NEW -->
diff --git a/src/xid/xhtml-symbol.ent b/src/xid/xhtml-symbol.ent
deleted file mode 100644
index 63c2abf..0000000
--- a/src/xid/xhtml-symbol.ent
+++ /dev/null
@@ -1,237 +0,0 @@
-<!-- Mathematical, Greek and Symbolic characters for XHTML -->
-
-<!-- Character entity set. Typical invocation:
-     <!ENTITY % HTMLsymbol PUBLIC
-        "-//W3C//ENTITIES Symbols for XHTML//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent">
-     %HTMLsymbol;
--->
-
-<!-- Portions (C) International Organization for Standardization 1986:
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-
-<!-- Relevant ISO entity set is given unless names are newly introduced.
-     New names (i.e., not in ISO 8879 list) do not clash with any
-     existing ISO 8879 entity names. ISO 10646 character numbers
-     are given for each character, in hex. values are decimal
-     conversions of the ISO 10646 values and refer to the document
-     character set. Names are Unicode names. 
--->
-
-<!-- Latin Extended-B -->
-<!ENTITY fnof     "&#402;"> <!-- latin small letter f with hook = function
-                                    = florin, U+0192 ISOtech -->
-
-<!-- Greek -->
-<!ENTITY Alpha    "&#913;"> <!-- greek capital letter alpha, U+0391 -->
-<!ENTITY Beta     "&#914;"> <!-- greek capital letter beta, U+0392 -->
-<!ENTITY Gamma    "&#915;"> <!-- greek capital letter gamma,
-                                    U+0393 ISOgrk3 -->
-<!ENTITY Delta    "&#916;"> <!-- greek capital letter delta,
-                                    U+0394 ISOgrk3 -->
-<!ENTITY Epsilon  "&#917;"> <!-- greek capital letter epsilon, U+0395 -->
-<!ENTITY Zeta     "&#918;"> <!-- greek capital letter zeta, U+0396 -->
-<!ENTITY Eta      "&#919;"> <!-- greek capital letter eta, U+0397 -->
-<!ENTITY Theta    "&#920;"> <!-- greek capital letter theta,
-                                    U+0398 ISOgrk3 -->
-<!ENTITY Iota     "&#921;"> <!-- greek capital letter iota, U+0399 -->
-<!ENTITY Kappa    "&#922;"> <!-- greek capital letter kappa, U+039A -->
-<!ENTITY Lambda   "&#923;"> <!-- greek capital letter lamda,
-                                    U+039B ISOgrk3 -->
-<!ENTITY Mu       "&#924;"> <!-- greek capital letter mu, U+039C -->
-<!ENTITY Nu       "&#925;"> <!-- greek capital letter nu, U+039D -->
-<!ENTITY Xi       "&#926;"> <!-- greek capital letter xi, U+039E ISOgrk3 -->
-<!ENTITY Omicron  "&#927;"> <!-- greek capital letter omicron, U+039F -->
-<!ENTITY Pi       "&#928;"> <!-- greek capital letter pi, U+03A0 ISOgrk3 -->
-<!ENTITY Rho      "&#929;"> <!-- greek capital letter rho, U+03A1 -->
-<!-- there is no Sigmaf, and no U+03A2 character either -->
-<!ENTITY Sigma    "&#931;"> <!-- greek capital letter sigma,
-                                    U+03A3 ISOgrk3 -->
-<!ENTITY Tau      "&#932;"> <!-- greek capital letter tau, U+03A4 -->
-<!ENTITY Upsilon  "&#933;"> <!-- greek capital letter upsilon,
-                                    U+03A5 ISOgrk3 -->
-<!ENTITY Phi      "&#934;"> <!-- greek capital letter phi,
-                                    U+03A6 ISOgrk3 -->
-<!ENTITY Chi      "&#935;"> <!-- greek capital letter chi, U+03A7 -->
-<!ENTITY Psi      "&#936;"> <!-- greek capital letter psi,
-                                    U+03A8 ISOgrk3 -->
-<!ENTITY Omega    "&#937;"> <!-- greek capital letter omega,
-                                    U+03A9 ISOgrk3 -->
-
-<!ENTITY alpha    "&#945;"> <!-- greek small letter alpha,
-                                    U+03B1 ISOgrk3 -->
-<!ENTITY beta     "&#946;"> <!-- greek small letter beta, U+03B2 ISOgrk3 -->
-<!ENTITY gamma    "&#947;"> <!-- greek small letter gamma,
-                                    U+03B3 ISOgrk3 -->
-<!ENTITY delta    "&#948;"> <!-- greek small letter delta,
-                                    U+03B4 ISOgrk3 -->
-<!ENTITY epsilon  "&#949;"> <!-- greek small letter epsilon,
-                                    U+03B5 ISOgrk3 -->
-<!ENTITY zeta     "&#950;"> <!-- greek small letter zeta, U+03B6 ISOgrk3 -->
-<!ENTITY eta      "&#951;"> <!-- greek small letter eta, U+03B7 ISOgrk3 -->
-<!ENTITY theta    "&#952;"> <!-- greek small letter theta,
-                                    U+03B8 ISOgrk3 -->
-<!ENTITY iota     "&#953;"> <!-- greek small letter iota, U+03B9 ISOgrk3 -->
-<!ENTITY kappa    "&#954;"> <!-- greek small letter kappa,
-                                    U+03BA ISOgrk3 -->
-<!ENTITY lambda   "&#955;"> <!-- greek small letter lamda,
-                                    U+03BB ISOgrk3 -->
-<!ENTITY mu       "&#956;"> <!-- greek small letter mu, U+03BC ISOgrk3 -->
-<!ENTITY nu       "&#957;"> <!-- greek small letter nu, U+03BD ISOgrk3 -->
-<!ENTITY xi       "&#958;"> <!-- greek small letter xi, U+03BE ISOgrk3 -->
-<!ENTITY omicron  "&#959;"> <!-- greek small letter omicron, U+03BF NEW -->
-<!ENTITY pi       "&#960;"> <!-- greek small letter pi, U+03C0 ISOgrk3 -->
-<!ENTITY rho      "&#961;"> <!-- greek small letter rho, U+03C1 ISOgrk3 -->
-<!ENTITY sigmaf   "&#962;"> <!-- greek small letter final sigma,
-                                    U+03C2 ISOgrk3 -->
-<!ENTITY sigma    "&#963;"> <!-- greek small letter sigma,
-                                    U+03C3 ISOgrk3 -->
-<!ENTITY tau      "&#964;"> <!-- greek small letter tau, U+03C4 ISOgrk3 -->
-<!ENTITY upsilon  "&#965;"> <!-- greek small letter upsilon,
-                                    U+03C5 ISOgrk3 -->
-<!ENTITY phi      "&#966;"> <!-- greek small letter phi, U+03C6 ISOgrk3 -->
-<!ENTITY chi      "&#967;"> <!-- greek small letter chi, U+03C7 ISOgrk3 -->
-<!ENTITY psi      "&#968;"> <!-- greek small letter psi, U+03C8 ISOgrk3 -->
-<!ENTITY omega    "&#969;"> <!-- greek small letter omega,
-                                    U+03C9 ISOgrk3 -->
-<!ENTITY thetasym "&#977;"> <!-- greek theta symbol,
-                                    U+03D1 NEW -->
-<!ENTITY upsih    "&#978;"> <!-- greek upsilon with hook symbol,
-                                    U+03D2 NEW -->
-<!ENTITY piv      "&#982;"> <!-- greek pi symbol, U+03D6 ISOgrk3 -->
-
-<!-- General Punctuation -->
-<!ENTITY bull     "&#8226;"> <!-- bullet = black small circle,
-                                     U+2022 ISOpub  -->
-<!-- bullet is NOT the same as bullet operator, U+2219 -->
-<!ENTITY hellip   "&#8230;"> <!-- horizontal ellipsis = three dot leader,
-                                     U+2026 ISOpub  -->
-<!ENTITY prime    "&#8242;"> <!-- prime = minutes = feet, U+2032 ISOtech -->
-<!ENTITY Prime    "&#8243;"> <!-- double prime = seconds = inches,
-                                     U+2033 ISOtech -->
-<!ENTITY oline    "&#8254;"> <!-- overline = spacing overscore,
-                                     U+203E NEW -->
-<!ENTITY frasl    "&#8260;"> <!-- fraction slash, U+2044 NEW -->
-
-<!-- Letterlike Symbols -->
-<!ENTITY weierp   "&#8472;"> <!-- script capital P = power set
-                                     = Weierstrass p, U+2118 ISOamso -->
-<!ENTITY image    "&#8465;"> <!-- black-letter capital I = imaginary part,
-                                     U+2111 ISOamso -->
-<!ENTITY real     "&#8476;"> <!-- black-letter capital R = real part symbol,
-                                     U+211C ISOamso -->
-<!ENTITY trade    "&#8482;"> <!-- trade mark sign, U+2122 ISOnum -->
-<!ENTITY alefsym  "&#8501;"> <!-- alef symbol = first transfinite cardinal,
-                                     U+2135 NEW -->
-<!-- alef symbol is NOT the same as hebrew letter alef,
-     U+05D0 although the same glyph could be used to depict both characters -->
-
-<!-- Arrows -->
-<!ENTITY larr     "&#8592;"> <!-- leftwards arrow, U+2190 ISOnum -->
-<!ENTITY uarr     "&#8593;"> <!-- upwards arrow, U+2191 ISOnum-->
-<!ENTITY rarr     "&#8594;"> <!-- rightwards arrow, U+2192 ISOnum -->
-<!ENTITY darr     "&#8595;"> <!-- downwards arrow, U+2193 ISOnum -->
-<!ENTITY harr     "&#8596;"> <!-- left right arrow, U+2194 ISOamsa -->
-<!ENTITY crarr    "&#8629;"> <!-- downwards arrow with corner leftwards
-                                     = carriage return, U+21B5 NEW -->
-<!ENTITY lArr     "&#8656;"> <!-- leftwards double arrow, U+21D0 ISOtech -->
-<!-- Unicode does not say that lArr is the same as the 'is implied by' arrow
-    but also does not have any other character for that function. So lArr can
-    be used for 'is implied by' as ISOtech suggests -->
-<!ENTITY uArr     "&#8657;"> <!-- upwards double arrow, U+21D1 ISOamsa -->
-<!ENTITY rArr     "&#8658;"> <!-- rightwards double arrow,
-                                     U+21D2 ISOtech -->
-<!-- Unicode does not say this is the 'implies' character but does not have 
-     another character with this function so rArr can be used for 'implies'
-     as ISOtech suggests -->
-<!ENTITY dArr     "&#8659;"> <!-- downwards double arrow, U+21D3 ISOamsa -->
-<!ENTITY hArr     "&#8660;"> <!-- left right double arrow,
-                                     U+21D4 ISOamsa -->
-
-<!-- Mathematical Operators -->
-<!ENTITY forall   "&#8704;"> <!-- for all, U+2200 ISOtech -->
-<!ENTITY part     "&#8706;"> <!-- partial differential, U+2202 ISOtech  -->
-<!ENTITY exist    "&#8707;"> <!-- there exists, U+2203 ISOtech -->
-<!ENTITY empty    "&#8709;"> <!-- empty set = null set, U+2205 ISOamso -->
-<!ENTITY nabla    "&#8711;"> <!-- nabla = backward difference,
-                                     U+2207 ISOtech -->
-<!ENTITY isin     "&#8712;"> <!-- element of, U+2208 ISOtech -->
-<!ENTITY notin    "&#8713;"> <!-- not an element of, U+2209 ISOtech -->
-<!ENTITY ni       "&#8715;"> <!-- contains as member, U+220B ISOtech -->
-<!ENTITY prod     "&#8719;"> <!-- n-ary product = product sign,
-                                     U+220F ISOamsb -->
-<!-- prod is NOT the same character as U+03A0 'greek capital letter pi' though
-     the same glyph might be used for both -->
-<!ENTITY sum      "&#8721;"> <!-- n-ary summation, U+2211 ISOamsb -->
-<!-- sum is NOT the same character as U+03A3 'greek capital letter sigma'
-     though the same glyph might be used for both -->
-<!ENTITY minus    "&#8722;"> <!-- minus sign, U+2212 ISOtech -->
-<!ENTITY lowast   "&#8727;"> <!-- asterisk operator, U+2217 ISOtech -->
-<!ENTITY radic    "&#8730;"> <!-- square root = radical sign,
-                                     U+221A ISOtech -->
-<!ENTITY prop     "&#8733;"> <!-- proportional to, U+221D ISOtech -->
-<!ENTITY infin    "&#8734;"> <!-- infinity, U+221E ISOtech -->
-<!ENTITY ang      "&#8736;"> <!-- angle, U+2220 ISOamso -->
-<!ENTITY and      "&#8743;"> <!-- logical and = wedge, U+2227 ISOtech -->
-<!ENTITY or       "&#8744;"> <!-- logical or = vee, U+2228 ISOtech -->
-<!ENTITY cap      "&#8745;"> <!-- intersection = cap, U+2229 ISOtech -->
-<!ENTITY cup      "&#8746;"> <!-- union = cup, U+222A ISOtech -->
-<!ENTITY int      "&#8747;"> <!-- integral, U+222B ISOtech -->
-<!ENTITY there4   "&#8756;"> <!-- therefore, U+2234 ISOtech -->
-<!ENTITY sim      "&#8764;"> <!-- tilde operator = varies with = similar to,
-                                     U+223C ISOtech -->
-<!-- tilde operator is NOT the same character as the tilde, U+007E,
-     although the same glyph might be used to represent both  -->
-<!ENTITY cong     "&#8773;"> <!-- approximately equal to, U+2245 ISOtech -->
-<!ENTITY asymp    "&#8776;"> <!-- almost equal to = asymptotic to,
-                                     U+2248 ISOamsr -->
-<!ENTITY ne       "&#8800;"> <!-- not equal to, U+2260 ISOtech -->
-<!ENTITY equiv    "&#8801;"> <!-- identical to, U+2261 ISOtech -->
-<!ENTITY le       "&#8804;"> <!-- less-than or equal to, U+2264 ISOtech -->
-<!ENTITY ge       "&#8805;"> <!-- greater-than or equal to,
-                                     U+2265 ISOtech -->
-<!ENTITY sub      "&#8834;"> <!-- subset of, U+2282 ISOtech -->
-<!ENTITY sup      "&#8835;"> <!-- superset of, U+2283 ISOtech -->
-<!ENTITY nsub     "&#8836;"> <!-- not a subset of, U+2284 ISOamsn -->
-<!ENTITY sube     "&#8838;"> <!-- subset of or equal to, U+2286 ISOtech -->
-<!ENTITY supe     "&#8839;"> <!-- superset of or equal to,
-                                     U+2287 ISOtech -->
-<!ENTITY oplus    "&#8853;"> <!-- circled plus = direct sum,
-                                     U+2295 ISOamsb -->
-<!ENTITY otimes   "&#8855;"> <!-- circled times = vector product,
-                                     U+2297 ISOamsb -->
-<!ENTITY perp     "&#8869;"> <!-- up tack = orthogonal to = perpendicular,
-                                     U+22A5 ISOtech -->
-<!ENTITY sdot     "&#8901;"> <!-- dot operator, U+22C5 ISOamsb -->
-<!-- dot operator is NOT the same character as U+00B7 middle dot -->
-
-<!-- Miscellaneous Technical -->
-<!ENTITY lceil    "&#8968;"> <!-- left ceiling = APL upstile,
-                                     U+2308 ISOamsc  -->
-<!ENTITY rceil    "&#8969;"> <!-- right ceiling, U+2309 ISOamsc  -->
-<!ENTITY lfloor   "&#8970;"> <!-- left floor = APL downstile,
-                                     U+230A ISOamsc  -->
-<!ENTITY rfloor   "&#8971;"> <!-- right floor, U+230B ISOamsc  -->
-<!ENTITY lang     "&#9001;"> <!-- left-pointing angle bracket = bra,
-                                     U+2329 ISOtech -->
-<!-- lang is NOT the same character as U+003C 'less than sign' 
-     or U+2039 'single left-pointing angle quotation mark' -->
-<!ENTITY rang     "&#9002;"> <!-- right-pointing angle bracket = ket,
-                                     U+232A ISOtech -->
-<!-- rang is NOT the same character as U+003E 'greater than sign' 
-     or U+203A 'single right-pointing angle quotation mark' -->
-
-<!-- Geometric Shapes -->
-<!ENTITY loz      "&#9674;"> <!-- lozenge, U+25CA ISOpub -->
-
-<!-- Miscellaneous Symbols -->
-<!ENTITY spades   "&#9824;"> <!-- black spade suit, U+2660 ISOpub -->
-<!-- black here seems to mean filled as opposed to hollow -->
-<!ENTITY clubs    "&#9827;"> <!-- black club suit = shamrock,
-                                     U+2663 ISOpub -->
-<!ENTITY hearts   "&#9829;"> <!-- black heart suit = valentine,
-                                     U+2665 ISOpub -->
-<!ENTITY diams    "&#9830;"> <!-- black diamond suit, U+2666 ISOpub -->
diff --git a/src/xid/xhtml1-frameset.dtd b/src/xid/xhtml1-frameset.dtd
deleted file mode 100644
index 1a00936..0000000
--- a/src/xid/xhtml1-frameset.dtd
+++ /dev/null
@@ -1,1235 +0,0 @@
-<!--
-   Extensible HTML version 1.0 Frameset DTD
-
-   This is the same as HTML 4 Frameset except for
-   changes due to the differences between XML and SGML.
-
-   Namespace = http://www.w3.org/1999/xhtml
-
-   For further information, see: http://www.w3.org/TR/xhtml1
-
-   Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),
-   All Rights Reserved. 
-
-   This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-   PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-   SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"
-
-   $Revision: 1.1 $
-   $Date: 2005/08/29 14:41:03 $
-
--->
-
-<!--================ Character mnemonic entities =========================-->
-
-<!ENTITY % HTMLlat1 PUBLIC
-   "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-   "xhtml-lat1.ent">
-%HTMLlat1;
-
-<!ENTITY % HTMLsymbol PUBLIC
-   "-//W3C//ENTITIES Symbols for XHTML//EN"
-   "xhtml-symbol.ent">
-%HTMLsymbol;
-
-<!ENTITY % HTMLspecial PUBLIC
-   "-//W3C//ENTITIES Special for XHTML//EN"
-   "xhtml-special.ent">
-%HTMLspecial;
-
-<!--================== Imported Names ====================================-->
-
-<!ENTITY % ContentType "CDATA">
-    <!-- media type, as per [RFC2045] -->
-
-<!ENTITY % ContentTypes "CDATA">
-    <!-- comma-separated list of media types, as per [RFC2045] -->
-
-<!ENTITY % Charset "CDATA">
-    <!-- a character encoding, as per [RFC2045] -->
-
-<!ENTITY % Charsets "CDATA">
-    <!-- a space separated list of character encodings, as per [RFC2045] -->
-
-<!ENTITY % LanguageCode "NMTOKEN">
-    <!-- a language code, as per [RFC3066] -->
-
-<!ENTITY % Character "CDATA">
-    <!-- a single character, as per section 2.2 of [XML] -->
-
-<!ENTITY % Number "CDATA">
-    <!-- one or more digits -->
-
-<!ENTITY % LinkTypes "CDATA">
-    <!-- space-separated list of link types -->
-
-<!ENTITY % MediaDesc "CDATA">
-    <!-- single or comma-separated list of media descriptors -->
-
-<!ENTITY % URI "CDATA">
-    <!-- a Uniform Resource Identifier, see [RFC2396] -->
-
-<!ENTITY % UriList "CDATA">
-    <!-- a space separated list of Uniform Resource Identifiers -->
-
-<!ENTITY % Datetime "CDATA">
-    <!-- date and time information. ISO date format -->
-
-<!ENTITY % Script "CDATA">
-    <!-- script expression -->
-
-<!ENTITY % StyleSheet "CDATA">
-    <!-- style sheet data -->
-
-<!ENTITY % Text "CDATA">
-    <!-- used for titles etc. -->
-
-<!ENTITY % FrameTarget "NMTOKEN">
-    <!-- render in this frame -->
-
-<!ENTITY % Length "CDATA">
-    <!-- nn for pixels or nn% for percentage length -->
-
-<!ENTITY % MultiLength "CDATA">
-    <!-- pixel, percentage, or relative -->
-
-<!ENTITY % MultiLengths "CDATA">
-    <!-- comma-separated list of MultiLength -->
-
-<!ENTITY % Pixels "CDATA">
-    <!-- integer representing length in pixels -->
-
-<!-- these are used for image maps -->
-
-<!ENTITY % Shape "(rect|circle|poly|default)">
-
-<!ENTITY % Coords "CDATA">
-    <!-- comma separated list of lengths -->
-
-<!-- used for object, applet, img, input and iframe -->
-<!ENTITY % ImgAlign "(top|middle|bottom|left|right)">
-
-<!-- a color using sRGB: #RRGGBB as Hex values -->
-<!ENTITY % Color "CDATA">
-
-<!-- There are also 16 widely known color names with their sRGB values:
-
-    Black  = #000000    Green  = #008000
-    Silver = #C0C0C0    Lime   = #00FF00
-    Gray   = #808080    Olive  = #808000
-    White  = #FFFFFF    Yellow = #FFFF00
-    Maroon = #800000    Navy   = #000080
-    Red    = #FF0000    Blue   = #0000FF
-    Purple = #800080    Teal   = #008080
-    Fuchsia= #FF00FF    Aqua   = #00FFFF
--->
-
-<!--=================== Generic Attributes ===============================-->
-
-<!-- core attributes common to most elements
-  id       document-wide unique id
-  class    space separated list of classes
-  style    associated style info
-  title    advisory title/amplification
--->
-<!ENTITY % coreattrs
- "id          ID             #IMPLIED
-  class       CDATA          #IMPLIED
-  style       %StyleSheet;   #IMPLIED
-  title       %Text;         #IMPLIED"
-  >
-
-<!-- internationalization attributes
-  lang        language code (backwards compatible)
-  xml:lang    language code (as per XML 1.0 spec)
-  dir         direction for weak/neutral text
--->
-<!ENTITY % i18n
- "lang        %LanguageCode; #IMPLIED
-  xml:lang    %LanguageCode; #IMPLIED
-  dir         (ltr|rtl)      #IMPLIED"
-  >
-
-<!-- attributes for common UI events
-  onclick     a pointer button was clicked
-  ondblclick  a pointer button was double clicked
-  onmousedown a pointer button was pressed down
-  onmouseup   a pointer button was released
-  onmousemove a pointer was moved onto the element
-  onmouseout  a pointer was moved away from the element
-  onkeypress  a key was pressed and released
-  onkeydown   a key was pressed down
-  onkeyup     a key was released
--->
-<!ENTITY % events
- "onclick     %Script;       #IMPLIED
-  ondblclick  %Script;       #IMPLIED
-  onmousedown %Script;       #IMPLIED
-  onmouseup   %Script;       #IMPLIED
-  onmouseover %Script;       #IMPLIED
-  onmousemove %Script;       #IMPLIED
-  onmouseout  %Script;       #IMPLIED
-  onkeypress  %Script;       #IMPLIED
-  onkeydown   %Script;       #IMPLIED
-  onkeyup     %Script;       #IMPLIED"
-  >
-
-<!-- attributes for elements that can get the focus
-  accesskey   accessibility key character
-  tabindex    position in tabbing order
-  onfocus     the element got the focus
-  onblur      the element lost the focus
--->
-<!ENTITY % focus
- "accesskey   %Character;    #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED"
-  >
-
-<!ENTITY % attrs "%coreattrs; %i18n; %events;">
-
-<!-- text alignment for p, div, h1-h6. The default is
-     align="left" for ltr headings, "right" for rtl -->
-
-<!ENTITY % TextAlign "align (left|center|right|justify) #IMPLIED">
-
-<!--=================== Text Elements ====================================-->
-
-<!ENTITY % special.extra
-   "object | applet | img | map | iframe">
-	
-<!ENTITY % special.basic
-	"br | span | bdo">
-
-<!ENTITY % special
-   "%special.basic; | %special.extra;">
-
-<!ENTITY % fontstyle.extra "big | small | font | basefont">
-
-<!ENTITY % fontstyle.basic "tt | i | b | u
-                      | s | strike ">
-
-<!ENTITY % fontstyle "%fontstyle.basic; | %fontstyle.extra;">
-
-<!ENTITY % phrase.extra "sub | sup">
-<!ENTITY % phrase.basic "em | strong | dfn | code | q |
-                   samp | kbd | var | cite | abbr | acronym">
-
-<!ENTITY % phrase "%phrase.basic; | %phrase.extra;">
-
-<!ENTITY % inline.forms "input | select | textarea | label | button">
-
-<!-- these can occur at block or inline level -->
-<!ENTITY % misc.inline "ins | del | script">
-
-<!-- these can only occur at block level -->
-<!ENTITY % misc "noscript | %misc.inline;">
-
-
-<!ENTITY % inline "a | %special; | %fontstyle; | %phrase; | %inline.forms;">
-
-<!-- %Inline; covers inline or "text-level" elements -->
-<!ENTITY % Inline "(#PCDATA | %inline; | %misc.inline;)*">
-
-<!--================== Block level elements ==============================-->
-
-<!ENTITY % heading "h1|h2|h3|h4|h5|h6">
-<!ENTITY % lists "ul | ol | dl | menu | dir">
-<!ENTITY % blocktext "pre | hr | blockquote | address | center">
-
-<!ENTITY % block
-    "p | %heading; | div | %lists; | %blocktext; | isindex | fieldset | table">
-
-<!-- %Flow; mixes block and inline and is used for list items etc. -->
-<!ENTITY % Flow "(#PCDATA | %block; | form | %inline; | %misc;)*">
-
-<!--================== Content models for exclusions =====================-->
-
-<!-- a elements use %Inline; excluding a -->
-
-<!ENTITY % a.content
-   "(#PCDATA | %special; | %fontstyle; | %phrase; | %inline.forms; | %misc.inline;)*">
-
-<!-- pre uses %Inline excluding img, object, applet, big, small,
-     sub, sup, font, or basefont -->
-
-<!ENTITY % pre.content
-   "(#PCDATA | a | %special.basic; | %fontstyle.basic; | %phrase.basic; |
-	   %inline.forms; | %misc.inline;)*">
-
-
-<!-- form uses %Flow; excluding form -->
-
-<!ENTITY % form.content "(#PCDATA | %block; | %inline; | %misc;)*">
-
-<!-- button uses %Flow; but excludes a, form, form controls, iframe -->
-
-<!ENTITY % button.content
-   "(#PCDATA | p | %heading; | div | %lists; | %blocktext; |
-      table | br | span | bdo | object | applet | img | map |
-      %fontstyle; | %phrase; | %misc;)*">
-
-<!--================ Document Structure ==================================-->
-
-<!-- the namespace URI designates the document profile -->
-
-<!ELEMENT html (head, frameset)>
-<!ATTLIST html
-  %i18n;
-  id          ID             #IMPLIED
-  xmlns       %URI;          #FIXED 'http://www.w3.org/1999/xhtml'
-  >
-
-<!--================ Document Head =======================================-->
-
-<!ENTITY % head.misc "(script|style|meta|link|object|isindex)*">
-
-<!-- content model is %head.misc; combined with a single
-     title and an optional base element in any order -->
-
-<!ELEMENT head (%head.misc;,
-     ((title, %head.misc;, (base, %head.misc;)?) |
-      (base, %head.misc;, (title, %head.misc;))))>
-
-<!ATTLIST head
-  %i18n;
-  id          ID             #IMPLIED
-  profile     %URI;          #IMPLIED
-  >
-
-<!-- The title element is not considered part of the flow of text.
-       It should be displayed, for example as the page header or
-       window title. Exactly one title is required per document.
-    -->
-<!ELEMENT title (#PCDATA)>
-<!ATTLIST title 
-  %i18n;
-  id          ID             #IMPLIED
-  >
-
-<!-- document base URI -->
-
-<!ELEMENT base EMPTY>
-<!ATTLIST base
-  id          ID             #IMPLIED
-  href        %URI;          #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!-- generic metainformation -->
-<!ELEMENT meta EMPTY>
-<!ATTLIST meta
-  %i18n;
-  id          ID             #IMPLIED
-  http-equiv  CDATA          #IMPLIED
-  name        CDATA          #IMPLIED
-  content     CDATA          #REQUIRED
-  scheme      CDATA          #IMPLIED
-  >
-
-<!--
-  Relationship values can be used in principle:
-
-   a) for document specific toolbars/menus when used
-      with the link element in document head e.g.
-        start, contents, previous, next, index, end, help
-   b) to link to a separate style sheet (rel="stylesheet")
-   c) to make a link to a script (rel="script")
-   d) by stylesheets to control how collections of
-      html nodes are rendered into printed documents
-   e) to make a link to a printable version of this document
-      e.g. a PostScript or PDF version (rel="alternate" media="print")
--->
-
-<!ELEMENT link EMPTY>
-<!ATTLIST link
-  %attrs;
-  charset     %Charset;      #IMPLIED
-  href        %URI;          #IMPLIED
-  hreflang    %LanguageCode; #IMPLIED
-  type        %ContentType;  #IMPLIED
-  rel         %LinkTypes;    #IMPLIED
-  rev         %LinkTypes;    #IMPLIED
-  media       %MediaDesc;    #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!-- style info, which may include CDATA sections -->
-<!ELEMENT style (#PCDATA)>
-<!ATTLIST style
-  %i18n;
-  id          ID             #IMPLIED
-  type        %ContentType;  #REQUIRED
-  media       %MediaDesc;    #IMPLIED
-  title       %Text;         #IMPLIED
-  xml:space   (preserve)     #FIXED 'preserve'
-  >
-
-<!-- script statements, which may include CDATA sections -->
-<!ELEMENT script (#PCDATA)>
-<!ATTLIST script
-  id          ID             #IMPLIED
-  charset     %Charset;      #IMPLIED
-  type        %ContentType;  #REQUIRED
-  language    CDATA          #IMPLIED
-  src         %URI;          #IMPLIED
-  defer       (defer)        #IMPLIED
-  xml:space   (preserve)     #FIXED 'preserve'
-  >
-
-<!-- alternate content container for non script-based rendering -->
-
-<!ELEMENT noscript %Flow;>
-<!ATTLIST noscript
-  %attrs;
-  >
-
-<!--======================= Frames =======================================-->
-
-<!-- only one noframes element permitted per document -->
-
-<!ELEMENT frameset (frameset|frame|noframes)*>
-<!ATTLIST frameset
-  %coreattrs;
-  rows        %MultiLengths; #IMPLIED
-  cols        %MultiLengths; #IMPLIED
-  onload      %Script;       #IMPLIED
-  onunload    %Script;       #IMPLIED
-  >
-
-<!-- reserved frame names start with "_" otherwise starts with letter -->
-
-<!-- tiled window within frameset -->
-
-<!ELEMENT frame EMPTY>
-<!ATTLIST frame
-  %coreattrs;
-  longdesc    %URI;          #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  src         %URI;          #IMPLIED
-  frameborder (1|0)          "1"
-  marginwidth %Pixels;       #IMPLIED
-  marginheight %Pixels;      #IMPLIED
-  noresize    (noresize)     #IMPLIED
-  scrolling   (yes|no|auto)  "auto"
-  >
-
-<!-- inline subwindow -->
-
-<!ELEMENT iframe %Flow;>
-<!ATTLIST iframe
-  %coreattrs;
-  longdesc    %URI;          #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  src         %URI;          #IMPLIED
-  frameborder (1|0)          "1"
-  marginwidth %Pixels;       #IMPLIED
-  marginheight %Pixels;      #IMPLIED
-  scrolling   (yes|no|auto)  "auto"
-  align       %ImgAlign;     #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  >
-
-<!-- alternate content container for non frame-based rendering -->
-
-<!ELEMENT noframes (body)>
-<!ATTLIST noframes
-  %attrs;
-  >
-
-<!--=================== Document Body ====================================-->
-
-<!ELEMENT body %Flow;>
-<!ATTLIST body
-  %attrs;
-  onload      %Script;       #IMPLIED
-  onunload    %Script;       #IMPLIED
-  background  %URI;          #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  text        %Color;        #IMPLIED
-  link        %Color;        #IMPLIED
-  vlink       %Color;        #IMPLIED
-  alink       %Color;        #IMPLIED
-  >
-
-<!ELEMENT div %Flow;>  <!-- generic language/style container -->
-<!ATTLIST div
-  %attrs;
-  %TextAlign;
-  >
-
-<!--=================== Paragraphs =======================================-->
-
-<!ELEMENT p %Inline;>
-<!ATTLIST p
-  %attrs;
-  %TextAlign;
-  >
-
-<!--=================== Headings =========================================-->
-
-<!--
-  There are six levels of headings from h1 (the most important)
-  to h6 (the least important).
--->
-
-<!ELEMENT h1  %Inline;>
-<!ATTLIST h1
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h2 %Inline;>
-<!ATTLIST h2
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h3 %Inline;>
-<!ATTLIST h3
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h4 %Inline;>
-<!ATTLIST h4
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h5 %Inline;>
-<!ATTLIST h5
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h6 %Inline;>
-<!ATTLIST h6
-  %attrs;
-  %TextAlign;
-  >
-
-<!--=================== Lists ============================================-->
-
-<!-- Unordered list bullet styles -->
-
-<!ENTITY % ULStyle "(disc|square|circle)">
-
-<!-- Unordered list -->
-
-<!ELEMENT ul (li)+>
-<!ATTLIST ul
-  %attrs;
-  type        %ULStyle;     #IMPLIED
-  compact     (compact)     #IMPLIED
-  >
-
-<!-- Ordered list numbering style
-
-    1   arabic numbers      1, 2, 3, ...
-    a   lower alpha         a, b, c, ...
-    A   upper alpha         A, B, C, ...
-    i   lower roman         i, ii, iii, ...
-    I   upper roman         I, II, III, ...
-
-    The style is applied to the sequence number which by default
-    is reset to 1 for the first list item in an ordered list.
--->
-<!ENTITY % OLStyle "CDATA">
-
-<!-- Ordered (numbered) list -->
-
-<!ELEMENT ol (li)+>
-<!ATTLIST ol
-  %attrs;
-  type        %OLStyle;      #IMPLIED
-  compact     (compact)      #IMPLIED
-  start       %Number;       #IMPLIED
-  >
-
-<!-- single column list (DEPRECATED) --> 
-<!ELEMENT menu (li)+>
-<!ATTLIST menu
-  %attrs;
-  compact     (compact)     #IMPLIED
-  >
-
-<!-- multiple column list (DEPRECATED) --> 
-<!ELEMENT dir (li)+>
-<!ATTLIST dir
-  %attrs;
-  compact     (compact)     #IMPLIED
-  >
-
-<!-- LIStyle is constrained to: "(%ULStyle;|%OLStyle;)" -->
-<!ENTITY % LIStyle "CDATA">
-
-<!-- list item -->
-
-<!ELEMENT li %Flow;>
-<!ATTLIST li
-  %attrs;
-  type        %LIStyle;      #IMPLIED
-  value       %Number;       #IMPLIED
-  >
-
-<!-- definition lists - dt for term, dd for its definition -->
-
-<!ELEMENT dl (dt|dd)+>
-<!ATTLIST dl
-  %attrs;
-  compact     (compact)      #IMPLIED
-  >
-
-<!ELEMENT dt %Inline;>
-<!ATTLIST dt
-  %attrs;
-  >
-
-<!ELEMENT dd %Flow;>
-<!ATTLIST dd
-  %attrs;
-  >
-
-<!--=================== Address ==========================================-->
-
-<!-- information on author -->
-
-<!ELEMENT address (#PCDATA | %inline; | %misc.inline; | p)*>
-<!ATTLIST address
-  %attrs;
-  >
-
-<!--=================== Horizontal Rule ==================================-->
-
-<!ELEMENT hr EMPTY>
-<!ATTLIST hr
-  %attrs;
-  align       (left|center|right) #IMPLIED
-  noshade     (noshade)      #IMPLIED
-  size        %Pixels;       #IMPLIED
-  width       %Length;       #IMPLIED
-  >
-
-<!--=================== Preformatted Text ================================-->
-
-<!-- content is %Inline; excluding 
-        "img|object|applet|big|small|sub|sup|font|basefont" -->
-
-<!ELEMENT pre %pre.content;>
-<!ATTLIST pre
-  %attrs;
-  width       %Number;      #IMPLIED
-  xml:space   (preserve)    #FIXED 'preserve'
-  >
-
-<!--=================== Block-like Quotes ================================-->
-
-<!ELEMENT blockquote %Flow;>
-<!ATTLIST blockquote
-  %attrs;
-  cite        %URI;          #IMPLIED
-  >
-
-<!--=================== Text alignment ===================================-->
-
-<!-- center content -->
-<!ELEMENT center %Flow;>
-<!ATTLIST center
-  %attrs;
-  >
-
-<!--=================== Inserted/Deleted Text ============================-->
-
-
-<!--
-  ins/del are allowed in block and inline content, but its
-  inappropriate to include block content within an ins element
-  occurring in inline content.
--->
-<!ELEMENT ins %Flow;>
-<!ATTLIST ins
-  %attrs;
-  cite        %URI;          #IMPLIED
-  datetime    %Datetime;     #IMPLIED
-  >
-
-<!ELEMENT del %Flow;>
-<!ATTLIST del
-  %attrs;
-  cite        %URI;          #IMPLIED
-  datetime    %Datetime;     #IMPLIED
-  >
-
-<!--================== The Anchor Element ================================-->
-
-<!-- content is %Inline; except that anchors shouldn't be nested -->
-
-<!ELEMENT a %a.content;>
-<!ATTLIST a
-  %attrs;
-  %focus;
-  charset     %Charset;      #IMPLIED
-  type        %ContentType;  #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  href        %URI;          #IMPLIED
-  hreflang    %LanguageCode; #IMPLIED
-  rel         %LinkTypes;    #IMPLIED
-  rev         %LinkTypes;    #IMPLIED
-  shape       %Shape;        "rect"
-  coords      %Coords;       #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!--===================== Inline Elements ================================-->
-
-<!ELEMENT span %Inline;> <!-- generic language/style container -->
-<!ATTLIST span
-  %attrs;
-  >
-
-<!ELEMENT bdo %Inline;>  <!-- I18N BiDi over-ride -->
-<!ATTLIST bdo
-  %coreattrs;
-  %events;
-  lang        %LanguageCode; #IMPLIED
-  xml:lang    %LanguageCode; #IMPLIED
-  dir         (ltr|rtl)      #REQUIRED
-  >
-
-<!ELEMENT br EMPTY>   <!-- forced line break -->
-<!ATTLIST br
-  %coreattrs;
-  clear       (left|all|right|none) "none"
-  >
-
-<!ELEMENT em %Inline;>   <!-- emphasis -->
-<!ATTLIST em %attrs;>
-
-<!ELEMENT strong %Inline;>   <!-- strong emphasis -->
-<!ATTLIST strong %attrs;>
-
-<!ELEMENT dfn %Inline;>   <!-- definitional -->
-<!ATTLIST dfn %attrs;>
-
-<!ELEMENT code %Inline;>   <!-- program code -->
-<!ATTLIST code %attrs;>
-
-<!ELEMENT samp %Inline;>   <!-- sample -->
-<!ATTLIST samp %attrs;>
-
-<!ELEMENT kbd %Inline;>  <!-- something user would type -->
-<!ATTLIST kbd %attrs;>
-
-<!ELEMENT var %Inline;>   <!-- variable -->
-<!ATTLIST var %attrs;>
-
-<!ELEMENT cite %Inline;>   <!-- citation -->
-<!ATTLIST cite %attrs;>
-
-<!ELEMENT abbr %Inline;>   <!-- abbreviation -->
-<!ATTLIST abbr %attrs;>
-
-<!ELEMENT acronym %Inline;>   <!-- acronym -->
-<!ATTLIST acronym %attrs;>
-
-<!ELEMENT q %Inline;>   <!-- inlined quote -->
-<!ATTLIST q
-  %attrs;
-  cite        %URI;          #IMPLIED
-  >
-
-<!ELEMENT sub %Inline;> <!-- subscript -->
-<!ATTLIST sub %attrs;>
-
-<!ELEMENT sup %Inline;> <!-- superscript -->
-<!ATTLIST sup %attrs;>
-
-<!ELEMENT tt %Inline;>   <!-- fixed pitch font -->
-<!ATTLIST tt %attrs;>
-
-<!ELEMENT i %Inline;>   <!-- italic font -->
-<!ATTLIST i %attrs;>
-
-<!ELEMENT b %Inline;>   <!-- bold font -->
-<!ATTLIST b %attrs;>
-
-<!ELEMENT big %Inline;>   <!-- bigger font -->
-<!ATTLIST big %attrs;>
-
-<!ELEMENT small %Inline;>   <!-- smaller font -->
-<!ATTLIST small %attrs;>
-
-<!ELEMENT u %Inline;>   <!-- underline -->
-<!ATTLIST u %attrs;>
-
-<!ELEMENT s %Inline;>   <!-- strike-through -->
-<!ATTLIST s %attrs;>
-
-<!ELEMENT strike %Inline;>   <!-- strike-through -->
-<!ATTLIST strike %attrs;>
-
-<!ELEMENT basefont EMPTY>  <!-- base font size -->
-<!ATTLIST basefont
-  id          ID             #IMPLIED
-  size        CDATA          #REQUIRED
-  color       %Color;        #IMPLIED
-  face        CDATA          #IMPLIED
-  >
-
-<!ELEMENT font %Inline;> <!-- local change to font -->
-<!ATTLIST font
-  %coreattrs;
-  %i18n;
-  size        CDATA          #IMPLIED
-  color       %Color;        #IMPLIED
-  face        CDATA          #IMPLIED
-  >
-
-<!--==================== Object ======================================-->
-<!--
-  object is used to embed objects as part of HTML pages.
-  param elements should precede other content. Parameters
-  can also be expressed as attribute/value pairs on the
-  object element itself when brevity is desired.
--->
-
-<!ELEMENT object (#PCDATA | param | %block; | form |%inline; | %misc;)*>
-<!ATTLIST object
-  %attrs;
-  declare     (declare)      #IMPLIED
-  classid     %URI;          #IMPLIED
-  codebase    %URI;          #IMPLIED
-  data        %URI;          #IMPLIED
-  type        %ContentType;  #IMPLIED
-  codetype    %ContentType;  #IMPLIED
-  archive     %UriList;      #IMPLIED
-  standby     %Text;         #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  usemap      %URI;          #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  align       %ImgAlign;     #IMPLIED
-  border      %Pixels;       #IMPLIED
-  hspace      %Pixels;       #IMPLIED
-  vspace      %Pixels;       #IMPLIED
-  >
-
-<!--
-  param is used to supply a named property value.
-  In XML it would seem natural to follow RDF and support an
-  abbreviated syntax where the param elements are replaced
-  by attribute value pairs on the object start tag.
--->
-<!ELEMENT param EMPTY>
-<!ATTLIST param
-  id          ID             #IMPLIED
-  name        CDATA          #REQUIRED
-  value       CDATA          #IMPLIED
-  valuetype   (data|ref|object) "data"
-  type        %ContentType;  #IMPLIED
-  >
-
-<!--=================== Java applet ==================================-->
-<!--
-  One of code or object attributes must be present.
-  Place param elements before other content.
--->
-<!ELEMENT applet (#PCDATA | param | %block; | form | %inline; | %misc;)*>
-<!ATTLIST applet
-  %coreattrs;
-  codebase    %URI;          #IMPLIED
-  archive     CDATA          #IMPLIED
-  code        CDATA          #IMPLIED
-  object      CDATA          #IMPLIED
-  alt         %Text;         #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  width       %Length;       #REQUIRED
-  height      %Length;       #REQUIRED
-  align       %ImgAlign;     #IMPLIED
-  hspace      %Pixels;       #IMPLIED
-  vspace      %Pixels;       #IMPLIED
-  >
-
-<!--=================== Images ===========================================-->
-
-<!--
-   To avoid accessibility problems for people who aren't
-   able to see the image, you should provide a text
-   description using the alt and longdesc attributes.
-   In addition, avoid the use of server-side image maps.
--->
-
-<!ELEMENT img EMPTY>
-<!ATTLIST img
-  %attrs;
-  src         %URI;          #REQUIRED
-  alt         %Text;         #REQUIRED
-  name        NMTOKEN        #IMPLIED
-  longdesc    %URI;          #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  usemap      %URI;          #IMPLIED
-  ismap       (ismap)        #IMPLIED
-  align       %ImgAlign;     #IMPLIED
-  border      %Pixels;       #IMPLIED
-  hspace      %Pixels;       #IMPLIED
-  vspace      %Pixels;       #IMPLIED
-  >
-
-<!-- usemap points to a map element which may be in this document
-  or an external document, although the latter is not widely supported -->
-
-<!--================== Client-side image maps ============================-->
-
-<!-- These can be placed in the same document or grouped in a
-     separate document although this isn't yet widely supported -->
-
-<!ELEMENT map ((%block; | form | %misc;)+ | area+)>
-<!ATTLIST map
-  %i18n;
-  %events;
-  id          ID             #REQUIRED
-  class       CDATA          #IMPLIED
-  style       %StyleSheet;   #IMPLIED
-  title       %Text;         #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  >
-
-<!ELEMENT area EMPTY>
-<!ATTLIST area
-  %attrs;
-  %focus;
-  shape       %Shape;        "rect"
-  coords      %Coords;       #IMPLIED
-  href        %URI;          #IMPLIED
-  nohref      (nohref)       #IMPLIED
-  alt         %Text;         #REQUIRED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!--================ Forms ===============================================-->
-
-<!ELEMENT form %form.content;>   <!-- forms shouldn't be nested -->
-
-<!ATTLIST form
-  %attrs;
-  action      %URI;          #REQUIRED
-  method      (get|post)     "get"
-  name        NMTOKEN        #IMPLIED
-  enctype     %ContentType;  "application/x-www-form-urlencoded"
-  onsubmit    %Script;       #IMPLIED
-  onreset     %Script;       #IMPLIED
-  accept      %ContentTypes; #IMPLIED
-  accept-charset %Charsets;  #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!--
-  Each label must not contain more than ONE field
-  Label elements shouldn't be nested.
--->
-<!ELEMENT label %Inline;>
-<!ATTLIST label
-  %attrs;
-  for         IDREF          #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  >
-
-<!ENTITY % InputType
-  "(text | password | checkbox |
-    radio | submit | reset |
-    file | hidden | image | button)"
-   >
-
-<!-- the name attribute is required for all but submit & reset -->
-
-<!ELEMENT input EMPTY>     <!-- form control -->
-<!ATTLIST input
-  %attrs;
-  %focus;
-  type        %InputType;    "text"
-  name        CDATA          #IMPLIED
-  value       CDATA          #IMPLIED
-  checked     (checked)      #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  readonly    (readonly)     #IMPLIED
-  size        CDATA          #IMPLIED
-  maxlength   %Number;       #IMPLIED
-  src         %URI;          #IMPLIED
-  alt         CDATA          #IMPLIED
-  usemap      %URI;          #IMPLIED
-  onselect    %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  accept      %ContentTypes; #IMPLIED
-  align       %ImgAlign;     #IMPLIED
-  >
-
-<!ELEMENT select (optgroup|option)+>  <!-- option selector -->
-<!ATTLIST select
-  %attrs;
-  name        CDATA          #IMPLIED
-  size        %Number;       #IMPLIED
-  multiple    (multiple)     #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  >
-
-<!ELEMENT optgroup (option)+>   <!-- option group -->
-<!ATTLIST optgroup
-  %attrs;
-  disabled    (disabled)     #IMPLIED
-  label       %Text;         #REQUIRED
-  >
-
-<!ELEMENT option (#PCDATA)>     <!-- selectable choice -->
-<!ATTLIST option
-  %attrs;
-  selected    (selected)     #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  label       %Text;         #IMPLIED
-  value       CDATA          #IMPLIED
-  >
-
-<!ELEMENT textarea (#PCDATA)>     <!-- multi-line text field -->
-<!ATTLIST textarea
-  %attrs;
-  %focus;
-  name        CDATA          #IMPLIED
-  rows        %Number;       #REQUIRED
-  cols        %Number;       #REQUIRED
-  disabled    (disabled)     #IMPLIED
-  readonly    (readonly)     #IMPLIED
-  onselect    %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  >
-
-<!--
-  The fieldset element is used to group form fields.
-  Only one legend element should occur in the content
-  and if present should only be preceded by whitespace.
--->
-<!ELEMENT fieldset (#PCDATA | legend | %block; | form | %inline; | %misc;)*>
-<!ATTLIST fieldset
-  %attrs;
-  >
-
-<!ENTITY % LAlign "(top|bottom|left|right)">
-
-<!ELEMENT legend %Inline;>     <!-- fieldset label -->
-<!ATTLIST legend
-  %attrs;
-  accesskey   %Character;    #IMPLIED
-  align       %LAlign;       #IMPLIED
-  >
-
-<!--
- Content is %Flow; excluding a, form, form controls, iframe
---> 
-<!ELEMENT button %button.content;>  <!-- push button -->
-<!ATTLIST button
-  %attrs;
-  %focus;
-  name        CDATA          #IMPLIED
-  value       CDATA          #IMPLIED
-  type        (button|submit|reset) "submit"
-  disabled    (disabled)     #IMPLIED
-  >
-
-<!-- single-line text input control (DEPRECATED) -->
-<!ELEMENT isindex EMPTY>
-<!ATTLIST isindex
-  %coreattrs;
-  %i18n;
-  prompt      %Text;         #IMPLIED
-  >
-
-<!--======================= Tables =======================================-->
-
-<!-- Derived from IETF HTML table standard, see [RFC1942] -->
-
-<!--
- The border attribute sets the thickness of the frame around the
- table. The default units are screen pixels.
-
- The frame attribute specifies which parts of the frame around
- the table should be rendered. The values are not the same as
- CALS to avoid a name clash with the valign attribute.
--->
-<!ENTITY % TFrame "(void|above|below|hsides|lhs|rhs|vsides|box|border)">
-
-<!--
- The rules attribute defines which rules to draw between cells:
-
- If rules is absent then assume:
-     "none" if border is absent or border="0" otherwise "all"
--->
-
-<!ENTITY % TRules "(none | groups | rows | cols | all)">
-  
-<!-- horizontal placement of table relative to document -->
-<!ENTITY % TAlign "(left|center|right)">
-
-<!-- horizontal alignment attributes for cell contents
-
-  char        alignment char, e.g. char=":"
-  charoff     offset for alignment char
--->
-<!ENTITY % cellhalign
-  "align      (left|center|right|justify|char) #IMPLIED
-   char       %Character;    #IMPLIED
-   charoff    %Length;       #IMPLIED"
-  >
-
-<!-- vertical alignment attributes for cell contents -->
-<!ENTITY % cellvalign
-  "valign     (top|middle|bottom|baseline) #IMPLIED"
-  >
-
-<!ELEMENT table
-     (caption?, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+))>
-<!ELEMENT caption  %Inline;>
-<!ELEMENT thead    (tr)+>
-<!ELEMENT tfoot    (tr)+>
-<!ELEMENT tbody    (tr)+>
-<!ELEMENT colgroup (col)*>
-<!ELEMENT col      EMPTY>
-<!ELEMENT tr       (th|td)+>
-<!ELEMENT th       %Flow;>
-<!ELEMENT td       %Flow;>
-
-<!ATTLIST table
-  %attrs;
-  summary     %Text;         #IMPLIED
-  width       %Length;       #IMPLIED
-  border      %Pixels;       #IMPLIED
-  frame       %TFrame;       #IMPLIED
-  rules       %TRules;       #IMPLIED
-  cellspacing %Length;       #IMPLIED
-  cellpadding %Length;       #IMPLIED
-  align       %TAlign;       #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  >
-
-<!ENTITY % CAlign "(top|bottom|left|right)">
-
-<!ATTLIST caption
-  %attrs;
-  align       %CAlign;       #IMPLIED
-  >
-
-<!--
-colgroup groups a set of col elements. It allows you to group
-several semantically related columns together.
--->
-<!ATTLIST colgroup
-  %attrs;
-  span        %Number;       "1"
-  width       %MultiLength;  #IMPLIED
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!--
- col elements define the alignment properties for cells in
- one or more columns.
-
- The width attribute specifies the width of the columns, e.g.
-
-     width=64        width in screen pixels
-     width=0.5*      relative width of 0.5
-
- The span attribute causes the attributes of one
- col element to apply to more than one column.
--->
-<!ATTLIST col
-  %attrs;
-  span        %Number;       "1"
-  width       %MultiLength;  #IMPLIED
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!--
-    Use thead to duplicate headers when breaking table
-    across page boundaries, or for static headers when
-    tbody sections are rendered in scrolling panel.
-
-    Use tfoot to duplicate footers when breaking table
-    across page boundaries, or for static footers when
-    tbody sections are rendered in scrolling panel.
-
-    Use multiple tbody sections when rules are needed
-    between groups of table rows.
--->
-<!ATTLIST thead
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tfoot
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tbody
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tr
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  bgcolor     %Color;        #IMPLIED
-  >
-
-<!-- Scope is simpler than headers attribute for common tables -->
-<!ENTITY % Scope "(row|col|rowgroup|colgroup)">
-
-<!-- th is for headers, td for data and for cells acting as both -->
-
-<!ATTLIST th
-  %attrs;
-  abbr        %Text;         #IMPLIED
-  axis        CDATA          #IMPLIED
-  headers     IDREFS         #IMPLIED
-  scope       %Scope;        #IMPLIED
-  rowspan     %Number;       "1"
-  colspan     %Number;       "1"
-  %cellhalign;
-  %cellvalign;
-  nowrap      (nowrap)       #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  width       %Pixels;       #IMPLIED
-  height      %Pixels;       #IMPLIED
-  >
-
-<!ATTLIST td
-  %attrs;
-  abbr        %Text;         #IMPLIED
-  axis        CDATA          #IMPLIED
-  headers     IDREFS         #IMPLIED
-  scope       %Scope;        #IMPLIED
-  rowspan     %Number;       "1"
-  colspan     %Number;       "1"
-  %cellhalign;
-  %cellvalign;
-  nowrap      (nowrap)       #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  width       %Pixels;       #IMPLIED
-  height      %Pixels;       #IMPLIED
-  >
-
diff --git a/src/xid/xhtml1-transitional.dtd b/src/xid/xhtml1-transitional.dtd
deleted file mode 100644
index e22581b..0000000
--- a/src/xid/xhtml1-transitional.dtd
+++ /dev/null
@@ -1,1210 +0,0 @@
-<!--
-   Extensible HTML version 1.0 Transitional DTD
-
-   This is the same as HTML 4 Transitional except for
-   changes due to the differences between XML and SGML.
-
-   Namespace = http://www.w3.org/1999/xhtml
-
-   For further information, see: http://www.w3.org/TR/xhtml1
-
-   Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),
-   All Rights Reserved.
-
-   This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-   PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-   SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
-
-   $Revision: 1.1 $
-   $Date: 2005/08/29 14:41:18 $
-
-   Date 2002/11/17 Chris Bulcock (Brill Software Limited)
-   Added the height attribute to the table tag.
-
-   Date 2004/01/02 Chris Bulcock (Brill Software Limited)
-   Added the background attribute to the table tag.
-
--->
-
-<!--================ Character mnemonic entities =========================-->
-
-<!ENTITY % HTMLlat1 PUBLIC
-   "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-   "xhtml-lat1.ent">
-%HTMLlat1;
-
-<!ENTITY % HTMLsymbol PUBLIC
-   "-//W3C//ENTITIES Symbols for XHTML//EN"
-   "xhtml-symbol.ent">
-%HTMLsymbol;
-
-<!ENTITY % HTMLspecial PUBLIC
-   "-//W3C//ENTITIES Special for XHTML//EN"
-   "xhtml-special.ent">
-%HTMLspecial;
-
-<!--================== Imported Names ====================================-->
-
-<!ENTITY % ContentType "CDATA">
-    <!-- media type, as per [RFC2045] -->
-
-<!ENTITY % ContentTypes "CDATA">
-    <!-- comma-separated list of media types, as per [RFC2045] -->
-
-<!ENTITY % Charset "CDATA">
-    <!-- a character encoding, as per [RFC2045] -->
-
-<!ENTITY % Charsets "CDATA">
-    <!-- a space separated list of character encodings, as per [RFC2045] -->
-
-<!ENTITY % LanguageCode "NMTOKEN">
-    <!-- a language code, as per [RFC3066] -->
-
-<!ENTITY % Character "CDATA">
-    <!-- a single character, as per section 2.2 of [XML] -->
-
-<!ENTITY % Number "CDATA">
-    <!-- one or more digits -->
-
-<!ENTITY % LinkTypes "CDATA">
-    <!-- space-separated list of link types -->
-
-<!ENTITY % MediaDesc "CDATA">
-    <!-- single or comma-separated list of media descriptors -->
-
-<!ENTITY % URI "CDATA">
-    <!-- a Uniform Resource Identifier, see [RFC2396] -->
-
-<!ENTITY % UriList "CDATA">
-    <!-- a space separated list of Uniform Resource Identifiers -->
-
-<!ENTITY % Datetime "CDATA">
-    <!-- date and time information. ISO date format -->
-
-<!ENTITY % Script "CDATA">
-    <!-- script expression -->
-
-<!ENTITY % StyleSheet "CDATA">
-    <!-- style sheet data -->
-
-<!ENTITY % Text "CDATA">
-    <!-- used for titles etc. -->
-
-<!ENTITY % FrameTarget "NMTOKEN">
-    <!-- render in this frame -->
-
-<!ENTITY % Length "CDATA">
-    <!-- nn for pixels or nn% for percentage length -->
-
-<!ENTITY % MultiLength "CDATA">
-    <!-- pixel, percentage, or relative -->
-
-<!ENTITY % Pixels "CDATA">
-    <!-- integer representing length in pixels -->
-
-<!-- these are used for image maps -->
-
-<!ENTITY % Shape "(rect|circle|poly|default)">
-
-<!ENTITY % Coords "CDATA">
-    <!-- comma separated list of lengths -->
-
-<!-- used for object, applet, img, input and iframe -->
-<!ENTITY % ImgAlign "(top|middle|bottom|left|right)">
-
-<!-- a color using sRGB: #RRGGBB as Hex values -->
-<!ENTITY % Color "CDATA">
-
-<!-- There are also 16 widely known color names with their sRGB values:
-
-    Black  = #000000    Green  = #008000
-    Silver = #C0C0C0    Lime   = #00FF00
-    Gray   = #808080    Olive  = #808000
-    White  = #FFFFFF    Yellow = #FFFF00
-    Maroon = #800000    Navy   = #000080
-    Red    = #FF0000    Blue   = #0000FF
-    Purple = #800080    Teal   = #008080
-    Fuchsia= #FF00FF    Aqua   = #00FFFF
--->
-
-<!--=================== Generic Attributes ===============================-->
-
-<!-- core attributes common to most elements
-  id       document-wide unique id
-  class    space separated list of classes
-  style    associated style info
-  title    advisory title/amplification
--->
-<!ENTITY % coreattrs
- "id          ID             #IMPLIED
-  class       CDATA          #IMPLIED
-  style       %StyleSheet;   #IMPLIED
-  title       %Text;         #IMPLIED"
-  >
-
-<!-- internationalization attributes
-  lang        language code (backwards compatible)
-  xml:lang    language code (as per XML 1.0 spec)
-  dir         direction for weak/neutral text
--->
-<!ENTITY % i18n
- "lang        %LanguageCode; #IMPLIED
-  xml:lang    %LanguageCode; #IMPLIED
-  dir         (ltr|rtl)      #IMPLIED"
-  >
-
-<!-- attributes for common UI events
-  onclick     a pointer button was clicked
-  ondblclick  a pointer button was double clicked
-  onmousedown a pointer button was pressed down
-  onmouseup   a pointer button was released
-  onmousemove a pointer was moved onto the element
-  onmouseout  a pointer was moved away from the element
-  onkeypress  a key was pressed and released
-  onkeydown   a key was pressed down
-  onkeyup     a key was released
--->
-<!ENTITY % events
- "onclick     %Script;       #IMPLIED
-  ondblclick  %Script;       #IMPLIED
-  onmousedown %Script;       #IMPLIED
-  onmouseup   %Script;       #IMPLIED
-  onmouseover %Script;       #IMPLIED
-  onmousemove %Script;       #IMPLIED
-  onmouseout  %Script;       #IMPLIED
-  onkeypress  %Script;       #IMPLIED
-  onkeydown   %Script;       #IMPLIED
-  onkeyup     %Script;       #IMPLIED"
-  >
-
-<!-- attributes for elements that can get the focus
-  accesskey   accessibility key character
-  tabindex    position in tabbing order
-  onfocus     the element got the focus
-  onblur      the element lost the focus
--->
-<!ENTITY % focus
- "accesskey   %Character;    #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED"
-  >
-
-<!ENTITY % attrs "%coreattrs; %i18n; %events;">
-
-<!-- text alignment for p, div, h1-h6. The default is
-     align="left" for ltr headings, "right" for rtl -->
-
-<!ENTITY % TextAlign "align (left|center|right|justify) #IMPLIED">
-
-<!--=================== Text Elements ====================================-->
-
-<!ENTITY % special.extra
-   "object | applet | img | map | iframe">
-
-<!ENTITY % special.basic
-	"br | span | bdo">
-
-<!ENTITY % special
-   "%special.basic; | %special.extra;">
-
-<!ENTITY % fontstyle.extra "big | small | font | basefont">
-
-<!ENTITY % fontstyle.basic "tt | i | b | u
-                      | s | strike ">
-
-<!ENTITY % fontstyle "%fontstyle.basic; | %fontstyle.extra;">
-
-<!ENTITY % phrase.extra "sub | sup">
-<!ENTITY % phrase.basic "em | strong | dfn | code | q |
-                   samp | kbd | var | cite | abbr | acronym">
-
-<!ENTITY % phrase "%phrase.basic; | %phrase.extra;">
-
-<!ENTITY % inline.forms "input | select | textarea | label | button">
-
-<!-- these can occur at block or inline level -->
-<!ENTITY % misc.inline "ins | del | script">
-
-<!-- these can only occur at block level -->
-<!ENTITY % misc "noscript | %misc.inline;">
-
-<!ENTITY % inline "a | %special; | %fontstyle; | %phrase; | %inline.forms;">
-
-<!-- %Inline; covers inline or "text-level" elements -->
-<!ENTITY % Inline "(#PCDATA | %inline; | %misc.inline;)*">
-
-<!--================== Block level elements ==============================-->
-
-<!ENTITY % heading "h1|h2|h3|h4|h5|h6">
-<!ENTITY % lists "ul | ol | dl | menu | dir">
-<!ENTITY % blocktext "pre | hr | blockquote | address | center | noframes">
-
-<!ENTITY % block
-    "p | %heading; | div | %lists; | %blocktext; | isindex |fieldset | table">
-
-<!-- %Flow; mixes block and inline and is used for list items etc. -->
-<!ENTITY % Flow "(#PCDATA | %block; | form | %inline; | %misc;)*">
-
-<!--================== Content models for exclusions =====================-->
-
-<!-- a elements use %Inline; excluding a -->
-
-<!ENTITY % a.content
-   "(#PCDATA | %special; | %fontstyle; | %phrase; | %inline.forms; | %misc.inline;)*">
-
-<!-- pre uses %Inline excluding img, object, applet, big, small,
-     font, or basefont -->
-
-<!ENTITY % pre.content
-   "(#PCDATA | a | %special.basic; | %fontstyle.basic; | %phrase.basic; |
-	   %inline.forms; | %misc.inline;)*">
-
-<!-- form uses %Flow; excluding form -->
-
-<!ENTITY % form.content "(#PCDATA | %block; | %inline; | %misc;)*">
-
-<!-- button uses %Flow; but excludes a, form, form controls, iframe -->
-
-<!ENTITY % button.content
-   "(#PCDATA | p | %heading; | div | %lists; | %blocktext; |
-      table | br | span | bdo | object | applet | img | map |
-      %fontstyle; | %phrase; | %misc;)*">
-
-<!--================ Document Structure ==================================-->
-
-<!-- the namespace URI designates the document profile -->
-
-<!ELEMENT html (head, body)>
-<!ATTLIST html
-  %i18n;
-  id          ID             #IMPLIED
-  xmlns       %URI;          #FIXED 'http://www.w3.org/1999/xhtml'
-  >
-
-<!--================ Document Head =======================================-->
-
-<!ENTITY % head.misc "(script|style|meta|link|object|isindex)*">
-
-<!-- content model is %head.misc; combined with a single
-     title and an optional base element in any order -->
-
-<!ELEMENT head (%head.misc;,
-     ((title, %head.misc;, (base, %head.misc;)?) |
-      (base, %head.misc;, (title, %head.misc;))))>
-
-<!ATTLIST head
-  %i18n;
-  id          ID             #IMPLIED
-  profile     %URI;          #IMPLIED
-  >
-
-<!-- The title element is not considered part of the flow of text.
-       It should be displayed, for example as the page header or
-       window title. Exactly one title is required per document.
-    -->
-<!ELEMENT title (#PCDATA)>
-<!ATTLIST title
-  %i18n;
-  id          ID             #IMPLIED
-  >
-
-<!-- document base URI -->
-
-<!ELEMENT base EMPTY>
-<!ATTLIST base
-  id          ID             #IMPLIED
-  href        %URI;          #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!-- generic metainformation -->
-<!ELEMENT meta EMPTY>
-<!ATTLIST meta
-  %i18n;
-  id          ID             #IMPLIED
-  http-equiv  CDATA          #IMPLIED
-  name        CDATA          #IMPLIED
-  content     CDATA          #REQUIRED
-  scheme      CDATA          #IMPLIED
-  >
-
-<!--
-  Relationship values can be used in principle:
-
-   a) for document specific toolbars/menus when used
-      with the link element in document head e.g.
-        start, contents, previous, next, index, end, help
-   b) to link to a separate style sheet (rel="stylesheet")
-   c) to make a link to a script (rel="script")
-   d) by stylesheets to control how collections of
-      html nodes are rendered into printed documents
-   e) to make a link to a printable version of this document
-      e.g. a PostScript or PDF version (rel="alternate" media="print")
--->
-
-<!ELEMENT link EMPTY>
-<!ATTLIST link
-  %attrs;
-  charset     %Charset;      #IMPLIED
-  href        %URI;          #IMPLIED
-  hreflang    %LanguageCode; #IMPLIED
-  type        %ContentType;  #IMPLIED
-  rel         %LinkTypes;    #IMPLIED
-  rev         %LinkTypes;    #IMPLIED
-  media       %MediaDesc;    #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!-- style info, which may include CDATA sections -->
-<!ELEMENT style (#PCDATA)>
-<!ATTLIST style
-  %i18n;
-  id          ID             #IMPLIED
-  type        %ContentType;  #REQUIRED
-  media       %MediaDesc;    #IMPLIED
-  title       %Text;         #IMPLIED
-  xml:space   (preserve)     #FIXED 'preserve'
-  >
-
-<!-- script statements, which may include CDATA sections -->
-<!ELEMENT script (#PCDATA)>
-<!ATTLIST script
-  id          ID             #IMPLIED
-  charset     %Charset;      #IMPLIED
-  type        %ContentType;  #REQUIRED
-  language    CDATA          #IMPLIED
-  src         %URI;          #IMPLIED
-  defer       (defer)        #IMPLIED
-  xml:space   (preserve)     #FIXED 'preserve'
-  >
-
-<!-- alternate content container for non script-based rendering -->
-
-<!ELEMENT noscript %Flow;>
-<!ATTLIST noscript
-  %attrs;
-  >
-
-<!--======================= Frames =======================================-->
-
-<!-- inline subwindow -->
-
-<!ELEMENT iframe %Flow;>
-<!ATTLIST iframe
-  %coreattrs;
-  longdesc    %URI;          #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  src         %URI;          #IMPLIED
-  frameborder (1|0)          "1"
-  marginwidth %Pixels;       #IMPLIED
-  marginheight %Pixels;      #IMPLIED
-  scrolling   (yes|no|auto)  "auto"
-  align       %ImgAlign;     #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  >
-
-<!-- alternate content container for non frame-based rendering -->
-
-<!ELEMENT noframes %Flow;>
-<!ATTLIST noframes
-  %attrs;
-  >
-
-<!--=================== Document Body ====================================-->
-
-<!ELEMENT body %Flow;>
-<!ATTLIST body
-  %attrs;
-  onload      %Script;       #IMPLIED
-  onunload    %Script;       #IMPLIED
-  background  %URI;          #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  text        %Color;        #IMPLIED
-  link        %Color;        #IMPLIED
-  vlink       %Color;        #IMPLIED
-  alink       %Color;        #IMPLIED
-  >
-
-<!ELEMENT div %Flow;>  <!-- generic language/style container -->
-<!ATTLIST div
-  %attrs;
-  %TextAlign;
-  >
-
-<!--=================== Paragraphs =======================================-->
-
-<!ELEMENT p %Inline;>
-<!ATTLIST p
-  %attrs;
-  %TextAlign;
-  >
-
-<!--=================== Headings =========================================-->
-
-<!--
-  There are six levels of headings from h1 (the most important)
-  to h6 (the least important).
--->
-
-<!ELEMENT h1  %Inline;>
-<!ATTLIST h1
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h2 %Inline;>
-<!ATTLIST h2
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h3 %Inline;>
-<!ATTLIST h3
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h4 %Inline;>
-<!ATTLIST h4
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h5 %Inline;>
-<!ATTLIST h5
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h6 %Inline;>
-<!ATTLIST h6
-  %attrs;
-  %TextAlign;
-  >
-
-<!--=================== Lists ============================================-->
-
-<!-- Unordered list bullet styles -->
-
-<!ENTITY % ULStyle "(disc|square|circle)">
-
-<!-- Unordered list -->
-
-<!ELEMENT ul (li)+>
-<!ATTLIST ul
-  %attrs;
-  type        %ULStyle;     #IMPLIED
-  compact     (compact)     #IMPLIED
-  >
-
-<!-- Ordered list numbering style
-
-    1   arabic numbers      1, 2, 3, ...
-    a   lower alpha         a, b, c, ...
-    A   upper alpha         A, B, C, ...
-    i   lower roman         i, ii, iii, ...
-    I   upper roman         I, II, III, ...
-
-    The style is applied to the sequence number which by default
-    is reset to 1 for the first list item in an ordered list.
--->
-<!ENTITY % OLStyle "CDATA">
-
-<!-- Ordered (numbered) list -->
-
-<!ELEMENT ol (li)+>
-<!ATTLIST ol
-  %attrs;
-  type        %OLStyle;      #IMPLIED
-  compact     (compact)      #IMPLIED
-  start       %Number;       #IMPLIED
-  >
-
-<!-- single column list (DEPRECATED) -->
-<!ELEMENT menu (li)+>
-<!ATTLIST menu
-  %attrs;
-  compact     (compact)     #IMPLIED
-  >
-
-<!-- multiple column list (DEPRECATED) -->
-<!ELEMENT dir (li)+>
-<!ATTLIST dir
-  %attrs;
-  compact     (compact)     #IMPLIED
-  >
-
-<!-- LIStyle is constrained to: "(%ULStyle;|%OLStyle;)" -->
-<!ENTITY % LIStyle "CDATA">
-
-<!-- list item -->
-
-<!ELEMENT li %Flow;>
-<!ATTLIST li
-  %attrs;
-  type        %LIStyle;      #IMPLIED
-  value       %Number;       #IMPLIED
-  >
-
-<!-- definition lists - dt for term, dd for its definition -->
-
-<!ELEMENT dl (dt|dd)+>
-<!ATTLIST dl
-  %attrs;
-  compact     (compact)      #IMPLIED
-  >
-
-<!ELEMENT dt %Inline;>
-<!ATTLIST dt
-  %attrs;
-  >
-
-<!ELEMENT dd %Flow;>
-<!ATTLIST dd
-  %attrs;
-  >
-
-<!--=================== Address ==========================================-->
-
-<!-- information on author -->
-
-<!ELEMENT address (#PCDATA | %inline; | %misc.inline; | p)*>
-<!ATTLIST address
-  %attrs;
-  >
-
-<!--=================== Horizontal Rule ==================================-->
-
-<!ELEMENT hr EMPTY>
-<!ATTLIST hr
-  %attrs;
-  align       (left|center|right) #IMPLIED
-  noshade     (noshade)      #IMPLIED
-  size        %Pixels;       #IMPLIED
-  width       %Length;       #IMPLIED
-  >
-
-<!--=================== Preformatted Text ================================-->
-
-<!-- content is %Inline; excluding
-        "img|object|applet|big|small|sub|sup|font|basefont" -->
-
-<!ELEMENT pre %pre.content;>
-<!ATTLIST pre
-  %attrs;
-  width       %Number;      #IMPLIED
-  xml:space   (preserve)    #FIXED 'preserve'
-  >
-
-<!--=================== Block-like Quotes ================================-->
-
-<!ELEMENT blockquote %Flow;>
-<!ATTLIST blockquote
-  %attrs;
-  cite        %URI;          #IMPLIED
-  >
-
-<!--=================== Text alignment ===================================-->
-
-<!-- center content -->
-<!ELEMENT center %Flow;>
-<!ATTLIST center
-  %attrs;
-  >
-
-<!--=================== Inserted/Deleted Text ============================-->
-
-<!--
-  ins/del are allowed in block and inline content, but its
-  inappropriate to include block content within an ins element
-  occurring in inline content.
--->
-<!ELEMENT ins %Flow;>
-<!ATTLIST ins
-  %attrs;
-  cite        %URI;          #IMPLIED
-  datetime    %Datetime;     #IMPLIED
-  >
-
-<!ELEMENT del %Flow;>
-<!ATTLIST del
-  %attrs;
-  cite        %URI;          #IMPLIED
-  datetime    %Datetime;     #IMPLIED
-  >
-
-<!--================== The Anchor Element ================================-->
-
-<!-- content is %Inline; except that anchors shouldn't be nested -->
-
-<!ELEMENT a %a.content;>
-<!ATTLIST a
-  %attrs;
-  %focus;
-  charset     %Charset;      #IMPLIED
-  type        %ContentType;  #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  href        %URI;          #IMPLIED
-  hreflang    %LanguageCode; #IMPLIED
-  rel         %LinkTypes;    #IMPLIED
-  rev         %LinkTypes;    #IMPLIED
-  shape       %Shape;        "rect"
-  coords      %Coords;       #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!--===================== Inline Elements ================================-->
-
-<!ELEMENT span %Inline;> <!-- generic language/style container -->
-<!ATTLIST span
-  %attrs;
-  >
-
-<!ELEMENT bdo %Inline;>  <!-- I18N BiDi over-ride -->
-<!ATTLIST bdo
-  %coreattrs;
-  %events;
-  lang        %LanguageCode; #IMPLIED
-  xml:lang    %LanguageCode; #IMPLIED
-  dir         (ltr|rtl)      #REQUIRED
-  >
-
-<!ELEMENT br EMPTY>   <!-- forced line break -->
-<!ATTLIST br
-  %coreattrs;
-  clear       (left|all|right|none) "none"
-  >
-
-<!ELEMENT em %Inline;>   <!-- emphasis -->
-<!ATTLIST em %attrs;>
-
-<!ELEMENT strong %Inline;>   <!-- strong emphasis -->
-<!ATTLIST strong %attrs;>
-
-<!ELEMENT dfn %Inline;>   <!-- definitional -->
-<!ATTLIST dfn %attrs;>
-
-<!ELEMENT code %Inline;>   <!-- program code -->
-<!ATTLIST code %attrs;>
-
-<!ELEMENT samp %Inline;>   <!-- sample -->
-<!ATTLIST samp %attrs;>
-
-<!ELEMENT kbd %Inline;>  <!-- something user would type -->
-<!ATTLIST kbd %attrs;>
-
-<!ELEMENT var %Inline;>   <!-- variable -->
-<!ATTLIST var %attrs;>
-
-<!ELEMENT cite %Inline;>   <!-- citation -->
-<!ATTLIST cite %attrs;>
-
-<!ELEMENT abbr %Inline;>   <!-- abbreviation -->
-<!ATTLIST abbr %attrs;>
-
-<!ELEMENT acronym %Inline;>   <!-- acronym -->
-<!ATTLIST acronym %attrs;>
-
-<!ELEMENT q %Inline;>   <!-- inlined quote -->
-<!ATTLIST q
-  %attrs;
-  cite        %URI;          #IMPLIED
-  >
-
-<!ELEMENT sub %Inline;> <!-- subscript -->
-<!ATTLIST sub %attrs;>
-
-<!ELEMENT sup %Inline;> <!-- superscript -->
-<!ATTLIST sup %attrs;>
-
-<!ELEMENT tt %Inline;>   <!-- fixed pitch font -->
-<!ATTLIST tt %attrs;>
-
-<!ELEMENT i %Inline;>   <!-- italic font -->
-<!ATTLIST i %attrs;>
-
-<!ELEMENT b %Inline;>   <!-- bold font -->
-<!ATTLIST b %attrs;>
-
-<!ELEMENT big %Inline;>   <!-- bigger font -->
-<!ATTLIST big %attrs;>
-
-<!ELEMENT small %Inline;>   <!-- smaller font -->
-<!ATTLIST small %attrs;>
-
-<!ELEMENT u %Inline;>   <!-- underline -->
-<!ATTLIST u %attrs;>
-
-<!ELEMENT s %Inline;>   <!-- strike-through -->
-<!ATTLIST s %attrs;>
-
-<!ELEMENT strike %Inline;>   <!-- strike-through -->
-<!ATTLIST strike %attrs;>
-
-<!ELEMENT basefont EMPTY>  <!-- base font size -->
-<!ATTLIST basefont
-  id          ID             #IMPLIED
-  size        CDATA          #REQUIRED
-  color       %Color;        #IMPLIED
-  face        CDATA          #IMPLIED
-  >
-
-<!ELEMENT font %Inline;> <!-- local change to font -->
-<!ATTLIST font
-  %coreattrs;
-  %i18n;
-  size        CDATA          #IMPLIED
-  color       %Color;        #IMPLIED
-  face        CDATA          #IMPLIED
-  >
-
-<!--==================== Object ======================================-->
-<!--
-  object is used to embed objects as part of HTML pages.
-  param elements should precede other content. Parameters
-  can also be expressed as attribute/value pairs on the
-  object element itself when brevity is desired.
--->
-
-<!ELEMENT object (#PCDATA | param | %block; | form | %inline; | %misc;)*>
-<!ATTLIST object
-  %attrs;
-  declare     (declare)      #IMPLIED
-  classid     %URI;          #IMPLIED
-  codebase    %URI;          #IMPLIED
-  data        %URI;          #IMPLIED
-  type        %ContentType;  #IMPLIED
-  codetype    %ContentType;  #IMPLIED
-  archive     %UriList;      #IMPLIED
-  standby     %Text;         #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  usemap      %URI;          #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  align       %ImgAlign;     #IMPLIED
-  border      %Pixels;       #IMPLIED
-  hspace      %Pixels;       #IMPLIED
-  vspace      %Pixels;       #IMPLIED
-  >
-
-<!--
-  param is used to supply a named property value.
-  In XML it would seem natural to follow RDF and support an
-  abbreviated syntax where the param elements are replaced
-  by attribute value pairs on the object start tag.
--->
-<!ELEMENT param EMPTY>
-<!ATTLIST param
-  id          ID             #IMPLIED
-  name        CDATA          #REQUIRED
-  value       CDATA          #IMPLIED
-  valuetype   (data|ref|object) "data"
-  type        %ContentType;  #IMPLIED
-  >
-
-<!--=================== Java applet ==================================-->
-<!--
-  One of code or object attributes must be present.
-  Place param elements before other content.
--->
-<!ELEMENT applet (#PCDATA | param | %block; | form | %inline; | %misc;)*>
-<!ATTLIST applet
-  %coreattrs;
-  codebase    %URI;          #IMPLIED
-  archive     CDATA          #IMPLIED
-  code        CDATA          #IMPLIED
-  object      CDATA          #IMPLIED
-  alt         %Text;         #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  width       %Length;       #REQUIRED
-  height      %Length;       #REQUIRED
-  align       %ImgAlign;     #IMPLIED
-  hspace      %Pixels;       #IMPLIED
-  vspace      %Pixels;       #IMPLIED
-  >
-
-<!--=================== Images ===========================================-->
-
-<!--
-   To avoid accessibility problems for people who aren't
-   able to see the image, you should provide a text
-   description using the alt and longdesc attributes.
-   In addition, avoid the use of server-side image maps.
--->
-
-<!ELEMENT img EMPTY>
-<!ATTLIST img
-  %attrs;
-  src         %URI;          #REQUIRED
-  alt         %Text;         #REQUIRED
-  name        NMTOKEN        #IMPLIED
-  longdesc    %URI;          #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  usemap      %URI;          #IMPLIED
-  ismap       (ismap)        #IMPLIED
-  align       %ImgAlign;     #IMPLIED
-  border      %Length;       #IMPLIED
-  hspace      %Pixels;       #IMPLIED
-  vspace      %Pixels;       #IMPLIED
-  >
-
-<!-- usemap points to a map element which may be in this document
-  or an external document, although the latter is not widely supported -->
-
-<!--================== Client-side image maps ============================-->
-
-<!-- These can be placed in the same document or grouped in a
-     separate document although this isn't yet widely supported -->
-
-<!ELEMENT map ((%block; | form | %misc;)+ | area+)>
-<!ATTLIST map
-  %i18n;
-  %events;
-  id          ID             #REQUIRED
-  class       CDATA          #IMPLIED
-  style       %StyleSheet;   #IMPLIED
-  title       %Text;         #IMPLIED
-  name        CDATA          #IMPLIED
-  >
-
-<!ELEMENT area EMPTY>
-<!ATTLIST area
-  %attrs;
-  %focus;
-  shape       %Shape;        "rect"
-  coords      %Coords;       #IMPLIED
-  href        %URI;          #IMPLIED
-  nohref      (nohref)       #IMPLIED
-  alt         %Text;         #REQUIRED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!--================ Forms ===============================================-->
-
-<!ELEMENT form %form.content;>   <!-- forms shouldn't be nested -->
-
-<!ATTLIST form
-  %attrs;
-  action      %URI;          #REQUIRED
-  method      (get|post)     "get"
-  name        NMTOKEN        #IMPLIED
-  enctype     %ContentType;  "application/x-www-form-urlencoded"
-  onsubmit    %Script;       #IMPLIED
-  onreset     %Script;       #IMPLIED
-  accept      %ContentTypes; #IMPLIED
-  accept-charset %Charsets;  #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!--
-  Each label must not contain more than ONE field
-  Label elements shouldn't be nested.
--->
-<!ELEMENT label %Inline;>
-<!ATTLIST label
-  %attrs;
-  for         IDREF          #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  >
-
-<!ENTITY % InputType
-  "(text | password | checkbox |
-    radio | submit | reset |
-    file | hidden | image | button)"
-   >
-
-<!-- the name attribute is required for all but submit & reset -->
-
-<!ELEMENT input EMPTY>     <!-- form control -->
-<!ATTLIST input
-  %attrs;
-  %focus;
-  type        %InputType;    "text"
-  name        CDATA          #IMPLIED
-  value       CDATA          #IMPLIED
-  checked     (checked)      #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  readonly    (readonly)     #IMPLIED
-  size        CDATA          #IMPLIED
-  maxlength   %Number;       #IMPLIED
-  src         %URI;          #IMPLIED
-  alt         CDATA          #IMPLIED
-  usemap      %URI;          #IMPLIED
-  onselect    %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  accept      %ContentTypes; #IMPLIED
-  align       %ImgAlign;     #IMPLIED
-  >
-
-<!ELEMENT select (optgroup|option)+>  <!-- option selector -->
-<!ATTLIST select
-  %attrs;
-  name        CDATA          #IMPLIED
-  size        %Number;       #IMPLIED
-  multiple    (multiple)     #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  >
-
-<!ELEMENT optgroup (option)+>   <!-- option group -->
-<!ATTLIST optgroup
-  %attrs;
-  disabled    (disabled)     #IMPLIED
-  label       %Text;         #REQUIRED
-  >
-
-<!ELEMENT option (#PCDATA)>     <!-- selectable choice -->
-<!ATTLIST option
-  %attrs;
-  selected    (selected)     #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  label       %Text;         #IMPLIED
-  value       CDATA          #IMPLIED
-  >
-
-<!ELEMENT textarea (#PCDATA)>     <!-- multi-line text field -->
-<!ATTLIST textarea
-  %attrs;
-  %focus;
-  name        CDATA          #IMPLIED
-  rows        %Number;       #REQUIRED
-  cols        %Number;       #REQUIRED
-  disabled    (disabled)     #IMPLIED
-  readonly    (readonly)     #IMPLIED
-  onselect    %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  >
-
-<!--
-  The fieldset element is used to group form fields.
-  Only one legend element should occur in the content
-  and if present should only be preceded by whitespace.
--->
-<!ELEMENT fieldset (#PCDATA | legend | %block; | form | %inline; | %misc;)*>
-<!ATTLIST fieldset
-  %attrs;
-  >
-
-<!ENTITY % LAlign "(top|bottom|left|right)">
-
-<!ELEMENT legend %Inline;>     <!-- fieldset label -->
-<!ATTLIST legend
-  %attrs;
-  accesskey   %Character;    #IMPLIED
-  align       %LAlign;       #IMPLIED
-  >
-
-<!--
- Content is %Flow; excluding a, form, form controls, iframe
--->
-<!ELEMENT button %button.content;>  <!-- push button -->
-<!ATTLIST button
-  %attrs;
-  %focus;
-  name        CDATA          #IMPLIED
-  value       CDATA          #IMPLIED
-  type        (button|submit|reset) "submit"
-  disabled    (disabled)     #IMPLIED
-  >
-
-<!-- single-line text input control (DEPRECATED) -->
-<!ELEMENT isindex EMPTY>
-<!ATTLIST isindex
-  %coreattrs;
-  %i18n;
-  prompt      %Text;         #IMPLIED
-  >
-
-<!--======================= Tables =======================================-->
-
-<!-- Derived from IETF HTML table standard, see [RFC1942] -->
-
-<!--
- The border attribute sets the thickness of the frame around the
- table. The default units are screen pixels.
-
- The frame attribute specifies which parts of the frame around
- the table should be rendered. The values are not the same as
- CALS to avoid a name clash with the valign attribute.
--->
-<!ENTITY % TFrame "(void|above|below|hsides|lhs|rhs|vsides|box|border)">
-
-<!--
- The rules attribute defines which rules to draw between cells:
-
- If rules is absent then assume:
-     "none" if border is absent or border="0" otherwise "all"
--->
-
-<!ENTITY % TRules "(none | groups | rows | cols | all)">
-
-<!-- horizontal placement of table relative to document -->
-<!ENTITY % TAlign "(left|center|right)">
-
-<!-- horizontal alignment attributes for cell contents
-
-  char        alignment char, e.g. char=':'
-  charoff     offset for alignment char
--->
-<!ENTITY % cellhalign
-  "align      (left|center|right|justify|char) #IMPLIED
-   char       %Character;    #IMPLIED
-   charoff    %Length;       #IMPLIED"
-  >
-
-<!-- vertical alignment attributes for cell contents -->
-<!ENTITY % cellvalign
-  "valign     (top|middle|bottom|baseline) #IMPLIED"
-  >
-
-<!ELEMENT table
-     (caption?, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+))>
-<!ELEMENT caption  %Inline;>
-<!ELEMENT thead    (tr)+>
-<!ELEMENT tfoot    (tr)+>
-<!ELEMENT tbody    (tr)+>
-<!ELEMENT colgroup (col)*>
-<!ELEMENT col      EMPTY>
-<!ELEMENT tr       (th|td)+>
-<!ELEMENT th       %Flow;>
-<!ELEMENT td       %Flow;>
-
-<!-- ###### CB -  Added height and background attribute ##### -->
-<!ATTLIST table
-  %attrs;
-  summary     %Text;         #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  border      %Pixels;       #IMPLIED
-  frame       %TFrame;       #IMPLIED
-  rules       %TRules;       #IMPLIED
-  cellspacing %Length;       #IMPLIED
-  cellpadding %Length;       #IMPLIED
-  align       %TAlign;       #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  background  %Text;         #IMPLIED
-  >
-
-<!ENTITY % CAlign "(top|bottom|left|right)">
-
-<!ATTLIST caption
-  %attrs;
-  align       %CAlign;       #IMPLIED
-  >
-
-<!--
-colgroup groups a set of col elements. It allows you to group
-several semantically related columns together.
--->
-<!ATTLIST colgroup
-  %attrs;
-  span        %Number;       "1"
-  width       %MultiLength;  #IMPLIED
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!--
- col elements define the alignment properties for cells in
- one or more columns.
-
- The width attribute specifies the width of the columns, e.g.
-
-     width=64        width in screen pixels
-     width=0.5*      relative width of 0.5
-
- The span attribute causes the attributes of one
- col element to apply to more than one column.
--->
-<!ATTLIST col
-  %attrs;
-  span        %Number;       "1"
-  width       %MultiLength;  #IMPLIED
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!--
-    Use thead to duplicate headers when breaking table
-    across page boundaries, or for static headers when
-    tbody sections are rendered in scrolling panel.
-
-    Use tfoot to duplicate footers when breaking table
-    across page boundaries, or for static footers when
-    tbody sections are rendered in scrolling panel.
-
-    Use multiple tbody sections when rules are needed
-    between groups of table rows.
--->
-<!ATTLIST thead
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tfoot
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tbody
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tr
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  bgcolor     %Color;        #IMPLIED
-  >
-
-<!-- Scope is simpler than headers attribute for common tables -->
-<!ENTITY % Scope "(row|col|rowgroup|colgroup)">
-
-<!-- th is for headers, td for data and for cells acting as both -->
-
-<!ATTLIST th
-  %attrs;
-  abbr        %Text;         #IMPLIED
-  axis        CDATA          #IMPLIED
-  headers     IDREFS         #IMPLIED
-  scope       %Scope;        #IMPLIED
-  rowspan     %Number;       "1"
-  colspan     %Number;       "1"
-  %cellhalign;
-  %cellvalign;
-  nowrap      (nowrap)       #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  width       %Length;       #IMPLIED
-  height      %Length;       #IMPLIED
-  >
-
-<!ATTLIST td
-  %attrs;
-  abbr        %Text;         #IMPLIED
-  axis        CDATA          #IMPLIED
-  headers     IDREFS         #IMPLIED
-  scope       %Scope;        #IMPLIED
-  rowspan     %Number;       "1"
-  colspan     %Number;       "1"
-  %cellhalign;
-  %cellvalign;
-  nowrap      (nowrap)       #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  width       %Length;       #IMPLIED
-  height      %Length;       #IMPLIED
-  >
-
diff --git a/test/xid/test/Test.java b/test/xid/test/Test.java
deleted file mode 100644
index b12acf6..0000000
--- a/test/xid/test/Test.java
+++ /dev/null
@@ -1,237 +0,0 @@
-package xid.test;
-
-import java.util.*;
-import java.io.*;
-import xid.*;
-
-/**
- *
- */
-class Test
-{
-  static private org.apache.log4j.Logger log;
-
-  static
-    { 
-      // Initialize log.
-      org.apache.log4j.Logger log = null;
-      
-      org.apache.log4j.BasicConfigurator.configure ();
-
-
-      log = org.apache.log4j.Logger.getRootLogger ();
-      //log.setLevel (org.apache.log4j.Level.INFO);
-      log.setLevel (org.apache.log4j.Level.INFO);
-      
-      log.info ("Enter");
-      
-      //
-      log.info ("Set the log file format...");
-       
-      
-      // log = org.apache.log4j.Category.getInstance(Application.class.getName());
-      log.info ("... done.");
-      
-      log.debug ("Exit");
-      log = org.apache.log4j.Logger.getLogger (Test.class.getName ());
-    }
-
-
-
-  /**
-   *
-   */
-  public static String check (String title, StringBuffer source, String model)
-  {
-    String result;
-
-    if (source.indexOf (model) == -1)
-      {
-	result = String.format ("%-40s  ->  KO  <-", title) + "\nGet:\n" + source + "\nWaiting:\n" + model;
-	
-      }
-    else
-      {
-	result = String.format ("%-40s    [ OK ]  ", title);
-      }
-    
-
-    //
-    return (result);
-  }
-
-  public enum MONTHS {JANUARY, FEBRUARY, MARCH, APRIL, MAY, JUNE, JULY, AUGUST, SEPTEMBER, OCTOBER, NOVEMBRE, DECEMBRE};
- 
-  /**
-   *
-   */
-  public static void main(String[] args)
-  {
-    System.out.println("Automatic test action for Xid!");
-
-
-    Data datas;
-    IdData tag;
-
-
-    String htmlSource;
-    StringBuffer html;
-    StringBuffer errorMessage;
-
-    // Populate attributes of Test 03.
-    System.out.println ("----------------------------");
-    datas = new Data ();
-    datas.setContent ("name", "Superman");
-    errorMessage = new StringBuffer ();
-
-    html = StringPresenter.doXid ("<div id='name'>a name</div >", datas, errorMessage);
-
-    System.out.println (check ("only content change", html, "<div id=\"name\">Superman</div>"));
-
-
-    // Populate attributes of Test 03.
-    System.out.println ("----------------------------");
-    datas = new Data ();
-    datas.setContent ("lastname", "Spiderman");
-    datas.appendAttribute ("lastname", "style", "background: blue;");
-    datas.appendAttribute ("lastname", "style", "foreground: red;");
-    datas.setAttribute ("lastname", "class", "nameClass");
-
-    errorMessage = new StringBuffer ();
-    html = StringPresenter.doXid ("<div id='lastname'>a last name</div >", datas, errorMessage);
-    System.out.println (check ("content and attributes", html, "<div class=\"nameClass\" style=\"background: blue;foreground: red;\" id=\"lastname\">Spiderman</div>"));
-
-    // Populate attributes of Test 03.
-    System.out.println ("----------------------------");
-    datas = new Data ();
-    datas.setContent ("words", 0, "alpha");
-    datas.setContent ("words", 1, "bravo");
-    datas.setContent ("words", 2, "charlie");
-    datas.setContent ("words", 3, "delta");
-    datas.setContent ("words", 4, "echo");
-    datas.setContent ("words", 5, "fox");
-
-
-    errorMessage = new StringBuffer ();
-    html = StringPresenter.doXid ("<ul>\n  <li id='words'>a word</li>\n</ul>", datas, errorMessage);
-    
-    System.out.println (check ("list assertion 1", html, "<li id=\"words_0\">alpha</li>"));
-    System.out.println (check ("list assertion 2", html, "<li id=\"words_1\">bravo</li>"));
-    System.out.println (check ("list assertion 3", html, "<li id=\"words_2\">charlie</li>"));
-    System.out.println (check ("list assertion 4", html, "<li id=\"words_3\">delta</li>"));
-    System.out.println (check ("list assertion 5", html, "<li id=\"words_4\">echo</li>"));
-    System.out.println (check ("list assertion 6", html, "<li id=\"words_5\">fox</li>"));
- 
-    // Populate attributes of Test 03.
-    System.out.println ("----------------------------");
-    datas = new Data ();
-    datas.setContent ("identity", 0, "nom", "Jemba");
-    datas.setContent ("identity", 0, "prenom", "Epo");
-    datas.setContent ("identity", 1, "nom", "Momon");
-    datas.setContent ("identity", 1, "prenom", "Christian");
-    datas.setContent ("identity", 2, "nom", "Tronche");
-    datas.setContent ("identity", 2, "prenom", "Christophe");
-
-
-    errorMessage = new StringBuffer ();
-    StringBuffer source = new StringBuffer ();
-    source.append ("<table>\n");
-    source.append (" <tr id='identity'><td>noid</td><td id='nom'>un nom</td><td id='prenom'>un prenom</td></tr>\n");
-    source.append ("</table>");
-    htmlSource = source.toString ();
-    html = StringPresenter.doXid (htmlSource, datas, errorMessage);
-    
-    System.out.println (check ("table 1 assertion 1", html, "<tr id=\"identity_0\"><td>noid</td><td id=\"nom_0\">Jemba</td><td id=\"prenom_0\">Epo</td></tr>"));
-    System.out.println (check ("table 1 assertion 2", html, "<tr id=\"identity_1\"><td>noid</td><td id=\"nom_1\">Momon</td><td id=\"prenom_1\">Christian</td></tr>"));
-    System.out.println (check ("table 1 assertion 3", html, "<tr id=\"identity_2\"><td>noid</td><td id=\"nom_2\">Tronche</td><td id=\"prenom_2\">Christophe</td></tr>"));
-
-    /*
-    // Populate attributes of Test 03.
-    System.out.println ("----------------------------");
-    datas = new Data ();
-    datas.setContent ("identity", 0, "nom", "Jemba");
-    datas.setContent ("identity", 0, "prenom", "Epo");
-    datas.setContent ("identity", 1, "nom", "Momon");
-    datas.setContent ("identity", 1, "prenom", "Christian");
-    datas.setContent ("identity", 2, "nom", "Tronche");
-    datas.setContent ("identity", 2, "prenom", "Christophe");
-    datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_FIRST_ROW);
-    //datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITH_ID);
-    //datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITHOUT_ID);
-    //datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ALL_ROWS);
-
-
-    errorMessage = new StringBuffer ();
-    source = new StringBuffer ();
-    source.append ("<table>\n");
-    source.append ("  <tr id='identity'><td>noid</td><td id='nom'>un nom</td><td id='prenom'>un prenom</td></tr>\n");
-    source.append ("  <tr id='identity2'><td>noid</td><td id='nom2'>un nom</td><td id='prenom2'>un prenom</td></tr>\n");
-    source.append ("  <tr><td>noid</td><td id='nom3'>un nom</td><td id='prenom3'>un prenom</td></tr>\n");
-    source.append ("</table>");
-    htmlSource = source.toString ();
-    
-    System.out.println ("datas = new Data ();");
-    System.out.println ("datas.setContent (\"identity\", 0, \"nom\", \"Jemba\");");
-    System.out.println ("datas.setContent (\"identity\", 0, \"prenom\", \"Epo\");");
-    System.out.println ("datas.setContent (\"identity\", 1, \"nom\", \"Momon\");");
-    System.out.println ("datas.setContent (\"identity\", 1, \"prenom\", \"Christian\");");
-    System.out.println ("datas.setContent (\"identity\", 2, \"nom\", \"Tronche\");");
-    System.out.println ("datas.setContent (\"identity\", 2, \"prenom\", \"Christophe\");");
-
-    System.out.println ("+");
-    System.out.println (htmlSource);
-    System.out.println ("=>");
-
-    
-    datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_FIRST_ROW);
-    System.out.println ("ONLY_FIRST_ROW:");
-    html = Presenter.doXid (htmlSource, datas, "", errorMessage);
-    System.out.println (html);
-
-    datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITH_ID);
-    System.out.println ("ONLY_ROWS_WITH_ID:");
-    html = Presenter.doXid (htmlSource, datas, "", errorMessage);
-    System.out.println (html);
-
-    datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ONLY_ROWS_WITHOUT_ID);
-    System.out.println ("ONLY_ROWS_WITHOUT_ID:");
-    html = Presenter.doXid (htmlSource, datas, "", errorMessage);
-    System.out.println (html);
-
-    datas.setIterationStrategy ("identity", IdsDataByIndex.IterationStrategy.ALL_ROWS);
-    System.out.println ("ALL_ROWS:");
-    html = Presenter.doXid (htmlSource, datas, "", errorMessage);
-    System.out.println (html);
-
-
-
-    // Populate attributes of Test 03.
-    System.out.println ("----------------------------");
-    datas = new Data ();
-    datas.setAttribute ("<div>", "class", "aDivClass");
-    datas.setAttribute ("<div>", "style", "background-color: #000000;");
-    datas.setAttribute ("number", "style", "background-color: #0000FF;");
-
-    errorMessage = new StringBuffer ();
-    source = new StringBuffer ();
-    source.append ("<div>\n");
-    source.append ("  <h1>one</h1>\n");
-    source.append ("</div>\n");
-    source.append ("<div id=\"number\">\n");
-    source.append ("  <h1>three</h1>\n");
-    source.append ("</div>");
-    htmlSource = source.toString ();
-    html = Presenter.doXid (htmlSource, datas, "", errorMessage);
-    
-    System.out.println (htmlSource);
-    System.out.println ("+");
-    System.out.println ("datas = new Data ();");
-    System.out.println ("datas.setAttribute (\"<div>\", \"class\", \"aDivClass\");");
-    System.out.println ("datas.setAttribute (\"<div>\", \"style\", \"background-color: #000000;\");");
-    System.out.println ("datas.setAttribute (\"number\", \"style\", \"background-color: #0000FF;\");");
-
-    System.out.println ("=>");
-    System.out.println (html);
-    */
-  }
-}
diff --git a/webapp-examples/WEB-INF/classes/build.xml b/webapp-examples/WEB-INF/classes/build.xml
deleted file mode 100644
index 9405f9d..0000000
--- a/webapp-examples/WEB-INF/classes/build.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE project>
-<!-- Builds the XID Test files. -->
-<project name="xid" default="dist" basedir=".">
-	<property name="targetjar" value="xid.jar"/>
-	<property name="zip_file" value="xid.zip"/>   <!-- Release zip file -->
-	<property name="src" value="src"/>
-	<property name="build" value="build"/>
-	<property name="doc" value="doc"/>
-	<property name="dist" value="dist"/>
-	<property name="resources" value="resources"/>
-	<property name="debug" value="on"/>
-
-	<target name="dist" depends="compile" />
-					
-	<!-- ******* Init ******* -->
-	<target name="init">
-		<tstamp/>
-	</target>
-
-	<!-- ******* Compile ******* -->
-	<target name="compile" depends="init">
-		<javac srcdir="xid" destdir="." debug="${debug}" deprecation="on">
-			<classpath>
-				<fileset dir="../lib" includes="**/*.jar"/>
-		        </classpath>
-		</javac>
-	</target>
-
-</project>
diff --git a/webapp-examples/WEB-INF/classes/log4j.properties b/webapp-examples/WEB-INF/classes/log4j.properties
deleted file mode 100644
index d23f58c..0000000
--- a/webapp-examples/WEB-INF/classes/log4j.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-# Log information (priority setting : DEBUG < INFO < WARN < ERROR)
-# ################
-log4j.rootCategory                              = INFO, Writer
-log4j.appender.Writer                           = org.apache.log4j.RollingFileAppender
-log4j.appender.Writer.File                      = /var/log/tomcat5/xid-test.log
-log4j.appender.Writer.MaxFileSize               = 100000KB
-log4j.appender.Writer.MaxBackupIndex            = 10
-log4j.appender.Writer.layout                    = org.apache.log4j.PatternLayout
-log4j.appender.Writer.layout.ConversionPattern  = %d{ISO8601} - %-17t %-6p %-34c.%20M - %m%n
diff --git a/webapp-examples/WEB-INF/classes/testXid.t b/webapp-examples/WEB-INF/classes/testXid.t
deleted file mode 100644
index 9037424..0000000
--- a/webapp-examples/WEB-INF/classes/testXid.t
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE html SYSTEM "xhtml1-transitional.dtd">
-<html>
-  <head>
-    <title>test</title>
-  </head>
-  <body>
-    Test 01: No id attribute
-    XHTML:  Hello <b title="a">world</b>.
-    no Java code
-    Result: Hello <b title="a">world</b>.
-
-    Test 02: id attribute with empty model
-    XHTML: Hello <b id="test02-original" title="b">world</b>.
-    no Java code
-    Result: Hello <b id="test02" title="b">world</b>.
-
-
-    Test 03: model changing the text
-    XHTML: Hello <b id="test03-original" title="c">world</b>.
-    // Populate attributes of Test 03.
-    text = new TextModel ();
-    text.getAttributes ().appendAttribute ("style", "background: blue;");
-    text.getAttributes ().appendAttribute ("style", "foreground: red;");
-    text.getAttributes ().setAttribute ("class", "totoClass");
-    text.setText ("mummy");
-    datas.put ("test03", text);
-    Result: Hello <b id="test03" title="c">world</b>.
-
-
-    Test 04: model changing title
-    XHTML: Hello <b id="test04-original" title="d">world</b>.
-    // Populate attributes of Test 04.
-    text = new TextModel ();
-    text.getAttributes ().setAttribute ("title", "another title");
-    datas.put ("test04", text);
-    Result: Hello <b id="test04" title="d">world</b>.
-
-
-    Test 05: model adding style attributes
-    XHTML: Hello <b id="test05-original" title="d">world</b>.
-    // Populate attributes of Test 05.
-    text = new TextModel ();
-    text.getAttributes ().appendAttribute ("style", "background: blue;");
-    text.getAttributes ().appendAttribute ("style", "foreground: red;");
-    text.getAttributes ().setAttribute ("class", "aClass");
-    datas.put ("test05", text);
-    Result: Hello <b id="test05" title="d">world</b>.
-
-
-    Test 06: model appending style attributes
-    XHTML: Hello <b id="test06-original" title="d" style="background:yellow;">world</b>.
-    // Populate attributes of Test 06.
-    text = new TextModel ();
-    text.getAttributes ().appendAttribute ("style", "foreground: red;");
-    text.getAttributes ().setAttribute ("class", "aClass");
-    datas.put ("test06", text);
-    Result: Hello <b id="test06" title="d" style="background:yellow;">world</b>.
-
-
-    Test 07: image
-    XHTML: A picture <img id="test07-original" src="http://www.ocmland.org/tmp/floatingb.jpg" alt="pinguoin flottant" />.
-    // Populate attributes of Test 07.
-    text = new TextModel ();
-    text.getAttributes ().setAttribute ("width", "50%");
-    datas.put ("test07", text);
-    Result: A picture <img id="test07" src="http://www.ocmland.org/tmp/floatingb.jpg" alt="pinguoin flottant" />.
-
-  </body>
-</html>
\ No newline at end of file
diff --git a/webapp-examples/WEB-INF/classes/xid/Test.class b/webapp-examples/WEB-INF/classes/xid/Test.class
deleted file mode 100644
index edb30be..0000000
Binary files a/webapp-examples/WEB-INF/classes/xid/Test.class and /dev/null differ
diff --git a/webapp-examples/WEB-INF/classes/xid/Test.java b/webapp-examples/WEB-INF/classes/xid/Test.java
deleted file mode 100644
index 20c2945..0000000
--- a/webapp-examples/WEB-INF/classes/xid/Test.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- *
- */
-package xid;
-import java.io.*;
-import java.text.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import xid.*;
-
-/**
- *
- */
-public class Test extends HttpServlet
-{
-  static private org.apache.log4j.Logger log;
-
-  static
-  { 
-    log = org.apache.log4j.Logger.getLogger (Test.class.getName());
-  }
-
-
-  /**
-   *
-   */
-  public void doPost (HttpServletRequest req,
-		      HttpServletResponse res)
-    throws ServletException, IOException
-  {
-    doGet (req, res);
-  }
-    
-
-
-  /**
-   *
-   */
-  public void doGet (HttpServletRequest request,
-		     HttpServletResponse response)
-    throws IOException, ServletException
-  {
-    log.info ("Enter");
-
-    Presenter xid = new Presenter (getServletContext ().getRealPath ("/"), "testXid.html");
-
-    //
-    TagsData datas = new TagsData ();
-    TextTagData text;
-
-    // Populate attributes of Test 03.
-    text = new TextTagData ();
-    datas.put ("test03", text);
-    text.setText ("mummy");
-    text.getAttributes ().appendAttribute ("style", "background: blue;");
-    text.getAttributes ().appendAttribute ("style", "foreground: red;");
-    text.getAttributes ().setAttribute ("class", "totoClass");
-
-
-    // Populate attributes of Test 04.
-    text = new TextTagData ();
-    text.getAttributes ().setAttribute ("title", "another title");
-    datas.put ("test04", text);
-
-    
-    // Populate attributes of Test 05.
-    text = new TextTagData ();
-    datas.put ("test05", text);
-    text.getAttributes ().appendAttribute ("style", "background: blue;");
-    text.getAttributes ().appendAttribute ("style", "foreground: red;");
-    text.getAttributes ().setAttribute ("class", "aClass");
-
-
-    // Populate attributes of Test 06.
-    text = new TextTagData ();
-    text.getAttributes ().appendAttribute ("style", "foreground: red;");
-    text.getAttributes ().setAttribute ("class", "aClass");
-    datas.put ("test06", text);
-
-
-    // Populate attributes of Test 07.
-    text = new TextTagData ();
-    text.getAttributes ().setAttribute ("width", "50%");
-    datas.put ("test07", text);
-
-
-    // Populate attributes of Test 09.
-    text = new TextTagData ();
-    text.getAttributes ().setAttribute ("class", "xid:nodisplay");
-    datas.put ("test09", text);
-
-
-    StringBuffer html;
-    StringBuffer errorMessage;
-
-    errorMessage = new StringBuffer ();
-    html = xid.doXid (datas, errorMessage);
-    
-
-    // Display page.
-    response.setContentType ("text/html");
-    PrintWriter out = response.getWriter();
-
-    out.println ("<html>");
-    out.println ("<head>");
-    out.println ("<title>XID TEST</title>");
-    out.println ("</head>");
-    out.println ("<body bgcolor=\"orange\">");
-
-    out.println ("<hr />");
-    out.println ("XID TEST<br/>");
-
-    if (errorMessage.length () != 0)
-      {
-	out.println ("An error occured in Xid treatment.<br/>");
-	out.println ("<pre>");
-	out.println (errorMessage);
-	out.println ("</pre>");
-	out.println ("<hr />");
-	out.println ("<pre>" + Presenter.restoreEntities (html) + "</pre>");
-	out.println ("<hr />");
-      }
-    else
-      {
-	out.println ("<pre>" + Presenter.restoreEntities (html) + "</pre>");
-      }
-    
-    out.println ("</body>");
-    out.println ("</html>");
-    
-    log.info ("Exit");
-  }
-}
-
-// ////////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/webapp-examples/WEB-INF/lib/xid.jar b/webapp-examples/WEB-INF/lib/xid.jar
deleted file mode 100644
index 0235c43..0000000
Binary files a/webapp-examples/WEB-INF/lib/xid.jar and /dev/null differ
diff --git a/webapp-examples/WEB-INF/web.xml b/webapp-examples/WEB-INF/web.xml
index b7eacff..2dff563 100644
--- a/webapp-examples/WEB-INF/web.xml
+++ b/webapp-examples/WEB-INF/web.xml
@@ -1,20 +1,11 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
 
     <display-name>XID TESTS</display-name>
     <description>
       Some tests on XID.
     </description>
 
-    <Context privileged="true" reloadable="true">
-        <Loader reloadable="true" className="org.apache.catalina.loader.WebappLoader" checkInterval ="2"/>
-    </Context>
-
     <!-- ========================================== -->
     <servlet>
         <servlet-name>XidTest</servlet-name>