fixed pango/pangoutils new wrappers

38 files changed, 696 insertions, 736 deletions

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