227 files changed, 268 insertions, 182 deletions

diff --git a/lib/copying.txt b/lib/copying.txt
index 6fcdca1df..6fcdca1df 100755..100644
--- a/lib/copying.txt
+++ b/lib/copying.txt
diff --git a/lib/cycle.h b/lib/cycle.h
index 4d714ba3f..4d714ba3f 100755..100644
--- a/lib/cycle.h
+++ b/lib/cycle.h
diff --git a/lib/ecmas/dom.nim b/lib/ecmas/dom.nim
index 6d9224c26..6d9224c26 100755..100644
--- a/lib/ecmas/dom.nim
+++ b/lib/ecmas/dom.nim
diff --git a/lib/impure/db_mysql.nim b/lib/impure/db_mysql.nim
index 9c427ae3b..9c427ae3b 100755..100644
--- a/lib/impure/db_mysql.nim
+++ b/lib/impure/db_mysql.nim
diff --git a/lib/impure/db_postgres.nim b/lib/impure/db_postgres.nim
index 3296e688a..3296e688a 100755..100644
--- a/lib/impure/db_postgres.nim
+++ b/lib/impure/db_postgres.nim
diff --git a/lib/impure/dialogs.nim b/lib/impure/dialogs.nim
index 31c8ca0ff..31c8ca0ff 100755..100644
--- a/lib/impure/dialogs.nim
+++ b/lib/impure/dialogs.nim
diff --git a/lib/impure/web.nim b/lib/impure/web.nim
index ba74c285a..ba74c285a 100755..100644
--- a/lib/impure/web.nim
+++ b/lib/impure/web.nim
diff --git a/lib/impure/zipfiles.nim b/lib/impure/zipfiles.nim
index 09bf8f7cc..09bf8f7cc 100755..100644
--- a/lib/impure/zipfiles.nim
+++ b/lib/impure/zipfiles.nim
diff --git a/lib/lgpl.txt b/lib/lgpl.txt
index f6fa6c9e5..f6fa6c9e5 100755..100644
--- a/lib/lgpl.txt
+++ b/lib/lgpl.txt
diff --git a/lib/newwrap/cairo/cairo.nim b/lib/newwrap/cairo/cairo.nim
index 77b2efa7b..77b2efa7b 100755..100644
--- a/lib/newwrap/cairo/cairo.nim
+++ b/lib/newwrap/cairo/cairo.nim
diff --git a/lib/newwrap/cairo/cairoft.nim b/lib/newwrap/cairo/cairoft.nim
index 16a80e7f7..16a80e7f7 100755..100644
--- a/lib/newwrap/cairo/cairoft.nim
+++ b/lib/newwrap/cairo/cairoft.nim
diff --git a/lib/newwrap/cairo/cairowin32.nim b/lib/newwrap/cairo/cairowin32.nim
index cec3a5bc5..cec3a5bc5 100755..100644
--- a/lib/newwrap/cairo/cairowin32.nim
+++ b/lib/newwrap/cairo/cairowin32.nim
diff --git a/lib/newwrap/cairo/cairoxlib.nim b/lib/newwrap/cairo/cairoxlib.nim
index 861c55527..861c55527 100755..100644
--- a/lib/newwrap/cairo/cairoxlib.nim
+++ b/lib/newwrap/cairo/cairoxlib.nim
diff --git a/lib/newwrap/gtk/atk.nim b/lib/newwrap/gtk/atk.nim
index 0178ade6f..0178ade6f 100755..100644
--- a/lib/newwrap/gtk/atk.nim
+++ b/lib/newwrap/gtk/atk.nim
diff --git a/lib/newwrap/gtk/gdk2.nim b/lib/newwrap/gtk/gdk2.nim
index f2e12ab24..f2e12ab24 100755..100644
--- a/lib/newwrap/gtk/gdk2.nim
+++ b/lib/newwrap/gtk/gdk2.nim
diff --git a/lib/newwrap/gtk/gdk2pixbuf.nim b/lib/newwrap/gtk/gdk2pixbuf.nim
index f22ab345b..f22ab345b 100755..100644
--- a/lib/newwrap/gtk/gdk2pixbuf.nim
+++ b/lib/newwrap/gtk/gdk2pixbuf.nim
diff --git a/lib/newwrap/gtk/gdkglext.nim b/lib/newwrap/gtk/gdkglext.nim
index 4fa20b969..4fa20b969 100755..100644
--- a/lib/newwrap/gtk/gdkglext.nim
+++ b/lib/newwrap/gtk/gdkglext.nim
diff --git a/lib/newwrap/gtk/glib2.nim b/lib/newwrap/gtk/glib2.nim
index 7ace55f7c..7ace55f7c 100755..100644
--- a/lib/newwrap/gtk/glib2.nim
+++ b/lib/newwrap/gtk/glib2.nim
diff --git a/lib/newwrap/gtk/gtk2.nim b/lib/newwrap/gtk/gtk2.nim
index 3abe363e3..3abe363e3 100755..100644
--- a/lib/newwrap/gtk/gtk2.nim
+++ b/lib/newwrap/gtk/gtk2.nim
diff --git a/lib/newwrap/gtk/gtkglext.nim b/lib/newwrap/gtk/gtkglext.nim
index 265730b83..265730b83 100755..100644
--- a/lib/newwrap/gtk/gtkglext.nim
+++ b/lib/newwrap/gtk/gtkglext.nim
diff --git a/lib/newwrap/gtk/gtkhtml.nim b/lib/newwrap/gtk/gtkhtml.nim
index 59568d6d0..59568d6d0 100755..100644
--- a/lib/newwrap/gtk/gtkhtml.nim
+++ b/lib/newwrap/gtk/gtkhtml.nim
diff --git a/lib/newwrap/gtk/libglade2.nim b/lib/newwrap/gtk/libglade2.nim
index 47e78e05e..47e78e05e 100755..100644
--- a/lib/newwrap/gtk/libglade2.nim
+++ b/lib/newwrap/gtk/libglade2.nim
diff --git a/lib/newwrap/gtk/pango.nim b/lib/newwrap/gtk/pango.nim
index 1443aba1d..1443aba1d 100755..100644
--- a/lib/newwrap/gtk/pango.nim
+++ b/lib/newwrap/gtk/pango.nim
diff --git a/lib/newwrap/gtk/pangoutils.nim b/lib/newwrap/gtk/pangoutils.nim
index 552362b9a..552362b9a 100755..100644
--- a/lib/newwrap/gtk/pangoutils.nim
+++ b/lib/newwrap/gtk/pangoutils.nim
diff --git a/lib/newwrap/libcurl.nim b/lib/newwrap/libcurl.nim
index 875f1cbc8..875f1cbc8 100755..100644
--- a/lib/newwrap/libcurl.nim
+++ b/lib/newwrap/libcurl.nim
diff --git a/lib/newwrap/lua/lauxlib.nim b/lib/newwrap/lua/lauxlib.nim
index bcb806f74..bcb806f74 100755..100644
--- a/lib/newwrap/lua/lauxlib.nim
+++ b/lib/newwrap/lua/lauxlib.nim
diff --git a/lib/newwrap/lua/lua.nim b/lib/newwrap/lua/lua.nim
index 000e09993..000e09993 100755..100644
--- a/lib/newwrap/lua/lua.nim
+++ b/lib/newwrap/lua/lua.nim
diff --git a/lib/newwrap/lua/lualib.nim b/lib/newwrap/lua/lualib.nim
index 94f08a1f1..94f08a1f1 100755..100644
--- a/lib/newwrap/lua/lualib.nim
+++ b/lib/newwrap/lua/lualib.nim
diff --git a/lib/newwrap/mysql.nim b/lib/newwrap/mysql.nim
index 2a7a10c58..2a7a10c58 100755..100644
--- a/lib/newwrap/mysql.nim
+++ b/lib/newwrap/mysql.nim
diff --git a/lib/newwrap/opengl/gl.nim b/lib/newwrap/opengl/gl.nim
index 9387b5bc9..9387b5bc9 100755..100644
--- a/lib/newwrap/opengl/gl.nim
+++ b/lib/newwrap/opengl/gl.nim
diff --git a/lib/newwrap/opengl/glext.nim b/lib/newwrap/opengl/glext.nim
index 32871df0e..32871df0e 100755..100644
--- a/lib/newwrap/opengl/glext.nim
+++ b/lib/newwrap/opengl/glext.nim
diff --git a/lib/newwrap/opengl/glu.nim b/lib/newwrap/opengl/glu.nim
index 29edb0df2..29edb0df2 100755..100644
--- a/lib/newwrap/opengl/glu.nim
+++ b/lib/newwrap/opengl/glu.nim
diff --git a/lib/newwrap/opengl/glut.nim b/lib/newwrap/opengl/glut.nim
index 43bee3382..43bee3382 100755..100644
--- a/lib/newwrap/opengl/glut.nim
+++ b/lib/newwrap/opengl/glut.nim
diff --git a/lib/newwrap/opengl/glx.nim b/lib/newwrap/opengl/glx.nim
index 76c052d70..76c052d70 100755..100644
--- a/lib/newwrap/opengl/glx.nim
+++ b/lib/newwrap/opengl/glx.nim
diff --git a/lib/newwrap/opengl/wingl.nim b/lib/newwrap/opengl/wingl.nim
index 7ed78f970..7ed78f970 100755..100644
--- a/lib/newwrap/opengl/wingl.nim
+++ b/lib/newwrap/opengl/wingl.nim
diff --git a/lib/newwrap/pcre/pcre.nim b/lib/newwrap/pcre/pcre.nim
index c2220b4e5..c2220b4e5 100755..100644
--- a/lib/newwrap/pcre/pcre.nim
+++ b/lib/newwrap/pcre/pcre.nim
diff --git a/lib/newwrap/postgres.nim b/lib/newwrap/postgres.nim
index 84e7d5abc..84e7d5abc 100755..100644
--- a/lib/newwrap/postgres.nim
+++ b/lib/newwrap/postgres.nim
diff --git a/lib/newwrap/sdl/sdl.nim b/lib/newwrap/sdl/sdl.nim
index 48553f96d..48553f96d 100755..100644
--- a/lib/newwrap/sdl/sdl.nim
+++ b/lib/newwrap/sdl/sdl.nim
diff --git a/lib/newwrap/sdl/sdl_gfx.nim b/lib/newwrap/sdl/sdl_gfx.nim
index 4bce944ec..4bce944ec 100755..100644
--- a/lib/newwrap/sdl/sdl_gfx.nim
+++ b/lib/newwrap/sdl/sdl_gfx.nim
diff --git a/lib/newwrap/sdl/sdl_image.nim b/lib/newwrap/sdl/sdl_image.nim
index f1f0eb8cc..f1f0eb8cc 100755..100644
--- a/lib/newwrap/sdl/sdl_image.nim
+++ b/lib/newwrap/sdl/sdl_image.nim
diff --git a/lib/newwrap/sdl/sdl_mixer.nim b/lib/newwrap/sdl/sdl_mixer.nim
index fb9ae4871..fb9ae4871 100755..100644
--- a/lib/newwrap/sdl/sdl_mixer.nim
+++ b/lib/newwrap/sdl/sdl_mixer.nim
diff --git a/lib/newwrap/sdl/sdl_mixer_nosmpeg.nim b/lib/newwrap/sdl/sdl_mixer_nosmpeg.nim
index 321b0e519..321b0e519 100755..100644
--- a/lib/newwrap/sdl/sdl_mixer_nosmpeg.nim
+++ b/lib/newwrap/sdl/sdl_mixer_nosmpeg.nim
diff --git a/lib/newwrap/sdl/sdl_net.nim b/lib/newwrap/sdl/sdl_net.nim
index 5a6445af9..5a6445af9 100755..100644
--- a/lib/newwrap/sdl/sdl_net.nim
+++ b/lib/newwrap/sdl/sdl_net.nim
diff --git a/lib/newwrap/sdl/sdl_ttf.nim b/lib/newwrap/sdl/sdl_ttf.nim
index bab48ec53..bab48ec53 100755..100644
--- a/lib/newwrap/sdl/sdl_ttf.nim
+++ b/lib/newwrap/sdl/sdl_ttf.nim
diff --git a/lib/newwrap/sdl/smpeg.nim b/lib/newwrap/sdl/smpeg.nim
index 09ca5a018..09ca5a018 100755..100644
--- a/lib/newwrap/sdl/smpeg.nim
+++ b/lib/newwrap/sdl/smpeg.nim
diff --git a/lib/newwrap/sqlite3.nim b/lib/newwrap/sqlite3.nim
index f2912f05f..f2912f05f 100755..100644
--- a/lib/newwrap/sqlite3.nim
+++ b/lib/newwrap/sqlite3.nim
diff --git a/lib/newwrap/tcl.nim b/lib/newwrap/tcl.nim
index f2ecf558d..f2ecf558d 100755..100644
--- a/lib/newwrap/tcl.nim
+++ b/lib/newwrap/tcl.nim
diff --git a/lib/nimbase.h b/lib/nimbase.h
index dc0ac6e0f..dc0ac6e0f 100755..100644
--- a/lib/nimbase.h
+++ b/lib/nimbase.h
diff --git a/lib/posix/posix.nim b/lib/posix/posix.nim
index 6bda372bb..6bda372bb 100755..100644
--- a/lib/posix/posix.nim
+++ b/lib/posix/posix.nim
diff --git a/lib/pure/browsers.nim b/lib/pure/browsers.nim
index 243c07dad..243c07dad 100755..100644
--- a/lib/pure/browsers.nim
+++ b/lib/pure/browsers.nim
diff --git a/lib/pure/cgi.nim b/lib/pure/cgi.nim
index 490ae926d..490ae926d 100755..100644
--- a/lib/pure/cgi.nim
+++ b/lib/pure/cgi.nim
diff --git a/lib/pure/complex.nim b/lib/pure/complex.nim
index f50ff4bd0..f50ff4bd0 100755..100644
--- a/lib/pure/complex.nim
+++ b/lib/pure/complex.nim
diff --git a/lib/pure/dynlib.nim b/lib/pure/dynlib.nim
index 592073e3d..592073e3d 100755..100644
--- a/lib/pure/dynlib.nim
+++ b/lib/pure/dynlib.nim
diff --git a/lib/pure/hashes.nim b/lib/pure/hashes.nim
index 1593119bd..1593119bd 100755..100644
--- a/lib/pure/hashes.nim
+++ b/lib/pure/hashes.nim
diff --git a/lib/pure/hashtabs.nim b/lib/pure/hashtabs.nim
index 68d19d63b..68d19d63b 100755..100644
--- a/lib/pure/hashtabs.nim
+++ b/lib/pure/hashtabs.nim
diff --git a/lib/pure/htmlparser.nim b/lib/pure/htmlparser.nim
index df840e15c..5c88f211d 100755..100644
--- a/lib/pure/htmlparser.nim
+++ b/lib/pure/htmlparser.nim
@@ -11,7 +11,7 @@
 ## It is supposed to handle the *wild* HTML the real world uses.
 ## 
 ## It can be used to parse a wild HTML document and output it as valid XHTML
-## document (if you are lucky):
+## document (well, if you are lucky):
 ##
 ## .. code-block:: nimrod
 ##
@@ -23,24 +23,29 @@
 ## **Note:** The resulting ``PXmlNode``s already use the ``clientData`` field, 
 ## so it cannot be used by clients of this library.
 
-import streams, parsexml, xmltree
+import strutils, streams, parsexml, xmltree, unicode, strtabs
 
 type
   THtmlTag* = enum ## list of all supported HTML tags; order will always be
                    ## alphabetically
     tagUnknown,    ## unknown HTML element
     tagA,          ## the HTML ``a`` element
+    tagAbbr,       ## the deprecated HTML ``abbr`` element
     tagAcronym,    ## the HTML ``acronym`` element
     tagAddress,    ## the HTML ``address`` element
+    tagApplet,     ## the deprecated HTML ``applet`` element
     tagArea,       ## the HTML ``area`` element
     tagB,          ## the HTML ``b`` element
     tagBase,       ## the HTML ``base`` element
+    tagBdo,        ## the deprecated HTML ``dbo`` element
+    tagBasefont,   ## the deprecated HTML ``basefont`` element
     tagBig,        ## the HTML ``big`` element
     tagBlockquote, ## the HTML ``blockquote`` element
     tagBody,       ## the HTML ``body`` element
     tagBr,         ## the HTML ``br`` element
     tagButton,     ## the HTML ``button`` element
     tagCaption,    ## the HTML ``caption`` element
+    tagCenter,     ## the deprecated HTML ``center`` element
     tagCite,       ## the HTML ``cite`` element
     tagCode,       ## the HTML ``code`` element
     tagCol,        ## the HTML ``col`` element
@@ -49,11 +54,15 @@ type
     tagDel,        ## the HTML ``del`` element
     tagDfn,        ## the HTML ``dfn`` element
     tagDiv,        ## the HTML ``div`` element
+    tagDir,        ## the deprecated HTLM ``dir`` element
     tagDl,         ## the HTML ``dl`` element
     tagDt,         ## the HTML ``dt`` element
     tagEm,         ## the HTML ``em`` element
     tagFieldset,   ## the HTML ``fieldset`` element
+    tagFont,       ## the deprecated HTML ``font`` element
     tagForm,       ## the HTML ``form`` element
+    tagFrame,      ## the HTML ``frame`` element
+    tagFrameset,   ## the deprecated HTML ``frameset`` element
     tagH1,         ## the HTML ``h1`` element
     tagH2,         ## the HTML ``h2`` element
     tagH3,         ## the HTML ``h3`` element
@@ -64,16 +73,21 @@ type
     tagHtml,       ## the HTML ``html`` element
     tagHr,         ## the HTML ``hr`` element
     tagI,          ## the HTML ``i`` element
+    tagIframe,     ## the deprecated HTML ``iframe`` element
     tagImg,        ## the HTML ``img`` element
     tagInput,      ## the HTML ``input`` element
     tagIns,        ## the HTML ``ins`` element
+    tagIsindex,    ## the deprecated HTML ``isindex`` element
     tagKbd,        ## the HTML ``kbd`` element
     tagLabel,      ## the HTML ``label`` element
     tagLegend,     ## the HTML ``legend`` element
     tagLi,         ## the HTML ``li`` element
     tagLink,       ## the HTML ``link`` element
     tagMap,        ## the HTML ``map`` element
+    tagMenu,       ## the deprecated HTML ``menu`` element
     tagMeta,       ## the HTML ``meta`` element
+    tagNobr,       ## the deprecated HTML ``nobr`` element
+    tagNoframes,   ## the deprecated HTML ``noframes`` element
     tagNoscript,   ## the HTML ``noscript`` element
     tagObject,     ## the HTML ``object`` element
     tagOl,         ## the HTML ``ol`` element
@@ -83,11 +97,13 @@ type
     tagParam,      ## the HTML ``param`` element
     tagPre,        ## the HTML ``pre`` element
     tagQ,          ## the HTML ``q`` element
+    tagS,          ## the deprecated HTML ``s`` element
     tagSamp,       ## the HTML ``samp`` element
     tagScript,     ## the HTML ``script`` element
     tagSelect,     ## the HTML ``select`` element
     tagSmall,      ## the HTML ``small`` element
     tagSpan,       ## the HTML ``span`` element
+    tagStrike,     ## the deprecated HTML ``strike`` element
     tagStrong,     ## the HTML ``strong`` element
     tagStyle,      ## the HTML ``style`` element
     tagSub,        ## the HTML ``sub`` element
@@ -102,21 +118,116 @@ type
     tagTitle,      ## the HTML ``title`` element
     tagTr,         ## the HTML ``tr`` element
     tagTt,         ## the HTML ``tt`` element
+    tagU,          ## the deprecated HTML ``u`` element
     tagUl,         ## the HTML ``ul`` element
     tagVar         ## the HTML ``var`` element
 
-const 
+const
   tagStrs = [
-    "a", "acronym", "address", "area", "b", "base", "big", "blockquote", 
-    "body", "br", "button", "caption", "cite", "code", "col", "colgroup", 
-    "dd", "del", "dfn", "div", "dl", "dt", "em", "fieldset", 
-    "form", "h1", "h2", "h3", "h4", "h5", "h6", "head", "html", "hr", 
-    "i", "img", "input", "ins", "kbd", "label", "legend", "li", "link", 
-    "map", "meta", "noscript", "object", "ol", "optgroup", "option", 
-    "p", "param", "pre", "q", "samp", "script", "select", "small", 
-    "span", "strong", "style", "sub", "sup", "table", "tbody", "td", 
-    "textarea", "tfoot", "th", "thead", "title", "tr", "tt", "ul", "var"
+    "a", "abbr", "acronym", "address", "applet", "area", 
+    "b", "base", "basefont", "bdo", "big", "blockquote", "body", 
+    "br", "button", "caption", "center", "cite", "code", 
+    "col", "colgroup", "dd", "del", "dfn", "div", 
+    "dir", "dl", "dt", "em", "fieldset", "font", 
+    "form", "frame", "frameset", "h1", "h2", "h3", 
+    "h4", "h5", "h6", "head", "html", "hr", 
+    "i", "iframe", "img", "input", "ins", "isindex", 
+    "kbd", "label", "legend", "li", "link", "map", 
+    "menu", "meta", "nobr", "noframes", "noscript", "object", "ol", 
+    "optgroup", "option", "p", "param", "pre", "q", 
+    "s", "samp", "script", "select", "small", "span", 
+    "strike", "strong", "style", "sub", "sup", "table", 
+    "tbody", "td", "textarea", "tfoot", "th", "thead", 
+    "title", "tr", "tt", "u", "ul", "var"
   ]
+  InlineTags* = {tagA, tagAbbr, tagAcronym, tagApplet, tagB, tagBasefont,
+    tagBdo, tagBig, tagBr, tagButton, tagCite, tagCode, tagDel, tagDfn,
+    tagEm, tagFont, tagI, tagImg, tagIns, tagInput, tagIframe, tagKbd,
+    tagLabel, tagMap, tagObject, tagQ, tagSamp, tagScript, tagSelect,
+    tagSmall, tagSpan, tagStrong, tagSub, tagSup, tagTextarea, tagTt,
+    tagVar, tagApplet, tagBasefont, tagFont, tagIframe, tagU, tagS, 
+    tagStrike}
+  BlockTags* = {tagAddress, tagBlockquote, tagCenter, tagDel, tagDir, tagDiv, 
+    tagDl, tagFieldset, tagForm, tagH1, tagH2, tagH3, tagH4, 
+    tagH5, tagH6, tagHr, tagIns, tagIsindex, tagMenu, tagNoframes, tagNoscript, 
+    tagOl, tagP, tagPre, tagTable, tagUl, tagCenter, tagDir, tagIsindex, 
+    tagMenu, tagNoframes}
+  SingleTags* = {tagArea, tagBase, tagBasefont, 
+    tagBr, tagCol, tagFrame, tagHr, tagImg, tagInput, tagIsindex,
+    tagLink, tagMeta, tagParam} # `tagP` can be both!
+  
+  Entities = [
+    ("nbsp", 0x00A0), ("iexcl", 0x00A1), ("cent", 0x00A2), ("pound", 0x00A3),
+    ("curren", 0x00A4), ("yen", 0x00A5), ("brvbar", 0x00A6), ("sect", 0x00A7),
+    ("uml", 0x00A8), ("copy", 0x00A9), ("ordf", 0x00AA), ("laquo", 0x00AB),
+    ("not", 0x00AC), ("shy", 0x00AD), ("reg", 0x00AE), ("macr", 0x00AF),
+    ("deg", 0x00B0), ("plusmn", 0x00B1), ("sup2", 0x00B2), ("sup3", 0x00B3),
+    ("acute", 0x00B4), ("micro", 0x00B5), ("para", 0x00B6), ("middot", 0x00B7),
+    ("cedil", 0x00B8), ("sup1", 0x00B9), ("ordm", 0x00BA), ("raquo", 0x00BB),
+    ("frac14", 0x00BC), ("frac12", 0x00BD), ("frac34", 0x00BE), 
+    ("iquest", 0x00BF), ("Agrave", 0x00C0), ("Aacute", 0x00C1),
+    ("Acirc", 0x00C2), ("Atilde", 0x00C3), ("Auml", 0x00C4), ("Aring", 0x00C5),
+    ("AElig", 0x00C6), ("Ccedil", 0x00C7), ("Egrave", 0x00C8),
+    ("Eacute", 0x00C9), ("Ecirc", 0x00CA), ("Euml", 0x00CB), ("Igrave", 0x00CC),
+    ("Iacute", 0x00CD), ("Icirc", 0x00CE), ("Iuml", 0x00CF), ("ETH", 0x00D0),
+    ("Ntilde", 0x00D1), ("Ograve", 0x00D2), ("Oacute", 0x00D3), 
+    ("Ocirc", 0x00D4), ("Otilde", 0x00D5), ("Ouml", 0x00D6), ("times", 0x00D7),
+    ("Oslash", 0x00D8), ("Ugrave", 0x00D9), ("Uacute", 0x00DA),
+    ("Ucirc", 0x00DB), ("Uuml", 0x00DC), ("Yacute", 0x00DD), ("THORN", 0x00DE),
+    ("szlig", 0x00DF), ("agrave", 0x00E0), ("aacute", 0x00E1),
+    ("acirc", 0x00E2), ("atilde", 0x00E3), ("auml", 0x00E4), ("aring", 0x00E5),
+    ("aelig", 0x00E6), ("ccedil", 0x00E7), ("egrave", 0x00E8),
+    ("eacute", 0x00E9), ("ecirc", 0x00EA), ("euml", 0x00EB), ("igrave", 0x00EC),
+    ("iacute", 0x00ED), ("icirc", 0x00EE), ("iuml", 0x00EF), ("eth", 0x00F0),
+    ("ntilde", 0x00F1), ("ograve", 0x00F2), ("oacute", 0x00F3),
+    ("ocirc", 0x00F4), ("otilde", 0x00F5), ("ouml", 0x00F6), ("divide", 0x00F7),
+    ("oslash", 0x00F8), ("ugrave", 0x00F9), ("uacute", 0x00FA),
+    ("ucirc", 0x00FB), ("uuml", 0x00FC), ("yacute", 0x00FD), ("thorn", 0x00FE),
+    ("yuml", 0x00FF), ("OElig", 0x0152), ("oelig", 0x0153), ("Scaron", 0x0160),
+    ("scaron", 0x0161), ("Yuml", 0x0178), ("fnof", 0x0192), ("circ", 0x02C6),
+    ("tilde", 0x02DC), ("Alpha", 0x0391), ("Beta", 0x0392), ("Gamma", 0x0393),
+    ("Delta", 0x0394), ("Epsilon", 0x0395), ("Zeta", 0x0396), ("Eta", 0x0397),
+    ("Theta", 0x0398), ("Iota", 0x0399), ("Kappa", 0x039A), ("Lambda", 0x039B),
+    ("Mu", 0x039C), ("Nu", 0x039D), ("Xi", 0x039E), ("Omicron", 0x039F),
+    ("Pi", 0x03A0), ("Rho", 0x03A1), ("Sigma", 0x03A3), ("Tau", 0x03A4),
+    ("Upsilon", 0x03A5), ("Phi", 0x03A6), ("Chi", 0x03A7), ("Psi", 0x03A8),
+    ("Omega", 0x03A9), ("alpha", 0x03B1), ("beta", 0x03B2), ("gamma", 0x03B3),
+    ("delta", 0x03B4), ("epsilon", 0x03B5), ("zeta", 0x03B6), ("eta", 0x03B7),
+    ("theta", 0x03B8), ("iota", 0x03B9), ("kappa", 0x03BA), ("lambda", 0x03BB),
+    ("mu", 0x03BC), ("nu", 0x03BD), ("xi", 0x03BE), ("omicron", 0x03BF),
+    ("pi", 0x03C0), ("rho", 0x03C1), ("sigmaf", 0x03C2), ("sigma", 0x03C3),
+    ("tau", 0x03C4), ("upsilon", 0x03C5), ("phi", 0x03C6), ("chi", 0x03C7),
+    ("psi", 0x03C8), ("omega", 0x03C9), ("thetasym", 0x03D1), ("upsih", 0x03D2),
+    ("piv", 0x03D6), ("ensp", 0x2002), ("emsp", 0x2003), ("thinsp", 0x2009),
+    ("zwnj", 0x200C), ("zwj", 0x200D), ("lrm", 0x200E), ("rlm", 0x200F),
+    ("ndash", 0x2013), ("mdash", 0x2014), ("lsquo", 0x2018), ("rsquo", 0x2019),
+    ("sbquo", 0x201A), ("ldquo", 0x201C), ("rdquo", 0x201D), ("bdquo", 0x201E),
+    ("dagger", 0x2020), ("Dagger", 0x2021), ("bull", 0x2022), 
+    ("hellip", 0x2026), ("permil", 0x2030), ("prime", 0x2032),
+    ("Prime", 0x2033), ("lsaquo", 0x2039), ("rsaquo", 0x203A),
+    ("oline", 0x203E), ("frasl", 0x2044), ("euro", 0x20AC),
+    ("image", 0x2111), ("weierp", 0x2118), ("real", 0x211C),
+    ("trade", 0x2122), ("alefsym", 0x2135), ("larr", 0x2190),
+    ("uarr", 0x2191), ("rarr", 0x2192), ("darr", 0x2193),
+    ("harr", 0x2194), ("crarr", 0x21B5), ("lArr", 0x21D0),
+    ("uArr", 0x21D1), ("rArr", 0x21D2), ("dArr", 0x21D3),
+    ("hArr", 0x21D4), ("forall", 0x2200), ("part", 0x2202),
+    ("exist", 0x2203), ("empty", 0x2205), ("nabla", 0x2207),
+    ("isin", 0x2208), ("notin", 0x2209), ("ni", 0x220B),
+    ("prod", 0x220F), ("sum", 0x2211), ("minus", 0x2212),
+    ("lowast", 0x2217), ("radic", 0x221A), ("prop", 0x221D),
+    ("infin", 0x221E), ("ang", 0x2220), ("and", 0x2227),
+    ("or", 0x2228), ("cap", 0x2229), ("cup", 0x222A),
+    ("int", 0x222B), ("there4", 0x2234), ("sim", 0x223C),
+    ("cong", 0x2245), ("asymp", 0x2248), ("ne", 0x2260),
+    ("equiv", 0x2261), ("le", 0x2264), ("ge", 0x2265),
+    ("sub", 0x2282), ("sup", 0x2283), ("nsub", 0x2284),
+    ("sube", 0x2286), ("supe", 0x2287), ("oplus", 0x2295),
+    ("otimes", 0x2297), ("perp", 0x22A5), ("sdot", 0x22C5),
+    ("lceil", 0x2308), ("rceil", 0x2309), ("lfloor", 0x230A),
+    ("rfloor", 0x230B), ("lang", 0x2329), ("rang", 0x232A),
+    ("loz", 0x25CA), ("spades", 0x2660), ("clubs", 0x2663),
+    ("hearts", 0x2665), ("diams", 0x2666)]
 
 proc binaryStrSearch(x: openarray[string], y: string): int = 
   ## XXX put this into the library somewhere!
@@ -125,110 +236,121 @@ proc binaryStrSearch(x: openarray[string], y: string): int =
   while a <= b: 
     var mid = (a + b) div 2
     var c = cmp(x[mid], y)
-    if c < 0: 
-      a = mid + 1
-    elif c > 0: 
-      b = mid - 1
-    else: 
-      return mid
+    if c < 0: a = mid + 1
+    elif c > 0: b = mid - 1
+    else: return mid
   result = - 1
 
 proc htmlTag*(n: PXmlNode): THtmlTag = 
-  ## gets `n`'s tag as a ``THtmlTag``. Even though results are cached, this is
-  ## can be more expensive than comparing ``tag`` directly to a string.
+  ## gets `n`'s tag as a ``THtmlTag``.
   if n.clientData == 0:
     n.clientData = binaryStrSearch(tagStrs, n.tag)+1
   result = THtmlTag(n.clientData)
 
-proc parseElement(x: var TXmlParser, doc: var PDocument): PElement =
-  var n = doc.createElement("")
+proc entityToUtf8*(entity: string): string = 
+  ## converts an HTML entity name like ``&Uuml;`` to its UTF-8 equivalent.
+  ## "" is returned if the entity name is unknown. The HTML parser
+  ## already converts entities to UTF-8.
+  for name, val in items(entities):
+    if name == entity:
+      return toUTF8(TRune(val))
+  result = ""
+
+proc addNode(father, son: PXmlNode) = 
+  if son != nil: add(father, son)
+
+proc parse(x: var TXmlParser, errors: var seq[string]): PXmlNode
 
-  while True:
-    case x.kind()
+proc untilElementEnd(x: var TXmlParser, result: PXmlNode, 
+                     errors: var seq[string]) =
+  if result.htmlTag in singleTags:
+    if x.kind != xmlElementEnd or cmpIgnoreCase(x.elementName, result.tag) != 0:
+      return
+  while true:
+    case x.kind
+    of xmlElementEnd: 
+      if cmpIgnoreCase(x.elementName, result.tag) == 0: 
+        next(x)
+      else:
+        errors.add(errorMsg(x, "</" & result.tag & "$1> expected"))
+        # do not skip it here!
+      break
     of xmlEof:
+      errors.add(errorMsg(x, "</" & result.tag & "$1> expected"))
       break
-    of xmlElementStart:
-      if n.tagName() != "":
-        n.appendChild(parseElement(x, doc))
-      else:
-        n = doc.createElement(x.elementName)
-    of xmlElementOpen:
-      if n.tagName() != "":
-        n.appendChild(parseElement(x, doc))
-      else:
-        if x.elementName.contains(':'):
-          #TODO: NamespaceURI
-          n = doc.createElementNS("nil", x.elementName)
-        else:  
-          n = doc.createElement(x.elementName)
-        
-    of xmlElementEnd:
-      if x.elementName == n.nodeName:
-        # n.normalize() # Remove any whitespace etc.
-        return n
-      else: #The wrong element is ended
-        raise newException(EMismatchedTag, "Mismatched tag at line " & 
-          $x.getLine() & " column " & $x.getColumn)
-      
-    of xmlCharData:
-      n.appendChild(parseText(x, doc))
-    of xmlAttribute:
-      if x.attrKey.contains(':'):
-        #TODO: NamespaceURI
-        n.setAttributeNS("nil", x.attrKey, x.attrValue)
-      else:
-        n.setAttribute(x.attrKey, x.attrValue)
-    of xmlCData:
-      n.appendChild(doc.createCDATASection(x.charData()))
-    of xmlComment:
-      n.appendChild(doc.createComment(x.charData()))
-    of xmlPI:
-      n.appendChild(doc.createProcessingInstruction(x.PIName(), x.PIRest()))
-      
-    of xmlWhitespace, xmlElementClose, xmlEntity, xmlSpecial:
-      # Unused 'events'
-
     else:
-      raise newException(EParserError, "Unexpected XML Parser event")
-    x.next()
+      result.addNode(parse(x, errors))
 
-  raise newException(EMismatchedTag, 
-    "Mismatched tag at line " & $x.getLine() & " column " & $x.getColumn)
-
-
-proc parse*(x: var TXmlParser, father: PXmlNode) =
-  
+proc parse(x: var TXmlParser, errors: var seq[string]): PXmlNode =
+  case x.kind
+  of xmlComment: 
+    result = newComment(x.charData)
+    next(x)
+  of xmlCharData, xmlWhitespace:
+    result = newText(x.charData)
+    next(x)
+  of xmlPI, xmlSpecial:
+    # we just ignore processing instructions for now
+    next(x)
+  of xmlError:
+    errors.add(errorMsg(x))
+    next(x)
+  of xmlElementStart:
+    result = newElement(x.elementName)
+    next(x)
+    untilElementEnd(x, result, errors)
+  of xmlElementEnd:
+    errors.add(errorMsg(x, "unexpected ending tag: " & x.elementName))
+  of xmlElementOpen: 
+    result = newElement(x.elementName)
+    next(x)
+    result.attr = newStringTable()
+    while true: 
+      case x.kind
+      of xmlAttribute:
+        result.attr[x.attrKey] = x.attrValue
+        next(x)
+      of xmlElementClose:
+        next(x)
+        break
+      of xmlError:
+        errors.add(errorMsg(x))
+        next(x)
+        break
+      else:
+        errors.add(errorMsg(x, "'>' expected"))
+        next(x)
+        break
+    untilElementEnd(x, result, errors)
+  of xmlAttribute, xmlElementClose:
+    errors.add(errorMsg(x, "<some_tag> expected"))
+    next(x)
+  of xmlCData: 
+    result = newCData(x.charData)
+    next(x)
+  of xmlEntity:
+    var u = entityToUtf8(x.entityName)
+    if u.len != 0: result = newText(u)
+    next(x)
+  of xmlEof: nil
 
 proc parseHtml*(s: PStream, filename: string, 
                 errors: var seq[string]): PXmlNode = 
-  ## parses the HTML from stream `s` and returns a ``PXmlNode``. Every
+  ## parses the XML from stream `s` and returns a ``PXmlNode``. Every
   ## occured parsing error is added to the `errors` sequence.
   var x: TXmlParser
   open(x, s, filename, {reportComments})
-  
-  result = newElement("html")
-  while true:
-    x.next()
-    case x.kind
-    of xmlWhitespace: nil # just skip it
-    of xmlComment: 
-      result.add(newComment(x.text))
-  
-  while True:
-    x.next()
-    case x.kind
-    of xmlEof: break
-    of xmlElementStart, xmlElementOpen:
-      var el: PElement = parseElement(x, XmlDoc)
-      XmlDoc = dom.createDocument(el)
-    of xmlWhitespace, xmlElementClose, xmlEntity, xmlSpecial:
-      # Unused 'events'
-    else:
-      raise newException(EParserError, "Unexpected XML Parser event")
+  next(x)
+  # skip the DOCTYPE:
+  if x.kind == xmlSpecial: next(x)
+  result = parse(x, errors)
+  while x.kind != xmlEof:
+    errors.add(errorMsg(x, "EOF expected"))
+    result.addNode(parse(x, errors))
   close(x)
 
 proc parseHtml*(s: PStream): PXmlNode = 
-  ## parses the HTML from stream `s` and returns a ``PXmlNode``. All parsing
+  ## parses the XTML from stream `s` and returns a ``PXmlNode``. All parsing
   ## errors are ignored.
   var errors: seq[string] = @[]
   result = parseHtml(s, "unknown_html_doc", errors)
@@ -236,7 +358,7 @@ proc parseHtml*(s: PStream): PXmlNode =
 proc loadHtml*(path: string, reportErrors = false): PXmlNode = 
   ## Loads and parses HTML from file specified by ``path``, and returns 
   ## a ``PXmlNode``. If `reportErrors` is true, the parsing errors are
-  ## ``echo``ed.
+  ## ``echo``ed, otherwise they are ignored.
   var s = newFileStream(path, fmRead)
   if s == nil: raise newException(EIO, "Unable to read file: " & path)
   
@@ -245,3 +367,16 @@ proc loadHtml*(path: string, reportErrors = false): PXmlNode =
   if reportErrors: 
     for msg in items(errors): echo(msg)
 
+when true:
+  nil
+else:
+  proc checkHtmlAux(n: PXmlNode, errors: var seq[string]) =
+    nil
+  
+  proc checkHtmlStructure*(n: PXmlNode, errors: var seq[string]) =
+    ## checks the HTML structure after parsing for other errors like 
+    ## a ``<h1>`` element within a ``<p>`` element.
+    if n == nil or n.htmlTag != tagHtml: 
+      errors.add("<html> tag expected")
+    checkHtmlAux(n, errors)
+  
\ No newline at end of file
diff --git a/lib/pure/httpclient.nim b/lib/pure/httpclient.nim
index 43eab0404..0f9054873 100755..100644
--- a/lib/pure/httpclient.nim
+++ b/lib/pure/httpclient.nim
@@ -60,14 +60,6 @@ type
                                      ## and ``postContent`` proc,
                                      ## when the server returns an error
 
-template newException(exceptn, message: expr): expr =
-  block: # open a new scope
-    var
-      e: ref exceptn
-    new(e)
-    e.msg = message
-    e
-
 proc httpError(msg: string) =
   var e: ref EInvalidProtocol
   new(e)
diff --git a/lib/pure/httpserver.nim b/lib/pure/httpserver.nim
index 2c85d8137..2c85d8137 100755..100644
--- a/lib/pure/httpserver.nim
+++ b/lib/pure/httpserver.nim
diff --git a/lib/pure/lexbase.nim b/lib/pure/lexbase.nim
index bb207e92a..bb207e92a 100755..100644
--- a/lib/pure/lexbase.nim
+++ b/lib/pure/lexbase.nim
diff --git a/lib/pure/logging.nim b/lib/pure/logging.nim
index 6df39f50b..6df39f50b 100755..100644
--- a/lib/pure/logging.nim
+++ b/lib/pure/logging.nim
diff --git a/lib/pure/macros.nim b/lib/pure/macros.nim
index 677469ed2..677469ed2 100755..100644
--- a/lib/pure/macros.nim
+++ b/lib/pure/macros.nim
diff --git a/lib/pure/math.nim b/lib/pure/math.nim
index cf4b6d95c..cf4b6d95c 100755..100644
--- a/lib/pure/math.nim
+++ b/lib/pure/math.nim
diff --git a/lib/pure/md5.nim b/lib/pure/md5.nim
index e75f80b4c..e75f80b4c 100755..100644
--- a/lib/pure/md5.nim
+++ b/lib/pure/md5.nim
diff --git a/lib/pure/os.nim b/lib/pure/os.nim
index 1879fb5db..ef526993a 100755..100644
--- a/lib/pure/os.nim
+++ b/lib/pure/os.nim
@@ -26,15 +26,6 @@ else:
 
 include "system/ansi_c"
 
-# copied from excpt.nim, because I don't want to make this template public
-template newException(exceptn, message: expr): expr =
-  block: # open a new scope
-    var
-      e: ref exceptn
-    new(e)
-    e.msg = message
-    e
-
 const
   doslike = defined(windows) or defined(OS2) or defined(DOS)
     # DOS-like filesystem
diff --git a/lib/pure/osproc.nim b/lib/pure/osproc.nim
index bbdea1eee..bbdea1eee 100755..100644
--- a/lib/pure/osproc.nim
+++ b/lib/pure/osproc.nim
diff --git a/lib/pure/parsecfg.nim b/lib/pure/parsecfg.nim
index c26dab099..c26dab099 100755..100644
--- a/lib/pure/parsecfg.nim
+++ b/lib/pure/parsecfg.nim
diff --git a/lib/pure/parsecsv.nim b/lib/pure/parsecsv.nim
index 5970f2090..5970f2090 100755..100644
--- a/lib/pure/parsecsv.nim
+++ b/lib/pure/parsecsv.nim
diff --git a/lib/pure/parseopt.nim b/lib/pure/parseopt.nim
index 8f4be98f4..8f4be98f4 100755..100644
--- a/lib/pure/parseopt.nim
+++ b/lib/pure/parseopt.nim
diff --git a/lib/pure/parsesql.nim b/lib/pure/parsesql.nim
index 2109c273a..2109c273a 100755..100644
--- a/lib/pure/parsesql.nim
+++ b/lib/pure/parsesql.nim
diff --git a/lib/pure/parseurl.nim b/lib/pure/parseurl.nim
index cd3bc621a..cd3bc621a 100755..100644
--- a/lib/pure/parseurl.nim
+++ b/lib/pure/parseurl.nim
diff --git a/lib/pure/parseutils.nim b/lib/pure/parseutils.nim
index 04d2a7973..0f107793c 100755..100644
--- a/lib/pure/parseutils.nim
+++ b/lib/pure/parseutils.nim
@@ -14,15 +14,6 @@
 {.push debugger:off .} # the user does not want to trace a part
                        # of the standard library!
 
-# copied from excpt.nim, because I don't want to make this template public
-template newException(exceptn, message: expr): expr =
-  block: # open a new scope
-    var
-      e: ref exceptn
-    new(e)
-    e.msg = message
-    e
-
 const
   Whitespace = {' ', '\t', '\v', '\r', '\l', '\f'}
   IdentChars = {'a'..'z', 'A'..'Z', '0'..'9', '_'}
diff --git a/lib/pure/parsexml.nim b/lib/pure/parsexml.nim
index 598ae6c68..598ae6c68 100755..100644
--- a/lib/pure/parsexml.nim
+++ b/lib/pure/parsexml.nim
diff --git a/lib/pure/pegs.nim b/lib/pure/pegs.nim
index 5ba0351ad..5ba0351ad 100755..100644
--- a/lib/pure/pegs.nim
+++ b/lib/pure/pegs.nim
diff --git a/lib/pure/re.nim b/lib/pure/re.nim
index 953f9c744..953f9c744 100755..100644
--- a/lib/pure/re.nim
+++ b/lib/pure/re.nim
diff --git a/lib/pure/regexprs.nim b/lib/pure/regexprs.nim
index 43c7f05be..43c7f05be 100755..100644
--- a/lib/pure/regexprs.nim
+++ b/lib/pure/regexprs.nim
diff --git a/lib/pure/ropes.nim b/lib/pure/ropes.nim
index aa793b4f3..df85baf92 100755..100644
--- a/lib/pure/ropes.nim
+++ b/lib/pure/ropes.nim
@@ -21,15 +21,6 @@
 {.push debugger:off .} # the user does not want to trace a part
                        # of the standard library!
 
-# copied from excpt.nim, because I don't want to make this template public
-template newException(exceptn, message: expr): expr =
-  block: # open a new scope
-    var
-      e: ref exceptn
-    new(e)
-    e.msg = message
-    e
-
 const
   countCacheMisses = false
 
diff --git a/lib/pure/sockets.nim b/lib/pure/sockets.nim
index 85628db78..85628db78 100755..100644
--- a/lib/pure/sockets.nim
+++ b/lib/pure/sockets.nim
diff --git a/lib/pure/streams.nim b/lib/pure/streams.nim
index f4d2911fc..f4d2911fc 100755..100644
--- a/lib/pure/streams.nim
+++ b/lib/pure/streams.nim
diff --git a/lib/pure/strtabs.nim b/lib/pure/strtabs.nim
index 8ea59637a..8ea59637a 100755..100644
--- a/lib/pure/strtabs.nim
+++ b/lib/pure/strtabs.nim
diff --git a/lib/pure/strutils.nim b/lib/pure/strutils.nim
index fe70130e5..2fd2aaeef 100755..100644
--- a/lib/pure/strutils.nim
+++ b/lib/pure/strutils.nim
@@ -17,16 +17,6 @@ import parseutils
 {.push debugger:off .} # the user does not want to trace a part
                        # of the standard library!
 
-# copied from excpt.nim, because I don't want to make this template public
-template newException(exceptn, message: expr): expr =
-  block: # open a new scope
-    var
-      e: ref exceptn
-    new(e)
-    e.msg = message
-    e
-
-
 type
   TCharSet* = set[char] # for compatibility with Nim
 
diff --git a/lib/pure/terminal.nim b/lib/pure/terminal.nim
index 42bd80cb4..42bd80cb4 100755..100644
--- a/lib/pure/terminal.nim
+++ b/lib/pure/terminal.nim
diff --git a/lib/pure/times.nim b/lib/pure/times.nim
index a54af3254..a54af3254 100755..100644
--- a/lib/pure/times.nim
+++ b/lib/pure/times.nim
diff --git a/lib/pure/unicode.nim b/lib/pure/unicode.nim
index bebbe56c5..bebbe56c5 100755..100644
--- a/lib/pure/unicode.nim
+++ b/lib/pure/unicode.nim
diff --git a/lib/pure/unidecode/gen.py b/lib/pure/unidecode/gen.py
index 8da0136ff..8da0136ff 100755..100644
--- a/lib/pure/unidecode/gen.py
+++ b/lib/pure/unidecode/gen.py
diff --git a/lib/pure/unidecode/unidecode.dat b/lib/pure/unidecode/unidecode.dat
index 9dff0a4a9..9dff0a4a9 100755..100644
--- a/lib/pure/unidecode/unidecode.dat
+++ b/lib/pure/unidecode/unidecode.dat
diff --git a/lib/pure/unidecode/unidecode.nim b/lib/pure/unidecode/unidecode.nim
index a665dd73e..a665dd73e 100755..100644
--- a/lib/pure/unidecode/unidecode.nim
+++ b/lib/pure/unidecode/unidecode.nim
diff --git a/lib/pure/variants.nim b/lib/pure/variants.nim
index f661f81a6..f661f81a6 100755..100644
--- a/lib/pure/variants.nim
+++ b/lib/pure/variants.nim
diff --git a/lib/pure/xmldom.nim b/lib/pure/xmldom.nim
index 4e9d721d7..76c666de0 100755..100644
--- a/lib/pure/xmldom.nim
+++ b/lib/pure/xmldom.nim
@@ -34,14 +34,6 @@ type
   ESyntaxErr* = object of EDOMException ## If an invalid or illegal string is specified.
   EWrongDocumentErr* = object of EDOMException ## If a node is used in a different document than the one that created it (that doesn't support it)
 
-template newException(exceptn, message: expr): expr =
-  block: # open a new scope
-    var
-      e: ref exceptn
-    new(e)
-    e.msg = message
-    e
-
 const
   ElementNode* = 1
   AttributeNode* = 2
diff --git a/lib/pure/xmldomparser.nim b/lib/pure/xmldomparser.nim
index 9df60cab8..b73baf1ff 100755..100644
--- a/lib/pure/xmldomparser.nim
+++ b/lib/pure/xmldomparser.nim
@@ -17,14 +17,6 @@ type
   #Parsing errors
   EMismatchedTag* = object of E_Base ## Raised when a tag is not properly closed
   EParserError* = object of E_Base ## Raised when an unexpected XML Parser event occurs
-
-template newException(exceptn, message: expr): expr =
-  block: # open a new scope
-    var
-      e: ref exceptn
-    new(e)
-    e.msg = message
-    e
     
 proc parseText(x: var TXmlParser, doc: var PDocument): PText =
   result = doc.createTextNode(x.charData())
diff --git a/lib/pure/xmlgen.nim b/lib/pure/xmlgen.nim
index 29f2700f2..29f2700f2 100755..100644
--- a/lib/pure/xmlgen.nim
+++ b/lib/pure/xmlgen.nim
diff --git a/lib/pure/xmltree.nim b/lib/pure/xmltree.nim
index 005969fc4..2b0977874 100755..100644
--- a/lib/pure/xmltree.nim
+++ b/lib/pure/xmltree.nim
@@ -63,7 +63,7 @@ proc newCData*(cdata: string): PXmlNode =
 proc newEntity*(entity: string): PXmlNode = 
   ## creates a new ``PXmlNode`` of kind ``xnEntity`` with the text `entity`.
   result = newXmlNode(xnCData)
-  result.fText = cdata
+  result.fText = entity
 
 proc text*(n: PXmlNode): string {.inline.} = 
   ## gets the associated text with the node `n`. `n` can be a CDATA, Text,
diff --git a/lib/pure/xmltreeparser.nim b/lib/pure/xmltreeparser.nim
index b7a9ba54a..bf2c05570 100755..100644
--- a/lib/pure/xmltreeparser.nim
+++ b/lib/pure/xmltreeparser.nim
@@ -9,7 +9,7 @@
 
 ## This module parses an XML document and creates its XML tree representation.
 
-import streams, parsexml, strtabs, xmltree, hxmlcommon
+import streams, parsexml, strtabs, xmltree
 
 type
   EInvalidXml* = object of E_Base ## exception that is raised for invalid XML
@@ -25,13 +25,30 @@ proc raiseInvalidXml(errors: seq[string]) =
 proc addNode(father, son: PXmlNode) = 
   if son != nil: add(father, son)
 
-proc parse*(x: var TXmlParser, errors: var seq[string]): PXmlNode =
+proc untilElementEnd(x: var TXmlParser, result: PXmlNode, 
+                     errors: var seq[string]) =
+  while true:
+    case x.kind
+    of xmlElementEnd: 
+      if x.elementName == result.tag: 
+        next(x)
+      else:
+        errors.add(errorMsg(x, "</" & result.tag & "$1> expected"))
+        # do not skip it here!
+      break
+    of xmlEof:
+      errors.add(errorMsg(x, "</" & result.tag & "$1> expected"))
+      break
+    else:
+      result.addNode(parse(x, errors))
+
+proc parse(x: var TXmlParser, errors: var seq[string]): PXmlNode =
   case x.kind
   of xmlComment: 
-    result = newComment(x.text)
+    result = newComment(x.charData)
     next(x)
   of xmlCharData, xmlWhitespace:
-    result = newText(x.text)
+    result = newText(x.charData)
     next(x)
   of xmlPI, xmlSpecial:
     # we just ignore processing instructions for now
@@ -42,23 +59,10 @@ proc parse*(x: var TXmlParser, errors: var seq[string]): PXmlNode =
   of xmlElementStart:    ## ``<elem>``
     result = newElement(x.elementName)
     next(x)
-    while true:
-      case x.kind
-      of xmlElementEnd: 
-        if x.elementName == result.tag: 
-          next(x)
-        else:
-          errors.add(errorMsg(x, "</$1> expected" % result.tag))
-          # do not skip it here!
-        break
-      of xmlEof:
-        errors.add(errorMsg(x, "</$1> expected" % result.tag))
-        break
-      else:
-        result.addNode(parse(x, errors))
-  of xmlElementEnd:       ## ``</elem>``
+    untilElementEnd(x, result, errors)
+  of xmlElementEnd:
     errors.add(errorMsg(x, "unexpected ending tag: " & x.elementName))
-  of xmlElementOpen:     ## ``<elem 
+  of xmlElementOpen: 
     result = newElement(x.elementName)
     next(x)
     result.attr = newStringTable()
@@ -75,12 +79,12 @@ proc parse*(x: var TXmlParser, errors: var seq[string]): PXmlNode =
         next(x)
         break
       else:
-        errors.add(errorMsg(x, "'>' expected" % result.tag))
+        errors.add(errorMsg(x, "'>' expected"))
         next(x)
         break
-  
+    untilElementEnd(x, result, errors)
   of xmlAttribute, xmlElementClose:
-    errors.add(errorMsg(x, "<some_tag> expected")
+    errors.add(errorMsg(x, "<some_tag> expected"))
     next(x)
   of xmlCData: 
     result = newCData(x.charData)
@@ -107,7 +111,7 @@ proc parseXml*(s: PStream, filename: string,
     of xmlError:
       errors.add(errorMsg(x))
     else:
-      errors.add(errorMsg(x, "<some_tag> expected")
+      errors.add(errorMsg(x, "<some_tag> expected"))
       break
   close(x)
 
diff --git a/lib/system.nim b/lib/system.nim
index ae9d6b432..ae9d6b432 100755..100644
--- a/lib/system.nim
+++ b/lib/system.nim
diff --git a/lib/system/alloc.nim b/lib/system/alloc.nim
index 95feff854..95feff854 100755..100644
--- a/lib/system/alloc.nim
+++ b/lib/system/alloc.nim
diff --git a/lib/system/ansi_c.nim b/lib/system/ansi_c.nim
index e9300949b..e9300949b 100755..100644
--- a/lib/system/ansi_c.nim
+++ b/lib/system/ansi_c.nim
diff --git a/lib/system/arithm.nim b/lib/system/arithm.nim
index b93bb9844..b93bb9844 100755..100644
--- a/lib/system/arithm.nim
+++ b/lib/system/arithm.nim
diff --git a/lib/system/assign.nim b/lib/system/assign.nim
index 44d2e5c64..44d2e5c64 100755..100644
--- a/lib/system/assign.nim
+++ b/lib/system/assign.nim
diff --git a/lib/system/cellsets.nim b/lib/system/cellsets.nim
index 0ce83864c..0ce83864c 100755..100644
--- a/lib/system/cellsets.nim
+++ b/lib/system/cellsets.nim
diff --git a/lib/system/cntbits.nim b/lib/system/cntbits.nim
index 281b96dd0..281b96dd0 100755..100644
--- a/lib/system/cntbits.nim
+++ b/lib/system/cntbits.nim
diff --git a/lib/system/debugger.nim b/lib/system/debugger.nim
index 01d8bd8a2..01d8bd8a2 100755..100644
--- a/lib/system/debugger.nim
+++ b/lib/system/debugger.nim
diff --git a/lib/system/dyncalls.nim b/lib/system/dyncalls.nim
index 0946ee355..0946ee355 100755..100644
--- a/lib/system/dyncalls.nim
+++ b/lib/system/dyncalls.nim
diff --git a/lib/system/ecmasys.nim b/lib/system/ecmasys.nim
index c0d0a5fd6..c0d0a5fd6 100755..100644
--- a/lib/system/ecmasys.nim
+++ b/lib/system/ecmasys.nim
diff --git a/lib/system/excpt.nim b/lib/system/excpt.nim
index 4d7b41da2..4d7b41da2 100755..100644
--- a/lib/system/excpt.nim
+++ b/lib/system/excpt.nim
diff --git a/lib/system/gc.nim b/lib/system/gc.nim
index da8f75768..da8f75768 100755..100644
--- a/lib/system/gc.nim
+++ b/lib/system/gc.nim
diff --git a/lib/system/hti.nim b/lib/system/hti.nim
index 3343000ae..3343000ae 100755..100644
--- a/lib/system/hti.nim
+++ b/lib/system/hti.nim
diff --git a/lib/system/mm.nim b/lib/system/mm.nim
index 76b5d83bd..76b5d83bd 100755..100644
--- a/lib/system/mm.nim
+++ b/lib/system/mm.nim
diff --git a/lib/system/profiler.nim b/lib/system/profiler.nim
index b87b30d4a..b87b30d4a 100755..100644
--- a/lib/system/profiler.nim
+++ b/lib/system/profiler.nim
diff --git a/lib/system/repr.nim b/lib/system/repr.nim
index e340f1d7c..e340f1d7c 100755..100644
--- a/lib/system/repr.nim
+++ b/lib/system/repr.nim
diff --git a/lib/system/sets.nim b/lib/system/sets.nim
index f9f3eb32b..f9f3eb32b 100755..100644
--- a/lib/system/sets.nim
+++ b/lib/system/sets.nim
diff --git a/lib/system/sysio.nim b/lib/system/sysio.nim
index 3c99a5eed..3c99a5eed 100755..100644
--- a/lib/system/sysio.nim
+++ b/lib/system/sysio.nim
diff --git a/lib/system/sysstr.nim b/lib/system/sysstr.nim
index 808941c06..808941c06 100755..100644
--- a/lib/system/sysstr.nim
+++ b/lib/system/sysstr.nim
diff --git a/lib/ucmaps/8859-1.txt b/lib/ucmaps/8859-1.txt
index 473ecabc1..473ecabc1 100755..100644
--- a/lib/ucmaps/8859-1.txt
+++ b/lib/ucmaps/8859-1.txt
diff --git a/lib/ucmaps/8859-10.txt b/lib/ucmaps/8859-10.txt
index 374a42b1a..374a42b1a 100755..100644
--- a/lib/ucmaps/8859-10.txt
+++ b/lib/ucmaps/8859-10.txt
diff --git a/lib/ucmaps/8859-13.txt b/lib/ucmaps/8859-13.txt
index cd11b53fd..cd11b53fd 100755..100644
--- a/lib/ucmaps/8859-13.txt
+++ b/lib/ucmaps/8859-13.txt
diff --git a/lib/ucmaps/8859-14.txt b/lib/ucmaps/8859-14.txt
index 36038f413..36038f413 100755..100644
--- a/lib/ucmaps/8859-14.txt
+++ b/lib/ucmaps/8859-14.txt
diff --git a/lib/ucmaps/8859-15.txt b/lib/ucmaps/8859-15.txt
index 1e319707d..1e319707d 100755..100644
--- a/lib/ucmaps/8859-15.txt
+++ b/lib/ucmaps/8859-15.txt
diff --git a/lib/ucmaps/8859-2.txt b/lib/ucmaps/8859-2.txt
index e45df25eb..e45df25eb 100755..100644
--- a/lib/ucmaps/8859-2.txt
+++ b/lib/ucmaps/8859-2.txt
diff --git a/lib/ucmaps/8859-3.txt b/lib/ucmaps/8859-3.txt
index 9b6ac69dd..9b6ac69dd 100755..100644
--- a/lib/ucmaps/8859-3.txt
+++ b/lib/ucmaps/8859-3.txt
diff --git a/lib/ucmaps/8859-4.txt b/lib/ucmaps/8859-4.txt
index 662e698ab..662e698ab 100755..100644
--- a/lib/ucmaps/8859-4.txt
+++ b/lib/ucmaps/8859-4.txt
diff --git a/lib/ucmaps/8859-5.txt b/lib/ucmaps/8859-5.txt
index a7ed1ce2a..a7ed1ce2a 100755..100644
--- a/lib/ucmaps/8859-5.txt
+++ b/lib/ucmaps/8859-5.txt
diff --git a/lib/ucmaps/8859-6.txt b/lib/ucmaps/8859-6.txt
index 69ac7f589..69ac7f589 100755..100644
--- a/lib/ucmaps/8859-6.txt
+++ b/lib/ucmaps/8859-6.txt
diff --git a/lib/ucmaps/8859-7.txt b/lib/ucmaps/8859-7.txt
index 52c42d08a..52c42d08a 100755..100644
--- a/lib/ucmaps/8859-7.txt
+++ b/lib/ucmaps/8859-7.txt
diff --git a/lib/ucmaps/8859-8.txt b/lib/ucmaps/8859-8.txt
index bc8da4c7f..bc8da4c7f 100755..100644
--- a/lib/ucmaps/8859-8.txt
+++ b/lib/ucmaps/8859-8.txt
diff --git a/lib/ucmaps/8859-9.txt b/lib/ucmaps/8859-9.txt
index 22901f107..22901f107 100755..100644
--- a/lib/ucmaps/8859-9.txt
+++ b/lib/ucmaps/8859-9.txt
diff --git a/lib/ucmaps/cp1250.txt b/lib/ucmaps/cp1250.txt
index 081d7763b..081d7763b 100755..100644
--- a/lib/ucmaps/cp1250.txt
+++ b/lib/ucmaps/cp1250.txt
diff --git a/lib/ucmaps/cp1251.txt b/lib/ucmaps/cp1251.txt
index 37eadbdbc..37eadbdbc 100755..100644
--- a/lib/ucmaps/cp1251.txt
+++ b/lib/ucmaps/cp1251.txt
diff --git a/lib/ucmaps/cp1252.txt b/lib/ucmaps/cp1252.txt
index 2ca4486eb..2ca4486eb 100755..100644
--- a/lib/ucmaps/cp1252.txt
+++ b/lib/ucmaps/cp1252.txt
diff --git a/lib/ucmaps/cp1253.txt b/lib/ucmaps/cp1253.txt
index 2ba51a0c8..2ba51a0c8 100755..100644
--- a/lib/ucmaps/cp1253.txt
+++ b/lib/ucmaps/cp1253.txt
diff --git a/lib/ucmaps/cp1254.txt b/lib/ucmaps/cp1254.txt
index ca1a1ebdb..ca1a1ebdb 100755..100644
--- a/lib/ucmaps/cp1254.txt
+++ b/lib/ucmaps/cp1254.txt
diff --git a/lib/ucmaps/cp1255.txt b/lib/ucmaps/cp1255.txt
index 341517f11..341517f11 100755..100644
--- a/lib/ucmaps/cp1255.txt
+++ b/lib/ucmaps/cp1255.txt
diff --git a/lib/ucmaps/cp1256.txt b/lib/ucmaps/cp1256.txt
index 0edd081b9..0edd081b9 100755..100644
--- a/lib/ucmaps/cp1256.txt
+++ b/lib/ucmaps/cp1256.txt
diff --git a/lib/ucmaps/cp1257.txt b/lib/ucmaps/cp1257.txt
index 97979d931..97979d931 100755..100644
--- a/lib/ucmaps/cp1257.txt
+++ b/lib/ucmaps/cp1257.txt
diff --git a/lib/ucmaps/cp1258.txt b/lib/ucmaps/cp1258.txt
index 392310a8c..392310a8c 100755..100644
--- a/lib/ucmaps/cp1258.txt
+++ b/lib/ucmaps/cp1258.txt
diff --git a/lib/ucmaps/cp437.txt b/lib/ucmaps/cp437.txt
index ae38e17ab..ae38e17ab 100755..100644
--- a/lib/ucmaps/cp437.txt
+++ b/lib/ucmaps/cp437.txt
diff --git a/lib/ucmaps/cp737.txt b/lib/ucmaps/cp737.txt
index 0fc572fc3..0fc572fc3 100755..100644
--- a/lib/ucmaps/cp737.txt
+++ b/lib/ucmaps/cp737.txt
diff --git a/lib/ucmaps/cp775.txt b/lib/ucmaps/cp775.txt
index 1ad4e4e58..1ad4e4e58 100755..100644
--- a/lib/ucmaps/cp775.txt
+++ b/lib/ucmaps/cp775.txt
diff --git a/lib/ucmaps/cp850.txt b/lib/ucmaps/cp850.txt
index 590b1afe5..590b1afe5 100755..100644
--- a/lib/ucmaps/cp850.txt
+++ b/lib/ucmaps/cp850.txt
diff --git a/lib/ucmaps/cp852.txt b/lib/ucmaps/cp852.txt
index 2f2dabaeb..2f2dabaeb 100755..100644
--- a/lib/ucmaps/cp852.txt
+++ b/lib/ucmaps/cp852.txt
diff --git a/lib/ucmaps/cp855.txt b/lib/ucmaps/cp855.txt
index d43daf039..d43daf039 100755..100644
--- a/lib/ucmaps/cp855.txt
+++ b/lib/ucmaps/cp855.txt
diff --git a/lib/ucmaps/cp856.txt b/lib/ucmaps/cp856.txt
index 3a6000bcb..3a6000bcb 100755..100644
--- a/lib/ucmaps/cp856.txt
+++ b/lib/ucmaps/cp856.txt
diff --git a/lib/ucmaps/cp857.txt b/lib/ucmaps/cp857.txt
index 305938396..305938396 100755..100644
--- a/lib/ucmaps/cp857.txt
+++ b/lib/ucmaps/cp857.txt
diff --git a/lib/ucmaps/cp860.txt b/lib/ucmaps/cp860.txt
index d7f2cb737..d7f2cb737 100755..100644
--- a/lib/ucmaps/cp860.txt
+++ b/lib/ucmaps/cp860.txt
diff --git a/lib/ucmaps/cp861.txt b/lib/ucmaps/cp861.txt
index fe0f02bb5..fe0f02bb5 100755..100644
--- a/lib/ucmaps/cp861.txt
+++ b/lib/ucmaps/cp861.txt
diff --git a/lib/ucmaps/cp862.txt b/lib/ucmaps/cp862.txt
index 963110518..963110518 100755..100644
--- a/lib/ucmaps/cp862.txt
+++ b/lib/ucmaps/cp862.txt
diff --git a/lib/ucmaps/cp863.txt b/lib/ucmaps/cp863.txt
index cc4eae186..cc4eae186 100755..100644
--- a/lib/ucmaps/cp863.txt
+++ b/lib/ucmaps/cp863.txt
diff --git a/lib/ucmaps/cp864.txt b/lib/ucmaps/cp864.txt
index 7aa055fba..7aa055fba 100755..100644
--- a/lib/ucmaps/cp864.txt
+++ b/lib/ucmaps/cp864.txt
diff --git a/lib/ucmaps/cp865.txt b/lib/ucmaps/cp865.txt
index 67705f46a..67705f46a 100755..100644
--- a/lib/ucmaps/cp865.txt
+++ b/lib/ucmaps/cp865.txt
diff --git a/lib/ucmaps/cp866.txt b/lib/ucmaps/cp866.txt
index 880fb70e3..880fb70e3 100755..100644
--- a/lib/ucmaps/cp866.txt
+++ b/lib/ucmaps/cp866.txt
diff --git a/lib/ucmaps/cp869.txt b/lib/ucmaps/cp869.txt
index 4c77ffd6c..4c77ffd6c 100755..100644
--- a/lib/ucmaps/cp869.txt
+++ b/lib/ucmaps/cp869.txt
diff --git a/lib/ucmaps/cp874.txt b/lib/ucmaps/cp874.txt
index 1eb71dfe1..1eb71dfe1 100755..100644
--- a/lib/ucmaps/cp874.txt
+++ b/lib/ucmaps/cp874.txt
diff --git a/lib/ucmaps/cp932.txt b/lib/ucmaps/cp932.txt
index 36bfdbfab..36bfdbfab 100755..100644
--- a/lib/ucmaps/cp932.txt
+++ b/lib/ucmaps/cp932.txt
diff --git a/lib/windows/mmsystem.nim b/lib/windows/mmsystem.nim
index 07d0cb538..c7dd5b1be 100755..100644
--- a/lib/windows/mmsystem.nim
+++ b/lib/windows/mmsystem.nim
@@ -21,6 +21,8 @@
 #   LCC-win32 (c) Jacob Navia
 #*******************************
 
+{.deadCodeElim: on.}
+
 import
   windows
 
diff --git a/lib/windows/nb30.nim b/lib/windows/nb30.nim
index 615488ac1..527e3a9e2 100755..100644
--- a/lib/windows/nb30.nim
+++ b/lib/windows/nb30.nim
@@ -10,6 +10,8 @@
 
 # This module contains the definitions for portable NetBIOS 3.0 support. 
 
+{.deadCodeElim: on.}
+
 import                        # Data structure templates 
   Windows
 
diff --git a/lib/windows/ole2.nim b/lib/windows/ole2.nim
index ec0ab8f5d..ec0ab8f5d 100755..100644
--- a/lib/windows/ole2.nim
+++ b/lib/windows/ole2.nim
diff --git a/lib/windows/shellapi.nim b/lib/windows/shellapi.nim
index a4a976c60..c6d2d69a1 100755..100644
--- a/lib/windows/shellapi.nim
+++ b/lib/windows/shellapi.nim
@@ -7,6 +7,8 @@
 #    distribution, for details about the copyright.
 #
 
+{.deadCodeElim: on.}
+
 # leave out unused functions so the unit can be used on win2000 as well
 
 #+-------------------------------------------------------------------------
diff --git a/lib/windows/shfolder.nim b/lib/windows/shfolder.nim
index 210f6441f..253b1c77a 100755..100644
--- a/lib/windows/shfolder.nim
+++ b/lib/windows/shfolder.nim
@@ -21,6 +21,8 @@
 #  systems.
 #  ---------------------------------------------------------------------
 
+{.deadCodeElim: on.}
+
 import 
   windows
 
diff --git a/lib/windows/windows.nim b/lib/windows/windows.nim
index 20f9a9d7d..20f9a9d7d 100755..100644
--- a/lib/windows/windows.nim
+++ b/lib/windows/windows.nim
diff --git a/lib/windows/winlean.nim b/lib/windows/winlean.nim
index 9a74a242a..9a74a242a 100755..100644
--- a/lib/windows/winlean.nim
+++ b/lib/windows/winlean.nim
diff --git a/lib/wrappers/cairo/cairo.nim b/lib/wrappers/cairo/cairo.nim
index 6da8183f3..6da8183f3 100755..100644
--- a/lib/wrappers/cairo/cairo.nim
+++ b/lib/wrappers/cairo/cairo.nim
diff --git a/lib/wrappers/cairo/cairoft.nim b/lib/wrappers/cairo/cairoft.nim
index 2418aa922..2418aa922 100755..100644
--- a/lib/wrappers/cairo/cairoft.nim
+++ b/lib/wrappers/cairo/cairoft.nim
diff --git a/lib/wrappers/cairo/cairowin32.nim b/lib/wrappers/cairo/cairowin32.nim
index 5d07c2611..5d07c2611 100755..100644
--- a/lib/wrappers/cairo/cairowin32.nim
+++ b/lib/wrappers/cairo/cairowin32.nim
diff --git a/lib/wrappers/cairo/cairoxlib.nim b/lib/wrappers/cairo/cairoxlib.nim
index dfe44eb87..dfe44eb87 100755..100644
--- a/lib/wrappers/cairo/cairoxlib.nim
+++ b/lib/wrappers/cairo/cairoxlib.nim
diff --git a/lib/wrappers/gtk/atk.nim b/lib/wrappers/gtk/atk.nim
index ae7a34c4b..ae7a34c4b 100755..100644
--- a/lib/wrappers/gtk/atk.nim
+++ b/lib/wrappers/gtk/atk.nim
diff --git a/lib/wrappers/gtk/gdk2.nim b/lib/wrappers/gtk/gdk2.nim
index 0ca5056b5..0ca5056b5 100755..100644
--- a/lib/wrappers/gtk/gdk2.nim
+++ b/lib/wrappers/gtk/gdk2.nim
diff --git a/lib/wrappers/gtk/gdk2pixbuf.nim b/lib/wrappers/gtk/gdk2pixbuf.nim
index daaa1479b..daaa1479b 100755..100644
--- a/lib/wrappers/gtk/gdk2pixbuf.nim
+++ b/lib/wrappers/gtk/gdk2pixbuf.nim
diff --git a/lib/wrappers/gtk/gdkglext.nim b/lib/wrappers/gtk/gdkglext.nim
index 524b5f730..524b5f730 100755..100644
--- a/lib/wrappers/gtk/gdkglext.nim
+++ b/lib/wrappers/gtk/gdkglext.nim
diff --git a/lib/wrappers/gtk/glib2.nim b/lib/wrappers/gtk/glib2.nim
index 3f33501e8..3f33501e8 100755..100644
--- a/lib/wrappers/gtk/glib2.nim
+++ b/lib/wrappers/gtk/glib2.nim
diff --git a/lib/wrappers/gtk/gtk2.nim b/lib/wrappers/gtk/gtk2.nim
index e7c5be7be..e7c5be7be 100755..100644
--- a/lib/wrappers/gtk/gtk2.nim
+++ b/lib/wrappers/gtk/gtk2.nim
diff --git a/lib/wrappers/gtk/gtkglext.nim b/lib/wrappers/gtk/gtkglext.nim
index 38da5d25e..38da5d25e 100755..100644
--- a/lib/wrappers/gtk/gtkglext.nim
+++ b/lib/wrappers/gtk/gtkglext.nim
diff --git a/lib/wrappers/gtk/gtkhtml.nim b/lib/wrappers/gtk/gtkhtml.nim
index c9ccc3595..c9ccc3595 100755..100644
--- a/lib/wrappers/gtk/gtkhtml.nim
+++ b/lib/wrappers/gtk/gtkhtml.nim
diff --git a/lib/wrappers/gtk/libglade2.nim b/lib/wrappers/gtk/libglade2.nim
index 5e323680e..5e323680e 100755..100644
--- a/lib/wrappers/gtk/libglade2.nim
+++ b/lib/wrappers/gtk/libglade2.nim
diff --git a/lib/wrappers/gtk/pango.nim b/lib/wrappers/gtk/pango.nim
index ade2da989..ade2da989 100755..100644
--- a/lib/wrappers/gtk/pango.nim
+++ b/lib/wrappers/gtk/pango.nim
diff --git a/lib/wrappers/gtk/pangoutils.nim b/lib/wrappers/gtk/pangoutils.nim
index e6f3ab94c..e6f3ab94c 100755..100644
--- a/lib/wrappers/gtk/pangoutils.nim
+++ b/lib/wrappers/gtk/pangoutils.nim
diff --git a/lib/wrappers/iup.nim b/lib/wrappers/iup.nim
index c37d31047..c37d31047 100755..100644
--- a/lib/wrappers/iup.nim
+++ b/lib/wrappers/iup.nim
diff --git a/lib/wrappers/libcurl.nim b/lib/wrappers/libcurl.nim
index 9cb352fb7..9cb352fb7 100755..100644
--- a/lib/wrappers/libcurl.nim
+++ b/lib/wrappers/libcurl.nim
diff --git a/lib/wrappers/lua/lauxlib.nim b/lib/wrappers/lua/lauxlib.nim
index 477dd5874..477dd5874 100755..100644
--- a/lib/wrappers/lua/lauxlib.nim
+++ b/lib/wrappers/lua/lauxlib.nim
diff --git a/lib/wrappers/lua/lua.nim b/lib/wrappers/lua/lua.nim
index 54f8d46bb..54f8d46bb 100755..100644
--- a/lib/wrappers/lua/lua.nim
+++ b/lib/wrappers/lua/lua.nim
diff --git a/lib/wrappers/lua/lualib.nim b/lib/wrappers/lua/lualib.nim
index df5d53101..df5d53101 100755..100644
--- a/lib/wrappers/lua/lualib.nim
+++ b/lib/wrappers/lua/lualib.nim
diff --git a/lib/wrappers/mysql.nim b/lib/wrappers/mysql.nim
index e94afb1a2..e94afb1a2 100755..100644
--- a/lib/wrappers/mysql.nim
+++ b/lib/wrappers/mysql.nim
diff --git a/lib/wrappers/odbcsql.nim b/lib/wrappers/odbcsql.nim
index 77719e85f..77719e85f 100755..100644
--- a/lib/wrappers/odbcsql.nim
+++ b/lib/wrappers/odbcsql.nim
diff --git a/lib/wrappers/opengl/gl.nim b/lib/wrappers/opengl/gl.nim
index 79f09b544..79f09b544 100755..100644
--- a/lib/wrappers/opengl/gl.nim
+++ b/lib/wrappers/opengl/gl.nim
diff --git a/lib/wrappers/opengl/glext.nim b/lib/wrappers/opengl/glext.nim
index 0a2138584..0a2138584 100755..100644
--- a/lib/wrappers/opengl/glext.nim
+++ b/lib/wrappers/opengl/glext.nim
diff --git a/lib/wrappers/opengl/glu.nim b/lib/wrappers/opengl/glu.nim
index 297f4d354..297f4d354 100755..100644
--- a/lib/wrappers/opengl/glu.nim
+++ b/lib/wrappers/opengl/glu.nim
diff --git a/lib/wrappers/opengl/glut.nim b/lib/wrappers/opengl/glut.nim
index 55ee18bda..55ee18bda 100755..100644
--- a/lib/wrappers/opengl/glut.nim
+++ b/lib/wrappers/opengl/glut.nim
diff --git a/lib/wrappers/opengl/glx.nim b/lib/wrappers/opengl/glx.nim
index a967acfc6..a967acfc6 100755..100644
--- a/lib/wrappers/opengl/glx.nim
+++ b/lib/wrappers/opengl/glx.nim
diff --git a/lib/wrappers/opengl/wingl.nim b/lib/wrappers/opengl/wingl.nim
index 2cebf8622..2cebf8622 100755..100644
--- a/lib/wrappers/opengl/wingl.nim
+++ b/lib/wrappers/opengl/wingl.nim
diff --git a/lib/wrappers/pcre/pcre.nim b/lib/wrappers/pcre/pcre.nim
index 05f937579..05f937579 100755..100644
--- a/lib/wrappers/pcre/pcre.nim
+++ b/lib/wrappers/pcre/pcre.nim
diff --git a/lib/wrappers/pcre/pcre_all.c b/lib/wrappers/pcre/pcre_all.c
index bcda06e50..bcda06e50 100755..100644
--- a/lib/wrappers/pcre/pcre_all.c
+++ b/lib/wrappers/pcre/pcre_all.c
diff --git a/lib/wrappers/postgres.nim b/lib/wrappers/postgres.nim
index 4b43333d7..4b43333d7 100755..100644
--- a/lib/wrappers/postgres.nim
+++ b/lib/wrappers/postgres.nim
diff --git a/lib/wrappers/python.nim b/lib/wrappers/python.nim
index ea9ef1fd5..ea9ef1fd5 100755..100644
--- a/lib/wrappers/python.nim
+++ b/lib/wrappers/python.nim
diff --git a/lib/wrappers/sdl/sdl.nim b/lib/wrappers/sdl/sdl.nim
index 7d2b6ba26..7d2b6ba26 100755..100644
--- a/lib/wrappers/sdl/sdl.nim
+++ b/lib/wrappers/sdl/sdl.nim
diff --git a/lib/wrappers/sdl/sdl_gfx.nim b/lib/wrappers/sdl/sdl_gfx.nim
index 8ae8eca0b..8ae8eca0b 100755..100644
--- a/lib/wrappers/sdl/sdl_gfx.nim
+++ b/lib/wrappers/sdl/sdl_gfx.nim
diff --git a/lib/wrappers/sdl/sdl_image.nim b/lib/wrappers/sdl/sdl_image.nim
index a15afd575..a15afd575 100755..100644
--- a/lib/wrappers/sdl/sdl_image.nim
+++ b/lib/wrappers/sdl/sdl_image.nim
diff --git a/lib/wrappers/sdl/sdl_mixer.nim b/lib/wrappers/sdl/sdl_mixer.nim
index a17ef09d4..a17ef09d4 100755..100644
--- a/lib/wrappers/sdl/sdl_mixer.nim
+++ b/lib/wrappers/sdl/sdl_mixer.nim
diff --git a/lib/wrappers/sdl/sdl_mixer_nosmpeg.nim b/lib/wrappers/sdl/sdl_mixer_nosmpeg.nim
index 879867607..879867607 100755..100644
--- a/lib/wrappers/sdl/sdl_mixer_nosmpeg.nim
+++ b/lib/wrappers/sdl/sdl_mixer_nosmpeg.nim
diff --git a/lib/wrappers/sdl/sdl_net.nim b/lib/wrappers/sdl/sdl_net.nim
index f27a674ae..f27a674ae 100755..100644
--- a/lib/wrappers/sdl/sdl_net.nim
+++ b/lib/wrappers/sdl/sdl_net.nim
diff --git a/lib/wrappers/sdl/sdl_ttf.nim b/lib/wrappers/sdl/sdl_ttf.nim
index 724c2f634..724c2f634 100755..100644
--- a/lib/wrappers/sdl/sdl_ttf.nim
+++ b/lib/wrappers/sdl/sdl_ttf.nim
diff --git a/lib/wrappers/sdl/sdlutils.pas b/lib/wrappers/sdl/sdlutils.pas
index e4206e935..e4206e935 100755..100644
--- a/lib/wrappers/sdl/sdlutils.pas
+++ b/lib/wrappers/sdl/sdlutils.pas
diff --git a/lib/wrappers/sdl/smpeg.nim b/lib/wrappers/sdl/smpeg.nim
index 733a3fcf9..733a3fcf9 100755..100644
--- a/lib/wrappers/sdl/smpeg.nim
+++ b/lib/wrappers/sdl/smpeg.nim
diff --git a/lib/wrappers/sqlite3.nim b/lib/wrappers/sqlite3.nim
index 9a97330ec..9a97330ec 100755..100644
--- a/lib/wrappers/sqlite3.nim
+++ b/lib/wrappers/sqlite3.nim
diff --git a/lib/wrappers/tcl.nim b/lib/wrappers/tcl.nim
index 813714ecd..813714ecd 100755..100644
--- a/lib/wrappers/tcl.nim
+++ b/lib/wrappers/tcl.nim
diff --git a/lib/wrappers/tre/config.h b/lib/wrappers/tre/config.h
index 1a3a0bc3a..1a3a0bc3a 100755..100644
--- a/lib/wrappers/tre/config.h
+++ b/lib/wrappers/tre/config.h
diff --git a/lib/wrappers/tre/tre_all.c b/lib/wrappers/tre/tre_all.c
index 8272657a3..8272657a3 100755..100644
--- a/lib/wrappers/tre/tre_all.c
+++ b/lib/wrappers/tre/tre_all.c
diff --git a/lib/wrappers/tre/version.txt b/lib/wrappers/tre/version.txt
index 4d01880a7..4d01880a7 100755..100644
--- a/lib/wrappers/tre/version.txt
+++ b/lib/wrappers/tre/version.txt
diff --git a/lib/wrappers/x11/cursorfont.nim b/lib/wrappers/x11/cursorfont.nim
index b262ad7c1..b262ad7c1 100755..100644
--- a/lib/wrappers/x11/cursorfont.nim
+++ b/lib/wrappers/x11/cursorfont.nim
diff --git a/lib/wrappers/x11/keysym.nim b/lib/wrappers/x11/keysym.nim
index b1fe13b80..b1fe13b80 100755..100644
--- a/lib/wrappers/x11/keysym.nim
+++ b/lib/wrappers/x11/keysym.nim
diff --git a/lib/wrappers/x11/x.nim b/lib/wrappers/x11/x.nim
index aa6e7f821..aa6e7f821 100755..100644
--- a/lib/wrappers/x11/x.nim
+++ b/lib/wrappers/x11/x.nim
diff --git a/lib/wrappers/x11/xatom.nim b/lib/wrappers/x11/xatom.nim
index b2e1dca91..b2e1dca91 100755..100644
--- a/lib/wrappers/x11/xatom.nim
+++ b/lib/wrappers/x11/xatom.nim
diff --git a/lib/wrappers/x11/xcms.nim b/lib/wrappers/x11/xcms.nim
index 57aad6ae0..57aad6ae0 100755..100644
--- a/lib/wrappers/x11/xcms.nim
+++ b/lib/wrappers/x11/xcms.nim
diff --git a/lib/wrappers/x11/xf86dga.nim b/lib/wrappers/x11/xf86dga.nim
index 376f11861..376f11861 100755..100644
--- a/lib/wrappers/x11/xf86dga.nim
+++ b/lib/wrappers/x11/xf86dga.nim
diff --git a/lib/wrappers/x11/xf86vmode.nim b/lib/wrappers/x11/xf86vmode.nim
index 18a922cab..18a922cab 100755..100644
--- a/lib/wrappers/x11/xf86vmode.nim
+++ b/lib/wrappers/x11/xf86vmode.nim
diff --git a/lib/wrappers/x11/xi.nim b/lib/wrappers/x11/xi.nim
index d1b9f7846..d1b9f7846 100755..100644
--- a/lib/wrappers/x11/xi.nim
+++ b/lib/wrappers/x11/xi.nim
diff --git a/lib/wrappers/x11/xinerama.nim b/lib/wrappers/x11/xinerama.nim
index 96f5d7da3..96f5d7da3 100755..100644
--- a/lib/wrappers/x11/xinerama.nim
+++ b/lib/wrappers/x11/xinerama.nim
diff --git a/lib/wrappers/x11/xkb.nim b/lib/wrappers/x11/xkb.nim
index f1b0448a8..f1b0448a8 100755..100644
--- a/lib/wrappers/x11/xkb.nim
+++ b/lib/wrappers/x11/xkb.nim
diff --git a/lib/wrappers/x11/xkblib.nim b/lib/wrappers/x11/xkblib.nim
index 92d438a60..92d438a60 100755..100644
--- a/lib/wrappers/x11/xkblib.nim
+++ b/lib/wrappers/x11/xkblib.nim
diff --git a/lib/wrappers/x11/xlib.nim b/lib/wrappers/x11/xlib.nim
index 19ebda9e0..19ebda9e0 100755..100644
--- a/lib/wrappers/x11/xlib.nim
+++ b/lib/wrappers/x11/xlib.nim
diff --git a/lib/wrappers/x11/xrandr.nim b/lib/wrappers/x11/xrandr.nim
index ee6f1705b..ee6f1705b 100755..100644
--- a/lib/wrappers/x11/xrandr.nim
+++ b/lib/wrappers/x11/xrandr.nim
diff --git a/lib/wrappers/x11/xrender.nim b/lib/wrappers/x11/xrender.nim
index 7b85fc9a7..7b85fc9a7 100755..100644
--- a/lib/wrappers/x11/xrender.nim
+++ b/lib/wrappers/x11/xrender.nim
diff --git a/lib/wrappers/x11/xresource.nim b/lib/wrappers/x11/xresource.nim
index ddb2a89c2..ddb2a89c2 100755..100644
--- a/lib/wrappers/x11/xresource.nim
+++ b/lib/wrappers/x11/xresource.nim
diff --git a/lib/wrappers/x11/xshm.nim b/lib/wrappers/x11/xshm.nim
index e56bd87b1..e56bd87b1 100755..100644
--- a/lib/wrappers/x11/xshm.nim
+++ b/lib/wrappers/x11/xshm.nim
diff --git a/lib/wrappers/x11/xutil.nim b/lib/wrappers/x11/xutil.nim
index 563702123..563702123 100755..100644
--- a/lib/wrappers/x11/xutil.nim
+++ b/lib/wrappers/x11/xutil.nim
diff --git a/lib/wrappers/x11/xv.nim b/lib/wrappers/x11/xv.nim
index 45ab61418..45ab61418 100755..100644
--- a/lib/wrappers/x11/xv.nim
+++ b/lib/wrappers/x11/xv.nim
diff --git a/lib/wrappers/x11/xvlib.nim b/lib/wrappers/x11/xvlib.nim
index 19fd0d000..19fd0d000 100755..100644
--- a/lib/wrappers/x11/xvlib.nim
+++ b/lib/wrappers/x11/xvlib.nim
diff --git a/lib/wrappers/zip/libzip.nim b/lib/wrappers/zip/libzip.nim
index 2f8abc46c..2f8abc46c 100755..100644
--- a/lib/wrappers/zip/libzip.nim
+++ b/lib/wrappers/zip/libzip.nim
diff --git a/lib/wrappers/zip/libzip_all.c b/lib/wrappers/zip/libzip_all.c
index 797374b29..797374b29 100755..100644
--- a/lib/wrappers/zip/libzip_all.c
+++ b/lib/wrappers/zip/libzip_all.c
diff --git a/lib/wrappers/zip/zlib.nim b/lib/wrappers/zip/zlib.nim
index 9b49b9663..9b49b9663 100755..100644
--- a/lib/wrappers/zip/zlib.nim
+++ b/lib/wrappers/zip/zlib.nim
diff --git a/lib/wrappers/zip/zzip.nim b/lib/wrappers/zip/zzip.nim
index a656322ee..a656322ee 100755..100644
--- a/lib/wrappers/zip/zzip.nim
+++ b/lib/wrappers/zip/zzip.nim