fixed pango/pangoutils new wrappers

759 files changed, 806 insertions, 758 deletions

diff --git a/.bzrignore b/.bzrignore
index a638ed4bd..a638ed4bd 100644..100755
--- a/.bzrignore
+++ b/.bzrignore
diff --git a/config/nimdoc.cfg b/config/nimdoc.cfg
index 300b5e509..300b5e509 100644..100755
--- a/config/nimdoc.cfg
+++ b/config/nimdoc.cfg
diff --git a/config/nimdoc.tex.cfg b/config/nimdoc.tex.cfg
index 54a57e0fb..54a57e0fb 100644..100755
--- a/config/nimdoc.tex.cfg
+++ b/config/nimdoc.tex.cfg
diff --git a/config/nimrod.cfg b/config/nimrod.cfg
index 80d7a548d..80d7a548d 100644..100755
--- a/config/nimrod.cfg
+++ b/config/nimrod.cfg
diff --git a/contributors.txt b/contributors.txt
index 2f025f422..2f025f422 100644..100755
--- a/contributors.txt
+++ b/contributors.txt
diff --git a/copying.txt b/copying.txt
index 992a5f9b9..992a5f9b9 100644..100755
--- a/copying.txt
+++ b/copying.txt
diff --git a/data/advopt.txt b/data/advopt.txt
index a4895efe7..a4895efe7 100644..100755
--- a/data/advopt.txt
+++ b/data/advopt.txt
diff --git a/data/ast.yml b/data/ast.yml
index f27b09a18..f27b09a18 100644..100755
--- a/data/ast.yml
+++ b/data/ast.yml
diff --git a/data/basicopt.txt b/data/basicopt.txt
index 0201b84d7..0201b84d7 100644..100755
--- a/data/basicopt.txt
+++ b/data/basicopt.txt
diff --git a/data/keywords.txt b/data/keywords.txt
index a6d96834a..a6d96834a 100644..100755
--- a/data/keywords.txt
+++ b/data/keywords.txt
diff --git a/data/magic.yml b/data/magic.yml
index 857a24088..857a24088 100644..100755
--- a/data/magic.yml
+++ b/data/magic.yml
diff --git a/data/messages.yml b/data/messages.yml
index 51ec2b088..51ec2b088 100644..100755
--- a/data/messages.yml
+++ b/data/messages.yml
diff --git a/data/pas_keyw.yml b/data/pas_keyw.yml
index 7f2d26960..7f2d26960 100644..100755
--- a/data/pas_keyw.yml
+++ b/data/pas_keyw.yml
diff --git a/data/readme.txt b/data/readme.txt
index ee9630eac..ee9630eac 100644..100755
--- a/data/readme.txt
+++ b/data/readme.txt
diff --git a/diff/empty.txt b/diff/empty.txt
index 20f9a91e3..20f9a91e3 100644..100755
--- a/diff/empty.txt
+++ b/diff/empty.txt
diff --git a/doc/abstypes.txt b/doc/abstypes.txt
index 44c3bb0c9..44c3bb0c9 100644..100755
--- a/doc/abstypes.txt
+++ b/doc/abstypes.txt
diff --git a/doc/apis.txt b/doc/apis.txt
index 93484b8b7..93484b8b7 100644..100755
--- a/doc/apis.txt
+++ b/doc/apis.txt
diff --git a/doc/astspec.txt b/doc/astspec.txt
index 01c1adba3..01c1adba3 100644..100755
--- a/doc/astspec.txt
+++ b/doc/astspec.txt
diff --git a/doc/docs.txt b/doc/docs.txt
index a731b1504..a731b1504 100644..100755
--- a/doc/docs.txt
+++ b/doc/docs.txt
diff --git a/doc/effects.txt b/doc/effects.txt
index 85de1ffdf..85de1ffdf 100644..100755
--- a/doc/effects.txt
+++ b/doc/effects.txt
diff --git a/doc/endb.txt b/doc/endb.txt
index e2be59c50..e2be59c50 100644..100755
--- a/doc/endb.txt
+++ b/doc/endb.txt
diff --git a/doc/filelist.txt b/doc/filelist.txt
index 7bcd424db..7bcd424db 100644..100755
--- a/doc/filelist.txt
+++ b/doc/filelist.txt
diff --git a/doc/filters.txt b/doc/filters.txt
index 0cbb3319d..0cbb3319d 100644..100755
--- a/doc/filters.txt
+++ b/doc/filters.txt
diff --git a/doc/gramcurl.txt b/doc/gramcurl.txt
index 3ac9294c8..3ac9294c8 100644..100755
--- a/doc/gramcurl.txt
+++ b/doc/gramcurl.txt
diff --git a/doc/grammar.txt b/doc/grammar.txt
index a648913a0..a648913a0 100644..100755
--- a/doc/grammar.txt
+++ b/doc/grammar.txt
diff --git a/doc/intern.txt b/doc/intern.txt
index 37c376568..37c376568 100644..100755
--- a/doc/intern.txt
+++ b/doc/intern.txt
diff --git a/doc/lib.txt b/doc/lib.txt
index b94ac987e..b94ac987e 100644..100755
--- a/doc/lib.txt
+++ b/doc/lib.txt
diff --git a/doc/manual.txt b/doc/manual.txt
index d2bfde138..d2bfde138 100644..100755
--- a/doc/manual.txt
+++ b/doc/manual.txt
diff --git a/doc/mytest.cfg b/doc/mytest.cfg
index be1118c46..be1118c46 100644..100755
--- a/doc/mytest.cfg
+++ b/doc/mytest.cfg
diff --git a/doc/nimdoc.css b/doc/nimdoc.css
index 6154f0b2e..6154f0b2e 100644..100755
--- a/doc/nimdoc.css
+++ b/doc/nimdoc.css
diff --git a/doc/nimrodc.txt b/doc/nimrodc.txt
index 79ce06ad1..79ce06ad1 100644..100755
--- a/doc/nimrodc.txt
+++ b/doc/nimrodc.txt
diff --git a/doc/overview.txt b/doc/overview.txt
index 242039086..242039086 100644..100755
--- a/doc/overview.txt
+++ b/doc/overview.txt
diff --git a/doc/pegdocs.txt b/doc/pegdocs.txt
index 8e21b12cd..27eb19747 100644..100755
--- a/doc/pegdocs.txt
+++ b/doc/pegdocs.txt
@@ -26,7 +26,8 @@ notation           meaning
                    operator priority.
 ``{E}``            Capture: Apply expression `E` and store the substring
                    that matched `E` into a *capture* that can be accessed
-                   after the matching process.                   
+                   after the matching process.
+``$i``             back reference to the ``i``th capture. ``i`` counts from 1. 
 ``&E``             And predicate: Indicate success if expression `E` matches
                    the text ahead; otherwise indicate failure. Do not consume
                    any text.
@@ -54,6 +55,9 @@ notation           meaning
 ``y's'``           String match ignoring style.
 ``v's'``           Verbatim string match: Use this to override a global
                    ``\i`` or ``\y`` modifier.
+``i$j``            String match ignoring case for back reference.
+``y$j``            String match ignoring style for back reference.
+``v$j``            Verbatim string match for back reference.
 ``.``              Any character: If there is a character ahead, consume it
                    and indicate success. Otherwise (that is, at the end of
                    input) indicate failure.
@@ -125,11 +129,17 @@ The PEG parser implements this grammar (written in PEG syntax)::
   
   rule <- identifier \s* "<-" expr ig
   identNoArrow <- identifier !(\s* "<-")
-  primary <- (ig '&' / ig '!' / ig '@')*
-               ((ig identNoArrow / ig charset / ig stringlit
-                                 / ig builtin / ig '.' / ig '_'
-                                 / (ig "(" expr ig ")"))
-             (ig '?' / ig '*' / ig '+')*)
+  prefixOpr <- ig '&' / ig '!' / ig '@'
+  literal <- ig identifier? '$' [0-9]+
+             ig identNoArrow / 
+             ig charset / 
+             ig stringlit / 
+             ig builtin / 
+             ig '.' / 
+             ig '_' / 
+             (ig "(" expr ig ")")
+  postfixOpr <- ig '?' / ig '*' / ig '+'
+  primary <- prefixOpr* (literal postfixOpr*)
   
   # Concatenation has higher priority than choice:
   # ``a b / c`` means ``(a b) / c``
diff --git a/doc/readme.txt b/doc/readme.txt
index 7f509bd39..7f509bd39 100644..100755
--- a/doc/readme.txt
+++ b/doc/readme.txt
diff --git a/doc/regexprs.txt b/doc/regexprs.txt
index 930352948..930352948 100644..100755
--- a/doc/regexprs.txt
+++ b/doc/regexprs.txt
diff --git a/doc/rst.txt b/doc/rst.txt
index 79d0eb9c4..79d0eb9c4 100644..100755
--- a/doc/rst.txt
+++ b/doc/rst.txt
diff --git a/doc/theindex.txt b/doc/theindex.txt
index 06cec5d19..06cec5d19 100644..100755
--- a/doc/theindex.txt
+++ b/doc/theindex.txt
diff --git a/doc/tut1.txt b/doc/tut1.txt
index bb37bd84d..bb37bd84d 100644..100755
--- a/doc/tut1.txt
+++ b/doc/tut1.txt
diff --git a/doc/tut2.txt b/doc/tut2.txt
index a139fb5de..a139fb5de 100644..100755
--- a/doc/tut2.txt
+++ b/doc/tut2.txt
diff --git a/examples/allany.nim b/examples/allany.nim
index 4747ce0d6..4747ce0d6 100644..100755
--- a/examples/allany.nim
+++ b/examples/allany.nim
diff --git a/examples/cairoex.nim b/examples/cairoex.nim
index 2c28e1abf..2c28e1abf 100644..100755
--- a/examples/cairoex.nim
+++ b/examples/cairoex.nim
diff --git a/examples/cgiex.nim b/examples/cgiex.nim
index 857caa8ef..857caa8ef 100644..100755
--- a/examples/cgiex.nim
+++ b/examples/cgiex.nim
diff --git a/examples/curlex.nim b/examples/curlex.nim
index 7f666f775..7f666f775 100644..100755
--- a/examples/curlex.nim
+++ b/examples/curlex.nim
diff --git a/examples/filterex.nim b/examples/filterex.nim
index 3713f4b64..3713f4b64 100644..100755
--- a/examples/filterex.nim
+++ b/examples/filterex.nim
diff --git a/examples/gtk/ex1.nim b/examples/gtk/ex1.nim
index aa3ed2f66..aa3ed2f66 100644..100755
--- a/examples/gtk/ex1.nim
+++ b/examples/gtk/ex1.nim
diff --git a/examples/gtk/ex2.nim b/examples/gtk/ex2.nim
index 80ff6f104..80ff6f104 100644..100755
--- a/examples/gtk/ex2.nim
+++ b/examples/gtk/ex2.nim
diff --git a/examples/gtk/ex3.nim b/examples/gtk/ex3.nim
index 460b1e4dc..460b1e4dc 100644..100755
--- a/examples/gtk/ex3.nim
+++ b/examples/gtk/ex3.nim
diff --git a/examples/gtk/ex4.nim b/examples/gtk/ex4.nim
index a387da972..a387da972 100644..100755
--- a/examples/gtk/ex4.nim
+++ b/examples/gtk/ex4.nim
diff --git a/examples/gtk/ex5.nim b/examples/gtk/ex5.nim
index 3a5b076c6..3a5b076c6 100644..100755
--- a/examples/gtk/ex5.nim
+++ b/examples/gtk/ex5.nim
diff --git a/examples/gtk/ex6.nim b/examples/gtk/ex6.nim
index 5f18786fe..5f18786fe 100644..100755
--- a/examples/gtk/ex6.nim
+++ b/examples/gtk/ex6.nim
diff --git a/examples/gtk/ex7.nim b/examples/gtk/ex7.nim
index 53890d1e1..53890d1e1 100644..100755
--- a/examples/gtk/ex7.nim
+++ b/examples/gtk/ex7.nim
diff --git a/examples/gtk/ex8.nim b/examples/gtk/ex8.nim
index acbba2258..acbba2258 100644..100755
--- a/examples/gtk/ex8.nim
+++ b/examples/gtk/ex8.nim
diff --git a/examples/gtk/ex9.nim b/examples/gtk/ex9.nim
index ce2f73862..ce2f73862 100644..100755
--- a/examples/gtk/ex9.nim
+++ b/examples/gtk/ex9.nim
diff --git a/examples/hallo.nim b/examples/hallo.nim
index 20aa4695c..20aa4695c 100644..100755
--- a/examples/hallo.nim
+++ b/examples/hallo.nim
diff --git a/examples/htmlrefs.nim b/examples/htmlrefs.nim
index b1695ee7a..b1695ee7a 100644..100755
--- a/examples/htmlrefs.nim
+++ b/examples/htmlrefs.nim
diff --git a/examples/htmltitle.nim b/examples/htmltitle.nim
index ae023e379..ae023e379 100644..100755
--- a/examples/htmltitle.nim
+++ b/examples/htmltitle.nim
diff --git a/examples/iupex1.nim b/examples/iupex1.nim
index 89e85e776..89e85e776 100644..100755
--- a/examples/iupex1.nim
+++ b/examples/iupex1.nim
diff --git a/examples/keyval.nim b/examples/keyval.nim
index 99a410e8c..99a410e8c 100644..100755
--- a/examples/keyval.nim
+++ b/examples/keyval.nim
diff --git a/examples/keyval2.nim b/examples/keyval2.nim
index 5e7d0ea4a..5e7d0ea4a 100644..100755
--- a/examples/keyval2.nim
+++ b/examples/keyval2.nim
diff --git a/examples/luaex.nim b/examples/luaex.nim
index a71f0fb05..a71f0fb05 100644..100755
--- a/examples/luaex.nim
+++ b/examples/luaex.nim
diff --git a/examples/maximum.nim b/examples/maximum.nim
index 1e26ee1a7..1e26ee1a7 100644..100755
--- a/examples/maximum.nim
+++ b/examples/maximum.nim
diff --git a/examples/myfile.txt b/examples/myfile.txt
index 1df0d56f8..1df0d56f8 100644..100755
--- a/examples/myfile.txt
+++ b/examples/myfile.txt
diff --git a/examples/pythonex.nim b/examples/pythonex.nim
index e2664f350..e2664f350 100644..100755
--- a/examples/pythonex.nim
+++ b/examples/pythonex.nim
diff --git a/examples/readme.txt b/examples/readme.txt
index e6e47c1d1..e6e47c1d1 100644..100755
--- a/examples/readme.txt
+++ b/examples/readme.txt
diff --git a/examples/sdlex.nim b/examples/sdlex.nim
index ae7f1b41e..ae7f1b41e 100644..100755
--- a/examples/sdlex.nim
+++ b/examples/sdlex.nim
diff --git a/examples/statcsv.nim b/examples/statcsv.nim
index e2f272a21..e2f272a21 100644..100755
--- a/examples/statcsv.nim
+++ b/examples/statcsv.nim
diff --git a/examples/tclex.nim b/examples/tclex.nim
index 6d6d45b8f..6d6d45b8f 100644..100755
--- a/examples/tclex.nim
+++ b/examples/tclex.nim
diff --git a/examples/transff.nim b/examples/transff.nim
index 32d17e52c..32d17e52c 100644..100755
--- a/examples/transff.nim
+++ b/examples/transff.nim
diff --git a/examples/wingui.nim b/examples/wingui.nim
index f4941bcc7..f4941bcc7 100644..100755
--- a/examples/wingui.nim
+++ b/examples/wingui.nim
diff --git a/examples/x11ex.nim b/examples/x11ex.nim
index db51df2e0..db51df2e0 100644..100755
--- a/examples/x11ex.nim
+++ b/examples/x11ex.nim
diff --git a/gpl.html b/gpl.html
index 0aec9fff0..0aec9fff0 100644..100755
--- a/gpl.html
+++ b/gpl.html
diff --git a/ide/config.nim b/ide/config.nim
index 448a67bda..448a67bda 100644..100755
--- a/ide/config.nim
+++ b/ide/config.nim
diff --git a/ide/main.nim b/ide/main.nim
index a7e9bb642..a7e9bb642 100644..100755
--- a/ide/main.nim
+++ b/ide/main.nim
diff --git a/ide/nimide.glade b/ide/nimide.glade
index ce24683b2..ce24683b2 100644..100755
--- a/ide/nimide.glade
+++ b/ide/nimide.glade
diff --git a/ide/nimide.gladep b/ide/nimide.gladep
index e429f891d..e429f891d 100644..100755
--- a/ide/nimide.gladep
+++ b/ide/nimide.gladep
diff --git a/ide/nimide.nim b/ide/nimide.nim
index 741f71afb..741f71afb 100644..100755
--- a/ide/nimide.nim
+++ b/ide/nimide.nim
diff --git a/install.txt b/install.txt
index 048cf8f98..048cf8f98 100644..100755
--- a/install.txt
+++ b/install.txt
diff --git a/koch.nim b/koch.nim
index bf07f3ba9..bf07f3ba9 100644..100755
--- a/koch.nim
+++ b/koch.nim
diff --git a/lib/copying.txt b/lib/copying.txt
index 6fcdca1df..6fcdca1df 100644..100755
--- a/lib/copying.txt
+++ b/lib/copying.txt
diff --git a/lib/cycle.h b/lib/cycle.h
index 4d714ba3f..4d714ba3f 100644..100755
--- a/lib/cycle.h
+++ b/lib/cycle.h
diff --git a/lib/devel/urls.nim b/lib/devel/urls.nim
index 6acf636f9..6acf636f9 100644..100755
--- a/lib/devel/urls.nim
+++ b/lib/devel/urls.nim
diff --git a/lib/ecmas/dom.nim b/lib/ecmas/dom.nim
index 6d9224c26..6d9224c26 100644..100755
--- 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 b9f697069..b9f697069 100644..100755
--- 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 131609a64..131609a64 100644..100755
--- a/lib/impure/db_postgres.nim
+++ b/lib/impure/db_postgres.nim
diff --git a/lib/impure/db_sqlite.nim b/lib/impure/db_sqlite.nim
index 0be5cc79d..0be5cc79d 100644..100755
--- a/lib/impure/db_sqlite.nim
+++ b/lib/impure/db_sqlite.nim
diff --git a/lib/impure/dialogs.nim b/lib/impure/dialogs.nim
index 31c8ca0ff..31c8ca0ff 100644..100755
--- a/lib/impure/dialogs.nim
+++ b/lib/impure/dialogs.nim
diff --git a/lib/impure/graphics.nim b/lib/impure/graphics.nim
index 320339b13..320339b13 100644..100755
--- a/lib/impure/graphics.nim
+++ b/lib/impure/graphics.nim
diff --git a/lib/impure/web.nim b/lib/impure/web.nim
index 3893843c6..3893843c6 100644..100755
--- 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 100644..100755
--- a/lib/impure/zipfiles.nim
+++ b/lib/impure/zipfiles.nim
diff --git a/lib/lgpl.txt b/lib/lgpl.txt
index f6fa6c9e5..f6fa6c9e5 100644..100755
--- a/lib/lgpl.txt
+++ b/lib/lgpl.txt
diff --git a/lib/newwrap/cairo/cairo.nim b/lib/newwrap/cairo/cairo.nim
index 96ad06e4d..96ad06e4d 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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..eb2333a2e 100644..100755
--- a/lib/newwrap/gtk/pango.nim
+++ b/lib/newwrap/gtk/pango.nim
@@ -4,10 +4,10 @@ import
 
 when defined(win32): 
   const 
-    pangolib* = "libpango-1.0-0.dll"
+    lib* = "libpango-1.0-0.dll"
 else: 
   const 
-    pangolib* = "libpango-1.0.so.0"
+    lib* = "libpango-1.0.so.0"
 type 
   PFont* = pointer
   PFontFamily* = pointer
@@ -56,8 +56,7 @@ type
 
   PDirection* = ptr TDirection
   TDirection* = enum 
-    PANGO_DIRECTION_LTR, PANGO_DIRECTION_RTL, PANGO_DIRECTION_TTB_LTR, 
-    PANGO_DIRECTION_TTB_RTL
+    DIRECTION_LTR, DIRECTION_RTL, DIRECTION_TTB_LTR, DIRECTION_TTB_RTL
   PColor* = ptr TColor
   TColor*{.final, pure.} = object 
     red*: guint16
@@ -123,8 +122,7 @@ type
 
   PCoverageLevel* = ptr TCoverageLevel
   TCoverageLevel* = enum 
-    PANGO_COVERAGE_NONE, PANGO_COVERAGE_FALLBACK, PANGO_COVERAGE_APPROXIMATE, 
-    PANGO_COVERAGE_EXACT
+    COVERAGE_NONE, COVERAGE_FALLBACK, COVERAGE_APPROXIMATE, COVERAGE_EXACT
   PBlockInfo* = ptr TBlockInfo
   TBlockInfo*{.final, pure.} = object 
     data*: Pguchar
@@ -225,10 +223,10 @@ type
 
   PAlignment* = ptr TAlignment
   TAlignment* = enum 
-    PANGO_ALIGN_LEFT, PANGO_ALIGN_CENTER, PANGO_ALIGN_RIGHT
+    ALIGN_LEFT, ALIGN_CENTER, ALIGN_RIGHT
   PWrapMode* = ptr TWrapMode
   TWrapMode* = enum 
-    PANGO_WRAP_WORD, PANGO_WRAP_CHAR
+    WRAP_WORD, WRAP_CHAR
   PLayoutLine* = ptr TLayoutLine
   TLayoutLine*{.final, pure.} = object 
     layout*: PLayout
@@ -243,135 +241,130 @@ type
 
   PTabAlign* = ptr TTabAlign
   TTabAlign* = enum 
-    PANGO_TAB_LEFT
+    TAB_LEFT
 
 const 
-  PANGO_SCALE* = 1024
-
-proc PANGO_PIXELS*(d: int): int
-proc PANGO_ASCENT*(rect: TRectangle): int32
-proc PANGO_DESCENT*(rect: TRectangle): int32
-proc PANGO_LBEARING*(rect: TRectangle): int32
-proc PANGO_RBEARING*(rect: TRectangle): int32
-proc PANGO_TYPE_LANGUAGE*(): GType
-proc pango_language_get_type*(): GType{.cdecl, dynlib: pangolib, 
-                                        importc: "pango_language_get_type".}
-proc pango_language_from_string*(language: cstring): PLanguage{.cdecl, 
-    dynlib: pangolib, importc: "pango_language_from_string".}
-proc pango_language_to_string*(language: PLanguage): cstring
-proc pango_language_matches*(language: PLanguage, range_list: cstring): gboolean{.
-    cdecl, dynlib: pangolib, importc: "pango_language_matches".}
+  SCALE* = 1024
+
+proc PIXELS*(d: int): int
+proc ASCENT*(rect: TRectangle): int32
+proc DESCENT*(rect: TRectangle): int32
+proc LBEARING*(rect: TRectangle): int32
+proc RBEARING*(rect: TRectangle): int32
+proc TYPE_LANGUAGE*(): GType
+proc language_get_type*(): GType{.cdecl, dynlib: lib, 
+                                  importc: "pango_language_get_type".}
+proc language_from_string*(language: cstring): PLanguage{.cdecl, dynlib: lib, 
+    importc: "pango_language_from_string".}
+proc language_to_string*(language: PLanguage): cstring
+proc language_matches*(language: PLanguage, range_list: cstring): gboolean{.
+    cdecl, dynlib: lib, importc: "pango_language_matches".}
 const 
-  PANGO_ATTR_INVALID* = 0
-  PANGO_ATTR_LANGUAGE* = 1
-  PANGO_ATTR_FAMILY* = 2
-  PANGO_ATTR_STYLE* = 3
-  PANGO_ATTR_WEIGHT* = 4
-  PANGO_ATTR_VARIANT* = 5
-  PANGO_ATTR_STRETCH* = 6
-  PANGO_ATTR_SIZE* = 7
-  PANGO_ATTR_FONT_DESC* = 8
-  PANGO_ATTR_FOREGROUND* = 9
-  PANGO_ATTR_BACKGROUND* = 10
-  PANGO_ATTR_UNDERLINE* = 11
-  PANGO_ATTR_STRIKETHROUGH* = 12
-  PANGO_ATTR_RISE* = 13
-  PANGO_ATTR_SHAPE* = 14
-  PANGO_ATTR_SCALE* = 15
-  PANGO_UNDERLINE_NONE* = 0
-  PANGO_UNDERLINE_SINGLE* = 1
-  PANGO_UNDERLINE_DOUBLE* = 2
-  PANGO_UNDERLINE_LOW* = 3
-
-proc PANGO_TYPE_COLOR*(): GType
-proc pango_color_get_type*(): GType{.cdecl, dynlib: pangolib, 
-                                     importc: "pango_color_get_type".}
-proc pango_color_copy*(src: PColor): PColor{.cdecl, dynlib: pangolib, 
-    importc: "pango_color_copy".}
-proc pango_color_free*(color: PColor){.cdecl, dynlib: pangolib, 
-                                       importc: "pango_color_free".}
-proc pango_color_parse*(color: PColor, spec: cstring): gboolean{.cdecl, 
-    dynlib: pangolib, importc: "pango_color_parse".}
-proc PANGO_TYPE_ATTR_LIST*(): GType
-proc pango_attr_type_register*(name: cstring): TAttrType{.cdecl, 
-    dynlib: pangolib, importc: "pango_attr_type_register".}
-proc pango_attribute_copy*(attr: PAttribute): PAttribute{.cdecl, 
-    dynlib: pangolib, importc: "pango_attribute_copy".}
-proc pango_attribute_destroy*(attr: PAttribute){.cdecl, dynlib: pangolib, 
+  ATTR_INVALID* = 0
+  ATTR_LANGUAGE* = 1
+  ATTR_FAMILY* = 2
+  ATTR_STYLE* = 3
+  ATTR_WEIGHT* = 4
+  ATTR_VARIANT* = 5
+  ATTR_STRETCH* = 6
+  ATTR_SIZE* = 7
+  ATTR_FONT_DESC* = 8
+  ATTR_FOREGROUND* = 9
+  ATTR_BACKGROUND* = 10
+  ATTR_UNDERLINE* = 11
+  ATTR_STRIKETHROUGH* = 12
+  ATTR_RISE* = 13
+  ATTR_SHAPE* = 14
+  ATTR_SCALE* = 15
+  UNDERLINE_NONE* = 0
+  UNDERLINE_SINGLE* = 1
+  UNDERLINE_DOUBLE* = 2
+  UNDERLINE_LOW* = 3
+
+proc TYPE_COLOR*(): GType
+proc color_get_type*(): GType{.cdecl, dynlib: lib, 
+                               importc: "pango_color_get_type".}
+proc color_copy*(src: PColor): PColor{.cdecl, dynlib: lib, 
+                                       importc: "pango_color_copy".}
+proc color_free*(color: PColor){.cdecl, dynlib: lib, importc: "pango_color_free".}
+proc color_parse*(color: PColor, spec: cstring): gboolean{.cdecl, dynlib: lib, 
+    importc: "pango_color_parse".}
+proc TYPE_ATTR_LIST*(): GType
+proc attr_type_register*(name: cstring): TAttrType{.cdecl, dynlib: lib, 
+    importc: "pango_attr_type_register".}
+proc attribute_copy*(attr: PAttribute): PAttribute{.cdecl, dynlib: lib, 
+    importc: "pango_attribute_copy".}
+proc attribute_destroy*(attr: PAttribute){.cdecl, dynlib: lib, 
     importc: "pango_attribute_destroy".}
-proc pango_attribute_equal*(attr1: PAttribute, attr2: PAttribute): gboolean{.
-    cdecl, dynlib: pangolib, importc: "pango_attribute_equal".}
-proc pango_attr_language_new*(language: PLanguage): PAttribute{.cdecl, 
-    dynlib: pangolib, importc: "pango_attr_language_new".}
-proc pango_attr_family_new*(family: cstring): PAttribute{.cdecl, 
-    dynlib: pangolib, importc: "pango_attr_family_new".}
-proc pango_attr_foreground_new*(red: guint16, green: guint16, blue: guint16): PAttribute{.
-    cdecl, dynlib: pangolib, importc: "pango_attr_foreground_new".}
-proc pango_attr_background_new*(red: guint16, green: guint16, blue: guint16): PAttribute{.
-    cdecl, dynlib: pangolib, importc: "pango_attr_background_new".}
-proc pango_attr_size_new*(size: int32): PAttribute{.cdecl, dynlib: pangolib, 
+proc attribute_equal*(attr1: PAttribute, attr2: PAttribute): gboolean{.cdecl, 
+    dynlib: lib, importc: "pango_attribute_equal".}
+proc attr_language_new*(language: PLanguage): PAttribute{.cdecl, dynlib: lib, 
+    importc: "pango_attr_language_new".}
+proc attr_family_new*(family: cstring): PAttribute{.cdecl, dynlib: lib, 
+    importc: "pango_attr_family_new".}
+proc attr_foreground_new*(red: guint16, green: guint16, blue: guint16): PAttribute{.
+    cdecl, dynlib: lib, importc: "pango_attr_foreground_new".}
+proc attr_background_new*(red: guint16, green: guint16, blue: guint16): PAttribute{.
+    cdecl, dynlib: lib, importc: "pango_attr_background_new".}
+proc attr_size_new*(size: int32): PAttribute{.cdecl, dynlib: lib, 
     importc: "pango_attr_size_new".}
-proc pango_attr_style_new*(style: TStyle): PAttribute{.cdecl, dynlib: pangolib, 
+proc attr_style_new*(style: TStyle): PAttribute{.cdecl, dynlib: lib, 
     importc: "pango_attr_style_new".}
-proc pango_attr_weight_new*(weight: TWeight): PAttribute{.cdecl, 
-    dynlib: pangolib, importc: "pango_attr_weight_new".}
-proc pango_attr_variant_new*(variant: TVariant): PAttribute{.cdecl, 
-    dynlib: pangolib, importc: "pango_attr_variant_new".}
-proc pango_attr_stretch_new*(stretch: TStretch): PAttribute{.cdecl, 
-    dynlib: pangolib, importc: "pango_attr_stretch_new".}
-proc pango_attr_font_desc_new*(desc: PFontDescription): PAttribute{.cdecl, 
-    dynlib: pangolib, importc: "pango_attr_font_desc_new".}
-proc pango_attr_underline_new*(underline: TUnderline): PAttribute{.cdecl, 
-    dynlib: pangolib, importc: "pango_attr_underline_new".}
-proc pango_attr_strikethrough_new*(strikethrough: gboolean): PAttribute{.cdecl, 
-    dynlib: pangolib, importc: "pango_attr_strikethrough_new".}
-proc pango_attr_rise_new*(rise: int32): PAttribute{.cdecl, dynlib: pangolib, 
+proc attr_weight_new*(weight: TWeight): PAttribute{.cdecl, dynlib: lib, 
+    importc: "pango_attr_weight_new".}
+proc attr_variant_new*(variant: TVariant): PAttribute{.cdecl, dynlib: lib, 
+    importc: "pango_attr_variant_new".}
+proc attr_stretch_new*(stretch: TStretch): PAttribute{.cdecl, dynlib: lib, 
+    importc: "pango_attr_stretch_new".}
+proc attr_font_desc_new*(desc: PFontDescription): PAttribute{.cdecl, 
+    dynlib: lib, importc: "pango_attr_font_desc_new".}
+proc attr_underline_new*(underline: TUnderline): PAttribute{.cdecl, dynlib: lib, 
+    importc: "pango_attr_underline_new".}
+proc attr_strikethrough_new*(strikethrough: gboolean): PAttribute{.cdecl, 
+    dynlib: lib, importc: "pango_attr_strikethrough_new".}
+proc attr_rise_new*(rise: int32): PAttribute{.cdecl, dynlib: lib, 
     importc: "pango_attr_rise_new".}
-proc pango_attr_shape_new*(ink_rect: PRectangle, logical_rect: PRectangle): PAttribute{.
-    cdecl, dynlib: pangolib, importc: "pango_attr_shape_new".}
-proc pango_attr_scale_new*(scale_factor: gdouble): PAttribute{.cdecl, 
-    dynlib: pangolib, importc: "pango_attr_scale_new".}
-proc pango_attr_list_get_type*(): GType{.cdecl, dynlib: pangolib, 
-    importc: "pango_attr_list_get_type".}
-proc pango_attr_list_new*(): PAttrList{.cdecl, dynlib: pangolib, 
-                                        importc: "pango_attr_list_new".}
-proc pango_attr_list_ref*(list: PAttrList){.cdecl, dynlib: pangolib, 
-    importc: "pango_attr_list_ref".}
-proc pango_attr_list_unref*(list: PAttrList){.cdecl, dynlib: pangolib, 
-    importc: "pango_attr_list_unref".}
-proc pango_attr_list_copy*(list: PAttrList): PAttrList{.cdecl, dynlib: pangolib, 
+proc attr_shape_new*(ink_rect: PRectangle, logical_rect: PRectangle): PAttribute{.
+    cdecl, dynlib: lib, importc: "pango_attr_shape_new".}
+proc attr_scale_new*(scale_factor: gdouble): PAttribute{.cdecl, dynlib: lib, 
+    importc: "pango_attr_scale_new".}
+proc attr_list_get_type*(): GType{.cdecl, dynlib: lib, 
+                                   importc: "pango_attr_list_get_type".}
+proc attr_list_new*(): PAttrList{.cdecl, dynlib: lib, 
+                                  importc: "pango_attr_list_new".}
+proc attr_list_ref*(list: PAttrList){.cdecl, dynlib: lib, 
+                                      importc: "pango_attr_list_ref".}
+proc attr_list_unref*(list: PAttrList){.cdecl, dynlib: lib, 
+                                        importc: "pango_attr_list_unref".}
+proc attr_list_copy*(list: PAttrList): PAttrList{.cdecl, dynlib: lib, 
     importc: "pango_attr_list_copy".}
-proc pango_attr_list_insert*(list: PAttrList, attr: PAttribute){.cdecl, 
-    dynlib: pangolib, importc: "pango_attr_list_insert".}
-proc pango_attr_list_insert_before*(list: PAttrList, attr: PAttribute){.cdecl, 
-    dynlib: pangolib, importc: "pango_attr_list_insert_before".}
-proc pango_attr_list_change*(list: PAttrList, attr: PAttribute){.cdecl, 
-    dynlib: pangolib, importc: "pango_attr_list_change".}
-proc pango_attr_list_splice*(list: PAttrList, other: PAttrList, pos: gint, 
-                             len: gint){.cdecl, dynlib: pangolib, 
-    importc: "pango_attr_list_splice".}
-proc pango_attr_list_get_iterator*(list: PAttrList): PAttrIterator{.cdecl, 
-    dynlib: pangolib, importc: "pango_attr_list_get_iterator".}
-proc pango_attr_iterator_range*(`iterator`: PAttrIterator, start: Pgint, 
-                                theEnd: Pgint){.cdecl, dynlib: pangolib, 
-    importc: "pango_attr_iterator_range".}
-proc pango_attr_iterator_next*(`iterator`: PAttrIterator): gboolean{.cdecl, 
-    dynlib: pangolib, importc: "pango_attr_iterator_next".}
-proc pango_attr_iterator_copy*(`iterator`: PAttrIterator): PAttrIterator{.cdecl, 
-    dynlib: pangolib, importc: "pango_attr_iterator_copy".}
-proc pango_attr_iterator_destroy*(`iterator`: PAttrIterator){.cdecl, 
-    dynlib: pangolib, importc: "pango_attr_iterator_destroy".}
-proc pango_attr_iterator_get*(`iterator`: PAttrIterator, `type`: TAttrType): PAttribute{.
-    cdecl, dynlib: pangolib, importc: "pango_attr_iterator_get".}
-proc pango_attr_iterator_get_font*(`iterator`: PAttrIterator, 
-                                   desc: PFontDescription, 
-                                   language: var PLanguage, 
-                                   extra_attrs: PPGSList){.cdecl, 
-    dynlib: pangolib, importc: "pango_attr_iterator_get_font".}
-proc pango_parse_markup*(markup_text: cstring, length: int32, 
-                         accel_marker: gunichar, attr_list: var PAttrList, 
-                         text: PPchar, accel_char: Pgunichar, error: pointer): gboolean{.
-    cdecl, dynlib: pangolib, importc: "pango_parse_markup".}
+proc attr_list_insert*(list: PAttrList, attr: PAttribute){.cdecl, dynlib: lib, 
+    importc: "pango_attr_list_insert".}
+proc attr_list_insert_before*(list: PAttrList, attr: PAttribute){.cdecl, 
+    dynlib: lib, importc: "pango_attr_list_insert_before".}
+proc attr_list_change*(list: PAttrList, attr: PAttribute){.cdecl, dynlib: lib, 
+    importc: "pango_attr_list_change".}
+proc attr_list_splice*(list: PAttrList, other: PAttrList, pos: gint, len: gint){.
+    cdecl, dynlib: lib, importc: "pango_attr_list_splice".}
+proc attr_list_get_iterator*(list: PAttrList): PAttrIterator{.cdecl, 
+    dynlib: lib, importc: "pango_attr_list_get_iterator".}
+proc attr_iterator_range*(`iterator`: PAttrIterator, start: Pgint, theEnd: Pgint){.
+    cdecl, dynlib: lib, importc: "pango_attr_iterator_range".}
+proc attr_iterator_next*(`iterator`: PAttrIterator): gboolean{.cdecl, 
+    dynlib: lib, importc: "pango_attr_iterator_next".}
+proc attr_iterator_copy*(`iterator`: PAttrIterator): PAttrIterator{.cdecl, 
+    dynlib: lib, importc: "pango_attr_iterator_copy".}
+proc attr_iterator_destroy*(`iterator`: PAttrIterator){.cdecl, dynlib: lib, 
+    importc: "pango_attr_iterator_destroy".}
+proc attr_iterator_get*(`iterator`: PAttrIterator, `type`: TAttrType): PAttribute{.
+    cdecl, dynlib: lib, importc: "pango_attr_iterator_get".}
+proc attr_iterator_get_font*(`iterator`: PAttrIterator, desc: PFontDescription, 
+                             language: var PLanguage, extra_attrs: PPGSList){.
+    cdecl, dynlib: lib, importc: "pango_attr_iterator_get_font".}
+proc parse_markup*(markup_text: cstring, length: int32, accel_marker: gunichar, 
+                   attr_list: var PAttrList, text: PPchar, 
+                   accel_char: Pgunichar, error: pointer): gboolean{.cdecl, 
+    dynlib: lib, importc: "pango_parse_markup".}
 const 
   bm_TPangoLogAttr_is_line_break* = 0x0001'i16
   bp_TPangoLogAttr_is_line_break* = 0'i16
@@ -414,508 +407,491 @@ proc is_sentence_start*(a: var TLogAttr): guint
 proc set_is_sentence_start*(a: var TLogAttr, `is_sentence_start`: guint)
 proc is_sentence_end*(a: var TLogAttr): guint
 proc set_is_sentence_end*(a: var TLogAttr, `is_sentence_end`: guint)
-proc pango_break*(text: cstring, length: int32, analysis: PAnalysis, 
-                  attrs: PLogAttr, attrs_len: int32){.cdecl, dynlib: pangolib, 
-    importc: "pango_break".}
-proc pango_find_paragraph_boundary*(text: cstring, length: gint, 
-                                    paragraph_delimiter_index: Pgint, 
-                                    next_paragraph_start: Pgint){.cdecl, 
-    dynlib: pangolib, importc: "pango_find_paragraph_boundary".}
-proc pango_get_log_attrs*(text: cstring, length: int32, level: int32, 
-                          language: PLanguage, log_attrs: PLogAttr, 
-                          attrs_len: int32){.cdecl, dynlib: pangolib, 
-    importc: "pango_get_log_attrs".}
-proc PANGO_TYPE_CONTEXT*(): GType
-proc PANGO_CONTEXT*(anObject: pointer): PContext
-proc PANGO_CONTEXT_CLASS*(klass: pointer): PContextClass
-proc PANGO_IS_CONTEXT*(anObject: pointer): bool
-proc PANGO_IS_CONTEXT_CLASS*(klass: pointer): bool
-proc PANGO_CONTEXT_GET_CLASS*(obj: PContext): PContextClass
-proc pango_context_get_type*(): GType{.cdecl, dynlib: pangolib, 
-                                       importc: "pango_context_get_type".}
-proc pango_context_list_families*(context: PContext, 
-                                  families: openarray[ptr PFontFamily]){.cdecl, 
-    dynlib: pangolib, importc: "pango_context_list_families".}
-proc pango_context_load_font*(context: PContext, desc: PFontDescription): PFont{.
-    cdecl, dynlib: pangolib, importc: "pango_context_load_font".}
-proc pango_context_load_fontset*(context: PContext, desc: PFontDescription, 
-                                 language: PLanguage): PFontset{.cdecl, 
-    dynlib: pangolib, importc: "pango_context_load_fontset".}
-proc pango_context_get_metrics*(context: PContext, desc: PFontDescription, 
-                                language: PLanguage): PFontMetrics{.cdecl, 
-    dynlib: pangolib, importc: "pango_context_get_metrics".}
-proc pango_context_set_font_description*(context: PContext, 
-    desc: PFontDescription){.cdecl, dynlib: pangolib, 
-                             importc: "pango_context_set_font_description".}
-proc pango_context_get_font_description*(context: PContext): PFontDescription{.
-    cdecl, dynlib: pangolib, importc: "pango_context_get_font_description".}
-proc pango_context_get_language*(context: PContext): PLanguage{.cdecl, 
-    dynlib: pangolib, importc: "pango_context_get_language".}
-proc pango_context_set_language*(context: PContext, language: PLanguage){.cdecl, 
-    dynlib: pangolib, importc: "pango_context_set_language".}
-proc pango_context_set_base_dir*(context: PContext, direction: TDirection){.
-    cdecl, dynlib: pangolib, importc: "pango_context_set_base_dir".}
-proc pango_context_get_base_dir*(context: PContext): TDirection{.cdecl, 
-    dynlib: pangolib, importc: "pango_context_get_base_dir".}
-proc pango_itemize*(context: PContext, text: cstring, start_index: int32, 
-                    length: int32, attrs: PAttrList, cached_iter: PAttrIterator): PGList{.
-    cdecl, dynlib: pangolib, importc: "pango_itemize".}
-proc pango_coverage_new*(): PCoverage{.cdecl, dynlib: pangolib, 
-                                       importc: "pango_coverage_new".}
-proc pango_coverage_ref*(coverage: PCoverage): PCoverage{.cdecl, 
-    dynlib: pangolib, importc: "pango_coverage_ref".}
-proc pango_coverage_unref*(coverage: PCoverage){.cdecl, dynlib: pangolib, 
+proc `break`*(text: cstring, length: int32, analysis: PAnalysis, attrs: PLogAttr, 
+            attrs_len: int32){.cdecl, dynlib: lib, importc: "pango_break".}
+proc find_paragraph_boundary*(text: cstring, length: gint, 
+                              paragraph_delimiter_index: Pgint, 
+                              next_paragraph_start: Pgint){.cdecl, dynlib: lib, 
+    importc: "pango_find_paragraph_boundary".}
+proc get_log_attrs*(text: cstring, length: int32, level: int32, 
+                    language: PLanguage, log_attrs: PLogAttr, attrs_len: int32){.
+    cdecl, dynlib: lib, importc: "pango_get_log_attrs".}
+proc TYPE_CONTEXT*(): GType
+proc CONTEXT*(anObject: pointer): PContext
+proc CONTEXT_CLASS*(klass: pointer): PContextClass
+proc IS_CONTEXT*(anObject: pointer): bool
+proc IS_CONTEXT_CLASS*(klass: pointer): bool
+proc CONTEXT_GET_CLASS*(obj: PContext): PContextClass
+proc context_get_type*(): GType{.cdecl, dynlib: lib, 
+                                 importc: "pango_context_get_type".}
+proc context_list_families*(context: PContext, 
+                            families: openarray[ptr PFontFamily]){.cdecl, 
+    dynlib: lib, importc: "pango_context_list_families".}
+proc context_load_font*(context: PContext, desc: PFontDescription): PFont{.
+    cdecl, dynlib: lib, importc: "pango_context_load_font".}
+proc context_load_fontset*(context: PContext, desc: PFontDescription, 
+                           language: PLanguage): PFontset{.cdecl, dynlib: lib, 
+    importc: "pango_context_load_fontset".}
+proc context_get_metrics*(context: PContext, desc: PFontDescription, 
+                          language: PLanguage): PFontMetrics{.cdecl, 
+    dynlib: lib, importc: "pango_context_get_metrics".}
+proc context_set_font_description*(context: PContext, desc: PFontDescription){.
+    cdecl, dynlib: lib, importc: "pango_context_set_font_description".}
+proc context_get_font_description*(context: PContext): PFontDescription{.cdecl, 
+    dynlib: lib, importc: "pango_context_get_font_description".}
+proc context_get_language*(context: PContext): PLanguage{.cdecl, dynlib: lib, 
+    importc: "pango_context_get_language".}
+proc context_set_language*(context: PContext, language: PLanguage){.cdecl, 
+    dynlib: lib, importc: "pango_context_set_language".}
+proc context_set_base_dir*(context: PContext, direction: TDirection){.cdecl, 
+    dynlib: lib, importc: "pango_context_set_base_dir".}
+proc context_get_base_dir*(context: PContext): TDirection{.cdecl, dynlib: lib, 
+    importc: "pango_context_get_base_dir".}
+proc itemize*(context: PContext, text: cstring, start_index: int32, 
+              length: int32, attrs: PAttrList, cached_iter: PAttrIterator): PGList{.
+    cdecl, dynlib: lib, importc: "pango_itemize".}
+proc coverage_new*(): PCoverage{.cdecl, dynlib: lib, 
+                                 importc: "pango_coverage_new".}
+proc coverage_ref*(coverage: PCoverage): PCoverage{.cdecl, dynlib: lib, 
+    importc: "pango_coverage_ref".}
+proc coverage_unref*(coverage: PCoverage){.cdecl, dynlib: lib, 
     importc: "pango_coverage_unref".}
-proc pango_coverage_copy*(coverage: PCoverage): PCoverage{.cdecl, 
-    dynlib: pangolib, importc: "pango_coverage_copy".}
-proc pango_coverage_get*(coverage: PCoverage, index: int32): TCoverageLevel{.
-    cdecl, dynlib: pangolib, importc: "pango_coverage_get".}
-proc pango_coverage_set*(coverage: PCoverage, index: int32, 
-                         level: TCoverageLevel){.cdecl, dynlib: pangolib, 
-    importc: "pango_coverage_set".}
-proc pango_coverage_max*(coverage: PCoverage, other: PCoverage){.cdecl, 
-    dynlib: pangolib, importc: "pango_coverage_max".}
-proc pango_coverage_to_bytes*(coverage: PCoverage, bytes: PPguchar, 
-                              n_bytes: var int32){.cdecl, dynlib: pangolib, 
-    importc: "pango_coverage_to_bytes".}
-proc pango_coverage_from_bytes*(bytes: Pguchar, n_bytes: int32): PCoverage{.
-    cdecl, dynlib: pangolib, importc: "pango_coverage_from_bytes".}
-proc PANGO_TYPE_FONTSET*(): GType
-proc PANGO_FONTSET*(anObject: pointer): PFontset
-proc PANGO_IS_FONTSET*(anObject: pointer): bool
-proc pango_fontset_get_type*(): GType{.cdecl, dynlib: pangolib, 
-                                       importc: "pango_fontset_get_type".}
-proc pango_fontset_get_font*(fontset: PFontset, wc: guint): PFont{.cdecl, 
-    dynlib: pangolib, importc: "pango_fontset_get_font".}
-proc pango_fontset_get_metrics*(fontset: PFontset): PFontMetrics{.cdecl, 
-    dynlib: pangolib, importc: "pango_fontset_get_metrics".}
+proc coverage_copy*(coverage: PCoverage): PCoverage{.cdecl, dynlib: lib, 
+    importc: "pango_coverage_copy".}
+proc coverage_get*(coverage: PCoverage, index: int32): TCoverageLevel{.cdecl, 
+    dynlib: lib, importc: "pango_coverage_get".}
+proc coverage_set*(coverage: PCoverage, index: int32, level: TCoverageLevel){.
+    cdecl, dynlib: lib, importc: "pango_coverage_set".}
+proc coverage_max*(coverage: PCoverage, other: PCoverage){.cdecl, dynlib: lib, 
+    importc: "pango_coverage_max".}
+proc coverage_to_bytes*(coverage: PCoverage, bytes: PPguchar, n_bytes: var int32){.
+    cdecl, dynlib: lib, importc: "pango_coverage_to_bytes".}
+proc coverage_from_bytes*(bytes: Pguchar, n_bytes: int32): PCoverage{.cdecl, 
+    dynlib: lib, importc: "pango_coverage_from_bytes".}
+proc TYPE_FONTSET*(): GType
+proc FONTSET*(anObject: pointer): PFontset
+proc IS_FONTSET*(anObject: pointer): bool
+proc fontset_get_type*(): GType{.cdecl, dynlib: lib, 
+                                 importc: "pango_fontset_get_type".}
+proc fontset_get_font*(fontset: PFontset, wc: guint): PFont{.cdecl, dynlib: lib, 
+    importc: "pango_fontset_get_font".}
+proc fontset_get_metrics*(fontset: PFontset): PFontMetrics{.cdecl, dynlib: lib, 
+    importc: "pango_fontset_get_metrics".}
 const 
-  PANGO_STYLE_NORMAL* = 0
-  PANGO_STYLE_OBLIQUE* = 1
-  PANGO_STYLE_ITALIC* = 2
-  PANGO_VARIANT_NORMAL* = 0
-  PANGO_VARIANT_SMALL_CAPS* = 1
-  PANGO_WEIGHT_ULTRALIGHT* = 200
-  PANGO_WEIGHT_LIGHT* = 300
-  PANGO_WEIGHT_NORMAL* = 400
-  PANGO_WEIGHT_BOLD* = 700
-  PANGO_WEIGHT_ULTRABOLD* = 800
-  PANGO_WEIGHT_HEAVY* = 900
-  PANGO_STRETCH_ULTRA_CONDENSED* = 0
-  PANGO_STRETCH_EXTRA_CONDENSED* = 1
-  PANGO_STRETCH_CONDENSED* = 2
-  PANGO_STRETCH_SEMI_CONDENSED* = 3
-  PANGO_STRETCH_NORMAL* = 4
-  PANGO_STRETCH_SEMI_EXPANDED* = 5
-  PANGO_STRETCH_EXPANDED* = 6
-  PANGO_STRETCH_EXTRA_EXPANDED* = 7
-  PANGO_STRETCH_ULTRA_EXPANDED* = 8
-  PANGO_FONT_MASK_FAMILY* = 1 shl 0
-  PANGO_FONT_MASK_STYLE* = 1 shl 1
-  PANGO_FONT_MASK_VARIANT* = 1 shl 2
-  PANGO_FONT_MASK_WEIGHT* = 1 shl 3
-  PANGO_FONT_MASK_STRETCH* = 1 shl 4
-  PANGO_FONT_MASK_SIZE* = 1 shl 5
-  PANGO_SCALE_XX_SMALL* = 0.578704
-  PANGO_SCALE_X_SMALL* = 0.644444
-  PANGO_SCALE_SMALL* = 0.833333
-  PANGO_SCALE_MEDIUM* = 1.00000
-  PANGO_SCALE_LARGE* = 1.20000
-  PANGO_SCALE_X_LARGE* = 1.44000
-  PANGO_SCALE_XX_LARGE* = 1.72800
-
-proc PANGO_TYPE_FONT_DESCRIPTION*(): GType
-proc pango_font_description_get_type*(): GType{.cdecl, dynlib: pangolib, 
+  STYLE_NORMAL* = 0
+  STYLE_OBLIQUE* = 1
+  STYLE_ITALIC* = 2
+  VARIANT_NORMAL* = 0
+  VARIANT_SMALL_CAPS* = 1
+  WEIGHT_ULTRALIGHT* = 200
+  WEIGHT_LIGHT* = 300
+  WEIGHT_NORMAL* = 400
+  WEIGHT_BOLD* = 700
+  WEIGHT_ULTRABOLD* = 800
+  WEIGHT_HEAVY* = 900
+  STRETCH_ULTRA_CONDENSED* = 0
+  STRETCH_EXTRA_CONDENSED* = 1
+  STRETCH_CONDENSED* = 2
+  STRETCH_SEMI_CONDENSED* = 3
+  STRETCH_NORMAL* = 4
+  STRETCH_SEMI_EXPANDED* = 5
+  STRETCH_EXPANDED* = 6
+  STRETCH_EXTRA_EXPANDED* = 7
+  STRETCH_ULTRA_EXPANDED* = 8
+  FONT_MASK_FAMILY* = 1 shl 0
+  FONT_MASK_STYLE* = 1 shl 1
+  FONT_MASK_VARIANT* = 1 shl 2
+  FONT_MASK_WEIGHT* = 1 shl 3
+  FONT_MASK_STRETCH* = 1 shl 4
+  FONT_MASK_SIZE* = 1 shl 5
+  SCALE_XX_SMALL* = 0.578704
+  SCALE_X_SMALL* = 0.644444
+  SCALE_SMALL* = 0.833333
+  SCALE_MEDIUM* = 1.00000
+  SCALE_LARGE* = 1.20000
+  SCALE_X_LARGE* = 1.44000
+  SCALE_XX_LARGE* = 1.72800
+
+proc TYPE_FONT_DESCRIPTION*(): GType
+proc font_description_get_type*(): GType{.cdecl, dynlib: lib, 
     importc: "pango_font_description_get_type".}
-proc pango_font_description_new*(): PFontDescription{.cdecl, dynlib: pangolib, 
+proc font_description_new*(): PFontDescription{.cdecl, dynlib: lib, 
     importc: "pango_font_description_new".}
-proc pango_font_description_copy*(desc: PFontDescription): PFontDescription{.
-    cdecl, dynlib: pangolib, importc: "pango_font_description_copy".}
-proc pango_font_description_copy_static*(desc: PFontDescription): PFontDescription{.
-    cdecl, dynlib: pangolib, importc: "pango_font_description_copy_static".}
-proc pango_font_description_hash*(desc: PFontDescription): guint{.cdecl, 
-    dynlib: pangolib, importc: "pango_font_description_hash".}
-proc pango_font_description_equal*(desc1: PFontDescription, 
-                                   desc2: PFontDescription): gboolean{.cdecl, 
-    dynlib: pangolib, importc: "pango_font_description_equal".}
-proc pango_font_description_free*(desc: PFontDescription){.cdecl, 
-    dynlib: pangolib, importc: "pango_font_description_free".}
-proc pango_font_descriptions_free*(descs: var PFontDescription, n_descs: int32){.
-    cdecl, dynlib: pangolib, importc: "pango_font_descriptions_free".}
-proc pango_font_description_set_family*(desc: PFontDescription, family: cstring){.
-    cdecl, dynlib: pangolib, importc: "pango_font_description_set_family".}
-proc pango_font_description_set_family_static*(desc: PFontDescription, 
-    family: cstring){.cdecl, dynlib: pangolib, 
-                      importc: "pango_font_description_set_family_static".}
-proc pango_font_description_get_family*(desc: PFontDescription): cstring{.cdecl, 
-    dynlib: pangolib, importc: "pango_font_description_get_family".}
-proc pango_font_description_set_style*(desc: PFontDescription, style: TStyle){.
-    cdecl, dynlib: pangolib, importc: "pango_font_description_set_style".}
-proc pango_font_description_get_style*(desc: PFontDescription): TStyle{.cdecl, 
-    dynlib: pangolib, importc: "pango_font_description_get_style".}
-proc pango_font_description_set_variant*(desc: PFontDescription, 
-    variant: TVariant){.cdecl, dynlib: pangolib, 
-                        importc: "pango_font_description_set_variant".}
-proc pango_font_description_get_variant*(desc: PFontDescription): TVariant{.
-    cdecl, dynlib: pangolib, importc: "pango_font_description_get_variant".}
-proc pango_font_description_set_weight*(desc: PFontDescription, weight: TWeight){.
-    cdecl, dynlib: pangolib, importc: "pango_font_description_set_weight".}
-proc pango_font_description_get_weight*(desc: PFontDescription): TWeight{.cdecl, 
-    dynlib: pangolib, importc: "pango_font_description_get_weight".}
-proc pango_font_description_set_stretch*(desc: PFontDescription, 
-    stretch: TStretch){.cdecl, dynlib: pangolib, 
-                        importc: "pango_font_description_set_stretch".}
-proc pango_font_description_get_stretch*(desc: PFontDescription): TStretch{.
-    cdecl, dynlib: pangolib, importc: "pango_font_description_get_stretch".}
-proc pango_font_description_set_size*(desc: PFontDescription, size: gint){.
-    cdecl, dynlib: pangolib, importc: "pango_font_description_set_size".}
-proc pango_font_description_get_size*(desc: PFontDescription): gint{.cdecl, 
-    dynlib: pangolib, importc: "pango_font_description_get_size".}
-proc pango_font_description_set_absolute_size*(desc: PFontDescription, 
-    size: float64){.cdecl, dynlib: pangolib, 
-                    importc: "pango_font_description_set_absolute_size".}
-proc pango_font_description_get_size_is_absolute*(desc: PFontDescription, 
-    size: float64): gboolean{.cdecl, dynlib: pangolib, importc: "pango_font_description_get_size_is_absolute".}
-proc pango_font_description_get_set_fields*(desc: PFontDescription): TFontMask{.
-    cdecl, dynlib: pangolib, importc: "pango_font_description_get_set_fields".}
-proc pango_font_description_unset_fields*(desc: PFontDescription, 
-    to_unset: TFontMask){.cdecl, dynlib: pangolib, 
-                          importc: "pango_font_description_unset_fields".}
-proc pango_font_description_merge*(desc: PFontDescription, 
-                                   desc_to_merge: PFontDescription, 
-                                   replace_existing: gboolean){.cdecl, 
-    dynlib: pangolib, importc: "pango_font_description_merge".}
-proc pango_font_description_merge_static*(desc: PFontDescription, 
-    desc_to_merge: PFontDescription, replace_existing: gboolean){.cdecl, 
-    dynlib: pangolib, importc: "pango_font_description_merge_static".}
-proc pango_font_description_better_match*(desc: PFontDescription, 
-    old_match: PFontDescription, new_match: PFontDescription): gboolean{.cdecl, 
-    dynlib: pangolib, importc: "pango_font_description_better_match".}
-proc pango_font_description_from_string*(str: cstring): PFontDescription{.cdecl, 
-    dynlib: pangolib, importc: "pango_font_description_from_string".}
-proc pango_font_description_to_string*(desc: PFontDescription): cstring{.cdecl, 
-    dynlib: pangolib, importc: "pango_font_description_to_string".}
-proc pango_font_description_to_filename*(desc: PFontDescription): cstring{.
-    cdecl, dynlib: pangolib, importc: "pango_font_description_to_filename".}
-proc PANGO_TYPE_FONT_METRICS*(): GType
-proc pango_font_metrics_get_type*(): GType{.cdecl, dynlib: pangolib, 
-    importc: "pango_font_metrics_get_type".}
-proc pango_font_metrics_ref*(metrics: PFontMetrics): PFontMetrics{.cdecl, 
-    dynlib: pangolib, importc: "pango_font_metrics_ref".}
-proc pango_font_metrics_unref*(metrics: PFontMetrics){.cdecl, dynlib: pangolib, 
+proc font_description_copy*(desc: PFontDescription): PFontDescription{.cdecl, 
+    dynlib: lib, importc: "pango_font_description_copy".}
+proc font_description_copy_static*(desc: PFontDescription): PFontDescription{.
+    cdecl, dynlib: lib, importc: "pango_font_description_copy_static".}
+proc font_description_hash*(desc: PFontDescription): guint{.cdecl, dynlib: lib, 
+    importc: "pango_font_description_hash".}
+proc font_description_equal*(desc1: PFontDescription, desc2: PFontDescription): gboolean{.
+    cdecl, dynlib: lib, importc: "pango_font_description_equal".}
+proc font_description_free*(desc: PFontDescription){.cdecl, dynlib: lib, 
+    importc: "pango_font_description_free".}
+proc font_descriptions_free*(descs: var PFontDescription, n_descs: int32){.
+    cdecl, dynlib: lib, importc: "pango_font_descriptions_free".}
+proc font_description_set_family*(desc: PFontDescription, family: cstring){.
+    cdecl, dynlib: lib, importc: "pango_font_description_set_family".}
+proc font_description_set_family_static*(desc: PFontDescription, family: cstring){.
+    cdecl, dynlib: lib, importc: "pango_font_description_set_family_static".}
+proc font_description_get_family*(desc: PFontDescription): cstring{.cdecl, 
+    dynlib: lib, importc: "pango_font_description_get_family".}
+proc font_description_set_style*(desc: PFontDescription, style: TStyle){.cdecl, 
+    dynlib: lib, importc: "pango_font_description_set_style".}
+proc font_description_get_style*(desc: PFontDescription): TStyle{.cdecl, 
+    dynlib: lib, importc: "pango_font_description_get_style".}
+proc font_description_set_variant*(desc: PFontDescription, variant: TVariant){.
+    cdecl, dynlib: lib, importc: "pango_font_description_set_variant".}
+proc font_description_get_variant*(desc: PFontDescription): TVariant{.cdecl, 
+    dynlib: lib, importc: "pango_font_description_get_variant".}
+proc font_description_set_weight*(desc: PFontDescription, weight: TWeight){.
+    cdecl, dynlib: lib, importc: "pango_font_description_set_weight".}
+proc font_description_get_weight*(desc: PFontDescription): TWeight{.cdecl, 
+    dynlib: lib, importc: "pango_font_description_get_weight".}
+proc font_description_set_stretch*(desc: PFontDescription, stretch: TStretch){.
+    cdecl, dynlib: lib, importc: "pango_font_description_set_stretch".}
+proc font_description_get_stretch*(desc: PFontDescription): TStretch{.cdecl, 
+    dynlib: lib, importc: "pango_font_description_get_stretch".}
+proc font_description_set_size*(desc: PFontDescription, size: gint){.cdecl, 
+    dynlib: lib, importc: "pango_font_description_set_size".}
+proc font_description_get_size*(desc: PFontDescription): gint{.cdecl, 
+    dynlib: lib, importc: "pango_font_description_get_size".}
+proc font_description_set_absolute_size*(desc: PFontDescription, size: float64){.
+    cdecl, dynlib: lib, importc: "pango_font_description_set_absolute_size".}
+proc font_description_get_size_is_absolute*(desc: PFontDescription, 
+    size: float64): gboolean{.cdecl, dynlib: lib, importc: "pango_font_description_get_size_is_absolute".}
+proc font_description_get_set_fields*(desc: PFontDescription): TFontMask{.cdecl, 
+    dynlib: lib, importc: "pango_font_description_get_set_fields".}
+proc font_description_unset_fields*(desc: PFontDescription, to_unset: TFontMask){.
+    cdecl, dynlib: lib, importc: "pango_font_description_unset_fields".}
+proc font_description_merge*(desc: PFontDescription, 
+                             desc_to_merge: PFontDescription, 
+                             replace_existing: gboolean){.cdecl, dynlib: lib, 
+    importc: "pango_font_description_merge".}
+proc font_description_merge_static*(desc: PFontDescription, 
+                                    desc_to_merge: PFontDescription, 
+                                    replace_existing: gboolean){.cdecl, 
+    dynlib: lib, importc: "pango_font_description_merge_static".}
+proc font_description_better_match*(desc: PFontDescription, 
+                                    old_match: PFontDescription, 
+                                    new_match: PFontDescription): gboolean{.
+    cdecl, dynlib: lib, importc: "pango_font_description_better_match".}
+proc font_description_from_string*(str: cstring): PFontDescription{.cdecl, 
+    dynlib: lib, importc: "pango_font_description_from_string".}
+proc font_description_to_string*(desc: PFontDescription): cstring{.cdecl, 
+    dynlib: lib, importc: "pango_font_description_to_string".}
+proc font_description_to_filename*(desc: PFontDescription): cstring{.cdecl, 
+    dynlib: lib, importc: "pango_font_description_to_filename".}
+proc TYPE_FONT_METRICS*(): GType
+proc font_metrics_get_type*(): GType{.cdecl, dynlib: lib, 
+                                      importc: "pango_font_metrics_get_type".}
+proc font_metrics_ref*(metrics: PFontMetrics): PFontMetrics{.cdecl, dynlib: lib, 
+    importc: "pango_font_metrics_ref".}
+proc font_metrics_unref*(metrics: PFontMetrics){.cdecl, dynlib: lib, 
     importc: "pango_font_metrics_unref".}
-proc pango_font_metrics_get_ascent*(metrics: PFontMetrics): int32{.cdecl, 
-    dynlib: pangolib, importc: "pango_font_metrics_get_ascent".}
-proc pango_font_metrics_get_descent*(metrics: PFontMetrics): int32{.cdecl, 
-    dynlib: pangolib, importc: "pango_font_metrics_get_descent".}
-proc pango_font_metrics_get_approximate_char_width*(metrics: PFontMetrics): int32{.
-    cdecl, dynlib: pangolib, 
-    importc: "pango_font_metrics_get_approximate_char_width".}
-proc pango_font_metrics_get_approximate_digit_width*(metrics: PFontMetrics): int32{.
-    cdecl, dynlib: pangolib, 
+proc font_metrics_get_ascent*(metrics: PFontMetrics): int32{.cdecl, dynlib: lib, 
+    importc: "pango_font_metrics_get_ascent".}
+proc font_metrics_get_descent*(metrics: PFontMetrics): int32{.cdecl, 
+    dynlib: lib, importc: "pango_font_metrics_get_descent".}
+proc font_metrics_get_approximate_char_width*(metrics: PFontMetrics): int32{.
+    cdecl, dynlib: lib, importc: "pango_font_metrics_get_approximate_char_width".}
+proc font_metrics_get_approximate_digit_width*(metrics: PFontMetrics): int32{.
+    cdecl, dynlib: lib, 
     importc: "pango_font_metrics_get_approximate_digit_width".}
-proc PANGO_TYPE_FONT_FAMILY*(): GType
-proc PANGO_FONT_FAMILY*(anObject: Pointer): PFontFamily
-proc PANGO_IS_FONT_FAMILY*(anObject: Pointer): bool
-proc pango_font_family_get_type*(): GType{.cdecl, dynlib: pangolib, 
-    importc: "pango_font_family_get_type".}
-proc pango_font_family_list_faces*(family: PFontFamily, 
-                                   faces: var openarray[ptr PFontFace]){.cdecl, 
-    dynlib: pangolib, importc: "pango_font_family_list_faces".}
-proc pango_font_family_get_name*(family: PFontFamily): cstring{.cdecl, 
-    dynlib: pangolib, importc: "pango_font_family_get_name".}
-proc PANGO_TYPE_FONT_FACE*(): GType
-proc PANGO_FONT_FACE*(anObject: pointer): PFontFace
-proc PANGO_IS_FONT_FACE*(anObject: pointer): bool
-proc pango_font_face_get_type*(): GType{.cdecl, dynlib: pangolib, 
-    importc: "pango_font_face_get_type".}
-proc pango_font_face_describe*(face: PFontFace): PFontDescription{.cdecl, 
-    dynlib: pangolib, importc: "pango_font_face_describe".}
-proc pango_font_face_get_face_name*(face: PFontFace): cstring{.cdecl, 
-    dynlib: pangolib, importc: "pango_font_face_get_face_name".}
-proc PANGO_TYPE_FONT*(): GType
-proc PANGO_FONT*(anObject: pointer): PFont
-proc PANGO_IS_FONT*(anObject: pointer): bool
-proc pango_font_get_type*(): GType{.cdecl, dynlib: pangolib, 
-                                    importc: "pango_font_get_type".}
-proc pango_font_describe*(font: PFont): PFontDescription{.cdecl, 
-    dynlib: pangolib, importc: "pango_font_describe".}
-proc pango_font_get_coverage*(font: PFont, language: PLanguage): PCoverage{.
-    cdecl, dynlib: pangolib, importc: "pango_font_get_coverage".}
-proc pango_font_find_shaper*(font: PFont, language: PLanguage, ch: guint32): PEngineShape{.
-    cdecl, dynlib: pangolib, importc: "pango_font_find_shaper".}
-proc pango_font_get_metrics*(font: PFont, language: PLanguage): PFontMetrics{.
-    cdecl, dynlib: pangolib, importc: "pango_font_get_metrics".}
-proc pango_font_get_glyph_extents*(font: PFont, glyph: TGlyph, 
-                                   ink_rect: PRectangle, 
-                                   logical_rect: PRectangle){.cdecl, 
-    dynlib: pangolib, importc: "pango_font_get_glyph_extents".}
-proc PANGO_TYPE_FONT_MAP*(): GType
-proc PANGO_FONT_MAP*(anObject: pointer): PFontMap
-proc PANGO_IS_FONT_MAP*(anObject: pointer): bool
-proc pango_font_map_get_type*(): GType{.cdecl, dynlib: pangolib, 
-                                        importc: "pango_font_map_get_type".}
-proc pango_font_map_load_font*(fontmap: PFontMap, context: PContext, 
-                               desc: PFontDescription): PFont{.cdecl, 
-    dynlib: pangolib, importc: "pango_font_map_load_font".}
-proc pango_font_map_load_fontset*(fontmap: PFontMap, context: PContext, 
-                                  desc: PFontDescription, language: PLanguage): PFontset{.
-    cdecl, dynlib: pangolib, importc: "pango_font_map_load_fontset".}
-proc pango_font_map_list_families*(fontmap: PFontMap, 
-                                   families: var openarray[ptr PFontFamily]){.
-    cdecl, dynlib: pangolib, importc: "pango_font_map_list_families".}
+proc TYPE_FONT_FAMILY*(): GType
+proc FONT_FAMILY*(anObject: Pointer): PFontFamily
+proc IS_FONT_FAMILY*(anObject: Pointer): bool
+proc font_family_get_type*(): GType{.cdecl, dynlib: lib, 
+                                     importc: "pango_font_family_get_type".}
+proc font_family_list_faces*(family: PFontFamily, 
+                             faces: var openarray[ptr PFontFace]){.cdecl, 
+    dynlib: lib, importc: "pango_font_family_list_faces".}
+proc font_family_get_name*(family: PFontFamily): cstring{.cdecl, dynlib: lib, 
+    importc: "pango_font_family_get_name".}
+proc TYPE_FONT_FACE*(): GType
+proc FONT_FACE*(anObject: pointer): PFontFace
+proc IS_FONT_FACE*(anObject: pointer): bool
+proc font_face_get_type*(): GType{.cdecl, dynlib: lib, 
+                                   importc: "pango_font_face_get_type".}
+proc font_face_describe*(face: PFontFace): PFontDescription{.cdecl, dynlib: lib, 
+    importc: "pango_font_face_describe".}
+proc font_face_get_face_name*(face: PFontFace): cstring{.cdecl, dynlib: lib, 
+    importc: "pango_font_face_get_face_name".}
+proc TYPE_FONT*(): GType
+proc FONT*(anObject: pointer): PFont
+proc IS_FONT*(anObject: pointer): bool
+proc font_get_type*(): GType{.cdecl, dynlib: lib, importc: "pango_font_get_type".}
+proc font_describe*(font: PFont): PFontDescription{.cdecl, dynlib: lib, 
+    importc: "pango_font_describe".}
+proc font_get_coverage*(font: PFont, language: PLanguage): PCoverage{.cdecl, 
+    dynlib: lib, importc: "pango_font_get_coverage".}
+proc font_find_shaper*(font: PFont, language: PLanguage, ch: guint32): PEngineShape{.
+    cdecl, dynlib: lib, importc: "pango_font_find_shaper".}
+proc font_get_metrics*(font: PFont, language: PLanguage): PFontMetrics{.cdecl, 
+    dynlib: lib, importc: "pango_font_get_metrics".}
+proc font_get_glyph_extents*(font: PFont, glyph: TGlyph, ink_rect: PRectangle, 
+                             logical_rect: PRectangle){.cdecl, dynlib: lib, 
+    importc: "pango_font_get_glyph_extents".}
+proc TYPE_FONT_MAP*(): GType
+proc FONT_MAP*(anObject: pointer): PFontMap
+proc IS_FONT_MAP*(anObject: pointer): bool
+proc font_map_get_type*(): GType{.cdecl, dynlib: lib, 
+                                  importc: "pango_font_map_get_type".}
+proc font_map_load_font*(fontmap: PFontMap, context: PContext, 
+                         desc: PFontDescription): PFont{.cdecl, dynlib: lib, 
+    importc: "pango_font_map_load_font".}
+proc font_map_load_fontset*(fontmap: PFontMap, context: PContext, 
+                            desc: PFontDescription, language: PLanguage): PFontset{.
+    cdecl, dynlib: lib, importc: "pango_font_map_load_fontset".}
+proc font_map_list_families*(fontmap: PFontMap, 
+                             families: var openarray[ptr PFontFamily]){.cdecl, 
+    dynlib: lib, importc: "pango_font_map_list_families".}
 const 
   bm_TPangoGlyphVisAttr_is_cluster_start* = 0x0001'i16
   bp_TPangoGlyphVisAttr_is_cluster_start* = 0'i16
 
 proc is_cluster_start*(a: var TGlyphVisAttr): guint
 proc set_is_cluster_start*(a: var TGlyphVisAttr, `is_cluster_start`: guint)
-proc PANGO_TYPE_GLYPH_STRING*(): GType
-proc pango_glyph_string_new*(): PGlyphString{.cdecl, dynlib: pangolib, 
-    importc: "pango_glyph_string_new".}
-proc pango_glyph_string_set_size*(`string`: PGlyphString, new_len: gint){.cdecl, 
-    dynlib: pangolib, importc: "pango_glyph_string_set_size".}
-proc pango_glyph_string_get_type*(): GType{.cdecl, dynlib: pangolib, 
-    importc: "pango_glyph_string_get_type".}
-proc pango_glyph_string_copy*(`string`: PGlyphString): PGlyphString{.cdecl, 
-    dynlib: pangolib, importc: "pango_glyph_string_copy".}
-proc pango_glyph_string_free*(`string`: PGlyphString){.cdecl, dynlib: pangolib, 
+proc TYPE_GLYPH_STRING*(): GType
+proc glyph_string_new*(): PGlyphString{.cdecl, dynlib: lib, 
+                                        importc: "pango_glyph_string_new".}
+proc glyph_string_set_size*(`string`: PGlyphString, new_len: gint){.cdecl, 
+    dynlib: lib, importc: "pango_glyph_string_set_size".}
+proc glyph_string_get_type*(): GType{.cdecl, dynlib: lib, 
+                                      importc: "pango_glyph_string_get_type".}
+proc glyph_string_copy*(`string`: PGlyphString): PGlyphString{.cdecl, 
+    dynlib: lib, importc: "pango_glyph_string_copy".}
+proc glyph_string_free*(`string`: PGlyphString){.cdecl, dynlib: lib, 
     importc: "pango_glyph_string_free".}
-proc pango_glyph_string_extents*(glyphs: PGlyphString, font: PFont, 
+proc glyph_string_extents*(glyphs: PGlyphString, font: PFont, 
+                           ink_rect: PRectangle, logical_rect: PRectangle){.
+    cdecl, dynlib: lib, importc: "pango_glyph_string_extents".}
+proc glyph_string_extents_range*(glyphs: PGlyphString, start: int32, 
+                                 theEnd: int32, font: PFont, 
                                  ink_rect: PRectangle, logical_rect: PRectangle){.
-    cdecl, dynlib: pangolib, importc: "pango_glyph_string_extents".}
-proc pango_glyph_string_extents_range*(glyphs: PGlyphString, start: int32, 
-                                       theEnd: int32, font: PFont, 
-                                       ink_rect: PRectangle, 
-                                       logical_rect: PRectangle){.cdecl, 
-    dynlib: pangolib, importc: "pango_glyph_string_extents_range".}
-proc pango_glyph_string_get_logical_widths*(glyphs: PGlyphString, text: cstring, 
-    length: int32, embedding_level: int32, logical_widths: var int32){.cdecl, 
-    dynlib: pangolib, importc: "pango_glyph_string_get_logical_widths".}
-proc pango_glyph_string_index_to_x*(glyphs: PGlyphString, text: cstring, 
-                                    length: int32, analysis: PAnalysis, 
-                                    index: int32, trailing: gboolean, 
-                                    x_pos: var int32){.cdecl, dynlib: pangolib, 
-    importc: "pango_glyph_string_index_to_x".}
-proc pango_glyph_string_x_to_index*(glyphs: PGlyphString, text: cstring, 
-                                    length: int32, analysis: PAnalysis, 
-                                    x_pos: int32, index, trailing: var int32){.
-    cdecl, dynlib: pangolib, importc: "pango_glyph_string_x_to_index".}
-proc pango_shape*(text: cstring, length: gint, analysis: PAnalysis, 
-                  glyphs: PGlyphString){.cdecl, dynlib: pangolib, 
-    importc: "pango_shape".}
-proc pango_reorder_items*(logical_items: PGList): PGList{.cdecl, 
-    dynlib: pangolib, importc: "pango_reorder_items".}
-proc pango_item_new*(): PItem{.cdecl, dynlib: pangolib, 
-                               importc: "pango_item_new".}
-proc pango_item_copy*(item: PItem): PItem{.cdecl, dynlib: pangolib, 
-    importc: "pango_item_copy".}
-proc pango_item_free*(item: PItem){.cdecl, dynlib: pangolib, 
-                                    importc: "pango_item_free".}
-proc pango_item_split*(orig: PItem, split_index: int32, split_offset: int32): PItem{.
-    cdecl, dynlib: pangolib, importc: "pango_item_split".}
-proc PANGO_TYPE_LAYOUT*(): GType
-proc PANGO_LAYOUT*(anObject: pointer): PLayout
-proc PANGO_LAYOUT_CLASS*(klass: pointer): PLayoutClass
-proc PANGO_IS_LAYOUT*(anObject: pointer): bool
-proc PANGO_IS_LAYOUT_CLASS*(klass: pointer): bool
-proc PANGO_LAYOUT_GET_CLASS*(obj: PLayout): PLayoutClass
-proc pango_layout_get_type*(): GType{.cdecl, dynlib: pangolib, 
-                                      importc: "pango_layout_get_type".}
-proc pango_layout_new*(context: PContext): PLayout{.cdecl, dynlib: pangolib, 
+    cdecl, dynlib: lib, importc: "pango_glyph_string_extents_range".}
+proc glyph_string_get_logical_widths*(glyphs: PGlyphString, text: cstring, 
+                                      length: int32, embedding_level: int32, 
+                                      logical_widths: var int32){.cdecl, 
+    dynlib: lib, importc: "pango_glyph_string_get_logical_widths".}
+proc glyph_string_index_to_x*(glyphs: PGlyphString, text: cstring, 
+                              length: int32, analysis: PAnalysis, index: int32, 
+                              trailing: gboolean, x_pos: var int32){.cdecl, 
+    dynlib: lib, importc: "pango_glyph_string_index_to_x".}
+proc glyph_string_x_to_index*(glyphs: PGlyphString, text: cstring, 
+                              length: int32, analysis: PAnalysis, x_pos: int32, 
+                              index, trailing: var int32){.cdecl, dynlib: lib, 
+    importc: "pango_glyph_string_x_to_index".}
+proc shape*(text: cstring, length: gint, analysis: PAnalysis, 
+            glyphs: PGlyphString){.cdecl, dynlib: lib, importc: "pango_shape".}
+proc reorder_items*(logical_items: PGList): PGList{.cdecl, dynlib: lib, 
+    importc: "pango_reorder_items".}
+proc item_new*(): PItem{.cdecl, dynlib: lib, importc: "pango_item_new".}
+proc item_copy*(item: PItem): PItem{.cdecl, dynlib: lib, 
+                                     importc: "pango_item_copy".}
+proc item_free*(item: PItem){.cdecl, dynlib: lib, importc: "pango_item_free".}
+proc item_split*(orig: PItem, split_index: int32, split_offset: int32): PItem{.
+    cdecl, dynlib: lib, importc: "pango_item_split".}
+proc TYPE_LAYOUT*(): GType
+proc LAYOUT*(anObject: pointer): PLayout
+proc LAYOUT_CLASS*(klass: pointer): PLayoutClass
+proc IS_LAYOUT*(anObject: pointer): bool
+proc IS_LAYOUT_CLASS*(klass: pointer): bool
+proc LAYOUT_GET_CLASS*(obj: PLayout): PLayoutClass
+proc layout_get_type*(): GType{.cdecl, dynlib: lib, 
+                                importc: "pango_layout_get_type".}
+proc layout_new*(context: PContext): PLayout{.cdecl, dynlib: lib, 
     importc: "pango_layout_new".}
-proc pango_layout_copy*(src: PLayout): PLayout{.cdecl, dynlib: pangolib, 
+proc layout_copy*(src: PLayout): PLayout{.cdecl, dynlib: lib, 
     importc: "pango_layout_copy".}
-proc pango_layout_get_context*(layout: PLayout): PContext{.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_get_context".}
-proc pango_layout_set_attributes*(layout: PLayout, attrs: PAttrList){.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_set_attributes".}
-proc pango_layout_get_attributes*(layout: PLayout): PAttrList{.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_get_attributes".}
-proc pango_layout_set_text*(layout: PLayout, text: cstring, length: int32){.
-    cdecl, dynlib: pangolib, importc: "pango_layout_set_text".}
-proc pango_layout_get_text*(layout: PLayout): cstring{.cdecl, dynlib: pangolib, 
+proc layout_get_context*(layout: PLayout): PContext{.cdecl, dynlib: lib, 
+    importc: "pango_layout_get_context".}
+proc layout_set_attributes*(layout: PLayout, attrs: PAttrList){.cdecl, 
+    dynlib: lib, importc: "pango_layout_set_attributes".}
+proc layout_get_attributes*(layout: PLayout): PAttrList{.cdecl, dynlib: lib, 
+    importc: "pango_layout_get_attributes".}
+proc layout_set_text*(layout: PLayout, text: cstring, length: int32){.cdecl, 
+    dynlib: lib, importc: "pango_layout_set_text".}
+proc layout_get_text*(layout: PLayout): cstring{.cdecl, dynlib: lib, 
     importc: "pango_layout_get_text".}
-proc pango_layout_set_markup*(layout: PLayout, markup: cstring, length: int32){.
-    cdecl, dynlib: pangolib, importc: "pango_layout_set_markup".}
-proc pango_layout_set_markup_with_accel*(layout: PLayout, markup: cstring, 
-    length: int32, accel_marker: gunichar, accel_char: Pgunichar){.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_set_markup_with_accel".}
-proc pango_layout_set_font_description*(layout: PLayout, desc: PFontDescription){.
-    cdecl, dynlib: pangolib, importc: "pango_layout_set_font_description".}
-proc pango_layout_set_width*(layout: PLayout, width: int32){.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_set_width".}
-proc pango_layout_get_width*(layout: PLayout): int32{.cdecl, dynlib: pangolib, 
+proc layout_set_markup*(layout: PLayout, markup: cstring, length: int32){.cdecl, 
+    dynlib: lib, importc: "pango_layout_set_markup".}
+proc layout_set_markup_with_accel*(layout: PLayout, markup: cstring, 
+                                   length: int32, accel_marker: gunichar, 
+                                   accel_char: Pgunichar){.cdecl, dynlib: lib, 
+    importc: "pango_layout_set_markup_with_accel".}
+proc layout_set_font_description*(layout: PLayout, desc: PFontDescription){.
+    cdecl, dynlib: lib, importc: "pango_layout_set_font_description".}
+proc layout_set_width*(layout: PLayout, width: int32){.cdecl, dynlib: lib, 
+    importc: "pango_layout_set_width".}
+proc layout_get_width*(layout: PLayout): int32{.cdecl, dynlib: lib, 
     importc: "pango_layout_get_width".}
-proc pango_layout_set_wrap*(layout: PLayout, wrap: TWrapMode){.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_set_wrap".}
-proc pango_layout_get_wrap*(layout: PLayout): TWrapMode{.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_get_wrap".}
-proc pango_layout_set_indent*(layout: PLayout, indent: int32){.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_set_indent".}
-proc pango_layout_get_indent*(layout: PLayout): int32{.cdecl, dynlib: pangolib, 
+proc layout_set_wrap*(layout: PLayout, wrap: TWrapMode){.cdecl, dynlib: lib, 
+    importc: "pango_layout_set_wrap".}
+proc layout_get_wrap*(layout: PLayout): TWrapMode{.cdecl, dynlib: lib, 
+    importc: "pango_layout_get_wrap".}
+proc layout_set_indent*(layout: PLayout, indent: int32){.cdecl, dynlib: lib, 
+    importc: "pango_layout_set_indent".}
+proc layout_get_indent*(layout: PLayout): int32{.cdecl, dynlib: lib, 
     importc: "pango_layout_get_indent".}
-proc pango_layout_set_spacing*(layout: PLayout, spacing: int32){.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_set_spacing".}
-proc pango_layout_get_spacing*(layout: PLayout): int32{.cdecl, dynlib: pangolib, 
+proc layout_set_spacing*(layout: PLayout, spacing: int32){.cdecl, dynlib: lib, 
+    importc: "pango_layout_set_spacing".}
+proc layout_get_spacing*(layout: PLayout): int32{.cdecl, dynlib: lib, 
     importc: "pango_layout_get_spacing".}
-proc pango_layout_set_justify*(layout: PLayout, justify: gboolean){.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_set_justify".}
-proc pango_layout_get_justify*(layout: PLayout): gboolean{.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_get_justify".}
-proc pango_layout_set_alignment*(layout: PLayout, alignment: TAlignment){.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_set_alignment".}
-proc pango_layout_get_alignment*(layout: PLayout): TAlignment{.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_get_alignment".}
-proc pango_layout_set_tabs*(layout: PLayout, tabs: PTabArray){.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_set_tabs".}
-proc pango_layout_get_tabs*(layout: PLayout): PTabArray{.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_get_tabs".}
-proc pango_layout_set_single_paragraph_mode*(layout: PLayout, setting: gboolean){.
-    cdecl, dynlib: pangolib, importc: "pango_layout_set_single_paragraph_mode".}
-proc pango_layout_get_single_paragraph_mode*(layout: PLayout): gboolean{.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_get_single_paragraph_mode".}
-proc pango_layout_context_changed*(layout: PLayout){.cdecl, dynlib: pangolib, 
+proc layout_set_justify*(layout: PLayout, justify: gboolean){.cdecl, 
+    dynlib: lib, importc: "pango_layout_set_justify".}
+proc layout_get_justify*(layout: PLayout): gboolean{.cdecl, dynlib: lib, 
+    importc: "pango_layout_get_justify".}
+proc layout_set_alignment*(layout: PLayout, alignment: TAlignment){.cdecl, 
+    dynlib: lib, importc: "pango_layout_set_alignment".}
+proc layout_get_alignment*(layout: PLayout): TAlignment{.cdecl, dynlib: lib, 
+    importc: "pango_layout_get_alignment".}
+proc layout_set_tabs*(layout: PLayout, tabs: PTabArray){.cdecl, dynlib: lib, 
+    importc: "pango_layout_set_tabs".}
+proc layout_get_tabs*(layout: PLayout): PTabArray{.cdecl, dynlib: lib, 
+    importc: "pango_layout_get_tabs".}
+proc layout_set_single_paragraph_mode*(layout: PLayout, setting: gboolean){.
+    cdecl, dynlib: lib, importc: "pango_layout_set_single_paragraph_mode".}
+proc layout_get_single_paragraph_mode*(layout: PLayout): gboolean{.cdecl, 
+    dynlib: lib, importc: "pango_layout_get_single_paragraph_mode".}
+proc layout_context_changed*(layout: PLayout){.cdecl, dynlib: lib, 
     importc: "pango_layout_context_changed".}
-proc pango_layout_get_log_attrs*(layout: PLayout, attrs: var PLogAttr, 
-                                 n_attrs: Pgint){.cdecl, dynlib: pangolib, 
-    importc: "pango_layout_get_log_attrs".}
-proc pango_layout_index_to_pos*(layout: PLayout, index: int32, pos: PRectangle){.
-    cdecl, dynlib: pangolib, importc: "pango_layout_index_to_pos".}
-proc pango_layout_get_cursor_pos*(layout: PLayout, index: int32, 
-                                  strong_pos: PRectangle, weak_pos: PRectangle){.
-    cdecl, dynlib: pangolib, importc: "pango_layout_get_cursor_pos".}
-proc pango_layout_move_cursor_visually*(layout: PLayout, strong: gboolean, 
-                                        old_index: int32, old_trailing: int32, 
-                                        direction: int32, 
-                                        new_index, new_trailing: var int32){.
-    cdecl, dynlib: pangolib, importc: "pango_layout_move_cursor_visually".}
-proc pango_layout_xy_to_index*(layout: PLayout, x: int32, y: int32, 
-                               index, trailing: var int32): gboolean{.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_xy_to_index".}
-proc pango_layout_get_extents*(layout: PLayout, ink_rect: PRectangle, 
-                               logical_rect: PRectangle){.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_get_extents".}
-proc pango_layout_get_pixel_extents*(layout: PLayout, ink_rect: PRectangle, 
-                                     logical_rect: PRectangle){.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_get_pixel_extents".}
-proc pango_layout_get_size*(layout: PLayout, width: var int32, height: var int32){.
-    cdecl, dynlib: pangolib, importc: "pango_layout_get_size".}
-proc pango_layout_get_pixel_size*(layout: PLayout, width: var int32, 
-                                  height: var int32){.cdecl, dynlib: pangolib, 
-    importc: "pango_layout_get_pixel_size".}
-proc pango_layout_get_line_count*(layout: PLayout): int32{.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_get_line_count".}
-proc pango_layout_get_line*(layout: PLayout, line: int32): PLayoutLine{.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_get_line".}
-proc pango_layout_get_lines*(layout: PLayout): PGSList{.cdecl, dynlib: pangolib, 
+proc layout_get_log_attrs*(layout: PLayout, attrs: var PLogAttr, n_attrs: Pgint){.
+    cdecl, dynlib: lib, importc: "pango_layout_get_log_attrs".}
+proc layout_index_to_pos*(layout: PLayout, index: int32, pos: PRectangle){.
+    cdecl, dynlib: lib, importc: "pango_layout_index_to_pos".}
+proc layout_get_cursor_pos*(layout: PLayout, index: int32, 
+                            strong_pos: PRectangle, weak_pos: PRectangle){.
+    cdecl, dynlib: lib, importc: "pango_layout_get_cursor_pos".}
+proc layout_move_cursor_visually*(layout: PLayout, strong: gboolean, 
+                                  old_index: int32, old_trailing: int32, 
+                                  direction: int32, 
+                                  new_index, new_trailing: var int32){.cdecl, 
+    dynlib: lib, importc: "pango_layout_move_cursor_visually".}
+proc layout_xy_to_index*(layout: PLayout, x: int32, y: int32, 
+                         index, trailing: var int32): gboolean{.cdecl, 
+    dynlib: lib, importc: "pango_layout_xy_to_index".}
+proc layout_get_extents*(layout: PLayout, ink_rect: PRectangle, 
+                         logical_rect: PRectangle){.cdecl, dynlib: lib, 
+    importc: "pango_layout_get_extents".}
+proc layout_get_pixel_extents*(layout: PLayout, ink_rect: PRectangle, 
+                               logical_rect: PRectangle){.cdecl, dynlib: lib, 
+    importc: "pango_layout_get_pixel_extents".}
+proc layout_get_size*(layout: PLayout, width: var int32, height: var int32){.
+    cdecl, dynlib: lib, importc: "pango_layout_get_size".}
+proc layout_get_pixel_size*(layout: PLayout, width: var int32, height: var int32){.
+    cdecl, dynlib: lib, importc: "pango_layout_get_pixel_size".}
+proc layout_get_line_count*(layout: PLayout): int32{.cdecl, dynlib: lib, 
+    importc: "pango_layout_get_line_count".}
+proc layout_get_line*(layout: PLayout, line: int32): PLayoutLine{.cdecl, 
+    dynlib: lib, importc: "pango_layout_get_line".}
+proc layout_get_lines*(layout: PLayout): PGSList{.cdecl, dynlib: lib, 
     importc: "pango_layout_get_lines".}
-proc pango_layout_line_ref*(line: PLayoutLine){.cdecl, dynlib: pangolib, 
+proc layout_line_ref*(line: PLayoutLine){.cdecl, dynlib: lib, 
     importc: "pango_layout_line_ref".}
-proc pango_layout_line_unref*(line: PLayoutLine){.cdecl, dynlib: pangolib, 
+proc layout_line_unref*(line: PLayoutLine){.cdecl, dynlib: lib, 
     importc: "pango_layout_line_unref".}
-proc pango_layout_line_x_to_index*(line: PLayoutLine, x_pos: int32, 
-                                   index: var int32, trailing: var int32): gboolean{.
-    cdecl, dynlib: pangolib, importc: "pango_layout_line_x_to_index".}
-proc pango_layout_line_index_to_x*(line: PLayoutLine, index: int32, 
-                                   trailing: gboolean, x_pos: var int32){.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_line_index_to_x".}
-proc pango_layout_line_get_extents*(line: PLayoutLine, ink_rect: PRectangle, 
+proc layout_line_x_to_index*(line: PLayoutLine, x_pos: int32, index: var int32, 
+                             trailing: var int32): gboolean{.cdecl, dynlib: lib, 
+    importc: "pango_layout_line_x_to_index".}
+proc layout_line_index_to_x*(line: PLayoutLine, index: int32, 
+                             trailing: gboolean, x_pos: var int32){.cdecl, 
+    dynlib: lib, importc: "pango_layout_line_index_to_x".}
+proc layout_line_get_extents*(line: PLayoutLine, ink_rect: PRectangle, 
+                              logical_rect: PRectangle){.cdecl, dynlib: lib, 
+    importc: "pango_layout_line_get_extents".}
+proc layout_line_get_pixel_extents*(layout_line: PLayoutLine, 
+                                    ink_rect: PRectangle, 
                                     logical_rect: PRectangle){.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_line_get_extents".}
-proc pango_layout_line_get_pixel_extents*(layout_line: PLayoutLine, 
-    ink_rect: PRectangle, logical_rect: PRectangle){.cdecl, dynlib: pangolib, 
-    importc: "pango_layout_line_get_pixel_extents".}
-proc pango_layout_get_iter*(layout: PLayout): PLayoutIter{.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_get_iter".}
-proc pango_layout_iter_free*(iter: PLayoutIter){.cdecl, dynlib: pangolib, 
+    dynlib: lib, importc: "pango_layout_line_get_pixel_extents".}
+proc layout_get_iter*(layout: PLayout): PLayoutIter{.cdecl, dynlib: lib, 
+    importc: "pango_layout_get_iter".}
+proc layout_iter_free*(iter: PLayoutIter){.cdecl, dynlib: lib, 
     importc: "pango_layout_iter_free".}
-proc pango_layout_iter_get_index*(iter: PLayoutIter): int32{.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_iter_get_index".}
-proc pango_layout_iter_get_run*(iter: PLayoutIter): PLayoutRun{.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_iter_get_run".}
-proc pango_layout_iter_get_line*(iter: PLayoutIter): PLayoutLine{.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_iter_get_line".}
-proc pango_layout_iter_at_last_line*(iter: PLayoutIter): gboolean{.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_iter_at_last_line".}
-proc pango_layout_iter_next_char*(iter: PLayoutIter): gboolean{.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_iter_next_char".}
-proc pango_layout_iter_next_cluster*(iter: PLayoutIter): gboolean{.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_iter_next_cluster".}
-proc pango_layout_iter_next_run*(iter: PLayoutIter): gboolean{.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_iter_next_run".}
-proc pango_layout_iter_next_line*(iter: PLayoutIter): gboolean{.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_iter_next_line".}
-proc pango_layout_iter_get_char_extents*(iter: PLayoutIter, 
-    logical_rect: PRectangle){.cdecl, dynlib: pangolib, 
-                               importc: "pango_layout_iter_get_char_extents".}
-proc pango_layout_iter_get_cluster_extents*(iter: PLayoutIter, 
-    ink_rect: PRectangle, logical_rect: PRectangle){.cdecl, dynlib: pangolib, 
-    importc: "pango_layout_iter_get_cluster_extents".}
-proc pango_layout_iter_get_run_extents*(iter: PLayoutIter, ink_rect: PRectangle, 
-                                        logical_rect: PRectangle){.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_iter_get_run_extents".}
-proc pango_layout_iter_get_line_extents*(iter: PLayoutIter, 
-    ink_rect: PRectangle, logical_rect: PRectangle){.cdecl, dynlib: pangolib, 
-    importc: "pango_layout_iter_get_line_extents".}
-proc pango_layout_iter_get_line_yrange*(iter: PLayoutIter, y0: var int32, 
-                                        y1: var int32){.cdecl, dynlib: pangolib, 
+proc layout_iter_get_index*(iter: PLayoutIter): int32{.cdecl, dynlib: lib, 
+    importc: "pango_layout_iter_get_index".}
+proc layout_iter_get_run*(iter: PLayoutIter): PLayoutRun{.cdecl, dynlib: lib, 
+    importc: "pango_layout_iter_get_run".}
+proc layout_iter_get_line*(iter: PLayoutIter): PLayoutLine{.cdecl, dynlib: lib, 
+    importc: "pango_layout_iter_get_line".}
+proc layout_iter_at_last_line*(iter: PLayoutIter): gboolean{.cdecl, dynlib: lib, 
+    importc: "pango_layout_iter_at_last_line".}
+proc layout_iter_next_char*(iter: PLayoutIter): gboolean{.cdecl, dynlib: lib, 
+    importc: "pango_layout_iter_next_char".}
+proc layout_iter_next_cluster*(iter: PLayoutIter): gboolean{.cdecl, dynlib: lib, 
+    importc: "pango_layout_iter_next_cluster".}
+proc layout_iter_next_run*(iter: PLayoutIter): gboolean{.cdecl, dynlib: lib, 
+    importc: "pango_layout_iter_next_run".}
+proc layout_iter_next_line*(iter: PLayoutIter): gboolean{.cdecl, dynlib: lib, 
+    importc: "pango_layout_iter_next_line".}
+proc layout_iter_get_char_extents*(iter: PLayoutIter, logical_rect: PRectangle){.
+    cdecl, dynlib: lib, importc: "pango_layout_iter_get_char_extents".}
+proc layout_iter_get_cluster_extents*(iter: PLayoutIter, ink_rect: PRectangle, 
+                                      logical_rect: PRectangle){.cdecl, 
+    dynlib: lib, importc: "pango_layout_iter_get_cluster_extents".}
+proc layout_iter_get_run_extents*(iter: PLayoutIter, ink_rect: PRectangle, 
+                                  logical_rect: PRectangle){.cdecl, dynlib: lib, 
+    importc: "pango_layout_iter_get_run_extents".}
+proc layout_iter_get_line_extents*(iter: PLayoutIter, ink_rect: PRectangle, 
+                                   logical_rect: PRectangle){.cdecl, 
+    dynlib: lib, importc: "pango_layout_iter_get_line_extents".}
+proc layout_iter_get_line_yrange*(iter: PLayoutIter, y0: var int32, 
+                                  y1: var int32){.cdecl, dynlib: lib, 
     importc: "pango_layout_iter_get_line_yrange".}
-proc pango_layout_iter_get_layout_extents*(iter: PLayoutIter, 
-    ink_rect: PRectangle, logical_rect: PRectangle){.cdecl, dynlib: pangolib, 
-    importc: "pango_layout_iter_get_layout_extents".}
-proc pango_layout_iter_get_baseline*(iter: PLayoutIter): int32{.cdecl, 
-    dynlib: pangolib, importc: "pango_layout_iter_get_baseline".}
-proc PANGO_TYPE_TAB_ARRAY*(): GType
-proc pango_tab_array_new*(initial_size: gint, positions_in_pixels: gboolean): PTabArray{.
-    cdecl, dynlib: pangolib, importc: "pango_tab_array_new".}
-proc pango_tab_array_get_type*(): GType{.cdecl, dynlib: pangolib, 
-    importc: "pango_tab_array_get_type".}
-proc pango_tab_array_copy*(src: PTabArray): PTabArray{.cdecl, dynlib: pangolib, 
+proc layout_iter_get_layout_extents*(iter: PLayoutIter, ink_rect: PRectangle, 
+                                     logical_rect: PRectangle){.cdecl, 
+    dynlib: lib, importc: "pango_layout_iter_get_layout_extents".}
+proc layout_iter_get_baseline*(iter: PLayoutIter): int32{.cdecl, dynlib: lib, 
+    importc: "pango_layout_iter_get_baseline".}
+proc TYPE_TAB_ARRAY*(): GType
+proc tab_array_new*(initial_size: gint, positions_in_pixels: gboolean): PTabArray{.
+    cdecl, dynlib: lib, importc: "pango_tab_array_new".}
+proc tab_array_get_type*(): GType{.cdecl, dynlib: lib, 
+                                   importc: "pango_tab_array_get_type".}
+proc tab_array_copy*(src: PTabArray): PTabArray{.cdecl, dynlib: lib, 
     importc: "pango_tab_array_copy".}
-proc pango_tab_array_free*(tab_array: PTabArray){.cdecl, dynlib: pangolib, 
+proc tab_array_free*(tab_array: PTabArray){.cdecl, dynlib: lib, 
     importc: "pango_tab_array_free".}
-proc pango_tab_array_get_size*(tab_array: PTabArray): gint{.cdecl, 
-    dynlib: pangolib, importc: "pango_tab_array_get_size".}
-proc pango_tab_array_resize*(tab_array: PTabArray, new_size: gint){.cdecl, 
-    dynlib: pangolib, importc: "pango_tab_array_resize".}
-proc pango_tab_array_set_tab*(tab_array: PTabArray, tab_index: gint, 
-                              alignment: TTabAlign, location: gint){.cdecl, 
-    dynlib: pangolib, importc: "pango_tab_array_set_tab".}
-proc pango_tab_array_get_tab*(tab_array: PTabArray, tab_index: gint, 
-                              alignment: PTabAlign, location: Pgint){.cdecl, 
-    dynlib: pangolib, importc: "pango_tab_array_get_tab".}
-proc pango_tab_array_get_positions_in_pixels*(tab_array: PTabArray): gboolean{.
-    cdecl, dynlib: pangolib, importc: "pango_tab_array_get_positions_in_pixels".}
-proc PANGO_ASCENT*(rect: TRectangle): int32 = 
+proc tab_array_get_size*(tab_array: PTabArray): gint{.cdecl, dynlib: lib, 
+    importc: "pango_tab_array_get_size".}
+proc tab_array_resize*(tab_array: PTabArray, new_size: gint){.cdecl, 
+    dynlib: lib, importc: "pango_tab_array_resize".}
+proc tab_array_set_tab*(tab_array: PTabArray, tab_index: gint, 
+                        alignment: TTabAlign, location: gint){.cdecl, 
+    dynlib: lib, importc: "pango_tab_array_set_tab".}
+proc tab_array_get_tab*(tab_array: PTabArray, tab_index: gint, 
+                        alignment: PTabAlign, location: Pgint){.cdecl, 
+    dynlib: lib, importc: "pango_tab_array_get_tab".}
+proc tab_array_get_positions_in_pixels*(tab_array: PTabArray): gboolean{.cdecl, 
+    dynlib: lib, importc: "pango_tab_array_get_positions_in_pixels".}
+proc ASCENT*(rect: TRectangle): int32 = 
   result = - int(rect.y)
 
-proc PANGO_DESCENT*(rect: TRectangle): int32 = 
+proc DESCENT*(rect: TRectangle): int32 = 
   result = int(rect.y) + int(rect.height)
 
-proc PANGO_LBEARING*(rect: TRectangle): int32 = 
+proc LBEARING*(rect: TRectangle): int32 = 
   result = rect.x
 
-proc PANGO_RBEARING*(rect: TRectangle): int32 = 
+proc RBEARING*(rect: TRectangle): int32 = 
   result = (rect.x) + (rect.width)
 
-proc PANGO_TYPE_LANGUAGE*(): GType = 
-  result = pango_language_get_type()
+proc TYPE_LANGUAGE*(): GType = 
+  result = language_get_type()
 
-proc pango_language_to_string*(language: PLanguage): cstring = 
+proc language_to_string*(language: PLanguage): cstring = 
   result = cast[cstring](language)
 
-proc PANGO_PIXELS*(d: int): int = 
+proc PIXELS*(d: int): int = 
   if d >= 0: 
-    result = (d + (PANGO_SCALE div 2)) div PANGO_SCALE
+    result = (d + (SCALE div 2)) div SCALE
   else: 
-    result = (d - (PANGO_SCALE div 2)) div PANGO_SCALE
+    result = (d - (SCALE div 2)) div SCALE
 
-proc PANGO_TYPE_COLOR*(): GType = 
-  result = pango_color_get_type()
+proc TYPE_COLOR*(): GType = 
+  result = color_get_type()
 
-proc PANGO_TYPE_ATTR_LIST*(): GType = 
-  result = pango_attr_list_get_type()
+proc TYPE_ATTR_LIST*(): GType = 
+  result = attr_list_get_type()
 
 proc is_line_break*(a: var TLogAttr): guint = 
   result = (a.flag0 and bm_TPangoLogAttr_is_line_break) shr
@@ -1007,146 +983,134 @@ proc set_is_sentence_end*(a: var TLogAttr, `is_sentence_end`: guint) =
       (int16(`is_sentence_end` shl bp_TPangoLogAttr_is_sentence_end) and
       bm_TPangoLogAttr_is_sentence_end)
 
-proc PANGO_TYPE_CONTEXT*(): GType = 
-  result = pango_context_get_type()
+proc TYPE_CONTEXT*(): GType = 
+  result = context_get_type()
 
-proc PANGO_CONTEXT*(anObject: pointer): PContext = 
-  result = cast[PContext](G_TYPE_CHECK_INSTANCE_CAST(anObject, 
-      PANGO_TYPE_CONTEXT()))
+proc CONTEXT*(anObject: pointer): PContext = 
+  result = cast[PContext](G_TYPE_CHECK_INSTANCE_CAST(anObject, TYPE_CONTEXT()))
 
-proc PANGO_CONTEXT_CLASS*(klass: pointer): PContextClass = 
-  result = cast[PContextClass](G_TYPE_CHECK_CLASS_CAST(klass, 
-      PANGO_TYPE_CONTEXT()))
+proc CONTEXT_CLASS*(klass: pointer): PContextClass = 
+  result = cast[PContextClass](G_TYPE_CHECK_CLASS_CAST(klass, TYPE_CONTEXT()))
 
-proc PANGO_IS_CONTEXT*(anObject: pointer): bool = 
-  result = G_TYPE_CHECK_INSTANCE_TYPE(anObject, PANGO_TYPE_CONTEXT())
+proc IS_CONTEXT*(anObject: pointer): bool = 
+  result = G_TYPE_CHECK_INSTANCE_TYPE(anObject, TYPE_CONTEXT())
 
-proc PANGO_IS_CONTEXT_CLASS*(klass: pointer): bool = 
-  result = G_TYPE_CHECK_CLASS_TYPE(klass, PANGO_TYPE_CONTEXT())
+proc IS_CONTEXT_CLASS*(klass: pointer): bool = 
+  result = G_TYPE_CHECK_CLASS_TYPE(klass, TYPE_CONTEXT())
 
-proc PANGO_CONTEXT_GET_CLASS*(obj: PContext): PContextClass = 
-  result = cast[PContextClass](G_TYPE_INSTANCE_GET_CLASS(obj, 
-      PANGO_TYPE_CONTEXT()))
+proc CONTEXT_GET_CLASS*(obj: PContext): PContextClass = 
+  result = cast[PContextClass](G_TYPE_INSTANCE_GET_CLASS(obj, TYPE_CONTEXT()))
 
-proc PANGO_TYPE_FONTSET*(): GType = 
-  result = pango_fontset_get_type()
+proc TYPE_FONTSET*(): GType = 
+  result = fontset_get_type()
 
-proc PANGO_FONTSET*(anObject: pointer): PFontset = 
-  result = cast[PFontset](G_TYPE_CHECK_INSTANCE_CAST(anObject, 
-      PANGO_TYPE_FONTSET()))
+proc FONTSET*(anObject: pointer): PFontset = 
+  result = cast[PFontset](G_TYPE_CHECK_INSTANCE_CAST(anObject, TYPE_FONTSET()))
 
-proc PANGO_IS_FONTSET*(anObject: pointer): bool = 
-  result = G_TYPE_CHECK_INSTANCE_TYPE(anObject, PANGO_TYPE_FONTSET())
+proc IS_FONTSET*(anObject: pointer): bool = 
+  result = G_TYPE_CHECK_INSTANCE_TYPE(anObject, TYPE_FONTSET())
 
-proc PANGO_FONTSET_CLASS*(klass: pointer): PFontsetClass = 
-  result = cast[PFontsetClass](G_TYPE_CHECK_CLASS_CAST(klass, 
-      PANGO_TYPE_FONTSET()))
+proc FONTSET_CLASS*(klass: pointer): PFontsetClass = 
+  result = cast[PFontsetClass](G_TYPE_CHECK_CLASS_CAST(klass, TYPE_FONTSET()))
 
-proc PANGO_IS_FONTSET_CLASS*(klass: pointer): bool = 
-  result = G_TYPE_CHECK_CLASS_TYPE(klass, PANGO_TYPE_FONTSET())
+proc IS_FONTSET_CLASS*(klass: pointer): bool = 
+  result = G_TYPE_CHECK_CLASS_TYPE(klass, TYPE_FONTSET())
 
-proc PANGO_FONTSET_GET_CLASS*(obj: PFontset): PFontsetClass = 
-  result = cast[PFontsetClass](G_TYPE_INSTANCE_GET_CLASS(obj, 
-      PANGO_TYPE_FONTSET()))
+proc FONTSET_GET_CLASS*(obj: PFontset): PFontsetClass = 
+  result = cast[PFontsetClass](G_TYPE_INSTANCE_GET_CLASS(obj, TYPE_FONTSET()))
 
-proc pango_fontset_simple_get_type(): GType{.
-    importc: "pango_fontset_simple_get_type", cdecl, dynlib: pangolib.}
-proc PANGO_TYPE_FONTSET_SIMPLE*(): GType = 
-  result = pango_fontset_simple_get_type()
+proc fontset_simple_get_type(): GType{.importc: "pango_fontset_simple_get_type", 
+                                       cdecl, dynlib: lib.}
+proc TYPE_FONTSET_SIMPLE*(): GType = 
+  result = fontset_simple_get_type()
 
-proc PANGO_FONTSET_SIMPLE*(anObject: pointer): PFontsetSimple = 
+proc FONTSET_SIMPLE*(anObject: pointer): PFontsetSimple = 
   result = cast[PFontsetSimple](G_TYPE_CHECK_INSTANCE_CAST(anObject, 
-      PANGO_TYPE_FONTSET_SIMPLE()))
+      TYPE_FONTSET_SIMPLE()))
 
-proc PANGO_IS_FONTSET_SIMPLE*(anObject: pointer): bool = 
-  result = G_TYPE_CHECK_INSTANCE_TYPE(anObject, PANGO_TYPE_FONTSET_SIMPLE())
+proc IS_FONTSET_SIMPLE*(anObject: pointer): bool = 
+  result = G_TYPE_CHECK_INSTANCE_TYPE(anObject, TYPE_FONTSET_SIMPLE())
 
-proc PANGO_TYPE_FONT_DESCRIPTION*(): GType = 
-  result = pango_font_description_get_type()
+proc TYPE_FONT_DESCRIPTION*(): GType = 
+  result = font_description_get_type()
 
-proc PANGO_TYPE_FONT_METRICS*(): GType = 
-  result = pango_font_metrics_get_type()
+proc TYPE_FONT_METRICS*(): GType = 
+  result = font_metrics_get_type()
 
-proc PANGO_TYPE_FONT_FAMILY*(): GType = 
-  result = pango_font_family_get_type()
+proc TYPE_FONT_FAMILY*(): GType = 
+  result = font_family_get_type()
 
-proc PANGO_FONT_FAMILY*(anObject: pointer): PFontFamily = 
+proc FONT_FAMILY*(anObject: pointer): PFontFamily = 
   result = cast[PFontFamily](G_TYPE_CHECK_INSTANCE_CAST(anObject, 
-      PANGO_TYPE_FONT_FAMILY()))
+      TYPE_FONT_FAMILY()))
 
-proc PANGO_IS_FONT_FAMILY*(anObject: Pointer): bool = 
-  result = G_TYPE_CHECK_INSTANCE_TYPE(anObject, PANGO_TYPE_FONT_FAMILY())
+proc IS_FONT_FAMILY*(anObject: Pointer): bool = 
+  result = G_TYPE_CHECK_INSTANCE_TYPE(anObject, TYPE_FONT_FAMILY())
 
-proc PANGO_FONT_FAMILY_CLASS*(klass: Pointer): PFontFamilyClass = 
+proc FONT_FAMILY_CLASS*(klass: Pointer): PFontFamilyClass = 
   result = cast[PFontFamilyClass](G_TYPE_CHECK_CLASS_CAST(klass, 
-      PANGO_TYPE_FONT_FAMILY()))
+      TYPE_FONT_FAMILY()))
 
-proc PANGO_IS_FONT_FAMILY_CLASS*(klass: Pointer): bool = 
-  result = G_TYPE_CHECK_CLASS_TYPE(klass, PANGO_TYPE_FONT_FAMILY())
+proc IS_FONT_FAMILY_CLASS*(klass: Pointer): bool = 
+  result = G_TYPE_CHECK_CLASS_TYPE(klass, TYPE_FONT_FAMILY())
 
-proc PANGO_FONT_FAMILY_GET_CLASS*(obj: PFontFamily): PFontFamilyClass = 
+proc FONT_FAMILY_GET_CLASS*(obj: PFontFamily): PFontFamilyClass = 
   result = cast[PFontFamilyClass](G_TYPE_INSTANCE_GET_CLASS(obj, 
-      PANGO_TYPE_FONT_FAMILY()))
+      TYPE_FONT_FAMILY()))
 
-proc PANGO_TYPE_FONT_FACE*(): GType = 
-  result = pango_font_face_get_type()
+proc TYPE_FONT_FACE*(): GType = 
+  result = font_face_get_type()
 
-proc PANGO_FONT_FACE*(anObject: Pointer): PFontFace = 
-  result = cast[PFontFace](G_TYPE_CHECK_INSTANCE_CAST(anObject, 
-      PANGO_TYPE_FONT_FACE()))
+proc FONT_FACE*(anObject: Pointer): PFontFace = 
+  result = cast[PFontFace](G_TYPE_CHECK_INSTANCE_CAST(anObject, TYPE_FONT_FACE()))
 
-proc PANGO_IS_FONT_FACE*(anObject: Pointer): bool = 
-  result = G_TYPE_CHECK_INSTANCE_TYPE(anObject, PANGO_TYPE_FONT_FACE())
+proc IS_FONT_FACE*(anObject: Pointer): bool = 
+  result = G_TYPE_CHECK_INSTANCE_TYPE(anObject, TYPE_FONT_FACE())
 
-proc PANGO_FONT_FACE_CLASS*(klass: Pointer): PFontFaceClass = 
-  result = cast[PFontFaceClass](G_TYPE_CHECK_CLASS_CAST(klass, 
-      PANGO_TYPE_FONT_FACE()))
+proc FONT_FACE_CLASS*(klass: Pointer): PFontFaceClass = 
+  result = cast[PFontFaceClass](G_TYPE_CHECK_CLASS_CAST(klass, TYPE_FONT_FACE()))
 
-proc PANGO_IS_FONT_FACE_CLASS*(klass: Pointer): bool = 
-  result = G_TYPE_CHECK_CLASS_TYPE(klass, PANGO_TYPE_FONT_FACE())
+proc IS_FONT_FACE_CLASS*(klass: Pointer): bool = 
+  result = G_TYPE_CHECK_CLASS_TYPE(klass, TYPE_FONT_FACE())
 
-proc PANGO_FONT_FACE_GET_CLASS*(obj: Pointer): PFontFaceClass = 
-  result = cast[PFontFaceClass](G_TYPE_INSTANCE_GET_CLASS(obj, 
-      PANGO_TYPE_FONT_FACE()))
+proc FONT_FACE_GET_CLASS*(obj: Pointer): PFontFaceClass = 
+  result = cast[PFontFaceClass](G_TYPE_INSTANCE_GET_CLASS(obj, TYPE_FONT_FACE()))
 
-proc PANGO_TYPE_FONT*(): GType = 
-  result = pango_font_get_type()
+proc TYPE_FONT*(): GType = 
+  result = font_get_type()
 
-proc PANGO_FONT*(anObject: Pointer): PFont = 
-  result = cast[PFont](G_TYPE_CHECK_INSTANCE_CAST(anObject, PANGO_TYPE_FONT()))
+proc FONT*(anObject: Pointer): PFont = 
+  result = cast[PFont](G_TYPE_CHECK_INSTANCE_CAST(anObject, TYPE_FONT()))
 
-proc PANGO_IS_FONT*(anObject: Pointer): bool = 
-  result = G_TYPE_CHECK_INSTANCE_TYPE(anObject, PANGO_TYPE_FONT())
+proc IS_FONT*(anObject: Pointer): bool = 
+  result = G_TYPE_CHECK_INSTANCE_TYPE(anObject, TYPE_FONT())
 
-proc PANGO_FONT_CLASS*(klass: Pointer): PFontClass = 
-  result = cast[PFontClass](G_TYPE_CHECK_CLASS_CAST(klass, PANGO_TYPE_FONT()))
+proc FONT_CLASS*(klass: Pointer): PFontClass = 
+  result = cast[PFontClass](G_TYPE_CHECK_CLASS_CAST(klass, TYPE_FONT()))
 
-proc PANGO_IS_FONT_CLASS*(klass: Pointer): bool = 
-  result = G_TYPE_CHECK_CLASS_TYPE(klass, PANGO_TYPE_FONT())
+proc IS_FONT_CLASS*(klass: Pointer): bool = 
+  result = G_TYPE_CHECK_CLASS_TYPE(klass, TYPE_FONT())
 
-proc PANGO_FONT_GET_CLASS*(obj: PFont): PFontClass = 
-  result = cast[PFontClass](G_TYPE_INSTANCE_GET_CLASS(obj, PANGO_TYPE_FONT()))
+proc FONT_GET_CLASS*(obj: PFont): PFontClass = 
+  result = cast[PFontClass](G_TYPE_INSTANCE_GET_CLASS(obj, TYPE_FONT()))
 
-proc PANGO_TYPE_FONT_MAP*(): GType = 
-  result = pango_font_map_get_type()
+proc TYPE_FONT_MAP*(): GType = 
+  result = font_map_get_type()
 
-proc PANGO_FONT_MAP*(anObject: pointer): PFontmap = 
-  result = cast[PFontmap](G_TYPE_CHECK_INSTANCE_CAST(anObject, 
-      PANGO_TYPE_FONT_MAP()))
+proc FONT_MAP*(anObject: pointer): PFontmap = 
+  result = cast[PFontmap](G_TYPE_CHECK_INSTANCE_CAST(anObject, TYPE_FONT_MAP()))
 
-proc PANGO_IS_FONT_MAP*(anObject: pointer): bool = 
-  result = G_TYPE_CHECK_INSTANCE_TYPE(anObject, PANGO_TYPE_FONT_MAP())
+proc IS_FONT_MAP*(anObject: pointer): bool = 
+  result = G_TYPE_CHECK_INSTANCE_TYPE(anObject, TYPE_FONT_MAP())
 
-proc PANGO_FONT_MAP_CLASS*(klass: pointer): PFontMapClass = 
-  result = cast[PFontMapClass](G_TYPE_CHECK_CLASS_CAST(klass, 
-      PANGO_TYPE_FONT_MAP()))
+proc FONT_MAP_CLASS*(klass: pointer): PFontMapClass = 
+  result = cast[PFontMapClass](G_TYPE_CHECK_CLASS_CAST(klass, TYPE_FONT_MAP()))
 
-proc PANGO_IS_FONT_MAP_CLASS*(klass: pointer): bool = 
-  result = G_TYPE_CHECK_CLASS_TYPE(klass, PANGO_TYPE_FONT_MAP())
+proc IS_FONT_MAP_CLASS*(klass: pointer): bool = 
+  result = G_TYPE_CHECK_CLASS_TYPE(klass, TYPE_FONT_MAP())
 
-proc PANGO_FONT_MAP_GET_CLASS*(obj: PFontMap): PFontMapClass = 
-  result = cast[PFontMapClass](G_TYPE_INSTANCE_GET_CLASS(obj, 
-      PANGO_TYPE_FONT_MAP()))
+proc FONT_MAP_GET_CLASS*(obj: PFontMap): PFontMapClass = 
+  result = cast[PFontMapClass](G_TYPE_INSTANCE_GET_CLASS(obj, TYPE_FONT_MAP()))
 
 proc is_cluster_start*(a: var TGlyphVisAttr): guint = 
   result = (a.flag0 and bm_TPangoGlyphVisAttr_is_cluster_start) shr
@@ -1157,27 +1121,26 @@ proc set_is_cluster_start*(a: var TGlyphVisAttr, `is_cluster_start`: guint) =
       (int16(`is_cluster_start` shl bp_TPangoGlyphVisAttr_is_cluster_start) and
       bm_TPangoGlyphVisAttr_is_cluster_start)
 
-proc PANGO_TYPE_GLYPH_STRING*(): GType = 
-  result = pango_glyph_string_get_type()
+proc TYPE_GLYPH_STRING*(): GType = 
+  result = glyph_string_get_type()
 
-proc PANGO_TYPE_LAYOUT*(): GType = 
-  result = pango_layout_get_type()
+proc TYPE_LAYOUT*(): GType = 
+  result = layout_get_type()
 
-proc PANGO_LAYOUT*(anObject: pointer): PLayout = 
-  result = cast[PLayout](G_TYPE_CHECK_INSTANCE_CAST(anObject, 
-      PANGO_TYPE_LAYOUT()))
+proc LAYOUT*(anObject: pointer): PLayout = 
+  result = cast[PLayout](G_TYPE_CHECK_INSTANCE_CAST(anObject, TYPE_LAYOUT()))
 
-proc PANGO_LAYOUT_CLASS*(klass: pointer): PLayoutClass = 
-  result = cast[PLayoutClass](G_TYPE_CHECK_CLASS_CAST(klass, PANGO_TYPE_LAYOUT()))
+proc LAYOUT_CLASS*(klass: pointer): PLayoutClass = 
+  result = cast[PLayoutClass](G_TYPE_CHECK_CLASS_CAST(klass, TYPE_LAYOUT()))
 
-proc PANGO_IS_LAYOUT*(anObject: pointer): bool = 
-  result = G_TYPE_CHECK_INSTANCE_TYPE(anObject, PANGO_TYPE_LAYOUT())
+proc IS_LAYOUT*(anObject: pointer): bool = 
+  result = G_TYPE_CHECK_INSTANCE_TYPE(anObject, TYPE_LAYOUT())
 
-proc PANGO_IS_LAYOUT_CLASS*(klass: pointer): bool = 
-  result = G_TYPE_CHECK_CLASS_TYPE(klass, PANGO_TYPE_LAYOUT())
+proc IS_LAYOUT_CLASS*(klass: pointer): bool = 
+  result = G_TYPE_CHECK_CLASS_TYPE(klass, TYPE_LAYOUT())
 
-proc PANGO_LAYOUT_GET_CLASS*(obj: PLayout): PLayoutClass = 
-  result = cast[PLayoutClass](G_TYPE_INSTANCE_GET_CLASS(obj, PANGO_TYPE_LAYOUT()))
+proc LAYOUT_GET_CLASS*(obj: PLayout): PLayoutClass = 
+  result = cast[PLayoutClass](G_TYPE_INSTANCE_GET_CLASS(obj, TYPE_LAYOUT()))
 
-proc PANGO_TYPE_TAB_ARRAY*(): GType = 
-  result = pango_tab_array_get_type()
+proc TYPE_TAB_ARRAY*(): GType = 
+  result = tab_array_get_type()
diff --git a/lib/newwrap/gtk/pangoutils.nim b/lib/newwrap/gtk/pangoutils.nim
index 552362b9a..e1574a908 100644..100755
--- a/lib/newwrap/gtk/pangoutils.nim
+++ b/lib/newwrap/gtk/pangoutils.nim
@@ -2,44 +2,41 @@
 import 
   glib2, pango
 
-type 
-  pint32* = ptr int32
-
-proc pango_split_file_list*(str: cstring): PPchar{.cdecl, dynlib: pangolib, 
+proc split_file_list*(str: cstring): PPchar{.cdecl, dynlib: lib, 
     importc: "pango_split_file_list".}
-proc pango_trim_string*(str: cstring): cstring{.cdecl, dynlib: pangolib, 
+proc trim_string*(str: cstring): cstring{.cdecl, dynlib: lib, 
     importc: "pango_trim_string".}
-proc pango_read_line*(stream: TFile, str: PGString): gint{.cdecl, 
-    dynlib: pangolib, importc: "pango_read_line".}
-proc pango_skip_space*(pos: PPchar): gboolean{.cdecl, dynlib: pangolib, 
+proc read_line*(stream: TFile, str: PGString): gint{.cdecl, dynlib: lib, 
+    importc: "pango_read_line".}
+proc skip_space*(pos: PPchar): gboolean{.cdecl, dynlib: lib, 
     importc: "pango_skip_space".}
-proc pango_scan_word*(pos: PPchar, OutStr: PGString): gboolean{.cdecl, 
-    dynlib: pangolib, importc: "pango_scan_word".}
-proc pango_scan_string*(pos: PPchar, OutStr: PGString): gboolean{.cdecl, 
-    dynlib: pangolib, importc: "pango_scan_string".}
-proc pango_scan_int*(pos: PPchar, OutInt: pint32): gboolean{.cdecl, 
-    dynlib: pangolib, importc: "pango_scan_int".}
-proc pango_config_key_get(key: cstring): cstring{.cdecl, dynlib: pangolib, 
+proc scan_word*(pos: PPchar, OutStr: PGString): gboolean{.cdecl, dynlib: lib, 
+    importc: "pango_scan_word".}
+proc scan_string*(pos: PPchar, OutStr: PGString): gboolean{.cdecl, dynlib: lib, 
+    importc: "pango_scan_string".}
+proc scan_int*(pos: PPchar, OutInt: ptr int32): gboolean{.cdecl, dynlib: lib, 
+    importc: "pango_scan_int".}
+proc config_key_get*(key: cstring): cstring{.cdecl, dynlib: lib, 
     importc: "pango_config_key_get".}
-proc pango_lookup_aliases(fontname: cstring, families: PPPchar, 
-                          n_families: pint32){.cdecl, dynlib: pangolib, 
-    importc: "pango_lookup_aliases".}
-proc pango_parse_style*(str: cstring, style: PStyle, warn: gboolean): gboolean{.
-    cdecl, dynlib: pangolib, importc: "pango_parse_style".}
-proc pango_parse_variant*(str: cstring, variant: PVariant, warn: gboolean): gboolean{.
-    cdecl, dynlib: pangolib, importc: "pango_parse_variant".}
-proc pango_parse_weight*(str: cstring, weight: PWeight, warn: gboolean): gboolean{.
-    cdecl, dynlib: pangolib, importc: "pango_parse_weight".}
-proc pango_parse_stretch*(str: cstring, stretch: PStretch, warn: gboolean): gboolean{.
-    cdecl, dynlib: pangolib, importc: "pango_parse_stretch".}
-proc pango_get_sysconf_subdirectory(): cstring{.cdecl, dynlib: pangolib, 
+proc lookup_aliases*(fontname: cstring, families: PPPchar, n_families: ptr int32){.
+    cdecl, dynlib: lib, importc: "pango_lookup_aliases".}
+proc parse_style*(str: cstring, style: PStyle, warn: gboolean): gboolean{.cdecl, 
+    dynlib: lib, importc: "pango_parse_style".}
+proc parse_variant*(str: cstring, variant: PVariant, warn: gboolean): gboolean{.
+    cdecl, dynlib: lib, importc: "pango_parse_variant".}
+proc parse_weight*(str: cstring, weight: PWeight, warn: gboolean): gboolean{.
+    cdecl, dynlib: lib, importc: "pango_parse_weight".}
+proc parse_stretch*(str: cstring, stretch: PStretch, warn: gboolean): gboolean{.
+    cdecl, dynlib: lib, importc: "pango_parse_stretch".}
+proc get_sysconf_subdirectory*(): cstring{.cdecl, dynlib: lib, 
     importc: "pango_get_sysconf_subdirectory".}
-proc pango_get_lib_subdirectory(): cstring{.cdecl, dynlib: pangolib, 
-    importc: "pango_get_lib_subdirectory".}
-proc pango_log2vis_get_embedding_levels*(str: Pgunichar, len: int32, 
-    pbase_dir: PDirection, embedding_level_list: Pguint8): gboolean{.cdecl, 
-    dynlib: pangolib, importc: "pango_log2vis_get_embedding_levels".}
-proc pango_get_mirror_char*(ch: gunichar, mirrored_ch: Pgunichar): gboolean{.
-    cdecl, dynlib: pangolib, importc: "pango_get_mirror_char".}
-proc pango_language_get_sample_string*(language: PLanguage): cstring{.cdecl, 
-    dynlib: pangolib, importc: "pango_language_get_sample_string".}
\ No newline at end of file
+proc get_lib_subdirectory*(): cstring{.cdecl, dynlib: lib, 
+                                      importc: "pango_get_lib_subdirectory".}
+proc log2vis_get_embedding_levels*(str: Pgunichar, len: int32, 
+                                   pbase_dir: PDirection, 
+                                   embedding_level_list: Pguint8): gboolean{.
+    cdecl, dynlib: lib, importc: "pango_log2vis_get_embedding_levels".}
+proc get_mirror_char*(ch: gunichar, mirrored_ch: Pgunichar): gboolean{.cdecl, 
+    dynlib: lib, importc: "pango_get_mirror_char".}
+proc language_get_sample_string*(language: PLanguage): cstring{.cdecl, 
+    dynlib: lib, importc: "pango_language_get_sample_string".}
diff --git a/lib/newwrap/libcurl.nim b/lib/newwrap/libcurl.nim
index 875f1cbc8..875f1cbc8 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 a5d2189a2..a5d2189a2 100644..100755
--- 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 100644..100755
--- a/lib/newwrap/tcl.nim
+++ b/lib/newwrap/tcl.nim
diff --git a/lib/nimbase.h b/lib/nimbase.h
index dc0ac6e0f..dc0ac6e0f 100644..100755
--- a/lib/nimbase.h
+++ b/lib/nimbase.h
diff --git a/lib/posix/posix.nim b/lib/posix/posix.nim
index 6bda372bb..6bda372bb 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- a/lib/pure/cgi.nim
+++ b/lib/pure/cgi.nim
diff --git a/lib/pure/colors.nim b/lib/pure/colors.nim
index 548f07381..548f07381 100644..100755
--- a/lib/pure/colors.nim
+++ b/lib/pure/colors.nim
diff --git a/lib/pure/complex.nim b/lib/pure/complex.nim
index f50ff4bd0..f50ff4bd0 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- a/lib/pure/hashtabs.nim
+++ b/lib/pure/hashtabs.nim
diff --git a/lib/pure/htmlparser.nim b/lib/pure/htmlparser.nim
index 278bf9b90..278bf9b90 100644..100755
--- a/lib/pure/htmlparser.nim
+++ b/lib/pure/htmlparser.nim
diff --git a/lib/pure/httpclient.nim b/lib/pure/httpclient.nim
index 0f9054873..0f9054873 100644..100755
--- a/lib/pure/httpclient.nim
+++ b/lib/pure/httpclient.nim
diff --git a/lib/pure/httpserver.nim b/lib/pure/httpserver.nim
index 2c85d8137..2c85d8137 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- a/lib/pure/md5.nim
+++ b/lib/pure/md5.nim
diff --git a/lib/pure/os.nim b/lib/pure/os.nim
index 4bb25098d..4bb25098d 100644..100755
--- a/lib/pure/os.nim
+++ b/lib/pure/os.nim
diff --git a/lib/pure/osproc.nim b/lib/pure/osproc.nim
index bbdea1eee..bbdea1eee 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- a/lib/pure/parseurl.nim
+++ b/lib/pure/parseurl.nim
diff --git a/lib/pure/parseutils.nim b/lib/pure/parseutils.nim
index 0f107793c..0f107793c 100644..100755
--- a/lib/pure/parseutils.nim
+++ b/lib/pure/parseutils.nim
diff --git a/lib/pure/parsexml.nim b/lib/pure/parsexml.nim
index 598ae6c68..598ae6c68 100644..100755
--- a/lib/pure/parsexml.nim
+++ b/lib/pure/parsexml.nim
diff --git a/lib/pure/pegs.nim b/lib/pure/pegs.nim
index 5ba0351ad..4f55a1883 100644..100755
--- a/lib/pure/pegs.nim
+++ b/lib/pure/pegs.nim
@@ -26,6 +26,8 @@ when useUnicode:
 
 const
   InlineThreshold = 5   ## number of leaves; -1 to disable inlining
+  MaxSubpatterns* = 10 ## defines the maximum number of subpatterns that
+                       ## can be captured. More subpatterns cannot be captured! 
 
 type
   TPegKind = enum
@@ -50,17 +52,20 @@ type
     pkAndPredicate,     ## &a     --> Internal DSL: &a
     pkNotPredicate,     ## !a     --> Internal DSL: !a
     pkCapture,          ## {a}    --> Internal DSL: capture(a)
+    pkBackRef,          ## $i     --> Internal DSL: backref(i)
+    pkBackRefIgnoreCase,
+    pkBackRefIgnoreStyle,
     pkSearch,           ## @a     --> Internal DSL: @a
     pkRule,             ## a <- b
     pkList              ## a, b
   TNonTerminalFlag = enum
     ntDeclared, ntUsed
   TNonTerminal {.final.} = object ## represents a non terminal symbol
-    name: string        ## the name of the symbol
-    line: int           ## the line the symbol has been declared/used in
-    col: int            ## the column the symbol has been declared/used in
-    flags: set[TNonTerminalFlag] ## the nonterminal's flags
-    rule: TNode         ## the rule that the symbol refers to
+    name: string                  ## the name of the symbol
+    line: int                     ## line the symbol has been declared/used in
+    col: int                      ## column the symbol has been declared/used in
+    flags: set[TNonTerminalFlag]  ## the nonterminal's flags
+    rule: TNode                   ## the rule that the symbol refers to
   TNode {.final.} = object
     case kind: TPegKind
     of pkEmpty, pkAny, pkAnyRune, pkGreedyAny, pkNewLine: nil
@@ -68,6 +73,7 @@ type
     of pkChar, pkGreedyRepChar: ch: char
     of pkCharChoice, pkGreedyRepSet: charChoice: ref set[char]
     of pkNonTerminal: nt: PNonTerminal
+    of pkBackRef..pkBackRefIgnoreStyle: index: range[1..MaxSubpatterns]
     else: sons: seq[TNode]
   PNonTerminal* = ref TNonTerminal
   
@@ -224,6 +230,24 @@ proc capture*(a: TPeg): TPeg =
   result.kind = pkCapture
   result.sons = @[a]
 
+proc backref*(index: range[1..MaxSubPatterns]): TPeg = 
+  ## constructs a back reference of the given `index`. `index` starts counting
+  ## from 1.
+  result.kind = pkBackRef
+  result.index = index-1
+
+proc backrefIgnoreCase*(index: range[1..MaxSubPatterns]): TPeg = 
+  ## constructs a back reference of the given `index`. `index` starts counting
+  ## from 1. Ignores case for matching.
+  result.kind = pkBackRefIgnoreCase
+  result.index = index-1
+
+proc backrefIgnoreStyle*(index: range[1..MaxSubPatterns]): TPeg = 
+  ## constructs a back reference of the given `index`. `index` starts counting
+  ## from 1. Ignores style for matching.
+  result.kind = pkBackRefIgnoreStyle
+  result.index = index-1
+
 proc spaceCost(n: TPeg): int =
   case n.kind
   of pkEmpty: nil
@@ -285,10 +309,6 @@ template natural*: expr =
   ## same as ``\d+``
   +digits
 
-const
-  MaxSubpatterns* = 10 ## defines the maximum number of subpatterns that
-                       ## can be captured. More subpatterns cannot be captured! 
-
 # ------------------------- debugging -----------------------------------------
 
 proc esc(c: char, reserved = {'\0'..'\255'}): string = 
@@ -394,6 +414,15 @@ proc toStrAux(r: TPeg, res: var string) =
     add(res, '{')
     toStrAux(r.sons[0], res)    
     add(res, '}')
+  of pkBackRef: 
+    add(res, '$')
+    add(res, $r.index)
+  of pkBackRefIgnoreCase: 
+    add(res, "i$")
+    add(res, $r.index)
+  of pkBackRefIgnoreStyle: 
+    add(res, "y$")
+    add(res, $r.index)
   of pkRule:
     toStrAux(r.sons[0], res)    
     add(res, " <- ")
@@ -559,6 +588,18 @@ proc m(s: string, p: TPeg, start: int, c: var TMatchClosure): int =
       #else: silently ignore the capture
     else:
       c.ml = idx
+  of pkBackRef: 
+    if p.index >= c.ml: return -1
+    var (a, b) = c.matches[p.index]
+    result = m(s, term(s.copy(a, b)), start, c)
+  of pkBackRefIgnoreCase:
+    if p.index >= c.ml: return -1
+    var (a, b) = c.matches[p.index]
+    result = m(s, termIgnoreCase(s.copy(a, b)), start, c)
+  of pkBackRefIgnoreStyle:
+    if p.index >= c.ml: return -1
+    var (a, b) = c.matches[p.index]
+    result = m(s, termIgnoreStyle(s.copy(a, b)), start, c)
   of pkRule, pkList: assert false
 
 proc match*(s: string, pattern: TPeg, matches: var openarray[string],
@@ -784,13 +825,15 @@ type
     tkOption,           ## '?'
     tkAt,               ## '@'
     tkBuiltin,          ## \identifier
-    tkEscaped           ## \\
+    tkEscaped,          ## \\
+    tkDollar            ## '$'
   
   TToken {.final.} = object  ## a token
     kind: TTokKind           ## the type of the token
     modifier: TModifier
     literal: string          ## the parsed (string) literal
     charset: set[char]       ## if kind == tkCharSet
+    index: int               ## if kind == tkDollar
   
   TPegLexer = object          ## the lexer object.
     bufpos: int               ## the current position within the buffer
@@ -804,7 +847,7 @@ const
   tokKindToStr: array[TTokKind, string] = [
     "invalid", "[EOF]", ".", "_", "identifier", "string literal",
     "character set", "(", ")", "{", "}", "<-", "/", "*", "+", "&", "!", "?",
-    "@", "built-in", "escaped"
+    "@", "built-in", "escaped", "$"
   ]
 
 proc HandleCR(L: var TPegLexer, pos: int): int =
@@ -945,6 +988,19 @@ proc getString(c: var TPegLexer, tok: var TToken) =
       Inc(pos)
   c.bufpos = pos
   
+proc getDollar(c: var TPegLexer, tok: var TToken) = 
+  var pos = c.bufPos + 1
+  var buf = c.buf
+  if buf[pos] in {'0'..'9'}:
+    tok.kind = tkDollar
+    tok.index = 0
+    while buf[pos] in {'0'..'9'}:
+      tok.index = tok.index * 10 + ord(buf[pos]) - ord('0')
+      inc(pos)
+  else:
+    tok.kind = tkInvalid
+  c.bufpos = pos
+  
 proc getCharSet(c: var TPegLexer, tok: var TToken) = 
   tok.kind = tkCharSet
   tok.charset = {}
@@ -1050,19 +1106,23 @@ proc getTok(c: var TPegLexer, tok: var TToken) =
   of '\\': 
     getBuiltin(c, tok)
   of '\'', '"': getString(c, tok)
+  of '$': getDollar(c, tok)
   of '\0': 
     tok.kind = tkEof
     tok.literal = "[EOF]"
   of 'a'..'z', 'A'..'Z', '\128'..'\255':
     getSymbol(c, tok)
-    if c.buf[c.bufpos] in {'\'', '"'}:
+    if c.buf[c.bufpos] in {'\'', '"', '$'}:
       case tok.literal
       of "i": tok.modifier = modIgnoreCase
       of "y": tok.modifier = modIgnoreStyle
       of "v": tok.modifier = modVerbatim
       else: nil
       setLen(tok.literal, 0)
-      getString(c, tok)
+      if c.buf[c.bufpos] == '$':
+        getDollar(c, tok)
+      else:
+        getString(c, tok)
       if tok.modifier == modNone: tok.kind = tkInvalid
   of '+':
     tok.kind = tkPlus
@@ -1117,8 +1177,7 @@ type
     tok: TToken
     nonterms: seq[PNonTerminal]
     modifier: TModifier
-
-proc getTok(p: var TPegParser) = getTok(p, p.tok)
+    captures: int
 
 proc pegError(p: TPegParser, msg: string, line = -1, col = -1) =
   var e: ref EInvalidPeg
@@ -1126,6 +1185,10 @@ proc pegError(p: TPegParser, msg: string, line = -1, col = -1) =
   e.msg = errorStr(p, msg, line, col)
   raise e
 
+proc getTok(p: var TPegParser) = 
+  getTok(p, p.tok)
+  if p.tok.kind == tkInvalid: pegError(p, "invalid token")
+
 proc eat(p: var TPegParser, kind: TTokKind) =
   if p.tok.kind == kind: getTok(p)
   else: pegError(p, tokKindToStr[kind] & " expected")
@@ -1146,6 +1209,12 @@ proc modifiedTerm(s: string, m: TModifier): TPeg =
   of modIgnoreCase: result = termIgnoreCase(s)
   of modIgnoreStyle: result = termIgnoreStyle(s)
 
+proc modifiedBackref(s: int, m: TModifier): TPeg =
+  case m
+  of modNone, modVerbatim: result = backRef(s)
+  of modIgnoreCase: result = backRefIgnoreCase(s)
+  of modIgnoreStyle: result = backRefIgnoreStyle(s)
+
 proc primary(p: var TPegParser): TPeg =
   case p.tok.kind
   of tkAmp:
@@ -1185,6 +1254,7 @@ proc primary(p: var TPegParser): TPeg =
     getTok(p)
     result = capture(parseExpr(p))
     eat(p, tkCurlyRi)
+    inc(p.captures)
   of tkAny:
     result = any()
     getTok(p)
@@ -1206,6 +1276,13 @@ proc primary(p: var TPegParser): TPeg =
   of tkEscaped:
     result = term(p.tok.literal[0])
     getTok(p)
+  of tkDollar:
+    var m = p.tok.modifier
+    if m == modNone: m = p.modifier
+    result = modifiedBackRef(p.tok.index, m)
+    if p.tok.index < 0 or p.tok.index > p.captures: 
+      pegError(p, "invalid back reference index: " & $p.tok.index)
+    getTok(p)
   else:
     pegError(p, "expression expected, but found: " & p.tok.literal)
     getTok(p) # we must consume a token here to prevent endless loops!
@@ -1227,7 +1304,7 @@ proc seqExpr(p: var TPegParser): TPeg =
   while true:
     case p.tok.kind
     of tkAmp, tkNot, tkAt, tkStringLit, tkCharset, tkParLe, tkCurlyLe,
-       tkAny, tkAnyRune, tkBuiltin, tkEscaped:
+       tkAny, tkAnyRune, tkBuiltin, tkEscaped, tkDollar:
       result = sequence(result, primary(p))
     of tkIdentifier:
       if not arrowIsNextTok(p):
diff --git a/lib/pure/re.nim b/lib/pure/re.nim
index 953f9c744..953f9c744 100644..100755
--- 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 100644..100755
--- a/lib/pure/regexprs.nim
+++ b/lib/pure/regexprs.nim
diff --git a/lib/pure/ropes.nim b/lib/pure/ropes.nim
index df85baf92..df85baf92 100644..100755
--- a/lib/pure/ropes.nim
+++ b/lib/pure/ropes.nim
diff --git a/lib/pure/sockets.nim b/lib/pure/sockets.nim
index 85628db78..85628db78 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- a/lib/pure/strtabs.nim
+++ b/lib/pure/strtabs.nim
diff --git a/lib/pure/strutils.nim b/lib/pure/strutils.nim
index 724d00ee9..724d00ee9 100644..100755
--- a/lib/pure/strutils.nim
+++ b/lib/pure/strutils.nim
diff --git a/lib/pure/terminal.nim b/lib/pure/terminal.nim
index 42bd80cb4..42bd80cb4 100644..100755
--- a/lib/pure/terminal.nim
+++ b/lib/pure/terminal.nim
diff --git a/lib/pure/times.nim b/lib/pure/times.nim
index 70cb038a7..70cb038a7 100644..100755
--- a/lib/pure/times.nim
+++ b/lib/pure/times.nim
diff --git a/lib/pure/unicode.nim b/lib/pure/unicode.nim
index 099509afe..099509afe 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 0b4f078e7..0b4f078e7 100644..100755
--- a/lib/pure/variants.nim
+++ b/lib/pure/variants.nim
diff --git a/lib/pure/xmldom.nim b/lib/pure/xmldom.nim
index babf60108..babf60108 100644..100755
--- a/lib/pure/xmldom.nim
+++ b/lib/pure/xmldom.nim
diff --git a/lib/pure/xmldomparser.nim b/lib/pure/xmldomparser.nim
index f338ca2e5..f338ca2e5 100644..100755
--- a/lib/pure/xmldomparser.nim
+++ b/lib/pure/xmldomparser.nim
diff --git a/lib/pure/xmlgen.nim b/lib/pure/xmlgen.nim
index 29f2700f2..29f2700f2 100644..100755
--- a/lib/pure/xmlgen.nim
+++ b/lib/pure/xmlgen.nim
diff --git a/lib/pure/xmlparser.nim b/lib/pure/xmlparser.nim
index 635497fa8..635497fa8 100644..100755
--- a/lib/pure/xmlparser.nim
+++ b/lib/pure/xmlparser.nim
diff --git a/lib/pure/xmltree.nim b/lib/pure/xmltree.nim
index 7b77fe156..7b77fe156 100644..100755
--- a/lib/pure/xmltree.nim
+++ b/lib/pure/xmltree.nim
diff --git a/lib/pure/yamllexer.nim b/lib/pure/yamllexer.nim
index 4640179c1..4640179c1 100644..100755
--- a/lib/pure/yamllexer.nim
+++ b/lib/pure/yamllexer.nim
diff --git a/lib/system.nim b/lib/system.nim
index ae9d6b432..ae9d6b432 100644..100755
--- a/lib/system.nim
+++ b/lib/system.nim
diff --git a/lib/system/alloc.nim b/lib/system/alloc.nim
index 95feff854..95feff854 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- a/lib/ucmaps/cp932.txt
+++ b/lib/ucmaps/cp932.txt
diff --git a/lib/windows/mmsystem.nim b/lib/windows/mmsystem.nim
index c7dd5b1be..c7dd5b1be 100644..100755
--- a/lib/windows/mmsystem.nim
+++ b/lib/windows/mmsystem.nim
diff --git a/lib/windows/nb30.nim b/lib/windows/nb30.nim
index 527e3a9e2..527e3a9e2 100644..100755
--- a/lib/windows/nb30.nim
+++ b/lib/windows/nb30.nim
diff --git a/lib/windows/ole2.nim b/lib/windows/ole2.nim
index ec0ab8f5d..ec0ab8f5d 100644..100755
--- a/lib/windows/ole2.nim
+++ b/lib/windows/ole2.nim
diff --git a/lib/windows/shellapi.nim b/lib/windows/shellapi.nim
index c6d2d69a1..c6d2d69a1 100644..100755
--- a/lib/windows/shellapi.nim
+++ b/lib/windows/shellapi.nim
diff --git a/lib/windows/shfolder.nim b/lib/windows/shfolder.nim
index 253b1c77a..253b1c77a 100644..100755
--- a/lib/windows/shfolder.nim
+++ b/lib/windows/shfolder.nim
diff --git a/lib/windows/windows.nim b/lib/windows/windows.nim
index 20f9a9d7d..20f9a9d7d 100644..100755
--- a/lib/windows/windows.nim
+++ b/lib/windows/windows.nim
diff --git a/lib/windows/winlean.nim b/lib/windows/winlean.nim
index 10915272f..10915272f 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 7dd33f296..7dd33f296 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- 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 100644..100755
--- a/lib/wrappers/zip/zzip.nim
+++ b/lib/wrappers/zip/zzip.nim
diff --git a/llvm/llvm.h b/llvm/llvm.h
index a873b44eb..a873b44eb 100644..100755
--- a/llvm/llvm.h
+++ b/llvm/llvm.h
diff --git a/llvm/llvm.nim b/llvm/llvm.nim
index d010457f8..d010457f8 100644..100755
--- a/llvm/llvm.nim
+++ b/llvm/llvm.nim
diff --git a/llvm/llvm.pas b/llvm/llvm.pas
index ad1398b83..ad1398b83 100644..100755
--- a/llvm/llvm.pas
+++ b/llvm/llvm.pas
diff --git a/llvm/llvm_orig.nim b/llvm/llvm_orig.nim
index 8e09f9c68..8e09f9c68 100644..100755
--- a/llvm/llvm_orig.nim
+++ b/llvm/llvm_orig.nim
diff --git a/nim/ast.pas b/nim/ast.pas
index 0079d755c..0079d755c 100644..100755
--- a/nim/ast.pas
+++ b/nim/ast.pas
diff --git a/nim/astalgo.pas b/nim/astalgo.pas
index 7c1f3ec0b..7c1f3ec0b 100644..100755
--- a/nim/astalgo.pas
+++ b/nim/astalgo.pas
diff --git a/nim/bitsets.pas b/nim/bitsets.pas
index 78c6d1f36..78c6d1f36 100644..100755
--- a/nim/bitsets.pas
+++ b/nim/bitsets.pas
diff --git a/nim/ccgexprs.pas b/nim/ccgexprs.pas
index a5789487a..a5789487a 100644..100755
--- a/nim/ccgexprs.pas
+++ b/nim/ccgexprs.pas
diff --git a/nim/ccgstmts.pas b/nim/ccgstmts.pas
index d31f0e5bd..d31f0e5bd 100644..100755
--- a/nim/ccgstmts.pas
+++ b/nim/ccgstmts.pas
diff --git a/nim/ccgtypes.pas b/nim/ccgtypes.pas
index 1c07fe5c7..1c07fe5c7 100644..100755
--- a/nim/ccgtypes.pas
+++ b/nim/ccgtypes.pas
diff --git a/nim/ccgutils.pas b/nim/ccgutils.pas
index da6b8774f..da6b8774f 100644..100755
--- a/nim/ccgutils.pas
+++ b/nim/ccgutils.pas
diff --git a/nim/cgen.pas b/nim/cgen.pas
index 83c34241a..83c34241a 100644..100755
--- a/nim/cgen.pas
+++ b/nim/cgen.pas
diff --git a/nim/cgmeth.pas b/nim/cgmeth.pas
index 6b9335c4c..6b9335c4c 100644..100755
--- a/nim/cgmeth.pas
+++ b/nim/cgmeth.pas
diff --git a/nim/charsets.pas b/nim/charsets.pas
index a5f14450f..a5f14450f 100644..100755
--- a/nim/charsets.pas
+++ b/nim/charsets.pas
diff --git a/nim/commands.pas b/nim/commands.pas
index 19f79fb4a..19f79fb4a 100644..100755
--- a/nim/commands.pas
+++ b/nim/commands.pas
diff --git a/nim/condsyms.pas b/nim/condsyms.pas
index d22bc0e18..d22bc0e18 100644..100755
--- a/nim/condsyms.pas
+++ b/nim/condsyms.pas
diff --git a/nim/config.inc b/nim/config.inc
index f73444a71..f73444a71 100644..100755
--- a/nim/config.inc
+++ b/nim/config.inc
diff --git a/nim/crc.pas b/nim/crc.pas
index e14716605..e14716605 100644..100755
--- a/nim/crc.pas
+++ b/nim/crc.pas
diff --git a/nim/depends.pas b/nim/depends.pas
index 6711875fe..6711875fe 100644..100755
--- a/nim/depends.pas
+++ b/nim/depends.pas
diff --git a/nim/docgen.pas b/nim/docgen.pas
index 468dd1bc9..468dd1bc9 100644..100755
--- a/nim/docgen.pas
+++ b/nim/docgen.pas
diff --git a/nim/ecmasgen.pas b/nim/ecmasgen.pas
index 59cb3c330..59cb3c330 100644..100755
--- a/nim/ecmasgen.pas
+++ b/nim/ecmasgen.pas
diff --git a/nim/evals.pas b/nim/evals.pas
index b7edc43ed..b7edc43ed 100644..100755
--- a/nim/evals.pas
+++ b/nim/evals.pas
diff --git a/nim/extccomp.pas b/nim/extccomp.pas
index 7df3e8748..7df3e8748 100644..100755
--- a/nim/extccomp.pas
+++ b/nim/extccomp.pas
diff --git a/nim/filters.pas b/nim/filters.pas
index 95f628fe2..95f628fe2 100644..100755
--- a/nim/filters.pas
+++ b/nim/filters.pas
diff --git a/nim/hashtest.pas b/nim/hashtest.pas
index 7e93ca5bf..7e93ca5bf 100644..100755
--- a/nim/hashtest.pas
+++ b/nim/hashtest.pas
diff --git a/nim/highlite.pas b/nim/highlite.pas
index fa760d2a2..fa760d2a2 100644..100755
--- a/nim/highlite.pas
+++ b/nim/highlite.pas
diff --git a/nim/idents.pas b/nim/idents.pas
index c1c1755e9..c1c1755e9 100644..100755
--- a/nim/idents.pas
+++ b/nim/idents.pas
diff --git a/nim/importer.pas b/nim/importer.pas
index a1ed57978..a1ed57978 100644..100755
--- a/nim/importer.pas
+++ b/nim/importer.pas
diff --git a/nim/interact.pas b/nim/interact.pas
index aab3c7fc2..aab3c7fc2 100644..100755
--- a/nim/interact.pas
+++ b/nim/interact.pas
diff --git a/nim/lexbase.pas b/nim/lexbase.pas
index 2b056c04f..2b056c04f 100644..100755
--- a/nim/lexbase.pas
+++ b/nim/lexbase.pas
diff --git a/nim/lists.pas b/nim/lists.pas
index e3442eb29..e3442eb29 100644..100755
--- a/nim/lists.pas
+++ b/nim/lists.pas
diff --git a/nim/llstream.pas b/nim/llstream.pas
index 30d9c0287..30d9c0287 100644..100755
--- a/nim/llstream.pas
+++ b/nim/llstream.pas
diff --git a/nim/llvmdata.pas b/nim/llvmdata.pas
index a8ae0f311..a8ae0f311 100644..100755
--- a/nim/llvmdata.pas
+++ b/nim/llvmdata.pas
diff --git a/nim/llvmdyn.pas b/nim/llvmdyn.pas
index e039939e5..e039939e5 100644..100755
--- a/nim/llvmdyn.pas
+++ b/nim/llvmdyn.pas
diff --git a/nim/llvmstat.pas b/nim/llvmstat.pas
index e7d06a284..e7d06a284 100644..100755
--- a/nim/llvmstat.pas
+++ b/nim/llvmstat.pas
diff --git a/nim/lookups.pas b/nim/lookups.pas
index e4c07224f..e4c07224f 100644..100755
--- a/nim/lookups.pas
+++ b/nim/lookups.pas
diff --git a/nim/magicsys.pas b/nim/magicsys.pas
index f4e4beafe..f4e4beafe 100644..100755
--- a/nim/magicsys.pas
+++ b/nim/magicsys.pas
diff --git a/nim/main.pas b/nim/main.pas
index 4b35513c5..4b35513c5 100644..100755
--- a/nim/main.pas
+++ b/nim/main.pas
diff --git a/nim/msgs.pas b/nim/msgs.pas
index 55ccdda5e..55ccdda5e 100644..100755
--- a/nim/msgs.pas
+++ b/nim/msgs.pas
diff --git a/nim/nhashes.pas b/nim/nhashes.pas
index 95bfd62f5..95bfd62f5 100644..100755
--- a/nim/nhashes.pas
+++ b/nim/nhashes.pas
diff --git a/nim/nimconf.pas b/nim/nimconf.pas
index 69c6f7618..69c6f7618 100644..100755
--- a/nim/nimconf.pas
+++ b/nim/nimconf.pas
diff --git a/nim/nimrod.pas b/nim/nimrod.pas
index 8d7db04b2..8d7db04b2 100644..100755
--- a/nim/nimrod.pas
+++ b/nim/nimrod.pas
diff --git a/nim/nimsets.pas b/nim/nimsets.pas
index 9795817b8..9795817b8 100644..100755
--- a/nim/nimsets.pas
+++ b/nim/nimsets.pas
diff --git a/nim/nmath.pas b/nim/nmath.pas
index 8b638eb42..8b638eb42 100644..100755
--- a/nim/nmath.pas
+++ b/nim/nmath.pas
diff --git a/nim/nos.pas b/nim/nos.pas
index 7c74ba1bc..7c74ba1bc 100644..100755
--- a/nim/nos.pas
+++ b/nim/nos.pas
diff --git a/nim/nstrtabs.pas b/nim/nstrtabs.pas
index bcb10f2ed..bcb10f2ed 100644..100755
--- a/nim/nstrtabs.pas
+++ b/nim/nstrtabs.pas
diff --git a/nim/nsystem.pas b/nim/nsystem.pas
index 4cdfade93..4cdfade93 100644..100755
--- a/nim/nsystem.pas
+++ b/nim/nsystem.pas
diff --git a/nim/ntime.pas b/nim/ntime.pas
index 9135c26c3..9135c26c3 100644..100755
--- a/nim/ntime.pas
+++ b/nim/ntime.pas
diff --git a/nim/nversion.pas b/nim/nversion.pas
index c9bdd24fb..c9bdd24fb 100644..100755
--- a/nim/nversion.pas
+++ b/nim/nversion.pas
diff --git a/nim/options.pas b/nim/options.pas
index 3a7d4a669..3a7d4a669 100644..100755
--- a/nim/options.pas
+++ b/nim/options.pas
diff --git a/nim/osproc.pas b/nim/osproc.pas
index 485daaf67..485daaf67 100644..100755
--- a/nim/osproc.pas
+++ b/nim/osproc.pas
diff --git a/nim/parsecfg.pas b/nim/parsecfg.pas
index ba6a98679..ba6a98679 100644..100755
--- a/nim/parsecfg.pas
+++ b/nim/parsecfg.pas
diff --git a/nim/parseopt.pas b/nim/parseopt.pas
index 0ca87bd37..0ca87bd37 100644..100755
--- a/nim/parseopt.pas
+++ b/nim/parseopt.pas
diff --git a/nim/paslex.pas b/nim/paslex.pas
index f3d8daaeb..f3d8daaeb 100644..100755
--- a/nim/paslex.pas
+++ b/nim/paslex.pas
diff --git a/nim/pasparse.pas b/nim/pasparse.pas
index dbfbf0437..dbfbf0437 100644..100755
--- a/nim/pasparse.pas
+++ b/nim/pasparse.pas
diff --git a/nim/passaux.pas b/nim/passaux.pas
index 7898d8278..7898d8278 100644..100755
--- a/nim/passaux.pas
+++ b/nim/passaux.pas
diff --git a/nim/passes.pas b/nim/passes.pas
index c280a75b1..c280a75b1 100644..100755
--- a/nim/passes.pas
+++ b/nim/passes.pas
diff --git a/nim/pbraces.pas b/nim/pbraces.pas
index d1cb84096..d1cb84096 100644..100755
--- a/nim/pbraces.pas
+++ b/nim/pbraces.pas
diff --git a/nim/pendx.pas b/nim/pendx.pas
index e23229e28..e23229e28 100644..100755
--- a/nim/pendx.pas
+++ b/nim/pendx.pas
diff --git a/nim/platform.pas b/nim/platform.pas
index c2fa711b9..c2fa711b9 100644..100755
--- a/nim/platform.pas
+++ b/nim/platform.pas
diff --git a/nim/pnimsyn.pas b/nim/pnimsyn.pas
index 260d1e5a5..260d1e5a5 100644..100755
--- a/nim/pnimsyn.pas
+++ b/nim/pnimsyn.pas
diff --git a/nim/pragmas.pas b/nim/pragmas.pas
index 7a0fd2468..7a0fd2468 100644..100755
--- a/nim/pragmas.pas
+++ b/nim/pragmas.pas
diff --git a/nim/procfind.pas b/nim/procfind.pas
index e93820ab3..e93820ab3 100644..100755
--- a/nim/procfind.pas
+++ b/nim/procfind.pas
diff --git a/nim/ptmplsyn.pas b/nim/ptmplsyn.pas
index 717da6ee0..717da6ee0 100644..100755
--- a/nim/ptmplsyn.pas
+++ b/nim/ptmplsyn.pas
diff --git a/nim/readme.txt b/nim/readme.txt
index 258192543..258192543 100644..100755
--- a/nim/readme.txt
+++ b/nim/readme.txt
diff --git a/nim/rnimsyn.pas b/nim/rnimsyn.pas
index ec1e9571e..ec1e9571e 100644..100755
--- a/nim/rnimsyn.pas
+++ b/nim/rnimsyn.pas
diff --git a/nim/rodread.pas b/nim/rodread.pas
index 457ad6cc2..457ad6cc2 100644..100755
--- a/nim/rodread.pas
+++ b/nim/rodread.pas
diff --git a/nim/rodwrite.pas b/nim/rodwrite.pas
index c71eda7e3..c71eda7e3 100644..100755
--- a/nim/rodwrite.pas
+++ b/nim/rodwrite.pas
diff --git a/nim/ropes.pas b/nim/ropes.pas
index 286f1b9e6..286f1b9e6 100644..100755
--- a/nim/ropes.pas
+++ b/nim/ropes.pas
diff --git a/nim/rst.pas b/nim/rst.pas
index 89ef2c501..89ef2c501 100644..100755
--- a/nim/rst.pas
+++ b/nim/rst.pas
diff --git a/nim/scanner.pas b/nim/scanner.pas
index c03ae9224..c03ae9224 100644..100755
--- a/nim/scanner.pas
+++ b/nim/scanner.pas
diff --git a/nim/sem.pas b/nim/sem.pas
index a5d28d734..a5d28d734 100644..100755
--- a/nim/sem.pas
+++ b/nim/sem.pas
diff --git a/nim/semdata.pas b/nim/semdata.pas
index 37934f3d6..37934f3d6 100644..100755
--- a/nim/semdata.pas
+++ b/nim/semdata.pas
diff --git a/nim/semexprs.pas b/nim/semexprs.pas
index 2d1d0a957..2d1d0a957 100644..100755
--- a/nim/semexprs.pas
+++ b/nim/semexprs.pas
diff --git a/nim/semfold.pas b/nim/semfold.pas
index 791f39149..791f39149 100644..100755
--- a/nim/semfold.pas
+++ b/nim/semfold.pas
diff --git a/nim/semgnrc.pas b/nim/semgnrc.pas
index ee905d444..ee905d444 100644..100755
--- a/nim/semgnrc.pas
+++ b/nim/semgnrc.pas
diff --git a/nim/seminst.pas b/nim/seminst.pas
index ea8889007..ea8889007 100644..100755
--- a/nim/seminst.pas
+++ b/nim/seminst.pas
diff --git a/nim/semstmts.pas b/nim/semstmts.pas
index 1ece72023..1ece72023 100644..100755
--- a/nim/semstmts.pas
+++ b/nim/semstmts.pas
diff --git a/nim/semtempl.pas b/nim/semtempl.pas
index fc7e12a73..fc7e12a73 100644..100755
--- a/nim/semtempl.pas
+++ b/nim/semtempl.pas
diff --git a/nim/semtypes.pas b/nim/semtypes.pas
index e2a0d2185..e2a0d2185 100644..100755
--- a/nim/semtypes.pas
+++ b/nim/semtypes.pas
diff --git a/nim/sigmatch.pas b/nim/sigmatch.pas
index 45a29fc29..45a29fc29 100644..100755
--- a/nim/sigmatch.pas
+++ b/nim/sigmatch.pas
diff --git a/nim/strutils.pas b/nim/strutils.pas
index 96c07d365..96c07d365 100644..100755
--- a/nim/strutils.pas
+++ b/nim/strutils.pas
diff --git a/nim/syntaxes.pas b/nim/syntaxes.pas
index 158ab8ea2..158ab8ea2 100644..100755
--- a/nim/syntaxes.pas
+++ b/nim/syntaxes.pas
diff --git a/nim/tigen.pas b/nim/tigen.pas
index 687b70920..687b70920 100644..100755
--- a/nim/tigen.pas
+++ b/nim/tigen.pas
diff --git a/nim/transf.pas b/nim/transf.pas
index a0f07d51d..a0f07d51d 100644..100755
--- a/nim/transf.pas
+++ b/nim/transf.pas
diff --git a/nim/transtmp.pas b/nim/transtmp.pas
index 15a07f5a2..15a07f5a2 100644..100755
--- a/nim/transtmp.pas
+++ b/nim/transtmp.pas
diff --git a/nim/trees.pas b/nim/trees.pas
index 0e0c04a22..0e0c04a22 100644..100755
--- a/nim/trees.pas
+++ b/nim/trees.pas
diff --git a/nim/treetab.pas b/nim/treetab.pas
index 31d7aa0cf..31d7aa0cf 100644..100755
--- a/nim/treetab.pas
+++ b/nim/treetab.pas
diff --git a/nim/types.pas b/nim/types.pas
index a881b2f11..a881b2f11 100644..100755
--- a/nim/types.pas
+++ b/nim/types.pas
diff --git a/nim/wordrecg.pas b/nim/wordrecg.pas
index c18969877..c18969877 100644..100755
--- a/nim/wordrecg.pas
+++ b/nim/wordrecg.pas
diff --git a/nimlib/copying.txt b/nimlib/copying.txt
index be182d65c..be182d65c 100644..100755
--- a/nimlib/copying.txt
+++ b/nimlib/copying.txt
diff --git a/nimlib/lgpl.txt b/nimlib/lgpl.txt
index f6fa6c9e5..f6fa6c9e5 100644..100755
--- a/nimlib/lgpl.txt
+++ b/nimlib/lgpl.txt
diff --git a/nimlib/nimbase.h b/nimlib/nimbase.h
index a0f08f4f3..a0f08f4f3 100644..100755
--- a/nimlib/nimbase.h
+++ b/nimlib/nimbase.h
diff --git a/nimlib/posix/posix.nim b/nimlib/posix/posix.nim
index ddeaec664..ddeaec664 100644..100755
--- a/nimlib/posix/posix.nim
+++ b/nimlib/posix/posix.nim
diff --git a/nimlib/pure/cgi.nim b/nimlib/pure/cgi.nim
index baae244e7..baae244e7 100644..100755
--- a/nimlib/pure/cgi.nim
+++ b/nimlib/pure/cgi.nim
diff --git a/nimlib/pure/complex.nim b/nimlib/pure/complex.nim
index f50ff4bd0..f50ff4bd0 100644..100755
--- a/nimlib/pure/complex.nim
+++ b/nimlib/pure/complex.nim
diff --git a/nimlib/pure/dynlib.nim b/nimlib/pure/dynlib.nim
index 592073e3d..592073e3d 100644..100755
--- a/nimlib/pure/dynlib.nim
+++ b/nimlib/pure/dynlib.nim
diff --git a/nimlib/pure/hashes.nim b/nimlib/pure/hashes.nim
index 1593119bd..1593119bd 100644..100755
--- a/nimlib/pure/hashes.nim
+++ b/nimlib/pure/hashes.nim
diff --git a/nimlib/pure/hashtabs.nim b/nimlib/pure/hashtabs.nim
index 68d19d63b..68d19d63b 100644..100755
--- a/nimlib/pure/hashtabs.nim
+++ b/nimlib/pure/hashtabs.nim
diff --git a/nimlib/pure/lexbase.nim b/nimlib/pure/lexbase.nim
index bb207e92a..bb207e92a 100644..100755
--- a/nimlib/pure/lexbase.nim
+++ b/nimlib/pure/lexbase.nim
diff --git a/nimlib/pure/logging.nim b/nimlib/pure/logging.nim
index 6df39f50b..6df39f50b 100644..100755
--- a/nimlib/pure/logging.nim
+++ b/nimlib/pure/logging.nim
diff --git a/nimlib/pure/macros.nim b/nimlib/pure/macros.nim
index 677469ed2..677469ed2 100644..100755
--- a/nimlib/pure/macros.nim
+++ b/nimlib/pure/macros.nim
diff --git a/nimlib/pure/math.nim b/nimlib/pure/math.nim
index bca45894c..bca45894c 100644..100755
--- a/nimlib/pure/math.nim
+++ b/nimlib/pure/math.nim
diff --git a/nimlib/pure/md5.nim b/nimlib/pure/md5.nim
index d9bb92949..d9bb92949 100644..100755
--- a/nimlib/pure/md5.nim
+++ b/nimlib/pure/md5.nim
diff --git a/nimlib/pure/os.nim b/nimlib/pure/os.nim
index afa145e9f..afa145e9f 100644..100755
--- a/nimlib/pure/os.nim
+++ b/nimlib/pure/os.nim
diff --git a/nimlib/pure/osproc.nim b/nimlib/pure/osproc.nim
index d76825531..d76825531 100644..100755
--- a/nimlib/pure/osproc.nim
+++ b/nimlib/pure/osproc.nim
diff --git a/nimlib/pure/parsecfg.nim b/nimlib/pure/parsecfg.nim
index c26dab099..c26dab099 100644..100755
--- a/nimlib/pure/parsecfg.nim
+++ b/nimlib/pure/parsecfg.nim
diff --git a/nimlib/pure/parsecsv.nim b/nimlib/pure/parsecsv.nim
index 5970f2090..5970f2090 100644..100755
--- a/nimlib/pure/parsecsv.nim
+++ b/nimlib/pure/parsecsv.nim
diff --git a/nimlib/pure/parseopt.nim b/nimlib/pure/parseopt.nim
index 8f4be98f4..8f4be98f4 100644..100755
--- a/nimlib/pure/parseopt.nim
+++ b/nimlib/pure/parseopt.nim
diff --git a/nimlib/pure/parsesql.nim b/nimlib/pure/parsesql.nim
index 2109c273a..2109c273a 100644..100755
--- a/nimlib/pure/parsesql.nim
+++ b/nimlib/pure/parsesql.nim
diff --git a/nimlib/pure/parsexml.nim b/nimlib/pure/parsexml.nim
index 54f62a9a4..54f62a9a4 100644..100755
--- a/nimlib/pure/parsexml.nim
+++ b/nimlib/pure/parsexml.nim
diff --git a/nimlib/pure/pegs.nim b/nimlib/pure/pegs.nim
index 488e42c7d..488e42c7d 100644..100755
--- a/nimlib/pure/pegs.nim
+++ b/nimlib/pure/pegs.nim
diff --git a/nimlib/pure/re.nim b/nimlib/pure/re.nim
index 1328f5f1f..1328f5f1f 100644..100755
--- a/nimlib/pure/re.nim
+++ b/nimlib/pure/re.nim
diff --git a/nimlib/pure/regexprs.nim b/nimlib/pure/regexprs.nim
index cff3152cf..cff3152cf 100644..100755
--- a/nimlib/pure/regexprs.nim
+++ b/nimlib/pure/regexprs.nim
diff --git a/nimlib/pure/streams.nim b/nimlib/pure/streams.nim
index f4d2911fc..f4d2911fc 100644..100755
--- a/nimlib/pure/streams.nim
+++ b/nimlib/pure/streams.nim
diff --git a/nimlib/pure/strtabs.nim b/nimlib/pure/strtabs.nim
index 10cd0b933..10cd0b933 100644..100755
--- a/nimlib/pure/strtabs.nim
+++ b/nimlib/pure/strtabs.nim
diff --git a/nimlib/pure/strutils.nim b/nimlib/pure/strutils.nim
index d7fd69f61..d7fd69f61 100644..100755
--- a/nimlib/pure/strutils.nim
+++ b/nimlib/pure/strutils.nim
diff --git a/nimlib/pure/terminal.nim b/nimlib/pure/terminal.nim
index 42bd80cb4..42bd80cb4 100644..100755
--- a/nimlib/pure/terminal.nim
+++ b/nimlib/pure/terminal.nim
diff --git a/nimlib/pure/times.nim b/nimlib/pure/times.nim
index 8c21b6027..8c21b6027 100644..100755
--- a/nimlib/pure/times.nim
+++ b/nimlib/pure/times.nim
diff --git a/nimlib/pure/unicode.nim b/nimlib/pure/unicode.nim
index 2a53d7660..2a53d7660 100644..100755
--- a/nimlib/pure/unicode.nim
+++ b/nimlib/pure/unicode.nim
diff --git a/nimlib/pure/variants.nim b/nimlib/pure/variants.nim
index f661f81a6..f661f81a6 100644..100755
--- a/nimlib/pure/variants.nim
+++ b/nimlib/pure/variants.nim
diff --git a/nimlib/pure/xmlgen.nim b/nimlib/pure/xmlgen.nim
index 79a782252..79a782252 100644..100755
--- a/nimlib/pure/xmlgen.nim
+++ b/nimlib/pure/xmlgen.nim
diff --git a/nimlib/readme.txt b/nimlib/readme.txt
index 2b2c4a03c..2b2c4a03c 100644..100755
--- a/nimlib/readme.txt
+++ b/nimlib/readme.txt
diff --git a/nimlib/system.nim b/nimlib/system.nim
index 174d739cd..174d739cd 100644..100755
--- a/nimlib/system.nim
+++ b/nimlib/system.nim
diff --git a/nimlib/system/alloc.nim b/nimlib/system/alloc.nim
index 95feff854..95feff854 100644..100755
--- a/nimlib/system/alloc.nim
+++ b/nimlib/system/alloc.nim
diff --git a/nimlib/system/ansi_c.nim b/nimlib/system/ansi_c.nim
index e9300949b..e9300949b 100644..100755
--- a/nimlib/system/ansi_c.nim
+++ b/nimlib/system/ansi_c.nim
diff --git a/nimlib/system/arithm.nim b/nimlib/system/arithm.nim
index f097ee794..f097ee794 100644..100755
--- a/nimlib/system/arithm.nim
+++ b/nimlib/system/arithm.nim
diff --git a/nimlib/system/assign.nim b/nimlib/system/assign.nim
index 44d2e5c64..44d2e5c64 100644..100755
--- a/nimlib/system/assign.nim
+++ b/nimlib/system/assign.nim
diff --git a/nimlib/system/cellsets.nim b/nimlib/system/cellsets.nim
index 0ce83864c..0ce83864c 100644..100755
--- a/nimlib/system/cellsets.nim
+++ b/nimlib/system/cellsets.nim
diff --git a/nimlib/system/cntbits.nim b/nimlib/system/cntbits.nim
index 281b96dd0..281b96dd0 100644..100755
--- a/nimlib/system/cntbits.nim
+++ b/nimlib/system/cntbits.nim
diff --git a/nimlib/system/debugger.nim b/nimlib/system/debugger.nim
index 01d8bd8a2..01d8bd8a2 100644..100755
--- a/nimlib/system/debugger.nim
+++ b/nimlib/system/debugger.nim
diff --git a/nimlib/system/dyncalls.nim b/nimlib/system/dyncalls.nim
index 0946ee355..0946ee355 100644..100755
--- a/nimlib/system/dyncalls.nim
+++ b/nimlib/system/dyncalls.nim
diff --git a/nimlib/system/ecmasys.nim b/nimlib/system/ecmasys.nim
index c0d0a5fd6..c0d0a5fd6 100644..100755
--- a/nimlib/system/ecmasys.nim
+++ b/nimlib/system/ecmasys.nim
diff --git a/nimlib/system/excpt.nim b/nimlib/system/excpt.nim
index 293491fe9..293491fe9 100644..100755
--- a/nimlib/system/excpt.nim
+++ b/nimlib/system/excpt.nim
diff --git a/nimlib/system/gc.nim b/nimlib/system/gc.nim
index da8f75768..da8f75768 100644..100755
--- a/nimlib/system/gc.nim
+++ b/nimlib/system/gc.nim
diff --git a/nimlib/system/hti.nim b/nimlib/system/hti.nim
index 3343000ae..3343000ae 100644..100755
--- a/nimlib/system/hti.nim
+++ b/nimlib/system/hti.nim
diff --git a/nimlib/system/mm.nim b/nimlib/system/mm.nim
index 76b5d83bd..76b5d83bd 100644..100755
--- a/nimlib/system/mm.nim
+++ b/nimlib/system/mm.nim
diff --git a/nimlib/system/profiler.nim b/nimlib/system/profiler.nim
index b87b30d4a..b87b30d4a 100644..100755
--- a/nimlib/system/profiler.nim
+++ b/nimlib/system/profiler.nim
diff --git a/nimlib/system/repr.nim b/nimlib/system/repr.nim
index e340f1d7c..e340f1d7c 100644..100755
--- a/nimlib/system/repr.nim
+++ b/nimlib/system/repr.nim
diff --git a/nimlib/system/sets.nim b/nimlib/system/sets.nim
index f9f3eb32b..f9f3eb32b 100644..100755
--- a/nimlib/system/sets.nim
+++ b/nimlib/system/sets.nim
diff --git a/nimlib/system/sysio.nim b/nimlib/system/sysio.nim
index 8b6d0e285..8b6d0e285 100644..100755
--- a/nimlib/system/sysio.nim
+++ b/nimlib/system/sysio.nim
diff --git a/nimlib/system/sysstr.nim b/nimlib/system/sysstr.nim
index 808941c06..808941c06 100644..100755
--- a/nimlib/system/sysstr.nim
+++ b/nimlib/system/sysstr.nim
diff --git a/nimlib/windows/winlean.nim b/nimlib/windows/winlean.nim
index 40e6e7b11..40e6e7b11 100644..100755
--- a/nimlib/windows/winlean.nim
+++ b/nimlib/windows/winlean.nim
diff --git a/noprefix.nim b/noprefix.nim
index e7ec26c56..e7ec26c56 100644..100755
--- a/noprefix.nim
+++ b/noprefix.nim
diff --git a/obj/empty.txt b/obj/empty.txt
index 20f9a91e3..20f9a91e3 100644..100755
--- a/obj/empty.txt
+++ b/obj/empty.txt
diff --git a/readme.txt b/readme.txt
index 56821bece..56821bece 100644..100755
--- a/readme.txt
+++ b/readme.txt
diff --git a/rod/ast.nim b/rod/ast.nim
index fde238eaa..fde238eaa 100644..100755
--- a/rod/ast.nim
+++ b/rod/ast.nim
diff --git a/rod/astalgo.nim b/rod/astalgo.nim
index 1b4572b2b..1b4572b2b 100644..100755
--- a/rod/astalgo.nim
+++ b/rod/astalgo.nim
diff --git a/rod/bitsets.nim b/rod/bitsets.nim
index 937e8237c..937e8237c 100644..100755
--- a/rod/bitsets.nim
+++ b/rod/bitsets.nim
diff --git a/rod/ccgexprs.nim b/rod/ccgexprs.nim
index ecff707ae..ecff707ae 100644..100755
--- a/rod/ccgexprs.nim
+++ b/rod/ccgexprs.nim
diff --git a/rod/ccgstmts.nim b/rod/ccgstmts.nim
index 3cf2123c9..3cf2123c9 100644..100755
--- a/rod/ccgstmts.nim
+++ b/rod/ccgstmts.nim
diff --git a/rod/ccgtypes.nim b/rod/ccgtypes.nim
index 5034bf67b..5034bf67b 100644..100755
--- a/rod/ccgtypes.nim
+++ b/rod/ccgtypes.nim
diff --git a/rod/ccgutils.nim b/rod/ccgutils.nim
index c7733c5ff..c7733c5ff 100644..100755
--- a/rod/ccgutils.nim
+++ b/rod/ccgutils.nim
diff --git a/rod/cgen.nim b/rod/cgen.nim
index 989778a02..989778a02 100644..100755
--- a/rod/cgen.nim
+++ b/rod/cgen.nim
diff --git a/rod/cgmeth.nim b/rod/cgmeth.nim
index 05118f78a..05118f78a 100644..100755
--- a/rod/cgmeth.nim
+++ b/rod/cgmeth.nim
diff --git a/rod/charsets.nim b/rod/charsets.nim
index c952a73bd..c952a73bd 100644..100755
--- a/rod/charsets.nim
+++ b/rod/charsets.nim
diff --git a/rod/commands.nim b/rod/commands.nim
index 17c946292..17c946292 100644..100755
--- a/rod/commands.nim
+++ b/rod/commands.nim
diff --git a/rod/condsyms.nim b/rod/condsyms.nim
index 0325a2b77..0325a2b77 100644..100755
--- a/rod/condsyms.nim
+++ b/rod/condsyms.nim
diff --git a/rod/crc.nim b/rod/crc.nim
index e66ce30fb..e66ce30fb 100644..100755
--- a/rod/crc.nim
+++ b/rod/crc.nim
diff --git a/rod/depends.nim b/rod/depends.nim
index 4c464f5ec..4c464f5ec 100644..100755
--- a/rod/depends.nim
+++ b/rod/depends.nim
diff --git a/rod/docgen.nim b/rod/docgen.nim
index 10516bf73..10516bf73 100644..100755
--- a/rod/docgen.nim
+++ b/rod/docgen.nim
diff --git a/rod/ecmasgen.nim b/rod/ecmasgen.nim
index 91acb98b2..91acb98b2 100644..100755
--- a/rod/ecmasgen.nim
+++ b/rod/ecmasgen.nim
diff --git a/rod/evals.nim b/rod/evals.nim
index bfc46aa5c..bfc46aa5c 100644..100755
--- a/rod/evals.nim
+++ b/rod/evals.nim
diff --git a/rod/expandimportc.nim b/rod/expandimportc.nim
index d4b2fee18..d4b2fee18 100644..100755
--- a/rod/expandimportc.nim
+++ b/rod/expandimportc.nim
diff --git a/rod/extccomp.nim b/rod/extccomp.nim
index 990466e1b..990466e1b 100644..100755
--- a/rod/extccomp.nim
+++ b/rod/extccomp.nim
diff --git a/rod/filters.nim b/rod/filters.nim
index 20db697bf..20db697bf 100644..100755
--- a/rod/filters.nim
+++ b/rod/filters.nim
diff --git a/rod/hashtest.nim b/rod/hashtest.nim
index c1b3ea0f4..c1b3ea0f4 100644..100755
--- a/rod/hashtest.nim
+++ b/rod/hashtest.nim
diff --git a/rod/highlite.nim b/rod/highlite.nim
index c2fc95da8..c2fc95da8 100644..100755
--- a/rod/highlite.nim
+++ b/rod/highlite.nim
diff --git a/rod/idents.nim b/rod/idents.nim
index 03d155169..03d155169 100644..100755
--- a/rod/idents.nim
+++ b/rod/idents.nim
diff --git a/rod/importer.nim b/rod/importer.nim
index 608bad066..608bad066 100644..100755
--- a/rod/importer.nim
+++ b/rod/importer.nim
diff --git a/rod/interact.nim b/rod/interact.nim
index 36fee8413..36fee8413 100644..100755
--- a/rod/interact.nim
+++ b/rod/interact.nim
diff --git a/rod/lexbase.nim b/rod/lexbase.nim
index 4f946b35f..4f946b35f 100644..100755
--- a/rod/lexbase.nim
+++ b/rod/lexbase.nim
diff --git a/rod/lists.nim b/rod/lists.nim
index b4610ab2f..b4610ab2f 100644..100755
--- a/rod/lists.nim
+++ b/rod/lists.nim
diff --git a/rod/llstream.nim b/rod/llstream.nim
index 6fcd278a0..6fcd278a0 100644..100755
--- a/rod/llstream.nim
+++ b/rod/llstream.nim
diff --git a/rod/llvmgen.nim b/rod/llvmgen.nim
index f8acb624a..f8acb624a 100644..100755
--- a/rod/llvmgen.nim
+++ b/rod/llvmgen.nim
diff --git a/rod/llvmtype.nim b/rod/llvmtype.nim
index 7790855ac..7790855ac 100644..100755
--- a/rod/llvmtype.nim
+++ b/rod/llvmtype.nim
diff --git a/rod/lookups.nim b/rod/lookups.nim
index e545ad3e6..e545ad3e6 100644..100755
--- a/rod/lookups.nim
+++ b/rod/lookups.nim
diff --git a/rod/magicsys.nim b/rod/magicsys.nim
index 58de1d795..58de1d795 100644..100755
--- a/rod/magicsys.nim
+++ b/rod/magicsys.nim
diff --git a/rod/main.nim b/rod/main.nim
index 3221f531e..3221f531e 100644..100755
--- a/rod/main.nim
+++ b/rod/main.nim
diff --git a/rod/msgs.nim b/rod/msgs.nim
index ca3a5c1e5..ca3a5c1e5 100644..100755
--- a/rod/msgs.nim
+++ b/rod/msgs.nim
diff --git a/rod/nhashes.nim b/rod/nhashes.nim
index b9dd3670a..b9dd3670a 100644..100755
--- a/rod/nhashes.nim
+++ b/rod/nhashes.nim
diff --git a/rod/nimconf.nim b/rod/nimconf.nim
index 836be5097..836be5097 100644..100755
--- a/rod/nimconf.nim
+++ b/rod/nimconf.nim
diff --git a/rod/nimrod.cfg b/rod/nimrod.cfg
index 5168a3bb9..5168a3bb9 100644..100755
--- a/rod/nimrod.cfg
+++ b/rod/nimrod.cfg
diff --git a/rod/nimrod.dot b/rod/nimrod.dot
index 36429844f..36429844f 100644..100755
--- a/rod/nimrod.dot
+++ b/rod/nimrod.dot
diff --git a/rod/nimrod.ini b/rod/nimrod.ini
index 7c0e8c565..7c0e8c565 100644..100755
--- a/rod/nimrod.ini
+++ b/rod/nimrod.ini
diff --git a/rod/nimrod.nim b/rod/nimrod.nim
index 8f83aa5cd..8f83aa5cd 100644..100755
--- a/rod/nimrod.nim
+++ b/rod/nimrod.nim
diff --git a/rod/nimsets.nim b/rod/nimsets.nim
index 337aedda9..337aedda9 100644..100755
--- a/rod/nimsets.nim
+++ b/rod/nimsets.nim
diff --git a/rod/nstrtabs.nim b/rod/nstrtabs.nim
index 811e461cc..811e461cc 100644..100755
--- a/rod/nstrtabs.nim
+++ b/rod/nstrtabs.nim
diff --git a/rod/nversion.nim b/rod/nversion.nim
index 2aa7babf7..2aa7babf7 100644..100755
--- a/rod/nversion.nim
+++ b/rod/nversion.nim
diff --git a/rod/options.nim b/rod/options.nim
index 514c3db3b..514c3db3b 100644..100755
--- a/rod/options.nim
+++ b/rod/options.nim
diff --git a/rod/parsecfg.nim b/rod/parsecfg.nim
index 0b9574a41..0b9574a41 100644..100755
--- a/rod/parsecfg.nim
+++ b/rod/parsecfg.nim
diff --git a/rod/pas2nim/pas2nim.cfg b/rod/pas2nim/pas2nim.cfg
index 789e6ec7f..789e6ec7f 100644..100755
--- a/rod/pas2nim/pas2nim.cfg
+++ b/rod/pas2nim/pas2nim.cfg
diff --git a/rod/pas2nim/pas2nim.nim b/rod/pas2nim/pas2nim.nim
index 5c7b68857..5c7b68857 100644..100755
--- a/rod/pas2nim/pas2nim.nim
+++ b/rod/pas2nim/pas2nim.nim
diff --git a/rod/pas2nim/paslex.nim b/rod/pas2nim/paslex.nim
index 193a45001..193a45001 100644..100755
--- a/rod/pas2nim/paslex.nim
+++ b/rod/pas2nim/paslex.nim
diff --git a/rod/pas2nim/pasparse.nim b/rod/pas2nim/pasparse.nim
index 427cdc5ef..427cdc5ef 100644..100755
--- a/rod/pas2nim/pasparse.nim
+++ b/rod/pas2nim/pasparse.nim
diff --git a/rod/passaux.nim b/rod/passaux.nim
index 0fc5226d1..0fc5226d1 100644..100755
--- a/rod/passaux.nim
+++ b/rod/passaux.nim
diff --git a/rod/passes.nim b/rod/passes.nim
index 7ae642ed4..7ae642ed4 100644..100755
--- a/rod/passes.nim
+++ b/rod/passes.nim
diff --git a/rod/pbraces.nim b/rod/pbraces.nim
index 4a5f85b85..4a5f85b85 100644..100755
--- a/rod/pbraces.nim
+++ b/rod/pbraces.nim
diff --git a/rod/pendx.nim b/rod/pendx.nim
index debe0d852..debe0d852 100644..100755
--- a/rod/pendx.nim
+++ b/rod/pendx.nim
diff --git a/rod/platform.nim b/rod/platform.nim
index 4e2240a90..4e2240a90 100644..100755
--- a/rod/platform.nim
+++ b/rod/platform.nim
diff --git a/rod/pnimsyn.nim b/rod/pnimsyn.nim
index 766e01671..766e01671 100644..100755
--- a/rod/pnimsyn.nim
+++ b/rod/pnimsyn.nim
diff --git a/rod/pragmas.nim b/rod/pragmas.nim
index 02411ee52..02411ee52 100644..100755
--- a/rod/pragmas.nim
+++ b/rod/pragmas.nim
diff --git a/rod/procfind.nim b/rod/procfind.nim
index bd5b3841f..bd5b3841f 100644..100755
--- a/rod/procfind.nim
+++ b/rod/procfind.nim
diff --git a/rod/ptmplsyn.nim b/rod/ptmplsyn.nim
index ad3a73b70..ad3a73b70 100644..100755
--- a/rod/ptmplsyn.nim
+++ b/rod/ptmplsyn.nim
diff --git a/rod/readme.txt b/rod/readme.txt
index 40b4ea057..40b4ea057 100644..100755
--- a/rod/readme.txt
+++ b/rod/readme.txt
diff --git a/rod/rnimsyn.nim b/rod/rnimsyn.nim
index 60cfd38b1..60cfd38b1 100644..100755
--- a/rod/rnimsyn.nim
+++ b/rod/rnimsyn.nim
diff --git a/rod/rodread.nim b/rod/rodread.nim
index ee295d122..ee295d122 100644..100755
--- a/rod/rodread.nim
+++ b/rod/rodread.nim
diff --git a/rod/rodwrite.nim b/rod/rodwrite.nim
index 370ebc314..370ebc314 100644..100755
--- a/rod/rodwrite.nim
+++ b/rod/rodwrite.nim
diff --git a/rod/ropes.nim b/rod/ropes.nim
index 1fe5ed55e..1fe5ed55e 100644..100755
--- a/rod/ropes.nim
+++ b/rod/ropes.nim
diff --git a/rod/rst.nim b/rod/rst.nim
index 5c675f563..5c675f563 100644..100755
--- a/rod/rst.nim
+++ b/rod/rst.nim
diff --git a/rod/scanner.nim b/rod/scanner.nim
index 04a41fb5c..04a41fb5c 100644..100755
--- a/rod/scanner.nim
+++ b/rod/scanner.nim
diff --git a/rod/sem.nim b/rod/sem.nim
index 7ea6338a2..7ea6338a2 100644..100755
--- a/rod/sem.nim
+++ b/rod/sem.nim
diff --git a/rod/semdata.nim b/rod/semdata.nim
index 5020f103d..5020f103d 100644..100755
--- a/rod/semdata.nim
+++ b/rod/semdata.nim
diff --git a/rod/semexprs.nim b/rod/semexprs.nim
index 0a3c6e2ee..0a3c6e2ee 100644..100755
--- a/rod/semexprs.nim
+++ b/rod/semexprs.nim
diff --git a/rod/semfold.nim b/rod/semfold.nim
index a7515f3bb..a7515f3bb 100644..100755
--- a/rod/semfold.nim
+++ b/rod/semfold.nim
diff --git a/rod/semgnrc.nim b/rod/semgnrc.nim
index fbc9f18bd..fbc9f18bd 100644..100755
--- a/rod/semgnrc.nim
+++ b/rod/semgnrc.nim
diff --git a/rod/seminst.nim b/rod/seminst.nim
index ba1f05cb2..ba1f05cb2 100644..100755
--- a/rod/seminst.nim
+++ b/rod/seminst.nim
diff --git a/rod/semstmts.nim b/rod/semstmts.nim
index d2df06f3d..d2df06f3d 100644..100755
--- a/rod/semstmts.nim
+++ b/rod/semstmts.nim
diff --git a/rod/semtempl.nim b/rod/semtempl.nim
index f866f77d2..f866f77d2 100644..100755
--- a/rod/semtempl.nim
+++ b/rod/semtempl.nim
diff --git a/rod/semtypes.nim b/rod/semtypes.nim
index cf88b0b4b..cf88b0b4b 100644..100755
--- a/rod/semtypes.nim
+++ b/rod/semtypes.nim
diff --git a/rod/sigmatch.nim b/rod/sigmatch.nim
index 1bb68ef1a..1bb68ef1a 100644..100755
--- a/rod/sigmatch.nim
+++ b/rod/sigmatch.nim
diff --git a/rod/syntaxes.nim b/rod/syntaxes.nim
index b8e4c1837..b8e4c1837 100644..100755
--- a/rod/syntaxes.nim
+++ b/rod/syntaxes.nim
diff --git a/rod/tigen.nim b/rod/tigen.nim
index ef13fe42b..ef13fe42b 100644..100755
--- a/rod/tigen.nim
+++ b/rod/tigen.nim
diff --git a/rod/transf.nim b/rod/transf.nim
index 6bb825e13..6bb825e13 100644..100755
--- a/rod/transf.nim
+++ b/rod/transf.nim
diff --git a/rod/transtmp.nim b/rod/transtmp.nim
index 44a462fea..44a462fea 100644..100755
--- a/rod/transtmp.nim
+++ b/rod/transtmp.nim
diff --git a/rod/trees.nim b/rod/trees.nim
index 69b77b8ab..69b77b8ab 100644..100755
--- a/rod/trees.nim
+++ b/rod/trees.nim
diff --git a/rod/treetab.nim b/rod/treetab.nim
index 797ef5029..797ef5029 100644..100755
--- a/rod/treetab.nim
+++ b/rod/treetab.nim
diff --git a/rod/types.nim b/rod/types.nim
index 64564233e..64564233e 100644..100755
--- a/rod/types.nim
+++ b/rod/types.nim
diff --git a/rod/webrepl.nim b/rod/webrepl.nim
index bf59bbfec..bf59bbfec 100644..100755
--- a/rod/webrepl.nim
+++ b/rod/webrepl.nim
diff --git a/rod/wordrecg.nim b/rod/wordrecg.nim
index daadd57d0..daadd57d0 100644..100755
--- a/rod/wordrecg.nim
+++ b/rod/wordrecg.nim
diff --git a/start.bat b/start.bat
index 694a79520..694a79520 100644..100755
--- a/start.bat
+++ b/start.bat
diff --git a/tests/accept/compile/mrecmod.nim b/tests/accept/compile/mrecmod.nim
index fab9654d5..fab9654d5 100644..100755
--- a/tests/accept/compile/mrecmod.nim
+++ b/tests/accept/compile/mrecmod.nim
diff --git a/tests/accept/compile/mrecmod2.nim b/tests/accept/compile/mrecmod2.nim
index 9557ce729..9557ce729 100644..100755
--- a/tests/accept/compile/mrecmod2.nim
+++ b/tests/accept/compile/mrecmod2.nim
diff --git a/tests/accept/compile/mvarious.nim b/tests/accept/compile/mvarious.nim
index 333b34d33..333b34d33 100644..100755
--- a/tests/accept/compile/mvarious.nim
+++ b/tests/accept/compile/mvarious.nim
diff --git a/tests/accept/compile/tarrindx.nim b/tests/accept/compile/tarrindx.nim
index 13919cc2c..13919cc2c 100644..100755
--- a/tests/accept/compile/tarrindx.nim
+++ b/tests/accept/compile/tarrindx.nim
diff --git a/tests/accept/compile/tassign.nim b/tests/accept/compile/tassign.nim
index f51c20783..f51c20783 100644..100755
--- a/tests/accept/compile/tassign.nim
+++ b/tests/accept/compile/tassign.nim
diff --git a/tests/accept/compile/tccgen1.nim b/tests/accept/compile/tccgen1.nim
index b1d8835f2..b1d8835f2 100644..100755
--- a/tests/accept/compile/tccgen1.nim
+++ b/tests/accept/compile/tccgen1.nim
diff --git a/tests/accept/compile/tcmdline.nim b/tests/accept/compile/tcmdline.nim
index f43aecafa..f43aecafa 100644..100755
--- a/tests/accept/compile/tcmdline.nim
+++ b/tests/accept/compile/tcmdline.nim
diff --git a/tests/accept/compile/tcolors.nim b/tests/accept/compile/tcolors.nim
index 9d1034405..9d1034405 100644..100755
--- a/tests/accept/compile/tcolors.nim
+++ b/tests/accept/compile/tcolors.nim
diff --git a/tests/accept/compile/tconsteval.nim b/tests/accept/compile/tconsteval.nim
index ce90d7c27..ce90d7c27 100644..100755
--- a/tests/accept/compile/tconsteval.nim
+++ b/tests/accept/compile/tconsteval.nim
diff --git a/tests/accept/compile/tconvert.nim b/tests/accept/compile/tconvert.nim
index b23afde74..b23afde74 100644..100755
--- a/tests/accept/compile/tconvert.nim
+++ b/tests/accept/compile/tconvert.nim
diff --git a/tests/accept/compile/tdeprecated.nim b/tests/accept/compile/tdeprecated.nim
index e287da3f9..e287da3f9 100644..100755
--- a/tests/accept/compile/tdeprecated.nim
+++ b/tests/accept/compile/tdeprecated.nim
diff --git a/tests/accept/compile/tdialogs.nim b/tests/accept/compile/tdialogs.nim
index 90f241cdf..90f241cdf 100644..100755
--- a/tests/accept/compile/tdialogs.nim
+++ b/tests/accept/compile/tdialogs.nim
diff --git a/tests/accept/compile/tdllvar.nim b/tests/accept/compile/tdllvar.nim
index ab767770c..ab767770c 100644..100755
--- a/tests/accept/compile/tdllvar.nim
+++ b/tests/accept/compile/tdllvar.nim
diff --git a/tests/accept/compile/tdumpast.nim b/tests/accept/compile/tdumpast.nim
index fb31af0ec..fb31af0ec 100644..100755
--- a/tests/accept/compile/tdumpast.nim
+++ b/tests/accept/compile/tdumpast.nim
diff --git a/tests/accept/compile/techo.nim b/tests/accept/compile/techo.nim
index beb21fa16..beb21fa16 100644..100755
--- a/tests/accept/compile/techo.nim
+++ b/tests/accept/compile/techo.nim
diff --git a/tests/accept/compile/tendian.nim b/tests/accept/compile/tendian.nim
index 256e2653c..256e2653c 100644..100755
--- a/tests/accept/compile/tendian.nim
+++ b/tests/accept/compile/tendian.nim
diff --git a/tests/accept/compile/tenum.nim b/tests/accept/compile/tenum.nim
index 6e53b9c08..6e53b9c08 100644..100755
--- a/tests/accept/compile/tenum.nim
+++ b/tests/accept/compile/tenum.nim
diff --git a/tests/accept/compile/tforwty.nim b/tests/accept/compile/tforwty.nim
index 0f1d3697f..0f1d3697f 100644..100755
--- a/tests/accept/compile/tforwty.nim
+++ b/tests/accept/compile/tforwty.nim
diff --git a/tests/accept/compile/tforwty2.nim b/tests/accept/compile/tforwty2.nim
index 5d15e112a..5d15e112a 100644..100755
--- a/tests/accept/compile/tforwty2.nim
+++ b/tests/accept/compile/tforwty2.nim
diff --git a/tests/accept/compile/tgtk.nim b/tests/accept/compile/tgtk.nim
index cd9254e4f..cd9254e4f 100644..100755
--- a/tests/accept/compile/tgtk.nim
+++ b/tests/accept/compile/tgtk.nim
diff --git a/tests/accept/compile/thallo.nim b/tests/accept/compile/thallo.nim
index f1cae5897..f1cae5897 100644..100755
--- a/tests/accept/compile/thallo.nim
+++ b/tests/accept/compile/thallo.nim
diff --git a/tests/accept/compile/tident.nim b/tests/accept/compile/tident.nim
index 1ed9894c6..1ed9894c6 100644..100755
--- a/tests/accept/compile/tident.nim
+++ b/tests/accept/compile/tident.nim
diff --git a/tests/accept/compile/tindent1.nim b/tests/accept/compile/tindent1.nim
index 0527b6e57..0527b6e57 100644..100755
--- a/tests/accept/compile/tindent1.nim
+++ b/tests/accept/compile/tindent1.nim
diff --git a/tests/accept/compile/tio.nim b/tests/accept/compile/tio.nim
index 014c32d9f..014c32d9f 100644..100755
--- a/tests/accept/compile/tio.nim
+++ b/tests/accept/compile/tio.nim
diff --git a/tests/accept/compile/titer.nim b/tests/accept/compile/titer.nim
index 19a11dc4e..19a11dc4e 100644..100755
--- a/tests/accept/compile/titer.nim
+++ b/tests/accept/compile/titer.nim
diff --git a/tests/accept/compile/tlastmod.nim b/tests/accept/compile/tlastmod.nim
index 75b047fc8..75b047fc8 100644..100755
--- a/tests/accept/compile/tlastmod.nim
+++ b/tests/accept/compile/tlastmod.nim
diff --git a/tests/accept/compile/tlexer.nim b/tests/accept/compile/tlexer.nim
index fe784280c..fe784280c 100644..100755
--- a/tests/accept/compile/tlexer.nim
+++ b/tests/accept/compile/tlexer.nim
diff --git a/tests/accept/compile/tlibs.nim b/tests/accept/compile/tlibs.nim
index e3b6bd4c3..e3b6bd4c3 100644..100755
--- a/tests/accept/compile/tlibs.nim
+++ b/tests/accept/compile/tlibs.nim
diff --git a/tests/accept/compile/tloops.nim b/tests/accept/compile/tloops.nim
index 3d03256ad..3d03256ad 100644..100755
--- a/tests/accept/compile/tloops.nim
+++ b/tests/accept/compile/tloops.nim
diff --git a/tests/accept/compile/tmath.nim b/tests/accept/compile/tmath.nim
index 6a1dae54d..6a1dae54d 100644..100755
--- a/tests/accept/compile/tmath.nim
+++ b/tests/accept/compile/tmath.nim
diff --git a/tests/accept/compile/tnew.nim b/tests/accept/compile/tnew.nim
index 6527541a2..6527541a2 100644..100755
--- a/tests/accept/compile/tnew.nim
+++ b/tests/accept/compile/tnew.nim
diff --git a/tests/accept/compile/tnewlibs.nim b/tests/accept/compile/tnewlibs.nim
index aca2e3c30..aca2e3c30 100644..100755
--- a/tests/accept/compile/tnewlibs.nim
+++ b/tests/accept/compile/tnewlibs.nim
diff --git a/tests/accept/compile/tnewsets.nim b/tests/accept/compile/tnewsets.nim
index 415fe8f7e..415fe8f7e 100644..100755
--- a/tests/accept/compile/tnewsets.nim
+++ b/tests/accept/compile/tnewsets.nim
diff --git a/tests/accept/compile/tnewuns.nim b/tests/accept/compile/tnewuns.nim
index 5181e467c..5181e467c 100644..100755
--- a/tests/accept/compile/tnewuns.nim
+++ b/tests/accept/compile/tnewuns.nim
diff --git a/tests/accept/compile/tobjcov.nim b/tests/accept/compile/tobjcov.nim
index da34fcb60..da34fcb60 100644..100755
--- a/tests/accept/compile/tobjcov.nim
+++ b/tests/accept/compile/tobjcov.nim
diff --git a/tests/accept/compile/tobject2.nim b/tests/accept/compile/tobject2.nim
index 8f69a6bac..8f69a6bac 100644..100755
--- a/tests/accept/compile/tobject2.nim
+++ b/tests/accept/compile/tobject2.nim
diff --git a/tests/accept/compile/tobjects.nim b/tests/accept/compile/tobjects.nim
index 8305e2838..8305e2838 100644..100755
--- a/tests/accept/compile/tobjects.nim
+++ b/tests/accept/compile/tobjects.nim
diff --git a/tests/accept/compile/toptions.nim b/tests/accept/compile/toptions.nim
index 95bb5cfbc..95bb5cfbc 100644..100755
--- a/tests/accept/compile/toptions.nim
+++ b/tests/accept/compile/toptions.nim
diff --git a/tests/accept/compile/tos.nim b/tests/accept/compile/tos.nim
index 9ab4295f8..9ab4295f8 100644..100755
--- a/tests/accept/compile/tos.nim
+++ b/tests/accept/compile/tos.nim
diff --git a/tests/accept/compile/toverprc.nim b/tests/accept/compile/toverprc.nim
index f35528ace..f35528ace 100644..100755
--- a/tests/accept/compile/toverprc.nim
+++ b/tests/accept/compile/toverprc.nim
diff --git a/tests/accept/compile/tparedef.nim b/tests/accept/compile/tparedef.nim
index dedebf6b7..dedebf6b7 100644..100755
--- a/tests/accept/compile/tparedef.nim
+++ b/tests/accept/compile/tparedef.nim
diff --git a/tests/accept/compile/tparscfg.nim b/tests/accept/compile/tparscfg.nim
index 618ecadd6..618ecadd6 100644..100755
--- a/tests/accept/compile/tparscfg.nim
+++ b/tests/accept/compile/tparscfg.nim
diff --git a/tests/accept/compile/tparsefloat.nim b/tests/accept/compile/tparsefloat.nim
index 38ed2db6d..38ed2db6d 100644..100755
--- a/tests/accept/compile/tparsefloat.nim
+++ b/tests/accept/compile/tparsefloat.nim
diff --git a/tests/accept/compile/tparsopt.nim b/tests/accept/compile/tparsopt.nim
index 2b2da7e51..2b2da7e51 100644..100755
--- a/tests/accept/compile/tparsopt.nim
+++ b/tests/accept/compile/tparsopt.nim
diff --git a/tests/accept/compile/tposix.nim b/tests/accept/compile/tposix.nim
index bf0b49586..bf0b49586 100644..100755
--- a/tests/accept/compile/tposix.nim
+++ b/tests/accept/compile/tposix.nim
diff --git a/tests/accept/compile/tprep.nim b/tests/accept/compile/tprep.nim
index 999b2f57f..999b2f57f 100644..100755
--- a/tests/accept/compile/tprep.nim
+++ b/tests/accept/compile/tprep.nim
diff --git a/tests/accept/compile/tpush.nim b/tests/accept/compile/tpush.nim
index 5fb411a79..5fb411a79 100644..100755
--- a/tests/accept/compile/tpush.nim
+++ b/tests/accept/compile/tpush.nim
diff --git a/tests/accept/compile/tquicksort.nim b/tests/accept/compile/tquicksort.nim
index 421564ecd..421564ecd 100644..100755
--- a/tests/accept/compile/tquicksort.nim
+++ b/tests/accept/compile/tquicksort.nim
diff --git a/tests/accept/compile/tquit.nim b/tests/accept/compile/tquit.nim
index d4dc1522d..d4dc1522d 100644..100755
--- a/tests/accept/compile/tquit.nim
+++ b/tests/accept/compile/tquit.nim
diff --git a/tests/accept/compile/tradix.nim b/tests/accept/compile/tradix.nim
index e7ca210e4..e7ca210e4 100644..100755
--- a/tests/accept/compile/tradix.nim
+++ b/tests/accept/compile/tradix.nim
diff --git a/tests/accept/compile/treadln.nim b/tests/accept/compile/treadln.nim
index 7703d5a56..7703d5a56 100644..100755
--- a/tests/accept/compile/treadln.nim
+++ b/tests/accept/compile/treadln.nim
diff --git a/tests/accept/compile/treadx.nim b/tests/accept/compile/treadx.nim
index 13acb0514..13acb0514 100644..100755
--- a/tests/accept/compile/treadx.nim
+++ b/tests/accept/compile/treadx.nim
diff --git a/tests/accept/compile/trecmod.nim b/tests/accept/compile/trecmod.nim
index 9d39d3ff7..9d39d3ff7 100644..100755
--- a/tests/accept/compile/trecmod.nim
+++ b/tests/accept/compile/trecmod.nim
diff --git a/tests/accept/compile/trecmod2.nim b/tests/accept/compile/trecmod2.nim
index 85fe2215f..85fe2215f 100644..100755
--- a/tests/accept/compile/trecmod2.nim
+++ b/tests/accept/compile/trecmod2.nim
diff --git a/tests/accept/compile/trepr.nim b/tests/accept/compile/trepr.nim
index 4a56842f6..4a56842f6 100644..100755
--- a/tests/accept/compile/trepr.nim
+++ b/tests/accept/compile/trepr.nim
diff --git a/tests/accept/compile/tseq2.nim b/tests/accept/compile/tseq2.nim
index 03bdb3fab..03bdb3fab 100644..100755
--- a/tests/accept/compile/tseq2.nim
+++ b/tests/accept/compile/tseq2.nim
diff --git a/tests/accept/compile/tseqcon2.nim b/tests/accept/compile/tseqcon2.nim
index 6225c3bb1..6225c3bb1 100644..100755
--- a/tests/accept/compile/tseqcon2.nim
+++ b/tests/accept/compile/tseqcon2.nim
diff --git a/tests/accept/compile/tsizeof.nim b/tests/accept/compile/tsizeof.nim
index f7b70dd4d..f7b70dd4d 100644..100755
--- a/tests/accept/compile/tsizeof.nim
+++ b/tests/accept/compile/tsizeof.nim
diff --git a/tests/accept/compile/tsockets.nim b/tests/accept/compile/tsockets.nim
index cc7d18b87..cc7d18b87 100644..100755
--- a/tests/accept/compile/tsockets.nim
+++ b/tests/accept/compile/tsockets.nim
diff --git a/tests/accept/compile/tstrace.nim b/tests/accept/compile/tstrace.nim
index 56f20a0dd..56f20a0dd 100644..100755
--- a/tests/accept/compile/tstrace.nim
+++ b/tests/accept/compile/tstrace.nim
diff --git a/tests/accept/compile/tstrdesc.nim b/tests/accept/compile/tstrdesc.nim
index 1c2e85b4b..1c2e85b4b 100644..100755
--- a/tests/accept/compile/tstrdesc.nim
+++ b/tests/accept/compile/tstrdesc.nim
diff --git a/tests/accept/compile/tstrdist.nim b/tests/accept/compile/tstrdist.nim
index 3e1939e73..3e1939e73 100644..100755
--- a/tests/accept/compile/tstrdist.nim
+++ b/tests/accept/compile/tstrdist.nim
diff --git a/tests/accept/compile/tstreams.nim b/tests/accept/compile/tstreams.nim
index 68ca8eeeb..68ca8eeeb 100644..100755
--- a/tests/accept/compile/tstreams.nim
+++ b/tests/accept/compile/tstreams.nim
diff --git a/tests/accept/compile/tstrset.nim b/tests/accept/compile/tstrset.nim
index e19ccee4d..e19ccee4d 100644..100755
--- a/tests/accept/compile/tstrset.nim
+++ b/tests/accept/compile/tstrset.nim
diff --git a/tests/accept/compile/tstrtabs.nim b/tests/accept/compile/tstrtabs.nim
index 299db609d..299db609d 100644..100755
--- a/tests/accept/compile/tstrtabs.nim
+++ b/tests/accept/compile/tstrtabs.nim
diff --git a/tests/accept/compile/ttempl.nim b/tests/accept/compile/ttempl.nim
index dcf096671..dcf096671 100644..100755
--- a/tests/accept/compile/ttempl.nim
+++ b/tests/accept/compile/ttempl.nim
diff --git a/tests/accept/compile/ttempl3.nim b/tests/accept/compile/ttempl3.nim
index 0c8fa9a94..0c8fa9a94 100644..100755
--- a/tests/accept/compile/ttempl3.nim
+++ b/tests/accept/compile/ttempl3.nim
diff --git a/tests/accept/compile/ttime.nim b/tests/accept/compile/ttime.nim
index bad818816..bad818816 100644..100755
--- a/tests/accept/compile/ttime.nim
+++ b/tests/accept/compile/ttime.nim
diff --git a/tests/accept/compile/ttuple1.nim b/tests/accept/compile/ttuple1.nim
index 5787cc309..5787cc309 100644..100755
--- a/tests/accept/compile/ttuple1.nim
+++ b/tests/accept/compile/ttuple1.nim
diff --git a/tests/accept/compile/tvarious.nim b/tests/accept/compile/tvarious.nim
index 52dd46184..52dd46184 100644..100755
--- a/tests/accept/compile/tvarious.nim
+++ b/tests/accept/compile/tvarious.nim
diff --git a/tests/accept/compile/twalker.nim b/tests/accept/compile/twalker.nim
index ba89ee7c6..ba89ee7c6 100644..100755
--- a/tests/accept/compile/twalker.nim
+++ b/tests/accept/compile/twalker.nim
diff --git a/tests/accept/compile/typalias.nim b/tests/accept/compile/typalias.nim
index ba9f38ed9..ba9f38ed9 100644..100755
--- a/tests/accept/compile/typalias.nim
+++ b/tests/accept/compile/typalias.nim
diff --git a/tests/accept/run/mambsys1.nim b/tests/accept/run/mambsys1.nim
index 5472b5ae4..5472b5ae4 100644..100755
--- a/tests/accept/run/mambsys1.nim
+++ b/tests/accept/run/mambsys1.nim
diff --git a/tests/accept/run/mambsys2.nim b/tests/accept/run/mambsys2.nim
index 395425b86..395425b86 100644..100755
--- a/tests/accept/run/mambsys2.nim
+++ b/tests/accept/run/mambsys2.nim
diff --git a/tests/accept/run/mbind3.nim b/tests/accept/run/mbind3.nim
index 586222eb8..586222eb8 100644..100755
--- a/tests/accept/run/mbind3.nim
+++ b/tests/accept/run/mbind3.nim
diff --git a/tests/accept/run/minit.nim b/tests/accept/run/minit.nim
index d3b4b0be1..d3b4b0be1 100644..100755
--- a/tests/accept/run/minit.nim
+++ b/tests/accept/run/minit.nim
diff --git a/tests/accept/run/spec.csv b/tests/accept/run/spec.csv
index c5e16685a..c5e16685a 100644..100755
--- a/tests/accept/run/spec.csv
+++ b/tests/accept/run/spec.csv
diff --git a/tests/accept/run/tack.nim b/tests/accept/run/tack.nim
index 59535e547..59535e547 100644..100755
--- a/tests/accept/run/tack.nim
+++ b/tests/accept/run/tack.nim
diff --git a/tests/accept/run/tambsym2.nim b/tests/accept/run/tambsym2.nim
index 9178182aa..9178182aa 100644..100755
--- a/tests/accept/run/tambsym2.nim
+++ b/tests/accept/run/tambsym2.nim
diff --git a/tests/accept/run/tambsys.nim b/tests/accept/run/tambsys.nim
index bb2622824..bb2622824 100644..100755
--- a/tests/accept/run/tambsys.nim
+++ b/tests/accept/run/tambsys.nim
diff --git a/tests/accept/run/tarray.nim b/tests/accept/run/tarray.nim
index 252cbd991..252cbd991 100644..100755
--- a/tests/accept/run/tarray.nim
+++ b/tests/accept/run/tarray.nim
diff --git a/tests/accept/run/tarray2.nim b/tests/accept/run/tarray2.nim
index eb0b75692..eb0b75692 100644..100755
--- a/tests/accept/run/tarray2.nim
+++ b/tests/accept/run/tarray2.nim
diff --git a/tests/accept/run/tassert.nim b/tests/accept/run/tassert.nim
index 9fd18e9bd..9fd18e9bd 100644..100755
--- a/tests/accept/run/tassert.nim
+++ b/tests/accept/run/tassert.nim
diff --git a/tests/accept/run/tbind1.nim b/tests/accept/run/tbind1.nim
index e7eed3e4f..e7eed3e4f 100644..100755
--- a/tests/accept/run/tbind1.nim
+++ b/tests/accept/run/tbind1.nim
diff --git a/tests/accept/run/tbind3.nim b/tests/accept/run/tbind3.nim
index f7fb4865b..f7fb4865b 100644..100755
--- a/tests/accept/run/tbind3.nim
+++ b/tests/accept/run/tbind3.nim
diff --git a/tests/accept/run/tbintre2.nim b/tests/accept/run/tbintre2.nim
index dedc87705..dedc87705 100644..100755
--- a/tests/accept/run/tbintre2.nim
+++ b/tests/accept/run/tbintre2.nim
diff --git a/tests/accept/run/tbintree.nim b/tests/accept/run/tbintree.nim
index 89126eaa5..89126eaa5 100644..100755
--- a/tests/accept/run/tbintree.nim
+++ b/tests/accept/run/tbintree.nim
diff --git a/tests/accept/run/tbug511622.nim b/tests/accept/run/tbug511622.nim
index 296c36b9c..296c36b9c 100644..100755
--- a/tests/accept/run/tbug511622.nim
+++ b/tests/accept/run/tbug511622.nim
diff --git a/tests/accept/run/tcasestm.nim b/tests/accept/run/tcasestm.nim
index 277b0bab1..277b0bab1 100644..100755
--- a/tests/accept/run/tcasestm.nim
+++ b/tests/accept/run/tcasestm.nim
diff --git a/tests/accept/run/tclosure.nim b/tests/accept/run/tclosure.nim
index 761e9a8f3..761e9a8f3 100644..100755
--- a/tests/accept/run/tclosure.nim
+++ b/tests/accept/run/tclosure.nim
diff --git a/tests/accept/run/tcnstseq.nim b/tests/accept/run/tcnstseq.nim
index 4f389bb3b..4f389bb3b 100644..100755
--- a/tests/accept/run/tcnstseq.nim
+++ b/tests/accept/run/tcnstseq.nim
diff --git a/tests/accept/run/tconstr2.nim b/tests/accept/run/tconstr2.nim
index 7687a416c..7687a416c 100644..100755
--- a/tests/accept/run/tconstr2.nim
+++ b/tests/accept/run/tconstr2.nim
diff --git a/tests/accept/run/tcopy.nim b/tests/accept/run/tcopy.nim
index 6cb2ec14c..6cb2ec14c 100644..100755
--- a/tests/accept/run/tcopy.nim
+++ b/tests/accept/run/tcopy.nim
diff --git a/tests/accept/run/tcurrncy.nim b/tests/accept/run/tcurrncy.nim
index fa08d620b..fa08d620b 100644..100755
--- a/tests/accept/run/tcurrncy.nim
+++ b/tests/accept/run/tcurrncy.nim
diff --git a/tests/accept/run/tfinally.nim b/tests/accept/run/tfinally.nim
index df6397125..df6397125 100644..100755
--- a/tests/accept/run/tfinally.nim
+++ b/tests/accept/run/tfinally.nim
diff --git a/tests/accept/run/tfloat1.nim b/tests/accept/run/tfloat1.nim
index 89911dd61..89911dd61 100644..100755
--- a/tests/accept/run/tfloat1.nim
+++ b/tests/accept/run/tfloat1.nim
diff --git a/tests/accept/run/tfloat2.nim b/tests/accept/run/tfloat2.nim
index 92421d446..92421d446 100644..100755
--- a/tests/accept/run/tfloat2.nim
+++ b/tests/accept/run/tfloat2.nim
diff --git a/tests/accept/run/tformat.nim b/tests/accept/run/tformat.nim
index aba35504b..aba35504b 100644..100755
--- a/tests/accept/run/tformat.nim
+++ b/tests/accept/run/tformat.nim
diff --git a/tests/accept/run/thintoff.nim b/tests/accept/run/thintoff.nim
index 7aff283d6..7aff283d6 100644..100755
--- a/tests/accept/run/thintoff.nim
+++ b/tests/accept/run/thintoff.nim
diff --git a/tests/accept/run/tinit.nim b/tests/accept/run/tinit.nim
index 85475ce94..85475ce94 100644..100755
--- a/tests/accept/run/tinit.nim
+++ b/tests/accept/run/tinit.nim
diff --git a/tests/accept/run/tints.nim b/tests/accept/run/tints.nim
index f2b52c134..f2b52c134 100644..100755
--- a/tests/accept/run/tints.nim
+++ b/tests/accept/run/tints.nim
diff --git a/tests/accept/run/tisopr.nim b/tests/accept/run/tisopr.nim
index d52859b09..d52859b09 100644..100755
--- a/tests/accept/run/tisopr.nim
+++ b/tests/accept/run/tisopr.nim
diff --git a/tests/accept/run/titer2.nim b/tests/accept/run/titer2.nim
index b9cdb53fe..b9cdb53fe 100644..100755
--- a/tests/accept/run/titer2.nim
+++ b/tests/accept/run/titer2.nim
diff --git a/tests/accept/run/titer3.nim b/tests/accept/run/titer3.nim
index d0e121445..d0e121445 100644..100755
--- a/tests/accept/run/titer3.nim
+++ b/tests/accept/run/titer3.nim
diff --git a/tests/accept/run/titer5.nim b/tests/accept/run/titer5.nim
index 1ac37ba66..1ac37ba66 100644..100755
--- a/tests/accept/run/titer5.nim
+++ b/tests/accept/run/titer5.nim
diff --git a/tests/accept/run/tlowhigh.nim b/tests/accept/run/tlowhigh.nim
index 79f5c5b95..79f5c5b95 100644..100755
--- a/tests/accept/run/tlowhigh.nim
+++ b/tests/accept/run/tlowhigh.nim
diff --git a/tests/accept/run/tmatrix.nim b/tests/accept/run/tmatrix.nim
index a162d0f10..a162d0f10 100644..100755
--- a/tests/accept/run/tmatrix.nim
+++ b/tests/accept/run/tmatrix.nim
diff --git a/tests/accept/run/tmultim1.nim b/tests/accept/run/tmultim1.nim
index 5d807e4c9..5d807e4c9 100644..100755
--- a/tests/accept/run/tmultim1.nim
+++ b/tests/accept/run/tmultim1.nim
diff --git a/tests/accept/run/tmultim2.nim b/tests/accept/run/tmultim2.nim
index bf3b5fd6e..bf3b5fd6e 100644..100755
--- a/tests/accept/run/tmultim2.nim
+++ b/tests/accept/run/tmultim2.nim
diff --git a/tests/accept/run/tnestif.nim b/tests/accept/run/tnestif.nim
index 558fe8d07..558fe8d07 100644..100755
--- a/tests/accept/run/tnestif.nim
+++ b/tests/accept/run/tnestif.nim
diff --git a/tests/accept/run/tnestprc.nim b/tests/accept/run/tnestprc.nim
index b7326e032..b7326e032 100644..100755
--- a/tests/accept/run/tnestprc.nim
+++ b/tests/accept/run/tnestprc.nim
diff --git a/tests/accept/run/toop1.nim b/tests/accept/run/toop1.nim
index 8bae002e7..8bae002e7 100644..100755
--- a/tests/accept/run/toop1.nim
+++ b/tests/accept/run/toop1.nim
diff --git a/tests/accept/run/topenarrayrepr.nim b/tests/accept/run/topenarrayrepr.nim
index 7e976540f..7e976540f 100644..100755
--- a/tests/accept/run/topenarrayrepr.nim
+++ b/tests/accept/run/topenarrayrepr.nim
diff --git a/tests/accept/run/topenlen.nim b/tests/accept/run/topenlen.nim
index b9d7fbc2d..b9d7fbc2d 100644..100755
--- a/tests/accept/run/topenlen.nim
+++ b/tests/accept/run/topenlen.nim
diff --git a/tests/accept/run/toverflw.nim b/tests/accept/run/toverflw.nim
index c8f194e68..c8f194e68 100644..100755
--- a/tests/accept/run/toverflw.nim
+++ b/tests/accept/run/toverflw.nim
diff --git a/tests/accept/run/toverl2.nim b/tests/accept/run/toverl2.nim
index 2d1225c6f..2d1225c6f 100644..100755
--- a/tests/accept/run/toverl2.nim
+++ b/tests/accept/run/toverl2.nim
diff --git a/tests/accept/run/toverlop.nim b/tests/accept/run/toverlop.nim
index f11275644..f11275644 100644..100755
--- a/tests/accept/run/toverlop.nim
+++ b/tests/accept/run/toverlop.nim
diff --git a/tests/accept/run/toverwr.nim b/tests/accept/run/toverwr.nim
index f2b42df15..f2b42df15 100644..100755
--- a/tests/accept/run/toverwr.nim
+++ b/tests/accept/run/toverwr.nim
diff --git a/tests/accept/run/tovfint.nim b/tests/accept/run/tovfint.nim
index 91eda8d0b..91eda8d0b 100644..100755
--- a/tests/accept/run/tovfint.nim
+++ b/tests/accept/run/tovfint.nim
diff --git a/tests/accept/run/tpos.nim b/tests/accept/run/tpos.nim
index 114d39c05..114d39c05 100644..100755
--- a/tests/accept/run/tpos.nim
+++ b/tests/accept/run/tpos.nim
diff --git a/tests/accept/run/tprintf.nim b/tests/accept/run/tprintf.nim
index 14687a937..14687a937 100644..100755
--- a/tests/accept/run/tprintf.nim
+++ b/tests/accept/run/tprintf.nim
diff --git a/tests/accept/run/tprocvar.nim b/tests/accept/run/tprocvar.nim
index f51543dfa..f51543dfa 100644..100755
--- a/tests/accept/run/tprocvar.nim
+++ b/tests/accept/run/tprocvar.nim
diff --git a/tests/accept/run/tquotewords.nim b/tests/accept/run/tquotewords.nim
index 462293b40..462293b40 100644..100755
--- a/tests/accept/run/tquotewords.nim
+++ b/tests/accept/run/tquotewords.nim
diff --git a/tests/accept/run/tregex.nim b/tests/accept/run/tregex.nim
index d9d22d603..d9d22d603 100644..100755
--- a/tests/accept/run/tregex.nim
+++ b/tests/accept/run/tregex.nim
diff --git a/tests/accept/run/treguse.nim b/tests/accept/run/treguse.nim
index dc805fc70..dc805fc70 100644..100755
--- a/tests/accept/run/treguse.nim
+++ b/tests/accept/run/treguse.nim
diff --git a/tests/accept/run/tromans.nim b/tests/accept/run/tromans.nim
index 12deca1ea..12deca1ea 100644..100755
--- a/tests/accept/run/tromans.nim
+++ b/tests/accept/run/tromans.nim
diff --git a/tests/accept/run/tseqcon.nim b/tests/accept/run/tseqcon.nim
index 935da86b5..935da86b5 100644..100755
--- a/tests/accept/run/tseqcon.nim
+++ b/tests/accept/run/tseqcon.nim
diff --git a/tests/accept/run/tsets.nim b/tests/accept/run/tsets.nim
index 08ab3e54b..08ab3e54b 100644..100755
--- a/tests/accept/run/tsets.nim
+++ b/tests/accept/run/tsets.nim
diff --git a/tests/accept/run/tsidee2.nim b/tests/accept/run/tsidee2.nim
index 2eaec01d7..2eaec01d7 100644..100755
--- a/tests/accept/run/tsidee2.nim
+++ b/tests/accept/run/tsidee2.nim
diff --git a/tests/accept/run/tsidee3.nim b/tests/accept/run/tsidee3.nim
index be94192e7..be94192e7 100644..100755
--- a/tests/accept/run/tsidee3.nim
+++ b/tests/accept/run/tsidee3.nim
diff --git a/tests/accept/run/tsimmeth.nim b/tests/accept/run/tsimmeth.nim
index 3f5f810e6..3f5f810e6 100644..100755
--- a/tests/accept/run/tsimmeth.nim
+++ b/tests/accept/run/tsimmeth.nim
diff --git a/tests/accept/run/tsplit.nim b/tests/accept/run/tsplit.nim
index 711696b9e..711696b9e 100644..100755
--- a/tests/accept/run/tsplit.nim
+++ b/tests/accept/run/tsplit.nim
diff --git a/tests/accept/run/tstrange.nim b/tests/accept/run/tstrange.nim
index 13aab2302..13aab2302 100644..100755
--- a/tests/accept/run/tstrange.nim
+++ b/tests/accept/run/tstrange.nim
diff --git a/tests/accept/run/tstrlits.nim b/tests/accept/run/tstrlits.nim
index 48ae08212..48ae08212 100644..100755
--- a/tests/accept/run/tstrlits.nim
+++ b/tests/accept/run/tstrlits.nim
diff --git a/tests/accept/run/tstrutil.nim b/tests/accept/run/tstrutil.nim
index 0468dfa0c..0468dfa0c 100644..100755
--- a/tests/accept/run/tstrutil.nim
+++ b/tests/accept/run/tstrutil.nim
diff --git a/tests/accept/run/tvardecl.nim b/tests/accept/run/tvardecl.nim
index 496601e3a..496601e3a 100644..100755
--- a/tests/accept/run/tvardecl.nim
+++ b/tests/accept/run/tvardecl.nim
diff --git a/tests/accept/run/tvarnums.nim b/tests/accept/run/tvarnums.nim
index 1b683ad94..1b683ad94 100644..100755
--- a/tests/accept/run/tvarnums.nim
+++ b/tests/accept/run/tvarnums.nim
diff --git a/tests/accept/run/tvartup.nim b/tests/accept/run/tvartup.nim
index 05b00b207..05b00b207 100644..100755
--- a/tests/accept/run/tvartup.nim
+++ b/tests/accept/run/tvartup.nim
diff --git a/tests/ecmas.html b/tests/ecmas.html
index 1cb56e72a..1cb56e72a 100644..100755
--- a/tests/ecmas.html
+++ b/tests/ecmas.html
diff --git a/tests/ecmas.nim b/tests/ecmas.nim
index 59e7ae1e8..59e7ae1e8 100644..100755
--- a/tests/ecmas.nim
+++ b/tests/ecmas.nim
diff --git a/tests/gc/gcbench.nim b/tests/gc/gcbench.nim
index d9e152326..d9e152326 100644..100755
--- a/tests/gc/gcbench.nim
+++ b/tests/gc/gcbench.nim
diff --git a/tests/gc/gctest.nim b/tests/gc/gctest.nim
index f58dc3217..f58dc3217 100644..100755
--- a/tests/gc/gctest.nim
+++ b/tests/gc/gctest.nim
diff --git a/tests/readme.txt b/tests/readme.txt
index c21b04acd..c21b04acd 100644..100755
--- a/tests/readme.txt
+++ b/tests/readme.txt
diff --git a/tests/rectest.nim b/tests/rectest.nim
index f08306cfd..f08306cfd 100644..100755
--- a/tests/rectest.nim
+++ b/tests/rectest.nim
diff --git a/tests/reject/99bottles.nim b/tests/reject/99bottles.nim
index 14904ac0f..14904ac0f 100644..100755
--- a/tests/reject/99bottles.nim
+++ b/tests/reject/99bottles.nim
diff --git a/tests/reject/mambsym1.nim b/tests/reject/mambsym1.nim
index cf8ac5242..cf8ac5242 100644..100755
--- a/tests/reject/mambsym1.nim
+++ b/tests/reject/mambsym1.nim
diff --git a/tests/reject/mambsym2.nim b/tests/reject/mambsym2.nim
index eac8de6ba..eac8de6ba 100644..100755
--- a/tests/reject/mambsym2.nim
+++ b/tests/reject/mambsym2.nim
diff --git a/tests/reject/mbind4.nim b/tests/reject/mbind4.nim
index 53b8331cd..53b8331cd 100644..100755
--- a/tests/reject/mbind4.nim
+++ b/tests/reject/mbind4.nim
diff --git a/tests/reject/mnamspc1.nim b/tests/reject/mnamspc1.nim
index da13c5f24..da13c5f24 100644..100755
--- a/tests/reject/mnamspc1.nim
+++ b/tests/reject/mnamspc1.nim
diff --git a/tests/reject/mnamspc2.nim b/tests/reject/mnamspc2.nim
index 84ef8533e..84ef8533e 100644..100755
--- a/tests/reject/mnamspc2.nim
+++ b/tests/reject/mnamspc2.nim
diff --git a/tests/reject/mopaque.nim b/tests/reject/mopaque.nim
index b7c5180fd..b7c5180fd 100644..100755
--- a/tests/reject/mopaque.nim
+++ b/tests/reject/mopaque.nim
diff --git a/tests/reject/spec.csv b/tests/reject/spec.csv
index bd42fe4a8..bd42fe4a8 100644..100755
--- a/tests/reject/spec.csv
+++ b/tests/reject/spec.csv
diff --git a/tests/reject/t99bott.nim b/tests/reject/t99bott.nim
index 4dfb11701..4dfb11701 100644..100755
--- a/tests/reject/t99bott.nim
+++ b/tests/reject/t99bott.nim
diff --git a/tests/reject/tadrdisc.nim b/tests/reject/tadrdisc.nim
index a7118455f..a7118455f 100644..100755
--- a/tests/reject/tadrdisc.nim
+++ b/tests/reject/tadrdisc.nim
diff --git a/tests/reject/tambsym.nim b/tests/reject/tambsym.nim
index b8eae3ba3..b8eae3ba3 100644..100755
--- a/tests/reject/tambsym.nim
+++ b/tests/reject/tambsym.nim
diff --git a/tests/reject/tambsym3.nim b/tests/reject/tambsym3.nim
index 96a5098c9..96a5098c9 100644..100755
--- a/tests/reject/tambsym3.nim
+++ b/tests/reject/tambsym3.nim
diff --git a/tests/reject/tatomic.nim b/tests/reject/tatomic.nim
index 0f1b8125d..0f1b8125d 100644..100755
--- a/tests/reject/tatomic.nim
+++ b/tests/reject/tatomic.nim
diff --git a/tests/reject/tbind2.nim b/tests/reject/tbind2.nim
index 41711083f..41711083f 100644..100755
--- a/tests/reject/tbind2.nim
+++ b/tests/reject/tbind2.nim
diff --git a/tests/reject/tbind4.nim b/tests/reject/tbind4.nim
index d0b5fc062..d0b5fc062 100644..100755
--- a/tests/reject/tbind4.nim
+++ b/tests/reject/tbind4.nim
diff --git a/tests/reject/tblock1.nim b/tests/reject/tblock1.nim
index 0bea7ae7f..0bea7ae7f 100644..100755
--- a/tests/reject/tblock1.nim
+++ b/tests/reject/tblock1.nim
diff --git a/tests/reject/tconstr1.nim b/tests/reject/tconstr1.nim
index 488170350..488170350 100644..100755
--- a/tests/reject/tconstr1.nim
+++ b/tests/reject/tconstr1.nim
diff --git a/tests/reject/tillrec.nim b/tests/reject/tillrec.nim
index 21ce19889..21ce19889 100644..100755
--- a/tests/reject/tillrec.nim
+++ b/tests/reject/tillrec.nim
diff --git a/tests/reject/tinc.nim b/tests/reject/tinc.nim
index 3a27b5026..3a27b5026 100644..100755
--- a/tests/reject/tinc.nim
+++ b/tests/reject/tinc.nim
diff --git a/tests/reject/tinout.nim b/tests/reject/tinout.nim
index b4fe2fb10..b4fe2fb10 100644..100755
--- a/tests/reject/tinout.nim
+++ b/tests/reject/tinout.nim
diff --git a/tests/reject/tinvalidnewseq.nim b/tests/reject/tinvalidnewseq.nim
index e2a3736c3..e2a3736c3 100644..100755
--- a/tests/reject/tinvalidnewseq.nim
+++ b/tests/reject/tinvalidnewseq.nim
diff --git a/tests/reject/tinvwhen.nim b/tests/reject/tinvwhen.nim
index 8dc8cbf50..8dc8cbf50 100644..100755
--- a/tests/reject/tinvwhen.nim
+++ b/tests/reject/tinvwhen.nim
diff --git a/tests/reject/titer4.nim b/tests/reject/titer4.nim
index 376522482..376522482 100644..100755
--- a/tests/reject/titer4.nim
+++ b/tests/reject/titer4.nim
diff --git a/tests/reject/tnamspc.nim b/tests/reject/tnamspc.nim
index eddaacfd8..eddaacfd8 100644..100755
--- a/tests/reject/tnamspc.nim
+++ b/tests/reject/tnamspc.nim
diff --git a/tests/reject/tnoop.nim b/tests/reject/tnoop.nim
index d097553e8..d097553e8 100644..100755
--- a/tests/reject/tnoop.nim
+++ b/tests/reject/tnoop.nim
diff --git a/tests/reject/tnot.nim b/tests/reject/tnot.nim
index cda551654..cda551654 100644..100755
--- a/tests/reject/tnot.nim
+++ b/tests/reject/tnot.nim
diff --git a/tests/reject/topaque.nim b/tests/reject/topaque.nim
index 7553a749e..7553a749e 100644..100755
--- a/tests/reject/topaque.nim
+++ b/tests/reject/topaque.nim
diff --git a/tests/reject/topena1.nim b/tests/reject/topena1.nim
index 7351edf55..7351edf55 100644..100755
--- a/tests/reject/topena1.nim
+++ b/tests/reject/topena1.nim
diff --git a/tests/reject/toverl.nim b/tests/reject/toverl.nim
index 94f251cac..94f251cac 100644..100755
--- a/tests/reject/toverl.nim
+++ b/tests/reject/toverl.nim
diff --git a/tests/reject/trawstr.nim b/tests/reject/trawstr.nim
index 7b2db0335..7b2db0335 100644..100755
--- a/tests/reject/trawstr.nim
+++ b/tests/reject/trawstr.nim
diff --git a/tests/reject/trecinca.nim b/tests/reject/trecinca.nim
index d78fee233..d78fee233 100644..100755
--- a/tests/reject/trecinca.nim
+++ b/tests/reject/trecinca.nim
diff --git a/tests/reject/trecincb.nim b/tests/reject/trecincb.nim
index 6191671a1..6191671a1 100644..100755
--- a/tests/reject/trecincb.nim
+++ b/tests/reject/trecincb.nim
diff --git a/tests/reject/treciter.nim b/tests/reject/treciter.nim
index 662239285..662239285 100644..100755
--- a/tests/reject/treciter.nim
+++ b/tests/reject/treciter.nim
diff --git a/tests/reject/trectype.nim b/tests/reject/trectype.nim
index a7a6f56e0..a7a6f56e0 100644..100755
--- a/tests/reject/trectype.nim
+++ b/tests/reject/trectype.nim
diff --git a/tests/reject/trefs.nim b/tests/reject/trefs.nim
index ab3934088..ab3934088 100644..100755
--- a/tests/reject/trefs.nim
+++ b/tests/reject/trefs.nim
diff --git a/tests/reject/tsidee1.nim b/tests/reject/tsidee1.nim
index 3bd520680..3bd520680 100644..100755
--- a/tests/reject/tsidee1.nim
+++ b/tests/reject/tsidee1.nim
diff --git a/tests/reject/tsidee4.nim b/tests/reject/tsidee4.nim
index 55c474d10..55c474d10 100644..100755
--- a/tests/reject/tsidee4.nim
+++ b/tests/reject/tsidee4.nim
diff --git a/tests/reject/tsimtych.nim b/tests/reject/tsimtych.nim
index b100c62e3..b100c62e3 100644..100755
--- a/tests/reject/tsimtych.nim
+++ b/tests/reject/tsimtych.nim
diff --git a/tests/reject/tstatret.nim b/tests/reject/tstatret.nim
index ac93ac532..ac93ac532 100644..100755
--- a/tests/reject/tstatret.nim
+++ b/tests/reject/tstatret.nim
diff --git a/tests/reject/tstmtexp.nim b/tests/reject/tstmtexp.nim
index f4d83e83f..f4d83e83f 100644..100755
--- a/tests/reject/tstmtexp.nim
+++ b/tests/reject/tstmtexp.nim
diff --git a/tests/reject/ttempl2.nim b/tests/reject/ttempl2.nim
index fba6bd0cb..fba6bd0cb 100644..100755
--- a/tests/reject/ttempl2.nim
+++ b/tests/reject/ttempl2.nim
diff --git a/tests/reject/tunderscores.nim b/tests/reject/tunderscores.nim
index 459cfda30..459cfda30 100644..100755
--- a/tests/reject/tunderscores.nim
+++ b/tests/reject/tunderscores.nim
diff --git a/tests/reject/typredef.nim b/tests/reject/typredef.nim
index a77d91f40..a77d91f40 100644..100755
--- a/tests/reject/typredef.nim
+++ b/tests/reject/typredef.nim
diff --git a/tests/stckovfl.nim b/tests/stckovfl.nim
index 799fe0001..799fe0001 100644..100755
--- a/tests/stckovfl.nim
+++ b/tests/stckovfl.nim
diff --git a/tests/sunset.tmpl b/tests/sunset.tmpl
index 6475bac4e..6475bac4e 100644..100755
--- a/tests/sunset.tmpl
+++ b/tests/sunset.tmpl
diff --git a/tests/testdata/csvtest.csv b/tests/testdata/csvtest.csv
index 6e7e14103..6e7e14103 100644..100755
--- a/tests/testdata/csvtest.csv
+++ b/tests/testdata/csvtest.csv
diff --git a/tests/testdata/data.csv b/tests/testdata/data.csv
index ea73f7387..ea73f7387 100644..100755
--- a/tests/testdata/data.csv
+++ b/tests/testdata/data.csv
diff --git a/tests/testdata/doc1.xml b/tests/testdata/doc1.xml
index 2895cc32f..2895cc32f 100644..100755
--- a/tests/testdata/doc1.xml
+++ b/tests/testdata/doc1.xml
diff --git a/tests/testdata/jsontest.json b/tests/testdata/jsontest.json
index 27b5ba1d1..27b5ba1d1 100644..100755
--- a/tests/testdata/jsontest.json
+++ b/tests/testdata/jsontest.json
diff --git a/tests/testdata/wildhtml.html b/tests/testdata/wildhtml.html
index dfab7ba95..dfab7ba95 100644..100755
--- a/tests/testdata/wildhtml.html
+++ b/tests/testdata/wildhtml.html
diff --git a/tests/testdata/xmltest.html b/tests/testdata/xmltest.html
index ca4abc4eb..ca4abc4eb 100644..100755
--- a/tests/testdata/xmltest.html
+++ b/tests/testdata/xmltest.html
diff --git a/tests/tester.nim b/tests/tester.nim
index bd1b56188..bd1b56188 100644..100755
--- a/tests/tester.nim
+++ b/tests/tester.nim
diff --git a/tests/tnewlibs.cfg b/tests/tnewlibs.cfg
index 852209a36..852209a36 100644..100755
--- a/tests/tnewlibs.cfg
+++ b/tests/tnewlibs.cfg
diff --git a/tools/build.tmpl b/tools/build.tmpl
index a18831f95..a18831f95 100644..100755
--- a/tools/build.tmpl
+++ b/tools/build.tmpl
diff --git a/tools/cmerge.nim b/tools/cmerge.nim
index 729a8f218..729a8f218 100644..100755
--- a/tools/cmerge.nim
+++ b/tools/cmerge.nim
diff --git a/tools/deinstall.tmpl b/tools/deinstall.tmpl
index 19b31e5b4..19b31e5b4 100644..100755
--- a/tools/deinstall.tmpl
+++ b/tools/deinstall.tmpl
diff --git a/tools/inno.tmpl b/tools/inno.tmpl
index cc8583779..cc8583779 100644..100755
--- a/tools/inno.tmpl
+++ b/tools/inno.tmpl
diff --git a/tools/install.tmpl b/tools/install.tmpl
index bf3bfabc4..bf3bfabc4 100644..100755
--- a/tools/install.tmpl
+++ b/tools/install.tmpl
diff --git a/tools/niminst.nim b/tools/niminst.nim
index 2a5b18c38..2a5b18c38 100644..100755
--- a/tools/niminst.nim
+++ b/tools/niminst.nim
diff --git a/tools/nimrepl.nim b/tools/nimrepl.nim
index 696052665..696052665 100644..100755
--- a/tools/nimrepl.nim
+++ b/tools/nimrepl.nim
diff --git a/tools/nimweb.nim b/tools/nimweb.nim
index 7889591fc..7889591fc 100644..100755
--- a/tools/nimweb.nim
+++ b/tools/nimweb.nim
diff --git a/tools/noprefix.nim b/tools/noprefix.nim
index e7ec26c56..e7ec26c56 100644..100755
--- a/tools/noprefix.nim
+++ b/tools/noprefix.nim
diff --git a/tools/sunset.tmpl b/tools/sunset.tmpl
index 18f8b74d5..18f8b74d5 100644..100755
--- a/tools/sunset.tmpl
+++ b/tools/sunset.tmpl
diff --git a/tools/trimcc.nim b/tools/trimcc.nim
index 47dd2a4b4..47dd2a4b4 100644..100755
--- a/tools/trimcc.nim
+++ b/tools/trimcc.nim
diff --git a/web/community.txt b/web/community.txt
index 1a8b1c38b..1a8b1c38b 100644..100755
--- a/web/community.txt
+++ b/web/community.txt
diff --git a/web/documentation.txt b/web/documentation.txt
index da0313c32..da0313c32 100644..100755
--- a/web/documentation.txt
+++ b/web/documentation.txt
diff --git a/web/download.txt b/web/download.txt
index 21ca1f57d..21ca1f57d 100644..100755
--- a/web/download.txt
+++ b/web/download.txt
diff --git a/web/index.txt b/web/index.txt
index fd6a04242..fd6a04242 100644..100755
--- a/web/index.txt
+++ b/web/index.txt
diff --git a/web/links.txt b/web/links.txt
index e69de29bb..e69de29bb 100644..100755
--- a/web/links.txt
+++ b/web/links.txt
diff --git a/web/news.txt b/web/news.txt
index 7ac039e66..6ce9f7fcd 100644..100755
--- a/web/news.txt
+++ b/web/news.txt
@@ -54,6 +54,7 @@ Additions
   `subscript overloading <manual.html#subscript-overloading>`_ for further
   information.
 - The documentation generator supports the ``.. raw:: html`` directive.
+- The Pegs module supports back references via the notation ``$capture_index``. 
 
 
 Changes affecting backwards compatibility
diff --git a/web/nimrod.ini b/web/nimrod.ini
index b92a0f36f..b92a0f36f 100644..100755
--- a/web/nimrod.ini
+++ b/web/nimrod.ini
diff --git a/web/question.txt b/web/question.txt
index 2012d182f..2012d182f 100644..100755
--- a/web/question.txt
+++ b/web/question.txt
diff --git a/web/snippets/snippet1.nim b/web/snippets/snippet1.nim
index 05359a0e0..05359a0e0 100644..100755
--- a/web/snippets/snippet1.nim
+++ b/web/snippets/snippet1.nim
diff --git a/web/ticker.txt b/web/ticker.txt
index 1ac6c9ecf..1ac6c9ecf 100644..100755
--- a/web/ticker.txt
+++ b/web/ticker.txt